alphabetizing existing options and arguments

1 files changed, 64 insertions, 33 deletions

diff --git a/certutil.xml b/certutil.xml
index fc55cfd..1ebd321 100644
--- a/certutil.xml
+++ b/certutil.xml
@@ -46,21 +46,15 @@ The key and certificate management process generally begins with creating keys i
    	<para><command>Options</command></para> 
    	<para>Options specify an action and are uppercase. </para>
     <variablelist>
-      <varlistentry>
-        <term>-N</term>
-        <listitem><para>Create new certificate and key databases.</para></listitem>
-      </varlistentry>
 
       <varlistentry>
-        <term>-S </term>
-        <listitem><para>Create an individual certificate and add it to a certificate database.</para></listitem>
+        <term>-A </term>
+        <listitem><para>Add an existing certificate to a certificate database. The certificate database should already exist; if one is not present, this option will initialize one by default. </para></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>-R</term>
-        <listitem><para>Create a certificate request file  that can be submitted to a Certificate Authority (CA) for processing into a finished certificate. Output defaults to standard out unless you use -o output-file argument.
-
-Use the -a argument to specify ASCII output.</para></listitem>
+        <term>-B</term>
+        <listitem><para>Run a series of commands from the specified batch file. This requires the <option>-i</option> argument.</para></listitem>
       </varlistentry>
     
       <varlistentry>
@@ -69,8 +63,13 @@ Use the -a argument to specify ASCII output.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>-G </term>
-        <listitem><para>Generate a new public and private key pair within a key database. The key database should already exist; if one is not present, this option will initialize one by default. Some smart cards (for example, the Litronic card) can store only one key pair. If you create a new key pair for such a card, the previous pair is overwritten.</para></listitem>
+        <term>-D </term>
+        <listitem><para>Delete a certificate from the certificate database.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-E </term>
+        <listitem><para>Add an email certificate to the certificate database.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -84,18 +83,18 @@ When you delete keys, be sure to also remove any certificates associated with th
       </varlistentry>
 
       <varlistentry>
-        <term>-K prefix</term>
-        <listitem><para>List the keyID of keys in the key database. A keyID is the modulus of the RSA key or the publicValue of the DSA key. IDs are displayed in hexadecimal ("0x" is not shown).</para></listitem>
+        <term>-G </term>
+        <listitem><para>Generate a new public and private key pair within a key database. The key database should already exist; if one is not present, this option will initialize one by default. Some smart cards (for example, the Litronic card) can store only one key pair. If you create a new key pair for such a card, the previous pair is overwritten.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>-A </term>
-        <listitem><para>Add an existing certificate to a certificate database. The certificate database should already exist; if one is not present, this option will initialize one by default. </para></listitem>
+        <term>-H </term>
+        <listitem><para>Display a list of the options and arguments used by the Certificate Database Tool.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>-D </term>
-        <listitem><para>Delete a certificate from the certificate database.</para></listitem>
+        <term>-K prefix</term>
+        <listitem><para>List the keyID of keys in the key database. A keyID is the modulus of the RSA key or the publicValue of the DSA key. IDs are displayed in hexadecimal ("0x" is not shown).</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -105,18 +104,45 @@ Use the -h tokenname argument to specify the certificate database on a particula
       </varlistentry>
 
       <varlistentry>
-        <term>-V </term>
-        <listitem><para>Check the validity of a certificate and its attributes.</para></listitem>
+        <term>-M </term>
+        <listitem><para>Modify a certificate's trust attributes using the values of the -t argument.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>-M </term>
-        <listitem><para>Modify a certificate's trust attributes using the values of the -t argument.</para></listitem>
+        <term>-N</term>
+        <listitem><para>Create new certificate and key databases.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>-H </term>
-        <listitem><para>Display a list of the options and arguments used by the Certificate Database Tool.</para></listitem>
+        <term>-O </term>
+        <listitem><para>Print the certificate chain.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-R</term>
+        <listitem><para>Create a certificate request file  that can be submitted to a Certificate Authority (CA) for processing into a finished certificate. Output defaults to standard out unless you use -o output-file argument.
+
+Use the -a argument to specify ASCII output.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-S </term>
+        <listitem><para>Create an individual certificate and add it to a certificate database.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-T </term>
+        <listitem><para>Reset the key database or token.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-U </term>
+        <listitem><para>List all available modules or print a single named module.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>-V </term>
+        <listitem><para>Check the validity of a certificate and its attributes.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -125,8 +151,13 @@ Use the -h tokenname argument to specify the certificate database on a particula
       </varlistentry>
 
       <varlistentry>
-        <term>-U certCipher</term>
-        <listitem><para>List all available modules or print a single named module.</para></listitem>
+        <term>--merge</term>
+        <listitem><para>Merge a source database into the target database.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>--upgrade-merge</term>
+        <listitem><para>Upgrade an old database and merge it into a new database.</para></listitem>
       </varlistentry>
 	</variablelist>
 
@@ -166,13 +197,6 @@ Use the -h tokenname argument to specify the certificate database on a particula
       </varlistentry>
 
       <varlistentry>
-        <term>-P dbPrefix</term>
-        <listitem><para>Specify the prefix used on the cert8.db and key3.db files 
-        (for example, my_cert8.db and my_key3.db). This option is provided as a special case. 
-        Changing the names of the certificate and key databases is not recommended.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term>-e </term>
         <listitem><para>Check a certificate's signature during the process of validating a certificate.</para></listitem>
       </varlistentry>
@@ -226,6 +250,13 @@ Use the -h tokenname argument to specify the certificate database on a particula
       </varlistentry>
 
       <varlistentry>
+        <term>-P dbPrefix</term>
+        <listitem><para>Specify the prefix used on the cert8.db and key3.db files 
+        (for example, my_cert8.db and my_key3.db). This option is provided as a special case. 
+        Changing the names of the certificate and key databases is not recommended.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term>-p phone</term>
         <listitem><para>Specify a contact telephone number to include in new certificates or certificate requests. Bracket this string with quotation marks if it contains spaces.</para></listitem>
       </varlistentry>