Index: general/genlib/openssl/openssl-config.xml
===================================================================
--- general/genlib/openssl/openssl-config.xml	(revision 959892a392fa7ea5aa74d13a37c20e47f039068c)
+++ general/genlib/openssl/openssl-config.xml	(revision b5e95905139234bd3f1f1e7c37d6d865704377c1)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring OpenSSL</title>
+<title>Configuring <application>OpenSSL</application></title>
 
 <sect3><title>Config files</title>
Index: general/genlib/openssl/openssl-desc.xml
===================================================================
--- general/genlib/openssl/openssl-desc.xml	(revision 959892a392fa7ea5aa74d13a37c20e47f039068c)
+++ general/genlib/openssl/openssl-desc.xml	(revision b5e95905139234bd3f1f1e7c37d6d865704377c1)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The <application>openssl</application> package contains
-<command>c_rehash</command>, <command>openssl</command>, <filename
+<para>The <application>openssl</application> package contains <command>
+c_rehash</command>, <command>openssl</command>, <filename
 class='libraryfile'>libcrypto</filename> libraries and <filename
 class='libraryfile'>libssl</filename> libraries.</para>
@@ -13,5 +13,7 @@
 <sect3><title>c_rehash</title>
 
-<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>
+<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,6 +21,8 @@
 <sect3><title>openssl</title>
 
-<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>
+<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>
@@ -26,8 +30,11 @@
 <sect3><title>libcrypto</title>
 
-<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>
+<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>
@@ -35,8 +42,8 @@
 <sect3><title>libssl</title>
  
-<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 
+<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>
  
Index: general/genlib/openssl/openssl-exp.xml
===================================================================
--- general/genlib/openssl/openssl-exp.xml	(revision 959892a392fa7ea5aa74d13a37c20e47f039068c)
+++ general/genlib/openssl/openssl-exp.xml	(revision b5e95905139234bd3f1f1e7c37d6d865704377c1)
@@ -3,6 +3,6 @@
 
 <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>
+otherwise <application>openssl</application> installs its passwd man page over 
+the existing system one which isn't what we want.</para>
 
 <para><screen><command>make MANDIR=/usr/share/man
@@ -10,12 +10,11 @@
 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>
+</filename> instead of the default which is <filename
+class='directory'>/etc/ssl/man</filename>.</para>
  
-<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>
+<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>
 
 </sect2>
Index: general/genlib/openssl/openssl-inst.xml
===================================================================
--- general/genlib/openssl/openssl-inst.xml	(revision 959892a392fa7ea5aa74d13a37c20e47f039068c)
+++ general/genlib/openssl/openssl-inst.xml	(revision b5e95905139234bd3f1f1e7c37d6d865704377c1)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Installation of OpenSSL</title>
+<title>Installation of <application>OpenSSL</application></title>
 
 <para>Install <application>openssl</application> by running the following commands:</para>
@@ -10,5 +10,5 @@
 </para></note>
 
-<screen><userinput>sed 's/^passwd/openssl-passwd/' doc/apps/passwd.pod \
+<screen><userinput><command>sed 's/^passwd/openssl-passwd/' doc/apps/passwd.pod \
 > doc/apps/openssl-passwd.pod &amp;&amp;
 rm doc/apps/passwd.pod &amp;&amp;
@@ -16,5 +16,5 @@
 make MANDIR=/usr/share/man &amp;&amp;
 make MANDIR=/usr/share/man install &amp;&amp;
-rmdir /etc/ssl/lib</userinput></screen>
+rmdir /etc/ssl/lib</command></userinput></screen>
 
 
Index: general/genlib/openssl/openssl-intro.xml
===================================================================
--- general/genlib/openssl/openssl-intro.xml	(revision 959892a392fa7ea5aa74d13a37c20e47f039068c)
+++ general/genlib/openssl/openssl-intro.xml	(revision b5e95905139234bd3f1f1e7c37d6d865704377c1)
@@ -1,8 +1,9 @@
 <sect2>
-<title>Introduction to OpenSSL</title>
+<title>Introduction to <application>OpenSSL</application></title>
 
-<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 <application>openssl</application> 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>
 
 
Index: general/genlib/pcre/pcre-inst.xml
===================================================================
--- general/genlib/pcre/pcre-inst.xml	(revision 959892a392fa7ea5aa74d13a37c20e47f039068c)
+++ general/genlib/pcre/pcre-inst.xml	(revision b5e95905139234bd3f1f1e7c37d6d865704377c1)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of pcre</title>
+<title>Installation of <application>pcre</application></title>
 
 <para>Install <application>pcre</application> by running the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen>
+make install</command></userinput></screen>
 
 </sect2>
Index: general/genlib/pcre/pcre-intro.xml
===================================================================
--- general/genlib/pcre/pcre-intro.xml	(revision 959892a392fa7ea5aa74d13a37c20e47f039068c)
+++ general/genlib/pcre/pcre-intro.xml	(revision b5e95905139234bd3f1f1e7c37d6d865704377c1)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Introduction to pcre</title>
+<title>Introduction to <application>pcre</application></title>
 
 <para>The <application>pcre</application> package contains
