cleaning up/formatting the XML

2 files changed, 107 insertions, 92 deletions

diff --git a/docbook2nroff.py b/docbook2nroff.py
index 18063d9..ebc0462 100755
--- a/docbook2nroff.py
+++ b/docbook2nroff.py
@@ -83,8 +83,8 @@ class DocBookToNroffHandler(sax.ContentHandler):
         self.stack = []
         ###########################################################################################
         
-        self.refentryinfo = {}
         self.refmeta = {}
+        self.refentryinfo = {}
         self.refnamediv = {}
         self.synopsis = {}
         self.elementcount = 0
@@ -141,21 +141,29 @@ class DocBookToNroffHandler(sax.ContentHandler):
         
         #TODO this should always use += content instead of = content, in case content is incomplete
         
-        if "refentryinfo" in self.stack:
+#        if "refentryinfo" in self.stack:
+#           if "refentrytitle" == name:
+#               self.refentryinfo["refentrytitle"] = content
+#           if "manvolnum" == name:
+#                self.refentryinfo["manvolnum"] = content
+#            if "productname" == name:
+#                self.refentryinfo["productname"] = content
+#            if "date" == name:
+#                self.refentryinfo["date"] = content
+              
+        if "refmeta" in self.stack:
             if "refentrytitle" == name:
-               self.refentryinfo["refentrytitle"] = content
+               self.refmeta["refentrytitle"] = content
             if "manvolnum" == name:
-                self.refentryinfo["manvolnum"] = content
+                self.refmeta["manvolnum"] = content
+        
+        elif "refentryinfo" in self.stack:
             if "productname" == name:
                 self.refentryinfo["productname"] = content
+            if "productnumber" == name:
+                self.refentryinfo["productnumber"] = content
             if "date" == name:
                 self.refentryinfo["date"] = content
-              
-        elif "refmeta" in self.stack:
-            if "refentrytitle" == name:
-                self.refmeta["refentrytitle"] = content
-            if "manvolnum" == name:
-                self.refmeta["manvolnum"] = content
                 
         elif "refnamediv" in self.stack:
             if "refname" == name:
@@ -206,8 +214,11 @@ class DocBookToNroffHandler(sax.ContentHandler):
         #print >> self.out, self.stack
         ###########################################################################################
         
+        if "refmeta" == name:
+            print >> self.out, ".TH %(refentrytitle)s %(manvolnum)s" % self.refmeta
+ 
         if "refentryinfo" == name:
-            print >> self.out, ".TH %(refentrytitle)s %(manvolnum)s \"%(date)s\" \"USER COMMANDS\"" % self.refentryinfo
+            print >> self.out, "\"%(date)s\" \"%(productnumber)s\" \"%(productname)s\"" % self.refentryinfo
 
         if "refnamediv" == name:
             print >> self.out, ".SH NAME \n %(refname)s \- %(refpurpose)s" % self.refnamediv
diff --git a/modutil.xml b/modutil.xml
index 01678cb..e274672 100644
--- a/modutil.xml
+++ b/modutil.xml
@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <refentry>
 
+  <refmeta>
+    <refentrytitle>MODUTIL</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refentryinfo>
+    <date>august 2010</date>
+    <title>NSS Security Tools</title>
+    <productname>nss-tools</productname>
+    <productnumber>8</productnumber>
+  </refentryinfo>
+
+<!-- this should be one word 
   <refentryinfo>
     <date>August 2010</date>
-<!-- this should be one word -->
 	<refentrytitle>modutil</refentrytitle>
     <manvolnum>1</manvolnum>
-<!-- end  -->
   </refentryinfo>
+end  -->
 
   <refnamediv>
     <refname>modutil</refname>
@@ -26,9 +37,9 @@
 
   <refsection id="description">
     <title>Description</title>
