Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp

[pspp-builds.git] / doc / invoking.texi

diff --git a/doc/invoking.texi b/doc/invoking.texi
index e91bf6998270bf6ba63798c536d4ff6a6ea1629c..d761935861c545f11d2fd9228d27d18fa2548b5b 100644 (file)
--- a/doc/invoking.texi
+++ b/doc/invoking.texi
@@ -1,4 +1,4 @@
-@node Invocation, Language, License, Top
+@node Invocation
 @chapter Invoking PSPP
 @cindex invocation
 @cindex PSPP, invoking
@@ -7,12 +7,12 @@
 @cindex options, command-line
 @example
 pspp [ -B @var{dir} | --config-dir=@var{dir} ] [ -o @var{device} | --device=@var{device} ]
-       [ -d @var{var}[=@var{value}] | --define=@var{var}[=@var{value}] ] [-u @var{var} | --undef=@var{var} ]
-       [ -f @var{file} | --out-file=@var{file} ] [ -p | --pipe ] [ -I- | --no-include ]
+       [ -a @{compatible|enhanced@} | --algorithm=@{compatible|enhanced@}]
+       [ -x @{compatible|enhanced@} | --syntax=@{compatible|enhanced@}]
+       [ -I- | --no-include ]
        [ -I @var{dir} | --include=@var{dir} ] [ -i | --interactive ] 
-       [ -n | --edit | --dry-run | --just-print | --recon ] 
        [ -r | --no-statrc ] [ -h | --help ] [ -l | --list ] 
-       [ -c @var{command} | --command @var{command} ] [ -s | --safer ]
+       [ -s | --safer ]
        [ --testing-mode ] [ -V | --version ] [ -v | --verbose ] 
        [ @var{key}=@var{value} ] @var{file}@enddots{}
 @end example
@@ -25,7 +25,7 @@ pspp [ -B @var{dir} | --config-dir=@var{dir} ] [ -o @var{device} | --device=@var
 * Informational options::       Helpful information about PSPP.
 @end menu
 
-@node Non-option Arguments, Configuration Options, Invocation, Invocation
+@node Non-option Arguments
 @section Non-option Arguments
 
 Syntax files and output device substitutions can be specified on
@@ -35,7 +35,7 @@ PSPP's command line:
 @item @var{file}
 
 A file by itself on the command line will be executed as a syntax file.
-If multiple files may be specified, they are executed in order, as if
+If multiple files are specified, they are executed in order, as if
 their contents had been given in a single file.
 PSPP terminates after the syntax files run, unless the @code{-i} or
 @code{--interactive} option is given (@pxref{Language control options}).
@@ -63,7 +63,7 @@ instead.)  Now you should be able to invoke the syntax file just by
 typing its name.  You can include any options on the command line as
 usual.  PSPP entirely ignores any lines beginning with @samp{#!}.
 
-@node Configuration Options, Input and output options, Non-option Arguments, Invocation
+@node Configuration Options
 @section Configuration Options
 
 Configuration options are used to change PSPP's configuration for the
@@ -94,26 +94,13 @@ given more than once, then all devices mentioned are selected.  This
 option disables all devices besides those mentioned on the command line.
 @end table
 
-@node Input and output options, Language control options, Configuration Options, Invocation
+@node Input and output options
 @section Input and output options
 
 Input and output options affect how PSPP reads input and writes
 output.  These are the input and output options:
 
 @table @code
-@item -f @var{file}
-@itemx --out-file=@var{file}
-
-This overrides the output file name for devices designated as listing
-devices.  If a file named @var{file} already exists, it is overwritten.
-
-@item -p
-@itemx --pipe
-
-Allows PSPP to be used as a filter by causing the syntax file to be
-read from stdin and output to be written to stdout.  Conflicts with the
-@code{-f @var{file}} and @code{--file=@var{file}} options.
-
 @item -I-
 @itemx --no-include
 
@@ -127,19 +114,13 @@ configuring}.
 Appends directory @var{dir} to the path that is searched for include
 files in PSPP syntax files.
 
-@item -c @var{command}
-@itemx --command=@var{command}
-
-Execute literal command @var{command}.  The command is executed before
-startup syntax files, if any.
-
 @item --testing-mode
 
 Invoke heuristics to assist with testing PSPP.  For use by @code{make
 check} and similar scripts.
 @end table
 
-@node Language control options, Informational options, Input and output options, Invocation
+@node Language control options
 @section Language control options
 
 Language control options control how PSPP syntax files are parsed and
@@ -158,21 +139,10 @@ mode, rather than the default batch mode.  @xref{Tokenizing lines}, for
 information on the differences between batch mode and interactive mode
 command interpretation.
 
-@item -n
-@itemx --edit
-@itemx --dry-run
-@itemx --just-print
-@itemx --recon
-
-Only the syntax of any syntax file specified or of commands entered at
-the command line is checked.  Transformations are not performed and
-procedures are not executed.  Not yet implemented.
-
 @item -r
 @itemx --no-statrc
 
-Prevents the execution of the PSPP startup syntax file.  Not yet
-implemented, as startup syntax files aren't, either.
+Prevents the execution of the PSPP startup syntax file.
 
 @item -s
 @itemx --safer
@@ -181,7 +151,7 @@ Disables certain unsafe operations.  This includes the ERASE and
 HOST commands, as well as use of pipes as input and output files.
 @end table
 
-@node Informational options,  , Language control options, Invocation
+@node Informational options
 @section Informational options
 
 Informational options cause information about PSPP to be written to