From 405a9158c70e10cb0438aa42a0e25c9aed6e9481 Mon Sep 17 00:00:00 2001 From: Paul Ackersviller Date: Thu, 31 May 2007 04:54:52 +0000 Subject: Merge 22360/22365: support version 2 of Yodl. --- Doc/Zsh/files.yo | 18 ++++++++++++++---- Doc/Zsh/index.yo | 9 +++++---- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Doc/Zsh/files.yo b/Doc/Zsh/files.yo index 92ea66303..658d09e1f 100644 --- a/Doc/Zsh/files.yo +++ b/Doc/Zsh/files.yo @@ -5,26 +5,35 @@ cindex(files, startup) cindex(startup files) cindex(files, shutdown) cindex(shutdown files) +pindex(RCS, use of) +pindex(GLOBAL_RCS, use of) 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. 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 -is unset at any point, any subsequent startup file(s) of the corresponding +is unset at any point, any subsequent startup file+LPAR()s+RPAR() +of the corresponding type will not be read. It is also possible for a file in tt($ZDOTDIR) to re-enable tt(GLOBAL_RCS). Both tt(RCS) and tt(GLOBAL_RCS) are set by default. 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). +cindex(zshrc) Then, if the shell is interactive, commands are read from tt(/etc/zshrc) and then tt($ZDOTDIR/.zshrc). +cindex(zlogin) Finally, if the shell is a login shell, tt(/etc/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 via the tt(exit) or tt(logout) commands, or an implicit exit by reading @@ -35,6 +44,7 @@ Note also that the tt(RCS) option affects the saving of history files, i.e. if tt(RCS) is unset when the shell exits, no history file will be saved. +vindex(HOME, use of) 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. @@ -47,12 +57,12 @@ be executed when zsh is invoked with the `tt(-f)' option. ifnzman(includefile(Zsh/filelist.yo)) Any of these files may be pre-compiled with the tt(zcompile) builtin -command ( +command (\ ifzman(\ -see zmanref(zshbuiltins) +see zmanref(zshbuiltins)\ )\ ifnzman(\ -noderef(Shell Builtin Commands) +noderef(Shell Builtin Commands)\ )\ ). If a compiled file exists (named for the original file plus the tt(.zwc) extension) and it is newer than the original file, the compiled diff --git a/Doc/Zsh/index.yo b/Doc/Zsh/index.yo index 7afa14d07..191e0f2f9 100644 --- a/Doc/Zsh/index.yo +++ b/Doc/Zsh/index.yo @@ -1,6 +1,7 @@ ifztexi(\ def(printindex)(2)(\ - NOTRANS(@unnumbered) ARG1NL()\ + texipage()NL()\ + NOTRANS(@unnumbered) ARG1+NL()\ NL()\ NOTRANS(@printindex) ARG2\ )\ @@ -16,9 +17,9 @@ printindex(Options Index)(pg) texinode(Functions Index)(Editor Functions Index)(Options Index)(Top) printindex(Functions Index)(fn) -texinode(Editor Functions Index)(Keystroke Index)(Functions Index)(Top) +texinode(Editor Functions Index)(Style and Tag Index)(Functions Index)(Top) printindex(Editor Functions Index)(tp) -texinode(Keystroke Index)()(Editor Functions Index)(Top) -printindex(Keystroke Index)(ky) +texinode(Style and Tag Index)()(Editor Functions Index)(Top) +printindex(Style and Tag Index)(ky) )\ -- cgit 1.4.1