-    <para>The Security Module Database Tool is a command-line utility for managing PKCS #11 module information within secmod.db files or within hardware tokens. You can use the tool to add and delete PKCS #11 modules, change passwords, set defaults, list module contents, enable or disable slots, enable or disable FIPS 140-2 compliance, and assign default providers for cryptographic operations. This tool can also create key3.db, cert8.db, and secmod.db security database files.</para>
+    <para>The Security Module Database Tool, <command>modutil</command>, is a command-line utility for managing PKCS #11 module information both within <filename>secmod.db</filename> files and within hardware tokens. <command>modutil</command> can add and delete PKCS #11 modules, change passwords on security databases, set defaults, list module contents, enable or disable slots, enable or disable FIPS 140-2 compliance, and assign default providers for cryptographic operations. This tool can also create <filename>key3.db</filename>, <filename>cert8.db</filename>, and <filename>secmod.db</filename> security database files.</para>
 
-	<para>The tasks associated with security module database management are part of a process that typically also involves managing key databases (key3.db files) and certificate databases (cert8.db files). The key, certificate, and PKCS #11 module management process generally begins with creating the keys and key database necessary to generate and manage certificates and the certificate database.</para>
+	<para>The tasks associated with security module database management are part of a process that typically also involves managing key databases (<filename>key3.db</filename>) and certificate databases (<filename>cert8.db</filename>).</para>
   </refsection>
   
   <refsection id="options">
@@ -42,62 +53,62 @@
 
       <varlistentry>
         <term>-add modulename</term>
-	  <listitem><para>Add the named PKCS #11 module to the database. Use this option with the -libfile, -ciphers, and -mechanisms arguments.</para></listitem>
+	  <listitem><para>Add the named PKCS #11 module to the database. Use this option with the <option>-libfile</option>, <option>-ciphers</option>, and <option>-mechanisms</option> arguments.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-changepw tokenname</term>
-	  <listitem><para>Change the password on the named token. If the token has not been initialized, this option initializes the password. Use this option with the -pwfile and -newpwfile arguments. In this context, the term "password" is equivalent to a personal identification number (PIN).</para></listitem>
+	  <listitem><para>Change the password on the named token. If the token has not been initialized, this option initializes the password. Use this option with the <option>-pwfile</option> and <option>-newpwfile</option> arguments. A <emphasis>password</emphasis> is equivalent to a personal identification number (PIN).</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-chkfips</term>
-	  <listitem><para>Verify whether the module is in the given FIPS mode. <command>true</command> means to verify that the module is in FIPS mode, while <command>false</command> means to verify tht the module is not in FIPS mode.</para></listitem>
+	  <listitem><para>Verify whether the module is in the given FIPS mode. <command>true</command> means to verify that the module is in FIPS mode, while <command>false</command> means to verify that the module is not in FIPS mode.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-create</term>
-	<listitem><para>Create new secmod.db, key3.db, and cert8.db files. Use the -dbdir directory argument to specify a directory. If any of these databases already exist in a specified directory, the Security Module Database Tool displays an error message.</para></listitem>
+	<listitem><para>Create new <filename>secmod.db</filename>, <filename>key3.db</filename>, and <filename>cert8.db</filename> files. Use the <option>-dbdir</option> directory argument to specify a directory. If any of these databases already exist in a specified directory, <command>modutil</command> returns an error message.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-default modulename</term>
-	  <listitem><para>Specify the security mechanisms for which the named module will be a default provider. The security mechanisms are specified with the -mechanisms mechanism-list argument.</para></listitem>
+	  <listitem><para>Specify the security mechanisms for which the named module will be a default provider. The security mechanisms are specified with the <option>-mechanisms</option> argument.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-delete modulename</term>
-	  <listitem><para>Delete the named module. Note that you cannot delete the Netscape Communicator internal PKCS #11 module.</para></listitem>
+	  <listitem><para>Delete the named module. The default NSS PKCS #11 module cannot be deleted.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-disable modulename</term>
-	  <listitem><para>Disable all slots on the named module. Use the [-slot slotname] argument to disable a specific slot.</para></listitem>
+	  <listitem><para>Disable all slots on the named module. Use the <option>-slot</option> argument to disable a specific slot.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-enable modulename</term>
-	  <listitem><para>Enable all slots on the named module. Use the [-slot slotname] argument to enable a specific slot.</para></listitem>
+	  <listitem><para>Enable all slots on the named module. Use the <option>-slot</option> argument to enable a specific slot.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-fips [true | false]</term>
-	  <listitem><para>Enable (true) or disable (false) FIPS 140-2 compliance for the Netscape Communicator internal module.</para></listitem>
+	  <listitem><para>Enable (true) or disable (false) FIPS 140-2 compliance for the default NSS module.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-force</term>
-	  <listitem><para>Disable the Security Module Database Tool's interactive prompts so it can be run from a script. Use this option only after manually testing each planned operation to check for warnings and to ensure that bypassing the prompts will cause no security lapses or loss of database integrity.</para></listitem>
+	  <listitem><para>Disable <command>modutil</command>'s interactive prompts so it can be run from a script. Use this option only after manually testing each planned operation to check for warnings and to ensure that bypassing the prompts will cause no security lapses or loss of database integrity.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-jar JAR-file</term>
-	  <listitem><para>Add a new PKCS #11 module to the database using the named JAR file. Use this option with the -installdir and -tempdir arguments. The JAR file uses the Netscape Server PKCS #11 JAR format to identify all the files to be installed, the module's name, the mechanism flags, and the cipher flags. The JAR file should also contain any files to be installed on the target machine, including the PKCS #11 module library file and other files such as documentation. See the section JAR Installation File for information on creating the special script needed to perform an installation through a server or with the Security Module Database Tool (that is, in environments without JavaScript support). For general installation instructions and to install a module in environments where JavaScript support is available (as in Netscape Communicator), see the document Using the JAR Installation Manager to Install a PKCS #11 Cryptographic Module.</para></listitem>
+	  <listitem><para>Add a new PKCS #11 module to the database using the named JAR file. Use this command with the <option>-installdir</option> and <option>-tempdir</option> arguments. The JAR file uses the NSS PKCS #11 JAR format to identify all the files to be installed, the module's name, the mechanism flags, and the cipher flags, as well as any files to be installed on the target machine, including the PKCS #11 module library file and other files such as documentation. This is covered in the JAR installation file section in the man page, which details the special script needed to perform an installation through a server or with <command>modutil</command>. </para></listitem>
       </varlistentry>
 
       <varlistentry>
           <term>-list [modulename]</term>
