Index: general/genlib/openssl/openssl-config.xml
===================================================================
--- general/genlib/openssl/openssl-config.xml	(revision fbd0a56941b7249ae165f0b6362f3179805a0af3)
+++ general/genlib/openssl/openssl-config.xml	(revision b68dce59a3bee1c1a9f56ae65a6a044c71e9adc2)
@@ -1,14 +1,16 @@
 <sect2>
-<title>Configuring Openssl</title>
+<title>Configuring OpenSSL</title>
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/ssl/openssl.cnf</userinput></para>
+<para><filename>/etc/ssl/openssl.cnf</filename></para>
 </sect3>
 
 <sect3><title>Configuration Information</title>
 
-<para>Most people who just want to use openssl for providing functions
-to other programs such as OpenSSH and web browsers won't need to worry
-about configuring openssl.  Configuring openssl is an advanced topic and
+<para>Most people who just want to use
+<application>openssl</application> for providing functions
+to other programs such as <application>OpenSSH</application> and web browsers won't need to worry
+about configuring <application>openssl</application>.  Configuring
+<application>openssl</application> is an advanced topic and
 so those who do would normally be expected to either know how to do it
 or to be able to find out how to do it.</para>
Index: general/genlib/openssl/openssl-desc.xml
===================================================================
--- general/genlib/openssl/openssl-desc.xml	(revision fbd0a56941b7249ae165f0b6362f3179805a0af3)
+++ general/genlib/openssl/openssl-desc.xml	(revision b68dce59a3bee1c1a9f56ae65a6a044c71e9adc2)
@@ -2,7 +2,5 @@
 <title>Contents</title>
 
-<para>The openssl package contains <userinput>c_rehash</userinput>,
-<userinput>openssl</userinput>, <filename>libcrypto</filename> libraries and
-<filename>libssl</filename> libraries.</para>
+<para>The <application>openssl</application> package contains <command>c_rehash</command>, <command>openssl</command>, <filename>libcrypto</filename> libraries and <filename>libssl</filename> libraries.</para>
 
 </sect2>
@@ -12,6 +10,5 @@
 <sect3><title>c_rehash</title>
 
-<para>c_rehash is a perl script that scans all files in a directory and
-adds symbolic links to their hash values.</para>
+<para><command>c_rehash</command> is a <application>perl</application> script that scans all files in a directory and adds symbolic links to their hash values.</para>
 
 </sect3>
@@ -19,8 +16,6 @@
 <sect3><title>openssl</title>
 
-<para>The openssl program is a command line tool for using the various
-cryptography functions of OpenSSL's crypto library from the shell.  
-It can be used for various functions which are documented in
-<userinput>man 1 openssl</userinput>.</para>
+<para>The <command>openssl</command> program is a command line tool for using the various cryptography functions of <application>OpenSSL</application>'s crypto
+library from the shell. It can be used for various functions which are documented in <command>man 1 openssl</command>.</para>
 
 </sect3>
@@ -28,9 +23,8 @@
 <sect3><title>libcrypto</title>
 
-<para>The OpenSSL crypto library implements a wide range of cryptographic 
-algorithms used in various Internet standards. The services provided by 
-this library are used by the OpenSSL implementations of SSL, TLS and S/MIME, 
-and they have also been used to implement SSH, OpenPGP, and other 
-cryptographic standards.</para>
+<para>The <application>OpenSSL</application> crypto library implements a wide range of cryptographic  algorithms used in various Internet standards. The services provided by  this library are used by the <application>OpenSSL</application> implementations of <acronym>SSL</acronym>, <acronym>TLS</acronym> and
+<acronym>S/MIME</acronym>, and they have also been used to implement
+<application>OpenSSH</application>, <application>OpenPGP</application>,
+and other cryptographic standards.</para>
 
 </sect3>
@@ -38,8 +32,9 @@
 <sect3><title>libssl</title>
  
-<para>The OpenSSL ssl library implements the Secure Sockets Layer (SSL 
-v2/v3) and Transport Layer Security (TLS v1) protocols. It provides a rich 
-API, documentation on which can be found by running 
-<userinput>man 3 ssl</userinput>.</para>
+<para>The <application>OpenSSL</application> <acronym>SSL</acronym> library implements the
+Secure Sockets Layer (<acronym>SSL</acronym> v2/v3) and Transport Layer
+Security (<acronym>TLS</acronym> v1) protocols. It provides a rich
+<acronym>API</acronym>, documentation on which can be found by running 
+<command>man 3 ssl</command>.</para>
  
 </sect3>
Index: general/genlib/openssl/openssl-exp.xml
===================================================================
--- general/genlib/openssl/openssl-exp.xml	(revision fbd0a56941b7249ae165f0b6362f3179805a0af3)
+++ general/genlib/openssl/openssl-exp.xml	(revision b68dce59a3bee1c1a9f56ae65a6a044c71e9adc2)
@@ -2,17 +2,19 @@
 <title>Command explanations</title>
 
