Documentation: Yet more markup

[pspp] / doc / pspp.texinfo

diff --git a/doc/pspp.texinfo b/doc/pspp.texinfo
index 8783e664a2b273b814820703e6723fd4f017de3c..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,14 +47,14 @@
 @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 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document