Index: BOOK/final-preps/mips/variables.xml
===================================================================
--- BOOK/final-preps/mips/variables.xml	(revision e02f05dedab0090380a22c37107934dac850e140)
+++ BOOK/final-preps/mips/variables.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
@@ -27,9 +27,9 @@
     <para os="aa">For a MIPS Little Endian Machine:</para>
 
-<screen role="nodump" os="ab"><userinput>export CLFS_TARGET="mipsel-unknown-linux-gnu"</userinput></screen>
+<screen os="ab"><userinput>export CLFS_TARGET="<replaceable>mipsel-unknown-linux-gnu</replaceable>"</userinput></screen>
 
     <para os="ac">For a MIPS Big Endian Machine:</para>
 
-<screen role="nodump" os="ad"><userinput>export CLFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
+<screen os="ad"><userinput>export CLFS_TARGET="<replaceable>mips-unknown-linux-gnu</replaceable>"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
Index: BOOK/final-preps/mips64/variables.xml
===================================================================
--- BOOK/final-preps/mips64/variables.xml	(revision e02f05dedab0090380a22c37107934dac850e140)
+++ BOOK/final-preps/mips64/variables.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
@@ -29,5 +29,5 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen role="nodump" os="ab"><userinput>export CLFS_TARGET="mips64el-unknown-linux-gnu"</userinput></screen>
+<screen os="ab"><userinput>export CLFS_TARGET="<replaceable>mips64el-unknown-linux-gnu</replaceable>"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='ac'])"/>
 
-<screen role="nodump" os="ad"><userinput>export CLFS_TARGET="mips64-unknown-linux-gnu"</userinput></screen>
+<screen os="ad"><userinput>export CLFS_TARGET="<replaceable>mips64-unknown-linux-gnu</replaceable>"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -41,5 +41,5 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen role="nodump" os="f"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
+<screen os="f"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-preps/ppc/variables.xml
===================================================================
--- BOOK/final-preps/ppc/variables.xml	(revision e02f05dedab0090380a22c37107934dac850e140)
+++ BOOK/final-preps/ppc/variables.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
@@ -25,5 +25,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen role="nodump" os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
Index: BOOK/final-preps/ppc64-64/variables.xml
===================================================================
--- BOOK/final-preps/ppc64-64/variables.xml	(revision e02f05dedab0090380a22c37107934dac850e140)
+++ BOOK/final-preps/ppc64-64/variables.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
@@ -25,5 +25,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen role="nodump" os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-preps/ppc64/variables.xml
===================================================================
--- BOOK/final-preps/ppc64/variables.xml	(revision e02f05dedab0090380a22c37107934dac850e140)
+++ BOOK/final-preps/ppc64/variables.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
@@ -25,5 +25,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen role="nodump" os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -31,5 +31,5 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen role="nodump" os="f"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
+<screen os="f"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-preps/sparc/variables.xml
===================================================================
--- BOOK/final-preps/sparc/variables.xml	(revision e02f05dedab0090380a22c37107934dac850e140)
+++ BOOK/final-preps/sparc/variables.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
@@ -25,5 +25,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen role="nodump" os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
Index: BOOK/final-preps/sparc64/variables.xml
===================================================================
--- BOOK/final-preps/sparc64/variables.xml	(revision e02f05dedab0090380a22c37107934dac850e140)
+++ BOOK/final-preps/sparc64/variables.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
@@ -25,5 +25,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen role="nodump" os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -31,5 +31,5 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen role="nodump" os="f"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+<screen os="f"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
 
   <para os="g">We will need to setup target specific flags for the compiler
Index: BOOK/final-preps/x86/variables.xml
===================================================================
--- BOOK/final-preps/x86/variables.xml	(revision e02f05dedab0090380a22c37107934dac850e140)
+++ BOOK/final-preps/x86/variables.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
@@ -22,10 +22,10 @@
   following command:</para>
 
-<screen role="nodump" os="b"><userinput>export CLFS_HOST=$(echo ${MACHTYPE} | sed -e 's/-[^-]*/-cross/')</userinput></screen>
+<screen os="b"><userinput>export CLFS_HOST=$(echo ${MACHTYPE} | sed -e 's/-[^-]*/-cross/')</userinput></screen>
 
   <para os="c">Now you will need to set the triplet for the target
   architecture. Set the target variable using the following command:</para>
 
-<screen role="nodump" os="d"><userinput>export CLFS_TARGET="[target triplet]"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="<replaceable>[target triplet]</replaceable>"</userinput></screen>
 
   <para os="t1">Replace [target triplet] with the appropriate machine triplet
Index: BOOK/final-preps/x86_64/variables.xml
===================================================================
--- BOOK/final-preps/x86_64/variables.xml	(revision e02f05dedab0090380a22c37107934dac850e140)
+++ BOOK/final-preps/x86_64/variables.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
@@ -25,9 +25,9 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen role="nodump" os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
 
   <para os="e">Now set the target triplet for 32 bits:</para>
 
-<screen role="nodump" os="f"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+<screen os="f"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
 
   <para os="g">We will need to setup target-specific flags for the compiler
