Index: BOOK/chroot/native-chapter.xml
===================================================================
--- BOOK/chroot/native-chapter.xml	(revision f4a346636006d82d34c3b6e23552407035d30f6d)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/before-chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: BOOK/chroot/native64-chapter.xml
===================================================================
--- BOOK/chroot/native64-chapter.xml	(revision f4a346636006d82d34c3b6e23552407035d30f6d)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter 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;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/before-chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: BOOK/final-system/native-chapter.xml
===================================================================
--- BOOK/final-system/native-chapter.xml	(revision f4a346636006d82d34c3b6e23552407035d30f6d)
+++ BOOK/final-system/native-chapter.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
@@ -70,5 +70,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/stripping.xml"/>
 
 </chapter>
Index: BOOK/final-system/native/stripping.xml
===================================================================
--- BOOK/final-system/native/stripping.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
+++ BOOK/final-system/native/stripping.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
@@ -0,0 +1,56 @@
+<?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-system-stripping">
+  <?dbhtml filename="stripping.html"?>
+
+  <title>Stripping</title>
+
+  <para os="a">If the intended user is not a programmer and does not plan to do
+  any debugging on the system software, the system size can be decreased
+  by about 200 MB by removing the debugging symbols from binaries and
+  libraries. This causes no inconvenience other than not being able to
+  debug the software fully anymore.</para>
+
+  <para os="b">Most people who use the command mentioned below do not
+  experience any difficulties. However, it is easy to make a typo and
+  render the new system unusable, so before running the
+  <command>strip</command> command, it is a good idea to make a
+  backup of the current situation.</para>
+
+  <para os="c">Before performing the stripping, take special care to ensure that
+  none of the binaries that are about to be stripped are running. If
+  unsure whether the user entered chroot with the command given in
+  <xref linkend="chapter-temp-system" role=","/> first exit from
+  chroot:</para>
+
+<screen os="d" role="nodump"><userinput>logout</userinput></screen>
+
+    <para os="e">Then reenter it with:</para>
+
+<screen os="f" role="nodump"><userinput>chroot ${CLFS} /tools/bin/env -i \
+    HOME=/root TERM=${TERM} PS1='\u:\w\$ ' \
+    PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+    /tools/bin/bash --login</userinput></screen>
+
+    <para os="g">Now the binaries and libraries can be safely stripped:</para>
+
+<screen os="h"><userinput>/tools/bin/find /{,usr/}{bin,lib,sbin} -type f \
+   -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
+
+    <para os="i">A large number of files will be reported as having their file
+    format not recognized. These warnings can be safely ignored. These
+    warnings indicate that those files are scripts instead of
+    binaries.</para>
+
+    <para os="j">If disk space is very tight, the <option>--strip-all</option>
+    option can be used on the binaries in <filename
+    class="directory">/{,usr/}{bin,sbin}</filename> to gain several more
+    megabytes. Do not use this option on libraries&mdash;they will be
+    destroyed.</para>
+
+</sect1>
Index: BOOK/final-system/native64-chapter.xml
===================================================================
--- BOOK/final-system/native64-chapter.xml	(revision f4a346636006d82d34c3b6e23552407035d30f6d)
+++ BOOK/final-system/native64-chapter.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
@@ -88,5 +88,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/stripping.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/stripping.xml"/>
 
 </chapter>
Index: BOOK/final-system/native64/stripping.xml
===================================================================
--- BOOK/final-system/native64/stripping.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
+++ BOOK/final-system/native64/stripping.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
@@ -0,0 +1,52 @@
+<?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-system-stripping">
+  <?dbhtml filename="stripping.html"?>
+
+  <title>Stripping</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/stripping.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/stripping.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../native/stripping.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/stripping.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/stripping.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/stripping.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/stripping.xml"
+  xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>/tools/bin/find /{,usr/}{bin,lib,lib64,sbin} -type f \
+   -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/stripping.xml"
+  xpointer="xpointer(//*[@os='i'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/stripping.xml"
+  xpointer="xpointer(//*[@os='j'])"/>
+
+</sect1>
Index: BOOK/introduction/native/changelog.xml
===================================================================
--- BOOK/introduction/native/changelog.xml	(revision f4a346636006d82d34c3b6e23552407035d30f6d)
+++ BOOK/introduction/native/changelog.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
@@ -34,4 +34,14 @@
 
     <listitem>
+      <para>June 6, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Merged chroot section with temp-system. Fixes
+          ticket #212.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 23, 2008</para>
       <itemizedlist>
Index: BOOK/introduction/native64/changelog.xml
===================================================================
--- BOOK/introduction/native64/changelog.xml	(revision f4a346636006d82d34c3b6e23552407035d30f6d)
+++ BOOK/introduction/native64/changelog.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
@@ -34,4 +34,14 @@
 
     <listitem>
+      <para>June 6, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Merged chroot section with temp-system. Fixes
+          ticket #212.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 5, 2009</para>
       <itemizedlist>
Index: BOOK/native-index.xml
===================================================================
--- BOOK/native-index.xml	(revision f4a346636006d82d34c3b6e23552407035d30f6d)
+++ BOOK/native-index.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
@@ -49,5 +49,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/native-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/native-chapter.xml"/>
 
   </part>
Index: BOOK/native64-index.xml
===================================================================
--- BOOK/native64-index.xml	(revision f4a346636006d82d34c3b6e23552407035d30f6d)
+++ BOOK/native64-index.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
@@ -49,5 +49,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/native64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/native64-chapter.xml"/>
 
   </part>
Index: BOOK/temp-system/native-chapter.xml
===================================================================
--- BOOK/temp-system/native-chapter.xml	(revision f4a346636006d82d34c3b6e23552407035d30f6d)
+++ BOOK/temp-system/native-chapter.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
@@ -24,4 +24,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
@@ -36,6 +37,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/kernfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/x86/before-chroot.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/chroot.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/changingowner.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/creatingdirs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/devices.xml"/>
 
 </chapter>
Index: BOOK/temp-system/native64-chapter.xml
===================================================================
--- BOOK/temp-system/native64-chapter.xml	(revision f4a346636006d82d34c3b6e23552407035d30f6d)
+++ BOOK/temp-system/native64-chapter.xml	(revision c7e5a987f19fddc4f4185c21f37508c60ce8635b)
@@ -24,4 +24,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
@@ -36,6 +37,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/kernfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/x86/before-chroot.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/chroot.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/changingowner.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/creatingdirs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/createfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/pwdgroup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/devices.xml"/>
 
 </chapter>
