git: 2c5bb27452 - main - handbook: Split off HTTP mirrors into a separate section

From: Edward Tomasz Napierala <trasz_at_FreeBSD.org>
Date: Thu, 20 Jan 2022 09:06:35 UTC
The branch main has been updated by trasz:

URL: https://cgit.FreeBSD.org/doc/commit/?id=2c5bb274521a030ceb7a217e16be35a5756cba5d

commit 2c5bb274521a030ceb7a217e16be35a5756cba5d
Author:     Edward Tomasz Napierala <trasz@FreeBSD.org>
AuthorDate: 2022-01-20 09:01:21 +0000
Commit:     Edward Tomasz Napierala <trasz@FreeBSD.org>
CommitDate: 2022-01-20 09:01:25 +0000

    handbook: Split off HTTP mirrors into a separate section
    
    Web browsers are deprecating support for FTP; thus, having
    an interleaved list of FTP and HTTP links isn’t particularly
    user-friendly.
    
    Note that there is another list of mirrors in the "eresources"
    chapter, but let's clean up this one first; I also have a followup
    patch that cleans up rsync.
    
    Reviewed By:    debdrup
    Sponsored By:   EPSRC
    Differential Revision:  https://reviews.freebsd.org/D33952
---
 .../content/en/books/handbook/mirrors/_index.adoc  | 243 +++++++++++++++++----
 1 file changed, 202 insertions(+), 41 deletions(-)

diff --git a/documentation/content/en/books/handbook/mirrors/_index.adoc b/documentation/content/en/books/handbook/mirrors/_index.adoc
index 00a1ac000e..2628d06fc1 100644
--- a/documentation/content/en/books/handbook/mirrors/_index.adoc
+++ b/documentation/content/en/books/handbook/mirrors/_index.adoc
@@ -49,14 +49,175 @@ toc::[]
 include::../../../../../shared/asciidoctor.adoc[]
 endif::[]
 
-[[mirrors-ftp]]
-== FTP Sites
+[[mirrors-http]]
+== HTTP Mirrors
 
-The official sources for FreeBSD are available via anonymous FTP from a worldwide set of mirror sites.
-The site link:ftp://ftp.FreeBSD.org/pub/FreeBSD/[ftp://ftp.FreeBSD.org/pub/FreeBSD/] is available via HTTP and FTP.
+The official sources for FreeBSD are available via HTTP from a worldwide set of mirror sites.
+The site link:https://ftp.FreeBSD.org/pub/FreeBSD/[https://ftp.FreeBSD.org/pub/FreeBSD/] is available via HTTP and anonymous FTP.
 It is made up of many machines operated by the project cluster administrators and behind GeoDNS to direct users to the closest available mirror.
 
