Switch gcc ftp URL's to http
diff mbox series

Message ID 20191113203704.19958-1-blomqvist.janne@gmail.com
State New
Headers show
Series
  • Switch gcc ftp URL's to http
Related show

Commit Message

Janne Blomqvist Nov. 13, 2019, 8:37 p.m. UTC
The FTP protocol is getting long in the tooth, and we should emphasize
HTTP where that is available. This patch changes various gcc.gnu.org
URL's to instead use HTTP.

For instance, kernel.org shut down FTP access in 2017, with the
explanation:

- The protocol is inefficient and requires adding awkward kludges to
  firewalls and load-balancing daemons
- FTP servers have no support for caching or accelerators, which has
  significant performance impacts
- Most software implementations have stagnated and see infrequent
  updates

ChangeLog:

2019-11-13  Janne Blomqvist  <jb@gcc.gnu.org>

	* configure.ac: Use http for gcc.gnu.org.
	* configure: Regenerated.

gcc/ChangeLog:

2019-11-13  Janne Blomqvist  <jb@gcc.gnu.org>

	* configure.ac: Use http for gcc.gnu.org
	* configure: Regenerated.
	* doc/install.texi: Use http for gcc.gnu.org.
	* doc/sourcebuild.texi: Likewise.

gcc/testsuite/ChangeLog:

2019-11-13  Janne Blomqvist  <jb@gcc.gnu.org>

	* README: Likewise.

libstdc++-v3/ChangeLog:

2019-11-13  Janne Blomqvist  <jb@gcc.gnu.org>

	* doc/html/api.html: Likewise.
	* doc/xml/api.xml: Likewise.

maintainer-scripts/ChangeLog:

2019-11-13  Janne Blomqvist  <jb@gcc.gnu.org>

	* gcc_release: Likewise.
---
 configure.ac                   |  2 +-
 gcc/configure.ac               |  2 +-
 gcc/doc/install.texi           | 11 +++++------
 gcc/doc/sourcebuild.texi       |  4 ++--
 gcc/testsuite/README           |  2 +-
 libstdc++-v3/doc/html/api.html |  4 ++--
 libstdc++-v3/doc/xml/api.xml   |  2 +-
 maintainer-scripts/gcc_release |  2 +-
 8 files changed, 14 insertions(+), 15 deletions(-)

Comments

Andrew Pinski Nov. 13, 2019, 8:40 p.m. UTC | #1
On Wed, Nov 13, 2019 at 12:37 PM Janne Blomqvist
<blomqvist.janne@gmail.com> wrote:
>
> The FTP protocol is getting long in the tooth, and we should emphasize
> HTTP where that is available. This patch changes various gcc.gnu.org
> URL's to instead use HTTP.

May I suggest you use https instead of http here?  Because it will be
redirected anyways to use https.

Thanks,
Andrew

