diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
index 9890703a99..1c0715e22a 100644
--- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml
@@ -1467,7 +1467,7 @@ export PATH</programlisting>
 	board with 2 800&nbsp;MHz &pentium;&nbsp;III processors, &adaptec; 29160 Ultra160
 	SCSI adapter (for accessing a 40/80&nbsp;GB DLT tape drive and CDROM),
 	&mylex; &acceleraid; (2 channels, firmware 6.00-1-00 with 32&nbsp;MB RAM).
-	To the &mylex; Raid-controller are attached two 17&nbsp;GB hard disks
+	To the &mylex; RAID controller are attached two 17&nbsp;GB hard disks
 	(mirrored) and four 36&nbsp;GB hard disks (RAID level 5).</para>
       </sect3>
 
@@ -1476,8 +1476,8 @@ export PATH</programlisting>
 
       <para>For this installation a &dell; &poweredge; 2500 was used: a
 	dual processor board with two 1000&nbsp;MHz &pentium;&nbsp;III processors
-	(256&nbsp;kB Cache), 2&nbsp;GB PC133 ECC SDRAM, PERC/3 DC PCI Raid Controller
-	with 128&nbsp;MB, and an EIDE DVD-ROM drive. To the RAID-controller are
+	(256&nbsp;kB Cache), 2&nbsp;GB PC133 ECC SDRAM, PERC/3 DC PCI RAID Controller
+	with 128&nbsp;MB, and an EIDE DVD-ROM drive. To the RAID controller are
 	attached two 18&nbsp;GB hard disks (mirrored) and four 36&nbsp;GB hard disks
 	(RAID level 5).</para>
       </sect3>
@@ -1567,11 +1567,11 @@ export PATH</programlisting>
 	<para>Configure and initialize the two logical drives
 	  with the &mylex; or PERC/3 RAID software beforehand.
 	  The software can be started during the
-	  bios boot phase.</para>
+	  <acronym>BIOS</acronym> boot phase.</para>
 
 	<para> Please note that this disk layout differs slightly from
 	  the &sap; recommendations, as &sap; suggests mounting the
-	  oracle-subdirectories (and some others) separately - I
+	  <application>&oracle;</application> subdirectories (and some others) separately &mdash; we
 	  decided to just create them as real subdirectories for
 	  simplicity.</para>
       </sect3>
@@ -1579,7 +1579,7 @@ export PATH</programlisting>
       <sect3 id="makeworldandnewkernel">
 	<title><command>make world</command> and a New Kernel</title>
 
-	<para>Download the latest stable-sources. Rebuild world and your
+	<para>Download the latest -STABLE sources. Rebuild world and your
 	  custom kernel after configuring your kernel configuration file.
 	  Here you should also include the
 	  <link linkend="kerneltuning">kernel parameters</link>
@@ -1644,7 +1644,7 @@ pam-0.68-7.i386.rpm</userinput></screen>
 	  relinking during <application>&oracle;</application> installation
 	  will not work).  There are some other issues regarding
 	  relinking of <application>&oracle;</application>, but that is
-	  a &oracle; Linux issue, not FreeBSD specific.</para>
+	  a <application>&oracle;</application> Linux issue, not FreeBSD specific.</para>
 
       </sect3>
 
@@ -1695,7 +1695,7 @@ pam-0.68-7.i386.rpm</userinput></screen>
 	</informaltable>
 
 	<para>It is also necessary to created some links. Otherwise
-	  the &sap; Installer will complain, as it is checking the
+	  the <application>&sap;</application> Installer will complain, as it is checking the
 	  created links:</para>
 
 	<screen>&prompt.root; <userinput>ln -s /compat/linux/oracle /oracle</userinput>
@@ -1727,22 +1727,22 @@ ERROR 2002-03-19 16:45:36 R3LINKS_IND_IND Ins_SetupLinks:0
 
 	<para><application>&sap.r3;</application> needs two users and
 	  three groups. The user names depend on the
-	  <application>&sap;</application> system id (SID) which consists
+	  <application>&sap;</application> system ID (SID) which consists
 	  of three letters. Some of these SIDs are reserved
 	  by <application>&sap;</application> (for example
-	  <emphasis>&sap;</emphasis> and <emphasis>NIX</emphasis>. For a
-	  complete list please see the &sap; documentation).  For the IDES
-	  installation I used <emphasis>IDS</emphasis>, for the
-	  4.6C SR2 installation <emphasis>PRD</emphasis>, as that system
+	  <literal>SAP</literal> and <literal>NIX</literal>. For a
+	  complete list please see the <application>&sap;</application> documentation).  For the IDES
+	  installation we used <literal>IDS</literal>, for the
+	  4.6C SR2 installation <literal>PRD</literal>, as that system
 	  is intended for production use.  We have
