- added first version of the SCons XSD

- rewrote User Guide XML files, such that they are valid against it

48 files changed, 1148 insertions, 333 deletions

diff --git a/doc/user/actions.xml b/doc/user/actions.xml
index d2a3dad..23f1dab 100644
--- a/doc/user/actions.xml
+++ b/doc/user/actions.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<chapter id="chap-actions"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>&SCons; Actions</title>
+
 <!--
 
   __COPYRIGHT__
@@ -402,3 +424,5 @@ solutions to the above limitations.
   </section>
 
   -->
+
+</chapter>
diff --git a/doc/user/add-method.xml b/doc/user/add-method.xml
index 2deb07a..cb9b358 100644
--- a/doc/user/add-method.xml
+++ b/doc/user/add-method.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<chapter id="chap-add-method"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Pseudo-Builders:  the AddMethod function</title>
+
 <!--
 
   __COPYRIGHT__
@@ -125,3 +147,5 @@
   and because &AddMethod; provides for copying the method
   to any clones of the &consenv; instance.
   </para>
+
+</chapter>
diff --git a/doc/user/alias.xml b/doc/user/alias.xml
index 686c004..ae50feb 100644
--- a/doc/user/alias.xml
+++ b/doc/user/alias.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<chapter id="chap-alias"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Alias Targets</title>
+
 <!--
 
   __COPYRIGHT__
@@ -100,3 +122,5 @@
      <scons_output_command>scons -Q -c __ROOT__/</scons_output_command>
      <scons_output_command>scons -Q install</scons_output_command>
   </scons_output>
+
+</chapter>
diff --git a/doc/user/ant.xml b/doc/user/ant.xml
index 0df1027..a346765 100644
--- a/doc/user/ant.xml
+++ b/doc/user/ant.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<appendix id="app-ant"
+          xmlns="http://www.scons.org/dbxsd/v1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Converting From Ant</title>
+
 <!--
 
   __COPYRIGHT__
@@ -50,3 +72,5 @@
    </para>
 
  </section>
+
+</appendix>
diff --git a/doc/user/build-install.xml b/doc/user/build-install.xml
index 821d2be..1f1d525 100644
--- a/doc/user/build-install.xml
+++ b/doc/user/build-install.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<chapter id="chap-build-install"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Building and Installing &SCons;</title>
+
 <!--
 
   __COPYRIGHT__
@@ -707,3 +729,5 @@
   </section>
 
   -->
+
+</chapter>
diff --git a/doc/user/builders-built-in.xml b/doc/user/builders-built-in.xml
index 3b5b981..1cc5b65 100644
--- a/doc/user/builders-built-in.xml
+++ b/doc/user/builders-built-in.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<chapter id="chap-builders-built-in"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Built-In Builders</title>
+
 <!--
 
   __COPYRIGHT__
@@ -948,3 +970,5 @@
     </section>
 
   </section>
+
+</chapter>
diff --git a/doc/user/builders-commands.xml b/doc/user/builders-commands.xml
index d0aae61..fa6573b 100644
--- a/doc/user/builders-commands.xml
+++ b/doc/user/builders-commands.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+
+]>
+
+<chapter id="chap-builders-commands"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Not Writing a Builder:  the &Command; Builder</title>
+
 <!--
 
   __COPYRIGHT__
@@ -154,3 +176,5 @@
 
   </para>
 
+
+</chapter>
diff --git a/doc/user/builders-writing.xml b/doc/user/builders-writing.xml
index 749a8ba..74787fe 100644
--- a/doc/user/builders-writing.xml
+++ b/doc/user/builders-writing.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+
+]>
+
+<chapter id="chap-builders-writing"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Writing Your Own Builders</title>
+
 <!--
 
   __COPYRIGHT__
@@ -1106,3 +1128,5 @@ This functionality could be invoked as in the following example:
   </section>
 
   -->
+
+</chapter>
diff --git a/doc/user/builders.xml b/doc/user/builders.xml
index f3989ef..cbe68ba 100644
--- a/doc/user/builders.xml
+++ b/doc/user/builders.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<appendix id="app-builders"
+          xmlns="http://www.scons.org/dbxsd/v1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Builders</title>
+
 <!--
 
   __COPYRIGHT__
@@ -23,25 +44,6 @@
 
 -->
 
