Index: chapter02/stages.xml
===================================================================
--- chapter02/stages.xml	(revision f9dc44bc487219fa7351131ab912b614f0f57032)
+++ chapter02/stages.xml	(revision 2ad6d436618d0e71e3ca0abd2560793d638a6ab9)
@@ -72,6 +72,5 @@
         <quote>Entering the Chroot Environment</quote> must be done as the
         <systemitem class="username">root</systemitem> user, with the LFS
-        environment variable set for the
-        <systemitem class="username">root</systemitem>user.</para>
+        environment variable set for the &root; user.</para>
       </listitem>
 
Index: chapter04/addinguser.xml
===================================================================
--- chapter04/addinguser.xml	(revision f9dc44bc487219fa7351131ab912b614f0f57032)
+++ chapter04/addinguser.xml	(revision 2ad6d436618d0e71e3ca0abd2560793d638a6ab9)
@@ -87,6 +87,6 @@
 
   <note><para>In some host systems, the following command does not complete
-  properly and suspends the login to the lfs user to the background.  If the
-  prompt "lfs:~$" does not appear immediately, entering the
+  properly and suspends the login to the &lfs-user; user to the background.
+  If the prompt "lfs:~$" does not appear immediately, entering the
   <command>fg</command> command will fix the issue.</para></note>
 
Index: chapter07/cleanup.xml
===================================================================
--- chapter07/cleanup.xml	(revision f9dc44bc487219fa7351131ab912b614f0f57032)
+++ chapter07/cleanup.xml	(revision 2ad6d436618d0e71e3ca0abd2560793d638a6ab9)
@@ -157,7 +157,7 @@
 
     <warning><para>The following commands are extremely dangerous.  If
-    you run <command>rm -rf ./*</command> as the root user and you
+    you run <command>rm -rf ./*</command> as the &root; user and you
     do not change to the $LFS directory or the <envar>LFS</envar>
-    environment variable is not set for the root user, it will destroy
+    environment variable is not set for the &root; user, it will destroy
     your entire host system.  YOU ARE WARNED.</para></warning>
 
Index: chapter07/introduction.xml
===================================================================
--- chapter07/introduction.xml	(revision f9dc44bc487219fa7351131ab912b614f0f57032)
+++ chapter07/introduction.xml	(revision 2ad6d436618d0e71e3ca0abd2560793d638a6ab9)
@@ -26,5 +26,5 @@
   run as <systemitem class="username">root</systemitem>, with the
   <envar>LFS</envar> variable set. After entering chroot, all commands
-  are run as root, fortunately without access to the OS of the computer
+  are run as &root;, fortunately without access to the OS of the computer
   you built LFS on. Be careful anyway, as it is easy to destroy the whole
   LFS system with badly formed commands.</para>
Index: chapter08/bash.xml
===================================================================
--- chapter08/bash.xml	(revision f9dc44bc487219fa7351131ab912b614f0f57032)
+++ chapter08/bash.xml	(revision 2ad6d436618d0e71e3ca0abd2560793d638a6ab9)
@@ -74,5 +74,5 @@
 <screen><userinput remap="test">chown -Rv tester .</userinput></screen>
 
-    <para>The testsuite of the package is designed to be run as a non-root
+    <para>The testsuite of the package is designed to be run as a non-&root;
     user that owns the terminal connected to standard input.  To satisfy the
     requirement, spawn a new pseudo terminal using
Index: chapter08/coreutils.xml
===================================================================
--- chapter08/coreutils.xml	(revision f9dc44bc487219fa7351131ab912b614f0f57032)
+++ chapter08/coreutils.xml	(revision 2ad6d436618d0e71e3ca0abd2560793d638a6ab9)
@@ -125,6 +125,6 @@
 <screen><userinput remap="test">echo "dummy:x:102:tester" &gt;&gt; /etc/group</userinput></screen>
 
-    <para>Fix some of the permissions so that the non-root user can compile and
-    run the tests:</para>
+    <para>Fix some of the permissions so that the non-&root; user can
+    compile and run the tests:</para>
 
 <screen><userinput remap="test">chown -Rv tester . </userinput></screen>
Index: chapter08/util-linux.xml
===================================================================
--- chapter08/util-linux.xml	(revision f9dc44bc487219fa7351131ab912b614f0f57032)
+++ chapter08/util-linux.xml	(revision 2ad6d436618d0e71e3ca0abd2560793d638a6ab9)
@@ -85,5 +85,5 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>If desired, run the test suite as a non-root user:</para>
+    <para>If desired, run the test suite as a non-&root; user:</para>
 
     <warning><para>Running the test suite as the
Index: chapter10/kernel.xml
===================================================================
--- chapter10/kernel.xml	(revision f9dc44bc487219fa7351131ab912b614f0f57032)
+++ chapter10/kernel.xml	(revision 2ad6d436618d0e71e3ca0abd2560793d638a6ab9)
@@ -249,6 +249,6 @@
       <para>If the host system has a separate /boot partition, the files copied
       below should go there. The easiest way to do that is to bind /boot on the
-      host (outside chroot) to /mnt/lfs/boot before proceeding.  As the root
-      user in the <emphasis>host system</emphasis>:</para>
+      host (outside chroot) to /mnt/lfs/boot before proceeding.  As the
+      &root; user in the <emphasis>host system</emphasis>:</para>
 
 <screen role="nodump"><userinput>mount --bind /boot /mnt/lfs/boot</userinput></screen>
Index: chapter11/reboot.xml
===================================================================
--- chapter11/reboot.xml	(revision f9dc44bc487219fa7351131ab912b614f0f57032)
+++ chapter11/reboot.xml	(revision 2ad6d436618d0e71e3ca0abd2560793d638a6ab9)
@@ -47,6 +47,6 @@
     <listitem><para>Installing <ulink
     url='&blfs-book;postlfs/sudo.html'>sudo</ulink> may be useful for
-    building packages as a non-root user and easily installing the resulting
-    packages in your new system.</para></listitem>
+    building packages as a non-&root; user and easily installing the
+    resulting packages in your new system.</para></listitem>
 
     <listitem><para>If you want to access your new system from a remote system
