X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fq2c.texi;h=280c543a4bc5bde4436a5792d95eaecdb01bcd44;hb=f70f1b22e925d55c246372376de1c6ffaacf8a4b;hp=b24a8ee0e17222974355865a08c216d1ccb2226b;hpb=1fc3af93c0ba6cbaf7ef09edc979096b6f16dd6f;p=pspp-builds.git

diff --git a/doc/q2c.texi b/doc/q2c.texi
index b24a8ee0..280c543a 100644
--- a/doc/q2c.texi
+++ b/doc/q2c.texi
@@ -1,4 +1,4 @@
-@node q2c Input Format, , Data File Format, Top
+@node q2c Input Format, GNU Free Documentation License, Data File Format, Top
 @appendix @code{q2c} Input Format
 
 PSPP statistical procedures have a bizarre and somewhat irregular
@@ -104,7 +104,7 @@ backslash within a string.
 
 @item Special character
 
-Other characters, other than whitespace, constitute tokens in
+Other characters, other than white space, constitute tokens in
 themselves.
 
 @end table
@@ -123,12 +123,12 @@ separated by semicolons (@samp{;}) and terminated with a full stop
 (@samp{.}).
 
 @example
-subcommand ::= sbc-options ID sbc-defn
-sbc-options ::= 
-            ::= sbc-option
-            ::= sbc-options sbc-options
-sbc-option ::= *
-           ::= +
+subcommand ::= default-opt arity-opt ID sbc-defn
+default-opt ::=
+            ::= *
+arity-opt ::=
+          ::= +
+          ::= ^
 sbc-defn ::= opt-prefix = specifiers
          ::= [ ID ] = array-sbc
          ::= opt-prefix = sbc-special-form
@@ -136,14 +136,16 @@ opt-prefix ::=
            ::= ( ID )
 @end example
 
-Each subcommand can be prefixed with one or more option characters.  An
-asterisk (@samp{*}) is used to indicate the default subcommand; the
-keyword used for the default subcommand can be omitted in the PSPP
-syntax file.  A plus sign (@samp{+}) is used to indicate that a
-subcommand can appear more than once; if it is not present then that
-subcommand can appear no more than once.
+A subcommand that begins with an asterisk (@samp{*}) is the default
+subcommand.  The keyword used for the default subcommand can be omitted
+in the PSPP syntax file.
 
-The subcommand name appears after the option characters.
+A plus sign (@samp{+}) indicates that a subcommand can appear more than
+once.  A caret (@samp{^}) indicate that a subcommand must appear exactly
+once.  A subcommand marked with neither character may appear once or not
+at all, but not more than once.
+
+The subcommand name appears after the leading option characters.
 
 There are three forms of subcommands.  The first and most common form
 simply gives an equals sign (@samp{=}) and a list of specifiers, which