-<!--
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-
-<refentry id="Command">
-
-<refmeta>
-<refentrytitle>Command</refentrytitle>
-</refmeta>
-
-<methodsynopsis>
-  <methodname>env.Command</methodname>
-  <methodparam>foo</methodparam>
-  <methodparam>bar</methodparam>
-</methodsynopsis>
-
-</refentry>
--->
-
 <para>
 
 This appendix contains descriptions of all of the
@@ -50,8 +52,6 @@ available "out of the box" in this version of SCons.
 
 </para>
 
-<variablelist>
-
-&builders-gen;
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../generated/builders.gen"/>
 
-</variablelist>
+</appendix>
diff --git a/doc/user/caching.xml b/doc/user/caching.xml
index cb8521b..baea2ea 100644
--- a/doc/user/caching.xml
+++ b/doc/user/caching.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<chapter id="chap-caching"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Caching Built Files</title>
+
 <!--
 
   __COPYRIGHT__
@@ -500,3 +522,5 @@
   </section>
 
   -->
+
+</chapter>
diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml
index 33f88ec..82a201a 100644
--- a/doc/user/command-line.xml
+++ b/doc/user/command-line.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+
+]>
+
+<chapter id="chap-command-line"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Controlling a Build From the Command Line</title>
+
 <!--
 
   __COPYRIGHT__
@@ -2343,3 +2365,5 @@
     </section>
 
   </section>
+
+</chapter>
diff --git a/doc/user/copyright.xml b/doc/user/copyright.xml
index 76e3e50..70396bf 100644
--- a/doc/user/copyright.xml
+++ b/doc/user/copyright.xml
@@ -1,3 +1,13 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+]>
+
+<legalnotice xmlns="http://www.scons.org/dbxsd/v1.0"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+
 <!--
 
   __COPYRIGHT__
@@ -30,3 +40,5 @@
 
  </para>
 </blockquote>
+
+</legalnotice>
diff --git a/doc/user/depends.xml b/doc/user/depends.xml
index f601312..a30ba80 100644
--- a/doc/user/depends.xml
+++ b/doc/user/depends.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+
+]>
+
+<chapter id="chap-depends"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Dependencies</title>
+
 <!--
 
   __COPYRIGHT__
@@ -1870,3 +1892,5 @@ operating system on which the build is performed (as reported by C<uname
   </section>
 
   -->
+
+</chapter>
diff --git a/doc/user/environments.xml b/doc/user/environments.xml
index 9f39347..b741ca3 100644
--- a/doc/user/environments.xml
+++ b/doc/user/environments.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+
+]>
+
+<chapter id="chap-environments"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Environments</title>
+
 <!--
 
      __COPYRIGHT__
@@ -1750,3 +1772,5 @@ environment, of directory names, suffixes, etc.
     </section>
 
   </section>
+
+</chapter>
diff --git a/doc/user/errors.xml b/doc/user/errors.xml
index 0891bf8..7f2efc6 100644
--- a/doc/user/errors.xml
+++ b/doc/user/errors.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+
+]>
+
+<chapter id="chap-errors"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Errors</title>
+
 <!--
 
   __COPYRIGHT__
@@ -39,3 +61,4 @@
    </para>
 
  </section>
+</chapter>
diff --git a/doc/user/example.xml b/doc/user/example.xml
index 0891bf8..f8e2599 100644
--- a/doc/user/example.xml
+++ b/doc/user/example.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<appendix id="app-example"
+          xmlns="http://www.scons.org/dbxsd/v1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Complex &SCons; Example</title>
+
 <!--
 
   __COPYRIGHT__
@@ -39,3 +61,5 @@
    </para>
 
  </section>
+
+</appendix>
diff --git a/doc/user/factories.xml b/doc/user/factories.xml
index cbe313a..8ec22fb 100644
--- a/doc/user/factories.xml
+++ b/doc/user/factories.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+
+]>
+
+<chapter id="chap-factories"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Platform-Independent File System Manipulation</title>
+
 <!--
 
   __COPYRIGHT__
@@ -505,3 +527,5 @@
     </sconstruct>
 
   </section>
+
+</chapter>
diff --git a/doc/user/file-removal.xml b/doc/user/file-removal.xml
index 1d1b604..5ff945b 100644
--- a/doc/user/file-removal.xml
+++ b/doc/user/file-removal.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<chapter id="chap-file-removal"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Controlling Removal of Targets</title>
+
 <!--
 
   __COPYRIGHT__
