Commits

dirkbaechle committed 4c37565

- added first version of the SCons XSD
- rewrote User Guide XML files, such that they are valid against it

  • Participants
  • Parent commits bcd5738

Comments (0)

Files changed (59)

File bin/SConsDoc.py

         
     return True
 
+def prettyprint_xml(fpath):
+    if not has_libxml2:
+        # At the moment we prefer libxml2 over lxml, the latter can lead
+        # to conflicts when installed together with libxml2.
+        if has_lxml:
+            # Use lxml
+            from lxml import etree
+            fin = open(fpath,'r')
+            tree = etree.parse(fin)
+            pretty_content = etree.tostring(tree, pretty_print=True)
+            fin.close()
+
+            fout = open(fpath,'w')
+            fout.write(pretty_content)
+            fout.close()
+        else:
+            # Use xmllint as a last fallback
+            try:
+                import subprocess
+                p = subprocess.Popen(['xmllint', '-o', fpath, '--format', fpath],
+                                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                sout, serr = p.communicate()
+            except:
+                print "Can't prettyprint %s! Neither lxml/libxml2, nor xmllint found." % fpath
+                return False
+
+    # Read file and resolve entities
+    doc = libxml2.readFile(fpath, None, libxml2.XML_PARSE_NOENT)
+    err = xmlschema_context.schemaValidateDoc(doc)
+    # Cleanup
+    doc.freeDoc()
+    
+
 perc="%"
 
 def validate_all_xml(dpath='src', xsdfile=default_xsd):
 class Function(Item):
     def __init__(self, name):
         super(Function, self).__init__(name)
-        self.arguments = []
+        self.arguments = ['()']
 
 class Tool(Item):
     def __init__(self, name):

File bin/scons-proc.py

             fl = filename.split(',')
             filename = fl[0]
         f = self.fopen(filename)
+        
+        # Write XML header
+        f.write("""<?xml version='1.0'?>
+<variablelist xmlns="%s"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="%s scons.xsd">
+
+""" % (SConsDoc.dbxsd, SConsDoc.dbxsd))
+        f.write(Warning)
+        
         for v in self.values:
             f.write('\n<varlistentry id="%s%s">\n' %
                         (v.prefix, v.idfunc()))
             f.write('</listitem>\n')
             f.write('</varlistentry>\n')
             
+        # Write end tag
+        f.write('\n</variablelist>\n')
+            
     def write_mod(self, filename):
         try:
             description = self.values[0].description
                 signature = arg.signature
             except AttributeError:
                 signature = "both"
-            s = self.args_to_xml(arg)
+            s = arg # TODO: self.args_to_xml(arg)
             if signature in ('both', 'global'):
                 result.append('<synopsis>%s%s</synopsis>\n' % (self.name, s)) #<br>
             if signature in ('both', 'env'):

File doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd

     <xs:attributeGroup ref="common.attrib"/>
     <xs:attributeGroup ref="scons_example.role.attrib"/>
     <xs:attribute name="name" type="xs:string" use="required" />
+    <xs:attribute name="printme" type="xs:int" use="optional" />
   </xs:attributeGroup>
   <!-- end of scons_example.attlist -->
   <!-- end of scons_example.module -->
   <xs:attributeGroup name="scons_output.attlist">
     <xs:attributeGroup ref="common.attrib"/>
     <xs:attributeGroup ref="scons_output.role.attrib"/>
-    <xs:attribute name="name" type="xs:string" use="required" />
+    <xs:attribute name="name" type="xs:string" />
+    <xs:attribute name="tools" type="xs:string" />
     <xs:attribute name="example" type="xs:string" use="required" />
   </xs:attributeGroup>
   <!-- end of scons_output.attlist -->

File doc/user/actions.xml

+<?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__
   </section>
 
   -->
+
+</chapter>

File doc/user/add-method.xml

+<?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__
   and because &AddMethod; provides for copying the method
   to any clones of the &consenv; instance.
   </para>
+
+</chapter>

File doc/user/alias.xml

+<?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__
      <scons_output_command>scons -Q -c __ROOT__/</scons_output_command>
      <scons_output_command>scons -Q install</scons_output_command>
   </scons_output>
+
+</chapter>

File doc/user/ant.xml

+<?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__
    </para>
 
  </section>
+
+</appendix>

File doc/user/build-install.xml

+<?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__
   </section>
 
   -->
+
+</chapter>

File doc/user/builders-built-in.xml

+<?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__
     </section>
 
   </section>
+
+</chapter>

File doc/user/builders-commands.xml

+<?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__
 
   </para>
 
+
+</chapter>

File doc/user/builders-writing.xml

+<?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__
   </section>
 
   -->
+
+</chapter>

File doc/user/builders.xml

+<?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__
 
 -->
 
-<!--
-<!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
 
 </para>
 
-<variablelist>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../generated/builders.gen"/>
 
-&builders-gen;
-
-</variablelist>
+</appendix>

File doc/user/caching.xml

+<?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__
   </section>
 
   -->
+
+</chapter>

File doc/user/command-line.xml

+<?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__
     </section>
 
   </section>
+
+</chapter>

File doc/user/copyright.xml

+<?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__
 
  </para>
 </blockquote>
+
+</legalnotice>

File doc/user/depends.xml

+<?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__
   </section>
 
   -->
+
+</chapter>

File doc/user/environments.xml

+<?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__
     </section>
 
   </section>
+
+</chapter>

File doc/user/errors.xml

+<?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__
    </para>
 
  </section>
+</chapter>

File doc/user/example.xml

+<?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__
    </para>
 
  </section>
+
+</appendix>

File doc/user/factories.xml

+<?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__
     </sconstruct>
 
   </section>
+
+</chapter>

File doc/user/file-removal.xml

+<?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__
     </scons_output>
 
   </section>
+
+</chapter>

File doc/user/functions.xml

+<?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__
 
 </para>
 
-<variablelist>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../generated/functions.gen"/>
 
-&functions-gen;
-
-</variablelist>
+</appendix>

File doc/user/gettext.xml

+<?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__
     even been touched.
     </para>
   </section>
+
+</chapter>

File doc/user/hierarchy.xml

+<?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__
   </section>
 
   -->
+
+</chapter>

File doc/user/install.xml

+<?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__
     </scons_output>
 
   </section>
+
+</chapter>

File doc/user/java.xml

+<?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__
     </para>
 
   </section>
+
+</chapter>

File doc/user/less-simple.xml

+<?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__
     </para>
 
   </section>
+
+</chapter>

File doc/user/libraries.xml

+<?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__
     </para>
 
   </section>
+
+</chapter>

File doc/user/main.xml

 
 -->
 
-<!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;
     <!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">
-
 ]>
 
   <!--
 
   -->
 
