11012: Rearrange menus to match section rearragement in 11008.

2 files changed, 13 insertions, 10 deletions

diff --git a/Doc/Zsh/intro.yo b/Doc/Zsh/intro.yo
index ebb678f70..95affd9b7 100644
--- a/Doc/Zsh/intro.yo
+++ b/Doc/Zsh/intro.yo
@@ -1,4 +1,4 @@
-texinode(Introduction)(Invocation)(The Z Shell Guide)(Top)
+texinode(Introduction)(Invocation)(The Z Shell Manual)(Top)
 chapter(Introduction)
 ifzman(\
 sect(Synopsis)
@@ -20,8 +20,11 @@ list(em(zshparam)     Zsh parameters)
 list(em(zshoptions)   Zsh options)
 list(em(zshbuiltins)  Zsh built-in functions)
 list(em(zshzle)       Zsh command line editing)
+list(em(zshcompwid)   Zsh completion widgets)
+list(em(zshcompsys)   Zsh completion system)
 list(em(zshcompctl)   Zsh completion control)
 list(em(zshmodules)   Zsh loadable modules)
+list(em(zshzftpsys)   Zsh built-in FTP client)
 ifzshone(\
 list(em(zshall)       Meta-man page containing all of the above)
 )\
diff --git a/Doc/Zsh/manual.yo b/Doc/Zsh/manual.yo
index a19161038..e6b098024 100644
--- a/Doc/Zsh/manual.yo
+++ b/Doc/Zsh/manual.yo
@@ -28,9 +28,9 @@ menu(Parameters)
 menu(Options)
 menu(Shell Builtin Commands)
 menu(Zsh Line Editor)
-menu(Completion Using compctl)
 menu(Completion Widgets)
 menu(Completion System)
+menu(Completion Using compctl)
 menu(Zsh Modules)
 menu(Zftp Function System)
 
@@ -98,14 +98,6 @@ menu(Arguments)
 menu(Completion)
 menu(Miscellaneous)
 
-Completion Using compctl
-
-menu(Command Flags)
-menu(Option Flags)
-menu(Alternative Completion)
-menu(Extended Completion)
-menu(Example)
-
 Completion Widgets
 
 menu(Special Parameters)
@@ -122,6 +114,14 @@ menu(Bindable Commands)
 menu(Completion Functions)
 menu(Completion Directories)
 
+Completion Using compctl
+
+menu(Command Flags)
+menu(Option Flags)
+menu(Alternative Completion)
+menu(Extended Completion)
+menu(Example)
+
 Zsh Modules
 
 includefile(Zsh/manmodmenu.yo)