-	  therefore the following groups (group ids might differ, these
-	  are just the values I used with my installation):</para>
+	  therefore the following groups (group IDs might differ, these
+	  are just the values we used with our installation):</para>
 
         <informaltable>
           <tgroup cols="3">
           <thead>
           <row>
-            <entry>group id</entry>
+            <entry>group ID</entry>
             <entry>group name</entry>
             <entry>description</entry>
           </row>
@@ -1767,11 +1767,11 @@ ERROR 2002-03-19 16:45:36 R3LINKS_IND_IND Ins_SetupLinks:0
           </tgroup>
         </informaltable>
 
-        <para>For a default &oracle; Installation, only group
+        <para>For a default <application>&oracle;</application> installation, only group
           <groupname>dba</groupname> is used. As
-          <groupname>oper</groupname>-group, one also uses group
-          <groupname>dba</groupname> (see &oracle; and
-          &sap; documentation for further information).</para>
+          <groupname>oper</groupname> group, one also uses group
+          <groupname>dba</groupname> (see <application>&oracle;</application> and
+          <application>&sap;</application> documentation for further information).</para>
 
         <para>We also need the following users:</para>
 
@@ -1779,7 +1779,7 @@ ERROR 2002-03-19 16:45:36 R3LINKS_IND_IND Ins_SetupLinks:0
           <tgroup cols="6">
           <thead>
           <row>
-            <entry>user id</entry>
+            <entry>user ID</entry>
             <entry>user name</entry>
             <entry>generic name</entry>
             <entry>group</entry>
@@ -1802,15 +1802,15 @@ ERROR 2002-03-19 16:45:36 R3LINKS_IND_IND Ins_SetupLinks:0
             <entry>ora<replaceable>sid</replaceable></entry>
             <entry>dba</entry>
             <entry>oper</entry>
-            <entry>DB Administrator</entry>
+            <entry>&oracle; Administrator</entry>
           </row>
           </tbody>
           </tgroup>
         </informaltable>
 
-        <para>Adding the users with <command>adduser</command>
+        <para>Adding the users with &man.adduser.8;
           requires the following (please note shell and home
-          directory) entries for &sap; Administrator:</para>
+          directory) entries for <quote>&sap; Administrator</quote>:</para>
 
         <programlisting>Name: <replaceable>sid</replaceable>adm
 Password: ******
@@ -1822,7 +1822,7 @@ Groups: sapsys dba
 HOME: /home/<replaceable>sid</replaceable>adm
 Shell: bash  (/compat/linux/bin/bash)</programlisting>
 
-        <para>and for Database-Administrator:</para>
+        <para>and for <quote>&oracle; Administrator</quote>:</para>
 
         <programlisting>Name: ora<replaceable>sid</replaceable> 
 Password: ****** 
@@ -1845,7 +1845,7 @@ Shell: bash  (/compat/linux/bin/bash)</programlisting>
         <title>Creating Directories</title>
 
         <para>These directories are usually created as separate
-          file systems.  This depends entirely on your requirements.  I
+          file systems.  This depends entirely on your requirements.  We
           choose to create them as simple directories, as they are all
           located on the same RAID 5 anyway:</para>
 
@@ -1870,7 +1870,7 @@ Shell: bash  (/compat/linux/bin/bash)</programlisting>
 &prompt.root; <userinput>mkdir saparch sapreorg</userinput>
 &prompt.root; <userinput>exit</userinput></screen>
 
-	<para>For the <application>&oracle; 8.1.7</application>-installation
+	<para>For the <application>&oracle; 8.1.7</application> installation
 	  some additional directories are needed:</para>
 
 	<screen>&prompt.root; <userinput>su - ora<replaceable>sid</replaceable></userinput>
@@ -1883,7 +1883,7 @@ Shell: bash  (/compat/linux/bin/bash)</programlisting>
 &prompt.root; <userinput>mkdir 817_32</userinput></screen>
 
 	<note><para>The directory <filename>client/80x_32</filename> is used
-	  with exactly this name. Don't replace the <emphasis>x</emphasis>
+	  with exactly this name. Do not replace the <emphasis>x</emphasis>
 	  with some number or anything.</para></note>
 
         <para>In the third step we create directories as user 
@@ -1899,18 +1899,18 @@ Shell: bash  (/compat/linux/bin/bash)</programlisting>
       <sect3 id="entriesinslashetcslashservices">
         <title>Entries in /etc/services</title>
 
