3 files changed, 8 insertions, 7 deletions
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 7ae67773b..06b08cc72 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -89,9 +89,9 @@ menu(Initialization)
 menu(Completion System Configuration)
 menu(Control Functions)
 menu(Bindable Commands)
-menu(Completion Functions)
-menu(Completion Directories)
+menu(Utility Functions)
 menu(Completion System Variables)
+menu(Completion Directories)
 endmenu()
 
 texinode(Initialization)(Completion System Configuration)()(Completion System)
@@ -3363,7 +3363,7 @@ endsitem()
 )
 enditem()
 
-texinode(Bindable Commands)(Completion Functions)(Control Functions)(Completion System)
+texinode(Bindable Commands)(Utility Functions)(Control Functions)(Completion System)
 sect(Bindable Commands)
 cindex(completion system, bindable commands)
 
@@ -3562,7 +3562,7 @@ emacs and vi respectively.
 )
 enditem()
 
-texinode(Completion Functions)(Completion System Variables)(Bindable Commands)(Completion System)
+texinode(Utility Functions)(Completion System Variables)(Bindable Commands)(Completion System)
 sect(Utility Functions)
 cindex(completion system, utility functions)
 
@@ -5481,7 +5481,7 @@ ifnzman(noderef(The zsh/zleparameter Module)).
 )
 enditem()
 
-texinode(Completion System Variables)(Completion Directories)(Completion Functions)(Completion System)
+texinode(Completion System Variables)(Completion Directories)(Utility Functions)(Completion System)
 sect(Completion System Variables)
 cindex(completion system, variables)
 
diff --git a/Doc/Zsh/index.yo b/Doc/Zsh/index.yo
index 191e0f2f9..131d7a4f2 100644
--- a/Doc/Zsh/index.yo
+++ b/Doc/Zsh/index.yo
@@ -5,7 +5,7 @@ def(printindex)(2)(\
   NL()\
   NOTRANS(@printindex) ARG2\
 )\
-texinode(Concept Index)(Variables Index)(Top)(Top)
+texinode(Concept Index)(Variables Index)()(Top)
 printindex(Concept Index)(cp)
 
 texinode(Variables Index)(Options Index)(Concept Index)(Top)
diff --git a/Doc/Zsh/manual.yo b/Doc/Zsh/manual.yo
index dc4d6ed07..e54dd077c 100644
--- a/Doc/Zsh/manual.yo
+++ b/Doc/Zsh/manual.yo
@@ -126,7 +126,8 @@ menu(Initialization)
 menu(Completion System Configuration)
 menu(Control Functions)
 menu(Bindable Commands)
-menu(Completion Functions)
+menu(Utility Functions)
+menu(Completion System Variables)
 menu(Completion Directories)
 
 Completion Using compctl