Update distro docs to remove dead links

4 files changed, 22 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 5483bd1dc..471748e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2018-07-17  Peter Stephenson  <p.stephenson@samsung.com>
 
+	* Matthew Martin: 43179: Doc/Zsh/contrib.yo,
+	Doc/Zsh/ftp_sites.yo, Doc/Zsh/metafaq.yo: update distro docs to
+	remove dead links.
+
 	* 43176: Doc/Zsh/intro.yo: note right at start of manual that
 	default mode is not POSIX.
 
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index 35ce91575..0c2ba484c 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -847,22 +847,22 @@ In order to do that, you may use the tt(vcs_info) function.
 The following VCSs are supported, showing the abbreviated name by which
 they are referred to within the system:
 startsitem()
-sitem(Bazaar (tt(bzr)))(uref(http://bazaar.canonical.com/))
+sitem(Bazaar (tt(bzr)))(uref(https://bazaar.canonical.com/))
 sitem(Codeville (tt(cdv)))(uref(http://freecode.com/projects/codeville/))
-sitem(Concurrent Versioning System (tt(cvs)))(uref(http://www.nongnu.org/cvs/))
+sitem(Concurrent Versioning System (tt(cvs)))(uref(https://www.nongnu.org/cvs/))
 sitem(Darcs (tt(darcs)))(uref(http://darcs.net/))
-sitem(Fossil (tt(fossil)))(uref(http://fossil-scm.org/))
-sitem(Git (tt(git)))(uref(http://git-scm.com/))
-sitem(GNU arch (tt(tla)))(uref(http://www.gnu.org/software/gnu-arch/))
-sitem(Mercurial (tt(hg)))(uref(http://mercurial.selenic.com/))
-sitem(Monotone (tt(mtn)))(uref(http://monotone.ca/))
-sitem(Perforce (tt(p4)))(uref(http://www.perforce.com/))
-sitem(Subversion (tt(svn)))(uref(http://subversion.apache.org/))
-sitem(SVK (tt(svk)))(uref(http://svk.bestpractical.com/))
+sitem(Fossil (tt(fossil)))(uref(https://fossil-scm.org/))
+sitem(Git (tt(git)))(uref(https://git-scm.com/))
+sitem(GNU arch (tt(tla)))(uref(https://www.gnu.org/software/gnu-arch/))
+sitem(Mercurial (tt(hg)))(uref(https://www.mercurial-scm.org/))
+sitem(Monotone (tt(mtn)))(uref(https://monotone.ca/))
+sitem(Perforce (tt(p4)))(uref(https://www.perforce.com/))
+sitem(Subversion (tt(svn)))(uref(https://subversion.apache.org/))
+sitem(SVK (tt(svk)))(uref(https://svk.bestpractical.com/))
 endsitem()
 
 There is also support for the patch management system tt(quilt)
-(uref(http://savannah.nongnu.org/projects/quilt)). See
+(uref(https://savannah.nongnu.org/projects/quilt)). See
 ifzman(bf(Quilt Support))ifnzman(noderef(vcs_info Quilt Support))
 below for details.
 
diff --git a/Doc/Zsh/ftp_sites.yo b/Doc/Zsh/ftp_sites.yo
deleted file mode 100644
index 804d975f3..000000000
--- a/Doc/Zsh/ftp_sites.yo
+++ /dev/null
@@ -1,15 +0,0 @@
-startitem()
-item(Primary site)(
-nofill(uref(ftp://ftp.zsh.org/pub/)
-uref(http://www.zsh.org/pub/))
-)
-item(Australia)(
-nofill(uref(ftp://ftp.zsh.org/pub/)
-uref(http://www.zsh.org/pub/)
-uref(http://mirror.dejanseo.com.au/pub/zsh/))
-)
-item(Hungary)(
-nofill(uref(ftp://ftp.cs.elte.hu/pub/zsh/)
-uref(http://www.cs.elte.hu/pub/zsh/))
-)
-enditem()
diff --git a/Doc/Zsh/metafaq.yo b/Doc/Zsh/metafaq.yo
index 6cb299ad1..c123a7cea 100644
--- a/Doc/Zsh/metafaq.yo
+++ b/Doc/Zsh/metafaq.yo
@@ -18,17 +18,17 @@ can be contacted at tt(<coordinator@zsh.org>), but matters relating to
 the code should generally go to the mailing list.
 texinode(Availability)(Mailing Lists)(Author)(Introduction)
 sect(Availability)
-Zsh is available from the following anonymous FTP sites.  These mirror
-sites are kept frequently up to date.  The sites marked with em((H)) may be
-mirroring tt(ftp.cs.elte.hu) instead of the primary site.
+Zsh is available from the following HTTP and anonymous FTP site.
 
 cindex(FTP sites for zsh)
 cindex(acquiring zsh by FTP)
 cindex(availability of zsh)
-INCLUDEFILE(Zsh/ftp_sites.yo)\
+nofill(uref(ftp://ftp.zsh.org/pub/)
+uref(https://www.zsh.org/pub/))
+)
 
 The up-to-date source code is available via Git from Sourceforge.  See
-uref(http://sourceforge.net/projects/zsh/) for details.  A summary of
+uref(https://sourceforge.net/projects/zsh/) for details.  A summary of
 instructions for the archive can be found at
 uref(http://zsh.sourceforge.net/).
 
@@ -75,7 +75,7 @@ maintained by Karsten Thygesen tt(<karthy@kom.auc.dk>).
 The mailing lists are archived; the archives can be accessed via the
 administrative addresses listed above.  There is also a hypertext
 archive, maintained by Geoff Wing tt(<gcw@zsh.org>), available at
-uref(http://www.zsh.org/mla/).
+uref(https://www.zsh.org/mla/).
 texinode(The Zsh FAQ)(The Zsh Web Page)(Mailing Lists)(Introduction)
 sect(The Zsh FAQ)
 Zsh has a list of Frequently Asked Questions (FAQ), maintained by
@@ -86,7 +86,7 @@ uref(http://www.zsh.org/FAQ/).  The contact address for FAQ-related matters
 is tt(<faqmaster@zsh.org>).
 texinode(The Zsh Web Page)(The Zsh Userguide)(The Zsh FAQ)(Introduction)
 sect(The Zsh Web Page)
-Zsh has a web page which is located at uref(http://www.zsh.org/).  This is
+Zsh has a web page which is located at uref(https://www.zsh.org/).  This is
 maintained by Karsten Thygesen tt(<karthy@zsh.org>), of SunSITE Denmark.
 The contact address for web-related matters is tt(<webmaster@zsh.org>).
 texinode(The Zsh Userguide)(See Also)(The Zsh Web Page)(Introduction)
@@ -98,7 +98,3 @@ cabbalistic, hierographic, or downright mystifying (for example, the word
 uref(http://zsh.sourceforge.net/Guide/).  At the time of writing, chapters
 dealing with startup files and their contents and the new completion system
 were essentially complete.
-sect(The Zsh Wiki)
-A `wiki' website for zsh has been created at uref(http://www.zshwiki.org/).
-This is a site which can be added to and modified directly by users without
-any special permission.  You can add your own zsh tips and configurations.