update URL references to http://zsh.sunsite.dk/ (15792)

2 files changed, 71 insertions, 30 deletions

diff --git a/Doc/Zsh/manual.yo b/Doc/Zsh/manual.yo
index 53176e079..b8c38b48e 100644
--- a/Doc/Zsh/manual.yo
+++ b/Doc/Zsh/manual.yo
@@ -20,19 +20,18 @@ menu(Functions)
 menu(Jobs & Signals)
 menu(Arithmetic Evaluation)
 menu(Conditional Expressions)
-menu(Compatibility)
 menu(Prompt Expansion)
-menu(Restricted Shell)
 menu(Expansion)
 menu(Parameters)
 menu(Options)
 menu(Shell Builtin Commands)
 menu(Zsh Line Editor)
 menu(Completion Widgets)
-menu(Programmable Completion Using compctl)
-menu(Zsh Modules)
 menu(Completion System)
+menu(Completion Using compctl)
+menu(Zsh Modules)
 menu(Zftp Function System)
+menu(User Contributions)
 
  --- Indices ---
 
@@ -41,7 +40,7 @@ menu(Variables Index)
 menu(Options Index)
 menu(Functions Index)
 menu(Editor Functions Index)
-menu(Keystroke Index)
+menu(Style and Tag Index)
 
  --- The Detailed Node Listing ---
 
@@ -52,8 +51,14 @@ menu(Availability)
 menu(Mailing Lists)
 menu(The Zsh FAQ)
 menu(The Zsh Web Page)
+menu(The Zsh Userguide)
 menu(See Also)
 
+Invocation
+
+menu(Compatibility)
+menu(Restricted Shell)
+
 Shell Grammar
 
 menu(Simple Commands & Pipelines)
@@ -86,7 +91,9 @@ menu(Parameters Used By The Shell)
 
 Options
 
+menu(Specifying Options)
 menu(Description of Options)
+menu(Option Aliases)
 menu(Single Letter Options)
 
 Zsh Line Editor
@@ -98,7 +105,24 @@ menu(Arguments)
 menu(Completion)
 menu(Miscellaneous)
 
-Programmable Completion Using compctl
+Completion Widgets
+
+menu(Special Parameters)
+menu(Builtin Commands)
+menu(Condition Codes)
+menu(Matching Control)
+menu(Completion Widget Example)
+
+Completion System
+
+menu(Initialization)
+menu(Completion System Configuration)
+menu(Control Functions)
+menu(Bindable Commands)
+menu(Completion Functions)
+menu(Completion Directories)
+
+Completion Using compctl
 
 menu(Command Flags)
 menu(Option Flags)
@@ -106,16 +130,23 @@ menu(Alternative Completion)
 menu(Extended Completion)
 menu(Example)
 
-Completion Widgets
-
-menu(Special Parameters)
-menu(Builtin Commands)
-menu(Condition Codes)
-menu(Examples)
-
 Zsh Modules
 
 includefile(Zsh/manmodmenu.yo)

+
+Zftp Function System
+
+menu(Installation)
+menu(Zftp Functions)
+menu(Miscellaneous Features)
+
+User Contributions
+
+menu(Utilities)
+menu(Prompt Themes)
+menu(ZLE Functions)
+menu(Other Functions)
+
 endmenu()
 texinode(The Z Shell Manual)(Introduction)(Top)(Top)
 chapter(The Z Shell Manual)
