5 files changed, 34 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 15dc8d771..8b77e5333 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-14  Peter Stephenson  <pws@csr.com>
+
+	* 25278: Doc/Zsh/compctl.yo, Doc/Zsh/compsys.yo,
+	Doc/Zsh/compwid.yo, Doc/Zsh/manual.yo: rename sections in the
+	completion widget manual to avoid confusion with sections
+	elsewhere.
+
 2008-07-11  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* Phil Pennock: 25275: Completion/Base/Utility/_store_cache,
diff --git a/Doc/Zsh/compctl.yo b/Doc/Zsh/compctl.yo
index fdb53227a..b1aed041b 100644
--- a/Doc/Zsh/compctl.yo
+++ b/Doc/Zsh/compctl.yo
@@ -134,7 +134,7 @@ options specified by the tt(-D) flag.
 The form with tt(-M) as the first and only option defines global
 matching specifications (see
 ifzman(zshcompwid)\
-ifnzman(noderef(Matching Control))\
+ifnzman(noderef(Completion Matching Control))\
 ). The match specifications given will be used for every completion
 attempt (only when using tt(compctl), not with the new completion
 system) and are tried in the order in which they are defined until one 
@@ -539,7 +539,7 @@ This defines additional matching control specifications that should be used
 only when testing words for the list of flags this flag appears in. The format
 of the var(match-spec) string is described in 
 ifzman(zshcompwid)\
-ifnzman(noderef(Matching Control))\
+ifnzman(noderef(Completion Matching Control))\
 .
 )
 enditem()
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 78a3135f6..9069df466 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -1956,16 +1956,16 @@ item(tt(matcher))(
 This style is tested separately for each tag valid in the current
 context.  Its value is added to any match specifications given by the 
 tt(matcher-list) style.  It should be in the form described in
-ifzman(the section `Matching Control' in zmanref(zshcompwid))\
-ifnzman(noderef(Matching Control))\
+ifzman(the section `Completion Matching Control' in zmanref(zshcompwid))\
+ifnzman(noderef(Completion Matching Control))\
 .
 )
 kindex(matcher-list, completion style)
 item(tt(matcher-list))(
 This style can be set to a list of match specifications that are to
 be applied everywhere. Match specifications are described in
-ifzman(the section `Matching Control' in zmanref(zshcompwid))\
-ifnzman(noderef(Matching Control))\
+ifzman(the section `Completion Matching Control' in zmanref(zshcompwid))\
+ifnzman(noderef(Completion Matching Control))\
 .
 The completion system will try them one after another for each completer
 selected.  For example, to try first simple completion and, if that
diff --git a/Doc/Zsh/compwid.yo b/Doc/Zsh/compwid.yo
index cbc14715c..05b8ab9b2 100644
--- a/Doc/Zsh/compwid.yo
+++ b/Doc/Zsh/compwid.yo
@@ -48,15 +48,15 @@ and treats the matches in the same manner as the specified builtin
 widget, in this case tt(expand-or-complete).
 
 startmenu()
-menu(Special Parameters)
-menu(Builtin Commands)
-menu(Condition Codes)
-menu(Matching Control)
+menu(Completion Special Parameters)
+menu(Completion Builtin Commands)
+menu(Completion Condition Codes)
+menu(Completion Matching Control)
 menu(Completion Widget Example)
 endmenu()
 
-texinode(Special Parameters)(Builtin Commands)()(Completion Widgets)
-sect(Special Parameters)
+texinode(Completion Special Parameters)(Completion Builtin Commands)()(Completion Widgets)
+sect(Completion Special Parameters)
 
 Inside completion widgets, and any functions called from them, some
 parameters have special meaning; outside these functions they are not
@@ -432,8 +432,8 @@ edited.
 )
 enditem()
 
-texinode(Builtin Commands)(Condition Codes)(Special Parameters)(Completion Widgets)
-sect(Builtin Commands)
+texinode(Completion Builtin Commands)(Completion Condition Codes)(Completion Special Parameters)(Completion Widgets)
+sect(Completion Builtin Commands)
 startitem()
 findex(compadd)
 cindex(completion widgets, adding specified matches)
@@ -634,8 +634,8 @@ into the command line.
 )
 item(tt(-M) var(match-spec))(
 This gives local match specifications as described below in
-noderef(Matching Control). This option may be given more than once. In 
-this case all var(match-spec)s given are concatenated with spaces
+noderef(Completion Matching Control). This option may be given more than once.
+In this case all var(match-spec)s given are concatenated with spaces
 between them to form the specification string to use.
 Note that they will only be used if the tt(-U) option is not given.
 )
@@ -809,8 +809,8 @@ Note that this builtin is defined by the tt(zsh/compctl) module.
 )
 enditem()
 
-texinode(Condition Codes)(Matching Control)(Builtin Commands)(Completion Widgets)
-sect(Condition Codes)
+texinode(Completion Condition Codes)(Completion Matching Control)(Completion Builtin Commands)(Completion Widgets)
+sect(Completion Condition Codes)
 cindex(completion widgets, condition codes)
 
 The following additional condition codes for use within the tt([[ ... ]])
@@ -835,8 +835,8 @@ true if the test for the tt(-N) option with both patterns would succeed.
 )
 enditem()
 
-texinode(Matching Control)(Completion Widget Example)(Condition Codes)(Completion Widgets)
-sect(Matching Control)
+texinode(Completion Matching Control)(Completion Widget Example)(Completion Condition Codes)(Completion Widgets)
+sect(Completion Matching Control)
 
 It is possible by use of the
 tt(-M) option of the tt(compadd) builtin command to specify how the
@@ -848,8 +848,8 @@ the tt(GLOB_COMPLETE) option is set or the tt(pattern_match) of the
 tt(compstate) special association is set to a non-empty string.
 
 The var(match-spec) given as the argument to the tt(-M) option (see
-ifzman(`Builtin Commands' above)\
-ifnzman(noderef(Builtin Commands))\
+ifzman(`Completion Builtin Commands' above)\
+ifnzman(noderef(Completion Builtin Commands))\
 ) consists of one or more matching descriptions separated by
 whitespace.  Each description consists of a letter followed by a colon
 and then the patterns describing which character sequences on the line match
@@ -1096,7 +1096,7 @@ ifnzman(noderef(Completion System))\
 specific contexts by using the tt(matcher) and tt(matcher-list)
 styles. The values for the latter will be used everywhere.
 
-texinode(Completion Widget Example)()(Matching Control)(Completion Widgets)
+texinode(Completion Widget Example)()(Completion Matching Control)(Completion Widgets)
 sect(Completion Widget Example)
 cindex(completion widgets, example)
 
diff --git a/Doc/Zsh/manual.yo b/Doc/Zsh/manual.yo
index ff6ecae41..3895b6a96 100644
--- a/Doc/Zsh/manual.yo
+++ b/Doc/Zsh/manual.yo
@@ -115,10 +115,10 @@ menu(Miscellaneous)
 
 Completion Widgets
 
-menu(Special Parameters)
-menu(Builtin Commands)
-menu(Condition Codes)
-menu(Matching Control)
+menu(Completion Special Parameters)
+menu(Completion Builtin Commands)
+menu(Completion Condition Codes)
+menu(Completion Matching Control)
 menu(Completion Widget Example)
 
 Completion System