@@ -221,3 +243,5 @@
     </scons_output>
 
   </section>
+
+</chapter>
diff --git a/doc/user/functions.xml b/doc/user/functions.xml
index 1b1b280..66bfd60 100644
--- a/doc/user/functions.xml
+++ b/doc/user/functions.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<appendix id="app-functions"
+          xmlns="http://www.scons.org/dbxsd/v1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Functions and Environment Methods</title>
+
 <!--
 
   __COPYRIGHT__
@@ -31,8 +52,6 @@ in this version of &SCons;
 
 </para>
 
-<variablelist>
-
-&functions-gen;
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../generated/functions.gen"/>
 
-</variablelist>
+</appendix>
diff --git a/doc/user/gettext.xml b/doc/user/gettext.xml
index ba09071..bed0d0e 100644
--- a/doc/user/gettext.xml
+++ b/doc/user/gettext.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<chapter id="chap-gettext"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Internationalization and localization with gettext</title>
+
 <!--
 
   __COPYRIGHT__
@@ -349,3 +371,5 @@
     even been touched.
     </para>
   </section>
+
+</chapter>
diff --git a/doc/user/hierarchy.xml b/doc/user/hierarchy.xml
index d70633d..4c9cd38 100644
--- a/doc/user/hierarchy.xml
+++ b/doc/user/hierarchy.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<chapter id="chap-hierarchical"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Hierarchical Builds</title>
+
 <!--
 
   __COPYRIGHT__
@@ -792,3 +814,5 @@ make no difference to the build.
   </section>
 
   -->
+
+</chapter>
diff --git a/doc/user/install.xml b/doc/user/install.xml
index ba179e7..6172eb0 100644
--- a/doc/user/install.xml
+++ b/doc/user/install.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+    
+]>
+
+<chapter id="chap-install"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Installing Files in Other Directories:  the &Install; Builder</title>
+
 <!--
 
   __COPYRIGHT__
@@ -245,3 +267,5 @@
     </scons_output>
 
   </section>
+
+</chapter>
diff --git a/doc/user/java.xml b/doc/user/java.xml
index 4561a4c..041db35 100644
--- a/doc/user/java.xml
+++ b/doc/user/java.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-java"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Java Builds</title>
+
 <!--
 
   __COPYRIGHT__
@@ -655,3 +676,5 @@
     </para>
 
   </section>
+
+</chapter>
diff --git a/doc/user/less-simple.xml b/doc/user/less-simple.xml
index fcffa5e..fa0e653 100644
--- a/doc/user/less-simple.xml
+++ b/doc/user/less-simple.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-less-simple"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Less Simple Things to Do With Builds</title>
+
 <!--
 
   __COPYRIGHT__
@@ -621,3 +642,5 @@
     </para>
 
   </section>
+
+</chapter>
diff --git a/doc/user/libraries.xml b/doc/user/libraries.xml
index e219e21..01d6066 100644
--- a/doc/user/libraries.xml
+++ b/doc/user/libraries.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-libraries"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Building and Linking with Libraries</title>
+
 <!--
 
   __COPYRIGHT__
@@ -443,3 +464,5 @@
     </para>
 
   </section>