-Additionally, FreeBSD is available via anonymous FTP from the following mirror sites.
+{central-http}
+
+[[primary]]
+*{mirrors-primary}*
+
+In case of problems, please contact the hostmaster `<{mirrors-primary-email}>` for this domain.
+
+* {mirrors-primary-ftp4-http} / {mirrors-primary-ftp4-httpv6}
+* {mirrors-primary-ftp10-http} / {mirrors-primary-ftp10-httpv6}
+* {mirrors-primary-ftp14-http}
+
+[[armenia]]
+*{mirrors-armenia}*
+
+In case of problems, please contact the hostmaster `<{mirrors-armenia-email}>` for this domain.
+
+* {mirrors-armenia-ftp-http}
+
+[[austria]]
+*{mirrors-austria}*
+
+In case of problems, please contact the hostmaster `<{mirrors-austria-email}>` for this domain.
+
+* {mirrors-austria-ftp-http} / {mirrors-austria-ftp-httpv6}
+
+[[brazil]]
+*{mirrors-brazil}*
+
+In case of problems, please contact the hostmaster `<{mirrors-brazil-email}>` for this domain.
+
+* {mirrors-brazil-ftp2-http}
+
+[[bulgaria]]
+*{mirrors-bulgaria}*
+
+In case of problems, please contact the hostmaster `<{mirrors-bulgaria-email}>` for this domain.
+
+* {mirrors-bulgaria-ftp-http} / {mirrors-bulgaria-ftp-httpv6}
+
+[[czech-republic]]
+*{mirrors-czech}*
+
+In case of problems, please contact the hostmaster `<{mirrors-czech-email}>` for this domain.
+
+* {mirrors-czech-ftp-http} / {mirrors-czech-ftp-httpv6}
+* {mirrors-czech-ftp2-http}
+
+[[denmark]]
+*{mirrors-denmark}*
+
+In case of problems, please contact the hostmaster `<{mirrors-denmark-email}>` for this domain.
+
+* {mirrors-denmark-ftp-http} / {mirrors-denmark-ftp-httpv6}
+
+[[france]]
+*{mirrors-france}*
+
+In case of problems, please contact the hostmaster `<{mirrors-france-email}>` for this domain.
+
+* {mirrors-france-ftp1-http}
+
+[[germany]]
+*{mirrors-germany}*
+
+In case of problems, please contact the hostmaster `<{mirrors-germany-email}>` for this domain.
+
+* http://www1.de.FreeBSD.org/freebsd/
+* http://ftp2.de.FreeBSD.org/pub/FreeBSD/
+* http://ftp4.de.FreeBSD.org/pub/FreeBSD/
+* http://ftp7.de.FreeBSD.org/pub/FreeBSD/
+
+[[korea]]
+*{mirrors-korea}*
+
+In case of problems, please contact the hostmaster `<{mirrors-korea-email}>` for this domain.
+
+* {mirrors-korea-ftp2-http}
+
+[[latvia]]
+*{mirrors-latvia}*
+
+In case of problems, please contact the hostmaster `<{mirrors-latvia-email}>` for this domain.
+
+* {mirrors-latvia-ftp-http}
+
+[[lithuania]]
+*{mirrors-lithuania}*
+
+In case of problems, please contact the hostmaster `<{mirrors-lithuania-email}>` for this domain.
+
+* {mirrors-lithuania-ftp-http}
+
+[[netherlands]]
+*{mirrors-netherlands}*
+
+In case of problems, please contact the hostmaster `<{mirrors-netherlands-email}>` for this domain.
+
+* {mirrors-netherlands-ftp-http}
+
+[[new-zealand]]
+*{mirrors-new-zealand}*
+
+* {mirrors-new-zealand-ftp-http}
+
+[[russia]]
+*{mirrors-russia}*
+
+In case of problems, please contact the hostmaster `<{mirrors-russia-email}>` for this domain.
+
+* {mirrors-russia-ftp-http}
+* {mirrors-russia-ftp2-http}
+* {mirrors-russia-ftp5-http}
+
+[[spain]]
+*{mirrors-spain}*
+
+In case of problems, please contact the hostmaster `<{mirrors-spain-email}>` for this domain.
+
+* {mirrors-spain-ftp-http}
+
+[[sweden]]
+*{mirrors-sweden}*
+
+In case of problems, please contact the hostmaster `<{mirrors-sweden-email}>` for this domain.
+
+* {mirrors-sweden-ftp4-http} / {mirrors-sweden-ftp4-httpv6}
+* {mirrors-sweden-ftp6-http}
+
+[[switzerland]]
+*{mirrors-switzerland}*
+
+In case of problems, please contact the hostmaster `<{mirrors-switzerland-email}>` for this domain.
+
+* {mirrors-switzerland-ftp-http}
+
+[[taiwan]]
+*{mirrors-taiwan}*
+
+In case of problems, please contact the hostmaster `<{mirrors-taiwan-email}>` for this domain.
+
+* {mirrors-taiwan-ftp2-http} / {mirrors-taiwan-ftp2-httpv6}
+* {mirrors-taiwan-ftp11-http}
+
+[[ukraine]]
+*{mirrors-ukraine}*
+
+* {mirrors-ukraine-ftp-http}
+* {mirrors-ukraine-ftp6-http}
+
+[[usa]]
+*{mirrors-us}*
+
+In case of problems, please contact the hostmaster `<{mirrors-us-email}>` for this domain.
+
+* {mirrors-us-ftp4-http} / {mirrors-us-ftp4-httpv6}
+* {mirrors-us-ftp13-http}
+* {mirrors-us-ftp14-http}
+
+[[mirrors-ftp]]
+== FTP Sites
+
+In addition to HTTP mirrors, FreeBSD is available via anonymous FTP from the following sites.
 When obtaining FreeBSD via anonymous FTP, please try to use a nearby site.
 The mirror sites listed as "Primary Mirror Sites" typically have the entire FreeBSD archive (all the currently available versions for each of the architectures) but faster download speeds are probably available from a site that is in your country or region.
 The regional sites carry the most recent versions for the most popular architecture(s) but might not carry the entire FreeBSD archive.
