Index: boot/common/settingenviron.xml
===================================================================
--- boot/common/settingenviron.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
+++ boot/common/settingenviron.xml	(revision 4a9cdca001d399f679d59815ae117578f6b8ef7a)
@@ -11,9 +11,9 @@
   <title>Setting Up the Environment</title>
 
-  <para>The new instance of the shell is a <emphasis>non-login</emphasis>
-  shell, will read <filename>.bash_profile</filename> file. Create the
-  <filename>.bash_profile</filename> file now:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../final-preps/settingenviron.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>cat &gt; ${LFS}/root/.bash_profile &lt;&lt; "EOF"
+<screen os="b"><userinput>cat &gt; ${LFS}/root/.bash_profile &lt;&lt; "EOF"
 <literal>PS1='\u:\w\$ '
 LC_ALL=POSIX
@@ -22,15 +22,9 @@
 EOF</userinput></screen>
 
-  <para>The <envar>LC_ALL</envar> variable controls the localization of
-  certain programs, making their messages follow the conventions of a
-  specified country. If the host system uses a version of Glibc older
-  than 2.2.4, having <envar>LC_ALL</envar> set to something other than
-  <quote>POSIX</quote> or <quote>C</quote> (during this chapter) may cause
-  issues if you exit the chroot environment and wish to return later.
-  Setting <envar>LC_ALL</envar> to <quote>POSIX</quote> or <quote>C</quote>
-  (the two are equivalent) ensures that everything will work as expected
-  in the chroot environment.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../final-preps/settingenviron.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-  <para>By putting <filename class="directory">/tools/bin</filename> ahead
+  <para os="i">By putting <filename class="directory">/tools/bin</filename> ahead
   of the standard <envar>PATH</envar>, all the programs installed in
   <xref linkend="chapter-temporary-tools"/> are picked up by the shell
Index: final-preps/settingenviron.xml
===================================================================
--- final-preps/settingenviron.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
+++ final-preps/settingenviron.xml	(revision 4a9cdca001d399f679d59815ae117578f6b8ef7a)
@@ -11,14 +11,14 @@
   <title>Setting Up the Environment</title>
 
-  <para>Set up a good working environment by creating two new startup
+  <para os="a">Set up a good working environment by creating two new startup
   files for the <command>bash</command> shell. While logged in as user
   <systemitem class="username">lfs</systemitem>, issue the following
   command to create a new <filename>.bash_profile</filename>:</para>
 
-<screen><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"
+<screen os="b"><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"
 <literal>exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash</literal>
 EOF</userinput></screen>
 
-  <para>When logged on as user <systemitem class="username">lfs</systemitem>,
+  <para os="c">When logged on as user <systemitem class="username">lfs</systemitem>,
   the initial shell is usually a <emphasis>login</emphasis> shell which
   reads the <filename>/etc/profile</filename> of the host (probably
@@ -33,5 +33,5 @@
   technique used here achieves the goal of ensuring a clean environment.</para>
 
-  <para>The new instance of the shell is a <emphasis>non-login</emphasis>
+  <para os="d">The new instance of the shell is a <emphasis>non-login</emphasis>
   shell, which does not read the <filename>/etc/profile</filename> or
   <filename>.bash_profile</filename> files, but rather reads the
@@ -39,5 +39,5 @@
   <filename>.bashrc</filename> file now:</para>
 
-<screen><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
+<screen os="e"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
 <literal>set +h
 umask 022
@@ -48,5 +48,5 @@
 EOF</userinput></screen>
 
-  <para>The <command>set +h</command> command turns off
+  <para os=f">The <command>set +h</command> command turns off
   <command>bash</command>'s hash function. Hashing is ordinarily a useful
   feature&mdash;<command>bash</command> uses a hash table to remember the
@@ -60,5 +60,5 @@
   different location.</para>
 
-  <para>Setting the user file-creation mask (umask) to 022 ensures that
+  <para os="g">Setting the user file-creation mask (umask) to 022 ensures that
   newly created files and directories are only writable by their owner,
   but are readable and executable by anyone (assuming default modes are
@@ -66,8 +66,8 @@
   mode 644 and directories with mode 755).</para>
 
-  <para>The <envar>LFS</envar> variable should be set to the
+  <para os="g">The <envar>LFS</envar> variable should be set to the
   chosen mount point.</para>
 
-  <para>TO BE REWRITTEN - The <envar>LC_ALL</envar> variable controls
+  <para os="h">TO BE REWRITTEN - The <envar>LC_ALL</envar> variable controls
   the localization of
   certain programs, making their messages follow the conventions of a
@@ -80,5 +80,5 @@
   the chroot environment.</para>
 
-  <para>By putting <filename class="directory">/tools/bin</filename> ahead
+  <para os="i">By putting <filename class="directory">/tools/bin</filename> ahead
   of the standard <envar>PATH</envar>, all the programs installed in
   <xref linkend="chapter-temp-system"/> are picked up by the shell
@@ -87,8 +87,8 @@
   the same programs are available in the temporary system.</para>
 
-  <para>Finally, to have the environment fully prepared for building the
+  <para os="j">Finally, to have the environment fully prepared for building the
   temporary tools, source the just-created user profile:</para>
 
-<screen><userinput>source ~/.bash_profile</userinput></screen>
+<screen os="k"><userinput>source ~/.bash_profile</userinput></screen>
 
 </sect1>