@@ -138,10 +169,10 @@ produce a nicely formatted printed manual.
 item(The HTML manual)(
 An HTML version of this manual is available at the Zsh web site via:
 
-tt(http://sunsite.auc.dk/zsh/Doc/index.html).
+tt(http://zsh.sunsite.dk/Doc/).
 
 (The HTML version is produced with bf(texi2html), which may be obtained
-from tt(http://wwwcn.cern.ch/dci/texi2html/). The command is
+from tt(http://www.mathematik.uni-kl.de/~obachman/Texi2html/). The command is
 `tt(texi2html -split_chapter -expandinfo zsh.texi)'.)
 )
 enditem()
diff --git a/Doc/Zsh/metafaq.yo b/Doc/Zsh/metafaq.yo
index 8dc003090..42c94cc84 100644
--- a/Doc/Zsh/metafaq.yo
+++ b/Doc/Zsh/metafaq.yo
@@ -4,6 +4,7 @@ menu(Availability)
 menu(Mailing Lists)
 menu(The Zsh FAQ)
 menu(The Zsh Web Page)
+menu(The Zsh Userguide)
 menu(See Also)
 endmenu()
 texinode(Author)(Availability)()(Introduction)
@@ -11,7 +12,7 @@ sect(Author)
 cindex(author)
 Zsh was originally written by Paul Falstad tt(<pf@zsh.org>).
 Zsh is now maintained by the members of the zsh-workers mailing
-list tt(<zsh-workers@sunsite.auc.dk>).  The development is currently
+list tt(<zsh-workers@sunsite.dk>).  The development is currently
 coordinated by Peter Stephenson tt(<pws@zsh.org>).  The coordinator
 can be contacted at tt(<coordinator@zsh.org>), but matters relating to
 the code should generally go to the mailing list.
@@ -35,13 +36,13 @@ tt(http://www.zsh.org/pub/zsh/)
 tt(ftp://ftp.ips.gov.au/pub/packages/zsh/)  em((H)))
 )
 item(Denmark)(
-nofill(tt(ftp://sunsite.auc.dk/pub/unix/shells/zsh/))
+nofill(tt(ftp://sunsite.dk/pub/unix/shells/zsh/))
 )
 item(Finland)(
 nofill(tt(ftp://ftp.funet.fi/pub/unix/shells/zsh/))
 )
 item(France)(
-nofill(tt(ftp://ftp.cenatls.cena.dgac.fr/pub/shells/zsh/))
+nofill(tt(ftp://ftp.cenatls.cena.dgac.fr/shells/zsh/))
 )
 item(Germany)(
 nofill(tt(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/)  em((H))
@@ -54,8 +55,8 @@ tt(http://www.cs.elte.hu/pub/zsh/)
 tt(ftp://ftp.kfki.hu/pub/packages/zsh/))
 )
 item(Israel)(
-nofill(tt(ftp://ftp.math.technion.ac.il/mirror/ftp.zsh.org/pub/zsh/)
-tt(http://www.math.technion.ac.il/mirror/ftp.zsh.org/pub/zsh/))
+nofill(tt(ftp://ftp.math.technion.ac.il/pub/zsh/)
+tt(http://www.math.technion.ac.il/pub/zsh/))
 )
 item(Italy)(
 nofill(tt(ftp://ftp.unina.it/pub/Unix/pkgs/shell/zsh/))
@@ -97,14 +98,14 @@ cindex(mailing lists)
 Zsh has 3 mailing lists:
 
 startitem()
-item(tt(<zsh-announce@sunsite.auc.dk>))(
+item(tt(<zsh-announce@sunsite.dk>))(
 Announcements about releases, major changes in the shell and the
 monthly posting of the Zsh FAQ.  (moderated)
 )
-item(tt(<zsh-users@sunsite.auc.dk>))(
+item(tt(<zsh-users@sunsite.dk>))(
 User discussions.
 )
-item(tt(<zsh-workers@sunsite.auc.dk>))(
+item(tt(<zsh-workers@sunsite.dk>))(
 Hacking, development, bug reports and patches.
 )
 enditem()
@@ -113,13 +114,13 @@ To subscribe or unsubscribe, send mail
 to the associated administrative address for the mailing list.
 
 startlist()
-list(tt(<zsh-announce-subscribe@sunsite.auc.dk>))
-list(tt(<zsh-users-subscribe@sunsite.auc.dk>))
-list(tt(<zsh-workers-subscribe@sunsite.auc.dk>))
+list(tt(<zsh-announce-subscribe@sunsite.dk>))
+list(tt(<zsh-users-subscribe@sunsite.dk>))
+list(tt(<zsh-workers-subscribe@sunsite.dk>))
 
-list(tt(<zsh-announce-unsubscribe@sunsite.auc.dk>))
-list(tt(<zsh-users-unsubscribe@sunsite.auc.dk>))
-list(tt(<zsh-workers-unsubscribe@sunsite.auc.dk>))
+list(tt(<zsh-announce-unsubscribe@sunsite.dk>))
+list(tt(<zsh-users-unsubscribe@sunsite.dk>))
+list(tt(<zsh-workers-unsubscribe@sunsite.dk>))
 endlist()
 
 YOU ONLY NEED TO JOIN ONE OF THE MAILING LISTS AS THEY ARE NESTED.
@@ -143,8 +144,17 @@ newsgroup bf(comp.unix.shell) and the bf(zsh-announce) mailing list.
 The latest version can be found at any of the Zsh FTP sites, or at
 tt(http://www.zsh.org/FAQ/).  The contact address for FAQ-related matters
 is tt(<faqmaster@zsh.org>).
-texinode(The Zsh Web Page)(See Also)(The Zsh FAQ)(Introduction)
+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 tt(http://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)
+sect(The Zsh Userguide)
+A userguide is currently in preparation.  It is intended to complement the
+manual, with explanations and hints on issues where the manual can be
+cabbalistic, hierographic, or downright mystifying (for example, the word
+`hierographic' does not exist).  It can be viewed in its current state at
+tt(http://zsh.sunsite.dk/Guide/).  At the time of writing, chapters
+dealing with startup files and their contents and the new completion system
+were essentially complete.