X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fpspp.texinfo;h=eae4f540a64fd6700e46b0ac89c27c63d7f4d85a;hb=refs%2Fbuilds%2F20140227030508%2Fpspp;hp=ae3db342b9bdf27c4d682f7980d01b096090685e;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp

diff --git a/doc/pspp.texinfo b/doc/pspp.texinfo
index ae3db342b9..eae4f540a6 100644
--- 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,34 +47,29 @@
 @dircategory Math
 @direntry
 * PSPP: (pspp).             Statistical analysis package.
-* PSPPIRE: (pspp).          Graphical user interface to PSPP.
+* 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, 2013 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
 
 @titlepage
-@title PSPP Users Guide
+@title PSPP Users' Guide
 @subtitle GNU PSPP Statistical Analysis Software
 @subtitle Release @value{VERSION}
-@author
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -103,6 +112,7 @@ in the production of this manual.
 * Statistics::                  Basic statistical procedures.
 * Utilities::                   Other commands.
 
+* Invoking pspp-convert::       Utility for converting among file formats.
 * Not Implemented::             What's not here yet
 * Bugs::                        Known problems; submitting bug reports.
 
@@ -129,6 +139,8 @@ in the production of this manual.
 @include flow-control.texi
 @include statistics.texi
 @include utilities.texi
+
+@include pspp-convert.texi
 @include not-implemented.texi
 @include bugs.texi