X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fpspp.texinfo;h=232c6605920902366873a53539f1bee3390a0500;hb=refs%2Fheads%2Flexer;hp=a87ca2b41399d51814df9fa3d29f096d78afde33;hpb=13c382bdb6763e544cc5fc621c2a006e0dfafffe;p=pspp

diff --git a/doc/pspp.texinfo b/doc/pspp.texinfo
index a87ca2b413..232c660592 100644
--- a/doc/pspp.texinfo
+++ b/doc/pspp.texinfo
@@ -6,12 +6,40 @@
 @c @setchapternewpage odd
 @c %**end of header
 
+
+@macro note{param1}
+@quotation
+@strong{Please note:} \param1\
+@end quotation
+@end macro
+
 @include version.texi
 
+@c This macro should be used for marking command names.  For the purposes of markup, 
+@c  no distinction is made between ``commands'' and ``procedures''.
 @macro cmd{CMDNAME}
-\CMDNAME\
+@code{\CMDNAME\}
+@end macro
+
+@c This macro is used for fragments of command syntax that are not in themselves command names.
+@c It does not necessarily have to be a subcommand.
+@macro subcmd{CMDNAME}
+@code{\CMDNAME\}
+@end macro
+
+@c Use this macro to refer to PSPP itself .  Not when giving a shell command line example.
+@macro pspp
+@sc{pspp}
 @end macro
 
+
+@ifset MISSING_CLICKSEQUENCE
+@alias clicksequence = asis
+@macro click {}
+->
+@end macro
+@end ifset
+
 @iftex
 @finalout
 @end iftex
@@ -19,39 +47,41 @@
 @dircategory Math
 @direntry
 * PSPP: (pspp).             Statistical analysis package.
+* PSPPIRE: (pspp).          Graphical user interface to @pspp{}.
 @end direntry
 
 @copying
 This manual is for GNU PSPP version @value{VERSION},
 software for statistical analysis.
 
-Copyright @copyright{} 1997, 1998, 2004, 2005 Free Software Foundation, Inc.
+Copyright @copyright{} 1997, 1998, 2004, 2005, 2009, 2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,''
-and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License.''
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled "GNU
+Free Documentation License".
 @end quotation
 @end copying
 
 @titlepage
-@title GNU PSPP
-@subtitle A System for Statistical Analysis
-@subtitle Edition @value{EDITION}, for PSPP version @value{VERSION}
-@author Ben Pfaff
+@title PSPP Users Guide
+@subtitle GNU PSPP Statistical Analysis Software
+@subtitle Release @value{VERSION}
 @page
 @vskip 0pt plus 1filll
 @insertcopying
 @end titlepage
 
+@c @chapheading Acknowledgements
+The authors wish to thank Network Theory Ltd 
+@url{http://www.network-theory.co.uk}
+for their financial support 
+in the production of this manual.
+
+
 @contents
 
 
@@ -66,12 +96,15 @@ Software Foundation raise funds for GNU development.''
 * Introduction::                Description of the package.
 * License::                     Your rights and obligations.
 
-* Invocation::                  Starting and running PSPP.
+* Invoking PSPP::               Starting the PSPP text-based interface.
+* Invoking PSPPIRE::            Starting the PSPP graphical user interface.
+* Using PSPP::                  How to use PSPP --- A brief tutorial.
 * Language::                    Basics of the PSPP command language.
 * Expressions::                 Numeric and string expression syntax.
 
 * Data Input and Output::       Reading data from user files.
-* System and Portable Files::   Dealing with system & portable files.
+* System and Portable File IO:: Reading and writing system & portable files.
+* Combining Data Files::        Combining data from multiple files.
 * Variable Attributes::         Adjusting and examining variables.
 * Data Manipulation::           Simple operations on data.
 * Data Selection::              Select certain cases for analysis.
@@ -86,13 +119,6 @@ Software Foundation raise funds for GNU development.''
 * Command Index::               Index of PSPP procedures.
 * Concept Index::               Index of concepts.
 
-* Installation::                How to compile and install PSPP.
-* Configuration::               Configuring PSPP.
-
-* Portable File Format::        Format of PSPP portable files.
-* Data File Format::            Format of PSPP system files.
-* q2c Input Format::            Format of syntax accepted by q2c.
-
 * GNU Free Documentation License:: License for copying this manual.
 @end menu
 
@@ -100,10 +126,12 @@ Software Foundation raise funds for GNU development.''
 @include license.texi
 
 @include invoking.texi
+@include tutorial.texi
 @include language.texi
 @include expressions.texi
 @include data-io.texi
 @include files.texi
+@include combining.texi
 @include variables.texi
 @include transformation.texi
 @include data-selection.texi
@@ -117,18 +145,11 @@ Software Foundation raise funds for GNU development.''
 @include command-index.texi
 @include concept-index.texi
 
-@include installing.texi
-@include configuring.texi
-
-@include portable-file-format.texi
-@include data-file-format.texi
-@include q2c.texi
-
 @include fdl.texi
 
 @bye
 
 @c Local Variables:
 @c use (texinfo-multiple-files-update "pspp.texinfo")  in emacs to keep these files consistent
-@c compile-command: "makeinfo pspp.texi"
+@c compile-command: "makeinfo pspp.texinfo"
 @c End: