1 files changed, 46 insertions, 15 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()