mention more standard tags in documentation and fix some typos (12177)

6 files changed, 30 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 996138643..dd320354c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-05  Oliver Kiddle  <opk@zsh.org>
+
+	* 12177: Doc/Zsh/compsys.yo, Completion/Builtins/_unhash,
+	Doc/Zsh/compwid.yo, Doc/Zsh/expn.yo, Doc/Zsh/mod_zutil.yo: add more
+	standard tags to docs and fix typos
+
 2000-07-05  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 12171: Completion/User/_arp: get return status right
diff --git a/Completion/Builtins/_unhash b/Completion/Builtins/_unhash
index a8f366180..927511887 100644
--- a/Completion/Builtins/_unhash
+++ b/Completion/Builtins/_unhash
@@ -7,8 +7,7 @@ _arguments -C -s \
   '(-d -f *)-a[remove aliases]:*:aliases:_aliases' \
   '(-d -a *)-f[remove functions]:*:functions:_functions' \
   '-m[treat arguments as patterns]' \
-  '*:commands: _command_names -e'  && return 0
+  '*:commands: _command_names -e' && return 0
 
-if [[ "$state" = nameddir ]]; then
-  _wanted nameddir expl 'named directory' compadd -k nameddirs
-fi
+[[ "$state" = nameddir ]] &&
+  _wanted named-directories expl 'named directory' compadd -k nameddirs
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 71a8351af..2afd1b4fc 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -516,6 +516,10 @@ item(tt(characters))(
 used for commands like tt(stty) when completing characters; also used
 when completing character classes after a opening bracket
 )
+kindex(colormapids, completion tag)
+item(tt(colormapids))(
+for X colormap ids
+)
 kindex(colors, completion tag)
 item(tt(colors))(
 for color names
@@ -525,6 +529,10 @@ item(tt(commands))(
 for names of external commands and names of sub-commands (used by some 
 commands like tt(cvs))
 )
+kindex(contexts, completion tag)
+item(tt(contexts))(
+for contexts used by the zstyle builtin command
+)
 kindex(corrections, completion tag)
 item(tt(corrections))(
 used by the tt(_approximate) and tt(_correct) completers for the possible
@@ -574,6 +582,10 @@ kindex(extensions, completion tag)
 item(tt(extensions))(
 for X server extensions
 )
+kindex(file-descriptors, completion tag)
+item(tt(file-descriptors))(
+for the numbers of open file descriptors
+)
 kindex(files, completion tag)
 item(tt(files))(
 the generic file-matching tag used by completion functions that can
@@ -748,6 +760,10 @@ item(tt(strings))(
 for strings (e.g. the replacement strings for the tt(cd) builtin
 command)
 )
+kindex(styles, completion tag)
+item(tt(styles))(
+for styles used by the zstyle builtin command
+)
 kindex(tags, completion tag)
 item(tt(tags))(
 for tags (e.g. tt(rpm) tags)
@@ -848,7 +864,7 @@ may also be the string `tt(file)' to make the completer add a space
 only to names of existing files.  Finally, the `true' values and
 `tt(file)' may be combined with `tt(subst)' to keep the completer from 
 adding a space when the resulting words were generated by expanding a
-substitution such as `tt($LPAR()...RPAR())' and `tt(${...})'.
+substitution of the form `tt($LPAR()...RPAR())' or `tt(${...})'.
 
 It is also used by the tt(_prefix) completer as a simple boolean value
 to decide if a space should be inserted before the suffix.
diff --git a/Doc/Zsh/compwid.yo b/Doc/Zsh/compwid.yo
index aa437741b..d4885f098 100644
--- a/Doc/Zsh/compwid.yo
+++ b/Doc/Zsh/compwid.yo
@@ -58,8 +58,8 @@ endmenu()
 texinode(Special Parameters)(Builtin Commands)()(Completion Widgets)
 sect(Special Parameters)
 
-Inside completion widgets, and any functions called from those, some
-parameters have special meaning; outside these function they are not
+Inside completion widgets, and any functions called from them, some
+parameters have special meaning; outside these functions they are not
 special to the shell in any way.  These parameters are used to pass
 information between the completion code and the completion widget. Some of
 the builtin commands and the condition codes use or change the current
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index bb0541800..17a0c1201 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -918,7 +918,7 @@ that this is a scalar, so that (despite the `tt((@))' flag) the subscript
 picks the first character. 
 )
 item(tt("${${(@)foo}[1]}"))(
-The produces the result `tt(bar)'.  In this case, the inner substitution
+This produces the result `tt(bar)'.  In this case, the inner substitution
 tt("${(@)foo}") produces the array `tt(LPAR()bar baz)tt(RPAR())'.  The outer
 substitution tt("${...[1]}") detects that this is an array and picks the
 first word.  This is similar to the simple case tt("${foo[1]}").
diff --git a/Doc/Zsh/mod_zutil.yo b/Doc/Zsh/mod_zutil.yo
index 9d57b28b8..8759fe3c8 100644
--- a/Doc/Zsh/mod_zutil.yo
+++ b/Doc/Zsh/mod_zutil.yo
@@ -123,7 +123,7 @@ many characters.  After all `tt(%)' sequences for the given var(specs)
 have been processed, the resulting string is stored in the parameter
 var(param).
 
-The second form, using the tt(-a) option, can be used for alignin
+The second form, using the tt(-a) option, can be used for aligning
 strings.  Here, the var(specs) are of the form
 `var(left)tt(:)var(right)' where `var(left)' and `var(right)' are
 arbitrary strings.  These strings are modified by replacing the colons