-<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>
 
       <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
     <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"/>
 
   <!--
 
   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"/>
 
   -->
 

File doc/user/make.xml

+<?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__
    </para>
 
  </section>
+
+</appendix>

File doc/user/mergeflags.xml

+<?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__
  in the specified construction environment.
 
  </para>
+
+</section>

File doc/user/misc.xml

+<?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__
     </para>
 
   </section>
+
+</chapter>

File doc/user/nodes.xml

+<?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__
   </section>
 
   -->
+
+</chapter>

File doc/user/output.xml

+<?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__
     </scons_output>
 
   </section>
+
+</chapter>

File doc/user/parseconfig.xml

+<?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__
     ['/usr/X11/include']
     scons: `.' is up to date.
  </screen>
+
+</section>

File doc/user/parseflags.xml

+<?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__
  consult the man page for details about those currently recognized.
 
  </para>
+
+</section>

File doc/user/preface.xml

+<?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__
     </para>
 
   </section>
+
+</preface>

File doc/user/python.xml

+<?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__
 
 -->
 
-  <!--
-
-  <section>
-  <title>Python Overview</title>
-
     <para>
 
     This section will provide a brief overview of
 
     </para>
 
-  </section>
-
-  -->
+</appendix>

File doc/user/repositories.xml

+<?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__
     </para>
 
   </section>
+
+</chapter>

File doc/user/run.xml

+<?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__
     </para>
 
   </section>
+
+</chapter>

File doc/user/scanners.xml

+<?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__
     
     </para>
     </section>
+
+</chapter>

File doc/user/sconf.xml

+<?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__
   </section>
 
   -->
+
+</chapter>

File doc/user/separate.xml

+<?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__
   </section>
 
   -->
+
+</chapter>

File doc/user/sideeffect.xml

+<?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__
 
 -->
 
- <!--
-
  <para>
 
  If &SCons; is unaware that a build step produces an extra file,
 
  </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,
     <scons_output_command>scons -Q --jobs=2</scons_output_command>
  </scons_output>
 
- -->
-
  <para>
 
  Sometimes a program the you need to call
              './build --log logfile.txt $SOURCE $TARGET')
  env.Command('file2.out', 'file.in',
              './build --log logfile.txt $SOURCE $TARGET')
- <screen>
+ </screen>
 
  <para>
 
  may actually updated by more than one command invocation.
 
  </para>
+
+ </chapter>
+ 

File doc/user/simple.xml

+<?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__
    </para>
 
  </section>
+
+</chapter>

File doc/user/sourcecode.xml

+<?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__
  </section>
 
  -->
+
+</chapter>

File doc/user/tasks.xml

+<?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__
  </scons_output>
     
 </example>