work on PRINT encoding

[pspp] / doc / pspp.texinfo

diff --git a/doc/pspp.texinfo b/doc/pspp.texinfo
index 562b328dbab3bb595574c9ee804d66703dc1d407..232c6605920902366873a53539f1bee3390a0500 100644 (file)
--- a/doc/pspp.texinfo
+++ b/doc/pspp.texinfo
@@ -15,10 +15,24 @@
 
 @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 {}
@@ -33,25 +47,22 @@
 @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, 2009 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 the freedom to copy and
-modify this GNU manual.''
+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
 
@@ -59,15 +70,13 @@ modify this GNU manual.''
 @title PSPP Users Guide
 @subtitle GNU PSPP Statistical Analysis Software
 @subtitle Release @value{VERSION}
-@author
 @page
 @vskip 0pt plus 1filll
 @insertcopying
 @end titlepage
 
-@chapheading Acknowledgements
-The authors wish to thank
-Network Theory Ltd 
+@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.
@@ -87,7 +96,8 @@ in the production of this manual.
 * 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.
@@ -109,8 +119,6 @@ in the production of this manual.
 * Command Index::               Index of PSPP procedures.
 * Concept Index::               Index of concepts.
 
-* Configuration::               Configuring PSPP.
-
 * GNU Free Documentation License:: License for copying this manual.
 @end menu
 
@@ -137,8 +145,6 @@ in the production of this manual.
 @include command-index.texi
 @include concept-index.texi
 
-@include configuring.texi
-
 @include fdl.texi
 
 @bye