[7143] texi2dvi slim down help message

[Gavin D. Smith]

Revision: 7143
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7143
Author:   gavin
Date:     2016-05-01 11:31:22 +0000 (Sun, 01 May 2016)
Log Message:
-----------
texi2dvi slim down help message

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/util/texi2dvi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-04-28 19:37:41 UTC (rev 7142)
+++ trunk/ChangeLog     2016-05-01 11:31:22 UTC (rev 7143)
@@ -1,3 +1,13 @@
+2016-05-01  Gavin Smith  <address@hidden>
+
+       * util/texi2dvi (usage): Streamline help message.  Don't mention 
+       option '-@' (but don't touch the implementation of this option 
+       to avoid breaking anything).  Don't mention pdftexi2dvi or 
+       --dvipdf in the summary.  Don't mention --silent as a synonym 
+       for --quiet, and don't mention --texinfo for --command.  Move 
+       mention of @setfilename next to --command.  Remove mention of 
+       AUC-TeX.  Only mention -E for --expand, and not -e.
+
 2016-04-25  Theodore Ts'o  <address@hidden>  (tiny change)
 
        * util/texi2dvi (make_tex_cmd): Check whether 'catcode_special' 

Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2016-04-28 19:37:41 UTC (rev 7142)
+++ trunk/util/texi2dvi 2016-05-01 11:31:22 UTC (rev 7143)
@@ -134,21 +134,15 @@
 is used to determine its language ((La)TeX or Texinfo).  To process
 (e)plain TeX files, set the environment variable LATEX=tex.
 
-In order to make texi2dvi a drop-in replacement of TeX/LaTeX in AUC-TeX,
-the FILE may also be composed of the following simple TeX commands.
-  \`\\input{FILE}'     the actual file to compile
-  \`\\nonstopmode'     same as --batch
+When invoked as \`texi2pdf' or given the option --pdf generate PDF output.
+Otherwise, generate DVI.
 
-When invoked as \`texi2pdf' or \`pdftexi2dvi', or given the option --pdf
-or --dvipdf, generate PDF output.  Otherwise, generate DVI.
-
 General options:
   -b, --batch         no interaction
   -D, --debug         turn on shell debugging (set -x)
   -h, --help          display this help and exit successfully
   -o, --output=OFILE  leave output in OFILE; only one input FILE is allowed
   -q, --quiet         no output unless errors (implies --batch)
-  -s, --silent        same as --quiet
   -v, --version       display version information and exit successfully
   -V, --verbose       report on what is done
   --max-iterations=N   don't process files more than N times [$max_iters]
@@ -165,17 +159,18 @@
       --text    output a plain text file from LaTeX, using HeVeA
 
 TeX tuning:
-  -@                         use @input instead of \input for preloaded Texinfo
-  -e, -E, --expand           force macro expansion using makeinfo
+  -E, --expand               macro expansion using makeinfo
   -I DIR                     search DIR for Texinfo files
   -l, --language=LANG        specify LANG for FILE, either latex or texinfo
       --no-line-error        do not pass --file-line-error to TeX
       --shell-escape         pass --shell-escape to TeX
       --src-specials         pass --src-specials to TeX
-  -t, --command=CMD          insert CMD in copy of input file
-   or --texinfo=CMD          multiple values accumulate
       --translate-file=FILE  use given charset translation file for TeX
+  -t, --command=CMD          insert CMD in copy of input file
 
+Any CMD strings are added after @setfilename for Texinfo input, or in
+the first line for LaTeX input.  Multiple values accumulate.
+
 Build modes:
   --build=MODE         specify the treatment of auxiliary files [$build_mode]
       --tidy           same as --build=tidy
@@ -206,9 +201,6 @@
 following programs are looked for (in this order): dvipdfmx dvipdfm
 dvipdf dvi2pdf dvitopdf.
 
-Any CMD strings are added after @setfilename for Texinfo input, or in
-the first line for LaTeX input.
-
 If Texinfo is installed on your site, then the command
 
   info texi2dvi