Re: Bug#466596: zsh: Incorrect paths for initialization scripts in manual page

[Clint Adams <schizo@xxxxxxxxxx>]

[-workers: just for reference]

On Tue, Feb 19, 2008 at 11:19:22PM +0200, Jarmo Jaakkola wrote:
> The manual page zsh(1) tells that the initialization scripts used by the
> shell are in /etc (e.g. zprofile, zshrc).  Instead, they are in
> /etc/zsh.

diff --git a/Doc/Zsh/filelist.yo b/Doc/Zsh/filelist.yo
index f6e3d9d..08245ab 100644
--- a/Doc/Zsh/filelist.yo
+++ b/Doc/Zsh/filelist.yo
@@ -7,9 +7,9 @@ list(tt($ZDOTDIR/.zshrc))
 list(tt($ZDOTDIR/.zlogin))
 list(tt($ZDOTDIR/.zlogout))
 list(tt(${TMPPREFIX}*)   (default is /tmp/zsh*))
-list(tt(/etc/zshenv))
-list(tt(/etc/zprofile))
-list(tt(/etc/zshrc))
-list(tt(/etc/zlogin))
-list(tt(/etc/zlogout)    (installation-specific - tt(/etc) is the default))
+list(tt(/etc/zsh/zshenv))
+list(tt(/etc/zsh/zprofile))
+list(tt(/etc/zsh/zshrc))
+list(tt(/etc/zsh/zlogin))
+list(tt(/etc/zsh/zlogout)    (installation-specific - tt(/etc/zsh) is the Debian default))
 endlist()
diff --git a/Doc/Zsh/files.yo b/Doc/Zsh/files.yo
index 658d09e..d3f561f 100644
--- a/Doc/Zsh/files.yo
+++ b/Doc/Zsh/files.yo
@@ -11,7 +11,7 @@ pindex(NO_RCS, use of)
 pindex(NO_GLOBAL_RCS, use of)
 vindex(ZDOTDIR, use of)
 cindex(zshenv)
-Commands are first read from tt(/etc/zshenv); this cannot be overridden.
+Commands are first read from tt(/etc/zsh/zshenv); this cannot be overridden.
 Subsequent behaviour is modified by the tt(RCS) and
 tt(GLOBAL_RCS) options; the former affects all startup files, while the
 second only affects those in the tt(/etc) directory.  If one of the options
@@ -25,17 +25,17 @@ Commands are then read from tt($ZDOTDIR/.zshenv).
 pindex(LOGIN, use of)
 cindex(zprofile)
 If the shell is a login shell, commands
-are read from tt(/etc/zprofile) and then tt($ZDOTDIR/.zprofile).
+are read from tt(/etc/zsh/zprofile) and then tt($ZDOTDIR/.zprofile).
 cindex(zshrc)
 Then, if the shell is interactive,
-commands are read from tt(/etc/zshrc) and then tt($ZDOTDIR/.zshrc).
+commands are read from tt(/etc/zsh/zshrc) and then tt($ZDOTDIR/.zshrc).
 cindex(zlogin)
-Finally, if the shell is a login shell, tt(/etc/zlogin) and
+Finally, if the shell is a login shell, tt(/etc/zsh/zlogin) and
 tt($ZDOTDIR/.zlogin) are read.
 
 cindex(zlogout)
 When a login shell exits, the files tt($ZDOTDIR/.zlogout) and then
-tt(/etc/zlogout) are read.  This happens with either an explicit exit
+tt(/etc/zsh/zlogout) are read.  This happens with either an explicit exit
 via the tt(exit) or tt(logout) commands, or an implicit exit by reading
 end-of-file from the terminal.  However, if the shell terminates due
 to tt(exec)'ing another process, the logout files are not read.
@@ -49,7 +49,7 @@ If tt(ZDOTDIR) is unset, tt(HOME) is used instead.
 Those files listed above as being in tt(/etc) may be in another
 directory, depending on the installation.
 
-As tt(/etc/zshenv) is run for all instances of zsh, it is important that
+As tt(/etc/zsh/zshenv) is run for all instances of zsh, it is important that
 it be kept as small as possible.  In particular, it is a good idea to
 put code that does not need to be run for every single shell behind
 a test of the form `tt(if [[ -o rcs ]]; then ...)' so that it will not
diff --git a/Doc/Zsh/mod_newuser.yo b/Doc/Zsh/mod_newuser.yo
index 8c37c70..558a242 100644
--- a/Doc/Zsh/mod_newuser.yo
+++ b/Doc/Zsh/mod_newuser.yo
@@ -5,7 +5,7 @@ The tt(zsh/newuser) module is loaded at boot if it is
 available, the tt(RCS) option is set, and the tt(PRIVILEGED) option is not
 set (all three are true by default).  This takes
 place immediately after commands in the global tt(zshenv) file (typically
-tt(/etc/zshenv)), if any, have been executed.  If the module is not
+tt(/etc/zsh/zshenv)), if any, have been executed.  If the module is not
 available it is silently ignored by the shell; the module may safely be
 removed from tt($MODULE_PATH) by the administrator if it is not required.
 
@@ -34,7 +34,7 @@ files for the user, however any valid shell code will be executed.
 The tt(zsh/newuser) module is then unconditionally unloaded.
 
 Note that it is possible to achieve exactly the same effect as the
-tt(zsh/newuser) module by adding code to tt(/etc/zshenv).  The module
+tt(zsh/newuser) module by adding code to tt(/etc/zsh/zshenv).  The module
 exists simply to allow the shell to make arrangements for new users without
 the need for intervention by package maintainers and system administrators.
 
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index 32ec48d..a8b2872 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -718,19 +718,19 @@ pindex(GLOBAL_RCS)
 cindex(startup files, global, inhibiting)
 cindex(files, global startup, inhibiting)
 item(tt(GLOBAL_RCS) (tt(-d)) <D>)(
-If this option is unset, the startup files tt(/etc/zprofile),
-tt(/etc/zshrc), tt(/etc/zlogin) and tt(/etc/zlogout) will not be run.  It
+If this option is unset, the startup files tt(/etc/zsh/zprofile),
+tt(/etc/zsh/zshrc), tt(/etc/zsh/zlogin) and tt(/etc/zsh/zlogout) will not be run.  It
 can be disabled and re-enabled at any time, including inside local startup
 files (tt(.zshrc), etc.).
 )
 pindex(RCS)
 cindex(startup files, sourcing)
 item(tt(RCS) (tt(PLUS()f)) <D>)(
-After tt(/etc/zshenv) is sourced on startup, source the
-tt(.zshenv), tt(/etc/zprofile), tt(.zprofile),
-tt(/etc/zshrc), tt(.zshrc), tt(/etc/zlogin), tt(.zlogin), and tt(.zlogout)
+After tt(/etc/zsh/zshenv) is sourced on startup, source the
+tt(.zshenv), tt(/etc/zsh/zprofile), tt(.zprofile),
+tt(/etc/zsh/zshrc), tt(.zshrc), tt(/etc/zsh/zlogin), tt(.zlogin), and tt(.zlogout)
 files, as described in noderef(Files).
-If this option is unset, the tt(/etc/zshenv) file is still sourced, but any
+If this option is unset, the tt(/etc/zsh/zshenv) file is still sourced, but any
 of the others will not be; it can be set at any time to prevent the
 remaining startup files after the currently executing one from
 being sourced.