+
+</chapter>
diff --git a/doc/user/main.xml b/doc/user/main.xml
index 61b544f..b2dbcb0 100644
--- a/doc/user/main.xml
+++ b/doc/user/main.xml
@@ -24,9 +24,7 @@
 
 -->
 
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
+<!DOCTYPE sconsdoc [
 
     <!ENTITY % version SYSTEM "../version.xml">
     %version;
@@ -34,70 +32,15 @@
     <!ENTITY % scons SYSTEM "../scons.mod">
     %scons;
 
-    <!ENTITY % builders-mod SYSTEM "builders.mod">
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
     %builders-mod;
-
-    <!ENTITY % functions-mod SYSTEM "functions.mod">
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
     %functions-mod;
-
-    <!ENTITY % tools-mod SYSTEM "tools.mod">
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
     %tools-mod;
-
-    <!ENTITY % variables-mod SYSTEM "variables.mod">
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
     %variables-mod;
 
-    <!ENTITY actions SYSTEM "actions.xml">
-    <!ENTITY alias SYSTEM "alias.xml">
-    <!ENTITY ant SYSTEM "ant.xml">
-    <!ENTITY build-install SYSTEM "build-install.xml">
-    <!ENTITY builders SYSTEM "builders.xml">
-    <!ENTITY builders-built-in SYSTEM "builders-built-in.xml">
-    <!ENTITY builders-commands SYSTEM "builders-commands.xml">
-    <!ENTITY builders-writing SYSTEM "builders-writing.xml">
-    <!ENTITY add-method SYSTEM "add-method.xml">
-    <!ENTITY caching SYSTEM "caching.xml">
-    <!ENTITY command-line SYSTEM "command-line.xml">
-    <!ENTITY copyright SYSTEM "copyright.xml">
-    <!ENTITY depends SYSTEM "depends.xml">
-    <!ENTITY environments SYSTEM "environments.xml">
-    <!ENTITY errors SYSTEM "errors.xml">
-    <!ENTITY example SYSTEM "example.xml">
-    <!ENTITY factories SYSTEM "factories.xml">
-    <!ENTITY file-removal SYSTEM "file-removal.xml">
-    <!ENTITY functions SYSTEM "functions.xml">
-    <!ENTITY gettext SYSTEM "gettext.xml">
-    <!ENTITY hierarchy SYSTEM "hierarchy.xml">
-    <!ENTITY java SYSTEM "java.xml">
-    <!ENTITY install SYSTEM "install.xml">
-    <!ENTITY less-simple SYSTEM "less-simple.xml">
-    <!ENTITY libraries SYSTEM "libraries.xml">
-    <!ENTITY make SYSTEM "make.xml">
-    <!ENTITY mergeflags SYSTEM "mergeflags.xml">
-    <!ENTITY misc SYSTEM "misc.xml">
-    <!ENTITY nodes SYSTEM "nodes.xml">
-    <!ENTITY output SYSTEM "output.xml">
-    <!ENTITY parseconfig SYSTEM "parseconfig.xml">
-    <!ENTITY parseflags SYSTEM "parseflags.xml">
-    <!ENTITY preface SYSTEM "preface.xml">
-    <!ENTITY python SYSTEM "python.xml">
-    <!ENTITY repositories SYSTEM "repositories.xml">
-    <!ENTITY run SYSTEM "run.xml">
-    <!ENTITY scanners SYSTEM "scanners.xml">
-    <!ENTITY sconf SYSTEM "sconf.xml">
-    <!ENTITY separate SYSTEM "separate.xml">
-    <!ENTITY simple SYSTEM "simple.xml">
-    <!ENTITY sourcecode SYSTEM "sourcecode.xml">
-    <!ENTITY tasks SYSTEM "tasks.xml">
-    <!ENTITY tools SYSTEM "tools.xml">
-    <!ENTITY troubleshoot SYSTEM "troubleshoot.xml">
-    <!ENTITY variables-xml SYSTEM "variables.xml">
-    <!ENTITY variants SYSTEM "variants.xml">
-
-    <!ENTITY builders-gen SYSTEM "builders.gen">
-    <!ENTITY functions-gen SYSTEM "functions.gen">
-    <!ENTITY tools-gen SYSTEM "tools.gen">
-    <!ENTITY variables-gen SYSTEM "variables.gen">
-
 ]>
 
   <!--
@@ -117,7 +60,9 @@
 
   -->
 
-<book>
+<book xmlns="http://www.scons.org/dbxsd/v1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
   <bookinfo>
     <title>SCons User Guide &buildversion;</title>
 
@@ -135,54 +80,21 @@
       <holder>Steven Knight</holder>
     </copyright>
 
-    <legalnotice>
-      &copyright;
-    </legalnotice>
-
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="copyright.xml"/>
+    
     <releaseinfo>version &buildversion;</releaseinfo>
 
   </bookinfo>
 
-  <preface id="chap-preface">
-    <title>Preface</title>
-    &preface;
-  </preface>
-
-  <chapter id="chap-build-install">
-    <title>Building and Installing &SCons;</title>
-    &build-install;
-  </chapter>
-
-  <chapter id="chap-simple">
-    <title>Simple Builds</title>
-    &simple;
-  </chapter>
-
-  <chapter id="chap-less-simple">
-    <title>Less Simple Things to Do With Builds</title>
-    &less-simple;
-  </chapter>
-
-  <chapter id="chap-libraries">
-    <title>Building and Linking with Libraries</title>
-    &libraries;
-  </chapter>
-
-  <chapter id="chap-nodes">
-    <title>Node Objects</title>
-    &nodes;
-  </chapter>
-
-  <chapter id="chap-depends">
-    <title>Dependencies</title>
-    &depends;
-  </chapter>
-
-  <chapter id="chap-environments">
-    <title>Environments</title>
-    &environments;
-  </chapter>
-
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="preface.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="build-install.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="simple.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less-simple.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libraries.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nodes.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="depends.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="environments.xml"/>
+  
   <chapter id="chap-manip-options">
     <title>Automatically Putting Command-line Options into their Construction Variables</title>
     <!-- TODO:  This intro paragraph should describe at a high-level