@@ -70,7 +231,7 @@ The access methods available for each site are provided in parentheses after the
 [[central]]
 *{central}*
 
-{central-ftp} (ftp / ftpv6 / {central-http} / {central-httpv6}) 
+{central-ftp} (ftp / ftpv6)
 
 [[primary]]
 *{mirrors-primary}*
@@ -80,21 +241,21 @@ In case of problems, please contact the hostmaster `<{mirrors-primary-email}>` f
 * {mirrors-primary-ftp1} (ftp)
 * {mirrors-primary-ftp2} (ftp)
 * {mirrors-primary-ftp3} (ftp)
-* {mirrors-primary-ftp4} (ftp / ftpv6 / {mirrors-primary-ftp4-http} / {mirrors-primary-ftp4-httpv6})
+* {mirrors-primary-ftp4} (ftp / ftpv6)
 * {mirrors-primary-ftp5} (ftp)
 * {mirrors-primary-ftp6} (ftp)
 * {mirrors-primary-ftp7} (ftp)
-* {mirrors-primary-ftp10} (ftp / ftpv6 / {mirrors-primary-ftp10-http} / {mirrors-primary-ftp10-httpv6})
+* {mirrors-primary-ftp10} (ftp / ftpv6)
 * {mirrors-primary-ftp11} (ftp)
 * {mirrors-primary-ftp13} (ftp)
-* {mirrors-primary-ftp14} (ftp / {mirrors-primary-ftp14-http}) 
+* {mirrors-primary-ftp14} (ftp)
 
 [[armenia]]
 *{mirrors-armenia}*
 
 In case of problems, please contact the hostmaster `<{mirrors-armenia-email}>` for this domain.
 
-* {mirrors-armenia-ftp} (ftp / {mirrors-armenia-ftp-http} / rsync) 
+* {mirrors-armenia-ftp} (ftp / rsync)
 
 [[australia]]
 *{mirrors-australia}*
@@ -110,38 +271,38 @@ In case of problems, please contact the hostmaster `<{mirrors-australia-email}>`
 
 In case of problems, please contact the hostmaster `<{mirrors-austria-email}>` for this domain.
 
-* {mirrors-austria-ftp} (ftp / ftpv6 / {mirrors-austria-ftp-http} / {mirrors-austria-ftp-httpv6}) 
+* {mirrors-austria-ftp} (ftp / ftpv6)
 
 [[brazil]]
 *{mirrors-brazil}*
 
 In case of problems, please contact the hostmaster `<{mirrors-brazil-email}>` for this domain.
 
-* {mirrors-brazil-ftp2} (ftp / {mirrors-brazil-ftp2-http})
+* {mirrors-brazil-ftp2} (ftp)
 * {mirrors-brazil-ftp3} (ftp / rsync)
