Remove mention of 'windows.php.net' (and URL tidy-up)

downloads.php

@@ -237,7 +237,7 @@ function option(string $value, string $desc, $attributes = []): string
 <h2>Binaries</h2>
 
 <p>
-    <a href="https://windows.php.net/download/">Binaries are available for
+    <a href="https://www.php.net/downloads.php?usage=web&amp;os=windows&amp;osvariant=windows-downloads&amp;version=default">Binaries are available for
     Microsoft Windows</a>. The PHP project does not currently release binary packages
     for other platforms such as Linux or macOS, but they are packaged by distributions
     and other providers. For more information, see:

sites.php

@@ -6,13 +6,13 @@
 
 <h1 class="content-header">PHP.net: A Tourist's Guide</h1>
 <p class="content-box">
- Everyone knows the <code>php.net</code> site. All of us went there sooner or later,
+ Everyone knows the <code>www.php.net</code> site. All of us went there sooner or later,
  and will keep going back there. This is the central reference point for PHP
  users, and there is a wealth of information there. Not all of it is obvious.
  Come with me, I'll show you.
 </p>
 
-<h2 id="www" class="content-header"><a href="http://php.net/">php.net</a>: Main Website</h2>
+<h2 id="www" class="content-header"><a href="https://www.php.net/">php.net</a>: Main Website</h2>
 
 <div class="content-box">
 <p>
@@ -25,7 +25,7 @@
  This is the home of the <a href="/downloads.php">download page</a>, for
  everyone to get the latest version of the PHP source code and binaries
  for Windows. The current and next-to-current versions are available there.
- (There is also a <a href="http://museum.php.net/">PHP Museum</a>, which has
+ (There is also a <a href="https://museum.php.net/">PHP Museum</a>, which has
  all of the source distributions since June 1996.)
 </p>
 
@@ -52,7 +52,7 @@
 </div>
 
 <h2 id="talks" class="content-header">
- <a href="http://talks.php.net/">talks.php.net</a>: Conference Materials
+ <a href="https://talks.php.net/">talks.php.net</a>: Conference Materials
 </h2>
 
 <p class="content-box">
@@ -142,13 +142,6 @@ interface to it. There you can browse the history (and latest versions) of the
  has a wiki section and everyone is able to apply for wiki commit access.
 </p>
 
-<h2 id="windows" class="content-header"><a href="https://windows.php.net/">windows.php.net</a>: PHP for Windows</h2>
-
-<p class="content-box">
- This site is dedicated to supporting PHP on Microsoft Windows.
- It also supports ports of PHP extensions or features as well as providing special builds for the various Windows architectures.
-</p>
-
 <h2 id="people" class="content-header"><a href="https://people.php.net/">people.php.net</a>: The PHP Developers Profiles</h2>
 
 <p class="content-box">
@@ -168,7 +161,6 @@ interface to it. There you can browse the history (and latest versions) of the
 <p class='panel'><a href="#doc">Documentation collaboration</a></p>
 <p class='panel'><a href="#git">Git Repository</a></p>
 <p class='panel'><a href="#wiki">The PHP Wiki</a></h2>
-<p class='panel'><a href="#windows">PHP for Windows</a></h2>
 <p class='panel'><a href="#people">The PHP Developers Profiles</a></h2>
 
 SIDEBAR_DATA;