>
> For instance, kernel.org shut down FTP access in 2017, with the
> explanation:
>
> - The protocol is inefficient and requires adding awkward kludges to
>   firewalls and load-balancing daemons
> - FTP servers have no support for caching or accelerators, which has
>   significant performance impacts
> - Most software implementations have stagnated and see infrequent
>   updates
>
> ChangeLog:
>
> 2019-11-13  Janne Blomqvist  <jb@gcc.gnu.org>
>
>         * configure.ac: Use http for gcc.gnu.org.
>         * configure: Regenerated.
>
> gcc/ChangeLog:
>
> 2019-11-13  Janne Blomqvist  <jb@gcc.gnu.org>
>
>         * configure.ac: Use http for gcc.gnu.org
>         * configure: Regenerated.
>         * doc/install.texi: Use http for gcc.gnu.org.
>         * doc/sourcebuild.texi: Likewise.
>
> gcc/testsuite/ChangeLog:
>
> 2019-11-13  Janne Blomqvist  <jb@gcc.gnu.org>
>
>         * README: Likewise.
>
> libstdc++-v3/ChangeLog:
>
> 2019-11-13  Janne Blomqvist  <jb@gcc.gnu.org>
>
>         * doc/html/api.html: Likewise.
>         * doc/xml/api.xml: Likewise.
>
> maintainer-scripts/ChangeLog:
>
> 2019-11-13  Janne Blomqvist  <jb@gcc.gnu.org>
>
>         * gcc_release: Likewise.
> ---
>  configure.ac                   |  2 +-
>  gcc/configure.ac               |  2 +-
>  gcc/doc/install.texi           | 11 +++++------
>  gcc/doc/sourcebuild.texi       |  4 ++--
>  gcc/testsuite/README           |  2 +-
>  libstdc++-v3/doc/html/api.html |  4 ++--
>  libstdc++-v3/doc/xml/api.xml   |  2 +-
>  maintainer-scripts/gcc_release |  2 +-
>  8 files changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index d63a8bae940..774e95a989f 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1665,7 +1665,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
>  Try the --with-gmp, --with-mpfr and/or --with-mpc options to specify
>  their locations.  Source code for these libraries can be found at
>  their respective hosting sites as well as at
> -ftp://gcc.gnu.org/pub/gcc/infrastructure/.  See also
> +http://gcc.gnu.org/pub/gcc/infrastructure/.  See also
>  http://gcc.gnu.org/install/prerequisites.html for additional info.  If
>  you obtained GMP, MPFR and/or MPC from a vendor distribution package,
>  make sure that you have installed both the libraries and the header
> diff --git a/gcc/configure.ac b/gcc/configure.ac
> index b9cc2435cdf..7bb77f4e7a0 100644
> --- a/gcc/configure.ac
> +++ b/gcc/configure.ac
> @@ -4748,7 +4748,7 @@ gd:
>           [     .machine ppc7400])
>         if test x$gcc_cv_as_machine_directive != xyes; then
>           echo "*** This target requires an assembler supporting \".machine\"" >&2
> -         echo you can get it from: ftp://gcc.gnu.org/pub/gcc/infrastructure/cctools-528.5.dmg >&2
> +         echo you can get it from: http://gcc.gnu.org/pub/gcc/infrastructure/cctools-528.5.dmg >&2
>           test x$build = x$target && exit 1
>         fi
>          ;;
> diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
> index 215a6fa38ff..c88d73f10cc 100644
> --- a/gcc/doc/install.texi
> +++ b/gcc/doc/install.texi
> @@ -333,7 +333,7 @@ requirements.
>  @itemx bzip2 version 1.0.2 (or later)
>
>  Necessary to uncompress GCC @command{tar} files when source code is
> -obtained via FTP mirror sites.
> +obtained via HTTP mirror sites.
>
>  @item GNU make version 3.80 (or later)
>
> @@ -411,7 +411,7 @@ download_prerequisites installs.
>  @item isl Library version 0.15 or later.
>
>  Necessary to build GCC with the Graphite loop optimizations.
> -It can be downloaded from @uref{ftp://gcc.gnu.org/pub/gcc/infrastructure/}.
> +It can be downloaded from @uref{http://gcc.gnu.org/pub/gcc/infrastructure/}.
>  If an isl source distribution is found
>  in a subdirectory of your GCC sources named @file{isl}, it will be
>  built together with GCC.  Alternatively, the @option{--with-isl} configure
> @@ -513,7 +513,7 @@ files in the directories below @file{jit/docs}.
>  @itemx SSH (any version)
>
>  Necessary to access the SVN repository.  Public releases and weekly
> -snapshots of the development sources are also available via FTP@.
> +snapshots of the development sources are also available via HTTP@.
>
>  @item GNU diffutils version 2.7 (or later)
>
> @@ -547,9 +547,8 @@ own sources.
>  @cindex Downloading GCC
>  @cindex Downloading the Source
>
> -GCC is distributed via @uref{http://gcc.gnu.org/svn.html,,SVN} and FTP
> -tarballs compressed with @command{gzip} or
> -@command{bzip2}.
> +GCC is distributed via @uref{http://gcc.gnu.org/svn.html,,SVN} and via
> +HTTP as tarballs compressed with @command{gzip} or @command{bzip2}.
>
>  Please refer to the @uref{http://gcc.gnu.org/releases.html,,releases web page}
>  for information on how to obtain GCC@.
> diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
> index f3bf66c44ee..2650fc078b3 100644
> --- a/gcc/doc/sourcebuild.texi
> +++ b/gcc/doc/sourcebuild.texi
> @@ -566,8 +566,8 @@ and the online manuals should be linked to from
>  @file{onlinedocs/index.html}.
>  @item
>  Any old releases or CVS repositories of the front end, before its
> -inclusion in GCC, should be made available on the GCC FTP site
> -@uref{ftp://gcc.gnu.org/pub/gcc/old-releases/}.
> +inclusion in GCC, should be made available on the GCC HTTP site
> +@uref{http://gcc.gnu.org/pub/gcc/old-releases/}.
>  @item
>  The release and snapshot script @file{maintainer-scripts/gcc_release}
>  should be updated to generate appropriate tarballs for this front end.
> diff --git a/gcc/testsuite/README b/gcc/testsuite/README
> index dfacd937a29..07e7e81957a 100644
> --- a/gcc/testsuite/README
> +++ b/gcc/testsuite/README
> @@ -3,7 +3,7 @@ the C testsuite, see README.gcc.
>
>  The driver that runs this testsuite is called DejaGnu and you will
>  need a current DejaGnu snapshot, which is available from
> -ftp://gcc.gnu.org/pub/gcc/infrastructure, for example.
> +http://gcc.gnu.org/pub/gcc/infrastructure, for example.
>
>  These tests are included "as is". If any of them fails, do not report
>  a bug.  Bug reports for DejaGnu can go to bug-dejagnu@gnu.org.
> diff --git a/libstdc++-v3/doc/html/api.html b/libstdc++-v3/doc/html/api.html
> index ec25525b9d9..d795488a3f8 100644
> --- a/libstdc++-v3/doc/html/api.html
> +++ b/libstdc++-v3/doc/html/api.html
> @@ -30,7 +30,7 @@
>  </p><p>
>    The rendered HTML, as above, is also available for download on the
>    gcc.gnu.org site in a directory located at
> -   <code class="literal">&lt;URL:ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/&gt;</code>.
> +   <code class="literal">&lt;URL:http://gcc.gnu.org/pub/gcc/libstdc++/doxygen/&gt;</code>.
>     You will almost certainly need to use one of the
>     <a class="link" href="http://gcc.gnu.org/mirrors.html" target="_top">mirror sites</a> to download
>     the tarball. After unpacking, simply load libstdc++-html-*/index.html
> @@ -38,4 +38,4 @@
>  </p><p>
>    In addition, a rendered set of man pages are available in the same
>    location specified above. Start with C++Intro(3).
> -</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="bk02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="bk02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="bk03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>
> \ No newline at end of file
> +</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="bk02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="bk02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="bk03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>
> diff --git a/libstdc++-v3/doc/xml/api.xml b/libstdc++-v3/doc/xml/api.xml
> index 238d8134a05..0312db60fd0 100644
> --- a/libstdc++-v3/doc/xml/api.xml
> +++ b/libstdc++-v3/doc/xml/api.xml
> @@ -52,7 +52,7 @@
>  <para>
>    The rendered HTML, as above, is also available for download on the
>    gcc.gnu.org site in a directory located at
> -   <literal>&lt;URL:ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/&gt;</literal>.
> +   <literal>&lt;URL:http://gcc.gnu.org/pub/gcc/libstdc++/doxygen/&gt;</literal>.
>     You will almost certainly need to use one of the
>     <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://gcc.gnu.org/mirrors.html">mirror sites</link> to download
>     the tarball. After unpacking, simply load libstdc++-html-*/index.html
> diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
> index bfb6b037bb1..37da345df2a 100755
> --- a/maintainer-scripts/gcc_release
> +++ b/maintainer-scripts/gcc_release
> @@ -430,7 +430,7 @@ announce_snapshot() {
>    changedir "${SNAPSHOTS_DIR}"
>    echo \
>  "Snapshot gcc-"${RELEASE}" is now available on
> -  ftp://gcc.gnu.org/pub/gcc/snapshots/"${RELEASE}"/
> +  http://gcc.gnu.org/pub/gcc/snapshots/"${RELEASE}"/
>  and on various mirrors, see http://gcc.gnu.org/mirrors.html for details.
>
>  This snapshot has been generated from the GCC "${BRANCH}" SVN branch
> --
> 2.17.1
>
Janne Blomqvist Nov. 13, 2019, 9:05 p.m. UTC | #2
On Wed, Nov 13, 2019 at 10:41 PM Andrew Pinski <pinskia@gmail.com> wrote:
>
> On Wed, Nov 13, 2019 at 12:37 PM Janne Blomqvist
> <blomqvist.janne@gmail.com> wrote:
> >
> > The FTP protocol is getting long in the tooth, and we should emphasize
> > HTTP where that is available. This patch changes various gcc.gnu.org
> > URL's to instead use HTTP.
>
> May I suggest you use https instead of http here?  Because it will be
> redirected anyways to use https.

For me, when I use my normal web browser (firefox), it does redirect
to https. But I'm using the "HTTPS everywhere" extension, so I'm not
sure if it's the extension that does it, or if the server redirects
me, or if it's some other web-security-thingy that does it. When I use
curl, and if I manage to interpret the output correctly, it does not
redirect.

That being said, it's probably a good idea to use https anyway. So
yes, consider it done (I'm not sending a new iteration of the patch
for this).
Joseph Myers Nov. 14, 2019, 1:49 a.m. UTC | #3
On Wed, 13 Nov 2019, Janne Blomqvist wrote:

> For me, when I use my normal web browser (firefox), it does redirect
> to https. But I'm using the "HTTPS everywhere" extension, so I'm not
> sure if it's the extension that does it, or if the server redirects
> me, or if it's some other web-security-thingy that does it. When I use
> curl, and if I manage to interpret the output correctly, it does not
> redirect.

If you connect once with https, you get back a header

Strict-Transport-Security: max-age=16070400

meaning that if you ever try to connect with http with the same browser 
(within 186 days), it will remap http to https and connect over https 
instead (and so refresh its memory of which it last saw the HSTS header).
Janne Blomqvist Nov. 20, 2019, 11:05 a.m. UTC | #4
PING

On Wed, Nov 13, 2019 at 11:05 PM Janne Blomqvist
<blomqvist.janne@gmail.com> wrote:
>
> On Wed, Nov 13, 2019 at 10:41 PM Andrew Pinski <pinskia@gmail.com> wrote:
> >
> > On Wed, Nov 13, 2019 at 12:37 PM Janne Blomqvist
> > <blomqvist.janne@gmail.com> wrote:
> > >
> > > The FTP protocol is getting long in the tooth, and we should emphasize
> > > HTTP where that is available. This patch changes various gcc.gnu.org
> > > URL's to instead use HTTP.
> >
> > May I suggest you use https instead of http here?  Because it will be
> > redirected anyways to use https.
>
> For me, when I use my normal web browser (firefox), it does redirect
> to https. But I'm using the "HTTPS everywhere" extension, so I'm not
> sure if it's the extension that does it, or if the server redirects
> me, or if it's some other web-security-thingy that does it. When I use
> curl, and if I manage to interpret the output correctly, it does not
> redirect.
>
> That being said, it's probably a good idea to use https anyway. So
> yes, consider it done (I'm not sending a new iteration of the patch
> for this).
>
>
> --
> Janne Blomqvist
Joseph Myers Nov. 20, 2019, 5:52 p.m. UTC | #5
This patch is OK with http changed to https.  (That is, with it changed 
where the patch is already changing the URL.  While changing http to https 
makes sense more generally in the documentation whenever a site supports 
https, that's probably best not mixed with the move from ftp.)
Janne Blomqvist Nov. 20, 2019, 8:29 p.m. UTC | #6
On Wed, Nov 20, 2019 at 7:53 PM Joseph Myers <joseph@codesourcery.com> wrote:
>
> This patch is OK with http changed to https.  (That is, with it changed
> where the patch is already changing the URL.  While changing http to https
> makes sense more generally in the documentation whenever a site supports
> https, that's probably best not mixed with the move from ftp.)

Thanks for the review, done, and committed as r278526.

Any opinions on whether I should apply this to the 8 and 9 branches as
well? And the same question for my previous patch updating
contrib/download_prerequisites at
https://gcc.gnu.org/ml/gcc-patches/2019-11/msg00957.html .
Joseph Myers Nov. 20, 2019, 10:30 p.m. UTC | #7
On Wed, 20 Nov 2019, Janne Blomqvist wrote:

> On Wed, Nov 20, 2019 at 7:53 PM Joseph Myers <joseph@codesourcery.com> wrote:
> >
> > This patch is OK with http changed to https.  (That is, with it changed
> > where the patch is already changing the URL.  While changing http to https
> > makes sense more generally in the documentation whenever a site supports
> > https, that's probably best not mixed with the move from ftp.)
> 
> Thanks for the review, done, and committed as r278526.
> 
> Any opinions on whether I should apply this to the 8 and 9 branches as
> well? And the same question for my previous patch updating
> contrib/download_prerequisites at
> https://gcc.gnu.org/ml/gcc-patches/2019-11/msg00957.html .

I have no advice on that question.

Patch
diff mbox series

diff --git a/configure.ac b/configure.ac
index d63a8bae940..774e95a989f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1665,7 +1665,7 @@  if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
 Try the --with-gmp, --with-mpfr and/or --with-mpc options to specify
 their locations.  Source code for these libraries can be found at
 their respective hosting sites as well as at
-ftp://gcc.gnu.org/pub/gcc/infrastructure/.  See also
+http://gcc.gnu.org/pub/gcc/infrastructure/.  See also
 http://gcc.gnu.org/install/prerequisites.html for additional info.  If
 you obtained GMP, MPFR and/or MPC from a vendor distribution package,
 make sure that you have installed both the libraries and the header
diff --git a/gcc/configure.ac b/gcc/configure.ac
index b9cc2435cdf..7bb77f4e7a0 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -4748,7 +4748,7 @@  gd:
 	  [	.machine ppc7400])
 	if test x$gcc_cv_as_machine_directive != xyes; then
 	  echo "*** This target requires an assembler supporting \".machine\"" >&2
-	  echo you can get it from: ftp://gcc.gnu.org/pub/gcc/infrastructure/cctools-528.5.dmg >&2
+	  echo you can get it from: http://gcc.gnu.org/pub/gcc/infrastructure/cctools-528.5.dmg >&2
 	  test x$build = x$target && exit 1
 	fi
         ;;
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 215a6fa38ff..c88d73f10cc 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -333,7 +333,7 @@  requirements.
 @itemx bzip2 version 1.0.2 (or later)
 
 Necessary to uncompress GCC @command{tar} files when source code is
-obtained via FTP mirror sites.
+obtained via HTTP mirror sites.
 
 @item GNU make version 3.80 (or later)
 
@@ -411,7 +411,7 @@  download_prerequisites installs.
 @item isl Library version 0.15 or later.
 
 Necessary to build GCC with the Graphite loop optimizations.
-It can be downloaded from @uref{ftp://gcc.gnu.org/pub/gcc/infrastructure/}.
+It can be downloaded from @uref{http://gcc.gnu.org/pub/gcc/infrastructure/}.
 If an isl source distribution is found
 in a subdirectory of your GCC sources named @file{isl}, it will be
 built together with GCC.  Alternatively, the @option{--with-isl} configure
@@ -513,7 +513,7 @@  files in the directories below @file{jit/docs}.
 @itemx SSH (any version)
 
 Necessary to access the SVN repository.  Public releases and weekly
-snapshots of the development sources are also available via FTP@.
+snapshots of the development sources are also available via HTTP@.
 
 @item GNU diffutils version 2.7 (or later)
 
@@ -547,9 +547,8 @@  own sources.
 @cindex Downloading GCC
 @cindex Downloading the Source
 
-GCC is distributed via @uref{http://gcc.gnu.org/svn.html,,SVN} and FTP
-tarballs compressed with @command{gzip} or
-@command{bzip2}.
+GCC is distributed via @uref{http://gcc.gnu.org/svn.html,,SVN} and via
+HTTP as tarballs compressed with @command{gzip} or @command{bzip2}.
 
 Please refer to the @uref{http://gcc.gnu.org/releases.html,,releases web page}
 for information on how to obtain GCC@.
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index f3bf66c44ee..2650fc078b3 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -566,8 +566,8 @@  and the online manuals should be linked to from
 @file{onlinedocs/index.html}.
 @item
 Any old releases or CVS repositories of the front end, before its
-inclusion in GCC, should be made available on the GCC FTP site
-@uref{ftp://gcc.gnu.org/pub/gcc/old-releases/}.
+inclusion in GCC, should be made available on the GCC HTTP site
+@uref{http://gcc.gnu.org/pub/gcc/old-releases/}.
 @item
 The release and snapshot script @file{maintainer-scripts/gcc_release}
 should be updated to generate appropriate tarballs for this front end.
diff --git a/gcc/testsuite/README b/gcc/testsuite/README
index dfacd937a29..07e7e81957a 100644
--- a/gcc/testsuite/README
+++ b/gcc/testsuite/README
@@ -3,7 +3,7 @@  the C testsuite, see README.gcc.
 
 The driver that runs this testsuite is called DejaGnu and you will
 need a current DejaGnu snapshot, which is available from
-ftp://gcc.gnu.org/pub/gcc/infrastructure, for example.
+http://gcc.gnu.org/pub/gcc/infrastructure, for example.
 
 These tests are included "as is". If any of them fails, do not report
 a bug.  Bug reports for DejaGnu can go to bug-dejagnu@gnu.org.
diff --git a/libstdc++-v3/doc/html/api.html b/libstdc++-v3/doc/html/api.html
index ec25525b9d9..d795488a3f8 100644
--- a/libstdc++-v3/doc/html/api.html
+++ b/libstdc++-v3/doc/html/api.html
@@ -30,7 +30,7 @@ 
 </p><p>
   The rendered HTML, as above, is also available for download on the
   gcc.gnu.org site in a directory located at
-   <code class="literal">&lt;URL:ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/&gt;</code>.
+   <code class="literal">&lt;URL:http://gcc.gnu.org/pub/gcc/libstdc++/doxygen/&gt;</code>.
    You will almost certainly need to use one of the
    <a class="link" href="http://gcc.gnu.org/mirrors.html" target="_top">mirror sites</a> to download
    the tarball. After unpacking, simply load libstdc++-html-*/index.html
@@ -38,4 +38,4 @@ 
 </p><p>
   In addition, a rendered set of man pages are available in the same
   location specified above. Start with C++Intro(3).
-</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="bk02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="bk02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="bk03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>
\ No newline at end of file
+</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="bk02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="bk02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="bk03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>
diff --git a/libstdc++-v3/doc/xml/api.xml b/libstdc++-v3/doc/xml/api.xml
index 238d8134a05..0312db60fd0 100644
--- a/libstdc++-v3/doc/xml/api.xml
+++ b/libstdc++-v3/doc/xml/api.xml
@@ -52,7 +52,7 @@ 
 <para>
   The rendered HTML, as above, is also available for download on the
   gcc.gnu.org site in a directory located at
-   <literal>&lt;URL:ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/&gt;</literal>.
+   <literal>&lt;URL:http://gcc.gnu.org/pub/gcc/libstdc++/doxygen/&gt;</literal>.
    You will almost certainly need to use one of the
    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://gcc.gnu.org/mirrors.html">mirror sites</link> to download
    the tarball. After unpacking, simply load libstdc++-html-*/index.html
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index bfb6b037bb1..37da345df2a 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -430,7 +430,7 @@  announce_snapshot() {
   changedir "${SNAPSHOTS_DIR}"
   echo \
 "Snapshot gcc-"${RELEASE}" is now available on
-  ftp://gcc.gnu.org/pub/gcc/snapshots/"${RELEASE}"/
+  http://gcc.gnu.org/pub/gcc/snapshots/"${RELEASE}"/
 and on various mirrors, see http://gcc.gnu.org/mirrors.html for details.
 
 This snapshot has been generated from the GCC "${BRANCH}" SVN branch