-* {mirrors-brazil-ftp4} (ftp) 
+* {mirrors-brazil-ftp4} (ftp)
 
 [[bulgaria]]
 *{mirrors-bulgaria}*
 
 In case of problems, please contact the hostmaster `<{mirrors-bulgaria-email}>` for this domain.
 
-* {mirrors-bulgaria-ftp} (ftp / {mirrors-bulgaria-ftpv6} / {mirrors-bulgaria-ftp-http} / {mirrors-bulgaria-ftp-httpv6} / rsync / rsyncv6)
+* {mirrors-bulgaria-ftp} (ftp / {mirrors-bulgaria-ftpv6} / rsync / rsyncv6)
 
 [[czech-republic]]
 *{mirrors-czech}*
 
 In case of problems, please contact the hostmaster `<{mirrors-czech-email}>` for this domain.
 
-* {mirrors-czech-ftp} (ftp / {mirrors-czech-ftpv6} / {mirrors-czech-ftp-http} / {mirrors-czech-ftp-httpv6} / rsync / rsyncv6)
-* {mirrors-czech-ftp2} (ftp / {mirrors-czech-ftp2-http}) 
+* {mirrors-czech-ftp} (ftp / {mirrors-czech-ftpv6} / rsync / rsyncv6)
+* {mirrors-czech-ftp2} (ftp)
 
 [[denmark]]
 *{mirrors-denmark}*
 
 In case of problems, please contact the hostmaster `<{mirrors-denmark-email}>` for this domain.
 
-* {mirrors-denmark-ftp} (ftp / ftpv6 / {mirrors-denmark-ftp-http} / {mirrors-denmark-ftp-httpv6}) 
+* {mirrors-denmark-ftp} (ftp / ftpv6)
 
 [[estonia]]
 *{mirrors-estonia}*
@@ -163,7 +324,7 @@ In case of problems, please contact the hostmaster `<{mirrors-finland-email}>` f
 In case of problems, please contact the hostmaster `<{mirrors-france-email}>` for this domain.
 
 * {mirrors-france-ftp} (ftp)
-* {mirrors-france-ftp1} (ftp / {mirrors-france-ftp1-http} / rsync)
+* {mirrors-france-ftp1} (ftp / rsync)
 * {mirrors-france-ftp3} (ftp)
 * {mirrors-france-ftp5} (ftp)
 * {mirrors-france-ftp6} (ftp / rsync)
@@ -176,11 +337,11 @@ In case of problems, please contact the hostmaster `<{mirrors-france-email}>` fo
 In case of problems, please contact the hostmaster `<{mirrors-germany-email}>` for this domain.
 
 * ftp://ftp.de.FreeBSD.org/pub/FreeBSD/ (ftp)
-* ftp://ftp1.de.FreeBSD.org/freebsd/ (ftp / http://www1.de.FreeBSD.org/freebsd/ / rsync://rsync3.de.FreeBSD.org/freebsd/)
-* ftp://ftp2.de.FreeBSD.org/pub/FreeBSD/ (ftp / http://ftp2.de.FreeBSD.org/pub/FreeBSD/ / rsync)
-* ftp://ftp4.de.FreeBSD.org/FreeBSD/ (ftp / http://ftp4.de.FreeBSD.org/pub/FreeBSD/)
+* ftp://ftp1.de.FreeBSD.org/freebsd/ (ftp / rsync://rsync3.de.FreeBSD.org/freebsd/)
+* ftp://ftp2.de.FreeBSD.org/pub/FreeBSD/ (ftp / rsync)
+* ftp://ftp4.de.FreeBSD.org/FreeBSD/ (ftp)
 * ftp://ftp5.de.FreeBSD.org/pub/FreeBSD/ (ftp)
-* ftp://ftp7.de.FreeBSD.org/pub/FreeBSD/ (ftp / http://ftp7.de.FreeBSD.org/pub/FreeBSD/)
+* ftp://ftp7.de.FreeBSD.org/pub/FreeBSD/ (ftp)
 
 [[greece]]
 *{mirrors-greece}*