@@ -192,96 +104,33 @@
     <para>
     This chapter describes the &MergeFlags;, &ParseFlags;, and &ParseConfig; methods of a &consenv;.
     </para>
-    <section id="sect-mergeflags">
-      <title>Merging Options into the Environment: the &MergeFlags; Function</title>
-      &mergeflags;
-    </section>
-    <section id="sect-parseflags">
-      <title>Separating Compile Arguments into their Variables: the &ParseFlags; Function</title>
-      &parseflags;
-    </section>
-    <section id="sect-parseconfig">
-      <title>Finding Installed Library Information: the &ParseConfig; Function</title>
-      &parseconfig;
-    </section>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mergeflags.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="parseflags.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="parseconfig.xml"/>
     <!--
     XXX parse_flags= option of Environment()
-
-    <section id="sect-env-parseflags">
-      <title>Adding Flags when Constructing Enviroment: the parse_flags Optional Argument</title>
-      &envparseflags;
-    </section>
     -->
   </chapter>
 
-  <chapter id="chap-output">
-    <title>Controlling Build Output</title>
-    &output;
-  </chapter>
-
-  <chapter id="chap-command-line">
-    <title>Controlling a Build From the Command Line</title>
-    &command-line;
-  </chapter>
-
-  <chapter id="chap-install">
-    <title>Installing Files in Other Directories:  the &Install; Builder</title>
-    &install;
-  </chapter>
-
-  <chapter id="chap-factories">
-    <title>Platform-Independent File System Manipulation</title>
-    &factories;
-  </chapter>
-
-  <chapter id="chap-file-removal">
-    <title>Controlling Removal of Targets</title>
-    &file-removal;
-  </chapter>
-
-  <chapter id="chap-hierarchical">
-    <title>Hierarchical Builds</title>
-    &hierarchy;
-  </chapter>
-
-  <chapter id="chap-separate">
-    <title>Separating Source and Build Directories</title>
-    &separate;
-  </chapter>
-
-  <chapter id="chap-variants">
-    <title>Variant Builds</title>
-    &variants;
-  </chapter>
-
-  <chapter id="chap-gettext">
-    <title>Internationalization and localization with gettext</title>
-    &gettext;
-  </chapter>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="output.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="command-line.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="install.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="factories.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-removal.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hierarchy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="separate.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="variants.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
 
   <!--
 
-  <chapter id="chap-builders-built-in">
-    <title>Built-In Builders</title>
-    &builders-built-in;
-  </chapter>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="builders-built-in.xml"/>
 
   -->
 
-  <chapter id="chap-builders-writing">
-    <title>Writing Your Own Builders</title>
-    &builders-writing;
-  </chapter>
-
-  <chapter id="chap-builders-commands">
-    <title>Not Writing a Builder:  the &Command; Builder</title>
-    &builders-commands;
-  </chapter>
-
-  <chapter id="chap-add-method">
-    <title>Pseudo-Builders:  the AddMethod function</title>
-    &add-method;
-  </chapter>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="builders-writing.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="builders-commands.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add-method.xml"/>
 
   <!--
 
@@ -289,122 +138,44 @@
   XXX AddPostAction()
   XXX AddPreAction()
 
-  <chapter id="chap-actions">
-    <title>&SCons; Actions</title>
-    &actions;
-  </chapter>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="actions.xml"/>
 
   -->
 
-  <chapter id="chap-scanners">
-    <title>Writing Scanners</title>
-    &scanners;
-  </chapter>
-
-  <chapter id="chap-repositories">
-    <title>Building From Code Repositories</title>
-    &repositories;
-  </chapter>
-
-  <chapter id="chap-sconf">
-    <title>Multi-Platform Configuration (&Autoconf; Functionality)</title>
-    &sconf;
-  </chapter>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scanners.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="repositories.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sconf.xml"/>
 
   <!--
 
