[5261] texinfo.txi (Preparing for @TeX{}): wording

[karl]

Revision: 5261
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5261
Author:   karl
Date:     2013-06-07 23:47:36 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
texinfo.txi (Preparing for @TeX{}): wording

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.txi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-06-07 16:38:26 UTC (rev 5260)
+++ trunk/ChangeLog     2013-06-07 23:47:36 UTC (rev 5261)
@@ -1,14 +1,18 @@
+2013-06-07  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Preparing for @TeX{}): texinfo.cnf
+       is a "configuration" file, other wording tweaks.
+
 2013-06-07  Sergey Poznyakoff  <address@hidden>
 
         Handle "index" tag.
-
         * info/tag.c (tags_expand): Accept NULL handler as a no-op.
         (tagtab): Add an entry for "index".
 
 2013-04-29  Stefano Lattarini  <address@hidden>  (tiny change)
 
        * tp/Makefile.am,
-       * tp/tests/Makefile.am: prefer $(MKDIR_P) to $(mkdir_p).
+       * tp/tests/Makefile.am: use $(MKDIR_P) instead of $(mkdir_p).
 
 2013-04-16  Sergey Poznyakoff  <address@hidden>
 

Modified: trunk/doc/texinfo.txi
===================================================================
--- trunk/doc/texinfo.txi       2013-06-07 16:38:26 UTC (rev 5260)
+++ trunk/doc/texinfo.txi       2013-06-07 23:47:36 UTC (rev 5261)
@@ -9861,7 +9861,7 @@
 @address@hidden, @address@hidden
 @address@hidden, @address@hidden,
 @address@hidden and @address@hidden, for every
-file found.  Als, @address@hidden is included verbatim, if
+file found.  Also, @address@hidden is included verbatim, if
 present.
 
 @item
@@ -14537,7 +14537,7 @@
 @example
 @@ifset txicommandconditionals
 @@ifcommandnotdefined foobarnode
-(Good, @@foobarnode is not defined.)
+(Good, @samp{@@foobarnode} is not defined.)
 @@end ifcommandnotdefined
 @@end ifset
 @end example
@@ -14549,9 +14549,9 @@
 We recommend avoiding these tests whenever possible---which is usually
 the case.  For many software packages, it is reasonable for all
 developers to have a given version of Texinfo (or newer) installed,
-and thus no reason to worry about older versions.  (It is simple to
-download and install the Texinfo source; it does not have any
-problematic dependencies.)
+and thus no reason to worry about older versions.  (It is
+straightforward for anyone to download and install the Texinfo source;
+it does not have any problematic dependencies.)
 
 The issue of Texinfo versions does not generally arise for end-users.
 With properly distributed packages, users need not process the Texinfo
@@ -16363,16 +16363,15 @@
 @pindex texinfo.cnf @r{installation}
 @cindex Customizing of @TeX{} for Texinfo
 @cindex Site-wide Texinfo configuration file
-Optionally, you may create an additional @file{texinfo.cnf}, and
-install it as well.  This file is read by @TeX{} when the
address@hidden@@setfilename} command is executed
-(@address@hidden@@setfilename}}).  You can put any commands you like
-there, according to local site-wide conventions.  They will be read by
address@hidden when processing any Texinfo document.  For example, if
address@hidden contains the line @samp{@@afourpaper} (@pxref{A4
-Paper}), then all Texinfo documents will be processed with that page
-size in effect.  If you have nothing to put in @file{texinfo.cnf}, you
-do not need to create it.
+Optionally, you may create a file @file{texinfo.cnf} for site
+configuration.  This file is read by @TeX{} when the
address@hidden@@setfilename} command is executed 
(@address@hidden@@setfilename}}).
+You can put any commands you like there, according to local site-wide
+conventions.  They will be read by @TeX{} when processing any Texinfo
+document.  For example, if @file{texinfo.cnf} contains the line
address@hidden@@afourpaper} (@pxref{A4 Paper}), then all Texinfo documents
+will be processed with that page size in effect.  If you have nothing
+to put in @file{texinfo.cnf}, you do not need to create it.
 
 @cindex Environment variable @code{TEXINPUTS}
 @vindex TEXINPUTS
@@ -16382,22 +16381,13 @@
 file after the @code{\input} command.  Another way, that works for both
 @file{texinfo.tex} and @file{texinfo.cnf} (and any other file @TeX{}
 might read), is to set the @code{TEXINPUTS} environment variable in your
address@hidden or @file{.profile} file.
address@hidden or @file{.cshrc} file.
 
-Which you use of @file{.cshrc} or @file{.profile} depends on
+Whether you use @file{.profile} or @file{.cshrc} depends on
 whether you use a Bourne shell-compatible (@code{sh}, @code{bash},
 @code{ksh}, @dots{}) or C shell-compatible (@code{csh}, @code{tcsh})
-command interpreter.  The latter read the @file{.cshrc} file for
-initialization information, and the former read @file{.profile}.
+command interpreter, respeictvely.
 
-In a @file{.cshrc} file, you could use the following @code{csh} command
-sequence:
-
address@hidden
-setenv TEXINPUTS .:/home/me/mylib:
address@hidden example
-
address@hidden 1000
 In a @file{.profile} file, you could use the following @code{sh} command
 sequence:
 
@@ -16408,9 +16398,17 @@
 @end group
 @end example
 
address@hidden 1000
+While in a @file{.cshrc} file, you could use the following @code{csh}
+command sequence:
+
address@hidden
+setenv TEXINPUTS .:/home/me/mylib:
address@hidden example
+
+
 On MS-DOS/MS-Windows, you would say it like address@hidden the use
-of the @samp{;} character, instead of @samp{:}, as directory separator
-on these systems.}:
+of the @samp{;} character as directory separator, instead of @samp{:}.}:
 
 @example
 @group