--- zsh.texi-2.0.3	Thu Jun 20 00:30:35 1996
+++ zsh.texi	Fri Jun 21 13:26:20 1996
@@ -10,13 +10,13 @@
 @afourpaper
 @end iftex
 
-@set EDITION 2.0.3
+@set EDITION 2.0.4
 @set VERSION 2.6.21
-@set UPDATED 20 June 1996
+@set UPDATED 21 June 1996
 
 @ifinfo
 @noindent
-Edition @value{EDITION}, last updated @value{UPDATED},
+Document Edition @value{EDITION}, last updated @value{UPDATED},
 of @cite{The Z Shell Guide}, for zsh, Version @value{VERSION}.
 
 This is a texinfo version of the man page for the Z Shell, originally by 
@@ -27,13 +27,13 @@
 
 @titlepage
 @title The Z Shell
-@subtitle Edition @value{EDITION} 
+@subtitle Document Edition @value{EDITION} 
 @subtitle @value{UPDATED}
 @author Originally by Paul Falstad
 @page
 @vskip 0pt plus 1filll
 @noindent
-Edition @value{EDITION}, last updated @value{UPDATED},
+Document Edition @value{EDITION}, last updated @value{UPDATED},
 of @cite{The Z Shell Guide}, for zsh, Version @value{VERSION}.
 
 This is a texinfo version of the man page for the Z Shell, originally by 
@@ -169,7 +169,7 @@
 @cindex author
 
 @noindent
-Zsh was originally written by Paul Falstad, @code{pf@@z-code.com}.
+Zsh was originally written by Paul Falstad, @code{pf@@software.com}.
 Programmable completion was implemented by Sven Wischnowsky,
 @code{oberon@@cs.tu-berlin.de} and Peter Stephenson,
 @code{P.Stephenson@@swansea.ac.uk}.  Richard Coleman,
@@ -670,8 +670,8 @@
 In non-interactive shells, or in interactive shells with the
 @code{INTERACTIVE_COMMENTS} option set, a word beginning with the third
 @pindex INTERACTIVE_COMMENTS, use of
-character of the @code{HISTCHARS} parameter (@code{#} by default) causes
-@vindex HISTCHARS, use of
+character of the @code{histchars} parameter (@code{#} by default) causes
+@vindex histchars, use of
 that word and all the following characters up to a newline to be
 ignored.
 
@@ -707,10 +707,10 @@
 preceding it with a @code{\}.  @code{\} followed by a newline is
 ignored.  All characters enclosed between a pair of single quotes
 @ifinfo
-(@code{@'@'}) are quoted, except the first character of @code{HISTCHARS}
+(@code{@'@'}) are quoted, except the first character of @code{histchars}
 @end ifinfo
 @iftex
-(@code{''}) are quoted, except the first character of @code{HISTCHARS}
+(@code{''}) are quoted, except the first character of @code{histchars}
 @end iftex
 (@code{!} by default).  A single quote cannot appear within single
 quotes.  Inside double quotes (@code{""}), parameter and command
@@ -6881,3 +6881,6 @@
 eg. "-f" to @samp, rather than @code.
 v2.0.2. June 13th 1996. Several fixes to Programmable Completion. 
 v2.0.3. June 20th 1996. Updated to include changes from 2.6.20 to 2.6.21.
+v2.0.4. June 21st 1996. Changed occurances of HISTCHARS to histchars.
+Changed mail address for Paul Falstad to pf@software.com.
+'Edition' -> 'Document Edition' to save confusion with zsh version.