Index: OK/cross-tools/common/cflags.xml
===================================================================
--- BOOK/cross-tools/common/cflags.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-cflags">
-  <?dbhtml filename="cflags.html"?>
-
-  <title>Build CFLAGS</title>
-
-  <para><envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> must not be
-  set during the building of cross-tools.</para>
-
-  <para>To disable <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>
-  use the following commands:</para>
-
-<screen><userinput>unset CFLAGS
-unset CXXFLAGS</userinput></screen>
-
-  <para>Now add these to <filename>~/.bashrc</filename>, just in
-  case you have to exit and restart building later:</para>
-
-<screen><userinput>echo unset CFLAGS &gt;&gt; ~/.bashrc
-echo unset CXXFLAGS &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: BOOK/cross-tools/mips-chapter.xml
===================================================================
--- BOOK/cross-tools/mips-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/mips-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
Index: BOOK/cross-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-64-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/mips64-64-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
Index: BOOK/cross-tools/mips64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/mips64-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
Index: BOOK/cross-tools/ppc-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/ppc-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
Index: BOOK/cross-tools/ppc64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-64-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/ppc64-64-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/variables.xml"/>
Index: BOOK/cross-tools/ppc64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/ppc64-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
Index: BOOK/cross-tools/sparc-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/sparc-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
Index: BOOK/cross-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-64-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/sparc64-64-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
Index: BOOK/cross-tools/sparc64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/sparc64-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
Index: BOOK/cross-tools/x86-chapter.xml
===================================================================
--- BOOK/cross-tools/x86-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/x86-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
Index: BOOK/cross-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-64-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/x86_64-64-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
Index: BOOK/cross-tools/x86_64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-chapter.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/cross-tools/x86_64-chapter.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
Index: BOOK/final-preps/settingenviron.xml
===================================================================
--- BOOK/final-preps/settingenviron.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/final-preps/settingenviron.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -45,5 +45,7 @@
 LC_ALL=POSIX
 PATH=/cross-tools/bin:/bin:/usr/bin
-export CLFS LC_ALL PATH</literal>
+export CLFS LC_ALL PATH
+unset CFLAGS
+unset CXXFLAGS</literal>
 EOF</userinput></screen>
 
@@ -87,8 +89,11 @@
   tools to build the temp-system in /tools.</para>
 
-  <para os="k">Finally, to have the environment fully prepared for building the
+  <para os="k">The <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> should
+  not be set while building the temporary system, so we unset them.</para>
+
+  <para os="l">Finally, to have the environment fully prepared for building the
   temporary tools, source the just-created user profile:</para>
 
-<screen os="l"><userinput>source ~/.bash_profile</userinput></screen>
+<screen os="m"><userinput>source ~/.bash_profile</userinput></screen>
 
 </sect1>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision bb748ad2828812b2aefd0538f517e8971ff74c85)
+++ BOOK/introduction/common/changelog.xml	(revision 1a24f0578a20e7d67a1cd55e0fec7fd53c07fcba)
@@ -38,4 +38,15 @@
 
     <listitem>
+      <para>19 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added commands to unset CFLAGS and CXXFLAGS to the
+          clfs user's default .bashrc, and removed the separate page where
+          this was done.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>18 May 2014</para>
       <itemizedlist>
