[Pspp-cvs] Changes to pspp/doc/pspp.texinfo

[Ben Pfaff]

Index: pspp/doc/pspp.texinfo
diff -u pspp/doc/pspp.texinfo:1.4 pspp/doc/pspp.texinfo:1.5
--- pspp/doc/pspp.texinfo:1.4   Wed Apr 13 10:09:59 2005
+++ pspp/doc/pspp.texinfo       Sat Apr 16 01:39:25 2005
@@ -6,6 +6,7 @@
 @c @setchapternewpage odd
 @c %**end of header
 
address@hidden version.texi
 
 @macro cmd{CMDNAME}
 \CMDNAME\
@@ -20,79 +21,46 @@
 * PSPP: (pspp).             Statistical analysis package.
 @end direntry
 
address@hidden
-PSPP, for statistical analysis of sampled data, by Ben Pfaff.
-
-This file documents PSPP, a statistical package for analysis of
-sampled data that uses a command language compatible with SPSS.
-
-Copyright (C) 1996-9, 2000 Free Software Foundation, Inc.
-
-This version of the PSPP documentation is consistent with version 2 of
-``texinfo.tex''.
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
address@hidden
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission notice
-identical to this one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
-
address@hidden ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this
-manual into another language, under the above condition for modified 
-versions, except that this permission notice may be stated in a 
-translation approved by the Free Software Foundation.
address@hidden ifinfo
-
address@hidden version.texi
address@hidden
+This manual is for GNU PSPP version @value{VERSION},
+software for statistical analysis.
+
+Copyright @copyright{} 1997, 1998, 2004, 2005 Free Software Foundation, Inc.
+
address@hidden
+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.''
address@hidden quotation
address@hidden copying
 
 @titlepage
address@hidden PSPP
address@hidden GNU PSPP
 @subtitle A System for Statistical Analysis
 @subtitle Edition @value{EDITION}, for PSPP version @value{VERSION}
address@hidden by Ben Pfaff
-
address@hidden Ben Pfaff
 @page
 @vskip 0pt plus 1filll
-
-PSPP Copyright @copyright{} 1997, 1998 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by the Foundation.
address@hidden
 @end titlepage
 
 @contents
 
 
address@hidden Top, Introduction, (dir), (dir)
address@hidden
address@hidden PSPP
-
-This file documents the PSPP package for statistical analysis of sampled
-data.  This is edition @value{EDITION}, for PSPP version
address@hidden, last modified on @value{UPDATED}.
address@hidden
address@hidden Top
address@hidden GNU PSPP
 
address@hidden ifinfo
address@hidden
address@hidden ifnottex
 
 @menu
 * Introduction::                Description of the package.
@@ -124,6 +92,8 @@
 * 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
 
 @include introduction.texi
@@ -154,6 +124,8 @@
 @include data-file-format.texi
 @include q2c.texi
 
address@hidden fdl.texi
+
 @bye
 
 @c Local Variables: