X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fpspp.texinfo;h=975ee660b815ccbc66fe23d51ee2a3ae1bd22c17;hb=85e74b3e36d5673205cb64345bca2587889f2113;hp=f4d1dc7c3070a80b414adb5d117fe268c66960a0;hpb=8444d8d47de5e5f8d076b6f43f73c2c29494031e;p=pspp-builds.git

diff --git a/doc/pspp.texinfo b/doc/pspp.texinfo
index f4d1dc7c..975ee660 100644
--- a/doc/pspp.texinfo
+++ b/doc/pspp.texinfo
@@ -36,17 +36,16 @@ 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.''
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.''
 @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}
+@author
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -71,7 +70,8 @@ Software Foundation raise funds for GNU development.''
 * 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.
@@ -88,10 +88,6 @@ Software Foundation raise funds for GNU development.''
 
 * 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
 
@@ -103,6 +99,7 @@ Software Foundation raise funds for GNU development.''
 @include expressions.texi
 @include data-io.texi
 @include files.texi
+@include combining.texi
 @include variables.texi
 @include transformation.texi
 @include data-selection.texi
@@ -118,15 +115,11 @@ Software Foundation raise funds for GNU development.''
 
 @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: