29114: use same FTP sites list in FAQ and META-FAQ.

6 files changed, 48 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index 9cd622513..d1cf373e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-04-30  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* 29114: Doc/Makefile.in, Doc/Zsh/.distfiles,
+	Doc/Zsh/ftp_sites.yo, Doc/Zsh/metafaq.yo, Etc/FAQ.yo: Use same
+	FTP sites list in META-FAQ as FAQ.
+
 	* İsmail Dönmez: 29020: Completion/openSUSE/Command/_SuSEconfig,
 	Completion/openSUSE/Command/_hwinfo,
 	Completion/openSUSE/Command/_osc,
@@ -14543,5 +14547,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5267 $
+* $Revision: 1.5268 $
 *****************************************************
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index 3374ea705..f7f5915c1 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -73,7 +73,8 @@ YODLSRC = zmacros.yo zman.yo ztexi.yo Zsh/arith.yo Zsh/builtins.yo \
 Zsh/calsys.yo \
 Zsh/compat.yo Zsh/compctl.yo Zsh/compsys.yo Zsh/compwid.yo Zsh/cond.yo \
 Zsh/contrib.yo Zsh/exec.yo Zsh/expn.yo \
-Zsh/filelist.yo Zsh/files.yo Zsh/func.yo Zsh/grammar.yo Zsh/manual.yo \
+Zsh/filelist.yo Zsh/files.yo Zsh/ftp_sites.yo \
+Zsh/func.yo Zsh/grammar.yo Zsh/manual.yo \
 Zsh/index.yo Zsh/intro.yo Zsh/invoke.yo Zsh/jobs.yo Zsh/metafaq.yo \
 Zsh/modules.yo Zsh/modlist.yo Zsh/modmenu.yo Zsh/manmodmenu.yo $(MODDOCSRC) \
 Zsh/options.yo Zsh/params.yo Zsh/prompt.yo Zsh/redirect.yo Zsh/restricted.yo \
@@ -161,9 +162,9 @@ zshall.1: zsh.yo
 	    $(YODL) -I$(sdir) -DZSHALL -w zman.yo version.yo zsh.yo | sed -e '1s/\\-/-/g' -e '/^\.'\''/d' > $$target \
 	;; esac; \
 
-../META-FAQ: META-FAQ.yo Zsh/metafaq.yo
+../META-FAQ: META-FAQ.yo Zsh/metafaq.yo Zsh/ftp_sites.yo
 	case '$(YODL)' in :*) touch $(sdir_top)/META-FAQ ;; *) \
-	    $(YODL) -I$(sdir) META-FAQ.yo | sed -e '/NEXTLINE/N' -e '/DELLINE/d' -e '/^SECTHEAD$$/{N;s/^SECTHEAD.//;h;s/./-/g;H;g;}' -e 's/  *$$//' > $(sdir_top)/META-FAQ \
+	    $(YODL) -I$(sdir) META-FAQ.yo | sed -e '/NEXTLINE/N' -e '/DELLINE/d' -e '/^SECTHEAD$$/{N;s/^SECTHEAD.//;h;s/./-/g;H;g;}' -e 's/  *$$//' -e '/comment(.*)/d' > $(sdir_top)/META-FAQ \
 	;; esac
 
 $(YODLDOC): version.yo
@@ -176,7 +177,8 @@ man: $(MAN)
 $(MAN): zmacros.yo zman.yo
 
 zsh.1 zshall.1: Zsh/intro.yo Zsh/metafaq.yo Zsh/invoke.yo Zsh/files.yo \
-                Zsh/filelist.yo Zsh/filelist.yo Zsh/seealso.yo
+                Zsh/filelist.yo Zsh/filelist.yo Zsh/seealso.yo \
+                Zsh/ftp_sites.yo
 
 zshbuiltins.1: Zsh/builtins.yo
 
diff --git a/Doc/Zsh/.distfiles b/Doc/Zsh/.distfiles
index dcca24e07..4f521e91c 100644
--- a/Doc/Zsh/.distfiles
+++ b/Doc/Zsh/.distfiles
@@ -14,6 +14,7 @@ exec.yo
 expn.yo
 filelist.yo
 files.yo
+ftp_sites.yo
 func.yo
 grammar.yo
 index.yo