@@ -223,34 +384,34 @@ In case of problems, please contact the hostmaster `<{mirrors-japan-email}>` for
 In case of problems, please contact the hostmaster `<{mirrors-korea-email}>` for this domain.
 
 * {mirrors-korea-ftp} (ftp / rsync)
-* {mirrors-korea-ftp2} (ftp / {mirrors-korea-ftp2-http}) 
+* {mirrors-korea-ftp2} (ftp)
 
 [[latvia]]
 *{mirrors-latvia}*
 
 In case of problems, please contact the hostmaster `<{mirrors-latvia-email}>` for this domain.
 
-* {mirrors-latvia-ftp} (ftp / {mirrors-latvia-ftp-http}) 
+* {mirrors-latvia-ftp} (ftp)
 
 [[lithuania]]
 *{mirrors-lithuania}*
 
 In case of problems, please contact the hostmaster `<{mirrors-lithuania-email}>` for this domain.
 
-* {mirrors-lithuania-ftp} (ftp / {mirrors-lithuania-ftp-http}) 
+* {mirrors-lithuania-ftp} (ftp)
 
 [[netherlands]]
 *{mirrors-netherlands}*
 
 In case of problems, please contact the hostmaster `<{mirrors-netherlands-email}>` for this domain.
 
-* {mirrors-netherlands-ftp} (ftp / {mirrors-netherlands-ftp-http} / rsync)
+* {mirrors-netherlands-ftp} (ftp / rsync)
 * {mirrors-netherlands-ftp2} (ftp) 
 
 [[new-zealand]]
 *{mirrors-new-zealand}*
 
-* {mirrors-new-zealand-ftp} (ftp / {mirrors-new-zealand-ftp-http}) 
+* {mirrors-new-zealand-ftp} (ftp)
 
 [[norway]]
 *{mirrors-norway}*
@@ -272,9 +433,9 @@ In case of problems, please contact the hostmaster `<{mirrors-poland-email}>` fo
 
 In case of problems, please contact the hostmaster `<{mirrors-russia-email}>` for this domain.
 
-* {mirrors-russia-ftp} (ftp / {mirrors-russia-ftp-http} / rsync)
-* {mirrors-russia-ftp2} (ftp / {mirrors-russia-ftp2-http} / rsync)
-* {mirrors-russia-ftp5} (ftp / {mirrors-russia-ftp5-http} / rsync)
+* {mirrors-russia-ftp} (ftp / rsync)
+* {mirrors-russia-ftp2} (ftp / rsync)
+* {mirrors-russia-ftp5} (ftp / rsync)
 * {mirrors-russia-ftp6} (ftp) 
 
 [[saudi-arabia]]
@@ -305,7 +466,7 @@ In case of problems, please contact the hostmaster `<{mirrors-south-africa-email
 
 In case of problems, please contact the hostmaster `<{mirrors-spain-email}>` for this domain.
 
-* {mirrors-spain-ftp} (ftp / {mirrors-spain-ftp-http})
+* {mirrors-spain-ftp} (ftp)
 * {mirrors-spain-ftp3} (ftp) 
 
 [[sweden]]
@@ -316,15 +477,15 @@ In case of problems, please contact the hostmaster `<{mirrors-sweden-email}>` fo
 * {mirrors-sweden-ftp} (ftp)
 * {mirrors-sweden-ftp2} (ftp / {mirrors-sweden-ftp2-rsync})
 * {mirrors-sweden-ftp3} (ftp)
-* {mirrors-sweden-ftp4} (ftp / {mirrors-sweden-ftp4v6} / {mirrors-sweden-ftp4-http} / {mirrors-sweden-ftp4-httpv6} / {mirrors-sweden-ftp4-rsync} / {mirrors-sweden-ftp4-rsyncv6})
-* {mirrors-sweden-ftp6} (ftp / {mirrors-sweden-ftp6-http}) 
+* {mirrors-sweden-ftp4} (ftp / {mirrors-sweden-ftp4v6} / {mirrors-sweden-ftp4-rsync} / {mirrors-sweden-ftp4-rsyncv6})
+* {mirrors-sweden-ftp6} (ftp)
 
 [[switzerland]]
 *{mirrors-switzerland}*
 
 In case of problems, please contact the hostmaster `<{mirrors-switzerland-email}>` for this domain.
 
-* {mirrors-switzerland-ftp} (ftp / {mirrors-switzerland-ftp-http}) 
+* {mirrors-switzerland-ftp} (ftp)
 
 [[taiwan]]
 *{mirrors-taiwan}*
@@ -332,13 +493,13 @@ In case of problems, please contact the hostmaster `<{mirrors-switzerland-email}
 In case of problems, please contact the hostmaster `<{mirrors-taiwan-email}>` for this domain.
 
 * {mirrors-taiwan-ftp} (ftp / {mirrors-taiwan-ftpv6} / rsync / rsyncv6)
