Bug 836477 - Complete the initial review of the docbook documentation for NSS command line tools, r=kaie

- Supply missing option descriptions for certutil, cmsutil, and crlutil
- Regenerate the html and man pages files

1 files changed, 37 insertions, 2 deletions

diff --git a/doc/cmsutil.xml b/doc/cmsutil.xml
index c41796277..ba45b99fd 100644
--- a/doc/cmsutil.xml
+++ b/doc/cmsutil.xml
@@ -89,9 +89,16 @@ The options and arguments for the cmsutil command are defined as follows:
     </variablelist>
 
 	<para><command>Arguments</command></para>
-	<para>Option arguments modify an action and are lowercase.</para>
+	<para>Option arguments modify an action.</para>
 	<variablelist>
       <varlistentry>
+        <term>-b </term>
+        <listitem>
+          <para>Decode a batch of files named in infile.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term>-c content </term>
         <listitem>
           <para>Use this detached content (decode only).</para>
@@ -113,12 +120,26 @@ The options and arguments for the cmsutil command are defined as follows:
       </varlistentry>
 
       <varlistentry>
+        <term>-f pwfile</term>
+        <listitem>
+          <para>Use password file to set password on all PKCS#11 tokens.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term>-G</term>
         <listitem>
           <para>Include a signing time attribute (sign only).</para>
         </listitem>
       </varlistentry>
-	
+
+      <varlistentry>
+        <term>-H hash</term>
+        <listitem>
+          <para>Use specified hash algorithm (default:SHA1).</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>-h num</term>
         <listitem>
@@ -134,6 +155,13 @@ The options and arguments for the cmsutil command are defined as follows:
       </varlistentry>
 
       <varlistentry>
+        <term>-k</term>
+        <listitem>
+          <para>Keep decoded encryption certs in permanent cert db.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term>-N nickname</term>
         <listitem>
           <para>Specify nickname of certificate to sign with (sign only).</para>
@@ -193,6 +221,13 @@ For certificates-only message, list of certificates to send.
       </varlistentry>
 
       <varlistentry>
+        <term>-v</term>
+        <listitem>
+          <para>Print debugging information.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term>-Y ekprefnick</term>
         <listitem>
           <para>Specify an encryption key preference by nickname.</para>