zsh-workers/8097

5 files changed, 15 insertions, 15 deletions

diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index d7673d0a1..a42e8123f 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -54,7 +54,7 @@ YODLDOC = $(MAN) zsh.texi
 YODLSRC = zmacros.yo zman.yo ztexi.yo Zsh/arith.yo Zsh/builtins.yo \
 Zsh/compat.yo Zsh/compctl.yo Zsh/compsys.yo Zsh/compwid.yo Zsh/cond.yo \
 Zsh/exec.yo Zsh/expn.yo \
-Zsh/filelist.yo Zsh/files.yo Zsh/func.yo Zsh/grammar.yo Zsh/guide.yo \
+Zsh/filelist.yo Zsh/files.yo Zsh/func.yo Zsh/grammar.yo Zsh/manual.yo \
 Zsh/index.yo Zsh/intro.yo Zsh/invoke.yo Zsh/jobs.yo Zsh/metafaq.yo \
 Zsh/modules.yo Zsh/mod_cap.yo \
 Zsh/mod_clone.yo Zsh/mod_comp1.yo Zsh/mod_compctl.yo Zsh/mod_complist.yo \
diff --git a/Doc/Zsh/guide.yo b/Doc/Zsh/guide.yo
index c9f97fad9..c4691b89d 100644
--- a/Doc/Zsh/guide.yo
+++ b/Doc/Zsh/guide.yo
@@ -1,6 +1,6 @@
 texiifinfo(\
-texinode(Top)(The Z Shell Guide)((dir))((dir))
-texitop(The Z Shell Guide)
+texinode(Top)(The Z Shell Manual)((dir))((dir))
+texitop(The Z Shell Manual)
 This Info file documents Zsh, a freely available UNIX command interpreter
 (shell), which of the standard shells most closely resembles the Korn shell
 (ksh), although it is not completely compatible.
@@ -9,7 +9,7 @@ Version version(), last updated date().
 )\
 
 startmenu()
-menu(The Z Shell Guide)
+menu(The Z Shell Manual)
 menu(Introduction)
 menu(Invocation)
 menu(Files)
@@ -131,26 +131,26 @@ menu(The stat Module)
 menu(The zftp Module)
 menu(The zle Module)
 endmenu()
-texinode(The Z Shell Guide)(Introduction)(Top)(Top)
-chapter(The Z Shell Guide)
+texinode(The Z Shell Manual)(Introduction)(Top)(Top)
+chapter(The Z Shell Manual)
 This document has been produced from the texinfo file tt(zsh.texi),
 included in the tt(Doc) sub-directory of the Zsh distribution.
 sect(Producing documentation from zsh.texi)
 The texinfo source may be converted into several formats:
 
 startitem()
-item(The Info guide)(
+item(The Info manual)(
 The Info format allows searching for topics, commands, functions, etc.
 from the many Indices. The command `tt(makeinfo zsh.texi)' is used to
 produce the Info documentation.
 )
-item(The printed guide)(
+item(The printed manual)(
 The command `tt(texi2dvi zsh.texi)' will output tt(zsh.dvi) which can
 then be processed with bf(dvips) and optionally bf(gs) (Ghostscript) to
-produce a nicely formatted printed guide.
+produce a nicely formatted printed manual.
 )
-item(The HTML guide)(
-An HTML version of this guide is available at the Zsh web site via:
+item(The HTML manual)(
+An HTML version of this manual is available at the Zsh web site via:
 
 tt(http://sunsite.auc.dk/zsh/Doc/index.html).
 
diff --git a/Doc/Zsh/intro.yo b/Doc/Zsh/intro.yo
index b3d4887b1..0e4e1048f 100644
--- a/Doc/Zsh/intro.yo
+++ b/Doc/Zsh/intro.yo
@@ -1,4 +1,4 @@
-texinode(Introduction)(Invocation)(The Z Shell Guide)(Top)
+texinode(Introduction)(Invocation)(The Z Shell Manual)(Top)
 chapter(Introduction)
 ifzman(\
 sect(Synopsis)
diff --git a/Doc/zsh.yo b/Doc/zsh.yo
index d59afff7d..dad958b80 100644
--- a/Doc/zsh.yo
+++ b/Doc/zsh.yo
@@ -21,7 +21,7 @@ NOTRANS(@iftex
 @finalout
 @end iftex)
 texititlepage()
-texititle(The Z Shell Guide)
+texititle(The Z Shell Manual)
 texisubtitle(Version version())
 texisubtitle(Updated date())
 texiauthor(Original documentation by Paul Falstad)
@@ -42,7 +42,7 @@ Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions.
 texiendtitlepage()
 )\
-ifnzman(includefile(Zsh/guide.yo))

+ifnzman(includefile(Zsh/manual.yo))

 includefile(Zsh/intro.yo)

 includefile(Zsh/invoke.yo)

 includefile(Zsh/files.yo)

diff --git a/Doc/ztexi.yo b/Doc/ztexi.yo
index 33535abc4..0ae6100b4 100644
--- a/Doc/ztexi.yo
+++ b/Doc/ztexi.yo
@@ -63,7 +63,7 @@ def(texinfo)(2)(\
   NOTRANS(@ifinfo)NL()\
   NOTRANS(@dircategory Utilities)NL()\
   NOTRANS(@direntry)NL()\
-  NOTRANS(     * ZSH: (zsh).                     The Z Shell Guide.)NL()\
+  NOTRANS(     * ZSH: (zsh).                     The Z Shell Manual.)NL()\
   NOTRANS(@end direntry)NL()\
   NOTRANS(@end ifinfo)NL()\
 )