According to the link provided, After Elizabeth Dies, Charles will take the throne, If he dies before Elizabeth, William takes the throne. And so on...
The Royal Family > Titles and succession > Succession
What this basically means is that Camilla (charles' current wife) will not be queen, she will be Princess Consort. Look at Queen Elizabeth's husband, Prince Phillip. He's Prince Consort, so he will not take the title of King. So whoever William Marries will not become queen either. but William's future children will be next in line for the throne. Diana would not become queen either if she was still married to Charles today.