[Cvs-cvs] Changes to ccvs/doc/cvs.texinfo [signed-commits]

[Derek Robert Price]

Index: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.668.2.1 ccvs/doc/cvs.texinfo:1.668.2.2
--- ccvs/doc/cvs.texinfo:1.668.2.1      Wed Oct 12 03:00:40 2005
+++ ccvs/doc/cvs.texinfo        Sat Oct 15 21:48:08 2005
@@ -2316,12 +2316,14 @@
 This method option first appeared in @sc{cvs} version 1.12.11 and is valid only
 as a modifcation to the @code{ext} connection method.
 
address@hidden OpenPGP Signatures
address@hidden Commit Signatures
 @item sign
address@hidden nosign
address@hidden no-sign
 Force OpenPGP signatures on or off.  @samp{sign} will cause the commit to abort
 if the server does not support OpenPGP signatures.  Without one of these
 options, CVS will autonegotiate signing, attempting to sign commits when the
-server supports it.  May be overridden by the @samp{--sign} and @samp{--nosign}
+server supports it.  May be overridden by the @samp{--sign} and 
@samp{--no-sign}
 commit options (@pxref{commit options}).
 
 @item address@hidden
@@ -8507,6 +8509,38 @@
 server will use the closest level allowed by the server administrator to
 compress returned data.  This option only has an effect when passed to
 the @sc{cvs} client.
+
address@hidden OpenPGP Signatures
address@hidden Commit Signatures
address@hidden -g
address@hidden --sign
address@hidden --no-sign
+Force OpenPGP signatures on or off.  @samp{-g} & @samp{--sign} will cause the
+commit to abort if the server does not support OpenPGP signatures.  Without one
+of these options, CVS will autonegotiate signing, attempting to sign commits
+when the server supports it.  Overrides the @samp{sign} and @samp{no-sign}
+method options.
+
address@hidden --sign-template @var{template}
+Use @var{template} as the command line template to generate OpenPGP signatures.
+Format strings in this template are substituted before the commit is run:
+
address@hidden @code
address@hidden %t
+Substitute in the textmode flag (defaults to @samp{--textmode}) when a
+signature is being generated for a text file.
+
address@hidden %a
+Substitute in any @var{arg}s set via the @samp{--sign-arg} option or the
+CVSROOT sign-arg method option.
+
address@hidden %s
+Substitute the name of the file to generate a signature for.
address@hidden table
+
+This template should send the generated signature to its standard output.
+Overrides the @samp{sign-template} method optoin and defaults to something like
address@hidden/usr/bin/gpg --detach-sign --output - %t %a %s}.
 @end table
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -9484,9 +9518,8 @@
 
 @itemize @bullet
 @item
-Synopsis: commit [-glnRf] [-m 'log_message' |
--F file] [-r revision] [--sign] [--sign-template @var{template}]
-[--sign-arg @address@hidden address@hidden
+Synopsis: commit [-glnRf] [-m 'log_message' | -F file] [-r revision]
+                address@hidden
 @item
 Requires: working directory, repository.
 @item
@@ -9605,36 +9638,6 @@
 @item -m @var{message}
 Use @var{message} as the log message, instead of
 invoking an editor.
-
address@hidden -g
address@hidden --sign
address@hidden --nosign
-Force OpenPGP signatures on or off.  @samp{-g} & @samp{--sign} will cause the
-commit to abort if the server does not support OpenPGP signatures.  Without one
-of these options, CVS will autonegotiate signing, attempting to sign commits
-when the server supports it.  Overrides the @samp{sign} and @samp{nosign}
-method options.
-
address@hidden --sign-template @var{template}
-Use @var{template} as the command line template to generate OpenPGP signatures.
-Format strings in this template are substituted before the commit is run:
-
address@hidden @code
address@hidden %t
-Substitute in the textmode flag (defaults to @samp{--textmode}) when a
-signature is being generated for a text file.
-
address@hidden %a
-Substitute in any @var{arg}s set via the @samp{--sign-arg} option or the
-CVSROOT sign-arg method option.
-
address@hidden %s
-Substitute the name of the file to generate a signature for.
address@hidden table
-
-This template should send the generated signature to its standard output.
-Overrides the @samp{sign-template} method optoin and defaults to something like
address@hidden/usr/bin/gpg --detach-sign --output - %t %a %s}.
 @end table
 
 @need 2000