Index: BOOK/boot/mips64/flags.xml
===================================================================
--- BOOK/boot/mips64/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/boot/mips64/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -13,9 +13,10 @@
   <para>We will need to copy our build variables into our new system:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; \
-    ${CLFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
+export BUILD32="${BUILD32}"
+export BUILDN32="${BUILDN32}"
+export BUILD64="${BUILD64}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+EOF</userinput></screen>
 
 </sect1>
Index: BOOK/boot/sparc64/flags.xml
===================================================================
--- BOOK/boot/sparc64/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/boot/sparc64/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -13,8 +13,9 @@
   <para>We will need to copy our build variables into our new system:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; \
-    ${CLFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+EOF</userinput></screen>
 
 </sect1>
Index: BOOK/boot/x86_64/flags.xml
===================================================================
--- BOOK/boot/x86_64/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/boot/x86_64/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -13,8 +13,9 @@
   <para>We will need to copy our build variables into our new system:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; \
-    ${CLFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+EOF</userinput></screen>
 
 </sect1>
Index: BOOK/chroot/mips64/flags.xml
===================================================================
--- BOOK/chroot/mips64/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/chroot/mips64/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -25,8 +25,10 @@
    variables to prevent any build issues in the future:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
+export BUILD32="${BUILD32}"
+export BUILDN32="${BUILDN32}"
+export BUILD64="${BUILD64}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+EOF</userinput></screen>
 
 </sect1>
Index: BOOK/chroot/ppc64/flags.xml
===================================================================
--- BOOK/chroot/ppc64/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/chroot/ppc64/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -24,7 +24,9 @@
    variables to prevent any build issues in the future:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+EOF</userinput></screen>
 
 </sect1>
Index: BOOK/chroot/sparc64/flags.xml
===================================================================
--- BOOK/chroot/sparc64/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/chroot/sparc64/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -24,7 +24,9 @@
    variables to prevent any build issues in the future:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+EOF</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/chroot/x86_64/flags.xml
===================================================================
--- BOOK/chroot/x86_64/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/chroot/x86_64/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -24,7 +24,9 @@
    variables to prevent any build issues in the future:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+EOF</userinput></screen>
 
 </sect1>
Index: BOOK/cross-tools/mips64/flags.xml
===================================================================
--- BOOK/cross-tools/mips64/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/cross-tools/mips64/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -23,7 +23,9 @@
      xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
-echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="d"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export BUILD32="${BUILD32}"
+export BUILDN32="${BUILDN32}"
+export BUILD64="${BUILD64}"
+EOF</userinput></screen>
 
 </sect1>
Index: BOOK/cross-tools/multilib/flags.xml
===================================================================
--- BOOK/cross-tools/multilib/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/cross-tools/multilib/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -20,6 +20,8 @@
   prevent issues if we stop and come back later:</para>
 
-<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="d"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
+EOF</userinput></screen>
 
 </sect1>
Index: BOOK/cross-tools/sparc64-64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/cross-tools/sparc64-64/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -21,6 +21,8 @@
    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
-echo export GCCTARGET=\""${GCCTARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="d"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export BUILD64="${BUILD64}"
+export GCCTARGET="${GCCTARGET}"
+EOF</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64/flags.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/cross-tools/sparc64/flags.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -22,7 +22,9 @@
    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
-echo export GCCTARGET=\""${GCCTARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="d"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
+export GCCTARGET="${GCCTARGET}"
+EOF</userinput></screen>
 
   <para os="e">The following table gives the entires for different Sparc 64 capable
Index: BOOK/cross-tools/x86/variables.xml
===================================================================
--- BOOK/cross-tools/x86/variables.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/cross-tools/x86/variables.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -38,6 +38,8 @@
   case you have to exit and restart building later:</para>
 
-<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
-echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="f"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+EOF</userinput></screen>
 
   <table os="g">
Index: BOOK/cross-tools/x86_64/variables.xml
===================================================================
--- BOOK/cross-tools/x86_64/variables.xml	(revision 9ad863df137fd2180e74840da018532d9f34072b)
+++ BOOK/cross-tools/x86_64/variables.xml	(revision c63dde1892da48cd95b409a562f0c36d212cf34f)
@@ -37,7 +37,9 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
-echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="f"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+EOF</userinput></screen>
 
 </sect1>