-* {mirrors-taiwan-ftp2} (ftp / {mirrors-taiwan-ftp2v6} / {mirrors-taiwan-ftp2-http} / {mirrors-taiwan-ftp2-httpv6} / rsync / rsyncv6)
+* {mirrors-taiwan-ftp2} (ftp / {mirrors-taiwan-ftp2v6} / rsync / rsyncv6)
 * {mirrors-taiwan-ftp4} (ftp)
 * {mirrors-taiwan-ftp5} (ftp)
 * {mirrors-taiwan-ftp6} (ftp / {mirrors-taiwan-ftp6v6} / rsync)
 * {mirrors-taiwan-ftp7} (ftp)
 * {mirrors-taiwan-ftp8} (ftp)
-* {mirrors-taiwan-ftp11} (ftp / {mirrors-taiwan-ftp11-http})
+* {mirrors-taiwan-ftp11} (ftp)
 * {mirrors-taiwan-ftp12} (ftp)
 * {mirrors-taiwan-ftp13} (ftp)
 * {mirrors-taiwan-ftp14} (ftp)
@@ -347,8 +508,8 @@ In case of problems, please contact the hostmaster `<{mirrors-taiwan-email}>` fo
 [[ukraine]]
 *{mirrors-ukraine}*
 
-* {mirrors-ukraine-ftp} (ftp / {mirrors-ukraine-ftp-http})
-* {mirrors-ukraine-ftp6} (ftp / {mirrors-ukraine-ftp6-http} / {mirrors-ukraine-ftp6-rsync})
+* {mirrors-ukraine-ftp} (ftp)
+* {mirrors-ukraine-ftp6} (ftp / {mirrors-ukraine-ftp6-rsync})
 * {mirrors-ukraine-ftp7} (ftp) 
 
 [[uk]]
@@ -370,14 +531,14 @@ In case of problems, please contact the hostmaster `<{mirrors-us-email}>` for th
 * {mirrors-us-ftp} (ftp)
 * {mirrors-us-ftp2} (ftp)
 * {mirrors-us-ftp3} (ftp)
-* {mirrors-us-ftp4} (ftp / ftpv6 / {mirrors-us-ftp4-http} / {mirrors-us-ftp4-httpv6})
+* {mirrors-us-ftp4} (ftp / ftpv6)
 * {mirrors-us-ftp5} (ftp)
 * {mirrors-us-ftp6} (ftp)
 * {mirrors-us-ftp8} (ftp)
 * {mirrors-us-ftp10} (ftp)
 * {mirrors-us-ftp11} (ftp)
-* {mirrors-us-ftp13} (ftp / {mirrors-us-ftp13-http} / rsync)
-* {mirrors-us-ftp14} (ftp / {mirrors-us-ftp14-http})
+* {mirrors-us-ftp13} (ftp / rsync)
+* {mirrors-us-ftp14} (ftp)
 * {mirrors-us-ftp15} (ftp) 
 
 [[git]]