-        <para>&sap.r3; requires some entries in file
+        <para><application>&sap.r3;</application> requires some entries in file
           <filename>/etc/services</filename>, which will not be set
           correctly during installation under FreeBSD.  Please add the
           following entries (you need at least those entries
-          corresponding to the instance number - in this case,
-          <emphasis>00</emphasis>.  It will do no harm adding all
-          entries from <emphasis>00</emphasis> to
-          <emphasis>99</emphasis> for <emphasis>dp</emphasis>,
-          <emphasis>gw</emphasis>, <emphasis>sp</emphasis> and
-          <emphasis>ms</emphasis>). If you are going to use a saprouter
-	  or need to access &sap; OSS, you also need <emphasis>99</emphasis>,
-	  as port 3299 is usually used for the saprouter process on the
+          corresponding to the instance number &mdash; in this case,
+          <literal>00</literal>.  It will do no harm adding all
+          entries from <literal>00</literal> to
+          <literal>99</literal> for <literal>dp</literal>,
+          <literal>gw</literal>, <literal>sp</literal> and
+          <literal>ms</literal>). If you are going to use a <application>SAProuter</application>
+	  or need to access <application>&sap;</application> OSS, you also need <literal>99</literal>,
+	  as port 3299 is usually used for the <application>SAProuter</application> process on the
 	  target system:</para>
 
         <programlisting>
@@ -1926,15 +1926,15 @@ sapgw00s   4800/tcp # SAP Secure Gateway   4800 + Instance-Number</programlistin
         <title>Necessary Locales</title>
 	<indexterm><primary>locale</primary></indexterm>
 
-        <para>&sap; requires at least two locales that are not part of
+        <para><application>&sap;</application> requires at least two locales that are not part of
           the default RedHat installation. &sap; offers the required
-          RPMs as download from their FTP-server (which is only
-          accessible if you are a customer with OSS-access).  See note
+          RPMs as download from their FTP server (which is only
+          accessible if you are a customer with OSS access).  See note
           0171356 for a list of RPMs you need.</para>
 
         <para>It is also possible to just create appropriate links
           (for example from <emphasis>de_DE</emphasis> and
-          <emphasis>en_US</emphasis> ), but I would not recommend this
+          <emphasis>en_US</emphasis> ), but we would not recommend this
           for a production system (so far it worked with the IDES
           system without any problems, though).  The following locales
           are needed:</para>
@@ -1951,16 +1951,16 @@ en_US.ISO-8859-1</programlisting>
         <para>If they are not present, there will be some problems
           during the installation.  If these are then subsequently
           ignored (by setting the status of the offending steps to
-          OK in file CENTRDB.R3S), it will be impossible to log onto
-          the &sap; system without some additional effort.</para>
+          <literal>OK</literal> in file <filename>CENTRDB.R3S</filename>), it will be impossible to log onto
+          the <application>&sap;</application> system without some additional effort.</para>
       </sect3>
 
       <sect3 id="kerneltuning">
         <title>Kernel Tuning</title>
 	<indexterm><primary>kernel tuning</primary></indexterm>
 
-        <para>&sap.r3; Systems need a lot of resources.  I therefore
-        added the following parameters to my kernel config-file:</para>
+        <para><application>&sap.r3;</application> systems need a lot of resources.  We therefore
+        added the following parameters to the kernel configuration file:</para>
 
         <programlisting># Set these for memory pigs (SAP and Oracle):
 options MAXDSIZ="(1024*1024*1024)"
@@ -1984,14 +1984,14 @@ options SEMUME=100       #number of UNDO keys</programlisting>
 
         <para>The minimum values are specified in the documentation that
           comes from &sap;.  As there is no description for Linux, see the
-          HP-UX-section (32-bit) for further information. As the system
+          HP-UX section (32-bit) for further information. As the system
 	  for the 4.6C SR2 installation has more main memory, the shared
 	  segments can be larger both for <application>&sap;</application>
 	  and <application>&oracle;</application>, therefore choose a larger
 	  number of shared memory pages.</para>
 
-	<note><para>With the default installation of FreeBSD&nbsp;4.5 on x386,
-	  leave MAXDSIZ and DFLDSIZ at 1&nbsp;GB maximum. Otherwise, strange 
+	<note><para>With the default installation of FreeBSD&nbsp;4.5 on &i386;,
+	  leave <literal>MAXDSIZ</literal> and <literal>DFLDSIZ</literal> at 1&nbsp;GB maximum. Otherwise, strange 
 	  errors like <errorname>ORA-27102: out of memory</errorname> and 
           <errorname>Linux Error: 12: Cannot allocate memory</errorname>
           might happen.</para></note>