diff --git a/Doc/Zsh/ftp_sites.yo b/Doc/Zsh/ftp_sites.yo
new file mode 100644
index 000000000..3ed675ab1
--- /dev/null
+++ b/Doc/Zsh/ftp_sites.yo
@@ -0,0 +1,28 @@
+startitem()
+item(Primary site)(
+nofill(tt(ftp://ftp.zsh.org/pub/)
+tt(http://www.zsh.org/pub/))
+)
+item(Australia)(
+nofill(tt(ftp://ftp.zsh.org/pub/)
+tt(http://www.zsh.org/pub/))
+)
+item(Denmark)(
+nofill(tt(ftp://mirrors.dotsrc.org/zsh/))
+)
+item(Finland)(
+nofill(tt(ftp://ftp.funet.fi/pub/unix/shells/zsh/))
+)
+item(France)(
+nofill(tt(ftp://nephtys.lip6.fr/pub/unix/shells/zsh/))
+)
+item(Germany)(
+nofill(tt(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/))
+)
+item(Hungary)(
+nofill(tt(ftp://ftp.kfki.hu/pub/packages/zsh/))
+)
+item(Poland)(
+nofill(tt(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/))
+)
+enditem()
diff --git a/Doc/Zsh/metafaq.yo b/Doc/Zsh/metafaq.yo
index de7edfeba..34cd70e32 100644
--- a/Doc/Zsh/metafaq.yo
+++ b/Doc/Zsh/metafaq.yo
@@ -25,34 +25,7 @@ mirroring tt(ftp.cs.elte.hu) instead of the primary site.
 cindex(FTP sites for zsh)
 cindex(acquiring zsh by FTP)
 cindex(availability of zsh)
-startitem()
-item(Primary site)(
-nofill(tt(ftp://ftp.zsh.org/pub/)
-tt(http://www.zsh.org/pub/))
-)
-item(Australia)(
-nofill(tt(ftp://ftp.zsh.org/pub/)
-tt(http://www.zsh.org/pub/))
-)
-item(Denmark)(
-nofill(tt(ftp://mirrors.dotsrc.org/zsh/))
-)
-item(Finland)(
-nofill(tt(ftp://ftp.funet.fi/pub/unix/shells/zsh/))
-)
-item(France)(
-nofill(tt(ftp://nephtys.lip6.fr/pub/unix/shells/zsh/))
-)
-item(Germany)(
-nofill(tt(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/))
-)
-item(Hungary)(
-nofill(tt(ftp://ftp.kfki.hu/pub/packages/zsh/))
-)
-item(Poland)(
-nofill(tt(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/))
-)
-enditem()
+INCLUDEFILE(Zsh/ftp_sites.yo)\
 
 The up-to-date source code is available via anonymous CVS and Git from
 Sourceforge.  See tt(http://sourceforge.net/projects/zsh/) for details.
diff --git a/Etc/FAQ.yo b/Etc/FAQ.yo
index 3663a68b8..3c7bdfbc2 100644
--- a/Etc/FAQ.yo
+++ b/Etc/FAQ.yo
@@ -42,7 +42,12 @@ whenhtml(report(ARG1)(ARG2)(ARG3))\
 whenlatex(report(ARG1)(ARG2)(ARG3))\
 whenman(report(ARG1)(ARG2)(ARG3))\
 whenms(report(ARG1)(ARG2)(ARG3))\
-whensgml(report(ARG1)(ARG2)(ARG3)))
+whensgml(report(ARG1)(ARG2)(ARG3)))\
+def(startitem)(0)() \
+def(enditem)(0)()\
+def(item)(2)(
+ARG1: ARG2)\
+def(nofill)(1)(ARG1)
 myreport(Z-Shell Frequently-Asked Questions)(Peter Stephenson)(2010/02/15)
 COMMENT(-- the following are for Usenet and must appear first)\
 description(\
@@ -334,25 +339,7 @@ label(16)
   the shell.  The following list also appears on the WWW at
   url(http://www.zsh.org/)(http://www.zsh.org/) .
 
-  description(
-    mydit(Home site) url(ftp://ftp.zsh.org/pub/)(ftp://ftp.zsh.org/pub/)
-    mydit()          (also url(http://www.zsh.org/pub/)
-(http://www.zsh.org/pub/))
-    mydit(Denmark)   url(ftp://mirrors.dotsrc.org/zsh/)
-(ftp://mirrors.dotsrc.org/zsh/)
-    mydit()          (also url(http://mirrors.dotsrc.org/zsh/)
-(http://mirrors.dotsrc.org/zsh/))
-    mydit(Finland)   url(ftp://ftp.funet.fi/pub/unix/shells/zsh/)
-(ftp://ftp.funet.fi/pub/unix/shells/zsh/)
-    mydit(France)    url(ftp://nephtys.lip6.fr/pub/unix/shells/zsh/)
-(ftp://nephtys.lip6.fr/pub/unix/shells/zsh/)
-    mydit(Germany)   url(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/)
-(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/)
-    mydit(Hungary)   url(ftp://ftp.kfki.hu/pub/packages/zsh/)
-(ftp://ftp.kfki.hu/pub/packages/zsh/)
-    mydit(Poland)    url(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/)
-(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/)
-  )
+includefile(../Doc/Zsh/ftp_sites.yo)
 
   A Windows port was created by Amol Deshpandem based on 3.0.5 (which
   is now rather old).  This has now been restored and can be found at