-<para><userinput>rm doc/apps/passwd.pod </userinput> : We do this because otherwise openssl installs its passwd man page over the 
+<para><command>rm doc/apps/passwd.pod </command> : We do this because
+otherwise <application>openssl</application> installs its passwd man page over the 
 existing system one which isn't what we want.</para>
 
-<para><screen><userinput>make MANDIR=/usr/share/man</userinput>
-<userinput>make MANDIR=/usr/share/man install</userinput></screen> These 
-commands install openssl with the man pages in <filename>/usr/share/man
-</filename> instead of the default which is <filename>/etc/ssl/man</filename>.
-</para>
+<para><screen><command>make MANDIR=/usr/share/man
+make MANDIR=/usr/share/man install</command></screen> These 
+commands install <application>openssl</application> with the man pages
+in <filename class='directory'>/usr/share/man
+</filename> instead of the default which is <filename class='directory'>/etc/ssl/man</filename>.</para>
  
-<para><userinput>rmdir /etc/ssl/lib</userinput> : This is simply a
-tidy-up command.  For some reason, the openssl install routine creates
-the <filename>/etc/ssl/lib</filename> directory even though the libraries have 
-been installed in <filename>/usr/lib</filename>.  We remove it to keep things 
+<para><command>rmdir /etc/ssl/lib</command> : This is simply a
+tidy-up command.  For some reason, the
+<application>openssl</application> install routine creates
+the <filename class='directory'>/etc/ssl/lib</filename> directory even though the libraries have 
+been installed in <filename class='directory'>/usr/lib</filename>.  We remove it to keep things 
 nice and tidy!</para>
 
Index: general/genlib/openssl/openssl-inst.xml
===================================================================
--- general/genlib/openssl/openssl-inst.xml	(revision fbd0a56941b7249ae165f0b6362f3179805a0af3)
+++ general/genlib/openssl/openssl-inst.xml	(revision b68dce59a3bee1c1a9f56ae65a6a044c71e9adc2)
@@ -1,20 +1,20 @@
 <sect2>
-<title>Installation of openssl</title>
+<title>Installation of OpenSSL</title>
 
-<para>Install openssl by running the following commands:</para>
+<para>Install <application>openssl</application> by running the following commands:</para>
 
-<note><para>GCC issues a warning on every compilation because the Configure 
+<note><para><application>GCC</application> issues a warning on every
+compilation because the <command>Configure</command> 
 command uses -m486 instead of -march=i486.  To fix this behavior, use
 linux-ppro, linux-pentium or linux-k6 (depending on your architecture), instead of linux-elf. 
 </para></note>
 
-<para><screen><userinput>sed 's/^passwd/openssl-passwd/' doc/apps/passwd.pod \
+<screen><userinput>sed 's/^passwd/openssl-passwd/' doc/apps/passwd.pod \
 > doc/apps/openssl-passwd.pod &amp;&amp;
 rm doc/apps/passwd.pod &amp;&amp;
-./Configure linux-elf  --openssldir=/etc/ssl --prefix=/usr shared &amp;&amp;</userinput>
-<userinput>make MANDIR=/usr/share/man &amp;&amp;</userinput>
-<userinput>make MANDIR=/usr/share/man install &amp;&amp;</userinput>
-<userinput>rmdir /etc/ssl/lib</userinput></screen>
-</para>
+./Configure linux-elf  --openssldir=/etc/ssl --prefix=/usr shared &amp;&amp;
+make MANDIR=/usr/share/man &amp;&amp;
+make MANDIR=/usr/share/man install &amp;&amp;
+rmdir /etc/ssl/lib</userinput></screen>
 
 
Index: general/genlib/openssl/openssl-intro.xml
===================================================================
--- general/genlib/openssl/openssl-intro.xml	(revision fbd0a56941b7249ae165f0b6362f3179805a0af3)
+++ general/genlib/openssl/openssl-intro.xml	(revision b68dce59a3bee1c1a9f56ae65a6a044c71e9adc2)
@@ -1,16 +1,18 @@
 <sect2>
-<title>Introduction to openssl</title>
+<title>Introduction to OpenSSL</title>
 
-<screen>Download location (HTTP):       <ulink url="&openssl-download-http;"/>
-Download location (FTP):        <ulink url="&openssl-download-ftp;"/>
-Version used:                   &openssl-version;
-Package size:                   &openssl-size;
-Estimated Disk space required:  &openssl-buildsize;</screen>
+<para>The openssl package contains management tools and libraries relating to
+cryptography.  These are useful for providing cryptography functions to
+other packages, notably <application>OpenSSH</application> and web browsers (for accessing secure https sites).</para>
 
-<para>The openssl package contains <userinput>c_rehash</userinput>,
-<userinput>openssl</userinput>, <userinput>libcrypto</userinput> and
-<userinput>libssl</userinput>.  These are useful for providing
-cryptography functions to other packages, notably OpenSSH and web
-browsers (for accessing secure https sites).</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&openssl-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&openssl-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &openssl-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &openssl-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &openssl-time;</para></listitem></itemizedlist>
+</sect3>
 
 </sect2>