-  <chapter id="chap-sourcecode">
-    <title>Fetching Files From Source Code Management Systems</title>
-    &sourcecode;
-  </chapter>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sourcecode.xml"/>
 
   -->
 
-  <chapter id="chap-caching">
-    <title>Caching Built Files</title>
-    &caching;
-  </chapter>
-
-  <chapter id="chap-alias">
-    <title>Alias Targets</title>
-    &alias;
-  </chapter>
-
-  <chapter id="chap-java">
-    <title>Java Builds</title>
-    &java;
-  </chapter>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="caching.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alias.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="java.xml"/>
 
   <!--
 
-  <chapter id="chap-run">
-    <title>How to Run &SCons;</title>
-    &run;
-  </chapter>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="run.xml"/>
 
   -->
 
-  <chapter id="chap-misc">
-    <title>Miscellaneous Functionality</title>
-    &misc;
-  </chapter>
-
-  <chapter id="chap-troubleshooting">
-    <title>Troubleshooting</title>
-    &troubleshoot;
-  </chapter>
-
-  <appendix id="app-variables">
-    <title>Construction Variables</title>
-    &variables-xml;
-  </appendix>
-
-  <appendix id="app-builders">
-    <title>Builders</title>
-    &builders;
-  </appendix>
-
-  <appendix id="app-tools">
-    <title>Tools</title>
-    &tools;
-  </appendix>
-
-  <appendix id="app-functions">
-    <title>Functions and Environment Methods</title>
-    &functions;
-  </appendix>
-
-  <appendix id="app-tasks">
-    <title>Handling Common Tasks</title>
-    &tasks;
-  </appendix>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="misc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="troubleshoot.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="builders.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="functions.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tasks.xml"/>
 
   <!--
 
-  <appendix id="app-python">
-    <title>Python Overview</title>
-    &example;
-  </appendix>
-
-  <appendix id="app-example">
-    <title>Complex &SCons; Example</title>
-    &example;
-  </appendix>
-
-  <appendix id="app-make">
-    <title>Converting From Make</title>
-    &make;
-  </appendix>
-
-  <appendix id="app-cons">
-    <title>Converting From Cons</title>
-    &cons;
-  </appendix>
-
-  <appendix id="app-ant">
-    <title>Converting From Ant</title>
-    &ant;
-  </appendix>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="example.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ant.xml"/>
 
   -->
 
diff --git a/doc/user/make.xml b/doc/user/make.xml
index 72b2df1..b553b3e 100644
--- a/doc/user/make.xml
+++ b/doc/user/make.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;    
+]>
+
+<appendix id="app-make"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Converting From Make</title>
+
 <!--
 
   __COPYRIGHT__
@@ -119,3 +140,5 @@ the makefiles.
    </para>
 
  </section>
+
+</appendix>
diff --git a/doc/user/mergeflags.xml b/doc/user/mergeflags.xml
index a148409..0979d94 100644
--- a/doc/user/mergeflags.xml
+++ b/doc/user/mergeflags.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<section id="sect-mergeflags"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Merging Options into the Environment: the &MergeFlags; Function</title>
+
 <!--
 
   __COPYRIGHT__
@@ -135,3 +156,5 @@
  in the specified construction environment.
 
  </para>
+
+</section>
diff --git a/doc/user/misc.xml b/doc/user/misc.xml
index dde75bf..c24a014 100644
--- a/doc/user/misc.xml
+++ b/doc/user/misc.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-misc"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Miscellaneous Functionality</title>
+
 <!--
 
   __COPYRIGHT__
@@ -604,3 +625,5 @@
     </para>
 
   </section>
+
+</chapter>
diff --git a/doc/user/nodes.xml b/doc/user/nodes.xml
index fb5ce23..82a41fe 100644
--- a/doc/user/nodes.xml
+++ b/doc/user/nodes.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-nodes"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Node Objects</title>
+
 <!--
 
   __COPYRIGHT__
@@ -429,3 +450,5 @@
   </section>
 
   -->
+
+</chapter>
diff --git a/doc/user/output.xml b/doc/user/output.xml
index 1383fc0..e2831b6 100644
--- a/doc/user/output.xml
+++ b/doc/user/output.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-output"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Controlling Build Output</title>
+
 <!--
 
   __COPYRIGHT__
@@ -679,3 +700,5 @@
     </scons_output>
 
   </section>