-	  <listitem><para>Display basic information about the contents of the secmod.db file. Use modulename to display detailed information about a particular module and its slots and tokens.</para></listitem>
+	  <listitem><para>Display basic information about the contents of the <filename>secmod.db</filename> file. Specifying a <emphasis>modulename</emphasis> displays detailed information about a particular module and its slots and tokens.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -111,13 +122,8 @@
       </varlistentry>
 
       <varlistentry>
-        <term>-chkfips</term>
-	  <listitem><para> (PIN).</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term>-undefault modulename</term>
-	  <listitem><para>Specify the security mechanisms for which the named module will not be a default provider. The security mechanisms are specified with the -mechanisms mechanism-list argument.</para></listitem>
+	  <listitem><para>Specify the security mechanisms for which the named module will not be a default provider. The security mechanisms are specified with the <option>-mechanisms</option> argument.</para></listitem>
       </varlistentry>
 	</variablelist>
 
@@ -136,50 +142,52 @@
 
       <varlistentry>
         <term>-ciphers cipher-enable-list</term>
-	  <listitem><para>Enable specific ciphers in a module that is being added to the database. The cipher-enable-list is a colon-delimited list of cipher names. Enclose this list in quotation marks if it contains spaces. The following cipher is currently available: FORTEZZA.</para></listitem>
+	  <listitem><para>Enable specific ciphers in a module that is being added to the database. The cipher-enable-list is a colon-delimited list of cipher names. Enclose this list in quotation marks if it contains spaces.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-dbdir directory</term>
-	  <listitem><para>Specify the database directory in which to access or create security module database files. On Unix, the Security Module Database Tool defaults to the user's Netscape directory. Windows NT has no default directory, so -dbdir must be used to specify a directory.</para></listitem>
+	  <listitem><para>Specify the database directory in which to access or create security module database files. <command>modutil</command> defaults to the user's <!-- FIX ME --> <filename>.netscape</filename> directory. </para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>--dbprefix prefix</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>
+	  <listitem><para>Specify the prefix used on the <filename>cert8.db</filename> and <filename>key3.db</filename> files, such as <filename>my_</filename> for <filename>my_cert8.db</filename>. 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>-installdir root-installation-directory</term>
-	  <listitem><para>Specify the root installation directory relative to which files will be installed by the -jar JAR-file option. This directory should be one below which it is appropriate to store dynamic library files (for example, a server's root directory or the Netscape Communicator root directory).</para></listitem>
+	  <listitem><para>Specify the root installation directory relative to which files will be installed by the <option>-jar</option> option. This directory should be one below which it is appropriate to store dynamic library files, such as a server's root directory.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-libfile library-file</term>
-	  <listitem><para>Specify a path to the DLL or other library file containing the implementation of the PKCS #11 interface module that is being added to the database.</para></listitem>
+	  <listitem><para>Specify a path to a library file containing the implementation of the PKCS #11 interface module that is being added to the database.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-mechanisms mechanism-list</term>
-	  <listitem><para>Specify the security mechanisms for which a particular module will be flagged as a default provider. The mechanism-list is a colon-delimited list of mechanism names. Enclose this list in quotation marks if it contains spaces. The module becomes a default provider for the listed mechanisms when those mechanisms are enabled. If more than one module claims to be a particular mechanism's default provider, that mechanism's default provider is undefined. The following mechanisms are currently available: RSA, DSA, RC2, RC4, RC5, DES, DH, FORTEZZA, SHA1, MD5, MD2, RANDOM (for random number generation), and FRIENDLY (meaning certificates are publicly readable).</para></listitem>
+	  <listitem><para>Specify the security mechanisms for which a particular module will be flagged as a default provider. The <emphasis>mechanism-list</emphasis> is a colon-delimited list of mechanism names. Enclose this list in quotation marks if it contains spaces.</para>
+	<para>The module becomes a default provider for the listed mechanisms when those mechanisms are enabled. If more than one module claims to be a particular mechanism's default provider, that mechanism's default provider is undefined.</para>
+	<para><command>modutil</command> supports several mechanisms: RSA, DSA, RC2, RC4, RC5, AES, DES, DH, SHA1, SHA256, SHA512, SSL, TLS, MD5, MD2, RANDOM (for random number generation), and FRIENDLY (meaning certificates are publicly readable).</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-newpwfile new-password-file</term>
-	  <listitem><para>Specify a text file containing a token's new or replacement password so that a password can be entered automatically with the -changepw tokenname option.</para></listitem>
+	  <listitem><para>Specify a text file containing a token's new or replacement password so that a password can be entered automatically with the <option>-changepw</option> option.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-nocertdb</term>
 	  <listitem><para>Do not open the certificate or key databases. This has several effects:</para>
-          <para>* With the -create command, only a secmod.db file will be created; cert8.db and key3.db will not be created.</para>
-          <para>* With the -jar command, signatures on the JAR file will not be checked.</para>
-          <para>* With the -changepw command, the password on the Netscape internal module cannot be set or changed, since this password is stored in key3.db.</para></listitem>
+          <para>* With the <option>-create</option> command, only a <filename>secmod.db</filename> file is created; <filename>cert8.db</filename> and <filename>key3.db</filename> are not created.</para>
+          <para>* With the <option>-jar</option> command, signatures on the JAR file are not checked.</para>
+          <para>* With the <option>-changepw</option> command, the password on the NSS internal module cannot be set or changed, since this password is stored in <filename>key3.db</filename>.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>-pwfile old-password-file</term>
-	  <listitem><para>Specify a text file containing a token's existing password so that a password can be entered automatically when the -changepw tokenname option is used to change passwords.</para></listitem>
+	  <listitem><para>Specify a text file containing a token's existing password so that a password can be entered automatically when the <option>-changepw</option> option is used to change passwords.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -189,7 +197,7 @@
 
       <varlistentry>
         <term>-slot slotname</term>
-	  <listitem><para>Specify a particular slot to be enabled or disabled with the -enable modulename or -disable modulename options.</para></listitem>
+	  <listitem><para>Specify a particular slot to be enabled or disabled with the <option>-enable</option> or <option>-disable</option> options.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -199,60 +207,30 @@
 
       <varlistentry>
         <term>-tempdir temporary-directory</term>
-	  <listitem><para>The temporary directory is the location where temporary files will be created in the course of installation by the -jar JAR-file option. If no temporary directory is specified, the current directory will be used.</para></listitem>
+	  <listitem><para>Give a directory location where temporary files are created during the installation by the <option>-jar</option> option. If no temporary directory is specified, the current directory is used.</para></listitem>
       </varlistentry>
     </variablelist>
   </refsection>
 
-  <refsection id="basic-usage">
-    <title>Basic Usage</title>
-    <para>Creating a set of security management database files (key3.db, cert8.db, and secmod.db):</para>
-<programlisting language="Bash">modutil -create</programlisting>
-
-    <para>Displaying basic module information or detailed information about the contents of a given module:</para>
-<programlisting language="Bash">modutil -list [modulename] </programlisting>
-
-    <para>Adding a PKCS #11 module, which includes setting a supporting library file, enabling ciphers, and setting default provider status for various security mechanisms:</para>
-<programlisting language="Bash">modutil -add modulename -libfile library-file [-ciphers cipher-enable-list] [-mechanisms mechanism-list] </programlisting>
-
-    <para>Adding a PKCS #11 module from an existing JAR file:</para>
-<programlisting language="Bash">modutil -jar JAR-file -installdir root-installation-directory [-tempdir temporary-directory] </programlisting>
-
-    <para>Deleting a specific PKCS #11 module from a security module database:</para>
-<programlisting language="Bash">modutil -delete modulename </programlisting>
-
-    <para>Initializing or changing a token's password:</para>
-<programlisting language="Bash">modutil -changepw tokenname [-pwfile old-password-file] [-newpwfile new-password-file] </programlisting>
-
-    <para>Setting the default provider status of various security mechanisms in an existing PKCS #11 module:</para>
-<programlisting language="Bash">modutil -default modulename -mechanisms mechanism-list </programlisting>
-
-    <para>Clearing the default provider status of various security mechanisms in an existing PKCS #11 module:</para>
-<programlisting language="Bash">modutil -undefault modulename -mechanisms mechanism-list </programlisting>
-
-    <para>Enabling a specific slot or all slots within a module:</para>
-<programlisting language="Bash">modutil -enable modulename [-slot slotname] </programlisting>
-
-    <para>Disabling a specific slot or all slots within a module:</para>
-<programlisting language="Bash">modutil -disable modulename [-slot slotname] </programlisting>
+  <refsection id="usage-and-examples">
+    <title>Usage and Examples</title>
 
-    <para>Enabling or disabling FIPS 140-2 compliance within the Netscape Communicator internal module:</para>
-<programlisting language="Bash">modutil -fips [true | false] </programlisting>
-
-    <para>Disabling interactive prompts for the Security Module Database Tool, to support scripted operation:</para>
-<programlisting language="Bash">modutil -force</programlisting>
-  </refsection>
-
-  <refsection id="examples">
-    <title>Extended Examples</title>
     <para><command>Creating Database Files</command></para>
-<programlisting language="Bash">modutil -create -dbdir c:\databases
+    <para>Before any operations can be performed, there must be a set of security databases available (<filename>cert8.db</filename>, <filename>key3.db</filename>, and <filename>secmod.db</filename>). <command>modutil</command> can be used to create these files. The only required argument is the database that where the databases will be located.</para>
+<programlisting language="Bash">modutil -create -dbdir directory</programlisting>
 
-Creating "c:\databases\key3.db"...done.
-Creating "c:\databases\cert8.db"...done.
-Creating "c:\databases\secmod.db"...done.</programlisting>
+	<para><command>Deleting a Module</command></para>
+    <para>A specific PKCS #11 module can be deleted from the <filename>secmod.db</filename> database:</para>
+<programlisting language="Bash">modutil -delete modulename </programlisting>
 
 	<para><command>Displaying Module Information</command></para>
+	<para>The <filename>secmod.db</filename> database 
+    <para>Displaying basic module information or detailed information about the contents of a given module:</para>
+<programlisting language="Bash">modutil -list [modulename] </programlisting>
+
+    <para>Displaying the module specs for any or all loaded modules:</para>
+<programlisting language="Bash">modutil -rawlist [modulename] </programlisting>
+   
 <programlisting language="Bash">modutil -list "Netscape Internal PKCS #11 Module" -dbdir c:\databases 
 
 Using database directory c:\databases...
@@ -299,6 +277,9 @@ Login Type: Login required
 User Pin: NOT Initialized</programlisting>
 
 	<para><command>Setting a Default Provider</command></para>
+
+    <para>Setting the default provider status of various security mechanisms in an existing PKCS #11 module:</para>
+<programlisting language="Bash">modutil -default modulename -mechanisms mechanism-list </programlisting>
 	<para>This example makes the specified module a default provider for the RSA, DSA, and RC2 security mechanisms:</para>
 
 <programlisting language="Bash">modutil -default "Cryptographic Module" -dbdir c:\databases -mechanisms RSA:DSA:RC2 
@@ -307,7 +288,16 @@ Using database directory c:\databases...
 
 Successfully changed defaults.</programlisting>
 
+    <para>Clearing the default provider status of various security mechanisms in an existing PKCS #11 module:</para>
+<programlisting language="Bash">modutil -undefault modulename -mechanisms mechanism-list </programlisting>
+
 	<para><command>Enabling a Slot</command></para>
+
+    <para>Enabling a specific slot or all slots within a module:</para>
+<programlisting language="Bash">modutil -enable modulename [-slot slotname] </programlisting>
+
+    <para>Disabling a specific slot or all slots within a module:</para>
+<programlisting language="Bash">modutil -disable modulename [-slot slotname] </programlisting>
 <programlisting language="Bash">modutil -enable "Cryptographic Module" -slot "Cryptographic Reader" -dbdir c:\databases 
 
 Using database directory c:\databases...
@@ -315,17 +305,28 @@ Using database directory c:\databases...
 Slot "Cryptographic Reader" enabled. </programlisting>
 
 	<para><command>Enabling FIPS Compliance</command></para>
+
+    <para>Enabling or disabling FIPS 140-2 compliance within the Netscape Communicator internal module:</para>
+<programlisting language="Bash">modutil -fips [true | false] </programlisting>
 <programlisting language="Bash">modutil -dbdir "C:\databases" -fips true 
 
 FIPS mode enabled. </programlisting>
 
 	<para><command>Adding a Cryptographic Module</command></para>
+
+    <para>Adding a PKCS #11 module, which includes setting a supporting library file, enabling ciphers, and setting default provider status for various security mechanisms:</para>
+<programlisting language="Bash">modutil -add modulename -libfile library-file [-ciphers cipher-enable-list] [-mechanisms mechanism-list] </programlisting>
 <programlisting language="Bash">modutil -dbdir "C:\databases" -add "Cryptorific Module" -libfile "C:\winnt\system32\crypto.dll" -mechanisms RSA:DSA:RC2:RANDOM 
 
 Using database directory C:\databases... 
 Module "Cryptorific Module" added to database.</programlisting>
 
+<programlisting language="Bash">modutil -rawadd modulespec</programlisting>
+
 	<para><command>Installing a Cryptographic Module from a JAR File</command></para>
+
+    <para>Adding a PKCS #11 module from an existing JAR file:</para>
+<programlisting language="Bash">modutil -jar JAR-file -installdir root-installation-directory [-tempdir temporary-directory] </programlisting>
 	<para>This example installs a cryptographic module from the following sample installation script.</para>
 <programlisting language="Bash">Platforms { 
    WinNT::x86 { 
@@ -382,6 +383,9 @@ Installed module "Cryptorific Module" into module database
 Installation completed successfully </programlisting>
 
 	<para><command>Changing the Password on a Token</command></para>
+
+    <para>Initializing or changing a token's password:</para>
+<programlisting language="Bash">modutil -changepw tokenname [-pwfile old-password-file] [-newpwfile new-password-file] </programlisting>
 <programlisting language="Bash">modutil -dbdir "c:\databases" -changepw "Communicator Certificate DB" 
 
 Using database directory c:\databases...