X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Finvoking.texi;h=f64c92712f61825540b77645a7f400767c613b8c;hb=100858ba8c03581afefc60719f863c9e936dbb4e;hp=bc53ae4dda457200180c13b5ed2f1d664856b057;hpb=5dbf5abcbed01f04422d4dead1c0ae0bb7efde4f;p=pspp

diff --git a/doc/invoking.texi b/doc/invoking.texi
index bc53ae4dda..f64c92712f 100644
--- a/doc/invoking.texi
+++ b/doc/invoking.texi
@@ -21,12 +21,12 @@ The sections below describe the @command{pspp} program's command-line
 interface.
 
 @menu
-* Main Options::                
-* PDF PostScript and SVG Output Options::  
-* Plain Text Output Options::   
-* HTML Output Options::         
-* OpenDocument Output Options::  
-* Comma-Separated Value Output Options::  
+* Main Options::
+* PDF PostScript and SVG Output Options::
+* Plain Text Output Options::
+* HTML Output Options::
+* OpenDocument Output Options::
+* Comma-Separated Value Output Options::
 @end menu
 
 @node Main Options
@@ -313,47 +313,21 @@ Cairo library.
 
 @item @option{-O foreground-color=@var{color}}
 @itemx @option{-O background-color=@var{color}}
-Sets @var{color} as the color to be used for the background or foreground to 
+Sets @var{color} as the color to be used for the background or foreground to
 be used for charts.
 Color should be given in the format @code{#@var{RRRR}@var{GGGG}@var{BBBB}},
 where @var{RRRR}, @var{GGGG} and @var{BBBB} are 4 character hexadecimal
 representations of the red, green and blue components respectively.
 If charts are disabled, this option has no effect.
 
-
-@item @option{-O paginate=@var{boolean}}
-If set, @pspp{} writes an ASCII formfeed the end of every page.  Default:
-@code{off}.
-
-@item @option{-O headers=@var{boolean}}
-If enabled, @pspp{} prints two lines of header information giving title
-and subtitle, page number, date and time, and @pspp{} version are printed
-at the top of every page.  These two lines are in addition to any top
-margin requested.  Default: @code{off}.
-
-@item @option{-O length=@var{line-count}}
-Physical length of a page.  Headers and margins are subtracted from
-this value.  You may specify the number of lines as a number, or for
-screen output you may specify @code{auto} to track the height of the
-terminal as it changes.  Default: @code{66}.
-
-@item @option{-O width=@var{character-count}}
-Width of a page, in characters.  Margins are subtracted from this
-value.  For screen output you may specify @code{auto} in place of a
-number to track the width of the terminal as it changes.  Default:
-@code{79}.
-
-@item @option{-O top-margin=@var{top-margin-lines}}
-Length of the top margin, in lines.  @pspp{} subtracts this value from
-the page length.  Default: @code{0}.
-
-@item @option{-O bottom-margin=@var{bottom-margin-lines}}
-Length of the bottom margin, in lines.  @pspp{} subtracts this value from
-the page length.  Default: @code{0}.
+@item @option{-O width=@var{columns}}
+Width of a page, in columns.  If unspecified or given as @code{auto},
+the default is the width of the terminal, for interactive output, or
+the WIDTH setting (@pxref{SET}), for output to a file.
 
 @item @option{-O box=@{ascii|unicode@}}
-Sets the characters used for lines in tables.  
-If set to 
+Sets the characters used for lines in tables.
+If set to
 @code{ascii} the characters @samp{-}, @samp{|}, and @samp{+} for single-width
 lines and @samp{=} and @samp{#} for double-width lines are used.
 If set to @code{unicode} then  Unicode box drawing characters will be used.
@@ -489,11 +463,11 @@ The PSPPIRE graphic user interface for @pspp{} can perform all
 functionality of the command line interface.  In addition it gives an
 instantaneous view of the data, variables and statistical output.
 
-The graphic user interface can be started by typing @command{psppire} at a 
+The graphic user interface can be started by typing @command{psppire} at a
 command prompt.
-Alternatively many systems have a system of interactive menus or buttons 
+Alternatively many systems have a system of interactive menus or buttons
 from which @command{psppire} can be started by a series of mouse clicks.
 
-Once the principles of the @pspp{} system are understood, 
+Once the principles of the @pspp{} system are understood,
 the graphic user interface is designed to be largely intuitive, and
 for this reason is covered only very briefly by this manual.