Merge commit 'origin/master' into charset

[pspp-builds.git] / doc / pspp.texinfo

diff --git a/doc/pspp.texinfo b/doc/pspp.texinfo
index b0759dd4c1ef095f43395c3145eb7976b20baa56..975ee660b815ccbc66fe23d51ee2a3ae1bd22c17 100644 (file)
--- a/doc/pspp.texinfo
+++ b/doc/pspp.texinfo
@@ -36,9 +36,8 @@ 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
 
@@ -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.
@@ -99,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