7 files changed, 21 insertions, 7 deletions
diff --git a/Doc/Zsh/compctl.yo b/Doc/Zsh/compctl.yo
index f25ddda98..cee73c897 100644
--- a/Doc/Zsh/compctl.yo
+++ b/Doc/Zsh/compctl.yo
@@ -1,4 +1,4 @@
-texinode(Completion Using compctl)(Completion Widgets)(Zsh Line Editor)(Top)
+texinode(Completion Using compctl)(Zsh Modules)(Completion System)(Top)
 chapter(Completion Using compctl)
 cindex(completion, programmable)
 cindex(completion, controlling)
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 1e077d8ad..d8b83a6f8 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -1,4 +1,4 @@
-texinode(Completion System)(Zsh Modules)(Completion Widgets)(Top)
+texinode(Completion System)(Completion Using compctl)(Completion Widgets)(Top)
 chapter(Completion System)
 cindex(completion system)
 cindex(completion, programmable)
@@ -202,6 +202,18 @@ after it.  The tt(#compdef) tags use the tt(compdef) function described
 below; the main difference is that the name of the function is supplied
 implicitly.
 
+Note also that the functions for the completion system assume that the
+tt(KSH_AUTOLOAD) option is not set, they can't be loaded when it is
+set. But when you can't or don't want to unset tt(KSH_AUTOLOAD) and
+still want to use the completion system, you can simply use one or
+more tt(zwc) file(s) created with the tt(zcompile) builtin command
+with the tt(-z) option to load the functions for the completion system 
+from (see
+ifzman(zmanref(zshbuiltins))\
+ifnzman(noderef(Shell Builtin Commands))\
+). This forces the functions to be autoloaded the way zsh normally
+loads functions.
+
 subsect(Functions)
 
 The tt(compinit) file defines the following function, which may
diff --git a/Doc/Zsh/compwid.yo b/Doc/Zsh/compwid.yo
index 007f23431..c2f70ce60 100644
--- a/Doc/Zsh/compwid.yo
+++ b/Doc/Zsh/compwid.yo
@@ -1,4 +1,4 @@
-texinode(Completion Widgets)(Completion System)(Completion Using compctl)(Top)
+texinode(Completion Widgets)(Completion System)(Zsh Line Editor)(Top)
 chapter(Completion Widgets)
 cindex(completion, widgets)
 cindex(completion, programmable)
diff --git a/Doc/Zsh/modules.yo b/Doc/Zsh/modules.yo
index e74a94aed..828b97d37 100644
--- a/Doc/Zsh/modules.yo
+++ b/Doc/Zsh/modules.yo
@@ -1,4 +1,4 @@
-texinode(Zsh Modules)(Zftp Function System)(Completion System)(Top)
+texinode(Zsh Modules)(Zftp Function System)(Completion Using compctl)(Top)
 chapter(Zsh Modules)
 cindex(modules)
 sect(Description)
diff --git a/Doc/Zsh/seealso.yo b/Doc/Zsh/seealso.yo
index 8289e6628..3c7e8910f 100644
--- a/Doc/Zsh/seealso.yo
+++ b/Doc/Zsh/seealso.yo
@@ -9,6 +9,8 @@ manref(ksh)(1)\
 ifzshone(\
 ,
 zmanref(zshbuiltins),
+zmanref(zshcompwid),
+zmanref(zshcompsys),
 zmanref(zshcompctl),
 zmanref(zshexpn),
 zmanref(zshmisc),
diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo
index 0bc857cfb..31eb4dec9 100644
--- a/Doc/Zsh/zle.yo
+++ b/Doc/Zsh/zle.yo
@@ -1,4 +1,4 @@
-texinode(Zsh Line Editor)(Completion Using compctl)(Shell Builtin Commands)(Top)
+texinode(Zsh Line Editor)(Completion Widgets)(Shell Builtin Commands)(Top)
 chapter(Zsh Line Editor)
 cindex(line editor)
 cindex(editor, line)
diff --git a/Doc/zsh.yo b/Doc/zsh.yo
index 3d39a41c0..c3e3c6409 100644
--- a/Doc/zsh.yo
+++ b/Doc/zsh.yo
@@ -61,9 +61,9 @@ ifnzman(includefile(Zsh/params.yo))
 ifnzman(includefile(Zsh/options.yo))
 ifnzman(includefile(Zsh/builtins.yo))
 ifnzman(includefile(Zsh/zle.yo))
-ifnzman(includefile(Zsh/compctl.yo))
 ifnzman(includefile(Zsh/compwid.yo))
 ifnzman(includefile(Zsh/compsys.yo))
+ifnzman(includefile(Zsh/compctl.yo))
 ifnzman(includefile(Zsh/modules.yo))
 ifnzman(includefile(Zsh/zftpsys.yo))
 ifzshall(\
@@ -75,9 +75,9 @@ source(zshparam)
 source(zshoptions)
 source(zshbuiltins)
 source(zshzle)
-source(zshcompctl)
 source(zshcompwid)
 source(zshcompsys)
+source(zshcompctl)
 source(zshmodules)
 source(zshzftpsys)
 manpage(ZSHALL)(1)(date())(zsh version())