+
+</chapter>
diff --git a/doc/user/parseconfig.xml b/doc/user/parseconfig.xml
index 2dbefff..59077a3 100644
--- a/doc/user/parseconfig.xml
+++ b/doc/user/parseconfig.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<section id="sect-parseconfig"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Finding Installed Library Information: the &ParseConfig; Function</title>
+
 <!--
 
   __COPYRIGHT__
@@ -138,3 +159,5 @@
     ['/usr/X11/include']
     scons: `.' is up to date.
  </screen>
+
+</section>
diff --git a/doc/user/parseflags.xml b/doc/user/parseflags.xml
index a0ea290..8a3c225 100644
--- a/doc/user/parseflags.xml
+++ b/doc/user/parseflags.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<section id="sect-parseflags"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Separating Compile Arguments into their Variables: the &ParseFlags; Function</title>
+
 <!--
 
   __COPYRIGHT__
@@ -174,3 +195,5 @@
  consult the man page for details about those currently recognized.
 
  </para>
+
+</section>
diff --git a/doc/user/preface.xml b/doc/user/preface.xml
index 6f3140b..067c8a1 100644
--- a/doc/user/preface.xml
+++ b/doc/user/preface.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<preface id="chap-preface"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Preface</title>
+
 <!--
 
   __COPYRIGHT__
@@ -424,3 +445,5 @@
     </para>
 
   </section>
+
+</preface>
diff --git a/doc/user/python.xml b/doc/user/python.xml
index e2a7cdd..3846f2e 100644
--- a/doc/user/python.xml
+++ b/doc/user/python.xml
@@ -1,3 +1,25 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+
+]>
+
+<appendix id="app-python"
+          xmlns="http://www.scons.org/dbxsd/v1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Python overview</title>
+
 <!--
 
   __COPYRIGHT__
@@ -23,11 +45,6 @@
 
 -->
 
-  <!--
-
-  <section>
-  <title>Python Overview</title>
-
     <para>
 
     This section will provide a brief overview of
@@ -149,6 +166,4 @@
 
     </para>
 
-  </section>
-
-  -->
+</appendix>
diff --git a/doc/user/repositories.xml b/doc/user/repositories.xml
index 33de530..b5bb62d 100644
--- a/doc/user/repositories.xml
+++ b/doc/user/repositories.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-repositories"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Building From Code Repositories</title>
+
 <!--
 
   __COPYRIGHT__
@@ -639,3 +660,5 @@ coming into existence.)
     </para>
 
   </section>
+
+</chapter>
diff --git a/doc/user/run.xml b/doc/user/run.xml
index 56b8fa2..d190cde 100644
--- a/doc/user/run.xml
+++ b/doc/user/run.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-run"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>How to Run &SCons;</title>
+
 <!--
 
   __COPYRIGHT__
@@ -373,3 +394,5 @@ do an unconstrained build before committing the integration).
     </para>
 
   </section>
+
+</chapter>
diff --git a/doc/user/scanners.xml b/doc/user/scanners.xml
index 50524e0..6712378 100644
--- a/doc/user/scanners.xml
+++ b/doc/user/scanners.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-scanners"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Writing Scanners</title>
+
 <!--
 
   __COPYRIGHT__
@@ -390,3 +411,5 @@ over the file scanning rather than being called for each input line:
     
     </para>
     </section>
+
+</chapter>
diff --git a/doc/user/sconf.xml b/doc/user/sconf.xml
index 584a82e..3d03adf 100644
--- a/doc/user/sconf.xml
+++ b/doc/user/sconf.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-sconf"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Multi-Platform Configuration (&Autoconf; Functionality)</title>
+
 <!--
 
   __COPYRIGHT__
@@ -484,3 +505,5 @@
   </section>
 
   -->
+
+</chapter>
diff --git a/doc/user/separate.xml b/doc/user/separate.xml
index 75605fe..9699521 100644
--- a/doc/user/separate.xml
+++ b/doc/user/separate.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-separate"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Separating Source and Build Directories</title>
+
 <!--
 
   __COPYRIGHT__
@@ -538,3 +559,5 @@ program using the F<build/foo.c> path name.
   </section>
 
   -->
+
+</chapter>
diff --git a/doc/user/sideeffect.xml b/doc/user/sideeffect.xml
index cbeefae..ad5c85c 100644
--- a/doc/user/sideeffect.xml
+++ b/doc/user/sideeffect.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-sideeffect"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Sideeffect files</title>
+
 <!--
 
   __COPYRIGHT__
@@ -23,8 +44,6 @@
 
 -->
 
- <!--
-
  <para>
 
  If &SCons; is unaware that a build step produces an extra file,
@@ -35,9 +54,11 @@
 
  </para>
 
+ <para>
  TODO: currently doesn't work due to issue #2154:
  http://scons.tigris.org/issues/show_bug.cgi?id=2154
-
+ </para>
+ 
  <para>
 
  If more than one build step creates or manipulates the same file,
@@ -75,8 +96,6 @@
     <scons_output_command>scons -Q --jobs=2</scons_output_command>
  </scons_output>
 
- -->
-
  <para>
 
  Sometimes a program the you need to call
@@ -100,7 +119,7 @@
              './build --log logfile.txt $SOURCE $TARGET')
  env.Command('file2.out', 'file.in',
              './build --log logfile.txt $SOURCE $TARGET')
- <screen>
+ </screen>
 
  <para>
 
@@ -214,3 +233,6 @@
  may actually updated by more than one command invocation.
 
  </para>
+
+ </chapter>
+ 
\ No newline at end of file
diff --git a/doc/user/simple.xml b/doc/user/simple.xml
index 8a25be5..41e4a00 100644
--- a/doc/user/simple.xml
+++ b/doc/user/simple.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-simple"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Simple Builds</title>
+
 <!--
 
   __COPYRIGHT__
@@ -515,3 +536,5 @@
    </para>
 
  </section>
+
+</chapter>
diff --git a/doc/user/sourcecode.xml b/doc/user/sourcecode.xml
index 04c76d0..55e3089 100644
--- a/doc/user/sourcecode.xml
+++ b/doc/user/sourcecode.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-sourcecode"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Fetching Files From Source Code Management Systems</title>
+
 <!--
 
   __COPYRIGHT__
@@ -160,3 +181,5 @@
  </section>
 
  -->
+
+</chapter>
diff --git a/doc/user/tasks.xml b/doc/user/tasks.xml
index 79787a6..2f2f727 100644
--- a/doc/user/tasks.xml
+++ b/doc/user/tasks.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<appendix id="app-tasks"
+          xmlns="http://www.scons.org/dbxsd/v1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Handling Common Tasks</title>
+
 <!--
 
   __COPYRIGHT__
@@ -144,3 +165,5 @@ produces this:
  </scons_output>
     
 </example>
+
+</appendix>
diff --git a/doc/user/tools.xml b/doc/user/tools.xml
index 512bf97..28b8729 100644
--- a/doc/user/tools.xml
+++ b/doc/user/tools.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<appendix id="app-tools"
+          xmlns="http://www.scons.org/dbxsd/v1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Tools</title>
+
 <!--
 
   __COPYRIGHT__
@@ -31,8 +52,6 @@ available "out of the box" in this version of SCons.
 
 </para>
 
-<variablelist>
-
-&tools-gen;
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../generated/tools.gen"/>
 
-</variablelist>
+</appendix>
diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml
index d171293..773ccac 100644
--- a/doc/user/troubleshoot.xml
+++ b/doc/user/troubleshoot.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-troubleshooting"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Troubleshooting</title>
+
 <!--
 
   __COPYRIGHT__
@@ -912,3 +933,5 @@
   </section>
 
   -->
+
+</chapter>
diff --git a/doc/user/variables.xml b/doc/user/variables.xml
index 7009996..edf0167 100644
--- a/doc/user/variables.xml
+++ b/doc/user/variables.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<appendix id="app-variables"
+          xmlns="http://www.scons.org/dbxsd/v1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Construction Variables</title>
+
 <!--
 
   __COPYRIGHT__
@@ -49,8 +70,6 @@ where the name appears for each entry.
 
 </para>
 
-<variablelist>
-
-&variables-gen;
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../generated/variables.gen"/>
 
-</variablelist>
+</appendix>
diff --git a/doc/user/variants.xml b/doc/user/variants.xml
index 9980b1d..b841d0a 100644
--- a/doc/user/variants.xml
+++ b/doc/user/variants.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-variants"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Variant Builds</title>
+
 <!--
 
   __COPYRIGHT__
@@ -149,3 +170,5 @@ is pretty smart about rebuilding things when you change options.
   </scons_output>
 
   -->
+
+</chapter>