Regenerated docs for 3.0.2 release

author: William Deegan <bill@baddogconsulting.com> 2018-12-31 23:12:44 (GMT)
committer: William Deegan <bill@baddogconsulting.com> 2018-12-31 23:12:44 (GMT)
commit: 6e4aa886cfb593b04ac2e57fd7b1d7cb9494d660 (patch)
tree: 2a15723fde907a6f80c37dbe580c57480872844d /doc
parent: 40f85c31422728d2614d1dbe8e69a9f0932a3570 (diff)
download: SCons-6e4aa886cfb593b04ac2e57fd7b1d7cb9494d660.zip
SCons-6e4aa886cfb593b04ac2e57fd7b1d7cb9494d660.tar.gz
SCons-6e4aa886cfb593b04ac2e57fd7b1d7cb9494d660.tar.bz2
236 files changed, 4107 insertions, 3193 deletions
diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen
index 6f8c7e9..680f72f 100644
--- a/doc/generated/builders.gen
+++ b/doc/generated/builders.gen
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sconsdoc [
     <!ENTITY % scons SYSTEM "../scons.mod">
     %scons;
@@ -12,7 +12,7 @@
     %variables-mod;
 ]>
 
-<variablelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
+<variablelist 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">
   <varlistentry id="b-CFile">
     <term>
       <function>CFile()</function>
@@ -20,17 +20,18 @@
     <term>
       <function>env.CFile()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a C source file given a lex (<filename>.l</filename>)
 or yacc (<filename>.y</filename>) input file.
-The suffix specified by the <link linkend="cv-CFILESUFFIX"><envar>$CFILESUFFIX</envar></link> construction variable
+The suffix specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CFILESUFFIX"><envar>$CFILESUFFIX</envar></link> construction variable
 (<filename>.c</filename> by default)
 is automatically added to the target
 if it is not already present.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # builds foo.c
 env.CFile(target = 'foo.c', source = 'foo.l')
 # builds bar.c
@@ -45,12 +46,13 @@ env.CFile(target = 'bar', source = 'bar.y')
     <term>
       <function>env.Command()</function>
     </term>
-    <listitem><para>
-The <function>Command</function> "Builder" is actually implemented
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The <function xmlns="http://www.scons.org/dbxsd/v1.0">Command</function> "Builder" is actually implemented
 as a function that looks like a Builder,
 but actually takes an additional argument of the action
 from which the Builder should be made.
-See the <link linkend="f-Command"><function>Command</function></link> function description
+See the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Command"><function>Command</function></link> function description
 for the calling syntax and details.
 </para>
 </listitem>
@@ -62,18 +64,19 @@ for the calling syntax and details.
     <term>
       <function>env.CXXFile()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a C++ source file given a lex (<filename>.ll</filename>)
 or yacc (<filename>.yy</filename>)
 input file.
-The suffix specified by the <link linkend="cv-CXXFILESUFFIX"><envar>$CXXFILESUFFIX</envar></link> construction variable
+The suffix specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CXXFILESUFFIX"><envar>$CXXFILESUFFIX</envar></link> construction variable
 (<filename>.cc</filename> by default)
 is automatically added to the target
 if it is not already present.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # builds foo.cc
 env.CXXFile(target = 'foo.cc', source = 'foo.ll')
 # builds bar.cc
@@ -88,19 +91,20 @@ env.CXXFile(target = 'bar', source = 'bar.yy')
     <term>
       <function>env.DocbookEpub()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A pseudo-Builder, providing a Docbook toolchain for EPUB output.
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookEpub('manual.epub', 'manual.xml')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 or simply
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookEpub('manual')
 </example_commands>
 
@@ -113,16 +117,17 @@ env.DocbookEpub('manual')
     <term>
       <function>env.DocbookHtml()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A pseudo-Builder, providing a Docbook toolchain for HTML output.
 </para>
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtml('manual.html', 'manual.xml')
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 or simply
 </para>
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtml('manual')
 </example_commands>
 </listitem>
@@ -134,34 +139,35 @@ env.DocbookHtml('manual')
     <term>
       <function>env.DocbookHtmlChunked()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A pseudo-Builder, providing a Docbook toolchain for chunked HTML output.
 It supports the <literal>base.dir</literal> parameter. The 
 <filename>chunkfast.xsl</filename> file (requires "EXSLT") is used as the
 default stylesheet. Basic syntax:
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtmlChunked('manual')
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 where <filename>manual.xml</filename> is the input file.
 </para>
-<para>If you use the <literal>root.filename</literal> 
+<para xmlns="http://www.scons.org/dbxsd/v1.0">If you use the <literal>root.filename</literal> 
 parameter in your own stylesheets you have to specify the new target name.
 This ensures that the dependencies get correct, especially for the cleanup via <quote><literal>scons -c</literal></quote>:
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtmlChunked('mymanual.html', 'manual', xsl='htmlchunk.xsl')
 </screen>
-<para>Some basic support for the <literal>base.dir</literal> is provided. You
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Some basic support for the <literal>base.dir</literal> is provided. You
 can add the <literal>base_dir</literal> keyword to your Builder
 call, and the given prefix gets prepended to all the created filenames:
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtmlChunked('manual', xsl='htmlchunk.xsl', base_dir='output/')
 </screen>
-<para>Make sure that you don't forget the trailing slash for the base folder, else
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Make sure that you don't forget the trailing slash for the base folder, else
 your files get renamed only! 
 </para>
 </listitem>
@@ -173,34 +179,35 @@ your files get renamed only!
     <term>
       <function>env.DocbookHtmlhelp()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A pseudo-Builder, providing a Docbook toolchain for HTMLHELP output.
 Its basic syntax is:
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtmlhelp('manual')
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 where <filename>manual.xml</filename> is the input file.
 </para>
 
-<para>If you use the <literal>root.filename</literal> 
+<para xmlns="http://www.scons.org/dbxsd/v1.0">If you use the <literal>root.filename</literal> 
 parameter in your own stylesheets you have to specify the new target name.
 This ensures that the dependencies get correct, especially for the cleanup via <quote><literal>scons -c</literal></quote>:
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtmlhelp('mymanual.html', 'manual', xsl='htmlhelp.xsl')
 </screen>
-<para>Some basic support for the <literal>base.dir</literal> parameter
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Some basic support for the <literal>base.dir</literal> parameter
 is provided. You can add the <literal>base_dir</literal> keyword to
 your Builder call, and the given prefix gets prepended to all the
 created filenames:
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtmlhelp('manual', xsl='htmlhelp.xsl', base_dir='output/')
 </screen>
-<para>Make sure that you don't forget the trailing slash for the base folder, else
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Make sure that you don't forget the trailing slash for the base folder, else
 your files get renamed only! 
 </para>
 
@@ -213,15 +220,16 @@ your files get renamed only!
     <term>
       <function>env.DocbookMan()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A pseudo-Builder, providing a Docbook toolchain for Man page output.
 Its basic syntax is:
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookMan('manual')
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 where <filename>manual.xml</filename> is the input file. Note, that 
 you can specify a target name, but the actual output names are automatically
 set from the <literal>refname</literal> entries in your XML source.
@@ -235,19 +243,20 @@ set from the <literal>refname</literal> entries in your XML source.
     <term>
       <function>env.DocbookPdf()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A pseudo-Builder, providing a Docbook toolchain for PDF output.
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookPdf('manual.pdf', 'manual.xml')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 or simply
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookPdf('manual')
 </example_commands>
 
@@ -260,32 +269,33 @@ env.DocbookPdf('manual')
     <term>
       <function>env.DocbookSlidesHtml()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A pseudo-Builder, providing a Docbook toolchain for HTML slides output.
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookSlidesHtml('manual')
 </example_commands>
 
-<para>If you use the <literal>titlefoil.html</literal> parameter in
+<para xmlns="http://www.scons.org/dbxsd/v1.0">If you use the <literal>titlefoil.html</literal> parameter in
 your own stylesheets you have to give the new target name. This ensures
 that the dependencies get correct, especially for the cleanup via 
 <quote><literal>scons -c</literal></quote>:
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookSlidesHtml('mymanual.html','manual', xsl='slideshtml.xsl')
 </screen>
 
-<para>Some basic support for the <literal>base.dir</literal> parameter 
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Some basic support for the <literal>base.dir</literal> parameter 
 is provided. You
 can add the <literal>base_dir</literal> keyword to your Builder
 call, and the given prefix gets prepended to all the created filenames:
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookSlidesHtml('manual', xsl='slideshtml.xsl', base_dir='output/')
 </screen>
-<para>Make sure that you don't forget the trailing slash for the base folder, else
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Make sure that you don't forget the trailing slash for the base folder, else
 your files get renamed only! 
 </para>
 
@@ -298,19 +308,20 @@ your files get renamed only!
     <term>
       <function>env.DocbookSlidesPdf()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A pseudo-Builder, providing a Docbook toolchain for PDF slides output.
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookSlidesPdf('manual.pdf', 'manual.xml')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 or simply
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookSlidesPdf('manual')
 </example_commands>
 </listitem>
@@ -322,11 +333,12 @@ env.DocbookSlidesPdf('manual')
     <term>
       <function>env.DocbookXInclude()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A pseudo-Builder, for resolving XIncludes in a separate processing step.
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookXInclude('manual_xincluded.xml', 'manual.xml')
 </example_commands>
 </listitem>
@@ -338,15 +350,16 @@ env.DocbookXInclude('manual_xincluded.xml', 'manual.xml')
     <term>
       <function>env.DocbookXslt()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A pseudo-Builder, applying a given XSL transformation to the input file.
 </para>
 
-<example_commands>env = Environment(tools=['docbook'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookXslt('manual_transformed.xml', 'manual.xml', xsl='transform.xslt')
 </example_commands>
 
-<para>Note, that this builder requires the <literal>xsl</literal> parameter
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Note, that this builder requires the <literal>xsl</literal> parameter
 to be set.
 </para>
 </listitem>
@@ -358,40 +371,41 @@ to be set.
     <term>
       <function>env.DVI()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a <filename>.dvi</filename> file
 from a <filename>.tex</filename>,
 <filename>.ltx</filename> or <filename>.latex</filename> input file.
 If the source file suffix is <filename>.tex</filename>,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will examine the contents of the file;
 if the string
 <literal>\documentclass</literal>
 or
 <literal>\documentstyle</literal>
 is found, the file is assumed to be a LaTeX file and
-the target is built by invoking the <link linkend="cv-LATEXCOM"><envar>$LATEXCOM</envar></link> command line;
-otherwise, the <link linkend="cv-TEXCOM"><envar>$TEXCOM</envar></link> command line is used.
+the target is built by invoking the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LATEXCOM"><envar>$LATEXCOM</envar></link> command line;
+otherwise, the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-TEXCOM"><envar>$TEXCOM</envar></link> command line is used.
 If the file is a LaTeX file,
 the
-<function>DVI</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">DVI</function>
 builder method will also examine the contents
 of the
 <filename>.aux</filename>
-file and invoke the <link linkend="cv-BIBTEX"><envar>$BIBTEX</envar></link> command line
+file and invoke the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-BIBTEX"><envar>$BIBTEX</envar></link> command line
 if the string
 <literal>bibdata</literal>
 is found,
-start <link linkend="cv-MAKEINDEX"><envar>$MAKEINDEX</envar></link> to generate an index if a
+start <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MAKEINDEX"><envar>$MAKEINDEX</envar></link> to generate an index if a
 <filename>.ind</filename>
 file is found
 and will examine the contents
 <filename>.log</filename>
-file and re-run the <link linkend="cv-LATEXCOM"><envar>$LATEXCOM</envar></link> command
+file and re-run the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LATEXCOM"><envar>$LATEXCOM</envar></link> command
 if the log file says it is necessary.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix <filename>.dvi</filename>
 (hard-coded within TeX itself)
 is automatically added to the target
@@ -399,7 +413,7 @@ if it is not already present.
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # builds from aaa.tex
 env.DVI(target = 'aaa.dvi', source = 'aaa.tex')
 # builds bbb.dvi
@@ -416,13 +430,14 @@ env.DVI(target = 'ccc.dvi', source = 'ccc.latex')
     <term>
       <function>env.Gs()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A Builder for explicitly calling the <literal>gs</literal> executable.
 Depending on the underlying OS, the different names <literal>gs</literal>,
 <literal>gsos2</literal> and <literal>gswin32c</literal>
 are tried.
 </para>
-<example_commands>env = Environment(tools=['gs'])
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['gs'])
 env.Gs('cover.jpg','scons-scons.pdf',
        GSFLAGS='-dNOPAUSE -dBATCH -sDEVICE=jpeg -dFirstPage=1 -dLastPage=1 -q') 
        )
@@ -436,7 +451,8 @@ env.Gs('cover.jpg','scons-scons.pdf',
     <term>
       <function>env.Install()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Installs one or more source files or directories
 in the specified target,
 which must be a directory.
@@ -446,7 +462,7 @@ sources may be given as a string or as a node returned by
 a builder.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Install('/usr/local/bin', source = ['foo', 'bar'])
 </example_commands>
 </listitem>
@@ -458,7 +474,8 @@ env.Install('/usr/local/bin', source = ['foo', 'bar'])
     <term>
       <function>env.InstallAs()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Installs one or more source files or directories
 to specific names,
 allowing changing a file or directory name
@@ -470,7 +487,7 @@ source
 arguments list different numbers of files or directories.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.InstallAs(target = '/usr/local/bin/foo',
               source = 'foo_debug')
 env.InstallAs(target = ['../lib/libfoo.a', '../lib/libbar.a'],
@@ -486,12 +503,13 @@ env.InstallAs(target = ['../lib/libfoo.a', '../lib/libbar.a'],
     <term>
       <function>env.InstallVersionedLib()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Installs a versioned shared library. The symlinks appropriate to the
 architecture will be generated based on symlinks of the source library.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.InstallVersionedLib(target = '/usr/local/bin/foo',
               source = 'libxyz.1.5.2.so')
 </example_commands>
@@ -504,40 +522,41 @@ env.InstallVersionedLib(target = '/usr/local/bin/foo',
     <term>
       <function>env.Jar()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a Java archive (<filename>.jar</filename>) file
 from the specified list of sources.
 Any directories in the source list
 will be searched for <filename>.class</filename> files).
 Any <filename>.java</filename> files in the source list
 will be compiled  to <filename>.class</filename> files
-by calling the <link linkend="b-Java"><function>Java</function></link> Builder.
+by calling the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-Java"><function>Java</function></link> Builder.
 </para>
 
-<para>
-If the <link linkend="cv-JARCHDIR"><envar>$JARCHDIR</envar></link> value is set, the
-<application>jar</application>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+If the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JARCHDIR"><envar>$JARCHDIR</envar></link> value is set, the
+<application xmlns="http://www.scons.org/dbxsd/v1.0">jar</application>
 command will change to the specified directory using the
 <option>-C</option>
 option.
-If <envar>$JARCHDIR</envar> is not set explicitly,
-<application>SCons</application> will use the top of any subdirectory tree
+If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JARCHDIR</envar> is not set explicitly,
+<application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> will use the top of any subdirectory tree
 in which Java <filename>.class</filename>
-were built by the <link linkend="b-Java"><function>Java</function></link> Builder.
+were built by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-Java"><function>Java</function></link> Builder.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the contents any of the source files begin with the string
 <literal>Manifest-Version</literal>,
 the file is assumed to be a manifest
 and is passed to the
-<application>jar</application>
+<application xmlns="http://www.scons.org/dbxsd/v1.0">jar</application>
 command with the
 <option>m</option>
 option set.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Jar(target = 'foo.jar', source = 'classes')
 
 env.Jar(target = 'bar.jar',
@@ -552,7 +571,8 @@ env.Jar(target = 'bar.jar',
     <term>
       <function>env.Java()</function>
     </term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Builds one or more Java class files.
                 The sources may be any combination of explicit
                 <filename>.java</filename>
@@ -561,7 +581,7 @@ env.Jar(target = 'bar.jar',
                 for <filename>.java</filename> files.
             </para>
 
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 SCons will parse each source <filename>.java</filename> file
                 to find the classes
                 (including inner classes)
@@ -572,7 +592,7 @@ env.Jar(target = 'bar.jar',
                 the specified target directory.
             </para>
 
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 SCons will also search each Java file
                 for the Java package name,
                 which it assumes can be found on a line
@@ -595,17 +615,17 @@ env.Jar(target = 'bar.jar',
                 class file.
             </para>
 
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Examples:
             </para>
 
-            <example_commands>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
                 env.Java(target = 'classes', source = 'src')
                 env.Java(target = 'classes', source = ['src1', 'src2'])
                 env.Java(target = 'classes', source = ['File1.java', 'File2.java'])
             </example_commands>
 
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Java source files can use the native encoding for the underlying OS.
                 Since SCons compiles in simple ASCII mode by default,
                 the compiler will generate warnings about unmappable characters,
@@ -618,7 +638,7 @@ env.Jar(target = 'bar.jar',
                 with a different encoding.
             </para>
 
-            <example_commands>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
                 env = Environment()
                 env['ENV']['LANG'] = 'en_GB.UTF-8'
             </example_commands>
@@ -631,7 +651,8 @@ env.Jar(target = 'bar.jar',
     <term>
       <function>env.JavaH()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds C header and source files for
 implementing Java native methods.
 The target can be either a directory
@@ -641,29 +662,29 @@ will contain all of the definitions.
 The source can be the names of <filename>.class</filename> files,
 the names of <filename>.java</filename> files
 to be compiled into <filename>.class</filename> files
-by calling the <link linkend="b-Java"><function>Java</function></link> builder method,
+by calling the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-Java"><function>Java</function></link> builder method,
 or the objects returned from the
-<function>Java</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Java</function>
 builder method.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the construction variable
-<link linkend="cv-JAVACLASSDIR"><envar>$JAVACLASSDIR</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACLASSDIR"><envar>$JAVACLASSDIR</envar></link>
 is set, either in the environment
 or in the call to the
-<function>JavaH</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">JavaH</function>
 builder method itself,
 then the value of the variable
 will be stripped from the
 beginning of any <filename>.class</filename> file names.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # builds java_native.h
 classes = env.Java(target = 'classdir', source = 'src')
 env.JavaH(target = 'java_native.h', source = classes)
@@ -686,9 +707,10 @@ env.JavaH(target = 'export',
     <term>
       <function>env.Library()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A synonym for the
-<function>StaticLibrary</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">StaticLibrary</function>
 builder method.
 </para>
 </listitem>
@@ -700,10 +722,11 @@ builder method.
     <term>
       <function>env.LoadableModule()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 On most systems,
 this is the same as
-<function>SharedLibrary</function>.
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SharedLibrary</function>.
 On Mac OS X (Darwin) platforms,
 this creates a loadable module bundle.
 </para>
@@ -716,9 +739,10 @@ this creates a loadable module bundle.
     <term>
       <function>env.M4()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds an output file from an M4 input file.
-This uses a default <link linkend="cv-M4FLAGS"><envar>$M4FLAGS</envar></link> value of
+This uses a default <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-M4FLAGS"><envar>$M4FLAGS</envar></link> value of
 <option>-E</option>,
 which considers all warnings to be fatal
 and stops on the first warning
@@ -726,7 +750,7 @@ when using the GNU version of m4.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.M4(target = 'foo.c', source = 'foo.c.m4')
 </example_commands>
 </listitem>
@@ -738,14 +762,15 @@ env.M4(target = 'foo.c', source = 'foo.c.m4')
     <term>
       <function>env.Moc()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds an output file from a moc input file. Moc input files are either
 header files or cxx files. This builder is only available after using the
-tool 'qt'. See the <link linkend="cv-QTDIR"><envar>$QTDIR</envar></link> variable for more information.
+tool 'qt'. See the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-QTDIR"><envar>$QTDIR</envar></link> variable for more information.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Moc('foo.h') # generates moc_foo.cc
 env.Moc('foo.cpp') # generates foo.moc
 </example_commands>
@@ -758,47 +783,48 @@ env.Moc('foo.cpp') # generates foo.moc
     <term>
       <function>env.MOFiles()</function>
     </term>
-    <listitem><para>
-This builder belongs to <link linkend="t-msgfmt"><literal>msgfmt</literal></link> tool. The builder compiles
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This builder belongs to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgfmt"><literal>msgfmt</literal></link> tool. The builder compiles
 <literal>PO</literal> files to <literal>MO</literal> files.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 1</emphasis>.
 Create <filename>pl.mo</filename> and <filename>en.mo</filename> by compiling
 <filename>pl.po</filename> and <filename>en.po</filename>:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.MOFiles(['pl', 'en'])
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 2</emphasis>.
 Compile files for languages defined in <filename>LINGUAS</filename> file:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.MOFiles(LINGUAS_FILE = 1)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 3</emphasis>.
 Create <filename>pl.mo</filename> and <filename>en.mo</filename> by compiling
 <filename>pl.po</filename> and <filename>en.po</filename> plus files for
 languages defined in <filename>LINGUAS</filename> file:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.MOFiles(['pl', 'en'], LINGUAS_FILE = 1)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 4</emphasis>.
 Compile files for languages defined in <filename>LINGUAS</filename> file 
 (another version):
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env['LINGUAS_FILE'] = 1
   env.MOFiles()
@@ -812,39 +838,39 @@ Compile files for languages defined in <filename>LINGUAS</filename> file
     <term>
       <function>env.MSVSProject()</function>
     </term>
-    <listitem><para> Builds a Microsoft Visual Studio project
-file, and by default builds a solution file as well. </para> <para> This
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0"> Builds a Microsoft Visual Studio project
+file, and by default builds a solution file as well. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> This
 builds a Visual Studio project file, based on the version of Visual Studio
 that is configured (either the latest installed version, or the version
-specified by <link linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the Environment constructor). For
+specified by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the Environment constructor). For
 Visual Studio 6, it will generate a <filename>.dsp</filename> file. For Visual
 Studio 7 (.NET) and later versions, it will generate a
-<filename>.vcproj</filename> file. </para> <para> By default, this also
+<filename>.vcproj</filename> file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> By default, this also
 generates a solution file for the specified project, a
 <filename>.dsw</filename> file for Visual Studio 6 or a
 <filename>.sln</filename> file for Visual Studio 7 (.NET). This behavior may
 be disabled by specifying <literal>auto_build_solution=0</literal> when you
-call <function>MSVSProject</function>, in which case you presumably want to build the solution
-file(s) by calling the <function>MSVSSolution</function> Builder (see below). </para> <para>
-The <function>MSVSProject</function> builder takes several lists of filenames to be placed into
+call <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function>, in which case you presumably want to build the solution
+file(s) by calling the <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSSolution</function> Builder (see below). </para> <para xmlns="http://www.scons.org/dbxsd/v1.0">
+The <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> builder takes several lists of filenames to be placed into
 the project file. These are currently limited to <literal>srcs</literal>,
 <literal>incs</literal>, <literal>localincs</literal>,
 <literal>resources</literal>, and <literal>misc</literal>. These are pretty
 self-explanatory, but it should be noted that these lists are added to the
-<link linkend="cv-SOURCES"><envar>$SOURCES</envar></link> construction variable as strings, NOT as SCons File Nodes.
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SOURCES"><envar>$SOURCES</envar></link> construction variable as strings, NOT as SCons File Nodes.
 This is because they represent file names to be added to the project file, not
-the source files used to build the project file. </para> <para> The above
+the source files used to build the project file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> The above
 filename lists are all optional, although at least one must be specified for
-the resulting project file to be non-empty. </para> <para> In addition to the
+the resulting project file to be non-empty. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> In addition to the
 above lists of values, the following values may be specified:
-</para><variablelist>
+</para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
     <varlistentry>
       <term>target</term>
 
       <listitem>
         <para>The name of the target <filename>.dsp</filename> or
         <filename>.vcproj</filename> file. The correct suffix for the version
-        of Visual Studio must be used, but the <link linkend="cv-MSVSPROJECTSUFFIX"><envar>$MSVSPROJECTSUFFIX</envar></link>
+        of Visual Studio must be used, but the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSPROJECTSUFFIX"><envar>$MSVSPROJECTSUFFIX</envar></link>
         construction variable will be defined to the correct value (see
         example below).</para>
       </listitem>
@@ -860,7 +886,7 @@ above lists of values, the following values may be specified:
         you want. For Visual Studio 7 projects, they may also specify a target
         platform separated from the variant name by a <literal>|</literal>
         (vertical pipe) character: <literal>Debug|Xbox</literal>. The default
-        target platform is Win32. Multiple calls to <function>MSVSProject</function> with
+        target platform is Win32. Multiple calls to <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> with
         different variants are allowed; all variants will be added to the
         project file with their appropriate build targets and
         sources.</para>
@@ -902,16 +928,16 @@ above lists of values, the following values may be specified:
         specified <literal>buildtarget</literal> value.</para>
       </listitem>
     </varlistentry>
-  </variablelist><para> Note that because <application>SCons</application> always executes its build
-commands from the directory in which the <filename>SConstruct</filename> file is located, if you
-generate a project file in a different directory than the <filename>SConstruct</filename>
+  </variablelist><para xmlns="http://www.scons.org/dbxsd/v1.0"> Note that because <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> always executes its build
+commands from the directory in which the <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> file is located, if you
+generate a project file in a different directory than the <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename>
 directory, users will not be able to double-click on the file name in
 compilation error messages displayed in the Visual Studio console output
 window. This can be remedied by adding the Visual C/C++ <literal>/FC</literal>
-compiler option to the <link linkend="cv-CCFLAGS"><envar>$CCFLAGS</envar></link> variable so that the compiler will
+compiler option to the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCFLAGS"><envar>$CCFLAGS</envar></link> variable so that the compiler will
 print the full path name of any files that cause compilation errors. </para>
-<para> Example usage: </para>
-    <example_commands>
+<para xmlns="http://www.scons.org/dbxsd/v1.0"> Example usage: </para>
+    <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 barsrcs = ['bar.cpp']
 barincs = ['bar.h']
 barlocalincs = ['StdAfx.h']
@@ -930,10 +956,10 @@ env.MSVSProject(target = 'Bar' + env['MSVSPROJECTSUFFIX'],
                 buildtarget = buildtarget,
                 variant = 'Release')
 </example_commands>
-<para>Starting with version 2.4 of
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Starting with version 2.4 of
 SCons it's also possible to specify the optional argument
 <parameter>DebugSettings</parameter>, which creates files for debugging under
-Visual Studio:</para><variablelist>
+Visual Studio:</para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
     <varlistentry>
       <term>DebugSettings</term>
 
@@ -946,14 +972,14 @@ Visual Studio:</para><variablelist>
         give only one, it will be propagated to all variants.</para>
       </listitem>
     </varlistentry>
-  </variablelist><para>Currently, only Visual Studio v9.0 and Visual Studio
+  </variablelist><para xmlns="http://www.scons.org/dbxsd/v1.0">Currently, only Visual Studio v9.0 and Visual Studio
 version v11 are implemented, for other versions no file is generated. To
 generate the user file, you just need to add a
 <parameter>DebugSettings</parameter> dictionary to the environment with the
 right parameters for your MSVS version. If the dictionary is empty, or does
-not contain any good value, no file will be generated.</para><para>Following
+not contain any good value, no file will be generated.</para><para xmlns="http://www.scons.org/dbxsd/v1.0">Following
 is a more contrived example, involving the setup of a project for variants and
-DebugSettings:</para><example_commands># Assuming you store your defaults in a file
+DebugSettings:</para><example_commands xmlns="http://www.scons.org/dbxsd/v1.0"># Assuming you store your defaults in a file
 vars = Variables('variables.py')
 msvcver = vars.args.get('vc', '9')
 
@@ -1075,21 +1101,21 @@ env.MSVSProject(target = 'Bar' + env['MSVSPROJECTSUFFIX'],
     <term>
       <function>env.MSVSSolution()</function>
     </term>
-    <listitem><para>Builds a Microsoft Visual Studio solution
-file. </para> <para>This builds a Visual Studio solution file, based on the
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">Builds a Microsoft Visual Studio solution
+file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0">This builds a Visual Studio solution file, based on the
 version of Visual Studio that is configured (either the latest installed
-version, or the version specified by <link linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the
+version, or the version specified by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link> in the
 construction environment). For Visual Studio 6, it will generate a
 <filename>.dsw</filename> file. For Visual Studio 7 (.NET), it will generate a
-<filename>.sln</filename> file. </para> <para> The following values must be
-specified: </para><variablelist>
+<filename>.sln</filename> file. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> The following values must be
+specified: </para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
     <varlistentry>
       <term>target</term>
 
       <listitem>
         <para>The name of the target .dsw or .sln file. The correct
         suffix for the version of Visual Studio must be used, but the value
-        <link linkend="cv-MSVSSOLUTIONSUFFIX"><envar>$MSVSSOLUTIONSUFFIX</envar></link> will be defined to the correct value (see
+        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSOLUTIONSUFFIX"><envar>$MSVSSOLUTIONSUFFIX</envar></link> will be defined to the correct value (see
         example below).</para>
       </listitem>
     </varlistentry>
@@ -1111,7 +1137,7 @@ specified: </para><variablelist>
 
       <listitem>
         <para>A list of project file names, or Project nodes returned by
-        calls to the <function>MSVSProject</function> Builder, to be placed into the solution
+        calls to the <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function> Builder, to be placed into the solution
         file. It should be noted that these file names are NOT added to the
         $SOURCES environment variable in form of files, but rather as strings.
         This is because they represent file names to be added to the solution
@@ -1119,7 +1145,7 @@ specified: </para><variablelist>
         file.</para>
       </listitem>
     </varlistentry>
-  </variablelist> <para> Example Usage: </para> <example_commands>
+  </variablelist> <para xmlns="http://www.scons.org/dbxsd/v1.0"> Example Usage: </para> <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.MSVSSolution(target = 'Bar' + env['MSVSSOLUTIONSUFFIX'], projects = ['bar'
 + env['MSVSPROJECTSUFFIX']], variant = 'Release')
 </example_commands></listitem>
@@ -1131,9 +1157,10 @@ env.MSVSSolution(target = 'Bar' + env['MSVSSOLUTIONSUFFIX'], projects = ['bar'
     <term>
       <function>env.Object()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A synonym for the
-<function>StaticObject</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">StaticObject</function>
 builder method.
 </para>
 </listitem>
@@ -1145,39 +1172,41 @@ builder method.
     <term>
       <function>env.Package()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a Binary Package of the given source files. 
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Package(source = FindInstalledFiles())
 </example_commands>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds software distribution packages.
 Packages consist of files to install and packaging information.
-The former may be specified with the <varname>source</varname> parameter and may be left out,
-in which case the <function>FindInstalledFiles</function> function will collect
-all files that have an <function>Install</function> or <function>InstallAs</function> Builder attached.
-If the <varname>target</varname> is not specified
+The former may be specified with the <varname xmlns="http://www.scons.org/dbxsd/v1.0">source</varname> parameter and may be left out,
+in which case the <function xmlns="http://www.scons.org/dbxsd/v1.0">FindInstalledFiles</function> function will collect
+all files that have an <function xmlns="http://www.scons.org/dbxsd/v1.0">Install</function> or <function xmlns="http://www.scons.org/dbxsd/v1.0">InstallAs</function> Builder attached.
+If the <varname xmlns="http://www.scons.org/dbxsd/v1.0">target</varname> is not specified
 it will be deduced from additional information given to this Builder.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The packaging information is specified
 with the help of construction variables documented below.
 This information is called a tag to stress that
-some of them can also be attached to files with the <function>Tag</function> function.
+some of them can also be attached to files with the <function xmlns="http://www.scons.org/dbxsd/v1.0">Tag</function> function.
 The mandatory ones will complain if they were not specified.
 They vary depending on chosen target packager.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The target packager may be selected with the "PACKAGETYPE" command line
-option or with the <envar>$PACKAGETYPE</envar> construction variable. Currently
+option or with the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$PACKAGETYPE</envar> construction variable. Currently
 the following packagers available:
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
  * msi - Microsoft Installer
  * rpm - RPM Package Manger
  * ipkg - Itsy Package Management System
@@ -1191,11 +1220,11 @@ the following packagers available:
  * src_zip - zip file source
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An updated list is always available under the "package_type" option when
 running "scons --help" on a project that has packaging activated.
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(tools=['default', 'packaging'])
 env.Install('/bin/', 'my_program')
 env.Package( NAME           = 'foo',
@@ -1218,7 +1247,8 @@ env.Package( NAME           = 'foo',
     <term>
       <function>env.PCH()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a Microsoft Visual C++ precompiled header.
 Calling this builder method
 returns a list of two targets: the PCH as the first element, and the object
@@ -1230,7 +1260,7 @@ conjunction with the PCH construction variable to force object files to use
 the precompiled header:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env['PCH'] = env.PCH('StdAfx.cpp')[0]
 </example_commands>
 </listitem>
@@ -1242,20 +1272,21 @@ env['PCH'] = env.PCH('StdAfx.cpp')[0]
     <term>
       <function>env.PDF()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a <filename>.pdf</filename> file
 from a <filename>.dvi</filename> input file
 (or, by extension, a <filename>.tex</filename>,
 <filename>.ltx</filename>,
 or
 <filename>.latex</filename> input file).
-The suffix specified by the <link linkend="cv-PDFSUFFIX"><envar>$PDFSUFFIX</envar></link> construction variable
+The suffix specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PDFSUFFIX"><envar>$PDFSUFFIX</envar></link> construction variable
 (<filename>.pdf</filename> by default)
 is added automatically to the target
 if it is not already present.  Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # builds from aaa.tex
 env.PDF(target = 'aaa.pdf', source = 'aaa.tex')
 # builds bbb.pdf from bbb.dvi
@@ -1270,99 +1301,100 @@ env.PDF(target = 'bbb', source = 'bbb.dvi')
     <term>
       <function>env.POInit()</function>
     </term>
-    <listitem><para>
-This builder belongs to <link linkend="t-msginit"><literal>msginit</literal></link> tool. The builder initializes missing
-<literal>PO</literal> file(s) if <link linkend="cv-POAUTOINIT"><envar>$POAUTOINIT</envar></link> is set.  If
-<link linkend="cv-POAUTOINIT"><envar>$POAUTOINIT</envar></link> is not set (default), <function>POInit</function> prints instruction for
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This builder belongs to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> tool. The builder initializes missing
+<literal>PO</literal> file(s) if <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POAUTOINIT"><envar>$POAUTOINIT</envar></link> is set.  If
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POAUTOINIT"><envar>$POAUTOINIT</envar></link> is not set (default), <function xmlns="http://www.scons.org/dbxsd/v1.0">POInit</function> prints instruction for
 user (that is supposed to be a translator), telling how the
 <literal>PO</literal> file should be initialized. In normal projects
-<emphasis>you should not use <function>POInit</function> and use <link linkend="b-POUpdate"><function>POUpdate</function></link>
-instead</emphasis>. <link linkend="b-POUpdate"><function>POUpdate</function></link> chooses intelligently between
-<command>msgmerge(1)</command> and <command>msginit(1)</command>. <function>POInit</function>
+<emphasis>you should not use <function xmlns="http://www.scons.org/dbxsd/v1.0">POInit</function> and use <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link>
+instead</emphasis>. <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> chooses intelligently between
+<command>msgmerge(1)</command> and <command>msginit(1)</command>. <function xmlns="http://www.scons.org/dbxsd/v1.0">POInit</function>
 always uses <command>msginit(1)</command> and should be regarded as builder for
 special purposes or for temporary use (e.g. for quick, one time initialization
 of a bunch of <literal>PO</literal> files) or for tests.
 </para>
 
-<para>
-Target nodes defined through <function>POInit</function> are not built by default (they're
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Target nodes defined through <function xmlns="http://www.scons.org/dbxsd/v1.0">POInit</function> are not built by default (they're
 <literal>Ignore</literal>d from <literal>'.'</literal> node) but are added to
 special <literal>Alias</literal> (<literal>'po-create'</literal> by default).
-The alias name may be changed through the <link linkend="cv-POCREATE_ALIAS"><envar>$POCREATE_ALIAS</envar></link>
+The alias name may be changed through the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POCREATE_ALIAS"><envar>$POCREATE_ALIAS</envar></link>
 construction variable. All <literal>PO</literal> files defined through
-<function>POInit</function> may be easily initialized by <command>scons po-create</command>.
+<function xmlns="http://www.scons.org/dbxsd/v1.0">POInit</function> may be easily initialized by <command>scons po-create</command>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 1</emphasis>.
 Initialize <filename>en.po</filename> and <filename>pl.po</filename> from
 <filename>messages.pot</filename>:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POInit(['en', 'pl']) # messages.pot --&gt; [en.po, pl.po] 
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 2</emphasis>.
 Initialize <filename>en.po</filename> and <filename>pl.po</filename> from
 <filename>foo.pot</filename>:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POInit(['en', 'pl'], ['foo']) # foo.pot --&gt; [en.po, pl.po] 
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 3</emphasis>.
 Initialize <filename>en.po</filename> and <filename>pl.po</filename> from
-<filename>foo.pot</filename> but using <link linkend="cv-POTDOMAIN"><envar>$POTDOMAIN</envar></link> construction
+<filename>foo.pot</filename> but using <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POTDOMAIN"><envar>$POTDOMAIN</envar></link> construction
 variable:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POInit(['en', 'pl'], POTDOMAIN='foo') # foo.pot --&gt; [en.po, pl.po] 
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 4</emphasis>.
 Initialize <literal>PO</literal> files for languages defined in
 <filename>LINGUAS</filename> file. The files will be initialized from template
 <filename>messages.pot</filename>:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POInit(LINGUAS_FILE = 1) # needs 'LINGUAS' file
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 5</emphasis>.
 Initialize <filename>en.po</filename> and <filename>pl.pl</filename>
 <literal>PO</literal> files plus files for languages defined in
 <filename>LINGUAS</filename> file. The files will be initialized from template
 <filename>messages.pot</filename>:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POInit(['en', 'pl'], LINGUAS_FILE = 1)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 6</emphasis>.
 You may preconfigure your environment first, and then initialize
 <literal>PO</literal> files:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env['POAUTOINIT'] = 1
   env['LINGUAS_FILE'] = 1
   env['POTDOMAIN'] = 'foo'
   env.POInit()
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 which has same efect as:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POInit(POAUTOINIT = 1, LINGUAS_FILE = 1, POTDOMAIN = 'foo')
 </example_commands>
@@ -1375,20 +1407,21 @@ which has same efect as:
     <term>
       <function>env.PostScript()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a <filename>.ps</filename> file
 from a <filename>.dvi</filename> input file
 (or, by extension, a <filename>.tex</filename>,
 <filename>.ltx</filename>,
 or
 <filename>.latex</filename> input file).
-The suffix specified by the <link linkend="cv-PSSUFFIX"><envar>$PSSUFFIX</envar></link> construction variable
+The suffix specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PSSUFFIX"><envar>$PSSUFFIX</envar></link> construction variable
 (<filename>.ps</filename> by default)
 is added automatically to the target
 if it is not already present.  Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # builds from aaa.tex
 env.PostScript(target = 'aaa.ps', source = 'aaa.tex')
 # builds bbb.ps from bbb.dvi
@@ -1403,23 +1436,24 @@ env.PostScript(target = 'bbb', source = 'bbb.dvi')
     <term>
       <function>env.POTUpdate()</function>
     </term>
-    <listitem><para>
-The builder belongs to <link linkend="t-xgettext"><literal>xgettext</literal></link> tool. The builder updates target
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The builder belongs to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> tool. The builder updates target
 <literal>POT</literal> file if exists or creates one if it doesn't. The node is
 not built by default (i.e. it is <literal>Ignore</literal>d from
 <literal>'.'</literal>), but only on demand (i.e.  when given
 <literal>POT</literal> file is required or when special alias is invoked). This
 builder adds its targe node (<filename>messages.pot</filename>, say) to a
 special alias (<literal>pot-update</literal> by default, see
-<link linkend="cv-POTUPDATE_ALIAS"><envar>$POTUPDATE_ALIAS</envar></link>) so you can update/create them easily with
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POTUPDATE_ALIAS"><envar>$POTUPDATE_ALIAS</envar></link>) so you can update/create them easily with
 <command>scons pot-update</command>. The file is not written until there is no
 real change in internationalized messages (or in comments that enter
 <literal>POT</literal> file). 
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <note> <para>You may see <command>xgettext(1)</command> being invoked by the
-<link linkend="t-xgettext"><literal>xgettext</literal></link> tool even if there is no real change in internationalized
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> tool even if there is no real change in internationalized
 messages (so the <literal>POT</literal> file is not being updated).  This
 happens every time  a source file has changed. In such case we invoke
 <command>xgettext(1)</command> and compare its output with the content of
@@ -1427,38 +1461,38 @@ happens every time  a source file has changed. In such case we invoke
 not.</para></note>
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 1.</emphasis>
 Let's create <filename>po/</filename> directory and place following
 <filename>SConstruct</filename> script there:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # SConstruct in 'po/' subdir
   env = Environment( tools = ['default', 'xgettext'] )
   env.POTUpdate(['foo'], ['../a.cpp', '../b.cpp'])
   env.POTUpdate(['bar'], ['../c.cpp', '../d.cpp'])
 </example_commands>      
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Then invoke scons few times:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   user@host:$ scons             # Does not create foo.pot nor bar.pot
   user@host:$ scons foo.pot     # Updates or creates foo.pot
   user@host:$ scons pot-update  # Updates or creates foo.pot and bar.pot
   user@host:$ scons -c          # Does not clean foo.pot nor bar.pot.
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 the results shall be as the comments above say.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 2.</emphasis>
-The <function>POTUpdate</function> builder may be used with no target specified, in which
+The <function xmlns="http://www.scons.org/dbxsd/v1.0">POTUpdate</function> builder may be used with no target specified, in which
 case default target <filename>messages.pot</filename> will be used. The
-default target may also be overridden by setting <link linkend="cv-POTDOMAIN"><envar>$POTDOMAIN</envar></link> construction
-variable or providing it as an override to <function>POTUpdate</function> builder:
+default target may also be overridden by setting <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POTDOMAIN"><envar>$POTDOMAIN</envar></link> construction
+variable or providing it as an override to <function xmlns="http://www.scons.org/dbxsd/v1.0">POTUpdate</function> builder:
 </para>
-<example_commands>    
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">    
   # SConstruct script
   env = Environment( tools = ['default', 'xgettext'] )
   env['POTDOMAIN'] = "foo"
@@ -1466,49 +1500,49 @@ variable or providing it as an override to <function>POTUpdate</function> builde
   env.POTUpdate(POTDOMAIN = "bar", source = ["c.cpp", "d.cpp"]) # and bar.pot
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 3.</emphasis>
 The sources may be specified within separate file, for example
 <filename>POTFILES.in</filename>:
 </para>
-<example_commands>      
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">      
   # POTFILES.in in 'po/' subdirectory
   ../a.cpp
   ../b.cpp
   # end of file
 </example_commands>    
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The name of the file (<filename>POTFILES.in</filename>) containing the list of
-sources is provided via <link linkend="cv-XGETTEXTFROM"><envar>$XGETTEXTFROM</envar></link>:
+sources is provided via <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-XGETTEXTFROM"><envar>$XGETTEXTFROM</envar></link>:
 </para>
-<example_commands>      
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">      
   # SConstruct file in 'po/' subdirectory
   env = Environment( tools = ['default', 'xgettext'] )
   env.POTUpdate(XGETTEXTFROM = 'POTFILES.in')
 </example_commands>    
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 4.</emphasis>
-You may use <link linkend="cv-XGETTEXTPATH"><envar>$XGETTEXTPATH</envar></link> to define source search path. Assume, for
+You may use <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-XGETTEXTPATH"><envar>$XGETTEXTPATH</envar></link> to define source search path. Assume, for
 example, that you have files <filename>a.cpp</filename>,
 <filename>b.cpp</filename>, <filename>po/SConstruct</filename>,
 <filename>po/POTFILES.in</filename>. Then your <literal>POT</literal>-related
 files could look as below:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # POTFILES.in in 'po/' subdirectory
   a.cpp
   b.cpp
   # end of file
 </example_commands>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # SConstruct file in 'po/' subdirectory
   env = Environment( tools = ['default', 'xgettext'] )
   env.POTUpdate(XGETTEXTFROM = 'POTFILES.in', XGETTEXTPATH='../')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 5.</emphasis>
 Multiple search directories may be defined within a list, i.e.
 <literal>XGETTEXTPATH = ['dir1', 'dir2', ...]</literal>. The order in the list
@@ -1516,48 +1550,48 @@ determines the search order of source files. The path to the first file found
 is used.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Let's create <filename>0/1/po/SConstruct</filename> script:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # SConstruct file in '0/1/po/' subdirectory
   env = Environment( tools = ['default', 'xgettext'] )
   env.POTUpdate(XGETTEXTFROM = 'POTFILES.in', XGETTEXTPATH=['../', '../../'])
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 and <filename>0/1/po/POTFILES.in</filename>:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # POTFILES.in in '0/1/po/' subdirectory
   a.cpp
   # end of file
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Write two <filename>*.cpp</filename> files, the first one is
 <filename>0/a.cpp</filename>:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   /* 0/a.cpp */
   gettext("Hello from ../../a.cpp")
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 and the second is <filename>0/1/a.cpp</filename>:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   /* 0/1/a.cpp */
   gettext("Hello from ../a.cpp")
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 then run scons. You'll obtain <literal>0/1/po/messages.pot</literal> with the
 message <literal>"Hello from ../a.cpp"</literal>. When you reverse order in
 <varname>$XGETTEXTFOM</varname>, i.e. when you write SConscript as
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # SConstruct file in '0/1/po/' subdirectory
   env = Environment( tools = ['default', 'xgettext'] )
   env.POTUpdate(XGETTEXTFROM = 'POTFILES.in', XGETTEXTPATH=['../../', '../'])
 </example_commands> 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 then the <filename>messages.pot</filename> will contain
 <literal>msgid "Hello from ../../a.cpp"</literal> line and not 
 <literal>msgid "Hello from ../a.cpp"</literal>.
@@ -1572,106 +1606,107 @@ then the <filename>messages.pot</filename> will contain
     <term>
       <function>env.POUpdate()</function>
     </term>
-    <listitem><para>
-The builder belongs to <link linkend="t-msgmerge"><literal>msgmerge</literal></link> tool. The builder updates
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The builder belongs to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgmerge"><literal>msgmerge</literal></link> tool. The builder updates
 <literal>PO</literal> files with <command>msgmerge(1)</command>, or initializes
 missing <literal>PO</literal> files as described in documentation of
-<link linkend="t-msginit"><literal>msginit</literal></link> tool and <link linkend="b-POInit"><function>POInit</function></link> builder (see also
-<link linkend="cv-POAUTOINIT"><envar>$POAUTOINIT</envar></link>). Note, that <function>POUpdate</function> <emphasis>does not add its
-targets to <literal>po-create</literal> alias</emphasis> as <link linkend="b-POInit"><function>POInit</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link> builder (see also
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POAUTOINIT"><envar>$POAUTOINIT</envar></link>). Note, that <function xmlns="http://www.scons.org/dbxsd/v1.0">POUpdate</function> <emphasis>does not add its
+targets to <literal>po-create</literal> alias</emphasis> as <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link>
 does.
 </para>
 
-<para>
-Target nodes defined through <function>POUpdate</function> are not built by default
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Target nodes defined through <function xmlns="http://www.scons.org/dbxsd/v1.0">POUpdate</function> are not built by default
 (they're <literal>Ignore</literal>d from <literal>'.'</literal> node). Instead,
 they are added automatically to special <literal>Alias</literal> 
 (<literal>'po-update'</literal> by default). The alias name may be changed
-through the <link linkend="cv-POUPDATE_ALIAS"><envar>$POUPDATE_ALIAS</envar></link> construction variable.  You can easily 
+through the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POUPDATE_ALIAS"><envar>$POUPDATE_ALIAS</envar></link> construction variable.  You can easily 
 update <literal>PO</literal> files in your project by <command>scons
 po-update</command>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 1.</emphasis>
 Update <filename>en.po</filename> and <filename>pl.po</filename> from
-<filename>messages.pot</filename> template (see also <link linkend="cv-POTDOMAIN"><envar>$POTDOMAIN</envar></link>),
+<filename>messages.pot</filename> template (see also <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POTDOMAIN"><envar>$POTDOMAIN</envar></link>),
 assuming that the later one exists or there is rule to build it (see
-<link linkend="b-POTUpdate"><function>POTUpdate</function></link>):
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link>):
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POUpdate(['en','pl']) # messages.pot --&gt; [en.po, pl.po]
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 2.</emphasis>
 Update <filename>en.po</filename> and <filename>pl.po</filename> from
 <filename>foo.pot</filename> template:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POUpdate(['en', 'pl'], ['foo']) # foo.pot --&gt;  [en.po, pl.pl]
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 3.</emphasis>
 Update <filename>en.po</filename> and <filename>pl.po</filename> from
 <filename>foo.pot</filename> (another version):
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POUpdate(['en', 'pl'], POTDOMAIN='foo') # foo.pot -- &gt; [en.po, pl.pl]
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 4.</emphasis>
 Update files for languages defined in <filename>LINGUAS</filename> file. The
 files are updated from <filename>messages.pot</filename> template:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POUpdate(LINGUAS_FILE = 1) # needs 'LINGUAS' file
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 5.</emphasis>
 Same as above, but update from <filename>foo.pot</filename> template:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POUpdate(LINGUAS_FILE = 1, source = ['foo'])
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 6.</emphasis>
 Update <filename>en.po</filename> and <filename>pl.po</filename> plus files for
 languages defined in <filename>LINGUAS</filename> file. The files are updated
 from <filename>messages.pot</filename> template:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # produce 'en.po', 'pl.po' + files defined in 'LINGUAS':
   env.POUpdate(['en', 'pl' ], LINGUAS_FILE = 1) 
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 7.</emphasis>
-Use <link linkend="cv-POAUTOINIT"><envar>$POAUTOINIT</envar></link> to automatically initialize <literal>PO</literal> file
+Use <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POAUTOINIT"><envar>$POAUTOINIT</envar></link> to automatically initialize <literal>PO</literal> file
 if it doesn't exist:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env.POUpdate(LINGUAS_FILE = 1, POAUTOINIT = 1)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 8.</emphasis>
 Update <literal>PO</literal> files for languages defined in
 <filename>LINGUAS</filename> file. The files are updated from
 <filename>foo.pot</filename> template. All necessary settings are
 pre-configured via environment.
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # ...
   env['POAUTOINIT'] = 1
   env['LINGUAS_FILE'] = 1
@@ -1688,28 +1723,29 @@ pre-configured via environment.
     <term>
       <function>env.Program()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds an executable given one or more object files
 or C, C++, D, or Fortran source files.
 If any C, C++, D or Fortran source files are specified,
 then they will be automatically
 compiled to object files using the
-<function>Object</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Object</function>
 builder method;
 see that builder method's description for
 a list of legal source file suffixes
 and how they are interpreted.
 The target executable file prefix
-(specified by the <link linkend="cv-PROGPREFIX"><envar>$PROGPREFIX</envar></link> construction variable; nothing by default)
+(specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PROGPREFIX"><envar>$PROGPREFIX</envar></link> construction variable; nothing by default)
 and suffix
-(specified by the <link linkend="cv-PROGSUFFIX"><envar>$PROGSUFFIX</envar></link> construction variable;
+(specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PROGSUFFIX"><envar>$PROGSUFFIX</envar></link> construction variable;
 by default, <filename>.exe</filename> on Windows systems,
 nothing on POSIX systems)
 are automatically added to the target if not already present.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Program(target = 'foo', source = ['foo.o', 'bar.c', 'baz.f'])
 </example_commands>
 </listitem>
@@ -1721,64 +1757,67 @@ env.Program(target = 'foo', source = ['foo.o', 'bar.c', 'baz.f'])
     <term>
       <function>env.ProgramAllAtOnce()</function>
     </term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       Builds an executable from D sources without first creating individual
       objects for each file.
     </para>
-    <para>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       D sources can be compiled file-by-file as C and C++ source are, and
-      D is integrated into the <filename>scons</filename> Object and Program builders for
+      D is integrated into the <filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename> Object and Program builders for
       this model of build. D codes can though do whole source
       meta-programming (some of the testing frameworks do this). For this
       it is imperative that all sources are compiled and linked in a single call of
       the D compiler. This builder serves that purpose.
     </para>
-    <example_commands>
+    <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
       env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
     </example_commands>
-    <para>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       This command will compile the modules mod_a, mod_b, and mod_c in a
       single compilation process without first creating object files for
       the modules. Some of the D compilers will create executable.o others
       will not.
     </para>
-  <para>
+  
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       Builds an executable from D sources without first creating individual
       objects for each file.
     </para>
-    <para>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       D sources can be compiled file-by-file as C and C++ source are, and
-      D is integrated into the <filename>scons</filename> Object and Program builders for
+      D is integrated into the <filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename> Object and Program builders for
       this model of build. D codes can though do whole source
       meta-programming (some of the testing frameworks do this). For this
       it is imperative that all sources are compiled and linked in a single call of
       the D compiler. This builder serves that purpose.
     </para>
-    <example_commands>
+    <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
       env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
     </example_commands>
-    <para>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       This command will compile the modules mod_a, mod_b, and mod_c in a
       single compilation process without first creating object files for
       the modules. Some of the D compilers will create executable.o others
       will not.
     </para>
-  <para>
+  
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       Builds an executable from D sources without first creating individual
       objects for each file.
     </para>
-    <para>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       D sources can be compiled file-by-file as C and C++ source are, and
-      D is integrated into the <filename>scons</filename> Object and Program builders for
+      D is integrated into the <filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename> Object and Program builders for
       this model of build. D codes can though do whole source
       meta-programming (some of the testing frameworks do this). For this
       it is imperative that all sources are compiled and linked in a single call of
       the D compiler. This builder serves that purpose.
     </para>
-    <example_commands>
+    <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
       env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
     </example_commands>
-    <para>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       This command will compile the modules mod_a, mod_b, and mod_c in a
       single compilation process without first creating object files for
       the modules. Some of the D compilers will create executable.o others
@@ -1793,7 +1832,8 @@ env.Program(target = 'foo', source = ['foo.o', 'bar.c', 'baz.f'])
     <term>
       <function>env.RES()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a Microsoft Visual C++ resource file.
 This builder method is only provided
 when Microsoft Visual C++ or MinGW is being used as the compiler. The
@@ -1806,7 +1846,7 @@ file is scanned for implicit dependencies as though it were a C file.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.RES('resource.rc')
 </example_commands>
 </listitem>
@@ -1818,7 +1858,8 @@ env.RES('resource.rc')
     <term>
       <function>env.RMIC()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds stub and skeleton class files
 for remote objects
 from Java <filename>.class</filename> files.
@@ -1827,16 +1868,16 @@ relative to which the stub
 and skeleton class files will be written.
 The source can be the names of <filename>.class</filename> files,
 or the objects return from the
-<function>Java</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Java</function>
 builder method.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the construction variable
-<link linkend="cv-JAVACLASSDIR"><envar>$JAVACLASSDIR</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACLASSDIR"><envar>$JAVACLASSDIR</envar></link>
 is set, either in the environment
 or in the call to the
-<function>RMIC</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">RMIC</function>
 builder method itself,
 then the value of the variable
 will be stripped from the
@@ -1844,7 +1885,7 @@ beginning of any <filename>.class </filename>
 file names.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 classes = env.Java(target = 'classdir', source = 'src')
 env.RMIC(target = 'outdir1', source = classes)
 
@@ -1864,7 +1905,8 @@ env.RMIC(target = 'outdir3',
     <term>
       <function>env.RPCGenClient()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Generates an RPC client stub (<filename>_clnt.c</filename>) file
 from a specified RPC (<filename>.x</filename>) source file.
 Because rpcgen only builds output files
@@ -1873,7 +1915,7 @@ the command will be executed
 in the source file's directory by default.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Builds src/rpcif_clnt.c
 env.RPCGenClient('src/rpcif.x')
 </example_commands>
@@ -1886,7 +1928,8 @@ env.RPCGenClient('src/rpcif.x')
     <term>
       <function>env.RPCGenHeader()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Generates an RPC header (<filename>.h</filename>) file
 from a specified RPC (<filename>.x</filename>) source file.
 Because rpcgen only builds output files
@@ -1895,7 +1938,7 @@ the command will be executed
 in the source file's directory by default.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Builds src/rpcif.h
 env.RPCGenHeader('src/rpcif.x')
 </example_commands>
@@ -1908,7 +1951,8 @@ env.RPCGenHeader('src/rpcif.x')
     <term>
       <function>env.RPCGenService()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Generates an RPC server-skeleton (<filename>_svc.c</filename>) file
 from a specified RPC (<filename>.x</filename>) source file.
 Because rpcgen only builds output files
@@ -1917,7 +1961,7 @@ the command will be executed
 in the source file's directory by default.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Builds src/rpcif_svc.c
 env.RPCGenClient('src/rpcif.x')
 </example_commands>
@@ -1930,7 +1974,8 @@ env.RPCGenClient('src/rpcif.x')
     <term>
       <function>env.RPCGenXDR()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Generates an RPC XDR routine (<filename>_xdr.c</filename>) file
 from a specified RPC (<filename>.x</filename>) source file.
 Because rpcgen only builds output files
@@ -1939,7 +1984,7 @@ the command will be executed
 in the source file's directory by default.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Builds src/rpcif_xdr.c
 env.RPCGenClient('src/rpcif.x')
 </example_commands>
@@ -1952,7 +1997,8 @@ env.RPCGenClient('src/rpcif.x')
     <term>
       <function>env.SharedLibrary()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a shared library
 (<filename>.so</filename> on a POSIX system,
 <filename>.dll</filename> on Windows)
@@ -1964,24 +2010,24 @@ compiled to object files.
 The static library prefix and suffix (if any)
 are automatically added to the target.
 The target library file prefix
-(specified by the <link linkend="cv-SHLIBPREFIX"><envar>$SHLIBPREFIX</envar></link> construction variable;
+(specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBPREFIX"><envar>$SHLIBPREFIX</envar></link> construction variable;
 by default, <filename>lib</filename> on POSIX systems,
 nothing on Windows systems)
 and suffix
-(specified by the <link linkend="cv-SHLIBSUFFIX"><envar>$SHLIBSUFFIX</envar></link> construction variable;
+(specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBSUFFIX"><envar>$SHLIBSUFFIX</envar></link> construction variable;
 by default, <filename>.dll</filename> on Windows systems,
 <filename>.so</filename> on POSIX systems)
 are automatically added to the target if not already present.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.SharedLibrary(target = 'bar', source = ['bar.c', 'foo.o'])
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 On Windows systems, the
-<function>SharedLibrary</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SharedLibrary</function>
 builder method will always build an import
 (<filename>.lib</filename>) library
 in addition to the shared (<filename>.dll</filename>) library,
@@ -1990,9 +2036,9 @@ if there is not already a <filename>.lib</filename> file explicitly
 listed in the targets.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 On Cygwin systems, the
-<function>SharedLibrary</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SharedLibrary</function>
 builder method will always build an import
 (<filename>.dll.a</filename>) library
 in addition to the shared (<filename>.dll</filename>) library,
@@ -2001,36 +2047,36 @@ if there is not already a <filename>.dll.a</filename> file explicitly
 listed in the targets.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Any object files listed in the
 <literal>source</literal>
 must have been built for a shared library
 (that is, using the
-<function>SharedObject</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SharedObject</function>
 builder method).
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will raise an error if there is any mismatch.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 On some platforms, there is a distinction between a shared library
 (loaded automatically by the system to resolve external references)
 and a loadable module (explicitly loaded by user action).
-For maximum portability, use the <function>LoadableModule</function> builder for the latter.
+For maximum portability, use the <function xmlns="http://www.scons.org/dbxsd/v1.0">LoadableModule</function> builder for the latter.
 </para>
 
-<para>
-When the <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> construction variable is defined a versioned
-shared library is created. This modifies the <link linkend="cv-SHLINKFLAGS"><envar>$SHLINKFLAGS</envar></link> as required,
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+When the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> construction variable is defined a versioned
+shared library is created. This modifies the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKFLAGS"><envar>$SHLINKFLAGS</envar></link> as required,
 adds the version number to the library name, and creates the symlinks that
 are needed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.SharedLibrary(target = 'bar', source = ['bar.c', 'foo.o'], SHLIBVERSION='1.5.2')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 On a POSIX system, versions with a single token create exactly one symlink:
 libbar.so.6 would have symlinks libbar.so only.
 On a POSIX system, versions with two or more
@@ -2039,28 +2085,28 @@ libbar.so and libbar.so.2; on a Darwin (OSX) system the library would be
 libbar.2.3.1.dylib and the link would be libbar.dylib.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 On Windows systems, specifying
 <literal>register=1</literal>
 will cause the <filename>.dll</filename> to be
 registered after it is built using REGSVR32.
 The command that is run
-("regsvr32" by default) is determined by <link linkend="cv-REGSVR"><envar>$REGSVR</envar></link> construction
-variable, and the flags passed are determined by <link linkend="cv-REGSVRFLAGS"><envar>$REGSVRFLAGS</envar></link>.  By
-default, <link linkend="cv-REGSVRFLAGS"><envar>$REGSVRFLAGS</envar></link> includes the <option>/s</option> option,
+("regsvr32" by default) is determined by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-REGSVR"><envar>$REGSVR</envar></link> construction
+variable, and the flags passed are determined by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-REGSVRFLAGS"><envar>$REGSVRFLAGS</envar></link>.  By
+default, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-REGSVRFLAGS"><envar>$REGSVRFLAGS</envar></link> includes the <option>/s</option> option,
 to prevent dialogs from popping
 up and requiring user attention when it is run.  If you change
-<link linkend="cv-REGSVRFLAGS"><envar>$REGSVRFLAGS</envar></link>, be sure to include the <option>/s</option> option.
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-REGSVRFLAGS"><envar>$REGSVRFLAGS</envar></link>, be sure to include the <option>/s</option> option.
 For example,
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.SharedLibrary(target = 'bar',
                   source = ['bar.cxx', 'foo.obj'],
                   register=1)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 will register <filename>bar.dll</filename> as a COM object
 when it is done linking it.
 </para>
@@ -2073,12 +2119,13 @@ when it is done linking it.
     <term>
       <function>env.SharedObject()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds an object file for
 inclusion in a shared library.
 Source files must have one of the same set of extensions
 specified above for the
-<function>StaticObject</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">StaticObject</function>
 builder method.
 On some platforms building a shared object requires additional
 compiler option
@@ -2093,21 +2140,21 @@ and shared objects to be linked into a
 shared library, and will use the same suffix for shared and normal
 (static) objects.
 The target object file prefix
-(specified by the <link linkend="cv-SHOBJPREFIX"><envar>$SHOBJPREFIX</envar></link> construction variable;
-by default, the same as <link linkend="cv-OBJPREFIX"><envar>$OBJPREFIX</envar></link>)
+(specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHOBJPREFIX"><envar>$SHOBJPREFIX</envar></link> construction variable;
+by default, the same as <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-OBJPREFIX"><envar>$OBJPREFIX</envar></link>)
 and suffix
-(specified by the <link linkend="cv-SHOBJSUFFIX"><envar>$SHOBJSUFFIX</envar></link> construction variable)
+(specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHOBJSUFFIX"><envar>$SHOBJSUFFIX</envar></link> construction variable)
 are automatically added to the target if not already present.
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.SharedObject(target = 'ddd', source = 'ddd.c')
 env.SharedObject(target = 'eee.o', source = 'eee.cpp')
 env.SharedObject(target = 'fff.obj', source = 'fff.for')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that the source files will be scanned
 according to the suffix mappings in the
 <literal>SourceFileScanner</literal>
@@ -2124,7 +2171,8 @@ below, for more information.
     <term>
       <function>env.StaticLibrary()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a static library given one or more object files
 or C, C++, D or Fortran source files.
 If any source files are given,
@@ -2133,29 +2181,29 @@ compiled to object files.
 The static library prefix and suffix (if any)
 are automatically added to the target.
 The target library file prefix
-(specified by the <link linkend="cv-LIBPREFIX"><envar>$LIBPREFIX</envar></link> construction variable;
+(specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBPREFIX"><envar>$LIBPREFIX</envar></link> construction variable;
 by default, <filename>lib</filename> on POSIX systems,
 nothing on Windows systems)
 and suffix
-(specified by the <link linkend="cv-LIBSUFFIX"><envar>$LIBSUFFIX</envar></link> construction variable;
+(specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBSUFFIX"><envar>$LIBSUFFIX</envar></link> construction variable;
 by default, <filename>.lib</filename> on Windows systems,
 <filename>.a</filename> on POSIX systems)
 are automatically added to the target if not already present.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.StaticLibrary(target = 'bar', source = ['bar.c', 'foo.o'])
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Any object files listed in the
 <literal>source</literal>
 must have been built for a static library
 (that is, using the
-<function>StaticObject</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">StaticObject</function>
 builder method).
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will raise an error if there is any mismatch.
 </para>
 </listitem>
@@ -2167,13 +2215,14 @@ will raise an error if there is any mismatch.
     <term>
       <function>env.StaticObject()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a static object file
 from one or more C, C++, D, or Fortran source files.
 Source files must have one of the following extensions:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   .asm    assembly language file
   .ASM    assembly language file
   .c      C file
@@ -2204,24 +2253,24 @@ Source files must have one of the following extensions:
   .SPP    assembly language file + C pre-processor
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The target object file prefix
-(specified by the <link linkend="cv-OBJPREFIX"><envar>$OBJPREFIX</envar></link> construction variable; nothing by default)
+(specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-OBJPREFIX"><envar>$OBJPREFIX</envar></link> construction variable; nothing by default)
 and suffix
-(specified by the <link linkend="cv-OBJSUFFIX"><envar>$OBJSUFFIX</envar></link> construction variable;
+(specified by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-OBJSUFFIX"><envar>$OBJSUFFIX</envar></link> construction variable;
 <filename>.obj</filename> on Windows systems,
 <filename>.o</filename> on POSIX systems)
 are automatically added to the target if not already present.
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.StaticObject(target = 'aaa', source = 'aaa.c')
 env.StaticObject(target = 'bbb.o', source = 'bbb.c++')
 env.StaticObject(target = 'ccc.obj', source = 'ccc.f')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that the source files will be scanned
 according to the suffix mappings in
 <literal>SourceFileScanner</literal>
@@ -2238,27 +2287,28 @@ below, for more information.
     <term>
       <function>env.Substfile()</function>
     </term>
-    <listitem><para>
-The <function>Substfile</function> builder creates a single text file from another file or set of
-files by concatenating them with <envar>$LINESEPARATOR</envar> and replacing text
-using the <envar>$SUBST_DICT</envar> construction variable. Nested lists of source files
-are flattened. See also <function>Textfile</function>.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The <function xmlns="http://www.scons.org/dbxsd/v1.0">Substfile</function> builder creates a single text file from another file or set of
+files by concatenating them with <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LINESEPARATOR</envar> and replacing text
+using the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SUBST_DICT</envar> construction variable. Nested lists of source files
+are flattened. See also <function xmlns="http://www.scons.org/dbxsd/v1.0">Textfile</function>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If a single source file is present with an <filename>.in</filename> suffix,
 the suffix is stripped and the remainder is used as the default target name.
 </para>
 
-<para>
-The prefix and suffix specified by the <envar>$SUBSTFILEPREFIX</envar>
-and <envar>$SUBSTFILESUFFIX</envar> construction variables
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The prefix and suffix specified by the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SUBSTFILEPREFIX</envar>
+and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SUBSTFILESUFFIX</envar> construction variables
 (the null string by default in both cases)
 are automatically added to the target if they are not already present.
 </para>
 
-<para>
-If a construction variable named <envar>$SUBST_DICT</envar> is present,
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+If a construction variable named <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SUBST_DICT</envar> is present,
 it may be either a Python dictionary or a sequence of (key,value) tuples.
 If it is a dictionary it is converted into a list of tuples in an arbitrary order,
 so if one key is a prefix of another key
@@ -2266,7 +2316,7 @@ or if one substitution could be further expanded by another subsitition,
 it is unpredictable whether the expansion will occur.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Any occurrences of a key in the source
 are replaced by the corresponding value,
 which may be a Python callable function or a string.
@@ -2275,7 +2325,7 @@ Strings are <emphasis>subst</emphasis>-expanded
 and the result replaces the key.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(tools = ['default', 'textfile'])
 
 env['prefix'] = '/usr/bin'
@@ -2327,12 +2377,13 @@ subst.Substfile('pgm2.c', [Value('#include "@foo@.h"'),
     <term>
       <function>env.Tar()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a tar archive of the specified files
 and/or directories.
 Unlike most builder methods,
 the
-<function>Tar</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Tar</function>
 builder method may be called multiple times
 for a given target;
 each additional call
@@ -2342,11 +2393,11 @@ Any source directories will
 be scanned for changes to
 any on-disk files,
 regardless of whether or not
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 knows about them from other Builder or function calls.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Tar('src.tar', 'src')
 
 # Create the stuff.tar file.
@@ -2372,28 +2423,29 @@ env.Tar('foo')
     <term>
       <function>env.Textfile()</function>
     </term>
-    <listitem><para>
-The <function>Textfile</function> builder generates a single text file.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The <function xmlns="http://www.scons.org/dbxsd/v1.0">Textfile</function> builder generates a single text file.
 The source strings constitute the lines;
 nested lists of sources are flattened.
-<envar>$LINESEPARATOR</envar> is used to separate the strings.
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$LINESEPARATOR</envar> is used to separate the strings.
 </para>
 
-<para>
-If present, the <envar>$SUBST_DICT</envar> construction variable
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+If present, the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SUBST_DICT</envar> construction variable
 is used to modify the strings before they are written;
-see the <function>Substfile</function> description for details.
+see the <function xmlns="http://www.scons.org/dbxsd/v1.0">Substfile</function> description for details.
 </para>
 
-<para>
-The prefix and suffix specified by the <envar>$TEXTFILEPREFIX</envar>
-and <envar>$TEXTFILESUFFIX</envar> construction variables
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The prefix and suffix specified by the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$TEXTFILEPREFIX</envar>
+and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$TEXTFILESUFFIX</envar> construction variables
 (the null string and <filename>.txt</filename> by default, respectively)
 are automatically added to the target if they are not already present.
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # builds/writes foo.txt
 env.Textfile(target = 'foo.txt', source = ['Goethe', 42, 'Schiller'])
 
@@ -2442,49 +2494,50 @@ blob.txt
     <term>
       <function>env.Translate()</function>
     </term>
-    <listitem><para>
-This pseudo-builder belongs to <link linkend="t-gettext"><literal>gettext</literal></link> toolset. The builder extracts
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This pseudo-builder belongs to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-gettext"><literal>gettext</literal></link> toolset. The builder extracts
 internationalized messages from source files, updates <literal>POT</literal>
 template (if necessary) and then updates <literal>PO</literal> translations (if
-necessary). If <link linkend="cv-POAUTOINIT"><envar>$POAUTOINIT</envar></link> is set, missing <literal>PO</literal> files
+necessary). If <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POAUTOINIT"><envar>$POAUTOINIT</envar></link> is set, missing <literal>PO</literal> files
 will be automatically created (i.e. without translator person intervention).
-The variables <link linkend="cv-LINGUAS_FILE"><envar>$LINGUAS_FILE</envar></link> and <link linkend="cv-POTDOMAIN"><envar>$POTDOMAIN</envar></link> are taken into
-acount too. All other construction variables used by <link linkend="b-POTUpdate"><function>POTUpdate</function></link>, and
-<link linkend="b-POUpdate"><function>POUpdate</function></link> work here too.
+The variables <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LINGUAS_FILE"><envar>$LINGUAS_FILE</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-POTDOMAIN"><envar>$POTDOMAIN</envar></link> are taken into
+acount too. All other construction variables used by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link>, and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> work here too.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 1</emphasis>.
 The simplest way is to specify input files and output languages inline in
-a SCons script when invoking <function>Translate</function>
+a SCons script when invoking <function xmlns="http://www.scons.org/dbxsd/v1.0">Translate</function>
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # SConscript in 'po/' directory
 env = Environment( tools = ["default", "gettext"] )
 env['POAUTOINIT'] = 1
 env.Translate(['en','pl'], ['../a.cpp','../b.cpp']) 
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 2</emphasis>.
 If you wish, you may also stick to conventional style known from
 <productname>autotools</productname>, i.e. using
 <filename>POTFILES.in</filename> and <filename>LINGUAS</filename> files
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # LINGUAS
 en pl 
 #end
 </example_commands>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # POTFILES.in
 a.cpp
 b.cpp
 # end
 </example_commands>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # SConscript
 env = Environment( tools = ["default", "gettext"] )
 env['POAUTOINIT'] = 1
@@ -2492,7 +2545,7 @@ env['XGETTEXTPATH'] = ['../']
 env.Translate(LINGUAS_FILE = 1, XGETTEXTFROM = 'POTFILES.in') 
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The last approach is perhaps the recommended one. It allows easily split
 internationalization/localization onto separate SCons scripts, where a script
 in source tree is responsible for translations (from sources to
@@ -2509,11 +2562,11 @@ so the source tree looks familiar to translators, and they may work with the
 project in their usual way.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis>Example 3</emphasis>.
 Let's prepare a development tree as below
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
  project/
   + SConstruct
   + build/        
@@ -2524,11 +2577,11 @@ Let's prepare a development tree as below
           + POTFILES.in
           + LINGUAS
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 with <filename>build</filename> being variant directory. Write the top-level
 <filename>SConstruct</filename> script as follows
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # SConstruct
   env = Environment( tools = ["default", "gettext"] )
   VariantDir('build', 'src', duplicate = 0)
@@ -2536,23 +2589,23 @@ with <filename>build</filename> being variant directory. Write the top-level
   SConscript('src/po/SConscript.i18n', exports = 'env')
   SConscript('build/po/SConscript', exports = 'env')
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 the <filename>src/po/SConscript.i18n</filename> as
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # src/po/SConscript.i18n
   Import('env')
   env.Translate(LINGUAS_FILE=1, XGETTEXTFROM='POTFILES.in', XGETTEXTPATH=['../'])
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 and the <filename>src/po/SConscript</filename>
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   # src/po/SConscript
   Import('env')
   env.MOFiles(LINGUAS_FILE = 1)
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Such setup produces <literal>POT</literal> and <literal>PO</literal> files
 under source tree in <filename>src/po/</filename> and binary
 <literal>MO</literal> files under variant tree in
@@ -2562,7 +2615,7 @@ not be committed back to source repositories (e.g. <literal>MO</literal>
 files).
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <note><para>In above example, the <literal>PO</literal> files are not updated,
 nor created automatically when you issue <command>scons '.'</command> command.
 The files must be updated (created) by hand via <command>scons
@@ -2579,7 +2632,8 @@ running <command>scons '.'</command>.</para></note>
     <term>
       <function>env.TypeLibrary()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a Windows type library (<filename>.tlb</filename>)
 file from an input IDL file (<filename>.idl</filename>).
 In addition, it will build the associated interface stub and
@@ -2588,11 +2642,11 @@ naming them according to the base name of the <filename>.idl</filename> file.
 For example,
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.TypeLibrary(source="foo.idl")
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Will create <filename>foo.tlb</filename>,
 <filename>foo.h</filename>,
 <filename>foo_i.c</filename>,
@@ -2610,21 +2664,22 @@ files.
     <term>
       <function>env.Uic()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a header file, an implementation file and a moc file from an ui file.
 and returns the corresponding nodes in the above order.
 This builder is only available after using the tool 'qt'. Note: you can
 specify <filename>.ui</filename> files directly as source
-files to the <function>Program</function>,
-<function>Library</function> and <function>SharedLibrary</function> builders
+files to the <function xmlns="http://www.scons.org/dbxsd/v1.0">Program</function>,
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Library</function> and <function xmlns="http://www.scons.org/dbxsd/v1.0">SharedLibrary</function> builders
 without using this builder. Using this builder lets you override the standard
 naming conventions (be careful: prefixes are always prepended to names of
 built files; if you don't want prefixes, you may set them to ``).
-See the <link linkend="cv-QTDIR"><envar>$QTDIR</envar></link> variable for more information.
+See the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-QTDIR"><envar>$QTDIR</envar></link> variable for more information.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Uic('foo.ui') # -&gt; ['foo.h', 'uic_foo.cc', 'moc_foo.cc']
 env.Uic(target = Split('include/foo.h gen/uicfoo.cc gen/mocfoo.cc'),
         source = 'foo.ui') # -&gt; ['include/foo.h', 'gen/uicfoo.cc', 'gen/mocfoo.cc']
@@ -2638,12 +2693,13 @@ env.Uic(target = Split('include/foo.h gen/uicfoo.cc gen/mocfoo.cc'),
     <term>
       <function>env.Zip()</function>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Builds a zip archive of the specified files
 and/or directories.
 Unlike most builder methods,
 the
-<function>Zip</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Zip</function>
 builder method may be called multiple times
 for a given target;
 each additional call
@@ -2653,11 +2709,11 @@ Any source directories will
 be scanned for changes to
 any on-disk files,
 regardless of whether or not
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 knows about them from other Builder or function calls.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Zip('src.zip', 'src')
 
 # Create the stuff.zip file.
diff --git a/doc/generated/examples/EnumVariable_map_1.xml b/doc/generated/examples/EnumVariable_map_1.xml
index 758405a..4380be0 100644
--- a/doc/generated/examples/EnumVariable_map_1.xml
+++ b/doc/generated/examples/EnumVariable_map_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=navy foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=navy foo.o</userinput>
 cc -o foo.o -c -DCOLOR="blue" foo.c
 </screen>
diff --git a/doc/generated/examples/addmethod_ex1_1.xml b/doc/generated/examples/addmethod_ex1_1.xml
index 0d2c88a..84dfd20 100644
--- a/doc/generated/examples/addmethod_ex1_1.xml
+++ b/doc/generated/examples/addmethod_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q /</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q /</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 Install file: "hello" as "/usr/bin/hello"
diff --git a/doc/generated/examples/addmethod_ex2_1.xml b/doc/generated/examples/addmethod_ex2_1.xml
index 3bcb3e9..3930341 100644
--- a/doc/generated/examples/addmethod_ex2_1.xml
+++ b/doc/generated/examples/addmethod_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o test_stuff.o -c test_stuff.c
 cc -o tests/test_stuff test_stuff.o
 </screen>
diff --git a/doc/generated/examples/addmethod_ex2_2.xml b/doc/generated/examples/addmethod_ex2_2.xml
index 973e212..15ae6e0 100644
--- a/doc/generated/examples/addmethod_ex2_2.xml
+++ b/doc/generated/examples/addmethod_ex2_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 rc /fores.res res.rc
 cl /Fotest_stuff.obj /c test_stuff.c /nologo
 link /nologo /OUT:tests\test_stuff.exe test_stuff.obj res.res
diff --git a/doc/generated/examples/alias_ex1_1.xml b/doc/generated/examples/alias_ex1_1.xml
index 21ddc8f..3ee3f1b 100644
--- a/doc/generated/examples/alias_ex1_1.xml
+++ b/doc/generated/examples/alias_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 Install file: "hello" as "/usr/bin/hello"
diff --git a/doc/generated/examples/alias_ex2_1.xml b/doc/generated/examples/alias_ex2_1.xml
index 170bdf9..3fa7dfd 100644
--- a/doc/generated/examples/alias_ex2_1.xml
+++ b/doc/generated/examples/alias_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install-bin</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install-bin</userinput>
 cc -o foo.o -c foo.c
 cc -o foo foo.o
 Install file: "foo" as "/usr/bin/foo"
diff --git a/doc/generated/examples/buildersbuiltin_ex1_1.xml b/doc/generated/examples/buildersbuiltin_ex1_1.xml
index 7704588..74cc779 100644
--- a/doc/generated/examples/buildersbuiltin_ex1_1.xml
+++ b/doc/generated/examples/buildersbuiltin_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q .</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q .</userinput>
 tar -c -f out1.tar file1 file2
 tar -c -f out2.tar directory
 </screen>
diff --git a/doc/generated/examples/buildersbuiltin_ex2_1.xml b/doc/generated/examples/buildersbuiltin_ex2_1.xml
index a86c8a6..6c66d7b 100644
--- a/doc/generated/examples/buildersbuiltin_ex2_1.xml
+++ b/doc/generated/examples/buildersbuiltin_ex2_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q .</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q .</userinput>
 tar -c -z -f out.tar.gz directory
 </screen>
diff --git a/doc/generated/examples/buildersbuiltin_ex3_1.xml b/doc/generated/examples/buildersbuiltin_ex3_1.xml
index fc838c2..4d281e5 100644
--- a/doc/generated/examples/buildersbuiltin_ex3_1.xml
+++ b/doc/generated/examples/buildersbuiltin_ex3_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q .</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q .</userinput>
 tar -c -z -f out.tgz directory
 </screen>
diff --git a/doc/generated/examples/buildersbuiltin_ex4_1.xml b/doc/generated/examples/buildersbuiltin_ex4_1.xml
index eb6ae9d..856f024 100644
--- a/doc/generated/examples/buildersbuiltin_ex4_1.xml
+++ b/doc/generated/examples/buildersbuiltin_ex4_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q .</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q .</userinput>
 zip(["out.zip"], ["file1", "file2"])
 </screen>
diff --git a/doc/generated/examples/buildersbuiltin_libs_1.xml b/doc/generated/examples/buildersbuiltin_libs_1.xml
index 7f3b620..8e1ee49 100644
--- a/doc/generated/examples/buildersbuiltin_libs_1.xml
+++ b/doc/generated/examples/buildersbuiltin_libs_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o goodbye.o -c goodbye.c
 cc -o hello.o -c hello.c
 cc -o hello hello.o goodbye.o -L/usr/dir1 -Ldir2 -lfoo1 -lfoo2
diff --git a/doc/generated/examples/buildersbuiltin_libs_2.xml b/doc/generated/examples/buildersbuiltin_libs_2.xml
index 24038fc..41a9c1e 100644
--- a/doc/generated/examples/buildersbuiltin_libs_2.xml
+++ b/doc/generated/examples/buildersbuiltin_libs_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 cl /Fogoodbye.obj /c goodbye.c /nologo
 cl /Fohello.obj /c hello.c /nologo
 link /nologo /OUT:hello.exe /LIBPATH:\usr\dir1 /LIBPATH:dir2 foo1.lib foo2.lib hello.obj goodbye.obj
diff --git a/doc/generated/examples/builderscommands_ex1_1.xml b/doc/generated/examples/builderscommands_ex1_1.xml
index 314b8a5..8782773 100644
--- a/doc/generated/examples/builderscommands_ex1_1.xml
+++ b/doc/generated/examples/builderscommands_ex1_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 sed 's/x/y/' &lt; foo.in &gt; foo.out
 </screen>
diff --git a/doc/generated/examples/builderscommands_ex2_1.xml b/doc/generated/examples/builderscommands_ex2_1.xml
index 6c3aef2..3fc1dde 100644
--- a/doc/generated/examples/builderscommands_ex2_1.xml
+++ b/doc/generated/examples/builderscommands_ex2_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 build(["foo.out"], ["foo.in"])
 </screen>
diff --git a/doc/generated/examples/builderswriting_MY_EMITTER_1.xml b/doc/generated/examples/builderswriting_MY_EMITTER_1.xml
index 6cac375..0c17d0e 100644
--- a/doc/generated/examples/builderswriting_MY_EMITTER_1.xml
+++ b/doc/generated/examples/builderswriting_MY_EMITTER_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 ./my_command file1.input modify1.in &gt; file1.foo
 ./my_command file2.input modify2.in &gt; file2.foo
 </screen>
diff --git a/doc/generated/examples/builderswriting_ex1_1.xml b/doc/generated/examples/builderswriting_ex1_1.xml
index b16a41b..cefcfa2 100644
--- a/doc/generated/examples/builderswriting_ex1_1.xml
+++ b/doc/generated/examples/builderswriting_ex1_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 foobuild &lt; file.input &gt; file.foo
 </screen>
diff --git a/doc/generated/examples/builderswriting_ex2_1.xml b/doc/generated/examples/builderswriting_ex2_1.xml
index 66bacd5..445dfb0 100644
--- a/doc/generated/examples/builderswriting_ex2_1.xml
+++ b/doc/generated/examples/builderswriting_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 AttributeError: 'SConsEnvironment' object has no attribute 'Program':
   File "/home/my/project/SConstruct", line 4:
     env.Program('hello.c')
diff --git a/doc/generated/examples/builderswriting_ex3_1.xml b/doc/generated/examples/builderswriting_ex3_1.xml
index a2d7d4f..2d8bcac 100644
--- a/doc/generated/examples/builderswriting_ex3_1.xml
+++ b/doc/generated/examples/builderswriting_ex3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 foobuild &lt; file.input &gt; file.foo
 cc -o hello.o -c hello.c
 cc -o hello hello.o
diff --git a/doc/generated/examples/builderswriting_ex4_1.xml b/doc/generated/examples/builderswriting_ex4_1.xml
index 3a05d16..cc71b19 100644
--- a/doc/generated/examples/builderswriting_ex4_1.xml
+++ b/doc/generated/examples/builderswriting_ex4_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 foobuild &lt; file1.input &gt; file1.foo
 foobuild &lt; file2.input &gt; file2.foo
 </screen>
diff --git a/doc/generated/examples/builderswriting_ex5_1.xml b/doc/generated/examples/builderswriting_ex5_1.xml
index 62a6452..d0aa83b 100644
--- a/doc/generated/examples/builderswriting_ex5_1.xml
+++ b/doc/generated/examples/builderswriting_ex5_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 build_function(["file.foo"], ["file.input"])
 </screen>
diff --git a/doc/generated/examples/builderswriting_ex6_1.xml b/doc/generated/examples/builderswriting_ex6_1.xml
index b16a41b..cefcfa2 100644
--- a/doc/generated/examples/builderswriting_ex6_1.xml
+++ b/doc/generated/examples/builderswriting_ex6_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 foobuild &lt; file.input &gt; file.foo
 </screen>
diff --git a/doc/generated/examples/builderswriting_ex7_1.xml b/doc/generated/examples/builderswriting_ex7_1.xml
index 85a446a..f14d598 100644
--- a/doc/generated/examples/builderswriting_ex7_1.xml
+++ b/doc/generated/examples/builderswriting_ex7_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 foobuild file.foo new_target - file.input new_source
 </screen>
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 4823b93..cab47eb 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cc -o f5.o -c f5.c
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o f2.o -c f2.c
-cc -o f3.o -c f3.c
-cc -o f4.o -c f4.c
 cc -o f1.o -c f1.c
+cc -o f4.o -c f4.c
+cc -o f5.o -c f5.c
+cc -o f3.o -c f3.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/caching_ex1_1.xml b/doc/generated/examples/caching_ex1_1.xml
index 86a0d30..38eaf82 100644
--- a/doc/generated/examples/caching_ex1_1.xml
+++ b/doc/generated/examples/caching_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q -c</userinput>
diff --git a/doc/generated/examples/caching_ex1_2.xml b/doc/generated/examples/caching_ex1_2.xml
index dab0b23..2f0bcde 100644
--- a/doc/generated/examples/caching_ex1_2.xml
+++ b/doc/generated/examples/caching_ex1_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q -c</userinput>
diff --git a/doc/generated/examples/caching_ex1_4.xml b/doc/generated/examples/caching_ex1_4.xml
index 637c836..922f1b6 100644
--- a/doc/generated/examples/caching_ex1_4.xml
+++ b/doc/generated/examples/caching_ex1_4.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q -c</userinput>
diff --git a/doc/generated/examples/caching_ex1_5.xml b/doc/generated/examples/caching_ex1_5.xml
index e6afdee..968727f 100644
--- a/doc/generated/examples/caching_ex1_5.xml
+++ b/doc/generated/examples/caching_ex1_5.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --cache-disable</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --cache-disable</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q -c</userinput>
diff --git a/doc/generated/examples/commandline_ARGLIST_1.xml b/doc/generated/examples/commandline_ARGLIST_1.xml
index c22a889..e094bc0 100644
--- a/doc/generated/examples/commandline_ARGLIST_1.xml
+++ b/doc/generated/examples/commandline_ARGLIST_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q define=FOO</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q define=FOO</userinput>
 cc -o prog.o -c -DFOO prog.c
 % <userinput>scons -Q define=FOO define=BAR</userinput>
 cc -o prog.o -c -DFOO -DBAR prog.c
diff --git a/doc/generated/examples/commandline_ARGUMENTS_1.xml b/doc/generated/examples/commandline_ARGUMENTS_1.xml
index ea9c32d..6aa4ed2 100644
--- a/doc/generated/examples/commandline_ARGUMENTS_1.xml
+++ b/doc/generated/examples/commandline_ARGUMENTS_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q debug=0</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q debug=0</userinput>
 cc -o prog.o -c prog.c
 cc -o prog prog.o
 % <userinput>scons -Q debug=0</userinput>
diff --git a/doc/generated/examples/commandline_AddOption_1.xml b/doc/generated/examples/commandline_AddOption_1.xml
index 8425669..55df25a 100644
--- a/doc/generated/examples/commandline_AddOption_1.xml
+++ b/doc/generated/examples/commandline_AddOption_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q -n</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q -n</userinput>
 Install file: "foo.in" as "/usr/bin/foo.in"
 </screen>
diff --git a/doc/generated/examples/commandline_AddOption_2.xml b/doc/generated/examples/commandline_AddOption_2.xml
index 0f374e9..7d0b978 100644
--- a/doc/generated/examples/commandline_AddOption_2.xml
+++ b/doc/generated/examples/commandline_AddOption_2.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q -n --prefix=/tmp/install</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q -n --prefix=/tmp/install</userinput>
 Install file: "foo.in" as "/tmp/install/usr/bin/foo.in"
 </screen>
diff --git a/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml b/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml
index f80b6f5..bd51961 100644
--- a/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml
+++ b/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 BUILD_TARGETS is ['prog1']
 cc -o prog1.o -c prog1.c
 cc -o prog1 prog1.o
diff --git a/doc/generated/examples/commandline_BoolVariable_1.xml b/doc/generated/examples/commandline_BoolVariable_1.xml
index 1870074..e4c1792 100644
--- a/doc/generated/examples/commandline_BoolVariable_1.xml
+++ b/doc/generated/examples/commandline_BoolVariable_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=yes foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=yes foo.o</userinput>
 cc -o foo.o -c -DRELEASE_BUILD=True foo.c
 </screen>
diff --git a/doc/generated/examples/commandline_BoolVariable_2.xml b/doc/generated/examples/commandline_BoolVariable_2.xml
index c1d95e3..dc1e068 100644
--- a/doc/generated/examples/commandline_BoolVariable_2.xml
+++ b/doc/generated/examples/commandline_BoolVariable_2.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=t foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=t foo.o</userinput>
 cc -o foo.o -c -DRELEASE_BUILD=True foo.c
 </screen>
diff --git a/doc/generated/examples/commandline_BoolVariable_3.xml b/doc/generated/examples/commandline_BoolVariable_3.xml
index 61e7789..0750fb5 100644
--- a/doc/generated/examples/commandline_BoolVariable_3.xml
+++ b/doc/generated/examples/commandline_BoolVariable_3.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=no foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=no foo.o</userinput>
 cc -o foo.o -c -DRELEASE_BUILD=False foo.c
 </screen>
diff --git a/doc/generated/examples/commandline_BoolVariable_4.xml b/doc/generated/examples/commandline_BoolVariable_4.xml
index bab12dd..84e4639 100644
--- a/doc/generated/examples/commandline_BoolVariable_4.xml
+++ b/doc/generated/examples/commandline_BoolVariable_4.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=f foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=f foo.o</userinput>
 cc -o foo.o -c -DRELEASE_BUILD=False foo.c
 </screen>
diff --git a/doc/generated/examples/commandline_BoolVariable_5.xml b/doc/generated/examples/commandline_BoolVariable_5.xml
index f34dc4e..81f1d4e 100644
--- a/doc/generated/examples/commandline_BoolVariable_5.xml
+++ b/doc/generated/examples/commandline_BoolVariable_5.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=bad_value foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=bad_value foo.o</userinput>
 
 scons: *** Error converting option: RELEASE
 Invalid value for boolean option: bad_value
diff --git a/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml b/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml
index a209526..1812f74 100644
--- a/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml
+++ b/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o foo.o -c foo.c
 cc -o foo foo.o
 % <userinput>scons -Q bar</userinput>
diff --git a/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml b/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml
index 6e02185..f92f160 100644
--- a/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml
+++ b/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 DEFAULT_TARGETS is ['prog1']
 scons: done reading SConscript files.
diff --git a/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml b/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml
index f84fa6e..01e953b 100644
--- a/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml
+++ b/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 DEFAULT_TARGETS is now ['prog1']
 DEFAULT_TARGETS is now ['prog1', 'prog2']
diff --git a/doc/generated/examples/commandline_Default1_1.xml b/doc/generated/examples/commandline_Default1_1.xml
index 50a1ff8..18008d8 100644
--- a/doc/generated/examples/commandline_Default1_1.xml
+++ b/doc/generated/examples/commandline_Default1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q</userinput>
diff --git a/doc/generated/examples/commandline_Default1_2.xml b/doc/generated/examples/commandline_Default1_2.xml
index a367d01..0f1a93e 100644
--- a/doc/generated/examples/commandline_Default1_2.xml
+++ b/doc/generated/examples/commandline_Default1_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q .</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q .</userinput>
 cc -o goodbye.o -c goodbye.c
 cc -o goodbye goodbye.o
 cc -o hello.o -c hello.c
diff --git a/doc/generated/examples/commandline_Default2_1.xml b/doc/generated/examples/commandline_Default2_1.xml
index 13a3d44..606ed67 100644
--- a/doc/generated/examples/commandline_Default2_1.xml
+++ b/doc/generated/examples/commandline_Default2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o prog1.o -c prog1.c
 cc -o prog1 prog1.o
 cc -o prog3.o -c prog3.c
diff --git a/doc/generated/examples/commandline_Default3_1.xml b/doc/generated/examples/commandline_Default3_1.xml
index bbb24e1..d18575c 100644
--- a/doc/generated/examples/commandline_Default3_1.xml
+++ b/doc/generated/examples/commandline_Default3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o prog1/foo.o -c prog1/foo.c
 cc -o prog1/main.o -c prog1/main.c
 cc -o prog1/main prog1/main.o prog1/foo.o
diff --git a/doc/generated/examples/commandline_Default4_1.xml b/doc/generated/examples/commandline_Default4_1.xml
index a4b0ae1..35e0b10 100644
--- a/doc/generated/examples/commandline_Default4_1.xml
+++ b/doc/generated/examples/commandline_Default4_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 scons: *** No targets specified and no Default() targets found.  Stop.
 Found nothing to build
 % <userinput>scons -Q .</userinput>
diff --git a/doc/generated/examples/commandline_EnumVariable_1.xml b/doc/generated/examples/commandline_EnumVariable_1.xml
index e9ce5c2..d658f69 100644
--- a/doc/generated/examples/commandline_EnumVariable_1.xml
+++ b/doc/generated/examples/commandline_EnumVariable_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=red foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=red foo.o</userinput>
 cc -o foo.o -c -DCOLOR="red" foo.c
 % <userinput>scons -Q COLOR=blue foo.o</userinput>
 cc -o foo.o -c -DCOLOR="blue" foo.c
diff --git a/doc/generated/examples/commandline_EnumVariable_2.xml b/doc/generated/examples/commandline_EnumVariable_2.xml
index a548b47..a8a18df 100644
--- a/doc/generated/examples/commandline_EnumVariable_2.xml
+++ b/doc/generated/examples/commandline_EnumVariable_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=magenta foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=magenta foo.o</userinput>
 
 scons: *** Invalid value for option COLOR: magenta.  Valid values are: ('red', 'green', 'blue')
 File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
diff --git a/doc/generated/examples/commandline_EnumVariable_3.xml b/doc/generated/examples/commandline_EnumVariable_3.xml
index c162981..bb9a6d5 100644
--- a/doc/generated/examples/commandline_EnumVariable_3.xml
+++ b/doc/generated/examples/commandline_EnumVariable_3.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=Red foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=Red foo.o</userinput>
 
 scons: *** Invalid value for option COLOR: Red.  Valid values are: ('red', 'green', 'blue')
 File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
diff --git a/doc/generated/examples/commandline_EnumVariable_ic1_1.xml b/doc/generated/examples/commandline_EnumVariable_ic1_1.xml
index f5f1300..db786e5 100644
--- a/doc/generated/examples/commandline_EnumVariable_ic1_1.xml
+++ b/doc/generated/examples/commandline_EnumVariable_ic1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=Red foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=Red foo.o</userinput>
 cc -o foo.o -c -DCOLOR="Red" foo.c
 % <userinput>scons -Q COLOR=BLUE foo.o</userinput>
 cc -o foo.o -c -DCOLOR="BLUE" foo.c
diff --git a/doc/generated/examples/commandline_EnumVariable_ic2_1.xml b/doc/generated/examples/commandline_EnumVariable_ic2_1.xml
index 0917b13..5596608 100644
--- a/doc/generated/examples/commandline_EnumVariable_ic2_1.xml
+++ b/doc/generated/examples/commandline_EnumVariable_ic2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=Red foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLOR=Red foo.o</userinput>
 cc -o foo.o -c -DCOLOR="red" foo.c
 % <userinput>scons -Q COLOR=nAvY foo.o</userinput>
 cc -o foo.o -c -DCOLOR="blue" foo.c
diff --git a/doc/generated/examples/commandline_ListVariable_1.xml b/doc/generated/examples/commandline_ListVariable_1.xml
index 020e2ca..6e245a3 100644
--- a/doc/generated/examples/commandline_ListVariable_1.xml
+++ b/doc/generated/examples/commandline_ListVariable_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLORS=red,blue foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLORS=red,blue foo.o</userinput>
 cc -o foo.o -c -DCOLORS="red blue" foo.c
 % <userinput>scons -Q COLORS=blue,green,red foo.o</userinput>
 cc -o foo.o -c -DCOLORS="blue green red" foo.c
diff --git a/doc/generated/examples/commandline_ListVariable_2.xml b/doc/generated/examples/commandline_ListVariable_2.xml
index e0675c0..b964669 100644
--- a/doc/generated/examples/commandline_ListVariable_2.xml
+++ b/doc/generated/examples/commandline_ListVariable_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLORS=all foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLORS=all foo.o</userinput>
 cc -o foo.o -c -DCOLORS="red green blue" foo.c
 % <userinput>scons -Q COLORS=none foo.o</userinput>
 cc -o foo.o -c -DCOLORS="" foo.c
diff --git a/doc/generated/examples/commandline_ListVariable_3.xml b/doc/generated/examples/commandline_ListVariable_3.xml
index a0ea1db..ae13d8b 100644
--- a/doc/generated/examples/commandline_ListVariable_3.xml
+++ b/doc/generated/examples/commandline_ListVariable_3.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLORS=magenta foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q COLORS=magenta foo.o</userinput>
 
 scons: *** Error converting option: COLORS
 Invalid value(s) for option: magenta
diff --git a/doc/generated/examples/commandline_PackageVariable_1.xml b/doc/generated/examples/commandline_PackageVariable_1.xml
index 5e635d6..b83fd80 100644
--- a/doc/generated/examples/commandline_PackageVariable_1.xml
+++ b/doc/generated/examples/commandline_PackageVariable_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q foo.o</userinput>
 cc -o foo.o -c -DPACKAGE="/opt/location" foo.c
 % <userinput>scons -Q PACKAGE=/usr/local/location foo.o</userinput>
 cc -o foo.o -c -DPACKAGE="/usr/local/location" foo.c
diff --git a/doc/generated/examples/commandline_PathVariable_1.xml b/doc/generated/examples/commandline_PathVariable_1.xml
index 42c5af7..81693b9 100644
--- a/doc/generated/examples/commandline_PathVariable_1.xml
+++ b/doc/generated/examples/commandline_PathVariable_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q foo.o</userinput>
 cc -o foo.o -c -DCONFIG_FILE="/etc/my_config" foo.c
 % <userinput>scons -Q CONFIG=/usr/local/etc/other_config foo.o</userinput>
 scons: `foo.o' is up to date.
diff --git a/doc/generated/examples/commandline_PathVariable_2.xml b/doc/generated/examples/commandline_PathVariable_2.xml
index f9a6202..7dde5b1 100644
--- a/doc/generated/examples/commandline_PathVariable_2.xml
+++ b/doc/generated/examples/commandline_PathVariable_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q CONFIG=/does/not/exist foo.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q CONFIG=/does/not/exist foo.o</userinput>
 
 scons: *** Path for option CONFIG does not exist: /does/not/exist
 File "/home/my/project/SConstruct", line 6, in &lt;module&gt;
diff --git a/doc/generated/examples/commandline_SCONSFLAGS_1.xml b/doc/generated/examples/commandline_SCONSFLAGS_1.xml
index 7b1043c..35e366c 100644
--- a/doc/generated/examples/commandline_SCONSFLAGS_1.xml
+++ b/doc/generated/examples/commandline_SCONSFLAGS_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 scons: Building targets ...
diff --git a/doc/generated/examples/commandline_SetOption_1.xml b/doc/generated/examples/commandline_SetOption_1.xml
index f772733..bac0cf4 100644
--- a/doc/generated/examples/commandline_SetOption_1.xml
+++ b/doc/generated/examples/commandline_SetOption_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 running with -j 2
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/commandline_SetOption_2.xml b/doc/generated/examples/commandline_SetOption_2.xml
index 83a5cf5..b00e073 100644
--- a/doc/generated/examples/commandline_SetOption_2.xml
+++ b/doc/generated/examples/commandline_SetOption_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>export NUM_CPU="4"</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>export NUM_CPU="4"</userinput>
 % <userinput>scons -Q</userinput>
 running with -j 4
 scons: `.' is up to date.
diff --git a/doc/generated/examples/commandline_SetOption_3.xml b/doc/generated/examples/commandline_SetOption_3.xml
index 672b6b4..df42ff0 100644
--- a/doc/generated/examples/commandline_SetOption_3.xml
+++ b/doc/generated/examples/commandline_SetOption_3.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q -j 7</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q -j 7</userinput>
 running with -j 7
 scons: `.' is up to date.
 % <userinput>export NUM_CPU="4"</userinput>
diff --git a/doc/generated/examples/commandline_UnknownVariables_1.xml b/doc/generated/examples/commandline_UnknownVariables_1.xml
index 7af0924..272a954 100644
--- a/doc/generated/examples/commandline_UnknownVariables_1.xml
+++ b/doc/generated/examples/commandline_UnknownVariables_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q NOT_KNOWN=foo</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q NOT_KNOWN=foo</userinput>
 Unknown variables: ['NOT_KNOWN']
 </screen>
diff --git a/doc/generated/examples/commandline_Variables1_1.xml b/doc/generated/examples/commandline_Variables1_1.xml
index edae63c..512ae65 100644
--- a/doc/generated/examples/commandline_Variables1_1.xml
+++ b/doc/generated/examples/commandline_Variables1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=1</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q RELEASE=1</userinput>
 cc -o bar.o -c -DRELEASE_BUILD=1 bar.c
 cc -o foo.o -c -DRELEASE_BUILD=1 foo.c
 cc -o foo foo.o bar.o
diff --git a/doc/generated/examples/commandline_Variables_Help_1.xml b/doc/generated/examples/commandline_Variables_Help_1.xml
index a23587c..db171eb 100644
--- a/doc/generated/examples/commandline_Variables_Help_1.xml
+++ b/doc/generated/examples/commandline_Variables_Help_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q -h</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q -h</userinput>
 
 RELEASE: Set to 1 to build for release
     default: 0
diff --git a/doc/generated/examples/commandline_Variables_custom_py_1_1.xml b/doc/generated/examples/commandline_Variables_custom_py_1_1.xml
index 7008f2b..4ef4d48 100644
--- a/doc/generated/examples/commandline_Variables_custom_py_1_1.xml
+++ b/doc/generated/examples/commandline_Variables_custom_py_1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o bar.o -c -DRELEASE_BUILD=1 bar.c
 cc -o foo.o -c -DRELEASE_BUILD=1 foo.c
 cc -o foo foo.o bar.o
diff --git a/doc/generated/examples/commandline_Variables_custom_py_2_1.xml b/doc/generated/examples/commandline_Variables_custom_py_2_1.xml
index 211b327..5961d0a 100644
--- a/doc/generated/examples/commandline_Variables_custom_py_2_1.xml
+++ b/doc/generated/examples/commandline_Variables_custom_py_2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o bar.o -c -DRELEASE_BUILD=0 bar.c
 cc -o foo.o -c -DRELEASE_BUILD=0 foo.c
 cc -o foo foo.o bar.o
diff --git a/doc/generated/examples/depends_AlwaysBuild_1.xml b/doc/generated/examples/depends_AlwaysBuild_1.xml
index 69bf93a..86700fe 100644
--- a/doc/generated/examples/depends_AlwaysBuild_1.xml
+++ b/doc/generated/examples/depends_AlwaysBuild_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q</userinput>
diff --git a/doc/generated/examples/depends_AlwaysBuild_2.xml b/doc/generated/examples/depends_AlwaysBuild_2.xml
index 0cbe6d6..d1bdd6d 100644
--- a/doc/generated/examples/depends_AlwaysBuild_2.xml
+++ b/doc/generated/examples/depends_AlwaysBuild_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q hello.o</userinput>
diff --git a/doc/generated/examples/depends_Requires_1.xml b/doc/generated/examples/depends_Requires_1.xml
index 24ea1cd..04bfc35 100644
--- a/doc/generated/examples/depends_Requires_1.xml
+++ b/doc/generated/examples/depends_Requires_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
 cc -o version.o -c version.c
 cc -o hello.o -c hello.c
 cc -o hello version.o hello.o
diff --git a/doc/generated/examples/depends_ex1_1.xml b/doc/generated/examples/depends_ex1_1.xml
index ed6f2f3..25355c9 100644
--- a/doc/generated/examples/depends_ex1_1.xml
+++ b/doc/generated/examples/depends_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q</userinput>
diff --git a/doc/generated/examples/depends_ex1_2.xml b/doc/generated/examples/depends_ex1_2.xml
index 4eed859..09ecc73 100644
--- a/doc/generated/examples/depends_ex1_2.xml
+++ b/doc/generated/examples/depends_ex1_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q hello</userinput>
diff --git a/doc/generated/examples/depends_ex1_3.xml b/doc/generated/examples/depends_ex1_3.xml
index 0f80889..20062df 100644
--- a/doc/generated/examples/depends_ex1_3.xml
+++ b/doc/generated/examples/depends_ex1_3.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>touch hello.c</userinput>
diff --git a/doc/generated/examples/depends_ex1_4.xml b/doc/generated/examples/depends_ex1_4.xml
index c8ed4d1..31aa5bd 100644
--- a/doc/generated/examples/depends_ex1_4.xml
+++ b/doc/generated/examples/depends_ex1_4.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 %     [CHANGE THE CONTENTS OF hello.c]
diff --git a/doc/generated/examples/depends_ex1_5.xml b/doc/generated/examples/depends_ex1_5.xml
index 59d1063..776bda2 100644
--- a/doc/generated/examples/depends_ex1_5.xml
+++ b/doc/generated/examples/depends_ex1_5.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 %   [CHANGE A COMMENT IN hello.c]
diff --git a/doc/generated/examples/depends_ex1_6.xml b/doc/generated/examples/depends_ex1_6.xml
index 2acd942..7493627 100644
--- a/doc/generated/examples/depends_ex1_6.xml
+++ b/doc/generated/examples/depends_ex1_6.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --implicit-cache hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --implicit-cache hello</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q hello</userinput>
diff --git a/doc/generated/examples/depends_ex1_7.xml b/doc/generated/examples/depends_ex1_7.xml
index 47a8f24..22b56d3 100644
--- a/doc/generated/examples/depends_ex1_7.xml
+++ b/doc/generated/examples/depends_ex1_7.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --implicit-deps-changed hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --implicit-deps-changed hello</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q hello</userinput>
diff --git a/doc/generated/examples/depends_ex1_8.xml b/doc/generated/examples/depends_ex1_8.xml
index 4b37bbb..d60db97 100644
--- a/doc/generated/examples/depends_ex1_8.xml
+++ b/doc/generated/examples/depends_ex1_8.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --implicit-deps-unchanged hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --implicit-deps-unchanged hello</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q hello</userinput>
diff --git a/doc/generated/examples/depends_ex5_1.xml b/doc/generated/examples/depends_ex5_1.xml
index d2d5f47..e81cb0c 100644
--- a/doc/generated/examples/depends_ex5_1.xml
+++ b/doc/generated/examples/depends_ex5_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
 cc -o hello.o -c -Iinclude -I/home/project/inc hello.c
 cc -o hello hello.o
 </screen>
diff --git a/doc/generated/examples/depends_ex5_2.xml b/doc/generated/examples/depends_ex5_2.xml
index 0e84948..ea78590 100644
--- a/doc/generated/examples/depends_ex5_2.xml
+++ b/doc/generated/examples/depends_ex5_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q hello.exe</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q hello.exe</userinput>
 cl /Fohello.obj /c hello.c /nologo /Iinclude /I\home\project\inc
 link /nologo /OUT:hello.exe hello.obj
 embedManifestExeCheck(target, source, env)
diff --git a/doc/generated/examples/depends_ignore_explicit_1.xml b/doc/generated/examples/depends_ignore_explicit_1.xml
index 1bb7585..a45a852 100644
--- a/doc/generated/examples/depends_ignore_explicit_1.xml
+++ b/doc/generated/examples/depends_ignore_explicit_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 scons: `.' is up to date.
 % <userinput>scons -Q hello</userinput>
 cc -o hello.o -c hello.c
diff --git a/doc/generated/examples/depends_include_1.xml b/doc/generated/examples/depends_include_1.xml
index 355b6ac..e22bd03 100644
--- a/doc/generated/examples/depends_include_1.xml
+++ b/doc/generated/examples/depends_include_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
 cc -o hello.o -c -I. hello.c
 cc -o hello hello.o
 % <userinput>scons -Q hello</userinput>
diff --git a/doc/generated/examples/depends_macroinc_1.xml b/doc/generated/examples/depends_macroinc_1.xml
index bfd6dbf..95d4e0b 100644
--- a/doc/generated/examples/depends_macroinc_1.xml
+++ b/doc/generated/examples/depends_macroinc_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c -I. hello.c
 cc -o hello hello.o
 %    [CHANGE CONTENTS OF foo.h]
diff --git a/doc/generated/examples/depends_match_1.xml b/doc/generated/examples/depends_match_1.xml
index 842add6..7dc3831 100644
--- a/doc/generated/examples/depends_match_1.xml
+++ b/doc/generated/examples/depends_match_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello.o</userinput>
 cc -o hello.o -c hello.c
 % <userinput>touch -t 198901010000 hello.c</userinput>
 % <userinput>scons -Q hello.o</userinput>
diff --git a/doc/generated/examples/depends_mixing_1.xml b/doc/generated/examples/depends_mixing_1.xml
index ccc578f..258dc90 100644
--- a/doc/generated/examples/depends_mixing_1.xml
+++ b/doc/generated/examples/depends_mixing_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o program1.o -c -I. program1.c
 cc -o prog-MD5 program1.o
 cc -o program2.o -c -I. program2.c
diff --git a/doc/generated/examples/depends_newer_1.xml b/doc/generated/examples/depends_newer_1.xml
index 171b9b4..28cb427 100644
--- a/doc/generated/examples/depends_newer_1.xml
+++ b/doc/generated/examples/depends_newer_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello.o</userinput>
 cc -o hello.o -c hello.c
 % <userinput>touch hello.c</userinput>
 % <userinput>scons -Q hello.o</userinput>
diff --git a/doc/generated/examples/depends_no-Requires_1.xml b/doc/generated/examples/depends_no-Requires_1.xml
index a29e265..8e2729f 100644
--- a/doc/generated/examples/depends_no-Requires_1.xml
+++ b/doc/generated/examples/depends_no-Requires_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q hello</userinput>
 cc -o hello.o -c hello.c
 cc -o version.o -c version.c
 cc -o hello hello.o version.o
diff --git a/doc/generated/examples/depends_parsedep_1.xml b/doc/generated/examples/depends_parsedep_1.xml
index bb27be1..910930b1 100644
--- a/doc/generated/examples/depends_parsedep_1.xml
+++ b/doc/generated/examples/depends_parsedep_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c -MD -MF hello.d -I. hello.c
 cc -o hello hello.o
 %    [CHANGE CONTENTS OF foo.h]
diff --git a/doc/generated/examples/environments_Append-nonexistent_1.xml b/doc/generated/examples/environments_Append-nonexistent_1.xml
index f5d21e4..bb15965 100644
--- a/doc/generated/examples/environments_Append-nonexistent_1.xml
+++ b/doc/generated/examples/environments_Append-nonexistent_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 NEW_VARIABLE = added
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/environments_Prepend-nonexistent_1.xml b/doc/generated/examples/environments_Prepend-nonexistent_1.xml
index f5d21e4..bb15965 100644
--- a/doc/generated/examples/environments_Prepend-nonexistent_1.xml
+++ b/doc/generated/examples/environments_Prepend-nonexistent_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 NEW_VARIABLE = added
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/environments_Replace-nonexistent_1.xml b/doc/generated/examples/environments_Replace-nonexistent_1.xml
index a4e0b09..c4480b5 100644
--- a/doc/generated/examples/environments_Replace-nonexistent_1.xml
+++ b/doc/generated/examples/environments_Replace-nonexistent_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 NEW_VARIABLE = xyzzy
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/environments_Replace1_1.xml b/doc/generated/examples/environments_Replace1_1.xml
index 5e2288a..54f4976 100644
--- a/doc/generated/examples/environments_Replace1_1.xml
+++ b/doc/generated/examples/environments_Replace1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o foo.o -c -DDEFINE2 foo.c
 cc -o foo foo.o
 </screen>
diff --git a/doc/generated/examples/environments_Replace2_1.xml b/doc/generated/examples/environments_Replace2_1.xml
index 4ae42fa..9ad257b 100644
--- a/doc/generated/examples/environments_Replace2_1.xml
+++ b/doc/generated/examples/environments_Replace2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 CCFLAGS = -DDEFINE1
 CCFLAGS = -DDEFINE2
diff --git a/doc/generated/examples/environments_ex1_1.xml b/doc/generated/examples/environments_ex1_1.xml
index b60ffca..84d22b8 100644
--- a/doc/generated/examples/environments_ex1_1.xml
+++ b/doc/generated/examples/environments_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 gcc -o foo.o -c -O2 foo.c
 gcc -o foo foo.o
 </screen>
diff --git a/doc/generated/examples/environments_ex2_1.xml b/doc/generated/examples/environments_ex2_1.xml
index b3a05f2..eb86c9e 100644
--- a/doc/generated/examples/environments_ex2_1.xml
+++ b/doc/generated/examples/environments_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o bar.o -c -g bar.c
 cc -o bar bar.o
 cc -o foo.o -c -O2 foo.c
diff --git a/doc/generated/examples/environments_ex3_1.xml b/doc/generated/examples/environments_ex3_1.xml
index 4a5e84c..3262302 100644
--- a/doc/generated/examples/environments_ex3_1.xml
+++ b/doc/generated/examples/environments_ex3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 
 scons: *** Two environments with different actions were specified for the same target: foo.o
 File "/home/my/project/SConstruct", line 6, in &lt;module&gt;
diff --git a/doc/generated/examples/environments_ex4_1.xml b/doc/generated/examples/environments_ex4_1.xml
index 2b87b21..286f46f 100644
--- a/doc/generated/examples/environments_ex4_1.xml
+++ b/doc/generated/examples/environments_ex4_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o foo-dbg.o -c -g foo.c
 cc -o foo-dbg foo-dbg.o
 cc -o foo-opt.o -c -O2 foo.c
diff --git a/doc/generated/examples/environments_ex5_1.xml b/doc/generated/examples/environments_ex5_1.xml
index 8531462..d6f0094 100644
--- a/doc/generated/examples/environments_ex5_1.xml
+++ b/doc/generated/examples/environments_ex5_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 gcc -o foo.o -c foo.c
 gcc -o foo foo.o
 gcc -o foo-dbg.o -c -g foo.c
diff --git a/doc/generated/examples/environments_ex6_1.xml b/doc/generated/examples/environments_ex6_1.xml
index 3a1f044..af8667f 100644
--- a/doc/generated/examples/environments_ex6_1.xml
+++ b/doc/generated/examples/environments_ex6_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 CC is: cc
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/environments_ex6b_1.xml b/doc/generated/examples/environments_ex6b_1.xml
index 29dd066..47a499a 100644
--- a/doc/generated/examples/environments_ex6b_1.xml
+++ b/doc/generated/examples/environments_ex6b_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 key = OBJSUFFIX, value = .o
 key = LIBSUFFIX, value = .a
 key = PROGSUFFIX, value = 
diff --git a/doc/generated/examples/environments_ex6b_2.xml b/doc/generated/examples/environments_ex6b_2.xml
index 7344565..73a6d19 100644
--- a/doc/generated/examples/environments_ex6b_2.xml
+++ b/doc/generated/examples/environments_ex6b_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 key = OBJSUFFIX, value = .obj
 key = LIBSUFFIX, value = .lib
 key = PROGSUFFIX, value = .exe
diff --git a/doc/generated/examples/environments_ex8_1.xml b/doc/generated/examples/environments_ex8_1.xml
index 3672198..68ebac4 100644
--- a/doc/generated/examples/environments_ex8_1.xml
+++ b/doc/generated/examples/environments_ex8_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o foo.o -c -DMY_VALUE -DLAST foo.c
 cc -o foo foo.o
 </screen>
diff --git a/doc/generated/examples/environments_ex9_1.xml b/doc/generated/examples/environments_ex9_1.xml
index 3c2cda3..3e31c3f 100644
--- a/doc/generated/examples/environments_ex9_1.xml
+++ b/doc/generated/examples/environments_ex9_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o foo.o -c -DFIRST -DMY_VALUE foo.c
 cc -o foo foo.o
 </screen>
diff --git a/doc/generated/examples/environments_missing1_1.xml b/doc/generated/examples/environments_missing1_1.xml
index 4032c55..edf136f 100644
--- a/doc/generated/examples/environments_missing1_1.xml
+++ b/doc/generated/examples/environments_missing1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 value is: -&gt;&lt;-
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/environments_missing2_1.xml b/doc/generated/examples/environments_missing2_1.xml
index 681a462..ffb308c 100644
--- a/doc/generated/examples/environments_missing2_1.xml
+++ b/doc/generated/examples/environments_missing2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 
 scons: *** NameError `MISSING' trying to evaluate `$MISSING'
 File "/home/my/project/SConstruct", line 3, in &lt;module&gt;
diff --git a/doc/generated/examples/environments_missing3_1.xml b/doc/generated/examples/environments_missing3_1.xml
index 4032c55..edf136f 100644
--- a/doc/generated/examples/environments_missing3_1.xml
+++ b/doc/generated/examples/environments_missing3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 value is: -&gt;&lt;-
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/factories_Chmod_1.xml b/doc/generated/examples/factories_Chmod_1.xml
index 462ee92..a324ed4 100644
--- a/doc/generated/examples/factories_Chmod_1.xml
+++ b/doc/generated/examples/factories_Chmod_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 Copy("file.out", "file.in")
 Chmod("file.out", 0755)
 </screen>
diff --git a/doc/generated/examples/factories_Copy1_1.xml b/doc/generated/examples/factories_Copy1_1.xml
index 47a119a..852412f 100644
--- a/doc/generated/examples/factories_Copy1_1.xml
+++ b/doc/generated/examples/factories_Copy1_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 Copy("file.out", "file.in")
 </screen>
diff --git a/doc/generated/examples/factories_Copy2_1.xml b/doc/generated/examples/factories_Copy2_1.xml
index 47a119a..852412f 100644
--- a/doc/generated/examples/factories_Copy2_1.xml
+++ b/doc/generated/examples/factories_Copy2_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 Copy("file.out", "file.in")
 </screen>
diff --git a/doc/generated/examples/factories_Copy3_1.xml b/doc/generated/examples/factories_Copy3_1.xml
index a6ef35d..bcb41ff 100644
--- a/doc/generated/examples/factories_Copy3_1.xml
+++ b/doc/generated/examples/factories_Copy3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 Copy("tempfile", "file.in")
 modify tempfile
 Copy("file.out", "tempfile")
diff --git a/doc/generated/examples/factories_Delete1_1.xml b/doc/generated/examples/factories_Delete1_1.xml
index 5b74e2e..e9a287e 100644
--- a/doc/generated/examples/factories_Delete1_1.xml
+++ b/doc/generated/examples/factories_Delete1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 Delete("tempfile")
 Copy("tempfile", "file.in")
 modify tempfile
diff --git a/doc/generated/examples/factories_Delete2_1.xml b/doc/generated/examples/factories_Delete2_1.xml
index a363ef1..2be3c3a 100644
--- a/doc/generated/examples/factories_Delete2_1.xml
+++ b/doc/generated/examples/factories_Delete2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 Delete("file.out")
 Copy("file.out", "file.in")
 </screen>
diff --git a/doc/generated/examples/factories_Execute_1.xml b/doc/generated/examples/factories_Execute_1.xml
index 48e5b11..a7ae0c7 100644
--- a/doc/generated/examples/factories_Execute_1.xml
+++ b/doc/generated/examples/factories_Execute_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 Mkdir("/tmp/my_temp_directory")
 scons: done reading SConscript files.
diff --git a/doc/generated/examples/factories_Mkdir_1.xml b/doc/generated/examples/factories_Mkdir_1.xml
index 924e410..ea3d79d 100644
--- a/doc/generated/examples/factories_Mkdir_1.xml
+++ b/doc/generated/examples/factories_Mkdir_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 Delete("tempdir")
 Mkdir("tempdir")
 Copy("tempdir/file.in", "file.in")
diff --git a/doc/generated/examples/factories_Move_1.xml b/doc/generated/examples/factories_Move_1.xml
index 3879ddc..a5e4ccd 100644
--- a/doc/generated/examples/factories_Move_1.xml
+++ b/doc/generated/examples/factories_Move_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 Copy("tempfile", "file.in")
 modify tempfile
 Move("file.out", "tempfile")
diff --git a/doc/generated/examples/factories_Touch_1.xml b/doc/generated/examples/factories_Touch_1.xml
index 01176ed..7417fa4 100644
--- a/doc/generated/examples/factories_Touch_1.xml
+++ b/doc/generated/examples/factories_Touch_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 Copy("file.out", "file.in")
 Touch("file.out")
 </screen>
diff --git a/doc/generated/examples/fileremoval_clean-ex1_1.xml b/doc/generated/examples/fileremoval_clean-ex1_1.xml
index 5600ddc..c76a7e5 100644
--- a/doc/generated/examples/fileremoval_clean-ex1_1.xml
+++ b/doc/generated/examples/fileremoval_clean-ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 build -o foo.out foo.in
 % <userinput>scons -Q -c</userinput>
 Removed foo.out
diff --git a/doc/generated/examples/fileremoval_noclean-ex1_1.xml b/doc/generated/examples/fileremoval_noclean-ex1_1.xml
index 1fe3672..45bd878 100644
--- a/doc/generated/examples/fileremoval_noclean-ex1_1.xml
+++ b/doc/generated/examples/fileremoval_noclean-ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o f1.o -c f1.c
 cc -o f2.o -c f2.c
 cc -o f3.o -c f3.c
diff --git a/doc/generated/examples/fileremoval_precious-ex1_1.xml b/doc/generated/examples/fileremoval_precious-ex1_1.xml
index b567082..36e5a25 100644
--- a/doc/generated/examples/fileremoval_precious-ex1_1.xml
+++ b/doc/generated/examples/fileremoval_precious-ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o f1.o -c f1.c
 cc -o f2.o -c f2.c
 cc -o f3.o -c f3.c
diff --git a/doc/generated/examples/hierarchy_Return_1.xml b/doc/generated/examples/hierarchy_Return_1.xml
index 2969ec8..e5ab7f7 100644
--- a/doc/generated/examples/hierarchy_Return_1.xml
+++ b/doc/generated/examples/hierarchy_Return_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o bar/bar.o -c bar/bar.c
 cc -o foo/foo.o -c foo/foo.c
 ar rc libprog.a foo/foo.o bar/bar.o
diff --git a/doc/generated/examples/hierarchy_ex1_1.xml b/doc/generated/examples/hierarchy_ex1_1.xml
index fc460ff..bb5cc7b 100644
--- a/doc/generated/examples/hierarchy_ex1_1.xml
+++ b/doc/generated/examples/hierarchy_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o prog1/foo1.o -c prog1/foo1.c
 cc -o prog1/foo2.o -c prog1/foo2.c
 cc -o prog1/main.o -c prog1/main.c
diff --git a/doc/generated/examples/hierarchy_ex2_1.xml b/doc/generated/examples/hierarchy_ex2_1.xml
index e53a08b..800a921 100644
--- a/doc/generated/examples/hierarchy_ex2_1.xml
+++ b/doc/generated/examples/hierarchy_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o lib/foo1.o -c lib/foo1.c
 cc -o src/prog/foo2.o -c src/prog/foo2.c
 cc -o src/prog/main.o -c src/prog/main.c
diff --git a/doc/generated/examples/hierarchy_ex3_1.xml b/doc/generated/examples/hierarchy_ex3_1.xml
index e57af2c..473c9f4 100644
--- a/doc/generated/examples/hierarchy_ex3_1.xml
+++ b/doc/generated/examples/hierarchy_ex3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o src/prog/foo2.o -c src/prog/foo2.c
 cc -o src/prog/main.o -c src/prog/main.c
 cc -o /usr/joe/lib/foo1.o -c /usr/joe/lib/foo1.c
diff --git a/doc/generated/examples/install_ex1_1.xml b/doc/generated/examples/install_ex1_1.xml
index 88088ed..776f7e8 100644
--- a/doc/generated/examples/install_ex1_1.xml
+++ b/doc/generated/examples/install_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q /usr/bin</userinput>
diff --git a/doc/generated/examples/install_ex2_1.xml b/doc/generated/examples/install_ex2_1.xml
index 8e37628..98de9c4 100644
--- a/doc/generated/examples/install_ex2_1.xml
+++ b/doc/generated/examples/install_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 % <userinput>scons -Q install</userinput>
diff --git a/doc/generated/examples/install_ex3_1.xml b/doc/generated/examples/install_ex3_1.xml
index f635206..e306111 100644
--- a/doc/generated/examples/install_ex3_1.xml
+++ b/doc/generated/examples/install_ex3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install</userinput>
 cc -o goodbye.o -c goodbye.c
 cc -o goodbye goodbye.o
 Install file: "goodbye" as "/usr/bin/goodbye"
diff --git a/doc/generated/examples/install_ex4_1.xml b/doc/generated/examples/install_ex4_1.xml
index 16655c9..36cd90c 100644
--- a/doc/generated/examples/install_ex4_1.xml
+++ b/doc/generated/examples/install_ex4_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 Install file: "hello" as "/usr/bin/hello-new"
diff --git a/doc/generated/examples/install_ex5_1.xml b/doc/generated/examples/install_ex5_1.xml
index f8aa074..89f7c56 100644
--- a/doc/generated/examples/install_ex5_1.xml
+++ b/doc/generated/examples/install_ex5_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q install</userinput>
 cc -o goodbye.o -c goodbye.c
 cc -o goodbye goodbye.o
 Install file: "goodbye" as "/usr/bin/goodbye-new"
diff --git a/doc/generated/examples/java_JAVACLASSDIR_1.xml b/doc/generated/examples/java_JAVACLASSDIR_1.xml
index a04b557..5e0709a 100644
--- a/doc/generated/examples/java_JAVACLASSDIR_1.xml
+++ b/doc/generated/examples/java_JAVACLASSDIR_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java
 javah -d native -classpath classes pkg.sub.Example1 pkg.sub.Example2 pkg.sub.Example3
 </screen>
diff --git a/doc/generated/examples/java_RMIC_1.xml b/doc/generated/examples/java_RMIC_1.xml
index 8ee46ce..4db895e 100644
--- a/doc/generated/examples/java_RMIC_1.xml
+++ b/doc/generated/examples/java_RMIC_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java
 rmic -d outdir -classpath classes pkg.sub.Example1 pkg.sub.Example2
 </screen>
diff --git a/doc/generated/examples/java_jar1_1.xml b/doc/generated/examples/java_jar1_1.xml
index ced917a..de93227 100644
--- a/doc/generated/examples/java_jar1_1.xml
+++ b/doc/generated/examples/java_jar1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
 jar cf test.jar classes
 </screen>
diff --git a/doc/generated/examples/java_jar2_1.xml b/doc/generated/examples/java_jar2_1.xml
index d77a462..9e942e2 100644
--- a/doc/generated/examples/java_jar2_1.xml
+++ b/doc/generated/examples/java_jar2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath prog1 prog1/Example1.java prog1/Example2.java
 javac -d classes -sourcepath prog2 prog2/Example3.java prog2/Example4.java
 jar cf prog1.jar -C classes Example1.class -C classes Example2.class
diff --git a/doc/generated/examples/java_java-classes_1.xml b/doc/generated/examples/java_java-classes_1.xml
index d48488e..6f02f5f 100644
--- a/doc/generated/examples/java_java-classes_1.xml
+++ b/doc/generated/examples/java_java-classes_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
 % <userinput>scons -Q classes</userinput>
 scons: `classes' is up to date.
diff --git a/doc/generated/examples/java_java-classes_2.xml b/doc/generated/examples/java_java-classes_2.xml
index 9936d43..31f6028 100644
--- a/doc/generated/examples/java_java-classes_2.xml
+++ b/doc/generated/examples/java_java-classes_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
 % <userinput>scons -Q -c classes</userinput>
 Removed classes/Example1.class
diff --git a/doc/generated/examples/java_java_1.xml b/doc/generated/examples/java_java_1.xml
index 624d803..551a5d4 100644
--- a/doc/generated/examples/java_java_1.xml
+++ b/doc/generated/examples/java_java_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
 </screen>
diff --git a/doc/generated/examples/java_javah_1.xml b/doc/generated/examples/java_javah_1.xml
index a04b557..5e0709a 100644
--- a/doc/generated/examples/java_javah_1.xml
+++ b/doc/generated/examples/java_javah_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java
 javah -d native -classpath classes pkg.sub.Example1 pkg.sub.Example2 pkg.sub.Example3
 </screen>
diff --git a/doc/generated/examples/java_javah_file_1.xml b/doc/generated/examples/java_javah_file_1.xml
index 192b024..163a53d 100644
--- a/doc/generated/examples/java_javah_file_1.xml
+++ b/doc/generated/examples/java_javah_file_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java
 javah -o native.h -classpath classes pkg.sub.Example1 pkg.sub.Example2 pkg.sub.Example3
 </screen>
diff --git a/doc/generated/examples/lesssimple_ex2_1.xml b/doc/generated/examples/lesssimple_ex2_1.xml
index 768967c..6093f0c 100644
--- a/doc/generated/examples/lesssimple_ex2_1.xml
+++ b/doc/generated/examples/lesssimple_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o file1.o -c file1.c
 cc -o file2.o -c file2.c
 cc -o prog.o -c prog.c
diff --git a/doc/generated/examples/lesssimple_ex3_1.xml b/doc/generated/examples/lesssimple_ex3_1.xml
index eabf7ff..b3ac2f0 100644
--- a/doc/generated/examples/lesssimple_ex3_1.xml
+++ b/doc/generated/examples/lesssimple_ex3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o file1.o -c file1.c
 cc -o file2.o -c file2.c
 cc -o prog.o -c prog.c
diff --git a/doc/generated/examples/lesssimple_ex3_2.xml b/doc/generated/examples/lesssimple_ex3_2.xml
index a4d3cd4..835f048 100644
--- a/doc/generated/examples/lesssimple_ex3_2.xml
+++ b/doc/generated/examples/lesssimple_ex3_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 cl /Fofile1.obj /c file1.c /nologo
 cl /Fofile2.obj /c file2.c /nologo
 cl /Foprog.obj /c prog.c /nologo
diff --git a/doc/generated/examples/lesssimple_ex4_1.xml b/doc/generated/examples/lesssimple_ex4_1.xml
index 697101c..87af41d 100644
--- a/doc/generated/examples/lesssimple_ex4_1.xml
+++ b/doc/generated/examples/lesssimple_ex4_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o bar1.o -c bar1.c
 cc -o bar2.o -c bar2.c
 cc -o bar bar1.o bar2.o
diff --git a/doc/generated/examples/lesssimple_ex5_1.xml b/doc/generated/examples/lesssimple_ex5_1.xml
index b99081b..0043e11 100644
--- a/doc/generated/examples/lesssimple_ex5_1.xml
+++ b/doc/generated/examples/lesssimple_ex5_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o bar1.o -c bar1.c
 cc -o bar2.o -c bar2.c
 cc -o common1.o -c common1.c
diff --git a/doc/generated/examples/lesssimple_target_1.xml b/doc/generated/examples/lesssimple_target_1.xml
index 4fff872..a958acb 100644
--- a/doc/generated/examples/lesssimple_target_1.xml
+++ b/doc/generated/examples/lesssimple_target_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o new_hello hello.o
 </screen>
diff --git a/doc/generated/examples/lesssimple_target_2.xml b/doc/generated/examples/lesssimple_target_2.xml
index 1fe6b03..ef7b241 100644
--- a/doc/generated/examples/lesssimple_target_2.xml
+++ b/doc/generated/examples/lesssimple_target_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 cl /Fohello.obj /c hello.c /nologo
 link /nologo /OUT:new_hello.exe hello.obj
 embedManifestExeCheck(target, source, env)
diff --git a/doc/generated/examples/libraries_SharedLibrary_1.xml b/doc/generated/examples/libraries_SharedLibrary_1.xml
index 120fc07..2300891 100644
--- a/doc/generated/examples/libraries_SharedLibrary_1.xml
+++ b/doc/generated/examples/libraries_SharedLibrary_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o f1.os -c f1.c
 cc -o f2.os -c f2.c
 cc -o f3.os -c f3.c
diff --git a/doc/generated/examples/libraries_SharedLibrary_2.xml b/doc/generated/examples/libraries_SharedLibrary_2.xml
index 17ced1f..b6b484d 100644
--- a/doc/generated/examples/libraries_SharedLibrary_2.xml
+++ b/doc/generated/examples/libraries_SharedLibrary_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 cl /Fof1.obj /c f1.c /nologo
 cl /Fof2.obj /c f2.c /nologo
 cl /Fof3.obj /c f3.c /nologo
diff --git a/doc/generated/examples/libraries_ex1_1.xml b/doc/generated/examples/libraries_ex1_1.xml
index df02912..bfd69b4 100644
--- a/doc/generated/examples/libraries_ex1_1.xml
+++ b/doc/generated/examples/libraries_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o f1.o -c f1.c
 cc -o f2.o -c f2.c
 cc -o f3.o -c f3.c
diff --git a/doc/generated/examples/libraries_ex1_2.xml b/doc/generated/examples/libraries_ex1_2.xml
index 95b42ea..912e7ad 100644
--- a/doc/generated/examples/libraries_ex1_2.xml
+++ b/doc/generated/examples/libraries_ex1_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 cl /Fof1.obj /c f1.c /nologo
 cl /Fof2.obj /c f2.c /nologo
 cl /Fof3.obj /c f3.c /nologo
diff --git a/doc/generated/examples/libraries_ex2_1.xml b/doc/generated/examples/libraries_ex2_1.xml
index e65ec56..c43f7e9 100644
--- a/doc/generated/examples/libraries_ex2_1.xml
+++ b/doc/generated/examples/libraries_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o f1.o -c f1.c
 cc -o f2.o -c f2.c
 cc -o f3.o -c f3.c
diff --git a/doc/generated/examples/libraries_ex2_2.xml b/doc/generated/examples/libraries_ex2_2.xml
index 8eab406..84b4d75 100644
--- a/doc/generated/examples/libraries_ex2_2.xml
+++ b/doc/generated/examples/libraries_ex2_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 cl /Fof1.obj /c f1.c /nologo
 cl /Fof2.obj /c f2.c /nologo
 cl /Fof3.obj /c f3.c /nologo
diff --git a/doc/generated/examples/libraries_ex3_1.xml b/doc/generated/examples/libraries_ex3_1.xml
index 4b3612a..9dd6ca9 100644
--- a/doc/generated/examples/libraries_ex3_1.xml
+++ b/doc/generated/examples/libraries_ex3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o prog.o -c prog.c
 cc -o prog prog.o -L/usr/lib -L/usr/local/lib -lm
 </screen>
diff --git a/doc/generated/examples/libraries_ex3_2.xml b/doc/generated/examples/libraries_ex3_2.xml
index 221b86a..e5ec4ce 100644
--- a/doc/generated/examples/libraries_ex3_2.xml
+++ b/doc/generated/examples/libraries_ex3_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 cl /Foprog.obj /c prog.c /nologo
 link /nologo /OUT:prog.exe /LIBPATH:\usr\lib /LIBPATH:\usr\local\lib m.lib prog.obj
 embedManifestExeCheck(target, source, env)
diff --git a/doc/generated/examples/libraries_objects_1.xml b/doc/generated/examples/libraries_objects_1.xml
index f5e5a7f..5d732da 100644
--- a/doc/generated/examples/libraries_objects_1.xml
+++ b/doc/generated/examples/libraries_objects_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o f1.o -c f1.c
 cc -o f3.o -c f3.c
 ar rc libfoo.a f1.o f2.o f3.o f4.o
diff --git a/doc/generated/examples/mergeflags_MergeFlags1_1.xml b/doc/generated/examples/mergeflags_MergeFlags1_1.xml
index b1df5da..8f18fd8 100644
--- a/doc/generated/examples/mergeflags_MergeFlags1_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 ['-option', '-O1', '-whatever', '-O3']
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/mergeflags_MergeFlags2_1.xml b/doc/generated/examples/mergeflags_MergeFlags2_1.xml
index 33604df..8cae827 100644
--- a/doc/generated/examples/mergeflags_MergeFlags2_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 ['/include', '/usr/local/include', '/usr/include', '/usr/opt/include']
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/mergeflags_MergeFlags3_1.xml b/doc/generated/examples/mergeflags_MergeFlags3_1.xml
index dcde108..d4f23d4 100644
--- a/doc/generated/examples/mergeflags_MergeFlags3_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 ['-option', '-O1', '-whatever', '-O3']
 ['/include', '/usr/local/include', '/usr/include', '/usr/opt/include']
 scons: `.' is up to date.
diff --git a/doc/generated/examples/misc_Exit_1.xml b/doc/generated/examples/misc_Exit_1.xml
index 4638af4..6af378f 100644
--- a/doc/generated/examples/misc_Exit_1.xml
+++ b/doc/generated/examples/misc_Exit_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q FUTURE=1</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q FUTURE=1</userinput>
 The FUTURE option is not supported yet!
 % <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
diff --git a/doc/generated/examples/misc_FindFile1a_1.xml b/doc/generated/examples/misc_FindFile1a_1.xml
index 2f41d74..eca0328 100644
--- a/doc/generated/examples/misc_FindFile1a_1.xml
+++ b/doc/generated/examples/misc_FindFile1a_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 None
 &lt;class 'SCons.Node.FS.File'&gt; exists
 scons: `.' is up to date.
diff --git a/doc/generated/examples/misc_FindFile1b_1.xml b/doc/generated/examples/misc_FindFile1b_1.xml
index 59869d4..4b194ce 100644
--- a/doc/generated/examples/misc_FindFile1b_1.xml
+++ b/doc/generated/examples/misc_FindFile1b_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 nonesuch.h  : None
 config.h    : config.h
 private.h   : src/include/private.h
diff --git a/doc/generated/examples/misc_FindFile1d_1.xml b/doc/generated/examples/misc_FindFile1d_1.xml
index 3802eca..5ab499f 100644
--- a/doc/generated/examples/misc_FindFile1d_1.xml
+++ b/doc/generated/examples/misc_FindFile1d_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 sub1/multiple
 sub2/multiple
 sub3/multiple
diff --git a/doc/generated/examples/misc_FindFile2_1.xml b/doc/generated/examples/misc_FindFile2_1.xml
index 5712ee7..149c5d5 100644
--- a/doc/generated/examples/misc_FindFile2_1.xml
+++ b/doc/generated/examples/misc_FindFile2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 leaf
 derived
 cat &gt; derived leaf
diff --git a/doc/generated/examples/misc_FindFile2_2.xml b/doc/generated/examples/misc_FindFile2_2.xml
index 5712ee7..149c5d5 100644
--- a/doc/generated/examples/misc_FindFile2_2.xml
+++ b/doc/generated/examples/misc_FindFile2_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 leaf
 derived
 cat &gt; derived leaf
diff --git a/doc/generated/examples/misc_FindFile3_1.xml b/doc/generated/examples/misc_FindFile3_1.xml
index b8cbe44..2c09fed 100644
--- a/doc/generated/examples/misc_FindFile3_1.xml
+++ b/doc/generated/examples/misc_FindFile3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 build/leaf
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/misc_Flatten1_1.xml b/doc/generated/examples/misc_Flatten1_1.xml
index 2bb02db..54720bb 100644
--- a/doc/generated/examples/misc_Flatten1_1.xml
+++ b/doc/generated/examples/misc_Flatten1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o prog1.o -c prog1.c
 cc -o prog2.o -c -DFOO prog2.c
 cc -o prog1 prog1.o prog2.o
diff --git a/doc/generated/examples/misc_Flatten2_1.xml b/doc/generated/examples/misc_Flatten2_1.xml
index 09b6d39..66161ec 100644
--- a/doc/generated/examples/misc_Flatten2_1.xml
+++ b/doc/generated/examples/misc_Flatten2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 AttributeError: 'NodeList' object has no attribute 'abspath':
   File "/home/my/project/SConstruct", line 8:
     print(object_file.abspath)
diff --git a/doc/generated/examples/nodes_GetBuildPath_1.xml b/doc/generated/examples/nodes_GetBuildPath_1.xml
index 1f24746..376f65e 100644
--- a/doc/generated/examples/nodes_GetBuildPath_1.xml
+++ b/doc/generated/examples/nodes_GetBuildPath_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 ['foo.c', 'sub/dir/value']
 scons: `.' is up to date.
 </screen>
diff --git a/doc/generated/examples/nodes_ex1_1.xml b/doc/generated/examples/nodes_ex1_1.xml
index 7c48388..e7eb8c4 100644
--- a/doc/generated/examples/nodes_ex1_1.xml
+++ b/doc/generated/examples/nodes_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o goodbye.o -c -DGOODBYE goodbye.c
 cc -o hello.o -c -DHELLO hello.c
 cc -o hello hello.o goodbye.o
diff --git a/doc/generated/examples/nodes_ex1_2.xml b/doc/generated/examples/nodes_ex1_2.xml
index 69f7314..a1ed1fb 100644
--- a/doc/generated/examples/nodes_ex1_2.xml
+++ b/doc/generated/examples/nodes_ex1_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 cl /Fogoodbye.obj /c goodbye.c -DGOODBYE
 cl /Fohello.obj /c hello.c -DHELLO
 link /nologo /OUT:hello.exe hello.obj goodbye.obj
diff --git a/doc/generated/examples/nodes_exists_1.xml b/doc/generated/examples/nodes_exists_1.xml
index 53d0039..a290b1c 100644
--- a/doc/generated/examples/nodes_exists_1.xml
+++ b/doc/generated/examples/nodes_exists_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 hello does not exist!
 cc -o hello.o -c hello.c
 cc -o hello hello.o
diff --git a/doc/generated/examples/nodes_print_1.xml b/doc/generated/examples/nodes_print_1.xml
index c1e0a36..11a3f45 100644
--- a/doc/generated/examples/nodes_print_1.xml
+++ b/doc/generated/examples/nodes_print_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 The object file is: hello.o
 The program file is: hello
 cc -o hello.o -c hello.c
diff --git a/doc/generated/examples/nodes_print_2.xml b/doc/generated/examples/nodes_print_2.xml
index e2d8065..a62b522 100644
--- a/doc/generated/examples/nodes_print_2.xml
+++ b/doc/generated/examples/nodes_print_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 The object file is: hello.obj
 The program file is: hello.exe
 cl /Fohello.obj /c hello.c /nologo
diff --git a/doc/generated/examples/output_Progress-TARGET_1.xml b/doc/generated/examples/output_Progress-TARGET_1.xml
index b9c1660..b233c6e 100644
--- a/doc/generated/examples/output_Progress-TARGET_1.xml
+++ b/doc/generated/examples/output_Progress-TARGET_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 Evaluating SConstruct
 Evaluating f1.c
 Evaluating f1.o
diff --git a/doc/generated/examples/output_ex1_1.xml b/doc/generated/examples/output_ex1_1.xml
index d3f0259..535960b 100644
--- a/doc/generated/examples/output_ex1_1.xml
+++ b/doc/generated/examples/output_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -h</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -h</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 
diff --git a/doc/generated/examples/output_ex2_1.xml b/doc/generated/examples/output_ex2_1.xml
index e321a40..e951c3a 100644
--- a/doc/generated/examples/output_ex2_1.xml
+++ b/doc/generated/examples/output_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -h</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -h</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 
diff --git a/doc/generated/examples/output_ex2_2.xml b/doc/generated/examples/output_ex2_2.xml
index f1fde0b..8dca6c3 100644
--- a/doc/generated/examples/output_ex2_2.xml
+++ b/doc/generated/examples/output_ex2_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -h</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -h</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 
diff --git a/doc/generated/examples/output_gbf2_1.xml b/doc/generated/examples/output_gbf2_1.xml
index efaf7a0..c31b41a 100644
--- a/doc/generated/examples/output_gbf2_1.xml
+++ b/doc/generated/examples/output_gbf2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 scons: `.' is up to date.
 Build succeeded.
 % <userinput>scons -Q fail=1</userinput>
diff --git a/doc/generated/examples/parseflags_ex1_1.xml b/doc/generated/examples/parseflags_ex1_1.xml
index 6a1336b..d6e4d96 100644
--- a/doc/generated/examples/parseflags_ex1_1.xml
+++ b/doc/generated/examples/parseflags_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 CPPPATH ['/opt/include']
 LIBPATH ['/opt/lib']
 LIBS ['foo']
diff --git a/doc/generated/examples/parseflags_ex1_2.xml b/doc/generated/examples/parseflags_ex1_2.xml
index 8eefc06..4c115d0 100644
--- a/doc/generated/examples/parseflags_ex1_2.xml
+++ b/doc/generated/examples/parseflags_ex1_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 CPPPATH ['/opt/include']
 LIBPATH ['/opt/lib']
 LIBS ['foo']
diff --git a/doc/generated/examples/parseflags_ex2_1.xml b/doc/generated/examples/parseflags_ex2_1.xml
index daedec6..da84ee3 100644
--- a/doc/generated/examples/parseflags_ex2_1.xml
+++ b/doc/generated/examples/parseflags_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 CCFLAGS -whatever
 cc -o f1.o -c -whatever f1.c
 cc -o f1 f1.o
diff --git a/doc/generated/examples/parseflags_ex3_1.xml b/doc/generated/examples/parseflags_ex3_1.xml
index 6a1336b..d6e4d96 100644
--- a/doc/generated/examples/parseflags_ex3_1.xml
+++ b/doc/generated/examples/parseflags_ex3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 CPPPATH ['/opt/include']
 LIBPATH ['/opt/lib']
 LIBS ['foo']
diff --git a/doc/generated/examples/parseflags_ex4_1.xml b/doc/generated/examples/parseflags_ex4_1.xml
index 6a1336b..d6e4d96 100644
--- a/doc/generated/examples/parseflags_ex4_1.xml
+++ b/doc/generated/examples/parseflags_ex4_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 CPPPATH ['/opt/include']
 LIBPATH ['/opt/lib']
 LIBS ['foo']
diff --git a/doc/generated/examples/repositories_CPPPATH3_1.xml b/doc/generated/examples/repositories_CPPPATH3_1.xml
index 83ef06b..d53ffdb 100644
--- a/doc/generated/examples/repositories_CPPPATH3_1.xml
+++ b/doc/generated/examples/repositories_CPPPATH3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c -Idir1 -I/r1/dir1 -I/r2/dir1 -Idir2 -I/r1/dir2 -I/r2/dir2 -Idir3 -I/r1/dir3 -I/r2/dir3 hello.c
 cc -o hello hello.o
 </screen>
diff --git a/doc/generated/examples/repositories_CPPPATH_1.xml b/doc/generated/examples/repositories_CPPPATH_1.xml
index fdbffaf..6c5a2d1 100644
--- a/doc/generated/examples/repositories_CPPPATH_1.xml
+++ b/doc/generated/examples/repositories_CPPPATH_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c -I. -I/usr/repository1 hello.c
 cc -o hello hello.o
 </screen>
diff --git a/doc/generated/examples/repositories_ex1_1.xml b/doc/generated/examples/repositories_ex1_1.xml
index 35532b8..a21fdc8 100644
--- a/doc/generated/examples/repositories_ex1_1.xml
+++ b/doc/generated/examples/repositories_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c hello.c
 cc -o hello hello.o
 </screen>
diff --git a/doc/generated/examples/repositories_ex2_1.xml b/doc/generated/examples/repositories_ex2_1.xml
index 9d2cdd2..819c936 100644
--- a/doc/generated/examples/repositories_ex2_1.xml
+++ b/doc/generated/examples/repositories_ex2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c /usr/repository1/hello.c
 cc -o hello hello.o
 </screen>
diff --git a/doc/generated/examples/repositories_ex3_1.xml b/doc/generated/examples/repositories_ex3_1.xml
index fe2654d..76d69cd 100644
--- a/doc/generated/examples/repositories_ex3_1.xml
+++ b/doc/generated/examples/repositories_ex3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c /usr/repository2/hello.c
 cc -o hello hello.o
 </screen>
diff --git a/doc/generated/examples/repositories_ex4_1.xml b/doc/generated/examples/repositories_ex4_1.xml
index 43267b0..8911683 100644
--- a/doc/generated/examples/repositories_ex4_1.xml
+++ b/doc/generated/examples/repositories_ex4_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>cd /usr/repository1</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>cd /usr/repository1</userinput>
 % <userinput>scons -Q</userinput>
 cc -o file1.o -c file1.c
 cc -o file2.o -c file2.c
diff --git a/doc/generated/examples/repositories_quote1_1.xml b/doc/generated/examples/repositories_quote1_1.xml
index 8a10939..d2ba624 100644
--- a/doc/generated/examples/repositories_quote1_1.xml
+++ b/doc/generated/examples/repositories_quote1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o hello.o -c -I. -I/usr/repository1 /usr/repository1/hello.c
 cc -o hello hello.o
 </screen>
diff --git a/doc/generated/examples/separate_builddir_1.xml b/doc/generated/examples/separate_builddir_1.xml
index b05f3d0..a763172 100644
--- a/doc/generated/examples/separate_builddir_1.xml
+++ b/doc/generated/examples/separate_builddir_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>ls src</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>ls src</userinput>
 hello.c
 % <userinput>scons -Q</userinput>
 cc -o build/hello.o -c build/hello.c
diff --git a/doc/generated/examples/separate_builddir_sconscript_1.xml b/doc/generated/examples/separate_builddir_sconscript_1.xml
index 11bfcb5..5694a56 100644
--- a/doc/generated/examples/separate_builddir_sconscript_1.xml
+++ b/doc/generated/examples/separate_builddir_sconscript_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>ls src</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>ls src</userinput>
 SConscript  hello.c
 % <userinput>scons -Q</userinput>
 cc -o build/hello.o -c build/hello.c
diff --git a/doc/generated/examples/separate_duplicate0_1.xml b/doc/generated/examples/separate_duplicate0_1.xml
index 142c1d3..207c5d7 100644
--- a/doc/generated/examples/separate_duplicate0_1.xml
+++ b/doc/generated/examples/separate_duplicate0_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>ls src</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>ls src</userinput>
 hello.c
 % <userinput>scons -Q</userinput>
 cc -o build/hello.o -c src/hello.c
diff --git a/doc/generated/examples/separate_ex1_1.xml b/doc/generated/examples/separate_ex1_1.xml
index 11bfcb5..5694a56 100644
--- a/doc/generated/examples/separate_ex1_1.xml
+++ b/doc/generated/examples/separate_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>ls src</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>ls src</userinput>
 SConscript  hello.c
 % <userinput>scons -Q</userinput>
 cc -o build/hello.o -c build/hello.c
diff --git a/doc/generated/examples/separate_glob_builddir_sconscript_1.xml b/doc/generated/examples/separate_glob_builddir_sconscript_1.xml
index 951acc4..7cdb420 100644
--- a/doc/generated/examples/separate_glob_builddir_sconscript_1.xml
+++ b/doc/generated/examples/separate_glob_builddir_sconscript_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>ls src</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>ls src</userinput>
 SConscript  f1.c  f2.c  f2.h
 % <userinput>scons -Q</userinput>
 cc -o build/f1.o -c build/f1.c
diff --git a/doc/generated/examples/sideeffect_parallel_1.xml b/doc/generated/examples/sideeffect_parallel_1.xml
index 4b38c2b..9478c52 100644
--- a/doc/generated/examples/sideeffect_parallel_1.xml
+++ b/doc/generated/examples/sideeffect_parallel_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --jobs=2</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --jobs=2</userinput>
 echo &gt; file1.out data1
 echo &gt; file2.out data2
 </screen>
diff --git a/doc/generated/examples/sideeffect_shared_1.xml b/doc/generated/examples/sideeffect_shared_1.xml
index 84a58b2..2abb806 100644
--- a/doc/generated/examples/sideeffect_shared_1.xml
+++ b/doc/generated/examples/sideeffect_shared_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --jobs=2</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --jobs=2</userinput>
 ./build --log logfile.txt file1.in file1.out
 ./build --log logfile.txt file2.in file2.out
 </screen>
diff --git a/doc/generated/examples/sideeffect_simple_1.xml b/doc/generated/examples/sideeffect_simple_1.xml
index cde16a4..e88630c 100644
--- a/doc/generated/examples/sideeffect_simple_1.xml
+++ b/doc/generated/examples/sideeffect_simple_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --jobs=2</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --jobs=2</userinput>
   File "/home/my/project/SConstruct", line 4
 
     'echo &gt;$TARGET data1; echo &gt;log updated file1'))
diff --git a/doc/generated/examples/simple_Object_1.xml b/doc/generated/examples/simple_Object_1.xml
index 31394ba..6d5c80d 100644
--- a/doc/generated/examples/simple_Object_1.xml
+++ b/doc/generated/examples/simple_Object_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 scons: Building targets ...
diff --git a/doc/generated/examples/simple_Object_2.xml b/doc/generated/examples/simple_Object_2.xml
index 4ba24c8..3686006 100644
--- a/doc/generated/examples/simple_Object_2.xml
+++ b/doc/generated/examples/simple_Object_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 scons: Building targets ...
diff --git a/doc/generated/examples/simple_clean_1.xml b/doc/generated/examples/simple_clean_1.xml
index 4c2c05f..21adbe7 100644
--- a/doc/generated/examples/simple_clean_1.xml
+++ b/doc/generated/examples/simple_clean_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 scons: Building targets ...
diff --git a/doc/generated/examples/simple_clean_2.xml b/doc/generated/examples/simple_clean_2.xml
index 6e50fe9..26f3c37 100644
--- a/doc/generated/examples/simple_clean_2.xml
+++ b/doc/generated/examples/simple_clean_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 scons: Building targets ...
diff --git a/doc/generated/examples/simple_declarative_1.xml b/doc/generated/examples/simple_declarative_1.xml
index 88bbb73..01061cf 100644
--- a/doc/generated/examples/simple_declarative_1.xml
+++ b/doc/generated/examples/simple_declarative_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 Calling Program('hello.c')
 Calling Program('goodbye.c')
diff --git a/doc/generated/examples/simple_ex1_1.xml b/doc/generated/examples/simple_ex1_1.xml
index 931920d..5833ede 100644
--- a/doc/generated/examples/simple_ex1_1.xml
+++ b/doc/generated/examples/simple_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 scons: Building targets ...
diff --git a/doc/generated/examples/simple_ex1_2.xml b/doc/generated/examples/simple_ex1_2.xml
index 282fe45..f0e07a1 100644
--- a/doc/generated/examples/simple_ex1_2.xml
+++ b/doc/generated/examples/simple_ex1_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 scons: Building targets ...
diff --git a/doc/generated/examples/simple_ex1_3.xml b/doc/generated/examples/simple_ex1_3.xml
index 282fe45..f0e07a1 100644
--- a/doc/generated/examples/simple_ex1_3.xml
+++ b/doc/generated/examples/simple_ex1_3.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 scons: Building targets ...
diff --git a/doc/generated/examples/simple_ex1_4.xml b/doc/generated/examples/simple_ex1_4.xml
index efd6e3a..80c7b63 100644
--- a/doc/generated/examples/simple_ex1_4.xml
+++ b/doc/generated/examples/simple_ex1_4.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q</userinput>
 cl /Fohello.obj /c hello.c /nologo
 link /nologo /OUT:hello.exe hello.obj
 embedManifestExeCheck(target, source, env)
diff --git a/doc/generated/examples/simple_java_1.xml b/doc/generated/examples/simple_java_1.xml
index bc7994c..75cc6cc 100644
--- a/doc/generated/examples/simple_java_1.xml
+++ b/doc/generated/examples/simple_java_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 scons: done reading SConscript files.
 scons: Building targets ...
diff --git a/doc/generated/examples/sourcecode_bitkeeper_1.xml b/doc/generated/examples/sourcecode_bitkeeper_1.xml
index 2e9a1af..41af3a2 100644
--- a/doc/generated/examples/sourcecode_bitkeeper_1.xml
+++ b/doc/generated/examples/sourcecode_bitkeeper_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 AttributeError: 'SConsEnvironment' object has no attribute 'BitKeeper':
   File "/home/my/project/SConstruct", line 2:
     env.SourceCode('.', env.BitKeeper())
diff --git a/doc/generated/examples/sourcecode_cvs_1.xml b/doc/generated/examples/sourcecode_cvs_1.xml
index 010425d..01ddb6b 100644
--- a/doc/generated/examples/sourcecode_cvs_1.xml
+++ b/doc/generated/examples/sourcecode_cvs_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 AttributeError: 'SConsEnvironment' object has no attribute 'CVS':
   File "/home/my/project/SConstruct", line 2:
     env.SourceCode('.', env.CVS('/usr/local/CVS'))
diff --git a/doc/generated/examples/sourcecode_rcs_1.xml b/doc/generated/examples/sourcecode_rcs_1.xml
index c858b8f..e6b36dd 100644
--- a/doc/generated/examples/sourcecode_rcs_1.xml
+++ b/doc/generated/examples/sourcecode_rcs_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 AttributeError: 'SConsEnvironment' object has no attribute 'RCS':
   File "/home/my/project/SConstruct", line 2:
     env.SourceCode('.', env.RCS())
diff --git a/doc/generated/examples/sourcecode_sccs_1.xml b/doc/generated/examples/sourcecode_sccs_1.xml
index 32b8c60..e0699d1 100644
--- a/doc/generated/examples/sourcecode_sccs_1.xml
+++ b/doc/generated/examples/sourcecode_sccs_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 AttributeError: 'SConsEnvironment' object has no attribute 'SCCS':
   File "/home/my/project/SConstruct", line 2:
     env.SourceCode('.', env.SCCS())
diff --git a/doc/generated/examples/tasks_ex1_1.xml b/doc/generated/examples/tasks_ex1_1.xml
index 0823697..4885fde 100644
--- a/doc/generated/examples/tasks_ex1_1.xml
+++ b/doc/generated/examples/tasks_ex1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cat &lt; test.bar &gt; test.h
 cc -o app main.cpp
 cat &lt; foo.bar2 &gt; foo.cpp
diff --git a/doc/generated/examples/troubleshoot_Dump_1.xml b/doc/generated/examples/troubleshoot_Dump_1.xml
index c60d2e7..99d1399 100644
--- a/doc/generated/examples/troubleshoot_Dump_1.xml
+++ b/doc/generated/examples/troubleshoot_Dump_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 { 'BUILDERS': {'_InternalInstall': &lt;function InstallBuilderWrapper at 0x700000&amp;gt;, '_InternalInstallVersionedLib': &lt;function InstallVersionedBuilderWrapper at 0x700000&amp;gt;, '_InternalInstallAs': &lt;function InstallAsBuilderWrapper at 0x700000&amp;gt;},
   'CONFIGUREDIR': '#/.sconf_temp',
diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml
index 6888b71..a621422 100644
--- a/doc/generated/examples/troubleshoot_Dump_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
 scons: Reading SConscript files ...
 { 'BUILDERS': {'_InternalInstallVersionedLib': &lt;function InstallVersionedBuilderWrapper at 0x700000&amp;gt;, '_InternalInstall': &lt;function InstallBuilderWrapper at 0x700000&amp;gt;, 'Object': &lt;SCons.Builder.CompositeBuilder object at 0x700000&amp;gt;, 'PCH': &lt;SCons.Builder.BuilderBase object at 0x700000&amp;gt;, 'RES': &lt;SCons.Builder.BuilderBase object at 0x700000&amp;gt;, 'SharedObject': &lt;SCons.Builder.CompositeBuilder object at 0x700000&amp;gt;, 'StaticObject': &lt;SCons.Builder.CompositeBuilder object at 0x700000&amp;gt;, '_InternalInstallAs': &lt;function InstallAsBuilderWrapper at 0x700000&amp;gt;},
   'CC': 'cl',
@@ -79,7 +79,7 @@ scons: Reading SConscript files ...
   'SHCXX': '$CXX',
   'SHCXXCOM': '${TEMPFILE("$SHCXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM","$SHCXXCOMSTR")}',
   'SHCXXFLAGS': ['$CXXFLAGS'],
-  'SHELL': 'command',
+  'SHELL': None,
   'SHLIBPREFIX': '',
   'SHLIBSUFFIX': '.dll',
   'SHOBJPREFIX': '$OBJPREFIX',
diff --git a/doc/generated/examples/troubleshoot_Dump_ENV_1.xml b/doc/generated/examples/troubleshoot_Dump_ENV_1.xml
index 6bb9463..786491f 100644
--- a/doc/generated/examples/troubleshoot_Dump_ENV_1.xml
+++ b/doc/generated/examples/troubleshoot_Dump_ENV_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
 { 'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin'}
 scons: done reading SConscript files.
diff --git a/doc/generated/examples/troubleshoot_Dump_ENV_2.xml b/doc/generated/examples/troubleshoot_Dump_ENV_2.xml
index 262a6b9..b91c31c 100644
--- a/doc/generated/examples/troubleshoot_Dump_ENV_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_ENV_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
 scons: Reading SConscript files ...
 { 'PATH': 'C:\\WINDOWS\\System32:/usr/bin',
   'PATHEXT': '.COM;.EXE;.BAT;.CMD',
diff --git a/doc/generated/examples/troubleshoot_explain1_1.xml b/doc/generated/examples/troubleshoot_explain1_1.xml
index 140a88e..2a9547d 100644
--- a/doc/generated/examples/troubleshoot_explain1_1.xml
+++ b/doc/generated/examples/troubleshoot_explain1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cp file.in file.oout
 % <userinput>scons -Q</userinput>
 cp file.in file.oout
diff --git a/doc/generated/examples/troubleshoot_explain1_2.xml b/doc/generated/examples/troubleshoot_explain1_2.xml
index 2493768..9864cd7 100644
--- a/doc/generated/examples/troubleshoot_explain1_2.xml
+++ b/doc/generated/examples/troubleshoot_explain1_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --debug=explain</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --debug=explain</userinput>
 scons: building `file.out' because it doesn't exist
 cp file.in file.oout
 </screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index c3ff407..cbe4800 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --warn=target-not-built</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --warn=target-not-built</userinput>
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/Users/bdbaddog/devel/scons/git/scons-bugfixes-3/bootstrap/src/script/scons.py", line 204, in &lt;module&gt;
+File "/home/bdbaddog/scons/git/as_scons/bootstrap/src/script/scons.py", line 204, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/examples/troubleshoot_explain2_1.xml b/doc/generated/examples/troubleshoot_explain2_1.xml
index 70f2e90..cd95a44 100644
--- a/doc/generated/examples/troubleshoot_explain2_1.xml
+++ b/doc/generated/examples/troubleshoot_explain2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o file1.o -c file1.c
 cc -o file2.o -c file2.c
 cc -o file3.o -c file3.c
diff --git a/doc/generated/examples/troubleshoot_explain3_1.xml b/doc/generated/examples/troubleshoot_explain3_1.xml
index 0207782..bacb7e8 100644
--- a/doc/generated/examples/troubleshoot_explain3_1.xml
+++ b/doc/generated/examples/troubleshoot_explain3_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 cc -o file1.o -c -I. file1.c
 cc -o file2.o -c -I. file2.c
 cc -o file3.o -c -I. file3.c
diff --git a/doc/generated/examples/troubleshoot_findlibs_1.xml b/doc/generated/examples/troubleshoot_findlibs_1.xml
index 62f1c2e..8fc4e5f 100644
--- a/doc/generated/examples/troubleshoot_findlibs_1.xml
+++ b/doc/generated/examples/troubleshoot_findlibs_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --debug=findlibs</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --debug=findlibs</userinput>
   findlibs: looking for 'libfoo.a' in 'libs1' ...
   findlibs: ... FOUND 'libfoo.a' in 'libs1'
   findlibs: looking for 'libfoo.so' in 'libs1' ...
diff --git a/doc/generated/examples/troubleshoot_stacktrace_1.xml b/doc/generated/examples/troubleshoot_stacktrace_1.xml
index e670ed0..cc3ca7b 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_1.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_1.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'.
 </screen>
diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml
index 381a2a2..76cfc1a 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_2.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --debug=stacktrace</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --debug=stacktrace</userinput>
 scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'.
 scons: internal stack trace:
   File "bootstrap/src/engine/SCons/Job.py", line 199, in start
diff --git a/doc/generated/examples/troubleshoot_taskmastertrace_1.xml b/doc/generated/examples/troubleshoot_taskmastertrace_1.xml
index 0ada18d..578951d 100644
--- a/doc/generated/examples/troubleshoot_taskmastertrace_1.xml
+++ b/doc/generated/examples/troubleshoot_taskmastertrace_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --taskmastertrace=- prog</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --taskmastertrace=- prog</userinput>
 
 Taskmaster: Looking for a node to evaluate
 Taskmaster:     Considering node &lt;no_state   0   'prog'&gt; and its children:
diff --git a/doc/generated/examples/troubleshoot_tree1_1.xml b/doc/generated/examples/troubleshoot_tree1_1.xml
index bc50b6b..4ccadc6 100644
--- a/doc/generated/examples/troubleshoot_tree1_1.xml
+++ b/doc/generated/examples/troubleshoot_tree1_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=all</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=all</userinput>
 cc -o f1.o -c -I. f1.c
 cc -o f2.o -c -I. f2.c
 cc -o f3.o -c -I. f3.c
diff --git a/doc/generated/examples/troubleshoot_tree1_2.xml b/doc/generated/examples/troubleshoot_tree1_2.xml
index 0ed526e..0bd4874 100644
--- a/doc/generated/examples/troubleshoot_tree1_2.xml
+++ b/doc/generated/examples/troubleshoot_tree1_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=all f2.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=all f2.o</userinput>
 cc -o f2.o -c -I. f2.c
 +-f2.o
   +-f2.c
diff --git a/doc/generated/examples/troubleshoot_tree1_3.xml b/doc/generated/examples/troubleshoot_tree1_3.xml
index 25e403e..75fa841 100644
--- a/doc/generated/examples/troubleshoot_tree1_3.xml
+++ b/doc/generated/examples/troubleshoot_tree1_3.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=all f1.o f3.o</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=all f1.o f3.o</userinput>
 cc -o f1.o -c -I. f1.c
 +-f1.o
   +-f1.c
diff --git a/doc/generated/examples/troubleshoot_tree1_4.xml b/doc/generated/examples/troubleshoot_tree1_4.xml
index 1f615cc..409bce9 100644
--- a/doc/generated/examples/troubleshoot_tree1_4.xml
+++ b/doc/generated/examples/troubleshoot_tree1_4.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=status</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=status</userinput>
 cc -o f1.o -c -I. f1.c
 cc -o f2.o -c -I. f2.c
 cc -o f3.o -c -I. f3.c
diff --git a/doc/generated/examples/troubleshoot_tree1_5.xml b/doc/generated/examples/troubleshoot_tree1_5.xml
index 06de4da..b852ab0 100644
--- a/doc/generated/examples/troubleshoot_tree1_5.xml
+++ b/doc/generated/examples/troubleshoot_tree1_5.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=derived</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=derived</userinput>
 cc -o f1.o -c -I. f1.c
 cc -o f2.o -c -I. f2.c
 cc -o f3.o -c -I. f3.c
diff --git a/doc/generated/examples/troubleshoot_tree1_6.xml b/doc/generated/examples/troubleshoot_tree1_6.xml
index 402d9fc..a0d42d7 100644
--- a/doc/generated/examples/troubleshoot_tree1_6.xml
+++ b/doc/generated/examples/troubleshoot_tree1_6.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=derived,status</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=derived,status</userinput>
 cc -o f1.o -c -I. f1.c
 cc -o f2.o -c -I. f2.c
 cc -o f3.o -c -I. f3.c
diff --git a/doc/generated/examples/troubleshoot_tree2_1.xml b/doc/generated/examples/troubleshoot_tree2_1.xml
index 209df28..85febf5 100644
--- a/doc/generated/examples/troubleshoot_tree2_1.xml
+++ b/doc/generated/examples/troubleshoot_tree2_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=all</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=all</userinput>
 cc -o f1.o -c -I. f1.c
 cc -o f2.o -c -I. f2.c
 cc -o f3.o -c -I. f3.c
diff --git a/doc/generated/examples/troubleshoot_tree2_2.xml b/doc/generated/examples/troubleshoot_tree2_2.xml
index 3400c25..5380fad 100644
--- a/doc/generated/examples/troubleshoot_tree2_2.xml
+++ b/doc/generated/examples/troubleshoot_tree2_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=prune</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q --tree=prune</userinput>
 cc -o f1.o -c -I. f1.c
 cc -o f2.o -c -I. f2.c
 cc -o f3.o -c -I. f3.c
diff --git a/doc/generated/examples/variants_ex_1.xml b/doc/generated/examples/variants_ex_1.xml
index 1b45e46e..12a14d6 100644
--- a/doc/generated/examples/variants_ex_1.xml
+++ b/doc/generated/examples/variants_ex_1.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q OS=linux</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q OS=linux</userinput>
 Install file: "build/linux/world/world.h" as "export/linux/include/world.h"
 cc -o build/linux/hello/hello.o -c -Iexport/linux/include build/linux/hello/hello.c
 cc -o build/linux/world/world.o -c -Iexport/linux/include build/linux/world/world.c
diff --git a/doc/generated/examples/variants_ex_2.xml b/doc/generated/examples/variants_ex_2.xml
index 1a78614..c129cc4 100644
--- a/doc/generated/examples/variants_ex_2.xml
+++ b/doc/generated/examples/variants_ex_2.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q OS=windows</userinput>
+<?xml version="1.0" encoding="UTF-8"?>
+<screen 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons -Q OS=windows</userinput>
 Install file: "build/windows/world/world.h" as "export/windows/include/world.h"
 cl /Fobuild\windows\hello\hello.obj /c build\windows\hello\hello.c /nologo /Iexport\windows\include
 cl /Fobuild\windows\world\world.obj /c build\windows\world\world.c /nologo /Iexport\windows\include
diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen
index 8327334..617a0a4 100644
--- a/doc/generated/functions.gen
+++ b/doc/generated/functions.gen
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sconsdoc [
     <!ENTITY % scons SYSTEM "../scons.mod">
     %scons;
@@ -12,7 +12,7 @@
     %variables-mod;
 ]>
 
-<variablelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
+<variablelist 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">
   <varlistentry id="f-Action">
     <term>
       <literal>Action(action, [cmd/str/fun, [var, ...]] [option=value, ...])</literal>
@@ -20,7 +20,8 @@
     <term>
       <literal>env.Action(action, [cmd/str/fun, [var, ...]] [option=value, ...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Creates an Action object for
 the specified
 <varname>action</varname>.
@@ -28,7 +29,7 @@ See the section "Action Objects,"
 below, for a complete explanation of the arguments and behavior.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that the
 <function>env.Action</function>()
 form of the invocation will expand
@@ -55,7 +56,8 @@ until the Action object is actually used.
     <term>
       <literal>env.AddMethod(function, [name])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When called with the
 <function>AddMethod</function>()
 form,
@@ -84,11 +86,11 @@ specified
 itself is used for the method name.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Note that the first argument to the function to
 # be attached as a method must be the object through
 # which the method will be called; the Python
@@ -114,7 +116,8 @@ env.other_method_name('another arg')
     <term>
       <literal>AddOption(arguments)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This function adds a new command-line option to be recognized.
 The specified
 <varname>arguments</varname>
@@ -126,12 +129,12 @@ see the documentation for
 for a thorough discussion of its option-processing capabities.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 In addition to the arguments and values supported by the
 <function>optparse.add_option</function>()
 method,
 the SCons
-<function>AddOption</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">AddOption</function>
 function allows you to set the
 <literal>nargs</literal>
 keyword value to
@@ -143,7 +146,7 @@ argument.
 When
 <literal>nargs = '?'</literal>
 is passed to the
-<function>AddOption</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">AddOption</function>
 function, the
 <literal>const</literal>
 keyword argument
@@ -153,28 +156,28 @@ option is specified on the command line
 without an explicit argument.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If no
 <literal>default=</literal>
 keyword argument is supplied when calling
-<function>AddOption</function>,
+<function xmlns="http://www.scons.org/dbxsd/v1.0">AddOption</function>,
 the option will have a default value of
 <literal>None</literal>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Once a new command-line option has been added with
-<function>AddOption</function>,
+<function xmlns="http://www.scons.org/dbxsd/v1.0">AddOption</function>,
 the option value may be accessed using
-<function>GetOption</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">GetOption</function>
 or
 <function>env.GetOption</function>().
 The value may also be set, using
-<function>SetOption</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SetOption</function>
 or
 <function>env.SetOption</function>(),
 if conditions in a
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 require overriding any default value.
 Note, however, that a
 value specified on the command line will
@@ -182,7 +185,7 @@ value specified on the command line will
 override a value set by any SConscript file.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Any specified
 <literal>help=</literal>
 strings for the new option(s)
@@ -194,22 +197,22 @@ options
 (the latter only if no other help text is
 specified in the SConscript files).
 The help text for the local options specified by
-<function>AddOption</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">AddOption</function>
 will appear below the SCons options themselves,
 under a separate
 <literal>Local Options</literal>
 heading.
 The options will appear in the help text
 in the order in which the
-<function>AddOption</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">AddOption</function>
 calls occur.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 AddOption('--prefix',
           dest='prefix',
           nargs=1, type='string',
@@ -227,7 +230,8 @@ env = Environment(PREFIX = GetOption('prefix'))
     <term>
       <literal>env.AddPostAction(target, action)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Arranges for the specified
 <varname>action</varname>
 to be performed
@@ -240,7 +244,7 @@ can be converted into an Action object
 (see below).
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When multiple targets are supplied,
 the action may be called multiple times,
 once after each action that generates
@@ -255,7 +259,8 @@ one or more targets in the list.
     <term>
       <literal>env.AddPreAction(target, action)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Arranges for the specified
 <varname>action</varname>
 to be performed
@@ -268,14 +273,14 @@ can be converted into an Action object
 (see below).
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When multiple targets are specified,
 the action(s) may be called multiple times,
 once before each action that generates
 one or more targets in the list.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that if any of the targets are built in multiple steps,
 the action will be invoked just
 before the "final" action that specifically
@@ -286,16 +291,16 @@ from a specified source
 file via an intermediate object file:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 foo = Program('foo.c')
 AddPreAction(foo, 'pre_action')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The specified
 <literal>pre_action</literal>
 would be executed before
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 calls the link command that actually
 generates the executable program binary
 <filename>foo</filename>,
@@ -312,7 +317,8 @@ file into an object file.
     <term>
       <literal>env.Alias(alias, [targets, [action]])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Creates one or more phony targets that
 expand to one or more other targets.
 An optional
@@ -326,17 +332,17 @@ which exists outside of any file system.
 This Node object, or the alias name,
 may be used as a dependency of any other target,
 including another alias.
-<function>Alias</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Alias</function>
 can be called multiple times for the same
 alias to add additional targets to the alias,
 or additional actions to the list for this alias.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Alias('install')
 Alias('install', '/usr/bin')
 Alias(['install', 'install-lib'], '/usr/local/lib')
@@ -352,7 +358,8 @@ env.Alias('update', ['file1', 'file2'], "update_database $SOURCES")
     <term>
       <literal>AllowSubstExceptions([exception, ...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies the exceptions that will be allowed
 when expanding construction variables.
 By default,
@@ -368,19 +375,19 @@ will generate an error message
 and terminate processing.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If
-<function>AllowSubstExceptions</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">AllowSubstExceptions</function>
 is called multiple times,
 each call completely overwrites the previous list
 of allowed exceptions.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Requires that all construction variable names exist.
 # (You may wish to do this if you want to enforce strictly
 # that all construction variables must be defined before use.)
@@ -399,13 +406,14 @@ AllowSubstExceptions(IndexError, NameError, ZeroDivisionError)
     <term>
       <literal>env.AlwaysBuild(target, ...)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Marks each given
 <varname>target</varname>
 so that it is always assumed to be out of date,
 and will always be rebuilt if needed.
 Note, however, that
-<function>AlwaysBuild</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">AlwaysBuild</function>
 does not add its target(s) to the default target list,
 so the targets will only be built
 if they are specified on the command line,
@@ -414,7 +422,7 @@ they will
 <emphasis>always</emphasis>
 be built if so specified.
 Multiple targets can be passed in to a single call to
-<function>AlwaysBuild</function>.
+<function xmlns="http://www.scons.org/dbxsd/v1.0">AlwaysBuild</function>.
 </para>
 </listitem>
   </varlistentry>
@@ -422,7 +430,8 @@ Multiple targets can be passed in to a single call to
     <term>
       <literal>env.Append(key=val, [...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Appends the specified keyword arguments
 to the end of construction variables in the environment.
 If the Environment does not have
@@ -438,11 +447,11 @@ and the lists are added together.
 (See also the Prepend method, below.)
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Append(CCFLAGS = ' -g', FOO = ['foo.yyy'])
 </example_commands>
 </listitem>
@@ -451,7 +460,8 @@ env.Append(CCFLAGS = ' -g', FOO = ['foo.yyy'])
     <term>
       <literal>env.AppendENVPath(name, newpath, [envname, sep, delete_existing])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This appends new path elements to the given path in the
 specified external environment
 (<literal>ENV</literal>
@@ -469,18 +479,18 @@ case where the given old path variable is a list instead of a
 string, in which case a list will be returned instead of a string.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If 
 <varname>delete_existing</varname>
 is 0, then adding a path that already exists
 will not move it to the end; it will stay where it is in the list.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 print 'before:',env['ENV']['INCLUDE']
 include_path = '/foo/bar:/foo'
 env.AppendENVPath('INCLUDE', include_path)
@@ -496,7 +506,8 @@ after: /biz:/foo/bar:/foo
     <term>
       <literal>env.AppendUnique(key=val, [...], delete_existing=0)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Appends the specified keyword arguments
 to the end of construction variables in the environment.
 If the Environment does not have
@@ -512,11 +523,11 @@ existing matching values are removed first, so
 existing values in the arg list move to the end of the list.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.AppendUnique(CCFLAGS = '-g', FOO = ['foo.yyy'])
 </example_commands>
 </listitem>
@@ -528,9 +539,10 @@ env.AppendUnique(CCFLAGS = '-g', FOO = ['foo.yyy'])
     <term>
       <literal>env.BuildDir(build_dir, src_dir, [duplicate])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Deprecated synonyms for
-<function>VariantDir</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">VariantDir</function>
 and
 <function>env.VariantDir</function>().
 The
@@ -538,7 +550,7 @@ The
 argument becomes the
 <varname>variant_dir</varname>
 argument of
-<function>VariantDir</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">VariantDir</function>
 or
 <function>env.VariantDir</function>().
 </para>
@@ -551,7 +563,8 @@ or
     <term>
       <literal>env.Builder(action, [arguments])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Creates a Builder object for
 the specified
 <varname>action</varname>.
@@ -559,7 +572,7 @@ See the section "Builder Objects,"
 below, for a complete explanation of the arguments and behavior.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that the
 <function>env.Builder</function>()
 form of the invocation will expand
@@ -574,7 +587,7 @@ construction environment through which
 <function>env.Builder</function>()
 was called.
 The
-<function>Builder</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Builder</function>
 form delays all variable expansion
 until after the Builder object is actually called.
 </para>
@@ -587,14 +600,15 @@ until after the Builder object is actually called.
     <term>
       <literal>env.CacheDir(cache_dir)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies that
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will maintain a cache of derived files in
 <varname>cache_dir</varname>.
 The derived files in the cache will be shared
 among all the builds using the same
-<function>CacheDir</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">CacheDir</function>
 call.
 Specifying a
 <varname>cache_dir</varname>
@@ -603,13 +617,13 @@ of
 disables derived file caching.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Calling
 <function>env.CacheDir</function>()
 will only affect targets built
 through the specified construction environment.
 Calling
-<function>CacheDir</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">CacheDir</function>
 sets a global default
 that will be used by all targets built
 through construction environments
@@ -620,21 +634,21 @@ have an
 specified.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When a
 <function>CacheDir</function>()
 is being used and
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 finds a derived file that needs to be rebuilt,
 it will first look in the cache to see if a
 derived file has already been built
 from identical input files and an identical build action
 (as incorporated into the MD5 build signature).
 If so,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will retrieve the file from the cache.
 If the derived file is not present in the cache,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will rebuild it and
 then place a copy of the built file in the cache
 (identified by its MD5 build signature),
@@ -643,20 +657,20 @@ builds that need to build the same derived file
 from identical inputs.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Use of a specified
-<function>CacheDir</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">CacheDir</function>
 may be disabled for any invocation
 by using the
 <option>--cache-disable</option>
 option.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the
 <option>--cache-force</option>
 option is used,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will place a copy of
 <emphasis>all</emphasis>
 derived files in the cache,
@@ -664,17 +678,17 @@ even if they already existed
 and were not built by this invocation.
 This is useful to populate a cache
 the first time
-<function>CacheDir</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">CacheDir</function>
 is added to a build,
 or after using the
 <option>--cache-disable</option>
 option.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When using
-<function>CacheDir</function>,
-<filename>scons</filename>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">CacheDir</function>,
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will report,
 "Retrieved `file' from cache,"
 unless the
@@ -683,7 +697,7 @@ option is being used.
 When the
 <option>--cache-show</option>
 option is used,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will print the action that
 <emphasis>would</emphasis>
 have been used to build the file,
@@ -695,9 +709,9 @@ a given derived file has been built in-place
 or retrieved from the cache.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
-<link linkend="f-NoCache"><function>NoCache</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-NoCache"><function>NoCache</function></link>
 method can be used to disable caching of specific files.  This can be
 useful if inputs and/or outputs of some tool are impossible to
 predict or prohibitively large.
@@ -711,7 +725,8 @@ predict or prohibitively large.
     <term>
       <literal>env.Clean(targets, files_or_dirs)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This specifies a list of files or directories which should be removed
 whenever the targets are specified with the
 <option>-c</option>
@@ -719,28 +734,28 @@ command line option.
 The specified targets may be a list
 or an individual target.
 Multiple calls to
-<function>Clean</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Clean</function>
 are legal,
 and create new targets or add files and directories to the
 clean list for the specified targets.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Multiple files or directories should be specified
 either as separate arguments to the
-<function>Clean</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Clean</function>
 method, or as a list.
-<function>Clean</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Clean</function>
 will also accept the return value of any of the construction environment
 Builder methods.
 Examples:
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The related
-<link linkend="f-NoClean"><function>NoClean</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-NoClean"><function>NoClean</function></link>
 function overrides calling
-<function>Clean</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Clean</function>
 for the same target,
 and any targets passed to both functions will
 <emphasis>not</emphasis>
@@ -749,23 +764,23 @@ be removed by the
 option.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Clean('foo', ['bar', 'baz'])
 Clean('dist', env.Program('hello', 'hello.c'))
 Clean(['foo', 'bar'], 'something_else_to_clean')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 In this example,
 installing the project creates a subdirectory for the documentation.
 This statement causes the subdirectory to be removed
 if the project is deinstalled.
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Clean(docdir, os.path.join(docdir, projectname))
 </example_commands>
 </listitem>
@@ -774,7 +789,8 @@ Clean(docdir, os.path.join(docdir, projectname))
     <term>
       <literal>env.Clone([key=val, ...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns a separate copy of a construction environment.
 If there are any keyword arguments specified,
 they are added to the returned copy,
@@ -782,32 +798,32 @@ overwriting any existing values
 for the keywords.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env2 = env.Clone()
 env3 = env.Clone(CCFLAGS = '-g')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Additionally, a list of tools and a toolpath may be specified, as in
 the Environment constructor:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 def MyTool(env): env['FOO'] = 'bar'
 env4 = env.Clone(tools = ['msvc', MyTool])
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
 <varname>parse_flags</varname>
 keyword argument is also recognized:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # create an environment for compiling programs that use wxWidgets
 wx_env = env.Clone(parse_flags = '!wx-config --cflags --cxxflags')
 </example_commands>
@@ -820,7 +836,8 @@ wx_env = env.Clone(parse_flags = '!wx-config --cflags --cxxflags')
     <term>
       <literal>env.Command(target, source, action, [key=val, ...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Executes a specific action
 (or list of actions)
 to build a target file or files.
@@ -829,7 +846,7 @@ than defining a separate Builder object
 for a single special-case build.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 As a special case, the
 <varname>source_scanner</varname>
 keyword argument can
@@ -845,12 +862,12 @@ changes to files that aren't
 already specified in other Builder of function calls.)
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Any other keyword arguments specified override any
 same-named existing construction variables.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An action can be an external command,
 specified as a string,
 or a callable Python object;
@@ -867,11 +884,11 @@ or by a
 to ignore the exit status of the external command.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Command('foo.out', 'foo.in',
             "$FOO_BUILD &lt; $SOURCES &gt; $TARGET")
 
@@ -889,9 +906,9 @@ env.Command('baz.out', 'baz.in',
 	     rename ])
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that the
-<function>Command</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Command</function>
 function will usually assume, by default,
 that the specified targets and/or sources are Files,
 if no other part of the configuration
@@ -900,24 +917,24 @@ If necessary, you can explicitly specify
 that targets or source nodes should
 be treated as directoriese
 by using the
-<link linkend="f-Dir"><function>Dir</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Dir"><function>Dir</function></link>
 or
 <function>env.Dir</function>()
 functions.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Command('ddd.list', Dir('ddd'), 'ls -l $SOURCE &gt; $TARGET')
 
 env['DISTDIR'] = 'destination/directory'
 env.Command(env.Dir('$DISTDIR')), None, make_distdir)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 (Also note that SCons will usually
 automatically create any directory necessary to hold a target file,
 so you normally don't need to create directories by hand.)
@@ -931,7 +948,8 @@ so you normally don't need to create directories by hand.)
     <term>
       <literal>env.Configure([custom_tests, conf_dir, log_file, config_h])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Creates a Configure object for integrated
 functionality similar to GNU autoconf.
 See the section "Configure Contexts,"
@@ -943,7 +961,8 @@ below, for a complete explanation of the arguments and behavior.
     <term>
       <literal>env.Copy([key=val, ...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A now-deprecated synonym for
 <function>env.Clone</function>().
 </para>
@@ -956,7 +975,8 @@ A now-deprecated synonym for
     <term>
       <literal>env.Decider(function)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies that all up-to-date decisions for
 targets built through this construction environment
 will be handled by the specified
@@ -968,7 +988,7 @@ that specify the type of decision function
 to be performed:
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <variablelist>
 <varlistentry>
 <term><literal>timestamp-newer</literal></term>
@@ -1051,11 +1071,11 @@ all within a single second.
 </variablelist>
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Use exact timestamp matches by default.
 Decider('timestamp-match')
 
@@ -1064,7 +1084,7 @@ Decider('timestamp-match')
 env.Decider('content')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 In addition to the above already-available functions,
 the
 <varname>function</varname>
@@ -1072,7 +1092,7 @@ argument may be an actual Python function
 that takes the following three arguments:
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <variablelist>
 <varlistentry>
 <term><parameter>dependency</parameter></term>
@@ -1120,7 +1140,7 @@ size, or content signature.
 </variablelist>
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
 <varname>function</varname>
 should return a
@@ -1148,11 +1168,11 @@ Ignoring some or all of the function arguments
 is perfectly normal.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 def my_decider(dependency, target, prev_ni):
     return not os.path.exists(str(target))
 
@@ -1167,54 +1187,55 @@ env.Decider(my_decider)
     <term>
       <literal>env.Default(targets)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This specifies a list of default targets,
 which will be built by
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 if no explicit targets are given on the command line.
 Multiple calls to
-<function>Default</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Default</function>
 are legal,
 and add to the list of default targets.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Multiple targets should be specified as
 separate arguments to the
-<function>Default</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Default</function>
 method, or as a list.
-<function>Default</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Default</function>
 will also accept the Node returned by any
 of a construction environment's
 builder methods.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Default('foo', 'bar', 'baz')
 env.Default(['a', 'b', 'c'])
 hello = env.Program('hello', 'hello.c')
 env.Default(hello)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An argument to
-<function>Default</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Default</function>
 of
 <literal>None</literal>
 will clear all default targets.
 Later calls to
-<function>Default</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Default</function>
 will add to the (now empty) default-target list
 like normal.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The current list of targets added using the
-<function>Default</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Default</function>
 function or method is available in the
 <literal>DEFAULT_TARGETS</literal>
 list;
@@ -1226,7 +1247,8 @@ see below.
     <term>
       <literal>DefaultEnvironment([args])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Creates and returns a default construction environment object.
 This construction environment is used internally by SCons
 in order to execute many of the global functions in this list,
@@ -1242,7 +1264,8 @@ from source code management systems.
     <term>
       <literal>env.Depends(target, dependency)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies an explicit dependency;
 the
 <varname>target</varname>
@@ -1265,11 +1288,11 @@ is not caught by a Scanner
 for the file.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Depends('foo', 'other-input-file-for-foo')
 
 mylib = env.Library('mylib.c')
@@ -1290,7 +1313,8 @@ env.Depends(bar, installed_lib)
     <term>
       <literal>env.Dictionary([vars])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns a dictionary object
 containing copies of all of the
 construction variables in the environment.
@@ -1299,11 +1323,11 @@ only the specified construction
 variables are returned in the dictionary.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 dict = env.Dictionary()
 cc_dict = env.Dictionary('CC', 'CCFLAGS', 'CCCOM')
 </example_commands>
@@ -1316,7 +1340,8 @@ cc_dict = env.Dictionary('CC', 'CCFLAGS', 'CCCOM')
     <term>
       <literal>env.Dir(name, [directory])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This returns a Directory Node,
 an object that represents the specified directory
 <varname>name</varname>.
@@ -1329,7 +1354,7 @@ If no
 is specified, the current script's directory is used as the parent.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If
 <varname>name</varname>
 is a list, SCons returns a list of Dir nodes.
@@ -1337,7 +1362,7 @@ Construction variables are expanded in
 <varname>name</varname>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Directory Nodes can be used anywhere you
 would supply a string as a directory name
 to a Builder method or function.
@@ -1351,7 +1376,8 @@ see "File and Directory Nodes," below.
     <term>
       <literal>env.Dump([key])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns a pretty printable representation of the environment.
 <varname>key</varname>,
 if not
@@ -1359,36 +1385,36 @@ if not
 should be a string containing the name of the variable of interest.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This SConstruct:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env=Environment()
 print env.Dump('CCCOM')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 will print:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 '$CC -c -o $TARGET $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $SOURCES'
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 While this SConstruct:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env=Environment()
 print env.Dump()
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 will print:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 { 'AR': 'ar',
   'ARCOM': '$AR $ARFLAGS $TARGET $SOURCES\n$RANLIB $RANLIBFLAGS $TARGET',
   'ARFLAGS': ['r'],
@@ -1406,7 +1432,8 @@ will print:
     <term>
       <literal>env.EnsurePythonVersion(major, minor)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Ensure that the Python version is at least
 <varname>major</varname>.<varname>minor</varname>.
 This function will
@@ -1414,11 +1441,11 @@ print out an error message and exit SCons with a non-zero exit code if the
 actual Python version is not late enough.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 EnsurePythonVersion(2,2)
 </example_commands>
 </listitem>
@@ -1430,7 +1457,8 @@ EnsurePythonVersion(2,2)
     <term>
       <literal>env.EnsureSConsVersion(major, minor, [revision])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Ensure that the SCons version is at least
 <varname>major.minor</varname>,
 or
@@ -1443,11 +1471,11 @@ print out an error message and exit SCons with a non-zero exit code if the
 actual SCons version is not late enough.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 EnsureSConsVersion(0,14)
 
 EnsureSConsVersion(0,96,90)
@@ -1461,7 +1489,8 @@ EnsureSConsVersion(0,96,90)
     <term>
       <literal>env.Environment([key=value, ...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Return a new construction environment
 initialized with the specified
 <varname>key</varname><literal>=</literal><varname>value</varname>
@@ -1476,7 +1505,8 @@ pairs.
     <term>
       <literal>env.Execute(action, [strfunction, varlist])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Executes an Action object.
 The specified
 <varname>action</varname>
@@ -1494,14 +1524,14 @@ or return value of the Python function
 will be returned.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will print an error message if the executed
 <varname>action</varname>
 fails--that is,
 exits with or returns a non-zero value.
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will
 <emphasis>not</emphasis>,
 however,
@@ -1510,12 +1540,12 @@ if the specified
 <varname>action</varname>
 fails.
 If you want the build to stop in response to a failed
-<function>Execute</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Execute</function>
 call,
 you must explicitly check for a non-zero return value:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Execute(Copy('file.out', 'file.in'))
 
 if Execute("mkdir sub/dir/ectory"):
@@ -1531,9 +1561,10 @@ if Execute("mkdir sub/dir/ectory"):
     <term>
       <literal>env.Exit([value])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This tells
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to exit immediately
 with the specified
 <varname>value</varname>.
@@ -1551,28 +1582,29 @@ is used if no value is specified.
     <term>
       <literal>env.Export(vars)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This tells
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to export a list of variables from the current
 SConscript file to all other SConscript files.
 The exported variables are kept in a global collection,
 so subsequent calls to
-<function>Export</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Export</function>
 will over-write previous exports that have the same name.
 Multiple variable names can be passed to
-<function>Export</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Export</function>
 as separate arguments or as a list.
 Keyword arguments can be used to provide names and their values.
 A dictionary can be used to map variables to a different name when exported.
 Both local variables and global variables can be exported.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment()
 # Make env available for all SConscript files to Import().
 Export("env")
@@ -1591,15 +1623,15 @@ Export(debug = env)
 Export({"debug":env})
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that the
-<function>SConscript</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</function>
 function supports an
 <varname>exports</varname>
 argument that makes it easier to to export a variable or
 set of variables to a single SConscript file.
 See the description of the
-<function>SConscript</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</function>
 function, below.
 </para>
 </listitem>
@@ -1611,7 +1643,8 @@ function, below.
     <term>
       <literal>env.File(name, [directory])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This returns a
 File Node,
 an object that represents the specified file
@@ -1622,7 +1655,7 @@ can be a relative or absolute path.
 is an optional directory that will be used as the parent directory.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If
 <varname>name</varname>
 is a list, SCons returns a list of File nodes.
@@ -1630,7 +1663,7 @@ Construction variables are expanded in
 <varname>name</varname>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 File Nodes can be used anywhere you
 would supply a string as a file name
 to a Builder method or function.
@@ -1647,7 +1680,8 @@ see "File and Directory Nodes," below.
     <term>
       <literal>env.FindFile(file, dirs)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Search for
 <varname>file</varname>
 in the path specified by
@@ -1659,11 +1693,11 @@ this function also searches for derived files
 that have not yet been built.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 foo = env.FindFile('foo', ['dir1', 'dir2'])
 </example_commands>
 </listitem>
@@ -1675,24 +1709,25 @@ foo = env.FindFile('foo', ['dir1', 'dir2'])
     <term>
       <literal>env.FindInstalledFiles()</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns the list of targets set up by the
-<link linkend="b-Install"><function>Install</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-Install"><function>Install</function></link>
 or
-<link linkend="b-InstallAs"><function>InstallAs</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-InstallAs"><function>InstallAs</function></link>
 builders.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This function serves as a convenient method to select the contents of
 a binary package.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Install( '/bin', [ 'executable_a', 'executable_b' ] )
 
 # will return the file node list
@@ -1711,7 +1746,8 @@ FindInstalledFiles()
     <term>
       <literal>FindPathDirs(variable)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns a function
 (actually a callable Python object)
 intended to be used as the
@@ -1723,14 +1759,14 @@ in a construction environment
 and treat the construction variable's value as a list of
 directory paths that should be searched
 (like
-<link linkend="cv-CPPPATH"><envar>$CPPPATH</envar></link>,
-<link linkend="cv-LIBPATH"><envar>$LIBPATH</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPPATH"><envar>$CPPPATH</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBPATH"><envar>$LIBPATH</envar></link>,
 etc.).
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that use of
-<function>FindPathDirs</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">FindPathDirs</function>
 is generally preferable to
 writing your own
 <varname>path_function</varname>
@@ -1738,11 +1774,11 @@ for the following reasons:
 1) The returned list will contain all appropriate directories
 found in source trees
 (when
-<link linkend="f-VariantDir"><function>VariantDir</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-VariantDir"><function>VariantDir</function></link>
 is used)
 or in code repositories
 (when
-<function>Repository</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Repository</function>
 or the
 <option>-Y</option>
 option are used).
@@ -1754,11 +1790,11 @@ and avoid re-scanning the directories for files,
 when possible.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 def my_scan(node, env, path, arg):
     # Code to scan file contents goes here...
     return include_files
@@ -1776,7 +1812,8 @@ scanner = Scanner(name = 'myscanner',
     <term>
       <literal>env.FindSourceFiles(node='"."')</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns the list of nodes which serve as the source of the built files.
 It does so by inspecting the dependency tree starting at the optional
 argument
@@ -1786,16 +1823,16 @@ which defaults to the '"."'-node. It will then return all leaves of
 These are all children which have no further children.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This function is a convenient method to select the contents of a Source
 Package.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Program( 'src/main_a.c' )
 Program( 'src/main_b.c' )
 Program( 'main_c.c' )
@@ -1807,7 +1844,7 @@ FindSourceFiles()
 FindSourceFiles( 'src' )
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 As you can see build support files (SConstruct in the above example)
 will also be returned by this function.
 </para>
@@ -1820,7 +1857,8 @@ will also be returned by this function.
     <term>
       <literal>env.Flatten(sequence)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Takes a sequence (that is, a Python list or tuple)
 that may contain nested sequences
 and returns a flattened list containing
@@ -1833,11 +1871,11 @@ but direct Python manipulation of
 these lists does not.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 foo = Object('foo.c')
 bar = Object('bar.c')
 
@@ -1860,7 +1898,8 @@ for object in Flatten(objects):
     <term>
       <literal>GetBuildFailures()</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns a list of exceptions for the
 actions that failed while
 attempting to build targets.
@@ -1872,13 +1911,13 @@ that record various aspects
 of the build failure:
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>.node</literal>
 The node that was being built
 when the build failure occurred.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>.status</literal>
 The numeric exit status
 returned by the command or Python function
@@ -1886,7 +1925,7 @@ that failed when trying to build the
 specified Node.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>.errstr</literal>
 The SCons error string
 describing the build failure.
@@ -1896,7 +1935,7 @@ to indicate that an executed
 command exited with a status of 2.)
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>.filename</literal>
 The name of the file or
 directory that actually caused the failure.
@@ -1919,7 +1958,7 @@ attribute will be
 <filename>sub/dir</filename>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>.executor</literal>
 The SCons Executor object
 for the target Node
@@ -1929,7 +1968,7 @@ the construction environment used
 for the failed action.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>.action</literal>
 The actual SCons Action object that failed.
 This will be one specific action
@@ -1938,26 +1977,26 @@ actions that would have been
 executed to build the target.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>.command</literal>
 The actual expanded command that was executed and failed,
 after expansion of
-<link linkend="cv-TARGET"><envar>$TARGET</envar></link>,
-<link linkend="cv-SOURCE"><envar>$SOURCE</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-TARGET"><envar>$TARGET</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SOURCE"><envar>$SOURCE</envar></link>,
 and other construction variables.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that the
-<function>GetBuildFailures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">GetBuildFailures</function>
 function
 will always return an empty list
 until any build failure has occurred,
 which means that
-<function>GetBuildFailures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">GetBuildFailures</function>
 will always return an empty list
 while the
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 files are being read.
 Its primary intended use is
 for functions that will be
@@ -1969,7 +2008,7 @@ function.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 import atexit
 
 def print_build_failures():
@@ -1988,9 +2027,10 @@ atexit.register(print_build_failures)
     <term>
       <literal>env.GetBuildPath(file, [...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns the
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 path name (or names) for the specified
 <varname>file</varname>
 (or files).
@@ -1998,7 +2038,7 @@ The specified
 <varname>file</varname>
 or files
 may be
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 Nodes or strings representing path names.
 </para>
 </listitem>
@@ -2010,9 +2050,10 @@ Nodes or strings representing path names.
     <term>
       <literal>env.GetLaunchDir()</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns the absolute path name of the directory from which
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 was initially invoked.
 This can be useful when using the
 <option>-u</option>,
@@ -2021,7 +2062,7 @@ or
 <option>-D</option>
 options, which internally
 change to the directory in which the
-<filename>SConstruct</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename>
 file is found.
 </para>
 </listitem>
@@ -2033,16 +2074,17 @@ file is found.
     <term>
       <literal>env.GetOption(name)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This function provides a way to query the value of
 SCons options set on scons command line
 (or set using the
-<link linkend="f-SetOption"><function>SetOption</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-SetOption"><function>SetOption</function></link>
 function).
 The options supported are:
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <variablelist>
 <varlistentry>
 <term><literal>cache_debug</literal></term>
@@ -2287,7 +2329,7 @@ which corresponds to --warn and --warning.
 </variablelist>
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 See the documentation for the
 corresponding command line object for information about each specific
 option.
@@ -2301,11 +2343,12 @@ option.
     <term>
       <literal>env.Glob(pattern, [ondisk, source, strings, exclude])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns Nodes (or strings) that match the specified
 <varname>pattern</varname>,
 relative to the directory of the current
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 file.
 The
 <function>env.Glob</function>()
@@ -2315,20 +2358,20 @@ and returns whatever matches
 the resulting expanded pattern.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The specified
 <varname>pattern</varname>
 uses Unix shell style metacharacters for matching:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   *       matches everything
   ?       matches any single character
   [seq]   matches any character in seq
   [!seq]  matches any char not in seq
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the first character of a filename is a dot,
 it must be matched explicitly.
 Character matches do
@@ -2336,17 +2379,17 @@ Character matches do
 span directory separators.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
-<function>Glob</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Glob</function>
 knows about
 repositories
 (see the
-<link linkend="f-Repository"><function>Repository</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Repository"><function>Repository</function></link>
 function)
 and source directories
 (see the
-<link linkend="f-VariantDir"><function>VariantDir</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-VariantDir"><function>VariantDir</function></link>
 function)
 and
 returns a Node (or string, if so configured)
@@ -2356,7 +2399,7 @@ anywhere in a corresponding
 repository or source directory.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
 <varname>ondisk</varname>
 argument may be set to
@@ -2370,7 +2413,7 @@ return corresponding Nodes
 for any on-disk matches found.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
 <varname>source</varname>
 argument may be set to
@@ -2378,20 +2421,20 @@ argument may be set to
 (or any equivalent value)
 to specify that,
 when the local directory is a
-<function>VariantDir</function>,
+<function xmlns="http://www.scons.org/dbxsd/v1.0">VariantDir</function>,
 the returned Nodes should be from the
 corresponding source directory,
 not the local directory.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
 <varname>strings</varname>
 argument may be set to
 <literal>True</literal>
 (or any equivalent value)
 to have the
-<function>Glob</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Glob</function>
 function return strings, not Nodes,
 that represent the matched files or directories.
 The returned strings will be relative to
@@ -2400,18 +2443,18 @@ the local (SConscript) directory.
 arbitrary manipulation of file names,
 but if the returned strings are
 passed to a different
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 file,
 any Node translation will be relative
 to the other
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 directory,
 not the original
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 directory.)
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
 <varname>exclude</varname>
 argument may be set to a pattern or a list of patterns
@@ -2421,11 +2464,11 @@ Elements matching a least one pattern of
 this list will be excluded.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Program('foo', Glob('*.c'))
 Zip('/tmp/everything', Glob('.??*') + Glob('*'))
 sources = Glob('*.cpp', exclude=['os_*_specific_*.cpp']) + Glob('os_%s_specific_*.cpp'%currentOS)
@@ -2439,19 +2482,20 @@ sources = Glob('*.cpp', exclude=['os_*_specific_*.cpp']) + Glob('os_%s_specific_
     <term>
       <literal>env.Help(text, append=False)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This specifies help text to be printed if the
 <option>-h</option>
 argument is given to
-<filename>scons</filename>.
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>.
 If 
-<function>Help</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Help</function>
 is called multiple times, the text is appended together in the order that 
-<function>Help</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Help</function>
 is called. With append set to False, any 
-<function>Help</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Help</function>
 text generated with 
-<function>AddOption</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">AddOption</function>
 is clobbered. If append is True, the AddOption help is prepended to the help
 string, thus preserving the 
 <option>-h</option>
@@ -2466,33 +2510,34 @@ message.
     <term>
       <literal>env.Ignore(target, dependency)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The specified dependency file(s)
 will be ignored when deciding if
 the target file(s) need to be rebuilt.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 You can also use
-<function>Ignore</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Ignore</function>
 to remove a target from the default build.
 In order to do this you must specify the directory the target will
 be built in as the target, and the file you want to skip building
 as the dependency.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that this will only remove the dependencies listed from 
 the files built by default.  It will still be built if that 
 dependency is needed by another object being built. 
 See the third and forth examples below.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Ignore('foo', 'foo.c')
 env.Ignore('bar', ['bar1.h', 'bar2.h'])
 env.Ignore('.','foobar.obj')
@@ -2507,30 +2552,31 @@ env.Ignore('bar','bar/foobar.obj')
     <term>
       <literal>env.Import(vars)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This tells
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to import a list of variables into the current SConscript file. This
 will import variables that were exported with
-<function>Export</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Export</function>
 or in the
 <varname>exports</varname>
 argument to
-<link linkend="f-SConscript"><function>SConscript</function></link>.
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-SConscript"><function>SConscript</function></link>.
 Variables exported by
-<function>SConscript</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</function>
 have precedence.
 Multiple variable names can be passed to
-<function>Import</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Import</function>
 as separate arguments or as a list. The variable "*" can be used
 to import all variables.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Import("env")
 Import("env", "variable")
 Import(["env", "variable"])
@@ -2545,7 +2591,8 @@ Import("*")
     <term>
       <literal>env.Literal(string)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The specified
 <varname>string</varname>
 will be preserved as-is
@@ -2560,7 +2607,8 @@ and not have construction variables expanded.
     <term>
       <literal>env.Local(targets)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The specified
 <varname>targets</varname>
 will have copies made in the local tree,
@@ -2574,7 +2622,8 @@ Returns a list of the target Node or Nodes.
     <term>
       <literal>env.MergeFlags(arg, [unique])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Merges the specified
 <varname>arg</varname>
 values to the construction environment's construction variables.
@@ -2582,7 +2631,7 @@ If the
 <varname>arg</varname>
 argument is not a dictionary,
 it is converted to one by calling
-<link linkend="f-ParseFlags"><function>env.ParseFlags</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-ParseFlags"><function>env.ParseFlags</function></link>
 on the argument
 before the values are merged.
 Note that
@@ -2591,10 +2640,10 @@ must be a single value,
 so multiple strings must
 be passed in as a list,
 not as separate arguments to
-<function>env.MergeFlags</function>.
+<function xmlns="http://www.scons.org/dbxsd/v1.0">env.MergeFlags</function>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 By default,
 duplicate values are eliminated;
 you can, however, specify
@@ -2610,11 +2659,11 @@ All other construction variables keep
 the right-most unique value.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Add an optimization flag to $CCFLAGS.
 env.MergeFlags('-O3')
 
@@ -2637,38 +2686,39 @@ env.MergeFlags(['-O3',
     <term>
       <literal>env.NoCache(target, ...)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies a list of files which should
 <emphasis>not</emphasis>
 be cached whenever the
-<link linkend="f-CacheDir"><function>CacheDir</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-CacheDir"><function>CacheDir</function></link>
 method has been activated.
 The specified targets may be a list
 or an individual target.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Multiple files should be specified
 either as separate arguments to the
-<function>NoCache</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">NoCache</function>
 method, or as a list.
-<function>NoCache</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">NoCache</function>
 will also accept the return value of any of the construction environment
 Builder methods.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Calling
-<function>NoCache</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">NoCache</function>
 on directories and other non-File Node types has no effect because
 only File Nodes are cached.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 NoCache('foo.elf')
 NoCache(env.Program('hello', 'hello.c'))
 </example_commands>
@@ -2681,7 +2731,8 @@ NoCache(env.Program('hello', 'hello.c'))
     <term>
       <literal>env.NoClean(target, ...)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies a list of files or directories which should
 <emphasis>not</emphasis>
 be removed whenever the targets (or their dependencies)
@@ -2691,7 +2742,7 @@ command line option.
 The specified targets may be a list
 or an individual target.
 Multiple calls to
-<function>NoClean</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">NoClean</function>
 are legal,
 and prevent each specified target
 from being removed by calls to the
@@ -2699,21 +2750,21 @@ from being removed by calls to the
 option.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Multiple files or directories should be specified
 either as separate arguments to the
-<function>NoClean</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">NoClean</function>
 method, or as a list.
-<function>NoClean</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">NoClean</function>
 will also accept the return value of any of the construction environment
 Builder methods.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Calling
-<function>NoClean</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">NoClean</function>
 for a target overrides calling
-<link linkend="f-Clean"><function>Clean</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Clean"><function>Clean</function></link>
 for the same target,
 and any targets passed to both functions will
 <emphasis>not</emphasis>
@@ -2722,11 +2773,11 @@ be removed by the
 option.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 NoClean('foo.elf')
 NoClean(env.Program('hello', 'hello.c'))
 </example_commands>
@@ -2736,7 +2787,8 @@ NoClean(env.Program('hello', 'hello.c'))
     <term>
       <literal>env.ParseConfig(command, [function, unique])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Calls the specified
 <varname>function</varname>
 to modify the environment as specified by the output of
@@ -2744,7 +2796,7 @@ to modify the environment as specified by the output of
 The default
 <varname>function</varname>
 is
-<link linkend="f-MergeFlags"><function>env.MergeFlags</function></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-MergeFlags"><function>env.MergeFlags</function></link>,
 which expects the output of a typical
 <application>*-config</application>
 command
@@ -2761,11 +2813,11 @@ to allow duplicate
 values to be added.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Interpreted options
 and the construction variables they affect
 are as specified for the
-<link linkend="f-ParseFlags"><function>env.ParseFlags</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-ParseFlags"><function>env.ParseFlags</function></link>
 method (which this method calls).
 See that method's description, below,
 for a table of options and construction variables.
@@ -2779,17 +2831,18 @@ for a table of options and construction variables.
     <term>
       <literal>env.ParseDepends(filename, [must_exist, only_one])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Parses the contents of the specified
 <varname>filename</varname>
 as a list of dependencies in the style of
-<application>Make</application>
+<application xmlns="http://www.scons.org/dbxsd/v1.0">Make</application>
 or
 <application>mkdep</application>,
 and explicitly establishes all of the listed dependencies.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 By default,
 it is not an error
 if the specified
@@ -2805,7 +2858,7 @@ generate an error if the file does not exist,
 or is otherwise inaccessible.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The optional
 <varname>only_one</varname>
 argument may be set to a non-zero
@@ -2827,15 +2880,15 @@ one output file into a corresponding
 file.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
 <varname>filename</varname>
 and all of the files listed therein
 will be interpreted relative to
 the directory of the
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 file which calls the
-<function>ParseDepends</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">ParseDepends</function>
 function.
 </para>
 </listitem>
@@ -2844,25 +2897,26 @@ function.
     <term>
       <literal>env.ParseFlags(flags, ...)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Parses one or more strings containing
 typical command-line flags for GCC tool chains
 and returns a dictionary with the flag values
 separated into the appropriate SCons construction variables.
 This is intended as a companion to the
-<link linkend="f-MergeFlags"><function>env.MergeFlags</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-MergeFlags"><function>env.MergeFlags</function></link>
 method, but allows for the values in the returned dictionary
 to be modified, if necessary,
 before merging them into the construction environment.
 (Note that
-<function>env.MergeFlags</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">env.MergeFlags</function>
 will call this method if its argument is not a dictionary,
 so it is usually not necessary to call
-<link linkend="f-ParseFlags"><function>env.ParseFlags</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-ParseFlags"><function>env.ParseFlags</function></link>
 directly unless you want to manipulate the values.)
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the first character in any string is
 an exclamation mark (!),
 the rest of the string is executed as a command,
@@ -2871,12 +2925,12 @@ parsed as GCC tool chain command-line flags
 and added to the resulting dictionary.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Flag values are translated accordig to the prefix found,
 and added to the following construction variables:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 -arch               CCFLAGS, LINKFLAGS
 -D                  CPPDEFINES
 -framework          FRAMEWORKS
@@ -2900,19 +2954,19 @@ and added to the following construction variables:
 +                   CCFLAGS, LINKFLAGS
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Any other strings not associated with options
 are assumed to be the names of libraries
 and added to the
-<envar>$LIBS</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBS</envar>
 construction variable.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples (all of which produce the same result):
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 dict = env.ParseFlags('-O2 -Dfoo -Dbar=1')
 dict = env.ParseFlags('-O2', '-Dfoo', '-Dbar=1')
 dict = env.ParseFlags(['-O2', '-Dfoo -Dbar=1'])
@@ -2924,38 +2978,39 @@ dict = env.ParseFlags('-O2', '!echo -Dfoo -Dbar=1')
     <term>
       <literal>Platform(string)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
-<function>Platform</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Platform</function>
 form returns a callable object
 that can be used to initialize
 a construction environment using the
 platform keyword of the
-<function>Environment</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Environment</function>
 function.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(platform = Platform('win32'))
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
-<function>env.Platform</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">env.Platform</function>
 form applies the callable object for the specified platform
 <varname>string</varname>
 to the environment through which the method was called.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Platform('posix')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that the
 <literal>win32</literal>
 platform adds the
@@ -2964,7 +3019,7 @@ and
 <literal>SystemRoot</literal>
 variables from the user's external environment
 to the construction environment's
-<link linkend="cv-ENV"><envar>$ENV</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-ENV"><envar>$ENV</envar></link>
 dictionary.
 This is so that any executed commands
 that use sockets to connect with other systems
@@ -2982,14 +3037,15 @@ will work on Windows systems.
     <term>
       <literal>env.Precious(target, ...)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Marks each given
 <varname>target</varname>
 as precious so it is not deleted before it is rebuilt. Normally
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 deletes a target before building it.
 Multiple targets can be passed in to a single call to
-<function>Precious</function>.
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Precious</function>.
 </para>
 </listitem>
   </varlistentry>
@@ -2997,7 +3053,8 @@ Multiple targets can be passed in to a single call to
     <term>
       <literal>env.Prepend(key=val, [...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Appends the specified keyword arguments
 to the beginning of construction variables in the environment.
 If the Environment does not have
@@ -3013,11 +3070,11 @@ and the lists are added together.
 (See also the Append method, above.)
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Prepend(CCFLAGS = '-g ', FOO = ['foo.yyy'])
 </example_commands>
 </listitem>
@@ -3026,10 +3083,11 @@ env.Prepend(CCFLAGS = '-g ', FOO = ['foo.yyy'])
     <term>
       <literal>env.PrependENVPath(name, newpath, [envname, sep, delete_existing])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This appends new path elements to the given path in the
 specified external environment
-(<envar>$ENV</envar>
+(<envar xmlns="http://www.scons.org/dbxsd/v1.0">$ENV</envar>
 by default).
 This will only add
 any particular path once (leaving the first one it encounters and
@@ -3044,7 +3102,7 @@ case where the given old path variable is a list instead of a
 string, in which case a list will be returned instead of a string.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If
 <varname>delete_existing</varname>
 is 0, then adding a path that already exists
@@ -3052,22 +3110,22 @@ will not move it to the beginning;
 it will stay where it is in the list.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 print 'before:',env['ENV']['INCLUDE']
 include_path = '/foo/bar:/foo'
 env.PrependENVPath('INCLUDE', include_path)
 print 'after:',env['ENV']['INCLUDE']
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The above example will print:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 before: /biz:/foo
 after: /foo/bar:/foo:/biz
 </example_commands>
@@ -3077,7 +3135,8 @@ after: /foo/bar:/foo:/biz
     <term>
       <literal>env.PrependUnique(key=val, delete_existing=0, [...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Appends the specified keyword arguments
 to the beginning of construction variables in the environment.
 If the Environment does not have
@@ -3093,11 +3152,11 @@ existing matching values are removed first, so
 existing values in the arg list move to the front of the list.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.PrependUnique(CCFLAGS = '-g', FOO = ['foo.yyy'])
 </example_commands>
 </listitem>
@@ -3112,13 +3171,14 @@ env.PrependUnique(CCFLAGS = '-g', FOO = ['foo.yyy'])
     <term>
       <literal>Progress(list_of_strings, [interval, file, overwrite])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Allows SCons to show progress made during the build
 by displaying a string or calling a function while
 evaluating Nodes (e.g. files).
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the first specified argument is a Python callable
 (a function or an object that has a
 <function>__call__</function>()
@@ -3140,19 +3200,19 @@ if SCons ever changes the interface
 to call the function with additional arguments in the future.)
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An example of a simple custom progress function
 that prints a string containing the Node name
 every 10 Nodes:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 def my_progress_function(node, *args, **kw):
     print('Evaluating node %s!' % node)
 Progress(my_progress_function, interval=10)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A more complicated example of a custom progress display object
 that prints a string containing a count
 every 100 evaluated Nodes.
@@ -3163,7 +3223,7 @@ at the end so that the string
 will overwrite itself on a display:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 import sys
 class ProgressCounter(object):
     count = 0
@@ -3173,9 +3233,9 @@ class ProgressCounter(object):
 Progress(ProgressCounter(), interval=100)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the first argument
-<link linkend="f-Progress"><function>Progress</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Progress"><function>Progress</function></link>
 is a string,
 the string will be displayed
 every
@@ -3191,14 +3251,14 @@ on the error output,
 one dot for every 100 evaluated Nodes:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 import sys
 Progress('.', interval=100, file=sys.stderr)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the string contains the verbatim substring
-<envar>$TARGET</envar>,
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$TARGET</envar>,
 it will be replaced with the Node.
 Note that, for performance reasons, this is
 <emphasis>not</emphasis>
@@ -3216,14 +3276,14 @@ keyword argument to make sure the previously-printed
 file name is overwritten with blank spaces:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 import sys
 Progress('$TARGET\r', overwrite=True)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the first argument to
-<function>Progress</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Progress</function>
 is a list of strings,
 then each string in the list will be displayed
 in rotating fashion every
@@ -3233,7 +3293,7 @@ This can be used to implement a "spinner"
 on the user's screen as follows:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Progress(['-\r', '\\\r', '|\r', '/\r'], interval=5)
 </example_commands>
 </listitem>
@@ -3245,17 +3305,18 @@ Progress(['-\r', '\\\r', '|\r', '/\r'], interval=5)
     <term>
       <literal>env.Pseudo(target, ...)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This indicates that each given
 <varname>target</varname>
 should not be created by the build rule, and if the target is created,
 an error will be generated. This is similar to the gnu make .PHONY
 target. However, in the vast majority of cases, an
-<function>Alias</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Alias</function>
 is more appropriate.
 
 Multiple targets can be passed in to a single call to
-<function>Pseudo</function>.
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Pseudo</function>.
 </para>
 </listitem>
   </varlistentry>
@@ -3266,7 +3327,8 @@ Multiple targets can be passed in to a single call to
     <term>
       <literal>env.PyPackageDir(modulename)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This returns a Directory Node similar to Dir.
 The python module / package is looked up and if located
 the directory is returned for the location.
@@ -3274,7 +3336,7 @@ the directory is returned for the location.
 Is a named python package / module to
 lookup the directory for it's location.
 </para>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If
 <varname>modulename</varname>
 is a list, SCons returns a list of Dir nodes.
@@ -3287,16 +3349,17 @@ Construction variables are expanded in
     <term>
       <literal>env.Replace(key=val, [...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Replaces construction variables in the Environment
 with the specified keyword arguments.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Replace(CCFLAGS = '-g', FOO = 'foo.xxx')
 </example_commands>
 </listitem>
@@ -3308,20 +3371,21 @@ env.Replace(CCFLAGS = '-g', FOO = 'foo.xxx')
     <term>
       <literal>env.Repository(directory)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies that
 <varname>directory</varname>
 is a repository to be searched for files.
 Multiple calls to
-<function>Repository</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Repository</function>
 are legal,
 and each one adds to the list of
 repositories that will be searched.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 To
-<filename>scons</filename>,
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>,
 a repository is a copy of the source tree,
 from the top-level directory on down,
 which may contain
@@ -3332,26 +3396,26 @@ The canonical example would be an
 official source tree maintained by an integrator.
 If the repository contains derived files,
 then the derived files should have been built using
-<filename>scons</filename>,
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>,
 so that the repository contains the necessary
 signature information to allow
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to figure out when it is appropriate to
 use the repository copy of a derived file,
 instead of building one locally.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that if an up-to-date derived file
 already exists in a repository,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will
 <emphasis>not</emphasis>
 make a copy in the local directory tree.
 In order to guarantee that a local copy
 will be made,
 use the
-<link linkend="f-Local"><function>Local</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Local"><function>Local</function></link>
 method.
 </para>
 </listitem>
@@ -3363,7 +3427,8 @@ method.
     <term>
       <literal>env.Requires(target, prerequisite)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies an order-only relationship
 between the specified target file(s)
 and the specified prerequisite file(s).
@@ -3377,11 +3442,11 @@ and will not be rebuilt simply because
 the prerequisite file(s) change.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Requires('foo', 'file-that-must-be-built-before-foo')
 </example_commands>
 </listitem>
@@ -3390,7 +3455,8 @@ env.Requires('foo', 'file-that-must-be-built-before-foo')
     <term>
       <literal>Return([vars..., stop=])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 By default,
 this stops processing the current SConscript
 file and returns to the calling SConscript file
@@ -3398,32 +3464,32 @@ the values of the variables named in the
 <varname>vars</varname>
 string arguments.
 Multiple strings contaning variable names may be passed to
-<function>Return</function>.
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Return</function>.
 Any strings that contain white space
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The optional
 <literal>stop=</literal>
 keyword argument may be set to a false value
 to continue processing the rest of the SConscript
 file after the
-<function>Return</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Return</function>
 call.
 This was the default behavior prior to SCons 0.98.
 However, the values returned
 are still the values of the variables in the named
 <varname>vars</varname>
 at the point
-<function>Return</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Return</function>
 is called.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Returns without returning a value.
 Return()
 
@@ -3445,7 +3511,8 @@ Return('val1 val2')
     <term>
       <literal>env.Scanner(function, [argument, keys, path_function, node_class, node_factory, scan_check, recursive])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Creates a Scanner object for
 the specified
 <varname>function</varname>.
@@ -3467,23 +3534,24 @@ below, for a complete explanation of the arguments and behavior.
     <term>
       <literal>env.SConscript(dirs=subdirs, [name=script, exports, variant_dir, duplicate, must_exist])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This tells
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to execute
 one or more subsidiary SConscript (configuration) files.
 Any variables returned by a called script using
-<link linkend="f-Return"><function>Return</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Return"><function>Return</function></link>
 will be returned by the call to
-<function>SConscript</function>.
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</function>.
 There are two ways to call the
-<function>SConscript</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</function>
 function.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The first way you can call
-<function>SConscript</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</function>
 is to explicitly specify one or more
 <varname>scripts</varname>
 as the first argument.
@@ -3491,45 +3559,45 @@ A single script may be specified as a string;
 multiple scripts must be specified as a list
 (either explicitly or as created by
 a function like
-<function>Split</function>).
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Split</function>).
 Examples:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 SConscript('SConscript')      # run SConscript in the current directory
 SConscript('src/SConscript')  # run SConscript in the src directory
 SConscript(['src/SConscript', 'doc/SConscript'])
 config = SConscript('MyConfig.py')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The second way you can call
-<function>SConscript</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</function>
 is to specify a list of (sub)directory names
 as a
 <literal>dirs=</literal><varname>subdirs</varname>
 keyword argument.
 In this case,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will, by default,
 execute a subsidiary configuration file named
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 in each of the specified directories.
 You may specify a name other than
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 by supplying an optional
 <literal>name=</literal><varname>script</varname>
 keyword argument.
 The first three examples below have the same effect
 as the first three examples above:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 SConscript(dirs='.')      # run SConscript in the current directory
 SConscript(dirs='src')    # run SConscript in the src directory
 SConscript(dirs=['src', 'doc'])
 SConscript(dirs=['sub1', 'sub2'], name='MySConscript')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The optional
 <varname>exports</varname>
 argument provides a list of variable names or a dictionary of
@@ -3538,28 +3606,28 @@ named values to export to the
 These variables are locally exported only to the specified
 <varname>script(s)</varname>,
 and do not affect the global pool of variables used by the
-<function>Export</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Export</function>
 function.
 <!-- If multiple dirs are provided, each script gets a fresh export. -->
 The subsidiary
 <varname>script(s)</varname>
 must use the
-<link linkend="f-Import"><function>Import</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Import"><function>Import</function></link>
 function to import the variables.
 Examples:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 foo = SConscript('sub/SConscript', exports='env')
 SConscript('dir/SConscript', exports=['env', 'variable'])
 SConscript(dirs='subdir', exports='env variable')
 SConscript(dirs=['one', 'two', 'three'], exports='shared_info')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the optional
 <varname>variant_dir</varname>
 argument is present, it causes an effect equivalent to the
-<link linkend="f-VariantDir"><function>VariantDir</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-VariantDir"><function>VariantDir</function></link>
 method described below.
 (If
 <varname>variant_dir</varname>
@@ -3576,14 +3644,14 @@ and
 arguments are interpreted relative to the directory of the calling
 -->
 argument is interpreted relative to the directory of the calling
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 file.
 See the description of the
-<function>VariantDir</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">VariantDir</function>
 function below for additional details and restrictions.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If
 <varname>variant_dir</varname>
 is present,
@@ -3593,46 +3661,46 @@ but
 is not,
 -->
 the source directory is the directory in which the
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 file resides and the
-<filename>SConscript</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename>
 file is evaluated as if it were in the
 <varname>variant_dir</varname>
 directory:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 SConscript('src/SConscript', variant_dir = 'build')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 is equivalent to
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 VariantDir('build', 'src')
 SConscript('build/SConscript')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This later paradigm is often used when the sources are
 in the same directory as the
-<filename>SConstruct</filename>:
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 SConscript('SConscript', variant_dir = 'build')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 is equivalent to
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 VariantDir('build', '.')
 SConscript('build/SConscript')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <!--
 If
 <varname>variant_dir</varname>
@@ -3665,36 +3733,36 @@ TODO??? SConscript('build/SConscript', src_dir='src')
 -->
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The optional
 <varname>must_exist</varname>
 argument, if true, causes an exception to be raised if a requested
-<filename>SConscript</filename> file is not found. The current default is false,
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename> file is not found. The current default is false,
 causing only a warning to be omitted, but this behavior is deprecated.
 For scripts which truly intend to be optional, transition to
 explicty supplying
 <literal>must_exist=False</literal> to the call.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Here are some composite examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # collect the configuration information and use it to build src and doc
 shared_info = SConscript('MyConfig.py')
 SConscript('src/SConscript', exports='shared_info')
 SConscript('doc/SConscript', exports='shared_info')
 </example_commands>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # build debugging and production versions.  SConscript
 # can use Dir('.').path to determine variant.
 SConscript('SConscript', variant_dir='debug', duplicate=0)
 SConscript('SConscript', variant_dir='prod', duplicate=0)
 </example_commands>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # build debugging and production versions.  SConscript
 # is passed flags to use.
 opts = { 'CPPDEFINES' : ['DEBUG'], 'CCFLAGS' : '-pgdb' }
@@ -3703,7 +3771,7 @@ opts = { 'CPPDEFINES' : ['NODEBUG'], 'CCFLAGS' : '-O' }
 SConscript('SConscript', variant_dir='prod', duplicate=0, exports=opts)
 </example_commands>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # build common documentation and compile for different architectures
 SConscript('doc/SConscript', variant_dir='build/doc', duplicate=0)
 SConscript('src/SConscript', variant_dir='build/x86', duplicate=0)
@@ -3718,9 +3786,10 @@ SConscript('src/SConscript', variant_dir='build/ppc', duplicate=0)
     <term>
       <literal>env.SConscriptChdir(value)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 By default,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 changes its working directory
 to the directory in which each
 subsidiary SConscript file lives.
@@ -3728,14 +3797,14 @@ This behavior may be disabled
 by specifying either:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 SConscriptChdir(0)
 env.SConscriptChdir(0)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 in which case
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will stay in the top-level directory
 while reading all SConscript files.
 (This may be necessary when building from repositories,
@@ -3747,11 +3816,11 @@ SConscriptChdir()
 multiple times.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment()
 SConscriptChdir(0)
 SConscript('foo/SConscript')	# will not chdir to foo
@@ -3767,9 +3836,10 @@ SConscript('bar/SConscript')	# will chdir to bar
     <term>
       <literal>env.SConsignFile([file, dbm_module])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This tells
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to store all file signatures
 in the specified database
 <varname>file</varname>.
@@ -3786,17 +3856,17 @@ If
 <varname>file</varname>
 is not an absolute path name,
 the file is placed in the same directory as the top-level
-<filename>SConstruct</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename>
 file.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If
 <varname>file</varname>
 is
 <literal>None</literal>,
 then
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will store file signatures
 in a separate
 <filename>.sconsign</filename>
@@ -3806,7 +3876,7 @@ not in one global database file.
 prior to SCons 0.96.91 and 0.97.)
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The optional
 <varname>dbm_module</varname>
 argument can be used to specify
@@ -3818,11 +3888,11 @@ Python data structures,
 and which works on all Python versions.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Explicitly stores signatures in ".sconsign.dblite"
 # in the top-level SConstruct directory (the
 # default behavior).
@@ -3845,13 +3915,14 @@ SConsignFile(None)
     <term>
       <literal>env.SetDefault(key=val, [...])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables to default values specified with the keyword
 arguments if (and only if) the variables are not already set.
 The following statements are equivalent:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.SetDefault(FOO = 'foo')
 
 if 'FOO' not in env: env['FOO'] = 'foo'
@@ -3865,12 +3936,13 @@ if 'FOO' not in env: env['FOO'] = 'foo'
     <term>
       <literal>env.SetOption(name, value)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This function provides a way to set a select subset of the scons command
 line options from a SConscript file. The options supported are:
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <variablelist>
 <varlistentry>
 <term><literal>clean</literal></term>
@@ -3955,17 +4027,17 @@ which corresponds to --stack-size.
 </variablelist>
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 See the documentation for the
 corresponding command line object for information about each specific
 option.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 SetOption('max_drift', 1)
 </example_commands>
 </listitem>
@@ -3977,7 +4049,8 @@ SetOption('max_drift', 1)
     <term>
       <literal>env.SideEffect(side_effect, target)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Declares
 <varname>side_effect</varname>
 as a side effect of building
@@ -3995,7 +4068,7 @@ files for a static library,
 and various log files are created updated
 as side effects of various TeX commands.
 If a target is a side effect of multiple build commands,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will ensure that only one set of commands
 is executed at a time.
 Consequently, you only need to use this method
@@ -4003,7 +4076,7 @@ for side-effect targets that are built as a result of
 multiple build commands.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Because multiple build commands may update
 the same side effect file,
 by default the
@@ -4027,9 +4100,9 @@ is cleaned whenever a specific
 is cleaned,
 you must specify this explicitly
 with the
-<link linkend="f-Clean"><function>Clean</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Clean"><function>Clean</function></link>
 or
-<function>env.Clean</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">env.Clean</function>
 function.
 </para>
 </listitem>
@@ -4041,16 +4114,17 @@ function.
     <term>
       <literal>env.SourceCode(entries, builder)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This function and its associate factory functions are deprecated.
 There is no replacement.
 The intended use was to keep a local tree in sync with an archive,
 but in actuality the function only causes the archive
 to be fetched on the first run.
-Synchronizing with the archive is best done external to <application>SCons</application>.
+Synchronizing with the archive is best done external to <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Arrange for non-existent source files to
 be fetched from a source code management system
 using the specified
@@ -4063,30 +4137,30 @@ source files or directories in which
 source files can be found.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 For any non-existent source files,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will search up the directory tree
 and use the first
-<function>SourceCode</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SourceCode</function>
 builder it finds.
 The specified
 <varname>builder</varname>
 may be
 <literal>None</literal>,
 in which case
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will not use a builder to fetch
 source files for the specified
 <varname>entries</varname>,
 even if a
-<function>SourceCode</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SourceCode</function>
 builder has been specified
 for a directory higher up the tree.
 </para>
 
-<para>
-<filename>scons</filename>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will, by default,
 fetch files from SCCS or RCS subdirectories
 without explicit configuration.
@@ -4098,11 +4172,11 @@ and speed up your build a little
 by disabling these searches as follows:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.SourceCode('.', None)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that if the specified
 <varname>builder</varname>
 is one you create by hand,
@@ -4111,8 +4185,8 @@ construction environment to use
 when fetching a source file.
 </para>
 
-<para>
-<filename>scons</filename>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 provides a set of canned factory
 functions that return appropriate
 Builders for various popular
@@ -4120,14 +4194,14 @@ source code management systems.
 Canonical examples of invocation include:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.SourceCode('.', env.BitKeeper('/usr/local/BKsources'))
 env.SourceCode('src', env.CVS('/usr/local/CVSROOT'))
 env.SourceCode('/', env.RCS())
 env.SourceCode(['f1.c', 'f2.c'], env.SCCS())
 env.SourceCode('no_source.c', None)
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <!-- env.SourceCode('.', env.Subversion('file:///usr/local/Subversion')) -->
 </para>
 </listitem>
@@ -4139,20 +4213,21 @@ env.SourceCode('no_source.c', None)
     <term>
       <literal>env.SourceSignatures(type)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note:  Although it is not yet officially deprecated,
 use of this function is discouraged.
 See the
-<link linkend="f-Decider"><function>Decider</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Decider"><function>Decider</function></link>
 function for a more flexible and straightforward way
 to configure SCons' decision-making.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
-<function>SourceSignatures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SourceSignatures</function>
 function tells
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 how to decide if a source file
 (a file that is not built from any other files)
 has changed since the last time it
@@ -4163,7 +4238,7 @@ or
 <literal>timestamp</literal>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the environment method is used,
 the specified type of source signature
 is only used when deciding whether targets
@@ -4174,19 +4249,19 @@ used for all decisions
 about whether targets are up-to-date.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>MD5</literal>
 means
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 decides that a source file has changed
 if the MD5 checksum of its contents has changed since
 the last time it was used to rebuild a particular target file.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>timestamp</literal>
 means
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 decides that a source file has changed
 if its timestamp (modification time) has changed since
 the last time it was used to rebuild a particular target file.
@@ -4196,14 +4271,14 @@ by default it will also rebuild if the dependency is
 than the last time it was used to rebuild the target file.)
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 There is no different between the two behaviors
 for Python
-<function>Value</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Value</function>
 node objects.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>MD5</literal>
 signatures take longer to compute,
 but are more accurate than
@@ -4213,21 +4288,21 @@ The default value is
 <literal>MD5</literal>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that the default
-<link linkend="f-TargetSignatures"><function>TargetSignatures</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-TargetSignatures"><function>TargetSignatures</function></link>
 setting (see below)
 is to use this
-<function>SourceSignatures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SourceSignatures</function>
 setting for any target files that are used
 to build other target files.
 Consequently, changing the value of
-<function>SourceSignatures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SourceSignatures</function>
 will, by default,
 affect the up-to-date decision for all files in the build
 (or all files built with a specific construction environment
 when
-<function>env.SourceSignatures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">env.SourceSignatures</function>
 is used).
 </para>
 </listitem>
@@ -4239,7 +4314,8 @@ is used).
     <term>
       <literal>env.Split(arg)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns a list of file names or other objects.
 If arg is a string,
 it will be split on strings of white-space characters
@@ -4252,11 +4328,11 @@ it will be returned as a list
 containing just the object.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 files = Split("f1.c f2.c f3.c")
 files = env.Split("f4.c f5.c f6.c")
 files = Split("""
@@ -4271,13 +4347,14 @@ files = Split("""
     <term>
       <literal>env.subst(input, [raw, target, source, conv])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Performs construction variable interpolation
 on the specified string or sequence argument
 <varname>input</varname>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 By default,
 leading or trailing white space will
 be removed from the result.
@@ -4309,7 +4386,7 @@ pairs
 (as is done for signature calculation).
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the input is a sequence
 (list or tuple),
 the individual elements of
@@ -4317,7 +4394,7 @@ the sequence will be expanded,
 and the results will be returned as a list.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The optional
 <varname>target</varname>
 and
@@ -4326,20 +4403,20 @@ keyword arguments
 must be set to lists of
 target and source nodes, respectively,
 if you want the
-<envar>$TARGET</envar>,
-<envar>$TARGETS</envar>,
-<envar>$SOURCE</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$TARGET</envar>,
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$TARGETS</envar>,
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$SOURCE</envar>
 and
-<envar>$SOURCES</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$SOURCES</envar>
 to be available for expansion.
 This is usually necessary if you are
 calling
-<function>env.subst</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">env.subst</function>
 from within a Python function used
 as an SCons action.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returned string values or sequence elements
 are converted to their string representation by default.
 The optional
@@ -4357,11 +4434,11 @@ idiom to pass in an unnamed function
 that simply returns its unconverted argument.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 print env.subst("The C compiler is: $CC")
 
 def compile(target, source, env):
@@ -4378,19 +4455,20 @@ source_nodes = env.subst('$EXPAND_TO_NODELIST',
     <term>
       <literal>Tag(node, tags)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Annotates file or directory Nodes with
 information about how the
-<link linkend="b-Package"><function>Package</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-Package"><function>Package</function></link>
 Builder should package those files or directories.
 All tags are optional.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # makes sure the built library will be installed with 0644 file
 # access mode
 Tag( Library( 'lib.c' ), UNIX_ATTR="0644" )
@@ -4407,20 +4485,21 @@ Tag( 'file2.txt', DOC )
     <term>
       <literal>env.TargetSignatures(type)</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note:  Although it is not yet officially deprecated,
 use of this function is discouraged.
 See the
-<link linkend="f-Decider"><function>Decider</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-Decider"><function>Decider</function></link>
 function for a more flexible and straightforward way
 to configure SCons' decision-making.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
-<function>TargetSignatures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">TargetSignatures</function>
 function tells
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 how to decide if a target file
 (a file that
 <emphasis>is</emphasis>
@@ -4437,7 +4516,7 @@ or
 <literal>"source"</literal>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the environment method is used,
 the specified type of target signature is only used
 for targets built with that environment.
@@ -4448,17 +4527,17 @@ don't have an explicit target signature type
 specified for their environments.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>"content"</literal>
 (or its synonym
 <literal>"MD5"</literal>)
 means
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 decides that a target file has changed
 if the MD5 checksum of its contents has changed since
 the last time it was used to rebuild some other target file.
 This means
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will open up
 MD5 sum the contents
 of target files after they're built,
@@ -4467,10 +4546,10 @@ and may decide that it does not need to rebuild
 rebuilt with exactly the same contents as the last time.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>"timestamp"</literal>
 means
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 decides that a target file has changed
 if its timestamp (modification time) has changed since
 the last time it was used to rebuild some other target file.
@@ -4480,33 +4559,33 @@ by default it will also rebuild if the dependency is
 than the last time it was used to rebuild the target file.)
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>"source"</literal>
 means
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 decides that a target file has changed
 as specified by the corresponding
-<function>SourceSignatures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SourceSignatures</function>
 setting
 (<literal>"MD5"</literal>
 or
 <literal>"timestamp"</literal>).
 This means that
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will treat all input files to a target the same way,
 regardless of whether they are source files
 or have been built from other files.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>"build"</literal>
 means
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 decides that a target file has changed
 if it has been rebuilt in this invocation
 or if its content or timestamp have changed
 as specified by the corresponding
-<function>SourceSignatures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SourceSignatures</function>
 setting.
 This "propagates" the status of a rebuilt file
 so that other "downstream" target files
@@ -4515,7 +4594,7 @@ even if the contents or the timestamp
 have not changed.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <literal>"build"</literal>
 signatures are fastest because
 <literal>"content"</literal>
@@ -4537,18 +4616,18 @@ The default value is
 <literal>"source"</literal>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Because the default setting is
 <literal>"source"</literal>,
 using
-<function>SourceSignatures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">SourceSignatures</function>
 is generally preferable to
-<function>TargetSignatures</function>,
+<function xmlns="http://www.scons.org/dbxsd/v1.0">TargetSignatures</function>,
 so that the up-to-date decision
 will be consistent for all files
 (or all files built with a specific construction environment).
 Use of
-<function>TargetSignatures</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">TargetSignatures</function>
 provides specific control for how built target files
 affect their "downstream" dependencies.
 </para>
@@ -4561,9 +4640,10 @@ affect their "downstream" dependencies.
     <term>
       <literal>env.Tool(string, [toolpath, **kw])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
-<function>Tool</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Tool</function>
 form of the function
 returns a callable object
 that can be used to initialize
@@ -4575,21 +4655,21 @@ in which case the object will
 add the necessary variables
 to the construction environment
 and the name of the tool will be added to the
-<link linkend="cv-TOOLS"><envar>$TOOLS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-TOOLS"><envar>$TOOLS</envar></link>
 construction variable.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Additional keyword arguments are passed to the tool's
 <function>generate</function>()
 method.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(tools = [ Tool('msvc') ])
 
 env = Environment()
@@ -4599,22 +4679,22 @@ u = Tool('opengl', toolpath = ['tools'])
 u(env)  # adds 'opengl' to the TOOLS variable
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
-<function>env.Tool</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">env.Tool</function>
 form of the function
 applies the callable object for the specified tool
 <varname>string</varname>
 to the environment through which the method was called.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Additional keyword arguments are passed to the tool's
 <function>generate</function>()
 method.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Tool('gcc')
 env.Tool('opengl', toolpath = ['build/tools'])
 </example_commands>
@@ -4627,7 +4707,8 @@ env.Tool('opengl', toolpath = ['build/tools'])
     <term>
       <literal>env.Value(value, [built_value])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Returns a Node object representing the specified Python value.  Value
 Nodes can be used as dependencies of targets.  If the result of
 calling
@@ -4641,7 +4722,7 @@ When using timestamp source signatures, Value Nodes'
 timestamps are equal to the system time when the Node is created.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The returned Value Node object has a
 <function>write</function>()
 method that can be used to "build" a Value Node
@@ -4657,11 +4738,11 @@ There is a corresponding
 method that will return the built value of the Node.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment()
 
 def create(target, source, env):
@@ -4703,9 +4784,10 @@ env.UpdateValue(target = Value(output), source = Value(input))
     <term>
       <literal>env.VariantDir(variant_dir, src_dir, [duplicate])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Use the
-<function>VariantDir</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">VariantDir</function>
 function to create a copy of your sources in another location:
 if a name under
 <varname>variant_dir</varname>
@@ -4718,8 +4800,8 @@ than the original sources by simply refering to the sources (and targets)
 within the variant tree.
 </para>
 
-<para>
-<function>VariantDir</function>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+<function xmlns="http://www.scons.org/dbxsd/v1.0">VariantDir</function>
 can be called multiple times with the same
 <varname>src_dir</varname>
 to set up multiple builds with different options
@@ -4737,9 +4819,9 @@ TODO: src_dir = '.' works fine with a build dir under it.
 -->
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The default behavior is for
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to physically duplicate the source files in the variant tree.
 Thus, a build performed in the variant tree is guaranteed to be identical
 to a build performed in the source tree even if
@@ -4750,7 +4832,7 @@ or individual compilers or other invoked tools are hard-coded
 to put derived files in the same directory as source files.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If possible on the platform,
 the duplication is performed by linking rather than copying;
 see also the
@@ -4761,14 +4843,14 @@ files and directories that are not used are not present in
 <varname>variant_dir</varname>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Duplicating the source tree may be disabled by setting the
 <literal>duplicate</literal>
 argument to
 <literal>0</literal>
 (zero).
 This will cause
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to invoke Builders using the path names of source files in
 <varname>src_dir</varname>
 and the path names of derived files within
@@ -4779,9 +4861,9 @@ and is usually safe for most builds
 (but see above for cases that may cause problems).
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that
-<function>VariantDir</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">VariantDir</function>
 works most naturally with a subsidiary SConscript file.
 However, you would then call the subsidiary SConscript file
 not in the source directory, but in the
@@ -4789,11 +4871,11 @@ not in the source directory, but in the
 regardless of the value of
 <literal>duplicate</literal>.
 This is how you tell
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 which variant of a source tree to build:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # run src/SConscript in two variant directories
 VariantDir('build/variant1', 'src')
 SConscript('build/variant1/SConscript')
@@ -4801,31 +4883,31 @@ VariantDir('build/variant2', 'src')
 SConscript('build/variant2/SConscript')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 See also the
-<link linkend="f-SConscript"><function>SConscript</function></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="f-SConscript"><function>SConscript</function></link>
 function, described above,
 for another way to specify a variant directory
 in conjunction with calling a subsidiary SConscript file.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Examples:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # use names in the build directory, not the source directory
 VariantDir('build', 'src', duplicate=0)
 Program('build/prog', 'build/source.c')
 </example_commands>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # this builds both the source and docs in a separate subtree
 VariantDir('build', '.', duplicate=0)
 SConscript(dirs=['build/src','build/doc'])
 </example_commands>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # same as previous example, but only uses SConscript
 SConscript(dirs='src', variant_dir='build/src', duplicate=0)
 SConscript(dirs='doc', variant_dir='build/doc', duplicate=0)
@@ -4839,7 +4921,8 @@ SConscript(dirs='doc', variant_dir='build/doc', duplicate=0)
     <term>
       <literal>env.WhereIs(program, [path, pathext, reject])</literal>
     </term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Searches for the specified executable
 <varname>program</varname>,
 returning the full path name to the program
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index 4f4cab4..7ae66c5 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sconsdoc [
     <!ENTITY % scons SYSTEM "../scons.mod">
     %scons;
@@ -12,117 +12,133 @@
     %variables-mod;
 ]>
 
-<variablelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
+<variablelist 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">
   <varlistentry id="t-386asm">
     <term>386asm</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the 386ASM assembler
 for the Phar Lap ETS embedded operating system.
 </para>
-<para>Sets:  &amp;cv-link-AS;, &amp;cv-link-ASCOM;, &amp;cv-link-ASFLAGS;, &amp;cv-link-ASPPCOM;, &amp;cv-link-ASPPFLAGS;.</para><para>Uses:  &amp;cv-link-CC;, &amp;cv-link-CPPFLAGS;, &amp;cv-link-_CPPDEFFLAGS;, &amp;cv-link-_CPPINCFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.</para><para>Uses:  &cv-link-CC;, &cv-link-CPPFLAGS;, &cv-link-_CPPDEFFLAGS;, &cv-link-_CPPINCFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-aixcXX">
     <term>aixc++</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the IMB xlc / Visual Age C++ compiler.
 </para>
-<para>Sets:  &amp;cv-link-CXX;, &amp;cv-link-CXXVERSION;, &amp;cv-link-SHCXX;, &amp;cv-link-SHOBJSUFFIX;.</para></listitem>
+<para>Sets:  &cv-link-CXX;, &cv-link-CXXVERSION;, &cv-link-SHCXX;, &cv-link-SHOBJSUFFIX;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-aixcc">
     <term>aixcc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the IBM xlc / Visual Age C compiler.
 </para>
-<para>Sets:  &amp;cv-link-CC;, &amp;cv-link-CCVERSION;, &amp;cv-link-SHCC;.</para></listitem>
+<para>Sets:  &cv-link-CC;, &cv-link-CCVERSION;, &cv-link-SHCC;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-aixf77">
     <term>aixf77</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the IBM Visual Age f77 Fortran compiler.
 </para>
-<para>Sets:  &amp;cv-link-F77;, &amp;cv-link-SHF77;.</para></listitem>
+<para>Sets:  &cv-link-F77;, &cv-link-SHF77;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-aixlink">
     <term>aixlink</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the IBM Visual Age linker.
 </para>
-<para>Sets:  &amp;cv-link-LINKFLAGS;, &amp;cv-link-SHLIBSUFFIX;, &amp;cv-link-SHLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-LINKFLAGS;, &cv-link-SHLIBSUFFIX;, &cv-link-SHLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-applelink">
     <term>applelink</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Sets construction variables for the Apple linker
                 (similar to the GNU linker).
             </para>
-        <para>Sets:  &amp;cv-link-APPLELINK_COMPATIBILITY_VERSION;, &amp;cv-link-APPLELINK_CURRENT_VERSION;, &amp;cv-link-APPLELINK_NO_COMPATIBILITY_VERSION;, &amp;cv-link-APPLELINK_NO_CURRENT_VERSION;, &amp;cv-link-FRAMEWORKPATHPREFIX;, &amp;cv-link-LDMODULECOM;, &amp;cv-link-LDMODULEFLAGS;, &amp;cv-link-LDMODULEPREFIX;, &amp;cv-link-LDMODULESUFFIX;, &amp;cv-link-LINKCOM;, &amp;cv-link-SHLINKCOM;, &amp;cv-link-SHLINKFLAGS;, &amp;cv-link-_APPLELINK_COMPATIBILITY_VERSION;, &amp;cv-link-_APPLELINK_CURRENT_VERSION;, &amp;cv-link-_FRAMEWORKPATH;, &amp;cv-link-_FRAMEWORKS;.</para><para>Uses:  &amp;cv-link-FRAMEWORKSFLAGS;.</para></listitem>
+        <para>Sets:  &cv-link-APPLELINK_COMPATIBILITY_VERSION;, &cv-link-APPLELINK_CURRENT_VERSION;, &cv-link-APPLELINK_NO_COMPATIBILITY_VERSION;, &cv-link-APPLELINK_NO_CURRENT_VERSION;, &cv-link-FRAMEWORKPATHPREFIX;, &cv-link-LDMODULECOM;, &cv-link-LDMODULEFLAGS;, &cv-link-LDMODULEPREFIX;, &cv-link-LDMODULESUFFIX;, &cv-link-LINKCOM;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;, &cv-link-_APPLELINK_COMPATIBILITY_VERSION;, &cv-link-_APPLELINK_CURRENT_VERSION;, &cv-link-_FRAMEWORKPATH;, &cv-link-_FRAMEWORKS;.</para><para>Uses:  &cv-link-FRAMEWORKSFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-ar">
     <term>ar</term>
-    <listitem><para>
-Sets construction variables for the <application>ar</application> library archiver.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">ar</application> library archiver.
 </para>
-<para>Sets:  &amp;cv-link-AR;, &amp;cv-link-ARCOM;, &amp;cv-link-ARFLAGS;, &amp;cv-link-LIBPREFIX;, &amp;cv-link-LIBSUFFIX;, &amp;cv-link-RANLIB;, &amp;cv-link-RANLIBCOM;, &amp;cv-link-RANLIBFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-AR;, &cv-link-ARCOM;, &cv-link-ARFLAGS;, &cv-link-LIBPREFIX;, &cv-link-LIBSUFFIX;, &cv-link-RANLIB;, &cv-link-RANLIBCOM;, &cv-link-RANLIBFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-as">
     <term>as</term>
-    <listitem><para>
-Sets construction variables for the <application>as</application> assembler.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">as</application> assembler.
 </para>
-<para>Sets:  &amp;cv-link-AS;, &amp;cv-link-ASCOM;, &amp;cv-link-ASFLAGS;, &amp;cv-link-ASPPCOM;, &amp;cv-link-ASPPFLAGS;.</para><para>Uses:  &amp;cv-link-CC;, &amp;cv-link-CPPFLAGS;, &amp;cv-link-_CPPDEFFLAGS;, &amp;cv-link-_CPPINCFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.</para><para>Uses:  &cv-link-CC;, &cv-link-CPPFLAGS;, &cv-link-_CPPDEFFLAGS;, &cv-link-_CPPINCFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-bcc32">
     <term>bcc32</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the bcc32 compiler.
 </para>
-<para>Sets:  &amp;cv-link-CC;, &amp;cv-link-CCCOM;, &amp;cv-link-CCFLAGS;, &amp;cv-link-CFILESUFFIX;, &amp;cv-link-CFLAGS;, &amp;cv-link-CPPDEFPREFIX;, &amp;cv-link-CPPDEFSUFFIX;, &amp;cv-link-INCPREFIX;, &amp;cv-link-INCSUFFIX;, &amp;cv-link-SHCC;, &amp;cv-link-SHCCCOM;, &amp;cv-link-SHCCFLAGS;, &amp;cv-link-SHCFLAGS;, &amp;cv-link-SHOBJSUFFIX;.</para><para>Uses:  &amp;cv-link-_CPPDEFFLAGS;, &amp;cv-link-_CPPINCFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-CC;, &cv-link-CCCOM;, &cv-link-CCFLAGS;, &cv-link-CFILESUFFIX;, &cv-link-CFLAGS;, &cv-link-CPPDEFPREFIX;, &cv-link-CPPDEFSUFFIX;, &cv-link-INCPREFIX;, &cv-link-INCSUFFIX;, &cv-link-SHCC;, &cv-link-SHCCCOM;, &cv-link-SHCCFLAGS;, &cv-link-SHCFLAGS;, &cv-link-SHOBJSUFFIX;.</para><para>Uses:  &cv-link-_CPPDEFFLAGS;, &cv-link-_CPPINCFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-cc">
     <term>cc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for generic POSIX C copmilers.
 </para>
-<para>Sets:  &amp;cv-link-CC;, &amp;cv-link-CCCOM;, &amp;cv-link-CCFLAGS;, &amp;cv-link-CFILESUFFIX;, &amp;cv-link-CFLAGS;, &amp;cv-link-CPPDEFPREFIX;, &amp;cv-link-CPPDEFSUFFIX;, &amp;cv-link-FRAMEWORKPATH;, &amp;cv-link-FRAMEWORKS;, &amp;cv-link-INCPREFIX;, &amp;cv-link-INCSUFFIX;, &amp;cv-link-SHCC;, &amp;cv-link-SHCCCOM;, &amp;cv-link-SHCCFLAGS;, &amp;cv-link-SHCFLAGS;, &amp;cv-link-SHOBJSUFFIX;.</para><para>Uses:  &amp;cv-link-PLATFORM;.</para></listitem>
+<para>Sets:  &cv-link-CC;, &cv-link-CCCOM;, &cv-link-CCFLAGS;, &cv-link-CFILESUFFIX;, &cv-link-CFLAGS;, &cv-link-CPPDEFPREFIX;, &cv-link-CPPDEFSUFFIX;, &cv-link-FRAMEWORKPATH;, &cv-link-FRAMEWORKS;, &cv-link-INCPREFIX;, &cv-link-INCSUFFIX;, &cv-link-SHCC;, &cv-link-SHCCCOM;, &cv-link-SHCCFLAGS;, &cv-link-SHCFLAGS;, &cv-link-SHOBJSUFFIX;.</para><para>Uses:  &cv-link-PLATFORM;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-clang">
     <term>clang</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for the Clang C compiler.
 </para>
-<para>Sets:  &amp;cv-link-CC;, &amp;cv-link-CCVERSION;, &amp;cv-link-SHCCFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-CC;, &cv-link-CCVERSION;, &cv-link-SHCCFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-clangxx">
     <term>clangxx</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for the Clang C++ compiler.
 </para>
-<para>Sets:  &amp;cv-link-CXX;, &amp;cv-link-CXXVERSION;, &amp;cv-link-SHCXXFLAGS;, &amp;cv-link-SHOBJSUFFIX;, &amp;cv-link-STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME;.</para></listitem>
+<para>Sets:  &cv-link-CXX;, &cv-link-CXXVERSION;, &cv-link-SHCXXFLAGS;, &cv-link-SHOBJSUFFIX;, &cv-link-STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-cvf">
     <term>cvf</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Compaq Visual Fortran compiler.
 </para>
-<para>Sets:  &amp;cv-link-FORTRAN;, &amp;cv-link-FORTRANCOM;, &amp;cv-link-FORTRANMODDIR;, &amp;cv-link-FORTRANMODDIRPREFIX;, &amp;cv-link-FORTRANMODDIRSUFFIX;, &amp;cv-link-FORTRANPPCOM;, &amp;cv-link-OBJSUFFIX;, &amp;cv-link-SHFORTRANCOM;, &amp;cv-link-SHFORTRANPPCOM;.</para><para>Uses:  &amp;cv-link-CPPFLAGS;, &amp;cv-link-FORTRANFLAGS;, &amp;cv-link-SHFORTRANFLAGS;, &amp;cv-link-_CPPDEFFLAGS;, &amp;cv-link-_FORTRANINCFLAGS;, &amp;cv-link-_FORTRANMODFLAG;.</para></listitem>
+<para>Sets:  &cv-link-FORTRAN;, &cv-link-FORTRANCOM;, &cv-link-FORTRANMODDIR;, &cv-link-FORTRANMODDIRPREFIX;, &cv-link-FORTRANMODDIRSUFFIX;, &cv-link-FORTRANPPCOM;, &cv-link-OBJSUFFIX;, &cv-link-SHFORTRANCOM;, &cv-link-SHFORTRANPPCOM;.</para><para>Uses:  &cv-link-CPPFLAGS;, &cv-link-FORTRANFLAGS;, &cv-link-SHFORTRANFLAGS;, &cv-link-_CPPDEFFLAGS;, &cv-link-_FORTRANINCFLAGS;, &cv-link-_FORTRANMODFLAG;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-cXX">
     <term>cXX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for generic POSIX C++ compilers.
 </para>
-<para>Sets:  &amp;cv-link-CPPDEFPREFIX;, &amp;cv-link-CPPDEFSUFFIX;, &amp;cv-link-CXX;, &amp;cv-link-CXXCOM;, &amp;cv-link-CXXFILESUFFIX;, &amp;cv-link-CXXFLAGS;, &amp;cv-link-INCPREFIX;, &amp;cv-link-INCSUFFIX;, &amp;cv-link-OBJSUFFIX;, &amp;cv-link-SHCXX;, &amp;cv-link-SHCXXCOM;, &amp;cv-link-SHCXXFLAGS;, &amp;cv-link-SHOBJSUFFIX;.</para><para>Uses:  &amp;cv-link-CXXCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-CPPDEFPREFIX;, &cv-link-CPPDEFSUFFIX;, &cv-link-CXX;, &cv-link-CXXCOM;, &cv-link-CXXFILESUFFIX;, &cv-link-CXXFLAGS;, &cv-link-INCPREFIX;, &cv-link-INCSUFFIX;, &cv-link-OBJSUFFIX;, &cv-link-SHCXX;, &cv-link-SHCXXCOM;, &cv-link-SHCXXFLAGS;, &cv-link-SHOBJSUFFIX;.</para><para>Uses:  &cv-link-CXXCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-cyglink">
     <term>cyglink</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for cygwin linker/loader.
 </para>
-<para>Sets:  &amp;cv-link-IMPLIBPREFIX;, &amp;cv-link-IMPLIBSUFFIX;, &amp;cv-link-LDMODULEVERSIONFLAGS;, &amp;cv-link-LINKFLAGS;, &amp;cv-link-RPATHPREFIX;, &amp;cv-link-RPATHSUFFIX;, &amp;cv-link-SHLIBPREFIX;, &amp;cv-link-SHLIBSUFFIX;, &amp;cv-link-SHLIBVERSIONFLAGS;, &amp;cv-link-SHLINKCOM;, &amp;cv-link-SHLINKFLAGS;, &amp;cv-link-_LDMODULEVERSIONFLAGS;, &amp;cv-link-_SHLIBVERSIONFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-IMPLIBPREFIX;, &cv-link-IMPLIBSUFFIX;, &cv-link-LDMODULEVERSIONFLAGS;, &cv-link-LINKFLAGS;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHLIBPREFIX;, &cv-link-SHLIBSUFFIX;, &cv-link-SHLIBVERSIONFLAGS;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;, &cv-link-_LDMODULEVERSIONFLAGS;, &cv-link-_SHLIBVERSIONFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-default">
     <term>default</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets variables by calling a default list of Tool modules
 for the platform on which SCons is running.
 </para>
@@ -130,14 +146,16 @@ for the platform on which SCons is running.
   </varlistentry>
   <varlistentry id="t-dmd">
     <term>dmd</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for D language compiler DMD.
 </para>
-<para>Sets:  &amp;cv-link-DC;, &amp;cv-link-DCOM;, &amp;cv-link-DDEBUG;, &amp;cv-link-DDEBUGPREFIX;, &amp;cv-link-DDEBUGSUFFIX;, &amp;cv-link-DFILESUFFIX;, &amp;cv-link-DFLAGPREFIX;, &amp;cv-link-DFLAGS;, &amp;cv-link-DFLAGSUFFIX;, &amp;cv-link-DINCPREFIX;, &amp;cv-link-DINCSUFFIX;, &amp;cv-link-DLIB;, &amp;cv-link-DLIBCOM;, &amp;cv-link-DLIBDIRPREFIX;, &amp;cv-link-DLIBDIRSUFFIX;, &amp;cv-link-DLIBFLAGPREFIX;, &amp;cv-link-DLIBFLAGSUFFIX;, &amp;cv-link-DLIBLINKPREFIX;, &amp;cv-link-DLIBLINKSUFFIX;, &amp;cv-link-DLINK;, &amp;cv-link-DLINKCOM;, &amp;cv-link-DLINKFLAGPREFIX;, &amp;cv-link-DLINKFLAGS;, &amp;cv-link-DLINKFLAGSUFFIX;, &amp;cv-link-DPATH;, &amp;cv-link-DRPATHPREFIX;, &amp;cv-link-DRPATHSUFFIX;, &amp;cv-link-DShLibSonameGenerator;, &amp;cv-link-DVERPREFIX;, &amp;cv-link-DVERSIONS;, &amp;cv-link-DVERSUFFIX;, &amp;cv-link-SHDC;, &amp;cv-link-SHDCOM;, &amp;cv-link-SHDLIBVERSION;, &amp;cv-link-SHDLIBVERSIONFLAGS;, &amp;cv-link-SHDLINK;, &amp;cv-link-SHDLINKCOM;, &amp;cv-link-SHDLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DRPATHPREFIX;, &cv-link-DRPATHSUFFIX;, &cv-link-DShLibSonameGenerator;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLIBVERSION;, &cv-link-SHDLIBVERSIONFLAGS;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-docbook">
     <term>docbook</term>
-    <listitem><para>This tool tries to make working with Docbook in SCons a little easier.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">This tool tries to make working with Docbook in SCons a little easier.
 It provides several toolchains for creating different output formats,
 like HTML or PDF. Contained in the package is
 a distribution of the Docbook XSL stylesheets as of version 1.76.1.
@@ -145,27 +163,27 @@ As long as you don't specify your own stylesheets for customization,
 these official versions are picked as default...which should reduce
 the inevitable setup hassles for you.
 </para>
-<para>Implicit dependencies to images and XIncludes are detected automatically
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Implicit dependencies to images and XIncludes are detected automatically
 if you meet the HTML requirements. The additional
 stylesheet <filename>utils/xmldepend.xsl</filename> by Paul DuBois is used for this purpose.
 </para>
-<para>Note, that there is no support for XML catalog resolving offered! This tool calls
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Note, that there is no support for XML catalog resolving offered! This tool calls
 the XSLT processors and PDF renderers with the stylesheets you specified, that's it.
 The rest lies in your hands and you still have to know what you're doing when
 resolving names via a catalog. 
 </para>
-<para>For activating the tool "docbook", you have to add its name to the Environment constructor,
+<para xmlns="http://www.scons.org/dbxsd/v1.0">For activating the tool "docbook", you have to add its name to the Environment constructor,
 like this
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 </screen>
-<para>On its startup, the Docbook tool tries to find a required <literal>xsltproc</literal> processor, and
+<para xmlns="http://www.scons.org/dbxsd/v1.0">On its startup, the Docbook tool tries to find a required <literal>xsltproc</literal> processor, and
 a PDF renderer, e.g. <literal>fop</literal>. So make sure that these are added to your system's environment
 <literal>PATH</literal> and can be called directly, without specifying their full path.
 </para>
-<para>For the most basic processing of Docbook to HTML, you need to have installed
+<para xmlns="http://www.scons.org/dbxsd/v1.0">For the most basic processing of Docbook to HTML, you need to have installed
 </para>
-<itemizedlist><listitem><para>the Python <literal>lxml</literal> binding to <literal>libxml2</literal>, or
+<itemizedlist xmlns="http://www.scons.org/dbxsd/v1.0"><listitem><para>the Python <literal>lxml</literal> binding to <literal>libxml2</literal>, or
 </para>
 </listitem>
 <listitem><para>the direct Python bindings for <literal>libxml2/libxslt</literal>, or
@@ -176,49 +194,49 @@ and <literal>xalan</literal>.
 </para>
 </listitem>
 </itemizedlist>
-<para>Rendering to PDF requires you to have one of the applications
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Rendering to PDF requires you to have one of the applications
 <literal>fop</literal> or <literal>xep</literal> installed.
 </para>
 
-<para>Creating a HTML or PDF document is very simple and straightforward. Say
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Creating a HTML or PDF document is very simple and straightforward. Say
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtml('manual.html', 'manual.xml')
 env.DocbookPdf('manual.pdf', 'manual.xml')
 </screen>
-<para>to get both outputs from your XML source <filename>manual.xml</filename>. As a shortcut, you can
+<para xmlns="http://www.scons.org/dbxsd/v1.0">to get both outputs from your XML source <filename>manual.xml</filename>. As a shortcut, you can
 give the stem of the filenames alone, like this:
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtml('manual')
 env.DocbookPdf('manual')
 </screen>
-<para>and get the same result. Target and source lists are also supported:
+<para xmlns="http://www.scons.org/dbxsd/v1.0">and get the same result. Target and source lists are also supported:
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtml(['manual.html','reference.html'], ['manual.xml','reference.xml'])
 </screen>
-<para>or even
+<para xmlns="http://www.scons.org/dbxsd/v1.0">or even
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtml(['manual','reference'])
 </screen>
-<important><para>Whenever you leave out the list of sources, you may not specify a file extension! The
+<important xmlns="http://www.scons.org/dbxsd/v1.0"><para>Whenever you leave out the list of sources, you may not specify a file extension! The
 Tool uses the given names as file stems, and adds the suffixes for target and source files
 accordingly.
 </para>
 </important>
-<para>The rules given above are valid for the Builders <link linkend="b-DocbookHtml"><function>DocbookHtml</function></link>, 
-<link linkend="b-DocbookPdf"><function>DocbookPdf</function></link>, <link linkend="b-DocbookEpub"><function>DocbookEpub</function></link>, <link linkend="b-DocbookSlidesPdf"><function>DocbookSlidesPdf</function></link> and <link linkend="b-DocbookXInclude"><function>DocbookXInclude</function></link>. For the 
-<link linkend="b-DocbookMan"><function>DocbookMan</function></link> transformation you
+<para xmlns="http://www.scons.org/dbxsd/v1.0">The rules given above are valid for the Builders <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookHtml"><function>DocbookHtml</function></link>, 
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookPdf"><function>DocbookPdf</function></link>, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookEpub"><function>DocbookEpub</function></link>, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookSlidesPdf"><function>DocbookSlidesPdf</function></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookXInclude"><function>DocbookXInclude</function></link>. For the 
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookMan"><function>DocbookMan</function></link> transformation you
 can specify a target name, but the actual output names are automatically
 set from the <literal>refname</literal> entries in your XML source.
 </para>
 
-<para>The Builders <link linkend="b-DocbookHtmlChunked"><function>DocbookHtmlChunked</function></link>, <link linkend="b-DocbookHtmlhelp"><function>DocbookHtmlhelp</function></link> and 
-<link linkend="b-DocbookSlidesHtml"><function>DocbookSlidesHtml</function></link> are special, in that:
+<para xmlns="http://www.scons.org/dbxsd/v1.0">The Builders <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookHtmlChunked"><function>DocbookHtmlChunked</function></link>, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookHtmlhelp"><function>DocbookHtmlhelp</function></link> and 
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookSlidesHtml"><function>DocbookSlidesHtml</function></link> are special, in that:
 </para>
-<orderedlist><listitem><para>they create a large set of files, where the exact names and their number depend
+<orderedlist xmlns="http://www.scons.org/dbxsd/v1.0"><listitem><para>they create a large set of files, where the exact names and their number depend
 on the content of the source file, and
 </para>
 </listitem>
@@ -227,24 +245,24 @@ XSL transformation is not picked up by the stylesheets.
 </para>
 </listitem>
 </orderedlist>
-<para>As a result, there is simply no use in specifying a target HTML name. 
+<para xmlns="http://www.scons.org/dbxsd/v1.0">As a result, there is simply no use in specifying a target HTML name. 
 So the basic syntax for these builders is always:
 </para>
-<screen>env = Environment(tools=['docbook'])
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'])
 env.DocbookHtmlhelp('manual')
 </screen>
 
-<para>If you want to use a specific XSL file, you can set the
+<para xmlns="http://www.scons.org/dbxsd/v1.0">If you want to use a specific XSL file, you can set the
 additional <literal>xsl</literal> parameter to your
 Builder call as follows:
 </para>
-<screen>env.DocbookHtml('other.html', 'manual.xml', xsl='html.xsl')
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env.DocbookHtml('other.html', 'manual.xml', xsl='html.xsl')
 </screen>
-<para>Since this may get tedious if you always use the same local naming for your customized XSL files,
+<para xmlns="http://www.scons.org/dbxsd/v1.0">Since this may get tedious if you always use the same local naming for your customized XSL files,
 e.g. <filename>html.xsl</filename> for HTML and <filename>pdf.xsl</filename> for PDF output, a set of
 variables for setting the default XSL name is provided. These are:
 </para>
-<screen>DOCBOOK_DEFAULT_XSL_HTML        
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">DOCBOOK_DEFAULT_XSL_HTML        
 DOCBOOK_DEFAULT_XSL_HTMLCHUNKED        
 DOCBOOK_DEFAULT_XSL_HTMLHELP        
 DOCBOOK_DEFAULT_XSL_PDF        
@@ -253,654 +271,732 @@ DOCBOOK_DEFAULT_XSL_MAN
 DOCBOOK_DEFAULT_XSL_SLIDESPDF        
 DOCBOOK_DEFAULT_XSL_SLIDESHTML        
 </screen>
-<para>and you can set them when constructing your environment:
+<para xmlns="http://www.scons.org/dbxsd/v1.0">and you can set them when constructing your environment:
 </para>
-<screen>env = Environment(tools=['docbook'],
+<screen xmlns="http://www.scons.org/dbxsd/v1.0">env = Environment(tools=['docbook'],
                   DOCBOOK_DEFAULT_XSL_HTML='html.xsl',
                   DOCBOOK_DEFAULT_XSL_PDF='pdf.xsl')
 env.DocbookHtml('manual') # now uses html.xsl
 </screen>
-<para>Sets:  &amp;cv-link-DOCBOOK_DEFAULT_XSL_EPUB;, &amp;cv-link-DOCBOOK_DEFAULT_XSL_HTML;, &amp;cv-link-DOCBOOK_DEFAULT_XSL_HTMLCHUNKED;, &amp;cv-link-DOCBOOK_DEFAULT_XSL_HTMLHELP;, &amp;cv-link-DOCBOOK_DEFAULT_XSL_MAN;, &amp;cv-link-DOCBOOK_DEFAULT_XSL_PDF;, &amp;cv-link-DOCBOOK_DEFAULT_XSL_SLIDESHTML;, &amp;cv-link-DOCBOOK_DEFAULT_XSL_SLIDESPDF;, &amp;cv-link-DOCBOOK_FOP;, &amp;cv-link-DOCBOOK_FOPCOM;, &amp;cv-link-DOCBOOK_FOPFLAGS;, &amp;cv-link-DOCBOOK_XMLLINT;, &amp;cv-link-DOCBOOK_XMLLINTCOM;, &amp;cv-link-DOCBOOK_XMLLINTFLAGS;, &amp;cv-link-DOCBOOK_XSLTPROC;, &amp;cv-link-DOCBOOK_XSLTPROCCOM;, &amp;cv-link-DOCBOOK_XSLTPROCFLAGS;, &amp;cv-link-DOCBOOK_XSLTPROCPARAMS;.</para><para>Uses:  &amp;cv-link-DOCBOOK_FOPCOMSTR;, &amp;cv-link-DOCBOOK_XMLLINTCOMSTR;, &amp;cv-link-DOCBOOK_XSLTPROCCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-DOCBOOK_DEFAULT_XSL_EPUB;, &cv-link-DOCBOOK_DEFAULT_XSL_HTML;, &cv-link-DOCBOOK_DEFAULT_XSL_HTMLCHUNKED;, &cv-link-DOCBOOK_DEFAULT_XSL_HTMLHELP;, &cv-link-DOCBOOK_DEFAULT_XSL_MAN;, &cv-link-DOCBOOK_DEFAULT_XSL_PDF;, &cv-link-DOCBOOK_DEFAULT_XSL_SLIDESHTML;, &cv-link-DOCBOOK_DEFAULT_XSL_SLIDESPDF;, &cv-link-DOCBOOK_FOP;, &cv-link-DOCBOOK_FOPCOM;, &cv-link-DOCBOOK_FOPFLAGS;, &cv-link-DOCBOOK_XMLLINT;, &cv-link-DOCBOOK_XMLLINTCOM;, &cv-link-DOCBOOK_XMLLINTFLAGS;, &cv-link-DOCBOOK_XSLTPROC;, &cv-link-DOCBOOK_XSLTPROCCOM;, &cv-link-DOCBOOK_XSLTPROCFLAGS;, &cv-link-DOCBOOK_XSLTPROCPARAMS;.</para><para>Uses:  &cv-link-DOCBOOK_FOPCOMSTR;, &cv-link-DOCBOOK_XMLLINTCOMSTR;, &cv-link-DOCBOOK_XSLTPROCCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-dvi">
     <term>dvi</term>
-    <listitem><para>
-Attaches the <function>DVI</function> builder to the
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Attaches the <function xmlns="http://www.scons.org/dbxsd/v1.0">DVI</function> builder to the
 construction environment.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="t-dvipdf">
     <term>dvipdf</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the dvipdf utility.
 </para>
-<para>Sets:  &amp;cv-link-DVIPDF;, &amp;cv-link-DVIPDFCOM;, &amp;cv-link-DVIPDFFLAGS;.</para><para>Uses:  &amp;cv-link-DVIPDFCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-DVIPDF;, &cv-link-DVIPDFCOM;, &cv-link-DVIPDFFLAGS;.</para><para>Uses:  &cv-link-DVIPDFCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-dvips">
     <term>dvips</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the dvips utility.
 </para>
-<para>Sets:  &amp;cv-link-DVIPS;, &amp;cv-link-DVIPSFLAGS;, &amp;cv-link-PSCOM;, &amp;cv-link-PSPREFIX;, &amp;cv-link-PSSUFFIX;.</para><para>Uses:  &amp;cv-link-PSCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-DVIPS;, &cv-link-DVIPSFLAGS;, &cv-link-PSCOM;, &cv-link-PSPREFIX;, &cv-link-PSSUFFIX;.</para><para>Uses:  &cv-link-PSCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-f03">
     <term>f03</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for generic POSIX Fortran 03 compilers.
 </para>
-<para>Sets:  &amp;cv-link-F03;, &amp;cv-link-F03COM;, &amp;cv-link-F03FLAGS;, &amp;cv-link-F03PPCOM;, &amp;cv-link-SHF03;, &amp;cv-link-SHF03COM;, &amp;cv-link-SHF03FLAGS;, &amp;cv-link-SHF03PPCOM;, &amp;cv-link-_F03INCFLAGS;.</para><para>Uses:  &amp;cv-link-F03COMSTR;, &amp;cv-link-F03PPCOMSTR;, &amp;cv-link-SHF03COMSTR;, &amp;cv-link-SHF03PPCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-F03;, &cv-link-F03COM;, &cv-link-F03FLAGS;, &cv-link-F03PPCOM;, &cv-link-SHF03;, &cv-link-SHF03COM;, &cv-link-SHF03FLAGS;, &cv-link-SHF03PPCOM;, &cv-link-_F03INCFLAGS;.</para><para>Uses:  &cv-link-F03COMSTR;, &cv-link-F03PPCOMSTR;, &cv-link-SHF03COMSTR;, &cv-link-SHF03PPCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-f08">
     <term>f08</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for generic POSIX Fortran 08 compilers.
 </para>
-<para>Sets:  &amp;cv-link-F08;, &amp;cv-link-F08COM;, &amp;cv-link-F08FLAGS;, &amp;cv-link-F08PPCOM;, &amp;cv-link-SHF08;, &amp;cv-link-SHF08COM;, &amp;cv-link-SHF08FLAGS;, &amp;cv-link-SHF08PPCOM;, &amp;cv-link-_F08INCFLAGS;.</para><para>Uses:  &amp;cv-link-F08COMSTR;, &amp;cv-link-F08PPCOMSTR;, &amp;cv-link-SHF08COMSTR;, &amp;cv-link-SHF08PPCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-F08;, &cv-link-F08COM;, &cv-link-F08FLAGS;, &cv-link-F08PPCOM;, &cv-link-SHF08;, &cv-link-SHF08COM;, &cv-link-SHF08FLAGS;, &cv-link-SHF08PPCOM;, &cv-link-_F08INCFLAGS;.</para><para>Uses:  &cv-link-F08COMSTR;, &cv-link-F08PPCOMSTR;, &cv-link-SHF08COMSTR;, &cv-link-SHF08PPCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-f77">
     <term>f77</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for generic POSIX Fortran 77 compilers.
 </para>
-<para>Sets:  &amp;cv-link-F77;, &amp;cv-link-F77COM;, &amp;cv-link-F77FILESUFFIXES;, &amp;cv-link-F77FLAGS;, &amp;cv-link-F77PPCOM;, &amp;cv-link-F77PPFILESUFFIXES;, &amp;cv-link-FORTRAN;, &amp;cv-link-FORTRANCOM;, &amp;cv-link-FORTRANFLAGS;, &amp;cv-link-SHF77;, &amp;cv-link-SHF77COM;, &amp;cv-link-SHF77FLAGS;, &amp;cv-link-SHF77PPCOM;, &amp;cv-link-SHFORTRAN;, &amp;cv-link-SHFORTRANCOM;, &amp;cv-link-SHFORTRANFLAGS;, &amp;cv-link-SHFORTRANPPCOM;, &amp;cv-link-_F77INCFLAGS;.</para><para>Uses:  &amp;cv-link-F77COMSTR;, &amp;cv-link-F77PPCOMSTR;, &amp;cv-link-FORTRANCOMSTR;, &amp;cv-link-FORTRANPPCOMSTR;, &amp;cv-link-SHF77COMSTR;, &amp;cv-link-SHF77PPCOMSTR;, &amp;cv-link-SHFORTRANCOMSTR;, &amp;cv-link-SHFORTRANPPCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-F77;, &cv-link-F77COM;, &cv-link-F77FILESUFFIXES;, &cv-link-F77FLAGS;, &cv-link-F77PPCOM;, &cv-link-F77PPFILESUFFIXES;, &cv-link-FORTRAN;, &cv-link-FORTRANCOM;, &cv-link-FORTRANFLAGS;, &cv-link-SHF77;, &cv-link-SHF77COM;, &cv-link-SHF77FLAGS;, &cv-link-SHF77PPCOM;, &cv-link-SHFORTRAN;, &cv-link-SHFORTRANCOM;, &cv-link-SHFORTRANFLAGS;, &cv-link-SHFORTRANPPCOM;, &cv-link-_F77INCFLAGS;.</para><para>Uses:  &cv-link-F77COMSTR;, &cv-link-F77PPCOMSTR;, &cv-link-FORTRANCOMSTR;, &cv-link-FORTRANPPCOMSTR;, &cv-link-SHF77COMSTR;, &cv-link-SHF77PPCOMSTR;, &cv-link-SHFORTRANCOMSTR;, &cv-link-SHFORTRANPPCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-f90">
     <term>f90</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for generic POSIX Fortran 90 compilers.
 </para>
-<para>Sets:  &amp;cv-link-F90;, &amp;cv-link-F90COM;, &amp;cv-link-F90FLAGS;, &amp;cv-link-F90PPCOM;, &amp;cv-link-SHF90;, &amp;cv-link-SHF90COM;, &amp;cv-link-SHF90FLAGS;, &amp;cv-link-SHF90PPCOM;, &amp;cv-link-_F90INCFLAGS;.</para><para>Uses:  &amp;cv-link-F90COMSTR;, &amp;cv-link-F90PPCOMSTR;, &amp;cv-link-SHF90COMSTR;, &amp;cv-link-SHF90PPCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-F90;, &cv-link-F90COM;, &cv-link-F90FLAGS;, &cv-link-F90PPCOM;, &cv-link-SHF90;, &cv-link-SHF90COM;, &cv-link-SHF90FLAGS;, &cv-link-SHF90PPCOM;, &cv-link-_F90INCFLAGS;.</para><para>Uses:  &cv-link-F90COMSTR;, &cv-link-F90PPCOMSTR;, &cv-link-SHF90COMSTR;, &cv-link-SHF90PPCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-f95">
     <term>f95</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for generic POSIX Fortran 95 compilers.
 </para>
-<para>Sets:  &amp;cv-link-F95;, &amp;cv-link-F95COM;, &amp;cv-link-F95FLAGS;, &amp;cv-link-F95PPCOM;, &amp;cv-link-SHF95;, &amp;cv-link-SHF95COM;, &amp;cv-link-SHF95FLAGS;, &amp;cv-link-SHF95PPCOM;, &amp;cv-link-_F95INCFLAGS;.</para><para>Uses:  &amp;cv-link-F95COMSTR;, &amp;cv-link-F95PPCOMSTR;, &amp;cv-link-SHF95COMSTR;, &amp;cv-link-SHF95PPCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-F95;, &cv-link-F95COM;, &cv-link-F95FLAGS;, &cv-link-F95PPCOM;, &cv-link-SHF95;, &cv-link-SHF95COM;, &cv-link-SHF95FLAGS;, &cv-link-SHF95PPCOM;, &cv-link-_F95INCFLAGS;.</para><para>Uses:  &cv-link-F95COMSTR;, &cv-link-F95PPCOMSTR;, &cv-link-SHF95COMSTR;, &cv-link-SHF95PPCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-fortran">
     <term>fortran</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for generic POSIX Fortran compilers.
 </para>
-<para>Sets:  &amp;cv-link-FORTRAN;, &amp;cv-link-FORTRANCOM;, &amp;cv-link-FORTRANFLAGS;, &amp;cv-link-SHFORTRAN;, &amp;cv-link-SHFORTRANCOM;, &amp;cv-link-SHFORTRANFLAGS;, &amp;cv-link-SHFORTRANPPCOM;.</para><para>Uses:  &amp;cv-link-FORTRANCOMSTR;, &amp;cv-link-FORTRANPPCOMSTR;, &amp;cv-link-SHFORTRANCOMSTR;, &amp;cv-link-SHFORTRANPPCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-FORTRAN;, &cv-link-FORTRANCOM;, &cv-link-FORTRANFLAGS;, &cv-link-SHFORTRAN;, &cv-link-SHFORTRANCOM;, &cv-link-SHFORTRANFLAGS;, &cv-link-SHFORTRANPPCOM;.</para><para>Uses:  &cv-link-FORTRANCOMSTR;, &cv-link-FORTRANPPCOMSTR;, &cv-link-SHFORTRANCOMSTR;, &cv-link-SHFORTRANPPCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-gXX">
     <term>g++</term>
-    <listitem><para>
-Set construction variables for the <application>gXX</application> C++ compiler.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Set construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">gXX</application> C++ compiler.
 </para>
-<para>Sets:  &amp;cv-link-CXX;, &amp;cv-link-CXXVERSION;, &amp;cv-link-SHCXXFLAGS;, &amp;cv-link-SHOBJSUFFIX;.</para></listitem>
+<para>Sets:  &cv-link-CXX;, &cv-link-CXXVERSION;, &cv-link-SHCXXFLAGS;, &cv-link-SHOBJSUFFIX;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-g77">
     <term>g77</term>
-    <listitem><para>
-Set construction variables for the <application>g77</application> Fortran compiler.
-Calls the <literal>f77</literal> Tool module
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Set construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">g77</application> Fortran compiler.
+Calls the <literal xmlns="http://www.scons.org/dbxsd/v1.0">f77</literal> Tool module
 to set variables.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="t-gas">
     <term>gas</term>
-    <listitem><para>
-Sets construction variables for the <application>gas</application> assembler.
-Calls the <literal>as</literal> module.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">gas</application> assembler.
+Calls the <literal xmlns="http://www.scons.org/dbxsd/v1.0">as</literal> module.
 </para>
-<para>Sets:  &amp;cv-link-AS;.</para></listitem>
+<para>Sets:  &cv-link-AS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-gcc">
     <term>gcc</term>
-    <listitem><para>
-Set construction variables for the <application>gcc</application> C compiler.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Set construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">gcc</application> C compiler.
 </para>
-<para>Sets:  &amp;cv-link-CC;, &amp;cv-link-CCVERSION;, &amp;cv-link-SHCCFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-CC;, &cv-link-CCVERSION;, &cv-link-SHCCFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-gdc">
     <term>gdc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the D language compiler GDC.
 </para>
-<para>Sets:  &amp;cv-link-DC;, &amp;cv-link-DCOM;, &amp;cv-link-DDEBUG;, &amp;cv-link-DDEBUGPREFIX;, &amp;cv-link-DDEBUGSUFFIX;, &amp;cv-link-DFILESUFFIX;, &amp;cv-link-DFLAGPREFIX;, &amp;cv-link-DFLAGS;, &amp;cv-link-DFLAGSUFFIX;, &amp;cv-link-DINCPREFIX;, &amp;cv-link-DINCSUFFIX;, &amp;cv-link-DLIB;, &amp;cv-link-DLIBCOM;, &amp;cv-link-DLIBDIRPREFIX;, &amp;cv-link-DLIBDIRSUFFIX;, &amp;cv-link-DLIBFLAGPREFIX;, &amp;cv-link-DLIBFLAGSUFFIX;, &amp;cv-link-DLIBLINKPREFIX;, &amp;cv-link-DLIBLINKSUFFIX;, &amp;cv-link-DLINK;, &amp;cv-link-DLINKCOM;, &amp;cv-link-DLINKFLAGPREFIX;, &amp;cv-link-DLINKFLAGS;, &amp;cv-link-DLINKFLAGSUFFIX;, &amp;cv-link-DPATH;, &amp;cv-link-DRPATHPREFIX;, &amp;cv-link-DRPATHSUFFIX;, &amp;cv-link-DShLibSonameGenerator;, &amp;cv-link-DVERPREFIX;, &amp;cv-link-DVERSIONS;, &amp;cv-link-DVERSUFFIX;, &amp;cv-link-SHDC;, &amp;cv-link-SHDCOM;, &amp;cv-link-SHDLIBVERSION;, &amp;cv-link-SHDLIBVERSIONFLAGS;, &amp;cv-link-SHDLINK;, &amp;cv-link-SHDLINKCOM;, &amp;cv-link-SHDLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DRPATHPREFIX;, &cv-link-DRPATHSUFFIX;, &cv-link-DShLibSonameGenerator;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLIBVERSION;, &cv-link-SHDLIBVERSIONFLAGS;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-gettext">
     <term>gettext</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is actually a toolset, which supports internationalization and
 localization of software being constructed with SCons. The toolset loads
 following tools:
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <itemizedlist mark="opencircle">
   <listitem><para>
-    <link linkend="t-xgettext"><literal>xgettext</literal></link> - to extract internationalized messages from source code to 
+    <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> - to extract internationalized messages from source code to 
     <literal>POT</literal> file(s),
   </para></listitem>
   <listitem><para>
-    <link linkend="t-msginit"><literal>msginit</literal></link> - may be optionally used to initialize <literal>PO</literal>
+    <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> - may be optionally used to initialize <literal>PO</literal>
     files,
   </para></listitem>
   <listitem><para>
-    <link linkend="t-msgmerge"><literal>msgmerge</literal></link> - to update <literal>PO</literal> files, that already contain
+    <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgmerge"><literal>msgmerge</literal></link> - to update <literal>PO</literal> files, that already contain
     translated messages,</para></listitem>
   <listitem><para>
-    <link linkend="t-msgfmt"><literal>msgfmt</literal></link> - to compile textual <literal>PO</literal> file to binary
+    <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgfmt"><literal>msgfmt</literal></link> - to compile textual <literal>PO</literal> file to binary
     installable <literal>MO</literal> file.
   </para></listitem>
 </itemizedlist>
 </para>
 
-<para>
-When you enable <literal>gettext</literal>, it internally loads all abovementioned tools,
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+When you enable <literal xmlns="http://www.scons.org/dbxsd/v1.0">gettext</literal>, it internally loads all abovementioned tools,
 so you're encouraged to see their individual documentation.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Each of the above tools provides its own builder(s) which may be used to
 perform particular activities related to software internationalization. You
 may be however interested in <emphasis>top-level</emphasis> builder
-<function>Translate</function> described few paragraphs later.
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Translate</function> described few paragraphs later.
 </para>
 
-<para>
-To use <literal>gettext</literal> tools add <literal>'gettext'</literal> tool to your
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+To use <literal xmlns="http://www.scons.org/dbxsd/v1.0">gettext</literal> tools add <literal>'gettext'</literal> tool to your
 environment:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
   env = Environment( tools = ['default', 'gettext'] )
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="t-gfortran">
     <term>gfortran</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the GNU F95/F2003 GNU compiler.
 </para>
-<para>Sets:  &amp;cv-link-F77;, &amp;cv-link-F90;, &amp;cv-link-F95;, &amp;cv-link-FORTRAN;, &amp;cv-link-SHF77;, &amp;cv-link-SHF77FLAGS;, &amp;cv-link-SHF90;, &amp;cv-link-SHF90FLAGS;, &amp;cv-link-SHF95;, &amp;cv-link-SHF95FLAGS;, &amp;cv-link-SHFORTRAN;, &amp;cv-link-SHFORTRANFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-F77;, &cv-link-F90;, &cv-link-F95;, &cv-link-FORTRAN;, &cv-link-SHF77;, &cv-link-SHF77FLAGS;, &cv-link-SHF90;, &cv-link-SHF90FLAGS;, &cv-link-SHF95;, &cv-link-SHF95FLAGS;, &cv-link-SHFORTRAN;, &cv-link-SHFORTRANFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-gnulink">
     <term>gnulink</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for GNU linker/loader.
 </para>
-<para>Sets:  &amp;cv-link-LDMODULEVERSIONFLAGS;, &amp;cv-link-RPATHPREFIX;, &amp;cv-link-RPATHSUFFIX;, &amp;cv-link-SHLIBVERSIONFLAGS;, &amp;cv-link-SHLINKFLAGS;, &amp;cv-link-_LDMODULESONAME;, &amp;cv-link-_SHLIBSONAME;.</para></listitem>
+<para>Sets:  &cv-link-LDMODULEVERSIONFLAGS;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHLIBVERSIONFLAGS;, &cv-link-SHLINKFLAGS;, &cv-link-_LDMODULESONAME;, &cv-link-_SHLIBSONAME;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-gs">
     <term>gs</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This Tool sets the required construction variables for working with
 the Ghostscript command. It also registers an appropriate Action
-with the PDF Builder (<link linkend="b-PDF"><function>PDF</function></link>), such that the conversion from
+with the PDF Builder (<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-PDF"><function>PDF</function></link>), such that the conversion from
 PS/EPS to PDF happens automatically for the TeX/LaTeX toolchain.
-Finally, it adds an explicit Ghostscript Builder (<link linkend="b-Gs"><function>Gs</function></link>) to the
+Finally, it adds an explicit Ghostscript Builder (<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-Gs"><function>Gs</function></link>) to the
 environment.
 </para>
-<para>Sets:  &amp;cv-link-GS;, &amp;cv-link-GSCOM;, &amp;cv-link-GSFLAGS;.</para><para>Uses:  &amp;cv-link-GSCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-GS;, &cv-link-GSCOM;, &cv-link-GSFLAGS;.</para><para>Uses:  &cv-link-GSCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-hpcXX">
     <term>hpc++</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for the compilers aCC on HP/UX systems.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="t-hpcc">
     <term>hpcc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set construction variables for the
 <application>aCC</application> on HP/UX systems.
-Calls the <literal>cXX</literal> tool for additional variables.
+Calls the <literal xmlns="http://www.scons.org/dbxsd/v1.0">cXX</literal> tool for additional variables.
 </para>
-<para>Sets:  &amp;cv-link-CXX;, &amp;cv-link-CXXVERSION;, &amp;cv-link-SHCXXFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-CXX;, &cv-link-CXXVERSION;, &cv-link-SHCXXFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-hplink">
     <term>hplink</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the linker on HP/UX systems.
 </para>
-<para>Sets:  &amp;cv-link-LINKFLAGS;, &amp;cv-link-SHLIBSUFFIX;, &amp;cv-link-SHLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-LINKFLAGS;, &cv-link-SHLIBSUFFIX;, &cv-link-SHLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-icc">
     <term>icc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the
 <application>icc</application> compiler on OS/2 systems.
 </para>
-<para>Sets:  &amp;cv-link-CC;, &amp;cv-link-CCCOM;, &amp;cv-link-CFILESUFFIX;, &amp;cv-link-CPPDEFPREFIX;, &amp;cv-link-CPPDEFSUFFIX;, &amp;cv-link-CXXCOM;, &amp;cv-link-CXXFILESUFFIX;, &amp;cv-link-INCPREFIX;, &amp;cv-link-INCSUFFIX;.</para><para>Uses:  &amp;cv-link-CCFLAGS;, &amp;cv-link-CFLAGS;, &amp;cv-link-CPPFLAGS;, &amp;cv-link-_CPPDEFFLAGS;, &amp;cv-link-_CPPINCFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-CC;, &cv-link-CCCOM;, &cv-link-CFILESUFFIX;, &cv-link-CPPDEFPREFIX;, &cv-link-CPPDEFSUFFIX;, &cv-link-CXXCOM;, &cv-link-CXXFILESUFFIX;, &cv-link-INCPREFIX;, &cv-link-INCSUFFIX;.</para><para>Uses:  &cv-link-CCFLAGS;, &cv-link-CFLAGS;, &cv-link-CPPFLAGS;, &cv-link-_CPPDEFFLAGS;, &cv-link-_CPPINCFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-icl">
     <term>icl</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Intel C/C++ compiler.
-Calls the <literal>intelc</literal> Tool module to set its variables.
+Calls the <literal xmlns="http://www.scons.org/dbxsd/v1.0">intelc</literal> Tool module to set its variables.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="t-ifl">
     <term>ifl</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Intel Fortran compiler.
 </para>
-<para>Sets:  &amp;cv-link-FORTRAN;, &amp;cv-link-FORTRANCOM;, &amp;cv-link-FORTRANPPCOM;, &amp;cv-link-SHFORTRANCOM;, &amp;cv-link-SHFORTRANPPCOM;.</para><para>Uses:  &amp;cv-link-CPPFLAGS;, &amp;cv-link-FORTRANFLAGS;, &amp;cv-link-_CPPDEFFLAGS;, &amp;cv-link-_FORTRANINCFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-FORTRAN;, &cv-link-FORTRANCOM;, &cv-link-FORTRANPPCOM;, &cv-link-SHFORTRANCOM;, &cv-link-SHFORTRANPPCOM;.</para><para>Uses:  &cv-link-CPPFLAGS;, &cv-link-FORTRANFLAGS;, &cv-link-_CPPDEFFLAGS;, &cv-link-_FORTRANINCFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-ifort">
     <term>ifort</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for newer versions
 of the Intel Fortran compiler for Linux.
 </para>
-<para>Sets:  &amp;cv-link-F77;, &amp;cv-link-F90;, &amp;cv-link-F95;, &amp;cv-link-FORTRAN;, &amp;cv-link-SHF77;, &amp;cv-link-SHF77FLAGS;, &amp;cv-link-SHF90;, &amp;cv-link-SHF90FLAGS;, &amp;cv-link-SHF95;, &amp;cv-link-SHF95FLAGS;, &amp;cv-link-SHFORTRAN;, &amp;cv-link-SHFORTRANFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-F77;, &cv-link-F90;, &cv-link-F95;, &cv-link-FORTRAN;, &cv-link-SHF77;, &cv-link-SHF77FLAGS;, &cv-link-SHF90;, &cv-link-SHF90FLAGS;, &cv-link-SHF95;, &cv-link-SHF95FLAGS;, &cv-link-SHFORTRAN;, &cv-link-SHFORTRANFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-ilink">
     <term>ilink</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the
 <application>ilink</application> linker on OS/2 systems.
 </para>
-<para>Sets:  &amp;cv-link-LIBDIRPREFIX;, &amp;cv-link-LIBDIRSUFFIX;, &amp;cv-link-LIBLINKPREFIX;, &amp;cv-link-LIBLINKSUFFIX;, &amp;cv-link-LINK;, &amp;cv-link-LINKCOM;, &amp;cv-link-LINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-LIBDIRPREFIX;, &cv-link-LIBDIRSUFFIX;, &cv-link-LIBLINKPREFIX;, &cv-link-LIBLINKSUFFIX;, &cv-link-LINK;, &cv-link-LINKCOM;, &cv-link-LINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-ilink32">
     <term>ilink32</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Borland
 <application>ilink32</application> linker.
 </para>
-<para>Sets:  &amp;cv-link-LIBDIRPREFIX;, &amp;cv-link-LIBDIRSUFFIX;, &amp;cv-link-LIBLINKPREFIX;, &amp;cv-link-LIBLINKSUFFIX;, &amp;cv-link-LINK;, &amp;cv-link-LINKCOM;, &amp;cv-link-LINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-LIBDIRPREFIX;, &cv-link-LIBDIRSUFFIX;, &cv-link-LIBLINKPREFIX;, &cv-link-LIBLINKSUFFIX;, &cv-link-LINK;, &cv-link-LINKCOM;, &cv-link-LINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-install">
     <term>install</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for file
 and directory installation.
 </para>
-<para>Sets:  &amp;cv-link-INSTALL;, &amp;cv-link-INSTALLSTR;.</para></listitem>
+<para>Sets:  &cv-link-INSTALL;, &cv-link-INSTALLSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-intelc">
     <term>intelc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Intel C/C++ compiler
 (Linux and Windows, version 7 and later).
-Calls the <literal>gcc</literal> or <literal>msvc</literal>
+Calls the <literal xmlns="http://www.scons.org/dbxsd/v1.0">gcc</literal> or <literal xmlns="http://www.scons.org/dbxsd/v1.0">msvc</literal>
 (on Linux and Windows, respectively)
 to set underlying variables.
 </para>
-<para>Sets:  &amp;cv-link-AR;, &amp;cv-link-CC;, &amp;cv-link-CXX;, &amp;cv-link-INTEL_C_COMPILER_VERSION;, &amp;cv-link-LINK;.</para></listitem>
+<para>Sets:  &cv-link-AR;, &cv-link-CC;, &cv-link-CXX;, &cv-link-INTEL_C_COMPILER_VERSION;, &cv-link-LINK;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-jar">
     <term>jar</term>
-    <listitem><para>
-Sets construction variables for the <application>jar</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">jar</application> utility.
 </para>
-<para>Sets:  &amp;cv-link-JAR;, &amp;cv-link-JARCOM;, &amp;cv-link-JARFLAGS;, &amp;cv-link-JARSUFFIX;.</para><para>Uses:  &amp;cv-link-JARCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-JAR;, &cv-link-JARCOM;, &cv-link-JARFLAGS;, &cv-link-JARSUFFIX;.</para><para>Uses:  &cv-link-JARCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-javac">
     <term>javac</term>
-    <listitem><para>
-                Sets construction variables for the <application>javac</application> compiler.
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
             </para>
-        <para>Sets:  &amp;cv-link-JAVABOOTCLASSPATH;, &amp;cv-link-JAVAC;, &amp;cv-link-JAVACCOM;, &amp;cv-link-JAVACFLAGS;, &amp;cv-link-JAVACLASSPATH;, &amp;cv-link-JAVACLASSSUFFIX;, &amp;cv-link-JAVAINCLUDES;, &amp;cv-link-JAVASOURCEPATH;, &amp;cv-link-JAVASUFFIX;.</para><para>Uses:  &amp;cv-link-JAVACCOMSTR;.</para></listitem>
+        <para>Sets:  &cv-link-JAVABOOTCLASSPATH;, &cv-link-JAVAC;, &cv-link-JAVACCOM;, &cv-link-JAVACFLAGS;, &cv-link-JAVACLASSPATH;, &cv-link-JAVACLASSSUFFIX;, &cv-link-JAVAINCLUDES;, &cv-link-JAVASOURCEPATH;, &cv-link-JAVASUFFIX;.</para><para>Uses:  &cv-link-JAVACCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-javah">
     <term>javah</term>
-    <listitem><para>
-Sets construction variables for the <application>javah</application> tool.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">javah</application> tool.
 </para>
-<para>Sets:  &amp;cv-link-JAVACLASSSUFFIX;, &amp;cv-link-JAVAH;, &amp;cv-link-JAVAHCOM;, &amp;cv-link-JAVAHFLAGS;.</para><para>Uses:  &amp;cv-link-JAVACLASSPATH;, &amp;cv-link-JAVAHCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-JAVACLASSSUFFIX;, &cv-link-JAVAH;, &cv-link-JAVAHCOM;, &cv-link-JAVAHFLAGS;.</para><para>Uses:  &cv-link-JAVACLASSPATH;, &cv-link-JAVAHCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-latex">
     <term>latex</term>
-    <listitem><para>
-Sets construction variables for the <application>latex</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">latex</application> utility.
 </para>
-<para>Sets:  &amp;cv-link-LATEX;, &amp;cv-link-LATEXCOM;, &amp;cv-link-LATEXFLAGS;.</para><para>Uses:  &amp;cv-link-LATEXCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-LATEX;, &cv-link-LATEXCOM;, &cv-link-LATEXFLAGS;.</para><para>Uses:  &cv-link-LATEXCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-ldc">
     <term>ldc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the D language compiler LDC2.
 </para>
-<para>Sets:  &amp;cv-link-DC;, &amp;cv-link-DCOM;, &amp;cv-link-DDEBUG;, &amp;cv-link-DDEBUGPREFIX;, &amp;cv-link-DDEBUGSUFFIX;, &amp;cv-link-DFILESUFFIX;, &amp;cv-link-DFLAGPREFIX;, &amp;cv-link-DFLAGS;, &amp;cv-link-DFLAGSUFFIX;, &amp;cv-link-DINCPREFIX;, &amp;cv-link-DINCSUFFIX;, &amp;cv-link-DLIB;, &amp;cv-link-DLIBCOM;, &amp;cv-link-DLIBDIRPREFIX;, &amp;cv-link-DLIBDIRSUFFIX;, &amp;cv-link-DLIBFLAGPREFIX;, &amp;cv-link-DLIBFLAGSUFFIX;, &amp;cv-link-DLIBLINKPREFIX;, &amp;cv-link-DLIBLINKSUFFIX;, &amp;cv-link-DLINK;, &amp;cv-link-DLINKCOM;, &amp;cv-link-DLINKFLAGPREFIX;, &amp;cv-link-DLINKFLAGS;, &amp;cv-link-DLINKFLAGSUFFIX;, &amp;cv-link-DPATH;, &amp;cv-link-DRPATHPREFIX;, &amp;cv-link-DRPATHSUFFIX;, &amp;cv-link-DShLibSonameGenerator;, &amp;cv-link-DVERPREFIX;, &amp;cv-link-DVERSIONS;, &amp;cv-link-DVERSUFFIX;, &amp;cv-link-SHDC;, &amp;cv-link-SHDCOM;, &amp;cv-link-SHDLIBVERSION;, &amp;cv-link-SHDLIBVERSIONFLAGS;, &amp;cv-link-SHDLINK;, &amp;cv-link-SHDLINKCOM;, &amp;cv-link-SHDLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DRPATHPREFIX;, &cv-link-DRPATHSUFFIX;, &cv-link-DShLibSonameGenerator;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLIBVERSION;, &cv-link-SHDLIBVERSIONFLAGS;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-lex">
     <term>lex</term>
-    <listitem><para>
-Sets construction variables for the <application>lex</application> lexical analyser.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">lex</application> lexical analyser.
 </para>
-<para>Sets:  &amp;cv-link-LEX;, &amp;cv-link-LEXCOM;, &amp;cv-link-LEXFLAGS;.</para><para>Uses:  &amp;cv-link-LEXCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-LEX;, &cv-link-LEXCOM;, &cv-link-LEXFLAGS;.</para><para>Uses:  &cv-link-LEXCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-link">
     <term>link</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for generic POSIX linkers.
 </para>
-<para>Sets:  &amp;cv-link-LDMODULE;, &amp;cv-link-LDMODULECOM;, &amp;cv-link-LDMODULEFLAGS;, &amp;cv-link-LDMODULENOVERSIONSYMLINKS;, &amp;cv-link-LDMODULEPREFIX;, &amp;cv-link-LDMODULESUFFIX;, &amp;cv-link-LDMODULEVERSION;, &amp;cv-link-LDMODULEVERSIONFLAGS;, &amp;cv-link-LIBDIRPREFIX;, &amp;cv-link-LIBDIRSUFFIX;, &amp;cv-link-LIBLINKPREFIX;, &amp;cv-link-LIBLINKSUFFIX;, &amp;cv-link-LINK;, &amp;cv-link-LINKCOM;, &amp;cv-link-LINKFLAGS;, &amp;cv-link-SHLIBSUFFIX;, &amp;cv-link-SHLINK;, &amp;cv-link-SHLINKCOM;, &amp;cv-link-SHLINKFLAGS;, &amp;cv-link-__LDMODULEVERSIONFLAGS;, &amp;cv-link-__SHLIBVERSIONFLAGS;.</para><para>Uses:  &amp;cv-link-LDMODULECOMSTR;, &amp;cv-link-LINKCOMSTR;, &amp;cv-link-SHLINKCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-LDMODULE;, &cv-link-LDMODULECOM;, &cv-link-LDMODULEFLAGS;, &cv-link-LDMODULENOVERSIONSYMLINKS;, &cv-link-LDMODULEPREFIX;, &cv-link-LDMODULESUFFIX;, &cv-link-LDMODULEVERSION;, &cv-link-LDMODULEVERSIONFLAGS;, &cv-link-LIBDIRPREFIX;, &cv-link-LIBDIRSUFFIX;, &cv-link-LIBLINKPREFIX;, &cv-link-LIBLINKSUFFIX;, &cv-link-LINK;, &cv-link-LINKCOM;, &cv-link-LINKFLAGS;, &cv-link-SHLIBSUFFIX;, &cv-link-SHLINK;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;, &cv-link-__LDMODULEVERSIONFLAGS;, &cv-link-__SHLIBVERSIONFLAGS;.</para><para>Uses:  &cv-link-LDMODULECOMSTR;, &cv-link-LINKCOMSTR;, &cv-link-SHLINKCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-linkloc">
     <term>linkloc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the
 <application>LinkLoc</application>
 linker for the Phar Lap ETS embedded operating system.
 </para>
-<para>Sets:  &amp;cv-link-LIBDIRPREFIX;, &amp;cv-link-LIBDIRSUFFIX;, &amp;cv-link-LIBLINKPREFIX;, &amp;cv-link-LIBLINKSUFFIX;, &amp;cv-link-LINK;, &amp;cv-link-LINKCOM;, &amp;cv-link-LINKFLAGS;, &amp;cv-link-SHLINK;, &amp;cv-link-SHLINKCOM;, &amp;cv-link-SHLINKFLAGS;.</para><para>Uses:  &amp;cv-link-LINKCOMSTR;, &amp;cv-link-SHLINKCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-LIBDIRPREFIX;, &cv-link-LIBDIRSUFFIX;, &cv-link-LIBLINKPREFIX;, &cv-link-LIBLINKSUFFIX;, &cv-link-LINK;, &cv-link-LINKCOM;, &cv-link-LINKFLAGS;, &cv-link-SHLINK;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;.</para><para>Uses:  &cv-link-LINKCOMSTR;, &cv-link-SHLINKCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-m4">
     <term>m4</term>
-    <listitem><para>
-Sets construction variables for the <application>m4</application> macro processor.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">m4</application> macro processor.
 </para>
-<para>Sets:  &amp;cv-link-M4;, &amp;cv-link-M4COM;, &amp;cv-link-M4FLAGS;.</para><para>Uses:  &amp;cv-link-M4COMSTR;.</para></listitem>
+<para>Sets:  &cv-link-M4;, &cv-link-M4COM;, &cv-link-M4FLAGS;.</para><para>Uses:  &cv-link-M4COMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-masm">
     <term>masm</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Microsoft assembler.
 </para>
-<para>Sets:  &amp;cv-link-AS;, &amp;cv-link-ASCOM;, &amp;cv-link-ASFLAGS;, &amp;cv-link-ASPPCOM;, &amp;cv-link-ASPPFLAGS;.</para><para>Uses:  &amp;cv-link-ASCOMSTR;, &amp;cv-link-ASPPCOMSTR;, &amp;cv-link-CPPFLAGS;, &amp;cv-link-_CPPDEFFLAGS;, &amp;cv-link-_CPPINCFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.</para><para>Uses:  &cv-link-ASCOMSTR;, &cv-link-ASPPCOMSTR;, &cv-link-CPPFLAGS;, &cv-link-_CPPDEFFLAGS;, &cv-link-_CPPINCFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-midl">
     <term>midl</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Microsoft IDL compiler.
 </para>
-<para>Sets:  &amp;cv-link-MIDL;, &amp;cv-link-MIDLCOM;, &amp;cv-link-MIDLFLAGS;.</para><para>Uses:  &amp;cv-link-MIDLCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-MIDL;, &cv-link-MIDLCOM;, &cv-link-MIDLFLAGS;.</para><para>Uses:  &cv-link-MIDLCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-mingw">
     <term>mingw</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for MinGW (Minimal Gnu on Windows).
 </para>
-<para>Sets:  &amp;cv-link-AS;, &amp;cv-link-CC;, &amp;cv-link-CXX;, &amp;cv-link-LDMODULECOM;, &amp;cv-link-LIBPREFIX;, &amp;cv-link-LIBSUFFIX;, &amp;cv-link-OBJSUFFIX;, &amp;cv-link-RC;, &amp;cv-link-RCCOM;, &amp;cv-link-RCFLAGS;, &amp;cv-link-RCINCFLAGS;, &amp;cv-link-RCINCPREFIX;, &amp;cv-link-RCINCSUFFIX;, &amp;cv-link-SHCCFLAGS;, &amp;cv-link-SHCXXFLAGS;, &amp;cv-link-SHLINKCOM;, &amp;cv-link-SHLINKFLAGS;, &amp;cv-link-SHOBJSUFFIX;, &amp;cv-link-WINDOWSDEFPREFIX;, &amp;cv-link-WINDOWSDEFSUFFIX;.</para><para>Uses:  &amp;cv-link-RCCOMSTR;, &amp;cv-link-SHLINKCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-AS;, &cv-link-CC;, &cv-link-CXX;, &cv-link-LDMODULECOM;, &cv-link-LIBPREFIX;, &cv-link-LIBSUFFIX;, &cv-link-OBJSUFFIX;, &cv-link-RC;, &cv-link-RCCOM;, &cv-link-RCFLAGS;, &cv-link-RCINCFLAGS;, &cv-link-RCINCPREFIX;, &cv-link-RCINCSUFFIX;, &cv-link-SHCCFLAGS;, &cv-link-SHCXXFLAGS;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;, &cv-link-SHOBJSUFFIX;, &cv-link-WINDOWSDEFPREFIX;, &cv-link-WINDOWSDEFSUFFIX;.</para><para>Uses:  &cv-link-RCCOMSTR;, &cv-link-SHLINKCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-msgfmt">
     <term>msgfmt</term>
-    <listitem><para>
-This scons tool is a part of scons <link linkend="t-gettext"><literal>gettext</literal></link> toolset. It provides scons
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This scons tool is a part of scons <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-gettext"><literal>gettext</literal></link> toolset. It provides scons
 interface to <command>msgfmt(1)</command> command, which generates binary
 message catalog (<literal>MO</literal>) from a textual translation description
 (<literal>PO</literal>).
 </para>
-<para>Sets:  &amp;cv-link-MOSUFFIX;, &amp;cv-link-MSGFMT;, &amp;cv-link-MSGFMTCOM;, &amp;cv-link-MSGFMTCOMSTR;, &amp;cv-link-MSGFMTFLAGS;, &amp;cv-link-POSUFFIX;.</para><para>Uses:  &amp;cv-link-LINGUAS_FILE;.</para></listitem>
+<para>Sets:  &cv-link-MOSUFFIX;, &cv-link-MSGFMT;, &cv-link-MSGFMTCOM;, &cv-link-MSGFMTCOMSTR;, &cv-link-MSGFMTFLAGS;, &cv-link-POSUFFIX;.</para><para>Uses:  &cv-link-LINGUAS_FILE;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-msginit">
     <term>msginit</term>
-    <listitem><para>
-This scons tool is a part of scons <link linkend="t-gettext"><literal>gettext</literal></link> toolset. It provides
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This scons tool is a part of scons <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-gettext"><literal>gettext</literal></link> toolset. It provides
 scons interface to <command>msginit(1)</command> program, which creates new
 <literal>PO</literal> file, initializing the meta information with values from
 user's environment (or options).
 </para>
-<para>Sets:  &amp;cv-link-MSGINIT;, &amp;cv-link-MSGINITCOM;, &amp;cv-link-MSGINITCOMSTR;, &amp;cv-link-MSGINITFLAGS;, &amp;cv-link-POAUTOINIT;, &amp;cv-link-POCREATE_ALIAS;, &amp;cv-link-POSUFFIX;, &amp;cv-link-POTSUFFIX;, &amp;cv-link-_MSGINITLOCALE;.</para><para>Uses:  &amp;cv-link-LINGUAS_FILE;, &amp;cv-link-POAUTOINIT;, &amp;cv-link-POTDOMAIN;.</para></listitem>
+<para>Sets:  &cv-link-MSGINIT;, &cv-link-MSGINITCOM;, &cv-link-MSGINITCOMSTR;, &cv-link-MSGINITFLAGS;, &cv-link-POAUTOINIT;, &cv-link-POCREATE_ALIAS;, &cv-link-POSUFFIX;, &cv-link-POTSUFFIX;, &cv-link-_MSGINITLOCALE;.</para><para>Uses:  &cv-link-LINGUAS_FILE;, &cv-link-POAUTOINIT;, &cv-link-POTDOMAIN;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-msgmerge">
     <term>msgmerge</term>
-    <listitem><para>
-This scons tool is a part of scons <link linkend="t-gettext"><literal>gettext</literal></link> toolset. It provides
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This scons tool is a part of scons <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-gettext"><literal>gettext</literal></link> toolset. It provides
 scons interface to <command>msgmerge(1)</command> command, which merges two
 Uniform style <filename>.po</filename> files together. 
 </para>
-<para>Sets:  &amp;cv-link-MSGMERGE;, &amp;cv-link-MSGMERGECOM;, &amp;cv-link-MSGMERGECOMSTR;, &amp;cv-link-MSGMERGEFLAGS;, &amp;cv-link-POSUFFIX;, &amp;cv-link-POTSUFFIX;, &amp;cv-link-POUPDATE_ALIAS;.</para><para>Uses:  &amp;cv-link-LINGUAS_FILE;, &amp;cv-link-POAUTOINIT;, &amp;cv-link-POTDOMAIN;.</para></listitem>
+<para>Sets:  &cv-link-MSGMERGE;, &cv-link-MSGMERGECOM;, &cv-link-MSGMERGECOMSTR;, &cv-link-MSGMERGEFLAGS;, &cv-link-POSUFFIX;, &cv-link-POTSUFFIX;, &cv-link-POUPDATE_ALIAS;.</para><para>Uses:  &cv-link-LINGUAS_FILE;, &cv-link-POAUTOINIT;, &cv-link-POTDOMAIN;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-mslib">
     <term>mslib</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Microsoft
 <application>mslib</application>
 library archiver.
 </para>
-<para>Sets:  &amp;cv-link-AR;, &amp;cv-link-ARCOM;, &amp;cv-link-ARFLAGS;, &amp;cv-link-LIBPREFIX;, &amp;cv-link-LIBSUFFIX;.</para><para>Uses:  &amp;cv-link-ARCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-AR;, &cv-link-ARCOM;, &cv-link-ARFLAGS;, &cv-link-LIBPREFIX;, &cv-link-LIBSUFFIX;.</para><para>Uses:  &cv-link-ARCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-mslink">
     <term>mslink</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Microsoft linker.
 </para>
-<para>Sets:  &amp;cv-link-LDMODULE;, &amp;cv-link-LDMODULECOM;, &amp;cv-link-LDMODULEFLAGS;, &amp;cv-link-LDMODULEPREFIX;, &amp;cv-link-LDMODULESUFFIX;, &amp;cv-link-LIBDIRPREFIX;, &amp;cv-link-LIBDIRSUFFIX;, &amp;cv-link-LIBLINKPREFIX;, &amp;cv-link-LIBLINKSUFFIX;, &amp;cv-link-LINK;, &amp;cv-link-LINKCOM;, &amp;cv-link-LINKFLAGS;, &amp;cv-link-REGSVR;, &amp;cv-link-REGSVRCOM;, &amp;cv-link-REGSVRFLAGS;, &amp;cv-link-SHLINK;, &amp;cv-link-SHLINKCOM;, &amp;cv-link-SHLINKFLAGS;, &amp;cv-link-WIN32DEFPREFIX;, &amp;cv-link-WIN32DEFSUFFIX;, &amp;cv-link-WIN32EXPPREFIX;, &amp;cv-link-WIN32EXPSUFFIX;, &amp;cv-link-WINDOWSDEFPREFIX;, &amp;cv-link-WINDOWSDEFSUFFIX;, &amp;cv-link-WINDOWSEXPPREFIX;, &amp;cv-link-WINDOWSEXPSUFFIX;, &amp;cv-link-WINDOWSPROGMANIFESTPREFIX;, &amp;cv-link-WINDOWSPROGMANIFESTSUFFIX;, &amp;cv-link-WINDOWSSHLIBMANIFESTPREFIX;, &amp;cv-link-WINDOWSSHLIBMANIFESTSUFFIX;, &amp;cv-link-WINDOWS_INSERT_DEF;.</para><para>Uses:  &amp;cv-link-LDMODULECOMSTR;, &amp;cv-link-LINKCOMSTR;, &amp;cv-link-REGSVRCOMSTR;, &amp;cv-link-SHLINKCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-LDMODULE;, &cv-link-LDMODULECOM;, &cv-link-LDMODULEFLAGS;, &cv-link-LDMODULEPREFIX;, &cv-link-LDMODULESUFFIX;, &cv-link-LIBDIRPREFIX;, &cv-link-LIBDIRSUFFIX;, &cv-link-LIBLINKPREFIX;, &cv-link-LIBLINKSUFFIX;, &cv-link-LINK;, &cv-link-LINKCOM;, &cv-link-LINKFLAGS;, &cv-link-REGSVR;, &cv-link-REGSVRCOM;, &cv-link-REGSVRFLAGS;, &cv-link-SHLINK;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;, &cv-link-WIN32DEFPREFIX;, &cv-link-WIN32DEFSUFFIX;, &cv-link-WIN32EXPPREFIX;, &cv-link-WIN32EXPSUFFIX;, &cv-link-WINDOWSDEFPREFIX;, &cv-link-WINDOWSDEFSUFFIX;, &cv-link-WINDOWSEXPPREFIX;, &cv-link-WINDOWSEXPSUFFIX;, &cv-link-WINDOWSPROGMANIFESTPREFIX;, &cv-link-WINDOWSPROGMANIFESTSUFFIX;, &cv-link-WINDOWSSHLIBMANIFESTPREFIX;, &cv-link-WINDOWSSHLIBMANIFESTSUFFIX;, &cv-link-WINDOWS_INSERT_DEF;.</para><para>Uses:  &cv-link-LDMODULECOMSTR;, &cv-link-LINKCOMSTR;, &cv-link-REGSVRCOMSTR;, &cv-link-SHLINKCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-mssdk">
     <term>mssdk</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets variables for Microsoft Platform SDK and/or Windows SDK.
 Note that unlike most other Tool modules,
 mssdk does not set construction variables,
 but sets the <emphasis>environment variables</emphasis>
-in the environment <application>SCons</application> uses to execute
+in the environment <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> uses to execute
 the Microsoft toolchain:
 <literal>%INCLUDE%</literal>,
 <literal>%LIB%</literal>,
 <literal>%LIBPATH%</literal> and
 <literal>%PATH%</literal>.
 </para>
-<para>Uses:  &amp;cv-link-MSSDK_DIR;, &amp;cv-link-MSSDK_VERSION;, &amp;cv-link-MSVS_VERSION;.</para></listitem>
+<para>Uses:  &cv-link-MSSDK_DIR;, &cv-link-MSSDK_VERSION;, &cv-link-MSVS_VERSION;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-msvc">
     <term>msvc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Microsoft Visual C/C++ compiler.
 </para>
-<para>Sets:  &amp;cv-link-BUILDERS;, &amp;cv-link-CC;, &amp;cv-link-CCCOM;, &amp;cv-link-CCFLAGS;, &amp;cv-link-CCPCHFLAGS;, &amp;cv-link-CCPDBFLAGS;, &amp;cv-link-CFILESUFFIX;, &amp;cv-link-CFLAGS;, &amp;cv-link-CPPDEFPREFIX;, &amp;cv-link-CPPDEFSUFFIX;, &amp;cv-link-CXX;, &amp;cv-link-CXXCOM;, &amp;cv-link-CXXFILESUFFIX;, &amp;cv-link-CXXFLAGS;, &amp;cv-link-INCPREFIX;, &amp;cv-link-INCSUFFIX;, &amp;cv-link-OBJPREFIX;, &amp;cv-link-OBJSUFFIX;, &amp;cv-link-PCHCOM;, &amp;cv-link-PCHPDBFLAGS;, &amp;cv-link-RC;, &amp;cv-link-RCCOM;, &amp;cv-link-RCFLAGS;, &amp;cv-link-SHCC;, &amp;cv-link-SHCCCOM;, &amp;cv-link-SHCCFLAGS;, &amp;cv-link-SHCFLAGS;, &amp;cv-link-SHCXX;, &amp;cv-link-SHCXXCOM;, &amp;cv-link-SHCXXFLAGS;, &amp;cv-link-SHOBJPREFIX;, &amp;cv-link-SHOBJSUFFIX;.</para><para>Uses:  &amp;cv-link-CCCOMSTR;, &amp;cv-link-CXXCOMSTR;, &amp;cv-link-PCH;, &amp;cv-link-PCHSTOP;, &amp;cv-link-PDB;, &amp;cv-link-SHCCCOMSTR;, &amp;cv-link-SHCXXCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-BUILDERS;, &cv-link-CC;, &cv-link-CCCOM;, &cv-link-CCFLAGS;, &cv-link-CCPCHFLAGS;, &cv-link-CCPDBFLAGS;, &cv-link-CFILESUFFIX;, &cv-link-CFLAGS;, &cv-link-CPPDEFPREFIX;, &cv-link-CPPDEFSUFFIX;, &cv-link-CXX;, &cv-link-CXXCOM;, &cv-link-CXXFILESUFFIX;, &cv-link-CXXFLAGS;, &cv-link-INCPREFIX;, &cv-link-INCSUFFIX;, &cv-link-OBJPREFIX;, &cv-link-OBJSUFFIX;, &cv-link-PCHCOM;, &cv-link-PCHPDBFLAGS;, &cv-link-RC;, &cv-link-RCCOM;, &cv-link-RCFLAGS;, &cv-link-SHCC;, &cv-link-SHCCCOM;, &cv-link-SHCCFLAGS;, &cv-link-SHCFLAGS;, &cv-link-SHCXX;, &cv-link-SHCXXCOM;, &cv-link-SHCXXFLAGS;, &cv-link-SHOBJPREFIX;, &cv-link-SHOBJSUFFIX;.</para><para>Uses:  &cv-link-CCCOMSTR;, &cv-link-CXXCOMSTR;, &cv-link-PCH;, &cv-link-PCHSTOP;, &cv-link-PDB;, &cv-link-SHCCCOMSTR;, &cv-link-SHCXXCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-msvs">
     <term>msvs</term>
-    <listitem><para>
-Sets construction variables for Microsoft Visual Studio. </para> <para>Sets:  &amp;cv-link-MSVSBUILDCOM;, &amp;cv-link-MSVSCLEANCOM;, &amp;cv-link-MSVSENCODING;, &amp;cv-link-MSVSPROJECTCOM;, &amp;cv-link-MSVSREBUILDCOM;, &amp;cv-link-MSVSSCONS;, &amp;cv-link-MSVSSCONSCOM;, &amp;cv-link-MSVSSCONSCRIPT;, &amp;cv-link-MSVSSCONSFLAGS;, &amp;cv-link-MSVSSOLUTIONCOM;.</para></listitem>
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for Microsoft Visual Studio. </para> <para>Sets:  &cv-link-MSVSBUILDCOM;, &cv-link-MSVSCLEANCOM;, &cv-link-MSVSENCODING;, &cv-link-MSVSPROJECTCOM;, &cv-link-MSVSREBUILDCOM;, &cv-link-MSVSSCONS;, &cv-link-MSVSSCONSCOM;, &cv-link-MSVSSCONSCRIPT;, &cv-link-MSVSSCONSFLAGS;, &cv-link-MSVSSOLUTIONCOM;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-mwcc">
     <term>mwcc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Metrowerks CodeWarrior compiler.
 </para>
-<para>Sets:  &amp;cv-link-CC;, &amp;cv-link-CCCOM;, &amp;cv-link-CFILESUFFIX;, &amp;cv-link-CPPDEFPREFIX;, &amp;cv-link-CPPDEFSUFFIX;, &amp;cv-link-CXX;, &amp;cv-link-CXXCOM;, &amp;cv-link-CXXFILESUFFIX;, &amp;cv-link-INCPREFIX;, &amp;cv-link-INCSUFFIX;, &amp;cv-link-MWCW_VERSION;, &amp;cv-link-MWCW_VERSIONS;, &amp;cv-link-SHCC;, &amp;cv-link-SHCCCOM;, &amp;cv-link-SHCCFLAGS;, &amp;cv-link-SHCFLAGS;, &amp;cv-link-SHCXX;, &amp;cv-link-SHCXXCOM;, &amp;cv-link-SHCXXFLAGS;.</para><para>Uses:  &amp;cv-link-CCCOMSTR;, &amp;cv-link-CXXCOMSTR;, &amp;cv-link-SHCCCOMSTR;, &amp;cv-link-SHCXXCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-CC;, &cv-link-CCCOM;, &cv-link-CFILESUFFIX;, &cv-link-CPPDEFPREFIX;, &cv-link-CPPDEFSUFFIX;, &cv-link-CXX;, &cv-link-CXXCOM;, &cv-link-CXXFILESUFFIX;, &cv-link-INCPREFIX;, &cv-link-INCSUFFIX;, &cv-link-MWCW_VERSION;, &cv-link-MWCW_VERSIONS;, &cv-link-SHCC;, &cv-link-SHCCCOM;, &cv-link-SHCCFLAGS;, &cv-link-SHCFLAGS;, &cv-link-SHCXX;, &cv-link-SHCXXCOM;, &cv-link-SHCXXFLAGS;.</para><para>Uses:  &cv-link-CCCOMSTR;, &cv-link-CXXCOMSTR;, &cv-link-SHCCCOMSTR;, &cv-link-SHCXXCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-mwld">
     <term>mwld</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Metrowerks CodeWarrior linker.
 </para>
-<para>Sets:  &amp;cv-link-AR;, &amp;cv-link-ARCOM;, &amp;cv-link-LIBDIRPREFIX;, &amp;cv-link-LIBDIRSUFFIX;, &amp;cv-link-LIBLINKPREFIX;, &amp;cv-link-LIBLINKSUFFIX;, &amp;cv-link-LINK;, &amp;cv-link-LINKCOM;, &amp;cv-link-SHLINK;, &amp;cv-link-SHLINKCOM;, &amp;cv-link-SHLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-AR;, &cv-link-ARCOM;, &cv-link-LIBDIRPREFIX;, &cv-link-LIBDIRSUFFIX;, &cv-link-LIBLINKPREFIX;, &cv-link-LIBLINKSUFFIX;, &cv-link-LINK;, &cv-link-LINKCOM;, &cv-link-SHLINK;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-nasm">
     <term>nasm</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the
 <application>nasm</application> Netwide Assembler.
 </para>
-<para>Sets:  &amp;cv-link-AS;, &amp;cv-link-ASCOM;, &amp;cv-link-ASFLAGS;, &amp;cv-link-ASPPCOM;, &amp;cv-link-ASPPFLAGS;.</para><para>Uses:  &amp;cv-link-ASCOMSTR;, &amp;cv-link-ASPPCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.</para><para>Uses:  &cv-link-ASCOMSTR;, &cv-link-ASPPCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-Packaging">
     <term>Packaging</term>
-    <listitem><para>
-Sets construction variables for the <function>Package</function> Builder.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="t-packaging">
     <term>packaging</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A framework for building binary and source packages.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="t-pdf">
     <term>pdf</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Portable Document Format builder.
 </para>
-<para>Sets:  &amp;cv-link-PDFPREFIX;, &amp;cv-link-PDFSUFFIX;.</para></listitem>
+<para>Sets:  &cv-link-PDFPREFIX;, &cv-link-PDFSUFFIX;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-pdflatex">
     <term>pdflatex</term>
-    <listitem><para>
-Sets construction variables for the <application>pdflatex</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">pdflatex</application> utility.
 </para>
-<para>Sets:  &amp;cv-link-LATEXRETRIES;, &amp;cv-link-PDFLATEX;, &amp;cv-link-PDFLATEXCOM;, &amp;cv-link-PDFLATEXFLAGS;.</para><para>Uses:  &amp;cv-link-PDFLATEXCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-LATEXRETRIES;, &cv-link-PDFLATEX;, &cv-link-PDFLATEXCOM;, &cv-link-PDFLATEXFLAGS;.</para><para>Uses:  &cv-link-PDFLATEXCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-pdftex">
     <term>pdftex</term>
-    <listitem><para>
-Sets construction variables for the <application>pdftex</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">pdftex</application> utility.
 </para>
-<para>Sets:  &amp;cv-link-LATEXRETRIES;, &amp;cv-link-PDFLATEX;, &amp;cv-link-PDFLATEXCOM;, &amp;cv-link-PDFLATEXFLAGS;, &amp;cv-link-PDFTEX;, &amp;cv-link-PDFTEXCOM;, &amp;cv-link-PDFTEXFLAGS;.</para><para>Uses:  &amp;cv-link-PDFLATEXCOMSTR;, &amp;cv-link-PDFTEXCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-LATEXRETRIES;, &cv-link-PDFLATEX;, &cv-link-PDFLATEXCOM;, &cv-link-PDFLATEXFLAGS;, &cv-link-PDFTEX;, &cv-link-PDFTEXCOM;, &cv-link-PDFTEXFLAGS;.</para><para>Uses:  &cv-link-PDFLATEXCOMSTR;, &cv-link-PDFTEXCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-qt">
     <term>qt</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for building Qt applications.
 </para>
-<para>Sets:  &amp;cv-link-QTDIR;, &amp;cv-link-QT_AUTOSCAN;, &amp;cv-link-QT_BINPATH;, &amp;cv-link-QT_CPPPATH;, &amp;cv-link-QT_LIB;, &amp;cv-link-QT_LIBPATH;, &amp;cv-link-QT_MOC;, &amp;cv-link-QT_MOCCXXPREFIX;, &amp;cv-link-QT_MOCCXXSUFFIX;, &amp;cv-link-QT_MOCFROMCXXCOM;, &amp;cv-link-QT_MOCFROMCXXFLAGS;, &amp;cv-link-QT_MOCFROMHCOM;, &amp;cv-link-QT_MOCFROMHFLAGS;, &amp;cv-link-QT_MOCHPREFIX;, &amp;cv-link-QT_MOCHSUFFIX;, &amp;cv-link-QT_UIC;, &amp;cv-link-QT_UICCOM;, &amp;cv-link-QT_UICDECLFLAGS;, &amp;cv-link-QT_UICDECLPREFIX;, &amp;cv-link-QT_UICDECLSUFFIX;, &amp;cv-link-QT_UICIMPLFLAGS;, &amp;cv-link-QT_UICIMPLPREFIX;, &amp;cv-link-QT_UICIMPLSUFFIX;, &amp;cv-link-QT_UISUFFIX;.</para></listitem>
+<para>Sets:  &cv-link-QTDIR;, &cv-link-QT_AUTOSCAN;, &cv-link-QT_BINPATH;, &cv-link-QT_CPPPATH;, &cv-link-QT_LIB;, &cv-link-QT_LIBPATH;, &cv-link-QT_MOC;, &cv-link-QT_MOCCXXPREFIX;, &cv-link-QT_MOCCXXSUFFIX;, &cv-link-QT_MOCFROMCXXCOM;, &cv-link-QT_MOCFROMCXXFLAGS;, &cv-link-QT_MOCFROMHCOM;, &cv-link-QT_MOCFROMHFLAGS;, &cv-link-QT_MOCHPREFIX;, &cv-link-QT_MOCHSUFFIX;, &cv-link-QT_UIC;, &cv-link-QT_UICCOM;, &cv-link-QT_UICDECLFLAGS;, &cv-link-QT_UICDECLPREFIX;, &cv-link-QT_UICDECLSUFFIX;, &cv-link-QT_UICIMPLFLAGS;, &cv-link-QT_UICIMPLPREFIX;, &cv-link-QT_UICIMPLSUFFIX;, &cv-link-QT_UISUFFIX;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-rmic">
     <term>rmic</term>
-    <listitem><para>
-Sets construction variables for the <application>rmic</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">rmic</application> utility.
 </para>
-<para>Sets:  &amp;cv-link-JAVACLASSSUFFIX;, &amp;cv-link-RMIC;, &amp;cv-link-RMICCOM;, &amp;cv-link-RMICFLAGS;.</para><para>Uses:  &amp;cv-link-RMICCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-JAVACLASSSUFFIX;, &cv-link-RMIC;, &cv-link-RMICCOM;, &cv-link-RMICFLAGS;.</para><para>Uses:  &cv-link-RMICCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-rpcgen">
     <term>rpcgen</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for building with RPCGEN.
 </para>
-<para>Sets:  &amp;cv-link-RPCGEN;, &amp;cv-link-RPCGENCLIENTFLAGS;, &amp;cv-link-RPCGENFLAGS;, &amp;cv-link-RPCGENHEADERFLAGS;, &amp;cv-link-RPCGENSERVICEFLAGS;, &amp;cv-link-RPCGENXDRFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-RPCGEN;, &cv-link-RPCGENCLIENTFLAGS;, &cv-link-RPCGENFLAGS;, &cv-link-RPCGENHEADERFLAGS;, &cv-link-RPCGENSERVICEFLAGS;, &cv-link-RPCGENXDRFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-sgiar">
     <term>sgiar</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the SGI library archiver.
 </para>
-<para>Sets:  &amp;cv-link-AR;, &amp;cv-link-ARCOMSTR;, &amp;cv-link-ARFLAGS;, &amp;cv-link-LIBPREFIX;, &amp;cv-link-LIBSUFFIX;, &amp;cv-link-SHLINK;, &amp;cv-link-SHLINKFLAGS;.</para><para>Uses:  &amp;cv-link-ARCOMSTR;, &amp;cv-link-SHLINKCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-AR;, &cv-link-ARCOMSTR;, &cv-link-ARFLAGS;, &cv-link-LIBPREFIX;, &cv-link-LIBSUFFIX;, &cv-link-SHLINK;, &cv-link-SHLINKFLAGS;.</para><para>Uses:  &cv-link-ARCOMSTR;, &cv-link-SHLINKCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-sgicXX">
     <term>sgic++</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the SGI C++ compiler.
 </para>
-<para>Sets:  &amp;cv-link-CXX;, &amp;cv-link-CXXFLAGS;, &amp;cv-link-SHCXX;, &amp;cv-link-SHOBJSUFFIX;.</para></listitem>
+<para>Sets:  &cv-link-CXX;, &cv-link-CXXFLAGS;, &cv-link-SHCXX;, &cv-link-SHOBJSUFFIX;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-sgicc">
     <term>sgicc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the SGI C compiler.
 </para>
-<para>Sets:  &amp;cv-link-CXX;, &amp;cv-link-SHOBJSUFFIX;.</para></listitem>
+<para>Sets:  &cv-link-CXX;, &cv-link-SHOBJSUFFIX;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-sgilink">
     <term>sgilink</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the SGI linker.
 </para>
-<para>Sets:  &amp;cv-link-LINK;, &amp;cv-link-RPATHPREFIX;, &amp;cv-link-RPATHSUFFIX;, &amp;cv-link-SHLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-LINK;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-sunar">
     <term>sunar</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Sun library archiver.
 </para>
-<para>Sets:  &amp;cv-link-AR;, &amp;cv-link-ARCOM;, &amp;cv-link-ARFLAGS;, &amp;cv-link-LIBPREFIX;, &amp;cv-link-LIBSUFFIX;.</para><para>Uses:  &amp;cv-link-ARCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-AR;, &cv-link-ARCOM;, &cv-link-ARFLAGS;, &cv-link-LIBPREFIX;, &cv-link-LIBSUFFIX;.</para><para>Uses:  &cv-link-ARCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-suncXX">
     <term>sunc++</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Sun C++ compiler.
 </para>
-<para>Sets:  &amp;cv-link-CXX;, &amp;cv-link-CXXVERSION;, &amp;cv-link-SHCXX;, &amp;cv-link-SHCXXFLAGS;, &amp;cv-link-SHOBJPREFIX;, &amp;cv-link-SHOBJSUFFIX;.</para></listitem>
+<para>Sets:  &cv-link-CXX;, &cv-link-CXXVERSION;, &cv-link-SHCXX;, &cv-link-SHCXXFLAGS;, &cv-link-SHOBJPREFIX;, &cv-link-SHOBJSUFFIX;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-suncc">
     <term>suncc</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Sun C compiler.
 </para>
-<para>Sets:  &amp;cv-link-CXX;, &amp;cv-link-SHCCFLAGS;, &amp;cv-link-SHOBJPREFIX;, &amp;cv-link-SHOBJSUFFIX;.</para></listitem>
+<para>Sets:  &cv-link-CXX;, &cv-link-SHCCFLAGS;, &cv-link-SHOBJPREFIX;, &cv-link-SHOBJSUFFIX;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-sunf77">
     <term>sunf77</term>
-    <listitem><para>
-Set construction variables for the Sun <application>f77</application> Fortran compiler.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Set construction variables for the Sun <application xmlns="http://www.scons.org/dbxsd/v1.0">f77</application> Fortran compiler.
 </para>
-<para>Sets:  &amp;cv-link-F77;, &amp;cv-link-FORTRAN;, &amp;cv-link-SHF77;, &amp;cv-link-SHF77FLAGS;, &amp;cv-link-SHFORTRAN;, &amp;cv-link-SHFORTRANFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-F77;, &cv-link-FORTRAN;, &cv-link-SHF77;, &cv-link-SHF77FLAGS;, &cv-link-SHFORTRAN;, &cv-link-SHFORTRANFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-sunf90">
     <term>sunf90</term>
-    <listitem><para>
-Set construction variables for the Sun <application>f90</application> Fortran compiler.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Set construction variables for the Sun <application xmlns="http://www.scons.org/dbxsd/v1.0">f90</application> Fortran compiler.
 </para>
-<para>Sets:  &amp;cv-link-F90;, &amp;cv-link-FORTRAN;, &amp;cv-link-SHF90;, &amp;cv-link-SHF90FLAGS;, &amp;cv-link-SHFORTRAN;, &amp;cv-link-SHFORTRANFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-F90;, &cv-link-FORTRAN;, &cv-link-SHF90;, &cv-link-SHF90FLAGS;, &cv-link-SHFORTRAN;, &cv-link-SHFORTRANFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-sunf95">
     <term>sunf95</term>
-    <listitem><para>
-Set construction variables for the Sun <application>f95</application> Fortran compiler.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Set construction variables for the Sun <application xmlns="http://www.scons.org/dbxsd/v1.0">f95</application> Fortran compiler.
 </para>
-<para>Sets:  &amp;cv-link-F95;, &amp;cv-link-FORTRAN;, &amp;cv-link-SHF95;, &amp;cv-link-SHF95FLAGS;, &amp;cv-link-SHFORTRAN;, &amp;cv-link-SHFORTRANFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-F95;, &cv-link-FORTRAN;, &cv-link-SHF95;, &cv-link-SHF95FLAGS;, &cv-link-SHFORTRAN;, &cv-link-SHFORTRANFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-sunlink">
     <term>sunlink</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Sun linker.
 </para>
-<para>Sets:  &amp;cv-link-RPATHPREFIX;, &amp;cv-link-RPATHSUFFIX;, &amp;cv-link-SHLINKFLAGS;.</para></listitem>
+<para>Sets:  &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHLINKFLAGS;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-swig">
     <term>swig</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the SWIG interface generator.
 </para>
-<para>Sets:  &amp;cv-link-SWIG;, &amp;cv-link-SWIGCFILESUFFIX;, &amp;cv-link-SWIGCOM;, &amp;cv-link-SWIGCXXFILESUFFIX;, &amp;cv-link-SWIGDIRECTORSUFFIX;, &amp;cv-link-SWIGFLAGS;, &amp;cv-link-SWIGINCPREFIX;, &amp;cv-link-SWIGINCSUFFIX;, &amp;cv-link-SWIGPATH;, &amp;cv-link-SWIGVERSION;, &amp;cv-link-_SWIGINCFLAGS;.</para><para>Uses:  &amp;cv-link-SWIGCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-SWIG;, &cv-link-SWIGCFILESUFFIX;, &cv-link-SWIGCOM;, &cv-link-SWIGCXXFILESUFFIX;, &cv-link-SWIGDIRECTORSUFFIX;, &cv-link-SWIGFLAGS;, &cv-link-SWIGINCPREFIX;, &cv-link-SWIGINCSUFFIX;, &cv-link-SWIGPATH;, &cv-link-SWIGVERSION;, &cv-link-_SWIGINCFLAGS;.</para><para>Uses:  &cv-link-SWIGCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-tar">
     <term>tar</term>
-    <listitem><para>
-Sets construction variables for the <application>tar</application> archiver.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">tar</application> archiver.
 </para>
-<para>Sets:  &amp;cv-link-TAR;, &amp;cv-link-TARCOM;, &amp;cv-link-TARFLAGS;, &amp;cv-link-TARSUFFIX;.</para><para>Uses:  &amp;cv-link-TARCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-TAR;, &cv-link-TARCOM;, &cv-link-TARFLAGS;, &cv-link-TARSUFFIX;.</para><para>Uses:  &cv-link-TARCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-tex">
     <term>tex</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the TeX formatter and typesetter.
 </para>
-<para>Sets:  &amp;cv-link-BIBTEX;, &amp;cv-link-BIBTEXCOM;, &amp;cv-link-BIBTEXFLAGS;, &amp;cv-link-LATEX;, &amp;cv-link-LATEXCOM;, &amp;cv-link-LATEXFLAGS;, &amp;cv-link-MAKEINDEX;, &amp;cv-link-MAKEINDEXCOM;, &amp;cv-link-MAKEINDEXFLAGS;, &amp;cv-link-TEX;, &amp;cv-link-TEXCOM;, &amp;cv-link-TEXFLAGS;.</para><para>Uses:  &amp;cv-link-BIBTEXCOMSTR;, &amp;cv-link-LATEXCOMSTR;, &amp;cv-link-MAKEINDEXCOMSTR;, &amp;cv-link-TEXCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-BIBTEX;, &cv-link-BIBTEXCOM;, &cv-link-BIBTEXFLAGS;, &cv-link-LATEX;, &cv-link-LATEXCOM;, &cv-link-LATEXFLAGS;, &cv-link-MAKEINDEX;, &cv-link-MAKEINDEXCOM;, &cv-link-MAKEINDEXFLAGS;, &cv-link-TEX;, &cv-link-TEXCOM;, &cv-link-TEXFLAGS;.</para><para>Uses:  &cv-link-BIBTEXCOMSTR;, &cv-link-LATEXCOMSTR;, &cv-link-MAKEINDEXCOMSTR;, &cv-link-TEXCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-textfile">
     <term>textfile</term>
-    <listitem><para>
-Set construction variables for the <function>Textfile</function> and <function>Substfile</function> builders.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Set construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Textfile</function> and <function xmlns="http://www.scons.org/dbxsd/v1.0">Substfile</function> builders.
 </para>
-<para>Sets:  &amp;cv-link-LINESEPARATOR;, &amp;cv-link-SUBSTFILEPREFIX;, &amp;cv-link-SUBSTFILESUFFIX;, &amp;cv-link-TEXTFILEPREFIX;, &amp;cv-link-TEXTFILESUFFIX;.</para><para>Uses:  &amp;cv-link-SUBST_DICT;.</para></listitem>
+<para>Sets:  &cv-link-LINESEPARATOR;, &cv-link-SUBSTFILEPREFIX;, &cv-link-SUBSTFILESUFFIX;, &cv-link-TEXTFILEPREFIX;, &cv-link-TEXTFILESUFFIX;.</para><para>Uses:  &cv-link-SUBST_DICT;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-tlib">
     <term>tlib</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the Borlan
 <application>tib</application> library archiver.
 </para>
-<para>Sets:  &amp;cv-link-AR;, &amp;cv-link-ARCOM;, &amp;cv-link-ARFLAGS;, &amp;cv-link-LIBPREFIX;, &amp;cv-link-LIBSUFFIX;.</para><para>Uses:  &amp;cv-link-ARCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-AR;, &cv-link-ARCOM;, &cv-link-ARFLAGS;, &cv-link-LIBPREFIX;, &cv-link-LIBSUFFIX;.</para><para>Uses:  &cv-link-ARCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-xgettext">
     <term>xgettext</term>
-    <listitem><para>
-This scons tool is a part of scons <link linkend="t-gettext"><literal>gettext</literal></link> toolset. It provides
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This scons tool is a part of scons <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-gettext"><literal>gettext</literal></link> toolset. It provides
 scons interface to <command>xgettext(1)</command>
 program, which extracts internationalized messages from source code. The tool
-provides <function>POTUpdate</function> builder to make  <literal>PO</literal>
+provides <function xmlns="http://www.scons.org/dbxsd/v1.0">POTUpdate</function> builder to make  <literal>PO</literal>
 <emphasis>Template</emphasis> files. 
 </para>
-<para>Sets:  &amp;cv-link-POTSUFFIX;, &amp;cv-link-POTUPDATE_ALIAS;, &amp;cv-link-XGETTEXTCOM;, &amp;cv-link-XGETTEXTCOMSTR;, &amp;cv-link-XGETTEXTFLAGS;, &amp;cv-link-XGETTEXTFROM;, &amp;cv-link-XGETTEXTFROMPREFIX;, &amp;cv-link-XGETTEXTFROMSUFFIX;, &amp;cv-link-XGETTEXTPATH;, &amp;cv-link-XGETTEXTPATHPREFIX;, &amp;cv-link-XGETTEXTPATHSUFFIX;, &amp;cv-link-_XGETTEXTDOMAIN;, &amp;cv-link-_XGETTEXTFROMFLAGS;, &amp;cv-link-_XGETTEXTPATHFLAGS;.</para><para>Uses:  &amp;cv-link-POTDOMAIN;.</para></listitem>
+<para>Sets:  &cv-link-POTSUFFIX;, &cv-link-POTUPDATE_ALIAS;, &cv-link-XGETTEXTCOM;, &cv-link-XGETTEXTCOMSTR;, &cv-link-XGETTEXTFLAGS;, &cv-link-XGETTEXTFROM;, &cv-link-XGETTEXTFROMPREFIX;, &cv-link-XGETTEXTFROMSUFFIX;, &cv-link-XGETTEXTPATH;, &cv-link-XGETTEXTPATHPREFIX;, &cv-link-XGETTEXTPATHSUFFIX;, &cv-link-_XGETTEXTDOMAIN;, &cv-link-_XGETTEXTFROMFLAGS;, &cv-link-_XGETTEXTPATHFLAGS;.</para><para>Uses:  &cv-link-POTDOMAIN;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-yacc">
     <term>yacc</term>
-    <listitem><para>
-Sets construction variables for the <application>yacc</application> parse generator.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">yacc</application> parse generator.
 </para>
-<para>Sets:  &amp;cv-link-YACC;, &amp;cv-link-YACCCOM;, &amp;cv-link-YACCFLAGS;, &amp;cv-link-YACCHFILESUFFIX;, &amp;cv-link-YACCHXXFILESUFFIX;, &amp;cv-link-YACCVCGFILESUFFIX;.</para><para>Uses:  &amp;cv-link-YACCCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-YACC;, &cv-link-YACCCOM;, &cv-link-YACCFLAGS;, &cv-link-YACCHFILESUFFIX;, &cv-link-YACCHXXFILESUFFIX;, &cv-link-YACCVCGFILESUFFIX;.</para><para>Uses:  &cv-link-YACCCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-zip">
     <term>zip</term>
-    <listitem><para>
-Sets construction variables for the <application>zip</application> archiver.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">zip</application> archiver.
 </para>
-<para>Sets:  &amp;cv-link-ZIP;, &amp;cv-link-ZIPCOM;, &amp;cv-link-ZIPCOMPRESSION;, &amp;cv-link-ZIPFLAGS;, &amp;cv-link-ZIPSUFFIX;.</para><para>Uses:  &amp;cv-link-ZIPCOMSTR;.</para></listitem>
+<para>Sets:  &cv-link-ZIP;, &cv-link-ZIPCOM;, &cv-link-ZIPCOMPRESSION;, &cv-link-ZIPFLAGS;, &cv-link-ZIPSUFFIX;.</para><para>Uses:  &cv-link-ZIPCOMSTR;.</para></listitem>
   </varlistentry>
 </variablelist>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index dfc604d..5ed8c2f 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sconsdoc [
     <!ENTITY % scons SYSTEM "../scons.mod">
     %scons;
@@ -12,115 +12,125 @@
     %variables-mod;
 ]>
 
-<variablelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
+<variablelist 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">
   <varlistentry id="cv-__LDMODULEVERSIONFLAGS">
     <term>__LDMODULEVERSIONFLAGS</term>
-    <listitem><para>
-This construction variable automatically introduces <link linkend="cv-_LDMODULEVERSIONFLAGS"><envar>$_LDMODULEVERSIONFLAGS</envar></link>
-if <link linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> is set. Othervise it evaluates to an empty string.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This construction variable automatically introduces <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_LDMODULEVERSIONFLAGS"><envar>$_LDMODULEVERSIONFLAGS</envar></link>
+if <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> is set. Othervise it evaluates to an empty string.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-__SHLIBVERSIONFLAGS">
     <term>__SHLIBVERSIONFLAGS</term>
-    <listitem><para>
-This construction variable automatically introduces <link linkend="cv-_SHLIBVERSIONFLAGS"><envar>$_SHLIBVERSIONFLAGS</envar></link>
-if <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is set. Othervise it evaluates to an empty string.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This construction variable automatically introduces <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_SHLIBVERSIONFLAGS"><envar>$_SHLIBVERSIONFLAGS</envar></link>
+if <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is set. Othervise it evaluates to an empty string.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_APPLELINK_COMPATIBILITY_VERSION">
     <term>_APPLELINK_COMPATIBILITY_VERSION</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 A macro (by default a generator function) used to create the linker flags to specify
                 apple's linker's -compatibility_version flag.
-                The default generator uses <link linkend="cv-APPLELINK_COMPATIBILITY_VERSION"><envar>$APPLELINK_COMPATIBILITY_VERSION</envar></link>
-                and <link linkend="cv-APPLELINK_NO_COMPATIBILITY_VERSION"><envar>$APPLELINK_NO_COMPATIBILITY_VERSION</envar></link> and  <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>
+                The default generator uses <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_COMPATIBILITY_VERSION"><envar>$APPLELINK_COMPATIBILITY_VERSION</envar></link>
+                and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_NO_COMPATIBILITY_VERSION"><envar>$APPLELINK_NO_COMPATIBILITY_VERSION</envar></link> and  <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>
                 to determine the correct flag.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-APPLELINK_COMPATIBILITY_VERSION">
     <term>APPLELINK_COMPATIBILITY_VERSION</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 On Mac OS X this is used to set the linker flag:
 
                 -compatibility_version
             </para>
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 The value is specified as X[.Y[.Z]] where X is between 1 and 65535, Y can be omitted or between 1 and
-                255, Z can be omitted or between 1 and 255. This value will be derived from <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if
+                255, Z can be omitted or between 1 and 255. This value will be derived from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if
                 not
                 specified. The lowest digit will be dropped and replaced by a 0.
             </para>
-            <para>
-                If the <link linkend="cv-APPLELINK_NO_COMPATIBILITY_VERSION"><envar>$APPLELINK_NO_COMPATIBILITY_VERSION</envar></link> is set then no -compatibility_version will be
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                If the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_NO_COMPATIBILITY_VERSION"><envar>$APPLELINK_NO_COMPATIBILITY_VERSION</envar></link> is set then no -compatibility_version will be
                 output.
             </para>
-            <para>See MacOS's ld manpage for more details</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">See MacOS's ld manpage for more details</para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-_APPLELINK_CURRENT_VERSION">
     <term>_APPLELINK_CURRENT_VERSION</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 A macro (by default a generator function) used to create the linker flags to specify apple's linker's
-                -current_version flag.  The default generator uses <link linkend="cv-APPLELINK_CURRENT_VERSION"><envar>$APPLELINK_CURRENT_VERSION</envar></link> and
-                <link linkend="cv-APPLELINK_NO_CURRENT_VERSION"><envar>$APPLELINK_NO_CURRENT_VERSION</envar></link> and  <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> to determine the correct flag.
+                -current_version flag.  The default generator uses <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_CURRENT_VERSION"><envar>$APPLELINK_CURRENT_VERSION</envar></link> and
+                <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_NO_CURRENT_VERSION"><envar>$APPLELINK_NO_CURRENT_VERSION</envar></link> and  <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> to determine the correct flag.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-APPLELINK_CURRENT_VERSION">
     <term>APPLELINK_CURRENT_VERSION</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 On Mac OS X this is used to set the linker flag:
 
                 -current_version
             </para>
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 The value is specified as X[.Y[.Z]] where X is between 1 and 65535, Y can be omitted or between 1 and
-                255, Z can be omitted or between 1 and 255. This value will be set to <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if not
+                255, Z can be omitted or between 1 and 255. This value will be set to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if not
                 specified.
             </para>
-            <para>
-                If the <link linkend="cv-APPLELINK_NO_CURRENT_VERSION"><envar>$APPLELINK_NO_CURRENT_VERSION</envar></link> is set then no -current_version will be
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                If the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_NO_CURRENT_VERSION"><envar>$APPLELINK_NO_CURRENT_VERSION</envar></link> is set then no -current_version will be
                 output.
             </para>
-            <para>See MacOS's ld manpage for more details</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">See MacOS's ld manpage for more details</para>
 
         </listitem>
   </varlistentry>
   <varlistentry id="cv-APPLELINK_NO_COMPATIBILITY_VERSION">
     <term>APPLELINK_NO_COMPATIBILITY_VERSION</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Set this to any True (1|True|non-empty string) value to disable adding -compatibility_version flag when
                 generating versioned shared libraries.
             </para>
-            <para>
-                This overrides <link linkend="cv-APPLELINK_COMPATIBILITY_VERSION"><envar>$APPLELINK_COMPATIBILITY_VERSION</envar></link>.
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                This overrides <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_COMPATIBILITY_VERSION"><envar>$APPLELINK_COMPATIBILITY_VERSION</envar></link>.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-APPLELINK_NO_CURRENT_VERSION">
     <term>APPLELINK_NO_CURRENT_VERSION</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Set this to any True (1|True|non-empty string) value to disable adding -current_version flag when
                 generating versioned shared libraries.
             </para>
-            <para>
-                This overrides <link linkend="cv-APPLELINK_CURRENT_VERSION"><envar>$APPLELINK_CURRENT_VERSION</envar></link>.
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                This overrides <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-APPLELINK_CURRENT_VERSION"><envar>$APPLELINK_CURRENT_VERSION</envar></link>.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-AR">
     <term>AR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The static library archiver.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ARCHITECTURE">
     <term>ARCHITECTURE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies the system architecture for which
 the package is being built.
 The default is the system architecture
@@ -137,41 +147,46 @@ as well as forming part of the name of a generated RPM package file.
   </varlistentry>
   <varlistentry id="cv-ARCOM">
     <term>ARCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to generate a static library from object files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ARCOMSTR">
     <term>ARCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when an object file
 is generated from an assembly-language source file.
-If this is not set, then <link linkend="cv-ARCOM"><envar>$ARCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-ARCOM"><envar>$ARCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(ARCOMSTR = "Archiving $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ARFLAGS">
     <term>ARFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the static library archiver.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-AS">
     <term>AS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The assembler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ASCOM">
     <term>ASCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to generate an object file
 from an assembly-language source file.
 </para>
@@ -179,63 +194,69 @@ from an assembly-language source file.
   </varlistentry>
   <varlistentry id="cv-ASCOMSTR">
     <term>ASCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when an object file
 is generated from an assembly-language source file.
-If this is not set, then <link linkend="cv-ASCOM"><envar>$ASCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-ASCOM"><envar>$ASCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(ASCOMSTR = "Assembling $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ASFLAGS">
     <term>ASFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the assembler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ASPPCOM">
     <term>ASPPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to assemble an assembly-language
 source file into an object file
 after first running the file through the C preprocessor.
 Any options specified
-in the <link linkend="cv-ASFLAGS"><envar>$ASFLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-ASFLAGS"><envar>$ASFLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ASPPCOMSTR">
     <term>ASPPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when an object file
 is generated from an assembly-language source file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-ASPPCOM"><envar>$ASPPCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-ASPPCOM"><envar>$ASPPCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(ASPPCOMSTR = "Assembling $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ASPPFLAGS">
     <term>ASPPFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options when an assembling an assembly-language
 source file into an object file
 after first running the file through the C preprocessor.
-The default is to use the value of <link linkend="cv-ASFLAGS"><envar>$ASFLAGS</envar></link>.
+The default is to use the value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-ASFLAGS"><envar>$ASFLAGS</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-BIBTEX">
     <term>BIBTEX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The bibliography generator for the TeX formatter and typesetter and the
 LaTeX structured formatter and typesetter.
 </para>
@@ -243,7 +264,8 @@ LaTeX structured formatter and typesetter.
   </varlistentry>
   <varlistentry id="cv-BIBTEXCOM">
     <term>BIBTEXCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call the bibliography generator for the
 TeX formatter and typesetter and the LaTeX structured formatter and
 typesetter.
@@ -252,20 +274,22 @@ typesetter.
   </varlistentry>
   <varlistentry id="cv-BIBTEXCOMSTR">
     <term>BIBTEXCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when generating a bibliography
 for TeX or LaTeX.
-If this is not set, then <link linkend="cv-BIBTEXCOM"><envar>$BIBTEXCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-BIBTEXCOM"><envar>$BIBTEXCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(BIBTEXCOMSTR = "Generating bibliography $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-BIBTEXFLAGS">
     <term>BIBTEXFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the bibliography generator for the TeX formatter
 and typesetter and the LaTeX structured formatter and typesetter.
 </para>
@@ -273,7 +297,8 @@ and typesetter and the LaTeX structured formatter and typesetter.
   </varlistentry>
   <varlistentry id="cv-BUILDERS">
     <term>BUILDERS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A dictionary mapping the names of the builders
 available through this environment
 to underlying Builder objects.
@@ -284,26 +309,26 @@ If you initialize this variable when an
 Environment is created:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(BUILDERS = {'NewBuilder' : foo})
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 the default Builders will no longer be available.
 To use a new Builder object in addition to the default Builders,
 add your new Builder object like this:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment()
 env.Append(BUILDERS = {'NewBuilder' : foo})
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 or this:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment()
 env['BUILDERS']['NewBuilder'] = foo
 </example_commands>
@@ -311,64 +336,70 @@ env['BUILDERS']['NewBuilder'] = foo
   </varlistentry>
   <varlistentry id="cv-CC">
     <term>CC</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The C compiler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CCCOM">
     <term>CCCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a C source file to a (static) object
-file.  Any options specified in the <link linkend="cv-CFLAGS"><envar>$CFLAGS</envar></link>, <link linkend="cv-CCFLAGS"><envar>$CCFLAGS</envar></link> and
-<link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables are included on this command
+file.  Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CFLAGS"><envar>$CFLAGS</envar></link>, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCFLAGS"><envar>$CCFLAGS</envar></link> and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables are included on this command
 line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CCCOMSTR">
     <term>CCCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a C source file
 is compiled to a (static) object file.
-If this is not set, then <link linkend="cv-CCCOM"><envar>$CCCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCCOM"><envar>$CCCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(CCCOMSTR = "Compiling static object $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CCFLAGS">
     <term>CCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options that are passed to the C and C++ compilers.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CCPCHFLAGS">
     <term>CCPCHFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options added to the compiler command line
 to support building with precompiled headers.
 The default value expands expands to the appropriate
 Microsoft Visual C++ command-line options
-when the <link linkend="cv-PCH"><envar>$PCH</envar></link> construction variable is set.
+when the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PCH"><envar>$PCH</envar></link> construction variable is set.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CCPDBFLAGS">
     <term>CCPDBFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options added to the compiler command line
 to support storing debugging information in a
 Microsoft Visual C++ PDB file.
 The default value expands expands to appropriate
 Microsoft Visual C++ command-line options
-when the <link linkend="cv-PDB"><envar>$PDB</envar></link> construction variable is set.
+when the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PDB"><envar>$PDB</envar></link> construction variable is set.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Visual C++ compiler option that SCons uses by default
 to generate PDB information is <option>/Z7</option>.
 This works correctly with parallel (<option>-j</option>) builds
@@ -381,30 +412,31 @@ link-time performance,
 although parallel builds will no longer work.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 You can generate PDB files with the <option>/Zi</option>
-switch by overriding the default <link linkend="cv-CCPDBFLAGS"><envar>$CCPDBFLAGS</envar></link> variable as follows:
+switch by overriding the default <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCPDBFLAGS"><envar>$CCPDBFLAGS</envar></link> variable as follows:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env['CCPDBFLAGS'] = ['${(PDB and "/Zi /Fd%s" % File(PDB)) or ""}']
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An alternative would be to use the <option>/Zi</option>
 to put the debugging information in a separate <filename>.pdb</filename>
 file for each object file by overriding
-the <link linkend="cv-CCPDBFLAGS"><envar>$CCPDBFLAGS</envar></link> variable as follows:
+the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCPDBFLAGS"><envar>$CCPDBFLAGS</envar></link> variable as follows:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env['CCPDBFLAGS'] = '/Zi /Fd${TARGET}.pdb'
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CCVERSION">
     <term>CCVERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The version number of the C compiler.
 This may or may not be set,
 depending on the specific C compiler being used.
@@ -413,7 +445,8 @@ depending on the specific C compiler being used.
   </varlistentry>
   <varlistentry id="cv-CFILESUFFIX">
     <term>CFILESUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix for C source files.
 This is used by the internal CFile builder
 when generating C files from Lex (.l) or YACC (.y) input files.
@@ -430,14 +463,16 @@ as C files.
   </varlistentry>
   <varlistentry id="cv-CFLAGS">
     <term>CFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options that are passed to the C compiler (C only; not C++).
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CHANGE_SPECFILE">
     <term>CHANGE_SPECFILE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A hook for modifying the file that controls the packaging build
 (the <filename>.spec</filename> for RPM,
 the <filename>control</filename> for Ipkg,
@@ -449,7 +484,8 @@ after the SCons template for the file has been written.
   </varlistentry>
   <varlistentry id="cv-CHANGED_SOURCES">
     <term>CHANGED_SOURCES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A reserved variable name
 that may not be set or used in a construction environment.
 (See "Variable Substitution," below.)
@@ -458,7 +494,8 @@ that may not be set or used in a construction environment.
   </varlistentry>
   <varlistentry id="cv-CHANGED_TARGETS">
     <term>CHANGED_TARGETS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A reserved variable name
 that may not be set or used in a construction environment.
 (See "Variable Substitution," below.)
@@ -467,7 +504,8 @@ that may not be set or used in a construction environment.
   </varlistentry>
   <varlistentry id="cv-CHANGELOG">
     <term>CHANGELOG</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The name of a file containing the change log text
 to be included in the package.
 This is included as the
@@ -479,8 +517,9 @@ section of the RPM
   </varlistentry>
   <varlistentry id="cv-_concat">
     <term>_concat</term>
-    <listitem><para>
-A function used to produce variables like <envar>$_CPPINCFLAGS</envar>. It takes
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+A function used to produce variables like <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPINCFLAGS</envar>. It takes
 four or five
 arguments: a prefix to concatenate onto each element, a list of
 elements, a suffix to concatenate onto each element, an environment
@@ -488,14 +527,15 @@ for variable interpolation, and an optional function that will be
 called to transform the list before concatenation.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env['_CPPINCFLAGS'] = '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs)} $)',
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CONFIGUREDIR">
     <term>CONFIGUREDIR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The name of the directory in which
 Configure context test files are written.
 The default is
@@ -509,7 +549,8 @@ file.
   </varlistentry>
   <varlistentry id="cv-CONFIGURELOG">
     <term>CONFIGURELOG</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The name of the Configure context log file.
 The default is
 <filename>config.log</filename>
@@ -522,48 +563,50 @@ file.
   </varlistentry>
   <varlistentry id="cv-_CPPDEFFLAGS">
     <term>_CPPDEFFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the C preprocessor command-line options
 to define values.
-The value of <envar>$_CPPDEFFLAGS</envar> is created
+The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPDEFFLAGS</envar> is created
 by respectively prepending and appending
-<envar>$CPPDEFPREFIX</envar> and <envar>$CPPDEFSUFFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFSUFFIX</envar>
 to the beginning and end
-of each definition in <envar>$CPPDEFINES</envar>.
+of each definition in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CPPDEFINES">
     <term>CPPDEFINES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A platform independent specification of C preprocessor definitions.
 The definitions will be added to command lines
 through the automatically-generated
-<envar>$_CPPDEFFLAGS</envar> construction variable (see above),
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPDEFFLAGS</envar> construction variable (see above),
 which is constructed according to
-the type of value of <envar>$CPPDEFINES</envar>:
+the type of value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar>:
 </para>
 
-<para>
-If <envar>$CPPDEFINES</envar> is a string,
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar> is a string,
 the values of the
-<envar>$CPPDEFPREFIX</envar> and <envar>$CPPDEFSUFFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFSUFFIX</envar>
 construction variables
 will be respectively prepended and appended to the beginning and end
-of each definition in <envar>$CPPDEFINES</envar>.
+of each definition in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar>.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Will add -Dxyz to POSIX compiler command lines,
 # and /Dxyz to Microsoft Visual C++ command lines.
 env = Environment(CPPDEFINES='xyz')
 </example_commands>
 
-<para>
-If <envar>$CPPDEFINES</envar> is a list,
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar> is a list,
 the values of the
-<envar>$CPPDEFPREFIX</envar> and <envar>$CPPDEFSUFFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFSUFFIX</envar>
 construction variables
 will be respectively prepended and appended to the beginning and end
 of each element in the list.
@@ -572,16 +615,16 @@ then the first item is the name being
 defined and the second item is its value:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Will add -DB=2 -DA to POSIX compiler command lines,
 # and /DB=2 /DA to Microsoft Visual C++ command lines.
 env = Environment(CPPDEFINES=[('B', 2), 'A'])
 </example_commands>
 
-<para>
-If <envar>$CPPDEFINES</envar> is a dictionary,
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar> is a dictionary,
 the values of the
-<envar>$CPPDEFPREFIX</envar> and <envar>$CPPDEFSUFFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFSUFFIX</envar>
 construction variables
 will be respectively prepended and appended to the beginning and end
 of each item from the dictionary.
@@ -594,11 +637,11 @@ then the name is defined without an explicit value.
 Note that the resulting flags are sorted by keyword
 to ensure that the order of the options on the
 command line is consistent each time
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 is run.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 # Will add -DA -DB=2 to POSIX compiler command lines,
 # and /DA /DB=2 to Microsoft Visual C++ command lines.
 env = Environment(CPPDEFINES={'B':2, 'A':None})
@@ -607,42 +650,45 @@ env = Environment(CPPDEFINES={'B':2, 'A':None})
   </varlistentry>
   <varlistentry id="cv-CPPDEFPREFIX">
     <term>CPPDEFPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify preprocessor definitions
 on the C compiler command line.
 This will be prepended to the beginning of each definition
-in the <envar>$CPPDEFINES</envar> construction variable
-when the <envar>$_CPPDEFFLAGS</envar> variable is automatically generated.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPDEFFLAGS</envar> variable is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CPPDEFSUFFIX">
     <term>CPPDEFSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used to specify preprocessor definitions
 on the C compiler command line.
 This will be appended to the end of each definition
-in the <envar>$CPPDEFINES</envar> construction variable
-when the <envar>$_CPPDEFFLAGS</envar> variable is automatically generated.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPDEFINES</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPDEFFLAGS</envar> variable is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CPPFLAGS">
     <term>CPPFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 User-specified C preprocessor options.
 These will be included in any command that uses the C preprocessor,
 including not just compilation of C and C++ source files
-via the <link linkend="cv-CCCOM"><envar>$CCCOM</envar></link>,
-<link linkend="cv-SHCCCOM"><envar>$SHCCCOM</envar></link>,
-<link linkend="cv-CXXCOM"><envar>$CXXCOM</envar></link> and
-<link linkend="cv-SHCXXCOM"><envar>$SHCXXCOM</envar></link> command lines,
-but also the <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>,
-<link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>,
-<link linkend="cv-F77PPCOM"><envar>$F77PPCOM</envar></link> and
-<link linkend="cv-SHF77PPCOM"><envar>$SHF77PPCOM</envar></link> command lines
+via the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCCOM"><envar>$CCCOM</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHCCCOM"><envar>$SHCCCOM</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CXXCOM"><envar>$CXXCOM</envar></link> and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHCXXCOM"><envar>$SHCXXCOM</envar></link> command lines,
+but also the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77PPCOM"><envar>$F77PPCOM</envar></link> and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF77PPCOM"><envar>$SHF77PPCOM</envar></link> command lines
 used to compile a Fortran source file,
-and the <link linkend="cv-ASPPCOM"><envar>$ASPPCOM</envar></link> command line
+and the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-ASPPCOM"><envar>$ASPPCOM</envar></link> command line
 used to assemble an assembly language source file,
 after first running each file through the C preprocessor.
 Note that this variable does
@@ -650,28 +696,30 @@ Note that this variable does
 contain
 <option>-I</option>
 (or similar) include search path options
-that scons generates automatically from <link linkend="cv-CPPPATH"><envar>$CPPPATH</envar></link>.
-See <link linkend="cv-_CPPINCFLAGS"><envar>$_CPPINCFLAGS</envar></link>, below,
+that scons generates automatically from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPPATH"><envar>$CPPPATH</envar></link>.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_CPPINCFLAGS"><envar>$_CPPINCFLAGS</envar></link>, below,
 for the variable that expands to those options.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_CPPINCFLAGS">
     <term>_CPPINCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the C preprocessor command-line options
 for specifying directories to be searched for include files.
-The value of <envar>$_CPPINCFLAGS</envar> is created
-by respectively prepending and appending <envar>$INCPREFIX</envar> and <envar>$INCSUFFIX</envar>
+The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPINCFLAGS</envar> is created
+by respectively prepending and appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$INCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$INCSUFFIX</envar>
 to the beginning and end
-of each directory in <envar>$CPPPATH</envar>.
+of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CPPPATH">
     <term>CPPPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of directories that the C preprocessor will search for include
 directories. The C/C++ implicit dependency scanner will search these
 directories for include files. Don't explicitly put include directory
@@ -679,56 +727,57 @@ arguments in CCFLAGS or CXXFLAGS because the result will be non-portable
 and the directories will not be searched by the dependency scanner. Note:
 directory names in CPPPATH will be looked-up relative to the SConscript
 directory when they are used in a command. To force
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to look-up a directory relative to the root of the source tree use #:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(CPPPATH='#/include')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory look-up can also be forced using the
-<function>Dir</function>()
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Dir</function>()
 function:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 include = Dir('include')
 env = Environment(CPPPATH=include)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory list will be added to command lines
 through the automatically-generated
-<envar>$_CPPINCFLAGS</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPINCFLAGS</envar>
 construction variable,
 which is constructed by
 respectively prepending and appending the value of the
-<envar>$INCPREFIX</envar> and <envar>$INCSUFFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$INCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$INCSUFFIX</envar>
 construction variables
 to the beginning and end
-of each directory in <envar>$CPPPATH</envar>.
+of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar>.
 Any command lines you define that need
 the CPPPATH directory list should
-include <envar>$_CPPINCFLAGS</envar>:
+include <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPINCFLAGS</envar>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(CCCOM="my_compiler $_CPPINCFLAGS -c -o $TARGET $SOURCE")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CPPSUFFIXES">
     <term>CPPSUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of suffixes of files that will be scanned
 for C preprocessor implicit dependencies
 (#include lines).
 The default list is:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 [".c", ".C", ".cxx", ".cpp", ".c++", ".cc",
  ".h", ".H", ".hxx", ".hpp", ".hh",
  ".F", ".fpp", ".FPP",
@@ -739,37 +788,41 @@ The default list is:
   </varlistentry>
   <varlistentry id="cv-CXX">
     <term>CXX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The C++ compiler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CXXCOM">
     <term>CXXCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a C++ source file to an object file.
-Any options specified in the <link linkend="cv-CXXFLAGS"><envar>$CXXFLAGS</envar></link> and
-<link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CXXFLAGS"><envar>$CXXFLAGS</envar></link> and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CXXCOMSTR">
     <term>CXXCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a C++ source file
 is compiled to a (static) object file.
-If this is not set, then <link linkend="cv-CXXCOM"><envar>$CXXCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CXXCOM"><envar>$CXXCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(CXXCOMSTR = "Compiling static object $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CXXFILESUFFIX">
     <term>CXXFILESUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix for C++ source files.
 This is used by the internal CXXFile builder
 when generating C++ files from Lex (.ll) or YACC (.yy) input files.
@@ -795,18 +848,20 @@ as C++ files.
   </varlistentry>
   <varlistentry id="cv-CXXFLAGS">
     <term>CXXFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options that are passed to the C++ compiler.
-By default, this includes the value of <link linkend="cv-CCFLAGS"><envar>$CCFLAGS</envar></link>,
-so that setting <envar>$CCFLAGS</envar> affects both C and C++ compilation.
+By default, this includes the value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCFLAGS"><envar>$CCFLAGS</envar></link>,
+so that setting <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CCFLAGS</envar> affects both C and C++ compilation.
 If you want to add C++-specific flags,
-you must set or override the value of <link linkend="cv-CXXFLAGS"><envar>$CXXFLAGS</envar></link>.
+you must set or override the value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CXXFLAGS"><envar>$CXXFLAGS</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-CXXVERSION">
     <term>CXXVERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The version number of the C++ compiler.
 This may or may not be set,
 depending on the specific C++ compiler being used.
@@ -815,78 +870,94 @@ depending on the specific C++ compiler being used.
   </varlistentry>
   <varlistentry id="cv-DC">
     <term>DC</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The D compiler to use.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The D compiler to use.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The D compiler to use.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DCOM">
     <term>DCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line used to compile a D file to an object file.
-  Any options specified in the <link linkend="cv-DFLAGS"><envar>$DFLAGS</envar></link> construction variable
+  Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-DFLAGS"><envar>$DFLAGS</envar></link> construction variable
   is included on this command line.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line used to compile a D file to an object file.
-  Any options specified in the <link linkend="cv-DFLAGS"><envar>$DFLAGS</envar></link> construction variable
+  Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-DFLAGS"><envar>$DFLAGS</envar></link> construction variable
   is included on this command line.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line used to compile a D file to an object file.
-  Any options specified in the <link linkend="cv-DFLAGS"><envar>$DFLAGS</envar></link> construction variable
+  Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-DFLAGS"><envar>$DFLAGS</envar></link> construction variable
   is included on this command line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DDEBUG">
     <term>DDEBUG</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   List of debug tags to enable when compiling.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   List of debug tags to enable when compiling.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   List of debug tags to enable when compiling.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DDEBUGPREFIX">
     <term>DDEBUGPREFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DDEBUGPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DDEBUGPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DDEBUGPREFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DDEBUGSUFFIX">
     <term>DDEBUGSUFFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DDEBUGSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DDEBUGSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DDEBUGSUFFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DESCRIPTION">
     <term>DESCRIPTION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A long description of the project being packaged.
 This is included in the relevant section
 of the file that controls the packaging build.
@@ -895,7 +966,8 @@ of the file that controls the packaging build.
   </varlistentry>
   <varlistentry id="cv-DESCRIPTION_lang">
     <term>DESCRIPTION_lang</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A language-specific long description for
 the specified <varname>lang</varname>.
 This is used to populate a
@@ -907,89 +979,109 @@ section of an RPM
   </varlistentry>
   <varlistentry id="cv-DFILESUFFIX">
     <term>DFILESUFFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFILESUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFILESUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFILESUFFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DFLAGPREFIX">
     <term>DFLAGPREFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFLAGPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFLAGPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFLAGPREFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DFLAGS">
     <term>DFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   General options that are passed to the D compiler.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   General options that are passed to the D compiler.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   General options that are passed to the D compiler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DFLAGSUFFIX">
     <term>DFLAGSUFFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFLAGSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFLAGSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFLAGSUFFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DINCPREFIX">
     <term>DINCPREFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DINCPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DINCPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DINCPREFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DINCSUFFIX">
     <term>DINCSUFFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGSUFFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-Dir">
     <term>Dir</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A function that converts a string
 into a Dir instance relative to the target being built.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A function that converts a string
 into a Dir instance relative to the target being built.
 </para>
@@ -997,7 +1089,8 @@ into a Dir instance relative to the target being built.
   </varlistentry>
   <varlistentry id="cv-Dirs">
     <term>Dirs</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A function that converts a list of strings
 into a list of Dir instances relative to the target being built.
 </para>
@@ -1005,240 +1098,288 @@ into a list of Dir instances relative to the target being built.
   </varlistentry>
   <varlistentry id="cv-DLIB">
     <term>DLIB</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   Name of the lib tool to use for D codes.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   Name of the lib tool to use for D codes.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   Name of the lib tool to use for D codes.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBCOM">
     <term>DLIBCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when creating libraries.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when creating libraries.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when creating libraries.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBDIRPREFIX">
     <term>DLIBDIRPREFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKPREFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBDIRSUFFIX">
     <term>DLIBDIRSUFFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKSUFFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBFLAGPREFIX">
     <term>DLIBFLAGPREFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGPREFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBFLAGSUFFIX">
     <term>DLIBFLAGSUFFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGSUFFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBLINKPREFIX">
     <term>DLIBLINKPREFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKPREFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBLINKSUFFIX">
     <term>DLIBLINKSUFFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKSUFFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLINK">
     <term>DLINK</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   Name of the linker to use for linking systems including D sources.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   Name of the linker to use for linking systems including D sources.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   Name of the linker to use for linking systems including D sources.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DLINKCOM">
     <term>DLINKCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when linking systems including D sources.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when linking systems including D sources.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when linking systems including D sources.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DLINKFLAGPREFIX">
     <term>DLINKFLAGPREFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLINKFLAGPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLINKFLAGPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLINKFLAGPREFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLINKFLAGS">
     <term>DLINKFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 List of linker flags.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 List of linker flags.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 List of linker flags.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DLINKFLAGSUFFIX">
     <term>DLINKFLAGSUFFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLINKFLAGSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLINKFLAGSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLINKFLAGSUFFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_DEFAULT_XSL_EPUB">
     <term>DOCBOOK_DEFAULT_XSL_EPUB</term>
-    <listitem><para>
-The default XSLT file for the <link linkend="b-DocbookEpub"><function>DocbookEpub</function></link> builder within the
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The default XSLT file for the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookEpub"><function>DocbookEpub</function></link> builder within the
 current environment, if no other XSLT gets specified via keyword.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_DEFAULT_XSL_HTML">
     <term>DOCBOOK_DEFAULT_XSL_HTML</term>
-    <listitem><para>
-The default XSLT file for the <link linkend="b-DocbookHtml"><function>DocbookHtml</function></link> builder within the
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The default XSLT file for the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookHtml"><function>DocbookHtml</function></link> builder within the
 current environment, if no other XSLT gets specified via keyword.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_DEFAULT_XSL_HTMLCHUNKED">
     <term>DOCBOOK_DEFAULT_XSL_HTMLCHUNKED</term>
-    <listitem><para>
-The default XSLT file for the <link linkend="b-DocbookHtmlChunked"><function>DocbookHtmlChunked</function></link> builder within the
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The default XSLT file for the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookHtmlChunked"><function>DocbookHtmlChunked</function></link> builder within the
 current environment, if no other XSLT gets specified via keyword.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_DEFAULT_XSL_HTMLHELP">
     <term>DOCBOOK_DEFAULT_XSL_HTMLHELP</term>
-    <listitem><para>
-The default XSLT file for the <link linkend="b-DocbookHtmlhelp"><function>DocbookHtmlhelp</function></link> builder within the
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The default XSLT file for the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookHtmlhelp"><function>DocbookHtmlhelp</function></link> builder within the
 current environment, if no other XSLT gets specified via keyword.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_DEFAULT_XSL_MAN">
     <term>DOCBOOK_DEFAULT_XSL_MAN</term>
-    <listitem><para>
-The default XSLT file for the <link linkend="b-DocbookMan"><function>DocbookMan</function></link> builder within the
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The default XSLT file for the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookMan"><function>DocbookMan</function></link> builder within the
 current environment, if no other XSLT gets specified via keyword.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_DEFAULT_XSL_PDF">
     <term>DOCBOOK_DEFAULT_XSL_PDF</term>
-    <listitem><para>
-The default XSLT file for the <link linkend="b-DocbookPdf"><function>DocbookPdf</function></link> builder within the
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The default XSLT file for the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookPdf"><function>DocbookPdf</function></link> builder within the
 current environment, if no other XSLT gets specified via keyword.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_DEFAULT_XSL_SLIDESHTML">
     <term>DOCBOOK_DEFAULT_XSL_SLIDESHTML</term>
-    <listitem><para>
-The default XSLT file for the <link linkend="b-DocbookSlidesHtml"><function>DocbookSlidesHtml</function></link> builder within the
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The default XSLT file for the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookSlidesHtml"><function>DocbookSlidesHtml</function></link> builder within the
 current environment, if no other XSLT gets specified via keyword.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_DEFAULT_XSL_SLIDESPDF">
     <term>DOCBOOK_DEFAULT_XSL_SLIDESPDF</term>
-    <listitem><para>
-The default XSLT file for the <link linkend="b-DocbookSlidesPdf"><function>DocbookSlidesPdf</function></link> builder within the
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The default XSLT file for the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-DocbookSlidesPdf"><function>DocbookSlidesPdf</function></link> builder within the
 current environment, if no other XSLT gets specified via keyword.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_FOP">
     <term>DOCBOOK_FOP</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The path to the PDF renderer <literal>fop</literal> or <literal>xep</literal>,
 if one of them is installed (<literal>fop</literal> gets checked first).
 </para>
@@ -1246,7 +1387,8 @@ if one of them is installed (<literal>fop</literal> gets checked first).
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_FOPCOM">
     <term>DOCBOOK_FOPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The full command-line for the
 PDF renderer <literal>fop</literal> or <literal>xep</literal>.
 </para>
@@ -1254,7 +1396,8 @@ PDF renderer <literal>fop</literal> or <literal>xep</literal>.
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_FOPCOMSTR">
     <term>DOCBOOK_FOPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a renderer like <literal>fop</literal> or
 <literal>xep</literal> is used to create PDF output from an XML file.
 </para>
@@ -1262,7 +1405,8 @@ The string displayed when a renderer like <literal>fop</literal> or
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_FOPFLAGS">
     <term>DOCBOOK_FOPFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Additonal command-line flags for the
 PDF renderer <literal>fop</literal> or <literal>xep</literal>.
 </para>
@@ -1270,7 +1414,8 @@ PDF renderer <literal>fop</literal> or <literal>xep</literal>.
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_XMLLINT">
     <term>DOCBOOK_XMLLINT</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The path to the external executable <literal>xmllint</literal>, if it's installed.
 Note, that this is only used as last fallback for resolving
 XIncludes, if no libxml2 or lxml Python binding can be imported
@@ -1280,7 +1425,8 @@ in the current system.
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_XMLLINTCOM">
     <term>DOCBOOK_XMLLINTCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The full command-line for the external executable
 <literal>xmllint</literal>.
 </para>
@@ -1288,7 +1434,8 @@ The full command-line for the external executable
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_XMLLINTCOMSTR">
     <term>DOCBOOK_XMLLINTCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when <literal>xmllint</literal> is used to resolve
 XIncludes for a given XML file.
 </para>
@@ -1296,7 +1443,8 @@ XIncludes for a given XML file.
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_XMLLINTFLAGS">
     <term>DOCBOOK_XMLLINTFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Additonal command-line flags for the external executable
 <literal>xmllint</literal>.
 </para>
@@ -1304,7 +1452,8 @@ Additonal command-line flags for the external executable
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_XSLTPROC">
     <term>DOCBOOK_XSLTPROC</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The path to the external executable <literal>xsltproc</literal>
 (or <literal>saxon</literal>, <literal>xalan</literal>), if one of them
 is installed.
@@ -1315,7 +1464,8 @@ no libxml2 or lxml Python binding can be imported in the current system.
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_XSLTPROCCOM">
     <term>DOCBOOK_XSLTPROCCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The full command-line for the external executable
 <literal>xsltproc</literal> (or <literal>saxon</literal>, 
 <literal>xalan</literal>).
@@ -1324,7 +1474,8 @@ The full command-line for the external executable
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_XSLTPROCCOMSTR">
     <term>DOCBOOK_XSLTPROCCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when <literal>xsltproc</literal> is used to transform
 an XML file via a given XSLT stylesheet.
 </para>
@@ -1332,7 +1483,8 @@ an XML file via a given XSLT stylesheet.
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_XSLTPROCFLAGS">
     <term>DOCBOOK_XSLTPROCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Additonal command-line flags for the external executable
 <literal>xsltproc</literal> (or <literal>saxon</literal>, 
 <literal>xalan</literal>).
@@ -1341,7 +1493,8 @@ Additonal command-line flags for the external executable
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_XSLTPROCPARAMS">
     <term>DOCBOOK_XSLTPROCPARAMS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Additonal parameters that are not intended for the XSLT processor executable, but
 the XSL processing itself. By default, they get appended at the end of the command line
 for <literal>saxon</literal> and <literal>saxon-xslt</literal>, respectively.
@@ -1350,158 +1503,181 @@ for <literal>saxon</literal> and <literal>saxon-xslt</literal>, respectively.
   </varlistentry>
   <varlistentry id="cv-DPATH">
     <term>DPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   List of paths to search for import modules.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   List of paths to search for import modules.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   List of paths to search for import modules.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DRPATHPREFIX">
     <term>DRPATHPREFIX</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 DRPATHPREFIX.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-DRPATHSUFFIX">
     <term>DRPATHSUFFIX</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 DRPATHSUFFIX.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-DShLibSonameGenerator">
     <term>DShLibSonameGenerator</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 DShLibSonameGenerator.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-DSUFFIXES">
     <term>DSUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of suffixes of files that will be scanned
 for imported D package files.
 The default list is:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 ['.d']
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DVERPREFIX">
     <term>DVERPREFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DVERPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DVERPREFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DVERPREFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DVERSIONS">
     <term>DVERSIONS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   List of version tags to enable when compiling.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   List of version tags to enable when compiling.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   List of version tags to enable when compiling.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DVERSUFFIX">
     <term>DVERSUFFIX</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DVERSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DVERSUFFIX.
     </para>
- <para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DVERSUFFIX.
     </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DVIPDF">
     <term>DVIPDF</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The TeX DVI file to PDF file converter.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DVIPDFCOM">
     <term>DVIPDFCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to convert TeX DVI files into a PDF file.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DVIPDFCOMSTR">
     <term>DVIPDFCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a TeX DVI file
 is converted into a PDF file.
-If this is not set, then <link linkend="cv-DVIPDFCOM"><envar>$DVIPDFCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-DVIPDFCOM"><envar>$DVIPDFCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DVIPDFFLAGS">
     <term>DVIPDFFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the TeX DVI file to PDF file converter.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DVIPS">
     <term>DVIPS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The TeX DVI file to PostScript converter.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DVIPSFLAGS">
     <term>DVIPSFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the TeX DVI file to PostScript converter.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ENV">
     <term>ENV</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A dictionary of environment variables
 to use when invoking commands. When
-<envar>$ENV</envar> is used in a command all list
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$ENV</envar> is used in a command all list
 values will be joined using the path separator and any other non-string
 values will simply be coerced to a string.
 Note that, by default,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 does
 <emphasis>not</emphasis>
 propagate the environment in force when you
 execute
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to the commands used to build target files.
 This is so that builds will be guaranteed
 repeatable regardless of the environment
 variables set at the time
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 is invoked.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If you want to propagate your
 environment variables
 to the commands executed
@@ -1509,12 +1685,12 @@ to build target files,
 you must do so explicitly:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 import os
 env = Environment(ENV = os.environ)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Note that you can choose only to propagate
 certain environment variables.
 A common example is
@@ -1522,12 +1698,12 @@ the system
 <envar>PATH</envar>
 environment variable,
 so that
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 uses the same utilities
 as the invoking shell (or other process):
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 import os
 env = Environment(ENV = {'PATH' : os.environ['PATH']})
 </example_commands>
@@ -1535,7 +1711,8 @@ env = Environment(ENV = {'PATH' : os.environ['PATH']})
   </varlistentry>
   <varlistentry id="cv-ESCAPE">
     <term>ESCAPE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A function that will be called to escape shell special characters in
 command lines. The function should take one argument: the command line
 string to escape; and should return the escaped command line.
@@ -1544,23 +1721,25 @@ string to escape; and should return the escaped command line.
   </varlistentry>
   <varlistentry id="cv-F03">
     <term>F03</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Fortran 03 compiler.
-You should normally set the <link linkend="cv-FORTRAN"><envar>$FORTRAN</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRAN"><envar>$FORTRAN</envar></link> variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
-You only need to set <link linkend="cv-F03"><envar>$F03</envar></link> if you need to use a specific compiler
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03"><envar>$F03</envar></link> if you need to use a specific compiler
 or compiler version for Fortran 03 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F03COM">
     <term>F03COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 03 source file to an object file.
-You only need to set <link linkend="cv-F03COM"><envar>$F03COM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03COM"><envar>$F03COM</envar></link> if you need to use a specific
 command line for Fortran 03 files.
-You should normally set the <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link> variable,
 which specifies the default command line
 for all Fortran versions.
 </para>
@@ -1568,17 +1747,19 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-F03COMSTR">
     <term>F03COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 03 source file
 is compiled to an object file.
-If this is not set, then <link linkend="cv-F03COM"><envar>$F03COM</envar></link> or <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03COM"><envar>$F03COM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F03FILESUFFIXES">
     <term>F03FILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the F03 dialect will be used. By
 default, this is ['.f03']
 </para>
@@ -1586,21 +1767,22 @@ default, this is ['.f03']
   </varlistentry>
   <varlistentry id="cv-F03FLAGS">
     <term>F03FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General user-specified options that are passed to the Fortran 03 compiler.
 Note that this variable does
 <emphasis>not</emphasis>
 contain
 <option>-I</option>
 (or similar) include search path options
-that scons generates automatically from <link linkend="cv-F03PATH"><envar>$F03PATH</envar></link>.
+that scons generates automatically from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03PATH"><envar>$F03PATH</envar></link>.
 See
-<link linkend="cv-_F03INCFLAGS"><envar>$_F03INCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F03INCFLAGS"><envar>$_F03INCFLAGS</envar></link>
 below,
 for the variable that expands to those options.
-You only need to set <link linkend="cv-F03FLAGS"><envar>$F03FLAGS</envar></link> if you need to define specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03FLAGS"><envar>$F03FLAGS</envar></link> if you need to define specific
 user options for Fortran 03 files.
-You should normally set the <link linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link> variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
@@ -1609,83 +1791,86 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-_F03INCFLAGS">
     <term>_F03INCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the Fortran 03 compiler command-line options
 for specifying directories to be searched for include files.
-The value of <link linkend="cv-_F03INCFLAGS"><envar>$_F03INCFLAGS</envar></link> is created
-by appending <link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+The value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F03INCFLAGS"><envar>$_F03INCFLAGS</envar></link> is created
+by appending <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 to the beginning and end
-of each directory in <link linkend="cv-F03PATH"><envar>$F03PATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03PATH"><envar>$F03PATH</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F03PATH">
     <term>F03PATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of directories that the Fortran 03 compiler will search for include
 directories. The implicit dependency scanner will search these
 directories for include files. Don't explicitly put include directory
-arguments in <link linkend="cv-F03FLAGS"><envar>$F03FLAGS</envar></link> because the result will be non-portable
+arguments in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03FLAGS"><envar>$F03FLAGS</envar></link> because the result will be non-portable
 and the directories will not be searched by the dependency scanner. Note:
-directory names in <link linkend="cv-F03PATH"><envar>$F03PATH</envar></link> will be looked-up relative to the SConscript
+directory names in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03PATH"><envar>$F03PATH</envar></link> will be looked-up relative to the SConscript
 directory when they are used in a command. To force
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to look-up a directory relative to the root of the source tree use #:
-You only need to set <link linkend="cv-F03PATH"><envar>$F03PATH</envar></link> if you need to define a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03PATH"><envar>$F03PATH</envar></link> if you need to define a specific
 include path for Fortran 03 files.
-You should normally set the <link linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link> variable,
 which specifies the include path
 for the default Fortran compiler
 for all Fortran versions.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(F03PATH='#/include')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory look-up can also be forced using the
-<function>Dir</function>()
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Dir</function>()
 function:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 include = Dir('include')
 env = Environment(F03PATH=include)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory list will be added to command lines
 through the automatically-generated
-<link linkend="cv-_F03INCFLAGS"><envar>$_F03INCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F03INCFLAGS"><envar>$_F03INCFLAGS</envar></link>
 construction variable,
 which is constructed by
 appending the values of the
-<link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 construction variables
 to the beginning and end
-of each directory in <link linkend="cv-F03PATH"><envar>$F03PATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03PATH"><envar>$F03PATH</envar></link>.
 Any command lines you define that need
 the F03PATH directory list should
-include <link linkend="cv-_F03INCFLAGS"><envar>$_F03INCFLAGS</envar></link>:
+include <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F03INCFLAGS"><envar>$_F03INCFLAGS</envar></link>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(F03COM="my_compiler $_F03INCFLAGS -c -o $TARGET $SOURCE")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F03PPCOM">
     <term>F03PPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 03 source file to an object file
 after first running the file through the C preprocessor.
-Any options specified in the <link linkend="cv-F03FLAGS"><envar>$F03FLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03FLAGS"><envar>$F03FLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
-You only need to set <link linkend="cv-F03PPCOM"><envar>$F03PPCOM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03PPCOM"><envar>$F03PPCOM</envar></link> if you need to use a specific
 C-preprocessor command line for Fortran 03 files.
-You should normally set the <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link> variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
 </para>
@@ -1693,18 +1878,20 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-F03PPCOMSTR">
     <term>F03PPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 03 source file
 is compiled to an object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-F03PPCOM"><envar>$F03PPCOM</envar></link> or <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F03PPCOM"><envar>$F03PPCOM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F03PPFILESUFFIXES">
     <term>F03PPFILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the compilation + preprocessor pass for
 F03 dialect will be used. By default, this is empty
 </para>
@@ -1712,23 +1899,25 @@ F03 dialect will be used. By default, this is empty
   </varlistentry>
   <varlistentry id="cv-F08">
     <term>F08</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Fortran 08 compiler.
-You should normally set the <link linkend="cv-FORTRAN"><envar>$FORTRAN</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRAN"><envar>$FORTRAN</envar></link> variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
-You only need to set <link linkend="cv-F08"><envar>$F08</envar></link> if you need to use a specific compiler
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08"><envar>$F08</envar></link> if you need to use a specific compiler
 or compiler version for Fortran 08 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F08COM">
     <term>F08COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 08 source file to an object file.
-You only need to set <link linkend="cv-F08COM"><envar>$F08COM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08COM"><envar>$F08COM</envar></link> if you need to use a specific
 command line for Fortran 08 files.
-You should normally set the <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link> variable,
 which specifies the default command line
 for all Fortran versions.
 </para>
@@ -1736,17 +1925,19 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-F08COMSTR">
     <term>F08COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 08 source file
 is compiled to an object file.
-If this is not set, then <link linkend="cv-F08COM"><envar>$F08COM</envar></link> or <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08COM"><envar>$F08COM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F08FILESUFFIXES">
     <term>F08FILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the F08 dialect will be used. By
 default, this is ['.f08']
 </para>
@@ -1754,21 +1945,22 @@ default, this is ['.f08']
   </varlistentry>
   <varlistentry id="cv-F08FLAGS">
     <term>F08FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General user-specified options that are passed to the Fortran 08 compiler.
 Note that this variable does
 <emphasis>not</emphasis>
 contain
 <option>-I</option>
 (or similar) include search path options
-that scons generates automatically from <link linkend="cv-F08PATH"><envar>$F08PATH</envar></link>.
+that scons generates automatically from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08PATH"><envar>$F08PATH</envar></link>.
 See
-<link linkend="cv-_F08INCFLAGS"><envar>$_F08INCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F08INCFLAGS"><envar>$_F08INCFLAGS</envar></link>
 below,
 for the variable that expands to those options.
-You only need to set <link linkend="cv-F08FLAGS"><envar>$F08FLAGS</envar></link> if you need to define specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08FLAGS"><envar>$F08FLAGS</envar></link> if you need to define specific
 user options for Fortran 08 files.
-You should normally set the <link linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link> variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
@@ -1777,83 +1969,86 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-_F08INCFLAGS">
     <term>_F08INCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the Fortran 08 compiler command-line options
 for specifying directories to be searched for include files.
-The value of <link linkend="cv-_F08INCFLAGS"><envar>$_F08INCFLAGS</envar></link> is created
-by appending <link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+The value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F08INCFLAGS"><envar>$_F08INCFLAGS</envar></link> is created
+by appending <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 to the beginning and end
-of each directory in <link linkend="cv-F08PATH"><envar>$F08PATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08PATH"><envar>$F08PATH</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F08PATH">
     <term>F08PATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of directories that the Fortran 08 compiler will search for include
 directories. The implicit dependency scanner will search these
 directories for include files. Don't explicitly put include directory
-arguments in <link linkend="cv-F08FLAGS"><envar>$F08FLAGS</envar></link> because the result will be non-portable
+arguments in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08FLAGS"><envar>$F08FLAGS</envar></link> because the result will be non-portable
 and the directories will not be searched by the dependency scanner. Note:
-directory names in <link linkend="cv-F08PATH"><envar>$F08PATH</envar></link> will be looked-up relative to the SConscript
+directory names in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08PATH"><envar>$F08PATH</envar></link> will be looked-up relative to the SConscript
 directory when they are used in a command. To force
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to look-up a directory relative to the root of the source tree use #:
-You only need to set <link linkend="cv-F08PATH"><envar>$F08PATH</envar></link> if you need to define a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08PATH"><envar>$F08PATH</envar></link> if you need to define a specific
 include path for Fortran 08 files.
-You should normally set the <link linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link> variable,
 which specifies the include path
 for the default Fortran compiler
 for all Fortran versions.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(F08PATH='#/include')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory look-up can also be forced using the
-<function>Dir</function>()
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Dir</function>()
 function:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 include = Dir('include')
 env = Environment(F08PATH=include)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory list will be added to command lines
 through the automatically-generated
-<link linkend="cv-_F08INCFLAGS"><envar>$_F08INCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F08INCFLAGS"><envar>$_F08INCFLAGS</envar></link>
 construction variable,
 which is constructed by
 appending the values of the
-<link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 construction variables
 to the beginning and end
-of each directory in <link linkend="cv-F08PATH"><envar>$F08PATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08PATH"><envar>$F08PATH</envar></link>.
 Any command lines you define that need
 the F08PATH directory list should
-include <link linkend="cv-_F08INCFLAGS"><envar>$_F08INCFLAGS</envar></link>:
+include <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F08INCFLAGS"><envar>$_F08INCFLAGS</envar></link>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(F08COM="my_compiler $_F08INCFLAGS -c -o $TARGET $SOURCE")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F08PPCOM">
     <term>F08PPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 08 source file to an object file
 after first running the file through the C preprocessor.
-Any options specified in the <link linkend="cv-F08FLAGS"><envar>$F08FLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08FLAGS"><envar>$F08FLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
-You only need to set <link linkend="cv-F08PPCOM"><envar>$F08PPCOM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08PPCOM"><envar>$F08PPCOM</envar></link> if you need to use a specific
 C-preprocessor command line for Fortran 08 files.
-You should normally set the <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link> variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
 </para>
@@ -1861,18 +2056,20 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-F08PPCOMSTR">
     <term>F08PPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 08 source file
 is compiled to an object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-F08PPCOM"><envar>$F08PPCOM</envar></link> or <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F08PPCOM"><envar>$F08PPCOM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F08PPFILESUFFIXES">
     <term>F08PPFILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the compilation + preprocessor pass for
 F08 dialect will be used. By default, this is empty
 </para>
@@ -1880,23 +2077,25 @@ F08 dialect will be used. By default, this is empty
   </varlistentry>
   <varlistentry id="cv-F77">
     <term>F77</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Fortran 77 compiler.
-You should normally set the <link linkend="cv-FORTRAN"><envar>$FORTRAN</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRAN"><envar>$FORTRAN</envar></link> variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
-You only need to set <link linkend="cv-F77"><envar>$F77</envar></link> if you need to use a specific compiler
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77"><envar>$F77</envar></link> if you need to use a specific compiler
 or compiler version for Fortran 77 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F77COM">
     <term>F77COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 77 source file to an object file.
-You only need to set <link linkend="cv-F77COM"><envar>$F77COM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77COM"><envar>$F77COM</envar></link> if you need to use a specific
 command line for Fortran 77 files.
-You should normally set the <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link> variable,
 which specifies the default command line
 for all Fortran versions.
 </para>
@@ -1904,17 +2103,19 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-F77COMSTR">
     <term>F77COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 77 source file
 is compiled to an object file.
-If this is not set, then <link linkend="cv-F77COM"><envar>$F77COM</envar></link> or <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77COM"><envar>$F77COM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F77FILESUFFIXES">
     <term>F77FILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the F77 dialect will be used. By
 default, this is ['.f77']
 </para>
@@ -1922,21 +2123,22 @@ default, this is ['.f77']
   </varlistentry>
   <varlistentry id="cv-F77FLAGS">
     <term>F77FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General user-specified options that are passed to the Fortran 77 compiler.
 Note that this variable does
 <emphasis>not</emphasis>
 contain
 <option>-I</option>
 (or similar) include search path options
-that scons generates automatically from <link linkend="cv-F77PATH"><envar>$F77PATH</envar></link>.
+that scons generates automatically from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77PATH"><envar>$F77PATH</envar></link>.
 See
-<link linkend="cv-_F77INCFLAGS"><envar>$_F77INCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F77INCFLAGS"><envar>$_F77INCFLAGS</envar></link>
 below,
 for the variable that expands to those options.
-You only need to set <link linkend="cv-F77FLAGS"><envar>$F77FLAGS</envar></link> if you need to define specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77FLAGS"><envar>$F77FLAGS</envar></link> if you need to define specific
 user options for Fortran 77 files.
-You should normally set the <link linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link> variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
@@ -1945,83 +2147,86 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-_F77INCFLAGS">
     <term>_F77INCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the Fortran 77 compiler command-line options
 for specifying directories to be searched for include files.
-The value of <link linkend="cv-_F77INCFLAGS"><envar>$_F77INCFLAGS</envar></link> is created
-by appending <link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+The value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F77INCFLAGS"><envar>$_F77INCFLAGS</envar></link> is created
+by appending <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 to the beginning and end
-of each directory in <link linkend="cv-F77PATH"><envar>$F77PATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77PATH"><envar>$F77PATH</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F77PATH">
     <term>F77PATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of directories that the Fortran 77 compiler will search for include
 directories. The implicit dependency scanner will search these
 directories for include files. Don't explicitly put include directory
-arguments in <link linkend="cv-F77FLAGS"><envar>$F77FLAGS</envar></link> because the result will be non-portable
+arguments in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77FLAGS"><envar>$F77FLAGS</envar></link> because the result will be non-portable
 and the directories will not be searched by the dependency scanner. Note:
-directory names in <link linkend="cv-F77PATH"><envar>$F77PATH</envar></link> will be looked-up relative to the SConscript
+directory names in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77PATH"><envar>$F77PATH</envar></link> will be looked-up relative to the SConscript
 directory when they are used in a command. To force
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to look-up a directory relative to the root of the source tree use #:
-You only need to set <link linkend="cv-F77PATH"><envar>$F77PATH</envar></link> if you need to define a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77PATH"><envar>$F77PATH</envar></link> if you need to define a specific
 include path for Fortran 77 files.
-You should normally set the <link linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link> variable,
 which specifies the include path
 for the default Fortran compiler
 for all Fortran versions.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(F77PATH='#/include')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory look-up can also be forced using the
-<function>Dir</function>()
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Dir</function>()
 function:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 include = Dir('include')
 env = Environment(F77PATH=include)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory list will be added to command lines
 through the automatically-generated
-<link linkend="cv-_F77INCFLAGS"><envar>$_F77INCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F77INCFLAGS"><envar>$_F77INCFLAGS</envar></link>
 construction variable,
 which is constructed by
 appending the values of the
-<link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 construction variables
 to the beginning and end
-of each directory in <link linkend="cv-F77PATH"><envar>$F77PATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77PATH"><envar>$F77PATH</envar></link>.
 Any command lines you define that need
 the F77PATH directory list should
-include <link linkend="cv-_F77INCFLAGS"><envar>$_F77INCFLAGS</envar></link>:
+include <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F77INCFLAGS"><envar>$_F77INCFLAGS</envar></link>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(F77COM="my_compiler $_F77INCFLAGS -c -o $TARGET $SOURCE")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F77PPCOM">
     <term>F77PPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 77 source file to an object file
 after first running the file through the C preprocessor.
-Any options specified in the <link linkend="cv-F77FLAGS"><envar>$F77FLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77FLAGS"><envar>$F77FLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
-You only need to set <link linkend="cv-F77PPCOM"><envar>$F77PPCOM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77PPCOM"><envar>$F77PPCOM</envar></link> if you need to use a specific
 C-preprocessor command line for Fortran 77 files.
-You should normally set the <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link> variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
 </para>
@@ -2029,18 +2234,20 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-F77PPCOMSTR">
     <term>F77PPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 77 source file
 is compiled to an object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-F77PPCOM"><envar>$F77PPCOM</envar></link> or <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F77PPCOM"><envar>$F77PPCOM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F77PPFILESUFFIXES">
     <term>F77PPFILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the compilation + preprocessor pass for
 F77 dialect will be used. By default, this is empty
 </para>
@@ -2048,23 +2255,25 @@ F77 dialect will be used. By default, this is empty
   </varlistentry>
   <varlistentry id="cv-F90">
     <term>F90</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Fortran 90 compiler.
-You should normally set the <link linkend="cv-FORTRAN"><envar>$FORTRAN</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRAN"><envar>$FORTRAN</envar></link> variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
-You only need to set <link linkend="cv-F90"><envar>$F90</envar></link> if you need to use a specific compiler
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90"><envar>$F90</envar></link> if you need to use a specific compiler
 or compiler version for Fortran 90 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F90COM">
     <term>F90COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 90 source file to an object file.
-You only need to set <link linkend="cv-F90COM"><envar>$F90COM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90COM"><envar>$F90COM</envar></link> if you need to use a specific
 command line for Fortran 90 files.
-You should normally set the <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link> variable,
 which specifies the default command line
 for all Fortran versions.
 </para>
@@ -2072,17 +2281,19 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-F90COMSTR">
     <term>F90COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 90 source file
 is compiled to an object file.
-If this is not set, then <link linkend="cv-F90COM"><envar>$F90COM</envar></link> or <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90COM"><envar>$F90COM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F90FILESUFFIXES">
     <term>F90FILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the F90 dialect will be used. By
 default, this is ['.f90']
 </para>
@@ -2090,21 +2301,22 @@ default, this is ['.f90']
   </varlistentry>
   <varlistentry id="cv-F90FLAGS">
     <term>F90FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General user-specified options that are passed to the Fortran 90 compiler.
 Note that this variable does
 <emphasis>not</emphasis>
 contain
 <option>-I</option>
 (or similar) include search path options
-that scons generates automatically from <link linkend="cv-F90PATH"><envar>$F90PATH</envar></link>.
+that scons generates automatically from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90PATH"><envar>$F90PATH</envar></link>.
 See
-<link linkend="cv-_F90INCFLAGS"><envar>$_F90INCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F90INCFLAGS"><envar>$_F90INCFLAGS</envar></link>
 below,
 for the variable that expands to those options.
-You only need to set <link linkend="cv-F90FLAGS"><envar>$F90FLAGS</envar></link> if you need to define specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90FLAGS"><envar>$F90FLAGS</envar></link> if you need to define specific
 user options for Fortran 90 files.
-You should normally set the <link linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link> variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
@@ -2113,83 +2325,86 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-_F90INCFLAGS">
     <term>_F90INCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the Fortran 90 compiler command-line options
 for specifying directories to be searched for include files.
-The value of <link linkend="cv-_F90INCFLAGS"><envar>$_F90INCFLAGS</envar></link> is created
-by appending <link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+The value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F90INCFLAGS"><envar>$_F90INCFLAGS</envar></link> is created
+by appending <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 to the beginning and end
-of each directory in <link linkend="cv-F90PATH"><envar>$F90PATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90PATH"><envar>$F90PATH</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F90PATH">
     <term>F90PATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of directories that the Fortran 90 compiler will search for include
 directories. The implicit dependency scanner will search these
 directories for include files. Don't explicitly put include directory
-arguments in <link linkend="cv-F90FLAGS"><envar>$F90FLAGS</envar></link> because the result will be non-portable
+arguments in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90FLAGS"><envar>$F90FLAGS</envar></link> because the result will be non-portable
 and the directories will not be searched by the dependency scanner. Note:
-directory names in <link linkend="cv-F90PATH"><envar>$F90PATH</envar></link> will be looked-up relative to the SConscript
+directory names in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90PATH"><envar>$F90PATH</envar></link> will be looked-up relative to the SConscript
 directory when they are used in a command. To force
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to look-up a directory relative to the root of the source tree use #:
-You only need to set <link linkend="cv-F90PATH"><envar>$F90PATH</envar></link> if you need to define a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90PATH"><envar>$F90PATH</envar></link> if you need to define a specific
 include path for Fortran 90 files.
-You should normally set the <link linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link> variable,
 which specifies the include path
 for the default Fortran compiler
 for all Fortran versions.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(F90PATH='#/include')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory look-up can also be forced using the
-<function>Dir</function>()
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Dir</function>()
 function:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 include = Dir('include')
 env = Environment(F90PATH=include)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory list will be added to command lines
 through the automatically-generated
-<link linkend="cv-_F90INCFLAGS"><envar>$_F90INCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F90INCFLAGS"><envar>$_F90INCFLAGS</envar></link>
 construction variable,
 which is constructed by
 appending the values of the
-<link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 construction variables
 to the beginning and end
-of each directory in <link linkend="cv-F90PATH"><envar>$F90PATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90PATH"><envar>$F90PATH</envar></link>.
 Any command lines you define that need
 the F90PATH directory list should
-include <link linkend="cv-_F90INCFLAGS"><envar>$_F90INCFLAGS</envar></link>:
+include <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F90INCFLAGS"><envar>$_F90INCFLAGS</envar></link>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(F90COM="my_compiler $_F90INCFLAGS -c -o $TARGET $SOURCE")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F90PPCOM">
     <term>F90PPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 90 source file to an object file
 after first running the file through the C preprocessor.
-Any options specified in the <link linkend="cv-F90FLAGS"><envar>$F90FLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90FLAGS"><envar>$F90FLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
-You only need to set <link linkend="cv-F90PPCOM"><envar>$F90PPCOM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90PPCOM"><envar>$F90PPCOM</envar></link> if you need to use a specific
 C-preprocessor command line for Fortran 90 files.
-You should normally set the <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link> variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
 </para>
@@ -2197,17 +2412,19 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-F90PPCOMSTR">
     <term>F90PPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 90 source file
 is compiled after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-F90PPCOM"><envar>$F90PPCOM</envar></link> or <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F90PPCOM"><envar>$F90PPCOM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F90PPFILESUFFIXES">
     <term>F90PPFILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the compilation + preprocessor pass for
 F90 dialect will be used. By default, this is empty
 </para>
@@ -2215,23 +2432,25 @@ F90 dialect will be used. By default, this is empty
   </varlistentry>
   <varlistentry id="cv-F95">
     <term>F95</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Fortran 95 compiler.
-You should normally set the <link linkend="cv-FORTRAN"><envar>$FORTRAN</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRAN"><envar>$FORTRAN</envar></link> variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
-You only need to set <link linkend="cv-F95"><envar>$F95</envar></link> if you need to use a specific compiler
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95"><envar>$F95</envar></link> if you need to use a specific compiler
 or compiler version for Fortran 95 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F95COM">
     <term>F95COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 95 source file to an object file.
-You only need to set <link linkend="cv-F95COM"><envar>$F95COM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95COM"><envar>$F95COM</envar></link> if you need to use a specific
 command line for Fortran 95 files.
-You should normally set the <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link> variable,
 which specifies the default command line
 for all Fortran versions.
 </para>
@@ -2239,17 +2458,19 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-F95COMSTR">
     <term>F95COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 95 source file
 is compiled to an object file.
-If this is not set, then <link linkend="cv-F95COM"><envar>$F95COM</envar></link> or <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95COM"><envar>$F95COM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F95FILESUFFIXES">
     <term>F95FILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the F95 dialect will be used. By
 default, this is ['.f95']
 </para>
@@ -2257,21 +2478,22 @@ default, this is ['.f95']
   </varlistentry>
   <varlistentry id="cv-F95FLAGS">
     <term>F95FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General user-specified options that are passed to the Fortran 95 compiler.
 Note that this variable does
 <emphasis>not</emphasis>
 contain
 <option>-I</option>
 (or similar) include search path options
-that scons generates automatically from <link linkend="cv-F95PATH"><envar>$F95PATH</envar></link>.
+that scons generates automatically from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95PATH"><envar>$F95PATH</envar></link>.
 See
-<link linkend="cv-_F95INCFLAGS"><envar>$_F95INCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F95INCFLAGS"><envar>$_F95INCFLAGS</envar></link>
 below,
 for the variable that expands to those options.
-You only need to set <link linkend="cv-F95FLAGS"><envar>$F95FLAGS</envar></link> if you need to define specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95FLAGS"><envar>$F95FLAGS</envar></link> if you need to define specific
 user options for Fortran 95 files.
-You should normally set the <link linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link> variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
@@ -2280,83 +2502,86 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-_F95INCFLAGS">
     <term>_F95INCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the Fortran 95 compiler command-line options
 for specifying directories to be searched for include files.
-The value of <link linkend="cv-_F95INCFLAGS"><envar>$_F95INCFLAGS</envar></link> is created
-by appending <link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+The value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F95INCFLAGS"><envar>$_F95INCFLAGS</envar></link> is created
+by appending <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 to the beginning and end
-of each directory in <link linkend="cv-F95PATH"><envar>$F95PATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95PATH"><envar>$F95PATH</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F95PATH">
     <term>F95PATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of directories that the Fortran 95 compiler will search for include
 directories. The implicit dependency scanner will search these
 directories for include files. Don't explicitly put include directory
-arguments in <link linkend="cv-F95FLAGS"><envar>$F95FLAGS</envar></link> because the result will be non-portable
+arguments in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95FLAGS"><envar>$F95FLAGS</envar></link> because the result will be non-portable
 and the directories will not be searched by the dependency scanner. Note:
-directory names in <link linkend="cv-F95PATH"><envar>$F95PATH</envar></link> will be looked-up relative to the SConscript
+directory names in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95PATH"><envar>$F95PATH</envar></link> will be looked-up relative to the SConscript
 directory when they are used in a command. To force
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to look-up a directory relative to the root of the source tree use #:
-You only need to set <link linkend="cv-F95PATH"><envar>$F95PATH</envar></link> if you need to define a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95PATH"><envar>$F95PATH</envar></link> if you need to define a specific
 include path for Fortran 95 files.
-You should normally set the <link linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link> variable,
 which specifies the include path
 for the default Fortran compiler
 for all Fortran versions.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(F95PATH='#/include')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory look-up can also be forced using the
-<function>Dir</function>()
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Dir</function>()
 function:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 include = Dir('include')
 env = Environment(F95PATH=include)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory list will be added to command lines
 through the automatically-generated
-<link linkend="cv-_F95INCFLAGS"><envar>$_F95INCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F95INCFLAGS"><envar>$_F95INCFLAGS</envar></link>
 construction variable,
 which is constructed by
 appending the values of the
-<link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 construction variables
 to the beginning and end
-of each directory in <link linkend="cv-F95PATH"><envar>$F95PATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95PATH"><envar>$F95PATH</envar></link>.
 Any command lines you define that need
 the F95PATH directory list should
-include <link linkend="cv-_F95INCFLAGS"><envar>$_F95INCFLAGS</envar></link>:
+include <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_F95INCFLAGS"><envar>$_F95INCFLAGS</envar></link>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(F95COM="my_compiler $_F95INCFLAGS -c -o $TARGET $SOURCE")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F95PPCOM">
     <term>F95PPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 95 source file to an object file
 after first running the file through the C preprocessor.
-Any options specified in the <link linkend="cv-F95FLAGS"><envar>$F95FLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95FLAGS"><envar>$F95FLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
-You only need to set <link linkend="cv-F95PPCOM"><envar>$F95PPCOM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95PPCOM"><envar>$F95PPCOM</envar></link> if you need to use a specific
 C-preprocessor command line for Fortran 95 files.
-You should normally set the <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link> variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
 </para>
@@ -2364,18 +2589,20 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-F95PPCOMSTR">
     <term>F95PPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 95 source file
 is compiled to an object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-F95PPCOM"><envar>$F95PPCOM</envar></link> or <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-F95PPCOM"><envar>$F95PPCOM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-F95PPFILESUFFIXES">
     <term>F95PPFILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the compilation + preprocessor pass for
 F95 dialect will be used. By default, this is empty
 </para>
@@ -2383,11 +2610,13 @@ F95 dialect will be used. By default, this is empty
   </varlistentry>
   <varlistentry id="cv-File">
     <term>File</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A function that converts a string into a File instance relative to the
 target being built.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A function that converts a string into a File instance relative to the
 target being built.
 </para>
@@ -2395,7 +2624,8 @@ target being built.
   </varlistentry>
   <varlistentry id="cv-FORTRAN">
     <term>FORTRAN</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The default Fortran compiler
 for all versions of Fortran.
 </para>
@@ -2403,31 +2633,34 @@ for all versions of Fortran.
   </varlistentry>
   <varlistentry id="cv-FORTRANCOM">
     <term>FORTRANCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran source file to an object file.
 By default, any options specified
-in the <link linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link>,
-<link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link>,
-<link linkend="cv-_CPPDEFFLAGS"><envar>$_CPPDEFFLAGS</envar></link>,
-<link linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link>, and
-<link linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link> construction variables
+in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_CPPDEFFLAGS"><envar>$_CPPDEFFLAGS</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link>, and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link> construction variables
 are included on this command line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-FORTRANCOMSTR">
     <term>FORTRANCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran source file
 is compiled to an object file.
-If this is not set, then <link linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANCOM"><envar>$FORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-FORTRANFILESUFFIXES">
     <term>FORTRANFILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the FORTRAN dialect will be used. By
 default, this is ['.f', '.for', '.ftn']
 </para>
@@ -2435,16 +2668,17 @@ default, this is ['.f', '.for', '.ftn']
   </varlistentry>
   <varlistentry id="cv-FORTRANFLAGS">
     <term>FORTRANFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General user-specified options that are passed to the Fortran compiler.
 Note that this variable does
 <emphasis>not</emphasis>
 contain
 <option>-I</option>
 (or similar) include or module search path options
-that scons generates automatically from <link linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link>.
+that scons generates automatically from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link>.
 See
-<link linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link> and <link linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link>,
 below,
 for the variables that expand those options.
 </para>
@@ -2452,22 +2686,24 @@ for the variables that expand those options.
   </varlistentry>
   <varlistentry id="cv-_FORTRANINCFLAGS">
     <term>_FORTRANINCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the Fortran compiler command-line options
 for specifying directories to be searched for include
 files and module files.
-The value of <link linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link> is created
+The value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link> is created
 by respectively prepending and appending
-<link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 to the beginning and end
-of each directory in <link linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-FORTRANMODDIR">
     <term>FORTRANMODDIR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Directory location where the Fortran compiler should place
 any module files it generates.  This variable is empty, by default. Some
 Fortran compilers will internally append this directory in the search path
@@ -2477,44 +2713,48 @@ for module files, as well.
   </varlistentry>
   <varlistentry id="cv-FORTRANMODDIRPREFIX">
     <term>FORTRANMODDIRPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify a module directory on the Fortran compiler command
 line.
 This will be prepended to the beginning of the directory
-in the <link linkend="cv-FORTRANMODDIR"><envar>$FORTRANMODDIR</envar></link> construction variables
-when the <link linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link> variables is automatically generated.
+in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIR"><envar>$FORTRANMODDIR</envar></link> construction variables
+when the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link> variables is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-FORTRANMODDIRSUFFIX">
     <term>FORTRANMODDIRSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used to specify a module directory on the Fortran compiler command
 line.
 This will be appended to the end of the directory
-in the <link linkend="cv-FORTRANMODDIR"><envar>$FORTRANMODDIR</envar></link> construction variables
-when the <link linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link> variables is automatically generated.
+in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIR"><envar>$FORTRANMODDIR</envar></link> construction variables
+when the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link> variables is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_FORTRANMODFLAG">
     <term>_FORTRANMODFLAG</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the Fortran compiler command-line option
 for specifying the directory location where the Fortran
 compiler should place any module files that happen to get
 generated during compilation.
-The value of <link linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link> is created
+The value of <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link> is created
 by respectively prepending and appending
-<link linkend="cv-FORTRANMODDIRPREFIX"><envar>$FORTRANMODDIRPREFIX</envar></link> and <link linkend="cv-FORTRANMODDIRSUFFIX"><envar>$FORTRANMODDIRSUFFIX</envar></link>
-to the beginning and end of the directory in <link linkend="cv-FORTRANMODDIR"><envar>$FORTRANMODDIR</envar></link>.
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIRPREFIX"><envar>$FORTRANMODDIRPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIRSUFFIX"><envar>$FORTRANMODDIRSUFFIX</envar></link>
+to the beginning and end of the directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANMODDIR"><envar>$FORTRANMODDIR</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-FORTRANMODPREFIX">
     <term>FORTRANMODPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The module file prefix used by the Fortran compiler.  SCons assumes that
 the Fortran compiler follows the quasi-standard naming convention for
 module files of
@@ -2528,7 +2768,8 @@ module file name as scons attempts to resolve dependencies.
   </varlistentry>
   <varlistentry id="cv-FORTRANMODSUFFIX">
     <term>FORTRANMODSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The module file suffix used by the Fortran compiler.  SCons assumes that
 the Fortran compiler follows the quasi-standard naming convention for
 module files of
@@ -2542,7 +2783,8 @@ module file name as scons attempts to resolve dependencies.
   </varlistentry>
   <varlistentry id="cv-FORTRANPATH">
     <term>FORTRANPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of directories that the Fortran compiler will search for
 include files and (for some compilers) module files. The Fortran implicit
 dependency scanner will search these directories for include files (but
@@ -2552,74 +2794,77 @@ include directory arguments in FORTRANFLAGS because the result will be
 non-portable and the directories will not be searched by the dependency
 scanner. Note: directory names in FORTRANPATH will be looked-up relative
 to the SConscript directory when they are used in a command. To force
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to look-up a directory relative to the root of the source tree use #:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(FORTRANPATH='#/include')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory look-up can also be forced using the
-<function>Dir</function>()
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Dir</function>()
 function:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 include = Dir('include')
 env = Environment(FORTRANPATH=include)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory list will be added to command lines
 through the automatically-generated
-<link linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link>
 construction variable,
 which is constructed by
 respectively prepending and appending the values of the
-<link linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCPREFIX"><envar>$INCPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-INCSUFFIX"><envar>$INCSUFFIX</envar></link>
 construction variables
 to the beginning and end
-of each directory in <link linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link>.
+of each directory in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPATH"><envar>$FORTRANPATH</envar></link>.
 Any command lines you define that need
 the FORTRANPATH directory list should
-include <link linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link>:
+include <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(FORTRANCOM="my_compiler $_FORTRANINCFLAGS -c -o $TARGET $SOURCE")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-FORTRANPPCOM">
     <term>FORTRANPPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran source file to an object file
 after first running the file through the C preprocessor.
-By default, any options specified in the <link linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link>,
-<link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link>,
-<link linkend="cv-_CPPDEFFLAGS"><envar>$_CPPDEFFLAGS</envar></link>,
-<link linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link>, and
-<link linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link>
+By default, any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANFLAGS"><envar>$FORTRANFLAGS</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_CPPDEFFLAGS"><envar>$_CPPDEFFLAGS</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANMODFLAG"><envar>$_FORTRANMODFLAG</envar></link>, and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_FORTRANINCFLAGS"><envar>$_FORTRANINCFLAGS</envar></link>
 construction variables are included on this command line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-FORTRANPPCOMSTR">
     <term>FORTRANPPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran source file
 is compiled to an object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FORTRANPPCOM"><envar>$FORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-FORTRANPPFILESUFFIXES">
     <term>FORTRANPPFILESUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of file extensions for which the compilation + preprocessor pass for
 FORTRAN dialect will be used. By default, this is ['.fpp', '.FPP']
 </para>
@@ -2627,14 +2872,15 @@ FORTRAN dialect will be used. By default, this is ['.fpp', '.FPP']
   </varlistentry>
   <varlistentry id="cv-FORTRANSUFFIXES">
     <term>FORTRANSUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of suffixes of files that will be scanned
 for Fortran implicit dependencies
 (INCLUDE lines and USE statements).
 The default list is:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 [".f", ".F", ".for", ".FOR", ".ftn", ".FTN", ".fpp", ".FPP",
 ".f77", ".F77", ".f90", ".F90", ".f95", ".F95"]
 </example_commands>
@@ -2642,47 +2888,50 @@ The default list is:
   </varlistentry>
   <varlistentry id="cv-FRAMEWORKPATH">
     <term>FRAMEWORKPATH</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 On Mac OS X with gcc,
                 a list containing the paths to search for frameworks.
                 Used by the compiler to find framework-style includes like
                 #include &lt;Fmwk/Header.h&gt;.
                 Used by the linker to find user-specified frameworks when linking (see
-                <link linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link>).
+                <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link>).
                 For example:
             </para>
 
-            <example_commands>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
                 env.AppendUnique(FRAMEWORKPATH='#myframeworkdir')
             </example_commands>
 
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 will add
             </para>
 
-            <example_commands>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
                 ... -Fmyframeworkdir
             </example_commands>
 
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 to the compiler and linker command lines.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-_FRAMEWORKPATH">
     <term>_FRAMEWORKPATH</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 On Mac OS X with gcc, an automatically-generated construction variable
                 containing the linker command-line options corresponding to
-                <link linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>.
+                <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-FRAMEWORKPATHPREFIX">
     <term>FRAMEWORKPATHPREFIX</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 On Mac OS X with gcc, the prefix to be used for the FRAMEWORKPATH entries.
-                (see <link linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>).
+                (see <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>).
                 The default value is
                 <option>-F</option>.
             </para>
@@ -2690,10 +2939,11 @@ The default list is:
   </varlistentry>
   <varlistentry id="cv-FRAMEWORKPREFIX">
     <term>FRAMEWORKPREFIX</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 On Mac OS X with gcc,
                 the prefix to be used for linking in frameworks
-                (see <link linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link>).
+                (see <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link>).
                 The default value is
                 <option>-framework</option>.
             </para>
@@ -2701,7 +2951,8 @@ The default list is:
   </varlistentry>
   <varlistentry id="cv-_FRAMEWORKS">
     <term>_FRAMEWORKS</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 On Mac OS X with gcc,
                 an automatically-generated construction variable
                 containing the linker command-line options
@@ -2711,14 +2962,15 @@ The default list is:
   </varlistentry>
   <varlistentry id="cv-FRAMEWORKS">
     <term>FRAMEWORKS</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 On Mac OS X with gcc, a list of the framework names to be linked into a
                 program or shared library or bundle.
                 The default value is the empty list.
                 For example:
             </para>
 
-            <example_commands>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
                 env.AppendUnique(FRAMEWORKS=Split('System Cocoa SystemConfiguration'))
             </example_commands>
 
@@ -2726,28 +2978,31 @@ The default list is:
   </varlistentry>
   <varlistentry id="cv-FRAMEWORKSFLAGS">
     <term>FRAMEWORKSFLAGS</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 On Mac OS X with gcc,
                 general user-supplied frameworks options to be added at
                 the end of a command
                 line building a loadable module.
                 (This has been largely superseded by
-                the <link linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>, <link linkend="cv-FRAMEWORKPATHPREFIX"><envar>$FRAMEWORKPATHPREFIX</envar></link>,
-                <link linkend="cv-FRAMEWORKPREFIX"><envar>$FRAMEWORKPREFIX</envar></link> and <link linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link> variables
+                the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATH"><envar>$FRAMEWORKPATH</envar></link>, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPATHPREFIX"><envar>$FRAMEWORKPATHPREFIX</envar></link>,
+                <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKPREFIX"><envar>$FRAMEWORKPREFIX</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKS"><envar>$FRAMEWORKS</envar></link> variables
                 described above.)
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-GS">
     <term>GS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Ghostscript program used, e.g. to convert PostScript to PDF files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-GSCOM">
     <term>GSCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The full Ghostscript command line used for the conversion process. Its default
 value is <quote><literal>$GS $GSFLAGS -sOutputFile=$TARGET $SOURCES</literal></quote>.
 </para>
@@ -2755,16 +3010,18 @@ value is <quote><literal>$GS $GSFLAGS -sOutputFile=$TARGET $SOURCES</literal></q
   </varlistentry>
   <varlistentry id="cv-GSCOMSTR">
     <term>GSCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when
 Ghostscript is called for the conversion process.
-If this is not set (the default), then <link linkend="cv-GSCOM"><envar>$GSCOM</envar></link> (the command line) is displayed.
+If this is not set (the default), then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-GSCOM"><envar>$GSCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-GSFLAGS">
     <term>GSFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the Ghostscript program,
 when converting PostScript to PDF files for example. Its default value
 is <quote><literal>-dNOPAUSE -dBATCH -sDEVICE=pdfwrite</literal></quote>
@@ -2773,7 +3030,8 @@ is <quote><literal>-dNOPAUSE -dBATCH -sDEVICE=pdfwrite</literal></quote>
   </varlistentry>
   <varlistentry id="cv-HOST_ARCH">
     <term>HOST_ARCH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
         The name of the host hardware architecture used to create the Environment.
         If a platform is specified when creating the Environment, then
         that Platform's logic will handle setting this value.
@@ -2781,7 +3039,8 @@ is <quote><literal>-dNOPAUSE -dBATCH -sDEVICE=pdfwrite</literal></quote>
         the Environment is initialized.
         Currently only set for Win32.
 </para>
-    <para>
+    
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets the host architecture for Visual Studio compiler. If not set,
 default to the detected host architecture: note that this may depend
 on the python you are using.
@@ -2789,11 +3048,11 @@ This variable must be passed as an argument to the Environment()
 constructor; setting it later has no effect. 
 </para>
 
-<para>
-Valid values are the same as for <envar>$TARGET_ARCH</envar>.
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Valid values are the same as for <envar xmlns="http://www.scons.org/dbxsd/v1.0">$TARGET_ARCH</envar>.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is currently only used on Windows, but in the future it will be
 used on other OSes as well.
 </para>
@@ -2801,7 +3060,8 @@ used on other OSes as well.
   </varlistentry>
   <varlistentry id="cv-HOST_OS">
     <term>HOST_OS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
         The name of the host operating system used to create the Environment.
         If a platform is specified when creating the Environment, then
         that Platform's logic will handle setting this value.
@@ -2813,69 +3073,75 @@ used on other OSes as well.
   </varlistentry>
   <varlistentry id="cv-IDLSUFFIXES">
     <term>IDLSUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of suffixes of files that will be scanned
 for IDL implicit dependencies
 (#include or import lines).
 The default list is:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 [".idl", ".IDL"]
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-IMPLIBNOVERSIONSYMLINKS">
     <term>IMPLIBNOVERSIONSYMLINKS</term>
-    <listitem><para>
-Used to override <link linkend="cv-SHLIBNOVERSIONSYMLINKS"><envar>$SHLIBNOVERSIONSYMLINKS</envar></link>/<link linkend="cv-LDMODULENOVERSIONSYMLINKS"><envar>$LDMODULENOVERSIONSYMLINKS</envar></link> when 
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Used to override <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBNOVERSIONSYMLINKS"><envar>$SHLIBNOVERSIONSYMLINKS</envar></link>/<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULENOVERSIONSYMLINKS"><envar>$LDMODULENOVERSIONSYMLINKS</envar></link> when 
 creating versioned import library for a shared library/loadable module. If not defined,
-then <link linkend="cv-SHLIBNOVERSIONSYMLINKS"><envar>$SHLIBNOVERSIONSYMLINKS</envar></link>/<link linkend="cv-LDMODULENOVERSIONSYMLINKS"><envar>$LDMODULENOVERSIONSYMLINKS</envar></link> is used to determine
+then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBNOVERSIONSYMLINKS"><envar>$SHLIBNOVERSIONSYMLINKS</envar></link>/<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULENOVERSIONSYMLINKS"><envar>$LDMODULENOVERSIONSYMLINKS</envar></link> is used to determine
 whether to disable symlink generation or not.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-IMPLIBPREFIX">
     <term>IMPLIBPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for import library names. For example, cygwin uses import
 libraries (<literal>libfoo.dll.a</literal>) in pair with dynamic libraries
-(<literal>cygfoo.dll</literal>). The <link linkend="t-cyglink"><literal>cyglink</literal></link> linker sets
-<link linkend="cv-IMPLIBPREFIX"><envar>$IMPLIBPREFIX</envar></link> to <literal>'lib'</literal> and <link linkend="cv-SHLIBPREFIX"><envar>$SHLIBPREFIX</envar></link>
+(<literal>cygfoo.dll</literal>). The <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-cyglink"><literal>cyglink</literal></link> linker sets
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-IMPLIBPREFIX"><envar>$IMPLIBPREFIX</envar></link> to <literal>'lib'</literal> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBPREFIX"><envar>$SHLIBPREFIX</envar></link>
 to <literal>'cyg'</literal>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-IMPLIBSUFFIX">
     <term>IMPLIBSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for import library names. For example, cygwin uses import
 libraries (<literal>libfoo.dll.a</literal>) in pair with dynamic libraries
-(<literal>cygfoo.dll</literal>). The <link linkend="t-cyglink"><literal>cyglink</literal></link> linker sets
-<link linkend="cv-IMPLIBSUFFIX"><envar>$IMPLIBSUFFIX</envar></link> to <literal>'.dll.a'</literal> and <link linkend="cv-SHLIBSUFFIX"><envar>$SHLIBSUFFIX</envar></link>
+(<literal>cygfoo.dll</literal>). The <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-cyglink"><literal>cyglink</literal></link> linker sets
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-IMPLIBSUFFIX"><envar>$IMPLIBSUFFIX</envar></link> to <literal>'.dll.a'</literal> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBSUFFIX"><envar>$SHLIBSUFFIX</envar></link>
 to <literal>'.dll'</literal>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-IMPLIBVERSION">
     <term>IMPLIBVERSION</term>
-    <listitem><para>
-Used to override <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>/<link linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> when
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Used to override <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>/<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> when
 generating versioned import library for a shared library/loadable module. If
-undefined, the <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>/<link linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> is used to
+undefined, the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>/<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> is used to
 determine the version of versioned import library. 
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-IMPLICIT_COMMAND_DEPENDENCIES">
     <term>IMPLICIT_COMMAND_DEPENDENCIES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Controls whether or not SCons will
 add implicit dependencies for the commands
 executed to build targets.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 By default, SCons will add
 to each target
 an implicit dependency on the command
@@ -2889,9 +3155,9 @@ variable in the
 environment used to execute the command.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If the construction variable
-<envar>$IMPLICIT_COMMAND_DEPENDENCIES</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$IMPLICIT_COMMAND_DEPENDENCIES</envar>
 is set to a false value
 (<literal>None</literal>,
 <literal>False</literal>,
@@ -2902,38 +3168,41 @@ not be added to the targets
 built with that construction environment.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(IMPLICIT_COMMAND_DEPENDENCIES = 0)
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-INCPREFIX">
     <term>INCPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify an include directory on the C compiler command
 line.
 This will be prepended to the beginning of each directory
-in the <envar>$CPPPATH</envar> and <envar>$FORTRANPATH</envar> construction variables
-when the <envar>$_CPPINCFLAGS</envar> and <envar>$_FORTRANINCFLAGS</envar>
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$FORTRANPATH</envar> construction variables
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPINCFLAGS</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_FORTRANINCFLAGS</envar>
 variables are automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-INCSUFFIX">
     <term>INCSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used to specify an include directory on the C compiler command
 line.
 This will be appended to the end of each directory
-in the <envar>$CPPPATH</envar> and <envar>$FORTRANPATH</envar> construction variables
-when the <envar>$_CPPINCFLAGS</envar> and <envar>$_FORTRANINCFLAGS</envar>
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$FORTRANPATH</envar> construction variables
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_CPPINCFLAGS</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_FORTRANINCFLAGS</envar>
 variables are automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-INSTALL">
     <term>INSTALL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A function to be called to install a file into a
 destination file name.
 The default function copies the file into the destination
@@ -2942,11 +3211,11 @@ to match the source file's).
 The function takes the following arguments:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 def install(dest, source, env):
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <varname>dest</varname>
 is the path name of the destination file.
 <varname>source</varname>
@@ -2960,19 +3229,21 @@ in force for this file installation.
   </varlistentry>
   <varlistentry id="cv-INSTALLSTR">
     <term>INSTALLSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a file is
 installed into a destination file name.
 The default is:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Install file: "$SOURCE" as "$TARGET"
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-INTEL_C_COMPILER_VERSION">
     <term>INTEL_C_COMPILER_VERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set by the "intelc" Tool
 to the major version number of the Intel C compiler
 selected for use.
@@ -2981,23 +3252,27 @@ selected for use.
   </varlistentry>
   <varlistentry id="cv-JAR">
     <term>JAR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Java archive tool.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Java archive tool.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-JARCHDIR">
     <term>JARCHDIR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory to which the Java archive tool should change
 (using the
 <option>-C</option>
 option).
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory to which the Java archive tool should change
 (using the
 <option>-C</option>
@@ -3007,39 +3282,44 @@ option).
   </varlistentry>
   <varlistentry id="cv-JARCOM">
     <term>JARCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call the Java archive tool.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call the Java archive tool.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-JARCOMSTR">
     <term>JARCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when the Java archive tool
 is called
-If this is not set, then <link linkend="cv-JARCOM"><envar>$JARCOM</envar></link> (the command line) is displayed.
+If this is not set, then <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JARCOM</envar> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET")
 </example_commands>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when the Java archive tool
 is called
-If this is not set, then <envar>$JARCOM</envar> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JARCOM"><envar>$JARCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-JARFLAGS">
     <term>JARFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the Java archive tool.
 By default this is set to
 <option>cf</option>
@@ -3047,7 +3327,8 @@ to create the necessary
 <command>jar</command>
 file.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the Java archive tool.
 By default this is set to
 <option>cf</option>
@@ -3059,12 +3340,14 @@ file.
   </varlistentry>
   <varlistentry id="cv-JARSUFFIX">
     <term>JARSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix for Java archives:
 <filename>.jar</filename>
 by default.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix for Java archives:
 <filename>.jar</filename>
 by default.
@@ -3073,10 +3356,11 @@ by default.
   </varlistentry>
   <varlistentry id="cv-JAVABOOTCLASSPATH">
     <term>JAVABOOTCLASSPATH</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Specifies the list of directories that
                 will be added to the
-                <application>javac</application> command line
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> command line
                 via the <option>-bootclasspath</option> option.
                 The individual directory names will be
                 separated by the operating system's path separate character
@@ -3088,46 +3372,51 @@ by default.
   </varlistentry>
   <varlistentry id="cv-JAVAC">
     <term>JAVAC</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 The Java compiler.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACCOM">
     <term>JAVACCOM</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 The command line used to compile a directory tree containing
                 Java source files to
                 corresponding Java class files.
-                Any options specified in the <link linkend="cv-JAVACFLAGS"><envar>$JAVACFLAGS</envar></link> construction variable
+                Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACFLAGS"><envar>$JAVACFLAGS</envar></link> construction variable
                 are included on this command line.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACCOMSTR">
     <term>JAVACCOMSTR</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 The string displayed when compiling
                 a directory tree of Java source files to
                 corresponding Java class files.
-                If this is not set, then <link linkend="cv-JAVACCOM"><envar>$JAVACCOM</envar></link> (the command line) is displayed.
+                If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACCOM"><envar>$JAVACCOM</envar></link> (the command line) is displayed.
             </para>
 
-            <example_commands>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
                 env = Environment(JAVACCOMSTR = "Compiling class files $TARGETS from $SOURCES")
             </example_commands>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACFLAGS">
     <term>JAVACFLAGS</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 General options that are passed to the Java compiler.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACLASSDIR">
     <term>JAVACLASSDIR</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 The directory in which Java class files may be found.
                 This is stripped from the beginning of any Java .class
                 file names supplied to the
@@ -3138,13 +3427,14 @@ by default.
   </varlistentry>
   <varlistentry id="cv-JAVACLASSPATH">
     <term>JAVACLASSPATH</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Specifies the list of directories that
                 will be searched for Java
                 <filename>.class</filename>
                 file.
                 The directories in this list will be added to the
-                <application>javac</application> and <application>javah</application> command lines
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> and <application xmlns="http://www.scons.org/dbxsd/v1.0">javah</application> command lines
                 via the <option>-classpath</option> option.
                 The individual directory names will be
                 separated by the operating system's path separate character
@@ -3153,11 +3443,11 @@ by default.
                 on Windows).
             </para>
 
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Note that this currently just adds the specified
                 directory via the <option>-classpath</option> option.
-                <application>SCons</application> does not currently search the
-                <envar>$JAVACLASSPATH</envar> directories for dependency
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> does not currently search the
+                <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVACLASSPATH</envar> directories for dependency
                 <filename>.class</filename>
                 files.
             </para>
@@ -3165,7 +3455,8 @@ by default.
   </varlistentry>
   <varlistentry id="cv-JAVACLASSSUFFIX">
     <term>JAVACLASSSUFFIX</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 The suffix for Java class files;
                 <filename>.class</filename>
                 by default.
@@ -3174,37 +3465,41 @@ by default.
   </varlistentry>
   <varlistentry id="cv-JAVAH">
     <term>JAVAH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Java generator for C header and stub files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVAHCOM">
     <term>JAVAHCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to generate C header and stub files
 from Java classes.
-Any options specified in the <link linkend="cv-JAVAHFLAGS"><envar>$JAVAHFLAGS</envar></link> construction variable
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVAHFLAGS"><envar>$JAVAHFLAGS</envar></link> construction variable
 are included on this command line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVAHCOMSTR">
     <term>JAVAHCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when C header and stub files
 are generated from Java classes.
-If this is not set, then <link linkend="cv-JAVAHCOM"><envar>$JAVAHCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVAHCOM"><envar>$JAVAHCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(JAVAHCOMSTR = "Generating header/stub file(s) $TARGETS from $SOURCES")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVAHFLAGS">
     <term>JAVAHFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the C header and stub file generator
 for Java classes.
 </para>
@@ -3212,20 +3507,22 @@ for Java classes.
   </varlistentry>
   <varlistentry id="cv-JAVAINCLUDES">
     <term>JAVAINCLUDES</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Include path for Java header files (such as jni.h)
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVASOURCEPATH">
     <term>JAVASOURCEPATH</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Specifies the list of directories that
                 will be searched for input
                 <filename>.java</filename>
                 file.
                 The directories in this list will be added to the
-                <application>javac</application> command line
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> command line
                 via the <option>-sourcepath</option> option.
                 The individual directory names will be
                 separated by the operating system's path separate character
@@ -3234,11 +3531,11 @@ for Java classes.
                 on Windows).
             </para>
 
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 Note that this currently just adds the specified
                 directory via the <option>-sourcepath</option> option.
-                <application>SCons</application> does not currently search the
-                <envar>$JAVASOURCEPATH</envar> directories for dependency
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> does not currently search the
+                <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVASOURCEPATH</envar> directories for dependency
                 <filename>.java</filename>
                 files.
             </para>
@@ -3246,7 +3543,8 @@ for Java classes.
   </varlistentry>
   <varlistentry id="cv-JAVASUFFIX">
     <term>JAVASUFFIX</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 The suffix for Java files;
                 <filename>.java</filename>
                 by default.
@@ -3255,70 +3553,76 @@ for Java classes.
   </varlistentry>
   <varlistentry id="cv-JAVAVERSION">
     <term>JAVAVERSION</term>
-    <listitem><para>
-                Specifies the Java version being used by the <function>Java</function> builder.
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Specifies the Java version being used by the <function xmlns="http://www.scons.org/dbxsd/v1.0">Java</function> builder.
                 This is <emphasis>not</emphasis> currently used to select one
                 version of the Java compiler vs. another.
                 Instead, you should set this to specify the version of Java
-                supported by your <application>javac</application> compiler.
+                supported by your <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
                 The default is <literal>1.4</literal>.
             </para>
 
-            <para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 This is sometimes necessary because
                 Java 1.5 changed the file names that are created
                 for nested anonymous inner classes,
                 which can cause a mismatch with the files
-                that <application>SCons</application> expects will be generated by the <application>javac</application> compiler.
-                Setting <envar>$JAVAVERSION</envar> to
+                that <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> expects will be generated by the <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
+                Setting <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVAVERSION</envar> to
                 <literal>1.5</literal>
                 (or <literal>1.6</literal>, as appropriate)
-                can make <application>SCons</application> realize that a Java 1.5 or 1.6
+                can make <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> realize that a Java 1.5 or 1.6
                 build is actually up to date.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-LATEX">
     <term>LATEX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The LaTeX structured formatter and typesetter.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LATEXCOM">
     <term>LATEXCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call the LaTeX structured formatter and typesetter.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LATEXCOMSTR">
     <term>LATEXCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when calling
 the LaTeX structured formatter and typesetter.
-If this is not set, then <link linkend="cv-LATEXCOM"><envar>$LATEXCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LATEXCOM"><envar>$LATEXCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(LATEXCOMSTR = "Building $TARGET from LaTeX input $SOURCES")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LATEXFLAGS">
     <term>LATEXFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the LaTeX structured formatter and typesetter.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LATEXRETRIES">
     <term>LATEXRETRIES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The maximum number of times that LaTeX
 will be re-run if the
 <filename>.log</filename>
-generated by the <link linkend="cv-LATEXCOM"><envar>$LATEXCOM</envar></link> command
+generated by the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LATEXCOM"><envar>$LATEXCOM</envar></link> command
 indicates that there are undefined references.
 The default is to try to resolve undefined references
 by re-running LaTeX up to three times.
@@ -3327,82 +3631,91 @@ by re-running LaTeX up to three times.
   </varlistentry>
   <varlistentry id="cv-LATEXSUFFIXES">
     <term>LATEXSUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of suffixes of files that will be scanned
 for LaTeX implicit dependencies
 (<literal>\include</literal> or <literal>\import</literal> files).
 The default list is:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 [".tex", ".ltx", ".latex"]
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LDMODULE">
     <term>LDMODULE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The linker for building loadable modules.
-By default, this is the same as <link linkend="cv-SHLINK"><envar>$SHLINK</envar></link>.
+By default, this is the same as <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINK"><envar>$SHLINK</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LDMODULECOM">
     <term>LDMODULECOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line for building loadable modules.
-On Mac OS X, this uses the <link linkend="cv-LDMODULE"><envar>$LDMODULE</envar></link>,
-<link linkend="cv-LDMODULEFLAGS"><envar>$LDMODULEFLAGS</envar></link> and
-<link linkend="cv-FRAMEWORKSFLAGS"><envar>$FRAMEWORKSFLAGS</envar></link> variables.
-On other systems, this is the same as <link linkend="cv-SHLINK"><envar>$SHLINK</envar></link>.
+On Mac OS X, this uses the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULE"><envar>$LDMODULE</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULEFLAGS"><envar>$LDMODULEFLAGS</envar></link> and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-FRAMEWORKSFLAGS"><envar>$FRAMEWORKSFLAGS</envar></link> variables.
+On other systems, this is the same as <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINK"><envar>$SHLINK</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LDMODULECOMSTR">
     <term>LDMODULECOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when building loadable modules.
-If this is not set, then <link linkend="cv-LDMODULECOM"><envar>$LDMODULECOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULECOM"><envar>$LDMODULECOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LDMODULEFLAGS">
     <term>LDMODULEFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General user options passed to the linker for building loadable modules.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LDMODULENOVERSIONSYMLINKS">
     <term>LDMODULENOVERSIONSYMLINKS</term>
-    <listitem><para>
-Instructs the <link linkend="b-LoadableModule"><function>LoadableModule</function></link> builder to not automatically create symlinks
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Instructs the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-LoadableModule"><function>LoadableModule</function></link> builder to not automatically create symlinks
 for versioned modules. Defaults to <literal>$SHLIBNOVERSIONSYMLINKS</literal>
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LDMODULEPREFIX">
     <term>LDMODULEPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for loadable module file names.
 On Mac OS X, this is null;
 on other systems, this is
-the same as <link linkend="cv-SHLIBPREFIX"><envar>$SHLIBPREFIX</envar></link>.
+the same as <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBPREFIX"><envar>$SHLIBPREFIX</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_LDMODULESONAME">
     <term>_LDMODULESONAME</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A macro that automatically generates loadable module's SONAME based on $TARGET,
-$LDMODULEVERSION and $LDMODULESUFFIX. Used by <link linkend="b-LoadableModule"><function>LoadableModule</function></link> builder
-when the linker tool supports SONAME (e.g. <link linkend="t-gnulink"><literal>gnulink</literal></link>).
+$LDMODULEVERSION and $LDMODULESUFFIX. Used by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-LoadableModule"><function>LoadableModule</function></link> builder
+when the linker tool supports SONAME (e.g. <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-gnulink"><literal>gnulink</literal></link>).
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LDMODULESUFFIX">
     <term>LDMODULESUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for loadable module file names.
 On Mac OS X, this is null;
 on other systems, this is
@@ -3412,32 +3725,35 @@ the same as $SHLIBSUFFIX.
   </varlistentry>
   <varlistentry id="cv-LDMODULEVERSION">
     <term>LDMODULEVERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When this construction variable is defined, a versioned loadable module
-is created by <link linkend="b-LoadableModule"><function>LoadableModule</function></link> builder. This activates the
-<link linkend="cv-_LDMODULEVERSIONFLAGS"><envar>$_LDMODULEVERSIONFLAGS</envar></link> and thus modifies the <link linkend="cv-LDMODULECOM"><envar>$LDMODULECOM</envar></link> as
+is created by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-LoadableModule"><function>LoadableModule</function></link> builder. This activates the
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_LDMODULEVERSIONFLAGS"><envar>$_LDMODULEVERSIONFLAGS</envar></link> and thus modifies the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULECOM"><envar>$LDMODULECOM</envar></link> as
 required, adds the version number to the library name, and creates the symlinks
-that are needed. <link linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> versions should exist in the same
-format as <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>.
+that are needed. <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> versions should exist in the same
+format as <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LDMODULEVERSIONFLAGS">
     <term>LDMODULEVERSIONFLAGS</term>
-    <listitem><para>
-Extra flags added to <link linkend="cv-LDMODULECOM"><envar>$LDMODULECOM</envar></link> when building versioned
-<link linkend="b-LoadableModule"><function>LoadableModule</function></link>. These flags are only used when <link linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> is
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Extra flags added to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULECOM"><envar>$LDMODULECOM</envar></link> when building versioned
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-LoadableModule"><function>LoadableModule</function></link>. These flags are only used when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> is
 set.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_LDMODULEVERSIONFLAGS">
     <term>_LDMODULEVERSIONFLAGS</term>
-    <listitem><para>
-This macro automatically introduces extra flags to <link linkend="cv-LDMODULECOM"><envar>$LDMODULECOM</envar></link> when
-building versioned <link linkend="b-LoadableModule"><function>LoadableModule</function></link> (that is when
-<link linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> is set). <literal>_LDMODULEVERSIONFLAGS</literal>
-usually adds <link linkend="cv-SHLIBVERSIONFLAGS"><envar>$SHLIBVERSIONFLAGS</envar></link> and some extra dynamically generated
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This macro automatically introduces extra flags to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULECOM"><envar>$LDMODULECOM</envar></link> when
+building versioned <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-LoadableModule"><function>LoadableModule</function></link> (that is when
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LDMODULEVERSION"><envar>$LDMODULEVERSION</envar></link> is set). <literal>_LDMODULEVERSIONFLAGS</literal>
+usually adds <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSIONFLAGS"><envar>$SHLIBVERSIONFLAGS</envar></link> and some extra dynamically generated
 options (such as <literal>-Wl,-soname=$_LDMODULESONAME</literal>).  It is unused
 by plain (unversioned) loadable modules.
 </para>
@@ -3445,14 +3761,16 @@ by plain (unversioned) loadable modules.
   </varlistentry>
   <varlistentry id="cv-LEX">
     <term>LEX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The lexical analyzer generator.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LEXCOM">
     <term>LEXCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call the lexical analyzer generator
 to generate a source file.
 </para>
@@ -3460,151 +3778,162 @@ to generate a source file.
   </varlistentry>
   <varlistentry id="cv-LEXCOMSTR">
     <term>LEXCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when generating a source file
 using the lexical analyzer generator.
-If this is not set, then <link linkend="cv-LEXCOM"><envar>$LEXCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LEXCOM"><envar>$LEXCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(LEXCOMSTR = "Lex'ing $TARGET from $SOURCES")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LEXFLAGS">
     <term>LEXFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the lexical analyzer generator.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_LIBDIRFLAGS">
     <term>_LIBDIRFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the linker command-line options
 for specifying directories to be searched for library.
-The value of <envar>$_LIBDIRFLAGS</envar> is created
-by respectively prepending and appending <envar>$LIBDIRPREFIX</envar> and <envar>$LIBDIRSUFFIX</envar>
+The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBDIRFLAGS</envar> is created
+by respectively prepending and appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBDIRPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBDIRSUFFIX</envar>
 to the beginning and end
-of each directory in <envar>$LIBPATH</envar>.
+of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBPATH</envar>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LIBDIRPREFIX">
     <term>LIBDIRPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify a library directory on the linker command line.
 This will be prepended to the beginning of each directory
-in the <envar>$LIBPATH</envar> construction variable
-when the <envar>$_LIBDIRFLAGS</envar> variable is automatically generated.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBPATH</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBDIRFLAGS</envar> variable is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LIBDIRSUFFIX">
     <term>LIBDIRSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used to specify a library directory on the linker command line.
 This will be appended to the end of each directory
-in the <envar>$LIBPATH</envar> construction variable
-when the <envar>$_LIBDIRFLAGS</envar> variable is automatically generated.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBPATH</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBDIRFLAGS</envar> variable is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LIBEMITTER">
     <term>LIBEMITTER</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 TODO
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_LIBFLAGS">
     <term>_LIBFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the linker command-line options
 for specifying libraries to be linked with the resulting target.
-The value of <envar>$_LIBFLAGS</envar> is created
-by respectively prepending and appending <envar>$LIBLINKPREFIX</envar> and <envar>$LIBLINKSUFFIX</envar>
+The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBFLAGS</envar> is created
+by respectively prepending and appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKSUFFIX</envar>
 to the beginning and end
-of each filename in <envar>$LIBS</envar>.
+of each filename in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBS</envar>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LIBLINKPREFIX">
     <term>LIBLINKPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify a library to link on the linker command line.
 This will be prepended to the beginning of each library
-in the <envar>$LIBS</envar> construction variable
-when the <envar>$_LIBFLAGS</envar> variable is automatically generated.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBS</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBFLAGS</envar> variable is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LIBLINKSUFFIX">
     <term>LIBLINKSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used to specify a library to link on the linker command line.
 This will be appended to the end of each library
-in the <envar>$LIBS</envar> construction variable
-when the <envar>$_LIBFLAGS</envar> variable is automatically generated.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBS</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBFLAGS</envar> variable is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LIBPATH">
     <term>LIBPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of directories that will be searched for libraries.
 The implicit dependency scanner will search these
 directories for include files. Don't explicitly put include directory
-arguments in <envar>$LINKFLAGS</envar> or <envar>$SHLINKFLAGS</envar>
+arguments in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LINKFLAGS</envar> or <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SHLINKFLAGS</envar>
 because the result will be non-portable
 and the directories will not be searched by the dependency scanner. Note:
 directory names in LIBPATH will be looked-up relative to the SConscript
 directory when they are used in a command. To force
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to look-up a directory relative to the root of the source tree use #:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(LIBPATH='#/libs')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory look-up can also be forced using the
-<function>Dir</function>()
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Dir</function>()
 function:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 libs = Dir('libs')
 env = Environment(LIBPATH=libs)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory list will be added to command lines
 through the automatically-generated
-<envar>$_LIBDIRFLAGS</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBDIRFLAGS</envar>
 construction variable,
 which is constructed by
 respectively prepending and appending the values of the
-<envar>$LIBDIRPREFIX</envar> and <envar>$LIBDIRSUFFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBDIRPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBDIRSUFFIX</envar>
 construction variables
 to the beginning and end
-of each directory in <envar>$LIBPATH</envar>.
+of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBPATH</envar>.
 Any command lines you define that need
 the LIBPATH directory list should
-include <envar>$_LIBDIRFLAGS</envar>:
+include <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBDIRFLAGS</envar>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(LINKCOM="my_linker $_LIBDIRFLAGS $_LIBFLAGS -o $TARGET $SOURCE")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LIBPREFIX">
     <term>LIBPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for (static) library file names.
 A default value is set for each platform
 (posix, win32, os2, etc.),
@@ -3616,63 +3945,65 @@ to reflect the names of the libraries they create.
   </varlistentry>
   <varlistentry id="cv-LIBPREFIXES">
     <term>LIBPREFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A list of all legal prefixes for library file names.
 When searching for library dependencies,
 SCons will look for files with these prefixes,
 the base library name,
-and suffixes in the <envar>$LIBSUFFIXES</envar> list.
+and suffixes in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBSUFFIXES</envar> list.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LIBS">
     <term>LIBS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A list of one or more libraries
 that will be linked with
 any executable programs
 created by this environment.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The library list will be added to command lines
 through the automatically-generated
-<envar>$_LIBFLAGS</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBFLAGS</envar>
 construction variable,
 which is constructed by
 respectively prepending and appending the values of the
-<envar>$LIBLINKPREFIX</envar> and <envar>$LIBLINKSUFFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKSUFFIX</envar>
 construction variables
 to the beginning and end
-of each filename in <envar>$LIBS</envar>.
+of each filename in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBS</envar>.
 Any command lines you define that need
 the LIBS library list should
-include <envar>$_LIBFLAGS</envar>:
+include <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBFLAGS</envar>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(LINKCOM="my_linker $_LIBDIRFLAGS $_LIBFLAGS -o $TARGET $SOURCE")
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 If you add a
 File
 object to the
-<envar>$LIBS</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBS</envar>
 list, the name of that file will be added to
-<envar>$_LIBFLAGS</envar>,
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$_LIBFLAGS</envar>,
 and thus the link line, as is, without
-<envar>$LIBLINKPREFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKPREFIX</envar>
 or
-<envar>$LIBLINKSUFFIX</envar>.
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBLINKSUFFIX</envar>.
 For example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Append(LIBS=File('/tmp/mylib.so'))
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 In all cases, scons will add dependencies from the executable program to
 all the libraries in this list.
 </para>
@@ -3680,7 +4011,8 @@ all the libraries in this list.
   </varlistentry>
   <varlistentry id="cv-LIBSUFFIX">
     <term>LIBSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for (static) library file names.
 A default value is set for each platform
 (posix, win32, os2, etc.),
@@ -3692,10 +4024,11 @@ to reflect the names of the libraries they create.
   </varlistentry>
   <varlistentry id="cv-LIBSUFFIXES">
     <term>LIBSUFFIXES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A list of all legal suffixes for library file names.
 When searching for library dependencies,
-SCons will look for files with prefixes, in the <envar>$LIBPREFIXES</envar> list,
+SCons will look for files with prefixes, in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LIBPREFIXES</envar> list,
 the base library name,
 and these suffixes.
 </para>
@@ -3703,7 +4036,8 @@ and these suffixes.
   </varlistentry>
   <varlistentry id="cv-LICENSE">
     <term>LICENSE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The abbreviated name, preferably the SPDX code, of the license under which
 this project is released (GPL-3.0, LGPL-2.1, BSD-2-Clause etc.).
 See http://www.opensource.org/licenses/alphabetical
@@ -3713,8 +4047,9 @@ for a list of license names and SPDX codes.
   </varlistentry>
   <varlistentry id="cv-LINESEPARATOR">
     <term>LINESEPARATOR</term>
-    <listitem><para>
-The separator used by the <function>Substfile</function> and <function>Textfile</function> builders.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The separator used by the <function xmlns="http://www.scons.org/dbxsd/v1.0">Substfile</function> and <function xmlns="http://www.scons.org/dbxsd/v1.0">Textfile</function> builders.
 This value is used between sources when constructing the target.
 It defaults to the current system line separator.
 </para>
@@ -3722,12 +4057,13 @@ It defaults to the current system line separator.
   </varlistentry>
   <varlistentry id="cv-LINGUAS_FILE">
     <term>LINGUAS_FILE</term>
-    <listitem><para>
-The <envar>$LINGUAS_FILE</envar> defines file(s) containing list of additional linguas
-to be processed by <link linkend="b-POInit"><function>POInit</function></link>, <link linkend="b-POUpdate"><function>POUpdate</function></link> or <link linkend="b-MOFiles"><function>MOFiles</function></link>
-builders. It also affects <link linkend="b-Translate"><function>Translate</function></link> builder. If the variable contains
-a string, it defines name of the list file. The <envar>$LINGUAS_FILE</envar> may be a
-list of file names as well. If <envar>$LINGUAS_FILE</envar> is set to
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LINGUAS_FILE</envar> defines file(s) containing list of additional linguas
+to be processed by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link>, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-MOFiles"><function>MOFiles</function></link>
+builders. It also affects <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-Translate"><function>Translate</function></link> builder. If the variable contains
+a string, it defines name of the list file. The <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LINGUAS_FILE</envar> may be a
+list of file names as well. If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$LINGUAS_FILE</envar> is set to
 <literal>True</literal> (or non-zero numeric value), the list will be read from
 default file named
 <filename>LINGUAS</filename>.
@@ -3737,50 +4073,54 @@ default file named
   </varlistentry>
   <varlistentry id="cv-LINK">
     <term>LINK</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The linker.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LINKCOM">
     <term>LINKCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to link object files into an executable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LINKCOMSTR">
     <term>LINKCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when object files
 are linked into an executable.
-If this is not set, then <link linkend="cv-LINKCOM"><envar>$LINKCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LINKCOM"><envar>$LINKCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(LINKCOMSTR = "Linking $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-LINKFLAGS">
     <term>LINKFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General user options passed to the linker.
 Note that this variable should
 <emphasis>not</emphasis>
 contain
 <option>-l</option>
-(or similar) options for linking with the libraries listed in <link linkend="cv-LIBS"><envar>$LIBS</envar></link>,
+(or similar) options for linking with the libraries listed in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBS"><envar>$LIBS</envar></link>,
 nor
 <option>-L</option>
 (or similar) library search path options
-that scons generates automatically from <link linkend="cv-LIBPATH"><envar>$LIBPATH</envar></link>.
+that scons generates automatically from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBPATH"><envar>$LIBPATH</envar></link>.
 See
-<link linkend="cv-_LIBFLAGS"><envar>$_LIBFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_LIBFLAGS"><envar>$_LIBFLAGS</envar></link>
 above,
 for the variable that expands to library-link options,
 and
-<link linkend="cv-_LIBDIRFLAGS"><envar>$_LIBDIRFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_LIBDIRFLAGS"><envar>$_LIBDIRFLAGS</envar></link>
 above,
 for the variable that expands to library search path options.
 </para>
@@ -3788,37 +4128,42 @@ for the variable that expands to library search path options.
   </varlistentry>
   <varlistentry id="cv-M4">
     <term>M4</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The M4 macro preprocessor.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-M4COM">
     <term>M4COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to pass files through the M4 macro preprocessor.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-M4COMSTR">
     <term>M4COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when
 a file is passed through the M4 macro preprocessor.
-If this is not set, then <link linkend="cv-M4COM"><envar>$M4COM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-M4COM"><envar>$M4COM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-M4FLAGS">
     <term>M4FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the M4 macro preprocessor.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MAKEINDEX">
     <term>MAKEINDEX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The makeindex generator for the TeX formatter and typesetter and the
 LaTeX structured formatter and typesetter.
 </para>
@@ -3826,7 +4171,8 @@ LaTeX structured formatter and typesetter.
   </varlistentry>
   <varlistentry id="cv-MAKEINDEXCOM">
     <term>MAKEINDEXCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call the makeindex generator for the
 TeX formatter and typesetter and the LaTeX structured formatter and
 typesetter.
@@ -3835,17 +4181,19 @@ typesetter.
   </varlistentry>
   <varlistentry id="cv-MAKEINDEXCOMSTR">
     <term>MAKEINDEXCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when calling the makeindex generator for the
 TeX formatter and typesetter
 and the LaTeX structured formatter and typesetter.
-If this is not set, then <link linkend="cv-MAKEINDEXCOM"><envar>$MAKEINDEXCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MAKEINDEXCOM"><envar>$MAKEINDEXCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MAKEINDEXFLAGS">
     <term>MAKEINDEXFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the makeindex generator for the TeX formatter
 and typesetter and the LaTeX structured formatter and typesetter.
 </para>
@@ -3853,7 +4201,8 @@ and typesetter and the LaTeX structured formatter and typesetter.
   </varlistentry>
   <varlistentry id="cv-MAXLINELENGTH">
     <term>MAXLINELENGTH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The maximum number of characters allowed on an external command line.
 On Win32 systems,
 link lines longer than this many characters
@@ -3863,159 +4212,178 @@ are linked via a temporary file name.
   </varlistentry>
   <varlistentry id="cv-MIDL">
     <term>MIDL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Microsoft IDL compiler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MIDLCOM">
     <term>MIDLCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to pass files to the Microsoft IDL compiler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MIDLCOMSTR">
     <term>MIDLCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when
 the Microsoft IDL copmiler is called.
-If this is not set, then <link linkend="cv-MIDLCOM"><envar>$MIDLCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MIDLCOM"><envar>$MIDLCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MIDLFLAGS">
     <term>MIDLFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the Microsoft IDL compiler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MOSUFFIX">
     <term>MOSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Suffix used for <literal>MO</literal> files (default: <literal>'.mo'</literal>).
-See <link linkend="t-msgfmt"><literal>msgfmt</literal></link> tool and <link linkend="b-MOFiles"><function>MOFiles</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgfmt"><literal>msgfmt</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-MOFiles"><function>MOFiles</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGFMT">
     <term>MSGFMT</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Absolute path to <command>msgfmt(1)</command> binary, found by
 <function>Detect()</function>.
-See <link linkend="t-msgfmt"><literal>msgfmt</literal></link> tool and <link linkend="b-MOFiles"><function>MOFiles</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgfmt"><literal>msgfmt</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-MOFiles"><function>MOFiles</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGFMTCOM">
     <term>MSGFMTCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Complete command line to run <command>msgfmt(1)</command> program.
-See <link linkend="t-msgfmt"><literal>msgfmt</literal></link> tool and <link linkend="b-MOFiles"><function>MOFiles</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgfmt"><literal>msgfmt</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-MOFiles"><function>MOFiles</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGFMTCOMSTR">
     <term>MSGFMTCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 String to display when <command>msgfmt(1)</command> is invoked 
-(default: <literal>''</literal>, which means ``print <link linkend="cv-MSGFMTCOM"><envar>$MSGFMTCOM</envar></link>'').
-See <link linkend="t-msgfmt"><literal>msgfmt</literal></link> tool and <link linkend="b-MOFiles"><function>MOFiles</function></link> builder.
+(default: <literal>''</literal>, which means ``print <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSGFMTCOM"><envar>$MSGFMTCOM</envar></link>'').
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgfmt"><literal>msgfmt</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-MOFiles"><function>MOFiles</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGFMTFLAGS">
     <term>MSGFMTFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Additional flags to <command>msgfmt(1)</command>.
-See <link linkend="t-msgfmt"><literal>msgfmt</literal></link> tool and <link linkend="b-MOFiles"><function>MOFiles</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgfmt"><literal>msgfmt</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-MOFiles"><function>MOFiles</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGINIT">
     <term>MSGINIT</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Path to <command>msginit(1)</command> program (found via
 <literal>Detect()</literal>).
-See <link linkend="t-msginit"><literal>msginit</literal></link> tool and <link linkend="b-POInit"><function>POInit</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGINITCOM">
     <term>MSGINITCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Complete command line to run <command>msginit(1)</command> program.
-See <link linkend="t-msginit"><literal>msginit</literal></link> tool and <link linkend="b-POInit"><function>POInit</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGINITCOMSTR">
     <term>MSGINITCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 String to display when <command>msginit(1)</command> is invoked 
-(default: <literal>''</literal>, which means ``print <link linkend="cv-MSGINITCOM"><envar>$MSGINITCOM</envar></link>'').
-See <link linkend="t-msginit"><literal>msginit</literal></link> tool and <link linkend="b-POInit"><function>POInit</function></link> builder.
+(default: <literal>''</literal>, which means ``print <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSGINITCOM"><envar>$MSGINITCOM</envar></link>'').
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGINITFLAGS">
     <term>MSGINITFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 List of additional flags to <command>msginit(1)</command> (default:
 <literal>[]</literal>).
-See <link linkend="t-msginit"><literal>msginit</literal></link> tool and <link linkend="b-POInit"><function>POInit</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_MSGINITLOCALE">
     <term>_MSGINITLOCALE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Internal ``macro''. Computes locale (language) name based on target filename
 (default: <literal>'${TARGET.filebase}' </literal>).
 </para>
-<para>
-See <link linkend="t-msginit"><literal>msginit</literal></link> tool and <link linkend="b-POInit"><function>POInit</function></link> builder.
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGMERGE">
     <term>MSGMERGE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Absolute path to <command>msgmerge(1)</command> binary as found by
 <function>Detect()</function>.
-See <link linkend="t-msgmerge"><literal>msgmerge</literal></link> tool and <link linkend="b-POUpdate"><function>POUpdate</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgmerge"><literal>msgmerge</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGMERGECOM">
     <term>MSGMERGECOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Complete command line to run <command>msgmerge(1)</command> command.
-See <link linkend="t-msgmerge"><literal>msgmerge</literal></link> tool and <link linkend="b-POUpdate"><function>POUpdate</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgmerge"><literal>msgmerge</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGMERGECOMSTR">
     <term>MSGMERGECOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 String to be displayed when <command>msgmerge(1)</command> is invoked
-(default: <literal>''</literal>, which means ``print <link linkend="cv-MSGMERGECOM"><envar>$MSGMERGECOM</envar></link>'').
-See <link linkend="t-msgmerge"><literal>msgmerge</literal></link> tool and <link linkend="b-POUpdate"><function>POUpdate</function></link> builder.
+(default: <literal>''</literal>, which means ``print <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSGMERGECOM"><envar>$MSGMERGECOM</envar></link>'').
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgmerge"><literal>msgmerge</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSGMERGEFLAGS">
     <term>MSGMERGEFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Additional flags to <command>msgmerge(1)</command> command.
-See <link linkend="t-msgmerge"><literal>msgmerge</literal></link> tool and <link linkend="b-POUpdate"><function>POUpdate</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgmerge"><literal>msgmerge</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSSDK_DIR">
     <term>MSSDK_DIR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory containing the Microsoft SDK
 (either Platform SDK or Windows SDK)
 to be used for compilation.
@@ -4024,7 +4392,8 @@ to be used for compilation.
   </varlistentry>
   <varlistentry id="cv-MSSDK_VERSION">
     <term>MSSDK_VERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The version string of the Microsoft SDK
 (either Platform SDK or Windows SDK)
 to be used for compilation.
@@ -4040,7 +4409,8 @@ and
   </varlistentry>
   <varlistentry id="cv-MSVC_BATCH">
     <term>MSVC_BATCH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When set to any true value,
 specifies that SCons should batch
 compilation of object files
@@ -4051,7 +4421,7 @@ and were configured in SCons using the same construction environment
 will be built in a single call to the compiler.
 Only source files that have changed since their
 object files were built will be passed to each compiler invocation
-(via the <link linkend="cv-CHANGED_SOURCES"><envar>$CHANGED_SOURCES</envar></link> construction variable).
+(via the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CHANGED_SOURCES"><envar>$CHANGED_SOURCES</envar></link> construction variable).
 Any compilations where the object (target) file base name
 (minus the <filename>.obj</filename>)
 does not match the source file base name
@@ -4061,12 +4431,13 @@ will be compiled separately.
   </varlistentry>
   <varlistentry id="cv-MSVC_USE_SCRIPT">
     <term>MSVC_USE_SCRIPT</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Use a batch script to set up Microsoft Visual Studio compiler
 </para>
 
-<para>
-<envar>$MSVC_USE_SCRIPT</envar> overrides <envar>$MSVC_VERSION</envar> and <envar>$TARGET_ARCH</envar>.
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_USE_SCRIPT</envar> overrides <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$TARGET_ARCH</envar>.
 If set to the name of a Visual Studio .bat file (e.g. vcvars.bat),
 SCons will run that bat file and extract the relevant variables from
 the result (typically %INCLUDE%, %LIB%, and %PATH%).  Setting
@@ -4078,12 +4449,13 @@ window and importing the shell's environment variables.
   </varlistentry>
   <varlistentry id="cv-MSVC_UWP_APP">
     <term>MSVC_UWP_APP</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Build libraries for a Universal Windows Platform (UWP) Application.
 </para>
 
-<para>
-If <envar>$MSVC_UWP_APP</envar> is set, the Visual Studio environment will be set up to point
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_UWP_APP</envar> is set, the Visual Studio environment will be set up to point
 to the Windows Store compatible libraries and Visual Studio runtimes. In doing so,
 any libraries that are built will be able to be used in a UWP App and published
 to the Windows Store.
@@ -4092,7 +4464,7 @@ This variable must be passed as an argument to the Environment()
 constructor; setting it later has no effect.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Valid values are '1' or '0'
 </para>
 
@@ -4100,19 +4472,20 @@ Valid values are '1' or '0'
   </varlistentry>
   <varlistentry id="cv-MSVC_VERSION">
     <term>MSVC_VERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets the preferred  version of Microsoft Visual C/C++ to use.
 </para>
 
-<para>
-If <envar>$MSVC_VERSION</envar> is not set, SCons will (by default) select the
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> is not set, SCons will (by default) select the
 latest version of Visual C/C++ installed on your system.  If the
 specified version isn't installed, tool initialization will fail.
 This variable must be passed as an argument to the Environment()
 constructor; setting it later has no effect.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Valid values for Windows are
 <literal>14.0</literal>,
 <literal>14.0Exp</literal>,
@@ -4137,17 +4510,15 @@ Versions ending in <literal>Exp</literal> refer to "Express" or
   </varlistentry>
   <varlistentry id="cv-MSVS">
     <term>MSVS</term>
-    <listitem>
-      <para>
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">
 When the Microsoft Visual Studio tools are initialized, they set up this
-dictionary with the following keys: </para>
-      <variablelist>
+dictionary with the following keys: </para><variablelist xmlns="http://www.scons.org/dbxsd/v1.0">
     <varlistentry>
       <term>VERSION</term>
 
       <listitem>
         <para>the version of MSVS being used (can be set via
-        <link linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link>)</para>
+        <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVS_VERSION"><envar>$MSVS_VERSION</envar></link>)</para>
       </listitem>
     </varlistentry>
 
@@ -4227,30 +4598,28 @@ dictionary with the following keys: </para>
         the version number.</para>
       </listitem>
     </varlistentry>
-  </variablelist>
-      <para>If a value isn't set, it wasn't available in the
-registry.</para>
-    </listitem>
+  </variablelist><para xmlns="http://www.scons.org/dbxsd/v1.0">If a value isn't set, it wasn't available in the
+registry.</para></listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_ARCH">
     <term>MSVS_ARCH</term>
-    <listitem><para>Sets
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets
 the architecture for which the generated project(s) should build. </para>
-<para>The default value is <literal>x86</literal>. <literal>amd64</literal> is
-also supported by <application>SCons</application> for some Visual Studio versions. Trying to set
-<envar>$MSVS_ARCH</envar> to an architecture that's not supported for a given Visual
+<para xmlns="http://www.scons.org/dbxsd/v1.0">The default value is <literal>x86</literal>. <literal>amd64</literal> is
+also supported by <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> for some Visual Studio versions. Trying to set
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_ARCH</envar> to an architecture that's not supported for a given Visual
 Studio version will generate an error. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_PROJECT_GUID">
     <term>MSVS_PROJECT_GUID</term>
-    <listitem><para>The string placed in a generated
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The string placed in a generated
 Microsoft Visual Studio project file as the value of the
 <literal>ProjectGUID</literal> attribute. There is no default value. If not
 defined, a new GUID is generated. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_AUX_PATH">
     <term>MSVS_SCC_AUX_PATH</term>
-    <listitem><para>The path name placed in a generated
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The path name placed in a generated
 Microsoft Visual Studio project file as the value of the
 <literal>SccAuxPath</literal> attribute if the
 <envar>MSVS_SCC_PROVIDER</envar> construction variable is also set. There is
@@ -4258,7 +4627,7 @@ no default value. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_CONNECTION_ROOT">
     <term>MSVS_SCC_CONNECTION_ROOT</term>
-    <listitem><para>The root path of projects in
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The root path of projects in
 your SCC workspace, i.e the path under which all project and solution files
 will be generated. It is used as a reference path from which the relative
 paths of the generated Microsoft Visual Studio project and solution files are
@@ -4278,7 +4647,7 @@ default value is the current working directory. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_PROJECT_NAME">
     <term>MSVS_SCC_PROJECT_NAME</term>
-    <listitem><para>The project name placed in
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The project name placed in
 a generated Microsoft Visual Studio project file as the value of the
 <literal>SccProjectName</literal> attribute if the
 <envar>MSVS_SCC_PROVIDER</envar> construction variable is also set. In this
@@ -4289,7 +4658,7 @@ of the Microsoft Visual Studio solution file. There is no default value.
   </varlistentry>
   <varlistentry id="cv-MSVS_SCC_PROVIDER">
     <term>MSVS_SCC_PROVIDER</term>
-    <listitem><para>The
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
 string placed in a generated Microsoft Visual Studio project file as the value
 of the <literal>SccProvider</literal> attribute. The string is also placed in
 the <literal>SccProvider0</literal> attribute of the
@@ -4298,45 +4667,46 @@ Visual Studio solution file. There is no default value. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVS_VERSION">
     <term>MSVS_VERSION</term>
-    <listitem><para>Sets the preferred version
-of Microsoft Visual Studio to use. </para> <para>If <envar>$MSVS_VERSION</envar> is not
-set, <application>SCons</application> will (by default) select the latest version of Visual Studio
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">Sets the preferred version
+of Microsoft Visual Studio to use. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0">If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar> is not
+set, <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> will (by default) select the latest version of Visual Studio
 installed on your system. So, if you have version 6 and version 7 (MSVS .NET)
 installed, it will prefer version 7. You can override this by specifying the
 <envar>MSVS_VERSION</envar> variable in the Environment initialization,
 setting it to the appropriate version ('6.0' or '7.0', for example). If the
 specified version isn't installed, tool initialization will fail. </para>
-<para>This is obsolete: use <envar>$MSVC_VERSION</envar> instead. If <envar>$MSVS_VERSION</envar> is
-set and <envar>$MSVC_VERSION</envar> is not, <envar>$MSVC_VERSION</envar> will be set automatically
-to <envar>$MSVS_VERSION</envar>. If both are set to different values, scons will raise an
+<para xmlns="http://www.scons.org/dbxsd/v1.0">This is obsolete: use <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> instead. If <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar> is
+set and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> is not, <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVC_VERSION</envar> will be set automatically
+to <envar xmlns="http://www.scons.org/dbxsd/v1.0">$MSVS_VERSION</envar>. If both are set to different values, scons will raise an
 error. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSBUILDCOM">
     <term>MSVSBUILDCOM</term>
-    <listitem><para>The build command line placed in a generated Microsoft Visual Studio
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">The build command line placed in a generated Microsoft Visual Studio
 project file. The default is to have Visual Studio invoke SCons with any
 specified build targets. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSCLEANCOM">
     <term>MSVSCLEANCOM</term>
-    <listitem><para>The clean command line placed in a generated Microsoft Visual
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The clean command line placed in a generated Microsoft Visual
 Studio project file. The default is to have Visual Studio invoke SCons with
 the -c option to remove any specified targets. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSENCODING">
     <term>MSVSENCODING</term>
-    <listitem><para>The encoding string placed in a
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The encoding string placed in a
 generated Microsoft Visual Studio project file. The default is encoding
 <literal>Windows-1252</literal>. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSPROJECTCOM">
     <term>MSVSPROJECTCOM</term>
-    <listitem><para>The action used to generate Microsoft
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The action used to generate Microsoft
 Visual Studio project files. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSPROJECTSUFFIX">
     <term>MSVSPROJECTSUFFIX</term>
-    <listitem><para>The suffix used for Microsoft Visual
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The suffix used for Microsoft Visual
 Studio project (DSP) files. The default value is <filename>.vcproj</filename>
 when using Visual Studio version 7.x (.NET) or later version, and
 <filename>.dsp</filename> when using earlier versions of Visual Studio.
@@ -4344,45 +4714,46 @@ when using Visual Studio version 7.x (.NET) or later version, and
   </varlistentry>
   <varlistentry id="cv-MSVSREBUILDCOM">
     <term>MSVSREBUILDCOM</term>
-    <listitem><para>The
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
 rebuild command line placed in a generated Microsoft Visual Studio project
 file. The default is to have Visual Studio invoke SCons with any specified
 rebuild targets. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONS">
     <term>MSVSSCONS</term>
-    <listitem><para>The SCons used in generated Microsoft Visual Studio project files. The
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">The SCons used in generated Microsoft Visual Studio project files. The
 default is the version of SCons being used to generate the project file.
 </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONSCOM">
     <term>MSVSSCONSCOM</term>
-    <listitem><para>The default
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The default
 SCons command used in generated Microsoft Visual Studio project files. </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONSCRIPT">
     <term>MSVSSCONSCRIPT</term>
-    <listitem><para>The sconscript
-file (that is, <filename>SConstruct</filename> or <filename>SConscript</filename> file) that will be invoked by
-Visual Studio project files (through the <link linkend="cv-MSVSSCONSCOM"><envar>$MSVSSCONSCOM</envar></link> variable). The
-default is the same sconscript file that contains the call to <function>MSVSProject</function>
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The sconscript
+file (that is, <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConstruct</filename> or <filename xmlns="http://www.scons.org/dbxsd/v1.0">SConscript</filename> file) that will be invoked by
+Visual Studio project files (through the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSCONSCOM"><envar>$MSVSSCONSCOM</envar></link> variable). The
+default is the same sconscript file that contains the call to <function xmlns="http://www.scons.org/dbxsd/v1.0">MSVSProject</function>
 to build the project file. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSCONSFLAGS">
     <term>MSVSSCONSFLAGS</term>
-    <listitem><para>The
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
 SCons flags used in generated Microsoft Visual Studio project files. </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSOLUTIONCOM">
     <term>MSVSSOLUTIONCOM</term>
-    <listitem><para>The action used to generate Microsoft
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The action used to generate Microsoft
 Visual Studio solution files. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-MSVSSOLUTIONSUFFIX">
     <term>MSVSSOLUTIONSUFFIX</term>
-    <listitem><para>The suffix used for Microsoft
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The suffix used for Microsoft
 Visual Studio solution (DSW) files. The default value is
 <filename>.sln</filename> when using Visual Studio version 7.x (.NET), and
 <filename>.dsw</filename> when using earlier versions of Visual Studio.
@@ -4390,38 +4761,43 @@ Visual Studio solution (DSW) files. The default value is
   </varlistentry>
   <varlistentry id="cv-MT">
     <term>MT</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The program used on Windows systems to embed manifests into DLLs and EXEs.
-See also <link linkend="cv-WINDOWS_EMBED_MANIFEST"><envar>$WINDOWS_EMBED_MANIFEST</envar></link>.
+See also <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-WINDOWS_EMBED_MANIFEST"><envar>$WINDOWS_EMBED_MANIFEST</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MTEXECOM">
     <term>MTEXECOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Windows command line used to embed manifests into executables.
-See also <link linkend="cv-MTSHLIBCOM"><envar>$MTSHLIBCOM</envar></link>.
+See also <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MTSHLIBCOM"><envar>$MTSHLIBCOM</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MTFLAGS">
     <term>MTFLAGS</term>
-    <listitem><para>
-Flags passed to the <link linkend="cv-MT"><envar>$MT</envar></link> manifest embedding program (Windows only).
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Flags passed to the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MT"><envar>$MT</envar></link> manifest embedding program (Windows only).
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MTSHLIBCOM">
     <term>MTSHLIBCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Windows command line used to embed manifests into shared libraries (DLLs).
-See also <link linkend="cv-MTEXECOM"><envar>$MTEXECOM</envar></link>.
+See also <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MTEXECOM"><envar>$MTEXECOM</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-MWCW_VERSION">
     <term>MWCW_VERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The version number of the MetroWerks CodeWarrior C compiler
 to be used.
 </para>
@@ -4429,7 +4805,8 @@ to be used.
   </varlistentry>
   <varlistentry id="cv-MWCW_VERSIONS">
     <term>MWCW_VERSIONS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A list of installed versions of the MetroWerks CodeWarrior C compiler
 on this system.
 </para>
@@ -4437,14 +4814,16 @@ on this system.
   </varlistentry>
   <varlistentry id="cv-NAME">
     <term>NAME</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specfies the name of the project to package.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-no_import_lib">
     <term>no_import_lib</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When set to non-zero,
 suppresses creation of a corresponding Windows static import lib by the
 <literal>SharedLibrary</literal>
@@ -4458,21 +4837,24 @@ when using Microsoft Visual Studio.
   </varlistentry>
   <varlistentry id="cv-OBJPREFIX">
     <term>OBJPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for (static) object file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-OBJSUFFIX">
     <term>OBJSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for (static) object file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PACKAGEROOT">
     <term>PACKAGEROOT</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies the directory where all files in resulting archive will be
 placed if applicable.  The default value is "$NAME-$VERSION".
 </para>
@@ -4480,11 +4862,12 @@ placed if applicable.  The default value is "$NAME-$VERSION".
   </varlistentry>
   <varlistentry id="cv-PACKAGETYPE">
     <term>PACKAGETYPE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Selects the package type to build.  Currently these are available:
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
  * msi - Microsoft Installer
  * rpm - Redhat Package Manger
  * ipkg - Itsy Package Management System
@@ -4496,14 +4879,15 @@ Selects the package type to build.  Currently these are available:
  * src_zip - zip file source
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This may be overridden with the "package_type" command line option.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PACKAGEVERSION">
     <term>PACKAGEVERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The version of the package (not the underlying project).
 This is currently only used by the rpm packager
 and should reflect changes in the packaging,
@@ -4513,7 +4897,8 @@ not the underlying project code itself.
   </varlistentry>
   <varlistentry id="cv-PCH">
     <term>PCH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Microsoft Visual C++ precompiled header that will be used when compiling
 object files. This variable is ignored by tools other than Microsoft Visual C++.
 When this variable is
@@ -4523,40 +4908,44 @@ dependencies for the PCH file.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env['PCH'] = 'StdAfx.pch'
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PCHCOM">
     <term>PCHCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used by the
-<function>PCH</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">PCH</function>
 builder to generated a precompiled header.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PCHCOMSTR">
     <term>PCHCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when generating a precompiled header.
-If this is not set, then <link linkend="cv-PCHCOM"><envar>$PCHCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PCHCOM"><envar>$PCHCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PCHPDBFLAGS">
     <term>PCHPDBFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A construction variable that, when expanded,
 adds the <literal>/yD</literal> flag to the command line
-only if the <envar>$PDB</envar> construction variable is set.
+only if the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$PDB</envar> construction variable is set.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PCHSTOP">
     <term>PCHSTOP</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This variable specifies how much of a source file is precompiled. This
 variable is ignored by tools other than Microsoft Visual C++, or when
 the PCH variable is not being used. When this variable is define it
@@ -4565,14 +4954,15 @@ is included at the end of the precompiled portion of the source files, or
 the empty string if the "#pragma hrdstop" construct is being used:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env['PCHSTOP'] = 'StdAfx.h'
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDB">
     <term>PDB</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Microsoft Visual C++ PDB file that will store debugging information for
 object files, shared libraries, and programs. This variable is ignored by
 tools other than Microsoft Visual C++.
@@ -4583,11 +4973,11 @@ dependencies for the PDB file.
 Example:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env['PDB'] = 'hello.pdb'
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Visual C++ compiler switch that SCons uses by default
 to generate PDB information is <option>/Z7</option>.
 This works correctly with parallel (<option>-j</option>) builds
@@ -4599,104 +4989,116 @@ Using the <option>/Zi</option> instead may yield improved
 link-time performance,
 although parallel builds will no longer work.
 You can generate PDB files with the <option>/Zi</option>
-switch by overriding the default <link linkend="cv-CCPDBFLAGS"><envar>$CCPDBFLAGS</envar></link> variable;
+switch by overriding the default <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CCPDBFLAGS"><envar>$CCPDBFLAGS</envar></link> variable;
 see the entry for that variable for specific examples.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFCOM">
     <term>PDFCOM</term>
-    <listitem><para>
-A deprecated synonym for <link linkend="cv-DVIPDFCOM"><envar>$DVIPDFCOM</envar></link>.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+A deprecated synonym for <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-DVIPDFCOM"><envar>$DVIPDFCOM</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFLATEX">
     <term>PDFLATEX</term>
-    <listitem><para>
-The <application>pdflatex</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The <application xmlns="http://www.scons.org/dbxsd/v1.0">pdflatex</application> utility.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFLATEXCOM">
     <term>PDFLATEXCOM</term>
-    <listitem><para>
-The command line used to call the <application>pdflatex</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The command line used to call the <application xmlns="http://www.scons.org/dbxsd/v1.0">pdflatex</application> utility.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFLATEXCOMSTR">
     <term>PDFLATEXCOMSTR</term>
-    <listitem><para>
-The string displayed when calling the <application>pdflatex</application> utility.
-If this is not set, then <link linkend="cv-PDFLATEXCOM"><envar>$PDFLATEXCOM</envar></link> (the command line) is displayed.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The string displayed when calling the <application xmlns="http://www.scons.org/dbxsd/v1.0">pdflatex</application> utility.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PDFLATEXCOM"><envar>$PDFLATEXCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(PDFLATEX;COMSTR = "Building $TARGET from LaTeX input $SOURCES")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFLATEXFLAGS">
     <term>PDFLATEXFLAGS</term>
-    <listitem><para>
-General options passed to the <application>pdflatex</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+General options passed to the <application xmlns="http://www.scons.org/dbxsd/v1.0">pdflatex</application> utility.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFPREFIX">
     <term>PDFPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for PDF file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFSUFFIX">
     <term>PDFSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for PDF file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFTEX">
     <term>PDFTEX</term>
-    <listitem><para>
-The <application>pdftex</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The <application xmlns="http://www.scons.org/dbxsd/v1.0">pdftex</application> utility.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFTEXCOM">
     <term>PDFTEXCOM</term>
-    <listitem><para>
-The command line used to call the <application>pdftex</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The command line used to call the <application xmlns="http://www.scons.org/dbxsd/v1.0">pdftex</application> utility.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFTEXCOMSTR">
     <term>PDFTEXCOMSTR</term>
-    <listitem><para>
-The string displayed when calling the <application>pdftex</application> utility.
-If this is not set, then <link linkend="cv-PDFTEXCOM"><envar>$PDFTEXCOM</envar></link> (the command line) is displayed.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The string displayed when calling the <application xmlns="http://www.scons.org/dbxsd/v1.0">pdftex</application> utility.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PDFTEXCOM"><envar>$PDFTEXCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(PDFTEXCOMSTR = "Building $TARGET from TeX input $SOURCES")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PDFTEXFLAGS">
     <term>PDFTEXFLAGS</term>
-    <listitem><para>
-General options passed to the <application>pdftex</application> utility.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+General options passed to the <application xmlns="http://www.scons.org/dbxsd/v1.0">pdftex</application> utility.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PKGCHK">
     <term>PKGCHK</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 On Solaris systems,
 the package-checking program that will
-be used (along with <envar>$PKGINFO</envar>)
+be used (along with <envar xmlns="http://www.scons.org/dbxsd/v1.0">$PKGINFO</envar>)
 to look for installed versions of
 the Sun PRO C++ compiler.
 The default is
@@ -4706,10 +5108,11 @@ The default is
   </varlistentry>
   <varlistentry id="cv-PKGINFO">
     <term>PKGINFO</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 On Solaris systems,
 the package information program that will
-be used (along with <envar>$PKGCHK</envar>)
+be used (along with <envar xmlns="http://www.scons.org/dbxsd/v1.0">$PKGCHK</envar>)
 to look for installed versions of
 the Sun PRO C++ compiler.
 The default is
@@ -4719,14 +5122,15 @@ The default is
   </varlistentry>
   <varlistentry id="cv-PLATFORM">
     <term>PLATFORM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The name of the platform used to create the Environment.  If no platform is
 specified when the Environment is created,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 autodetects the platform.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(tools = [])
 if env['PLATFORM'] == 'cygwin':
     Tool('mingw')(env)
@@ -4737,41 +5141,45 @@ else:
   </varlistentry>
   <varlistentry id="cv-POAUTOINIT">
     <term>POAUTOINIT</term>
-    <listitem><para>
-The <envar>$POAUTOINIT</envar> variable, if set to <literal>True</literal> (on non-zero
-numeric value), let the <link linkend="t-msginit"><literal>msginit</literal></link> tool to automatically initialize
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The <envar xmlns="http://www.scons.org/dbxsd/v1.0">$POAUTOINIT</envar> variable, if set to <literal>True</literal> (on non-zero
+numeric value), let the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> tool to automatically initialize
 <emphasis>missing</emphasis> <literal>PO</literal> files with
 <command>msginit(1)</command>.  This applies to both,
-<link linkend="b-POInit"><function>POInit</function></link> and <link linkend="b-POUpdate"><function>POUpdate</function></link> builders (and others that use any of
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> builders (and others that use any of
 them).
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-POCREATE_ALIAS">
     <term>POCREATE_ALIAS</term>
-    <listitem><para>
-Common alias for all <literal>PO</literal> files created with <function>POInit</function>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Common alias for all <literal>PO</literal> files created with <function xmlns="http://www.scons.org/dbxsd/v1.0">POInit</function>
 builder (default: <literal>'po-create'</literal>).
-See <link linkend="t-msginit"><literal>msginit</literal></link> tool and <link linkend="b-POInit"><function>POInit</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-POSUFFIX">
     <term>POSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Suffix used for <literal>PO</literal> files (default: <literal>'.po'</literal>)
-See <link linkend="t-msginit"><literal>msginit</literal></link> tool and <link linkend="b-POInit"><function>POInit</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msginit"><literal>msginit</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-POTDOMAIN">
     <term>POTDOMAIN</term>
-    <listitem><para>
-The <envar>$POTDOMAIN</envar> defines default domain, used to generate
-<literal>POT</literal> filename as <filename><envar>$POTDOMAIN</envar>.pot</filename> when
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The <envar xmlns="http://www.scons.org/dbxsd/v1.0">$POTDOMAIN</envar> defines default domain, used to generate
+<literal>POT</literal> filename as <filename><envar xmlns="http://www.scons.org/dbxsd/v1.0">$POTDOMAIN</envar>.pot</filename> when
 no <literal>POT</literal> file name is provided by the user. This applies to
-<link linkend="b-POTUpdate"><function>POTUpdate</function></link>, <link linkend="b-POInit"><function>POInit</function></link> and <link linkend="b-POUpdate"><function>POUpdate</function></link> builders (and
-builders, that use them, e.g. <function>Translate</function>). Normally (if <envar>$POTDOMAIN</envar> is
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link>, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POInit"><function>POInit</function></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> builders (and
+builders, that use them, e.g. <function xmlns="http://www.scons.org/dbxsd/v1.0">Translate</function>). Normally (if <envar xmlns="http://www.scons.org/dbxsd/v1.0">$POTDOMAIN</envar> is
 not defined), the builders use <filename>messages.pot</filename> as default
 <literal>POT</literal> file name.
 </para>
@@ -4779,33 +5187,37 @@ not defined), the builders use <filename>messages.pot</filename> as default
   </varlistentry>
   <varlistentry id="cv-POTSUFFIX">
     <term>POTSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Suffix used for PO Template files (default: <literal>'.pot'</literal>).
-See <link linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-POTUPDATE_ALIAS">
     <term>POTUPDATE_ALIAS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Name of the common phony target for all PO Templates created with
-<link linkend="b-POUpdate"><function>POUpdate</function></link> (default: <literal>'pot-update'</literal>).
-See <link linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> (default: <literal>'pot-update'</literal>).
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-POUPDATE_ALIAS">
     <term>POUPDATE_ALIAS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Common alias for all <literal>PO</literal> files being defined with
-<link linkend="b-POUpdate"><function>POUpdate</function></link> builder (default: <literal>'po-update'</literal>).
-See <link linkend="t-msgmerge"><literal>msgmerge</literal></link> tool and <link linkend="b-POUpdate"><function>POUpdate</function></link> builder.
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> builder (default: <literal>'po-update'</literal>).
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-msgmerge"><literal>msgmerge</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POUpdate"><function>POUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PRINT_CMD_LINE_FUNC">
     <term>PRINT_CMD_LINE_FUNC</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A Python function used to print the command lines as they are executed
 (assuming command printing is not disabled by the
 <option>-q</option>
@@ -4823,20 +5235,20 @@ the source(s) used (file node, list, or string name(s)), and
 the environment being used.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The function must do the printing itself.  The default implementation,
 used if this variable is not set or is None, is:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 def print_cmd_line(s, target, source, env):
   sys.stdout.write(s + "\n")
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Here's an example of a more interesting function:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 def print_cmd_line(s, target, source, env):
    sys.stdout.write("Building %s -&gt; %s...\n" %
     (' and '.join([str(x) for x in source]),
@@ -4845,7 +5257,7 @@ env=Environment(PRINT_CMD_LINE_FUNC=print_cmd_line)
 env.Program('foo', 'foo.c')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This just prints "Building <varname>targetname</varname> from <varname>sourcename</varname>..." instead
 of the actual commands.
 Such a function could also log the actual commands to a log file,
@@ -4855,58 +5267,66 @@ for example.
   </varlistentry>
   <varlistentry id="cv-PROGEMITTER">
     <term>PROGEMITTER</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 TODO
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PROGPREFIX">
     <term>PROGPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for executable file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PROGSUFFIX">
     <term>PROGSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for executable file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PSCOM">
     <term>PSCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to convert TeX DVI files into a PostScript file.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PSCOMSTR">
     <term>PSCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a TeX DVI file
 is converted into a PostScript file.
-If this is not set, then <link linkend="cv-PSCOM"><envar>$PSCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PSCOM"><envar>$PSCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PSPREFIX">
     <term>PSPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for PostScript file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-PSSUFFIX">
     <term>PSSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for PostScript file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_AUTOSCAN">
     <term>QT_AUTOSCAN</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Turn off scanning for mocable files. Use the Moc Builder to explicitly
 specify files to run moc on.
 </para>
@@ -4914,66 +5334,74 @@ specify files to run moc on.
   </varlistentry>
   <varlistentry id="cv-QT_BINPATH">
     <term>QT_BINPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The path where the qt binaries are installed.
-The default value is '<link linkend="cv-QTDIR"><envar>$QTDIR</envar></link>/bin'.
+The default value is '<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-QTDIR"><envar>$QTDIR</envar></link>/bin'.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_CPPPATH">
     <term>QT_CPPPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The path where the qt header files are installed.
-The default value is '<link linkend="cv-QTDIR"><envar>$QTDIR</envar></link>/include'.
+The default value is '<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-QTDIR"><envar>$QTDIR</envar></link>/include'.
 Note: If you set this variable to None,
-the tool won't change the <link linkend="cv-CPPPATH"><envar>$CPPPATH</envar></link>
+the tool won't change the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPPATH"><envar>$CPPPATH</envar></link>
 construction variable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_DEBUG">
     <term>QT_DEBUG</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Prints lots of debugging information while scanning for moc files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_LIB">
     <term>QT_LIB</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is 'qt'. You may want to set this to 'qt-mt'. Note: If you set
-this variable to None, the tool won't change the <link linkend="cv-LIBS"><envar>$LIBS</envar></link> variable.
+this variable to None, the tool won't change the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBS"><envar>$LIBS</envar></link> variable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_LIBPATH">
     <term>QT_LIBPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The path where the qt libraries are installed.
-The default value is '<link linkend="cv-QTDIR"><envar>$QTDIR</envar></link>/lib'.
+The default value is '<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-QTDIR"><envar>$QTDIR</envar></link>/lib'.
 Note: If you set this variable to None,
-the tool won't change the <link linkend="cv-LIBPATH"><envar>$LIBPATH</envar></link>
+the tool won't change the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBPATH"><envar>$LIBPATH</envar></link>
 construction variable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_MOC">
     <term>QT_MOC</term>
-    <listitem><para>
-Default value is '<link linkend="cv-QT_BINPATH"><envar>$QT_BINPATH</envar></link>/moc'.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Default value is '<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-QT_BINPATH"><envar>$QT_BINPATH</envar></link>/moc'.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_MOCCXXPREFIX">
     <term>QT_MOCCXXPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is ''. Prefix for moc output files, when source is a cxx file.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_MOCCXXSUFFIX">
     <term>QT_MOCCXXSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is '.moc'. Suffix for moc output files, when source is a cxx
 file.
 </para>
@@ -4981,22 +5409,25 @@ file.
   </varlistentry>
   <varlistentry id="cv-QT_MOCFROMCXXCOM">
     <term>QT_MOCFROMCXXCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Command to generate a moc file from a cpp file.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_MOCFROMCXXCOMSTR">
     <term>QT_MOCFROMCXXCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when generating a moc file from a cpp file.
-If this is not set, then <link linkend="cv-QT_MOCFROMCXXCOM"><envar>$QT_MOCFROMCXXCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-QT_MOCFROMCXXCOM"><envar>$QT_MOCFROMCXXCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_MOCFROMCXXFLAGS">
     <term>QT_MOCFROMCXXFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is '-i'. These flags are passed to moc, when moccing a
 C++ file.
 </para>
@@ -5004,22 +5435,25 @@ C++ file.
   </varlistentry>
   <varlistentry id="cv-QT_MOCFROMHCOM">
     <term>QT_MOCFROMHCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Command to generate a moc file from a header.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_MOCFROMHCOMSTR">
     <term>QT_MOCFROMHCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when generating a moc file from a cpp file.
-If this is not set, then <link linkend="cv-QT_MOCFROMHCOM"><envar>$QT_MOCFROMHCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-QT_MOCFROMHCOM"><envar>$QT_MOCFROMHCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_MOCFROMHFLAGS">
     <term>QT_MOCFROMHFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is ''. These flags are passed to moc, when moccing a header
 file.
 </para>
@@ -5027,44 +5461,50 @@ file.
   </varlistentry>
   <varlistentry id="cv-QT_MOCHPREFIX">
     <term>QT_MOCHPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is 'moc_'. Prefix for moc output files, when source is a header.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_MOCHSUFFIX">
     <term>QT_MOCHSUFFIX</term>
-    <listitem><para>
-Default value is '<link linkend="cv-CXXFILESUFFIX"><envar>$CXXFILESUFFIX</envar></link>'. Suffix for moc output files, when source is
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Default value is '<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CXXFILESUFFIX"><envar>$CXXFILESUFFIX</envar></link>'. Suffix for moc output files, when source is
 a header.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_UIC">
     <term>QT_UIC</term>
-    <listitem><para>
-Default value is '<link linkend="cv-QT_BINPATH"><envar>$QT_BINPATH</envar></link>/uic'.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Default value is '<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-QT_BINPATH"><envar>$QT_BINPATH</envar></link>/uic'.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_UICCOM">
     <term>QT_UICCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Command to generate header files from .ui files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_UICCOMSTR">
     <term>QT_UICCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when generating header files from .ui files.
-If this is not set, then <link linkend="cv-QT_UICCOM"><envar>$QT_UICCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-QT_UICCOM"><envar>$QT_UICCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_UICDECLFLAGS">
     <term>QT_UICDECLFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is ''. These flags are passed to uic, when creating a a h
 file from a .ui file.
 </para>
@@ -5072,21 +5512,24 @@ file from a .ui file.
   </varlistentry>
   <varlistentry id="cv-QT_UICDECLPREFIX">
     <term>QT_UICDECLPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is ''. Prefix for uic generated header files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_UICDECLSUFFIX">
     <term>QT_UICDECLSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is '.h'. Suffix for uic generated header files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_UICIMPLFLAGS">
     <term>QT_UICIMPLFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is ''. These flags are passed to uic, when creating a cxx
 file from a .ui file.
 </para>
@@ -5094,29 +5537,33 @@ file from a .ui file.
   </varlistentry>
   <varlistentry id="cv-QT_UICIMPLPREFIX">
     <term>QT_UICIMPLPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is 'uic_'. Prefix for uic generated implementation files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_UICIMPLSUFFIX">
     <term>QT_UICIMPLSUFFIX</term>
-    <listitem><para>
-Default value is '<link linkend="cv-CXXFILESUFFIX"><envar>$CXXFILESUFFIX</envar></link>'. Suffix for uic generated implementation
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Default value is '<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CXXFILESUFFIX"><envar>$CXXFILESUFFIX</envar></link>'. Suffix for uic generated implementation
 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QT_UISUFFIX">
     <term>QT_UISUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Default value is '.ui'. Suffix of designer input files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-QTDIR">
     <term>QTDIR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The qt tool tries to take this from os.environ.
 It also initializes all QT_*
 construction variables listed below.
@@ -5125,24 +5572,24 @@ with python's os.path.join() method,
 but are listed here with the '/' separator
 for easier reading.)
 In addition, the construction environment
-variables <link linkend="cv-CPPPATH"><envar>$CPPPATH</envar></link>,
-<link linkend="cv-LIBPATH"><envar>$LIBPATH</envar></link> and
-<link linkend="cv-LIBS"><envar>$LIBS</envar></link> may be modified
+variables <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPPATH"><envar>$CPPPATH</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBPATH"><envar>$LIBPATH</envar></link> and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBS"><envar>$LIBS</envar></link> may be modified
 and the variables
-<link linkend="cv-PROGEMITTER"><envar>$PROGEMITTER</envar></link>, <link linkend="cv-SHLIBEMITTER"><envar>$SHLIBEMITTER</envar></link> and <link linkend="cv-LIBEMITTER"><envar>$LIBEMITTER</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-PROGEMITTER"><envar>$PROGEMITTER</envar></link>, <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBEMITTER"><envar>$SHLIBEMITTER</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBEMITTER"><envar>$LIBEMITTER</envar></link>
 are modified. Because the build-performance is affected when using this tool,
 you have to explicitly specify it at Environment creation:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 Environment(tools=['default','qt'])
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The qt tool supports the following operations:
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis role="strong">Automatic moc file generation from header files.</emphasis>
 You do not have to specify moc files explicitly, the tool does it for you.
 However, there are a few preconditions to do so: Your header file must have
@@ -5150,11 +5597,11 @@ the same filebase as your implementation file and must stay in the same
 directory. It must have one of the suffixes .h, .hpp, .H, .hxx, .hh. You
 can turn off automatic moc file generation by setting QT_AUTOSCAN to 0.
 See also the corresponding
-<function>Moc</function>()
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Moc</function>()
 builder method.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis role="strong">Automatic moc file generation from cxx files.</emphasis>
 As stated in the qt documentation, include the moc file at the end of
 the cxx file. Note that you have to include the file, which is generated
@@ -5163,11 +5610,11 @@ by the transformation ${QT_MOCCXXPREFIX}&lt;basename&gt;${QT_MOCCXXSUFFIX}, by d
 do not include the correct file. If you are using VariantDir, you may
 need to specify duplicate=1. You can turn off automatic moc file generation
 by setting QT_AUTOSCAN to 0. See also the corresponding
-<function>Moc</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Moc</function>
 builder method.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <emphasis role="strong">Automatic handling of .ui files.</emphasis>
 The implementation files generated from .ui files are handled much the same
 as yacc or lex files. Each .ui file given as a source of Program, Library or
@@ -5175,47 +5622,52 @@ SharedLibrary will generate three files, the declaration file, the
 implementation file and a moc file. Because there are also generated headers,
 you may need to specify duplicate=1 in calls to VariantDir.
 See also the corresponding
-<function>Uic</function>
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Uic</function>
 builder method.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RANLIB">
     <term>RANLIB</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The archive indexer.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RANLIBCOM">
     <term>RANLIBCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to index a static library archive.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RANLIBCOMSTR">
     <term>RANLIBCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a static library archive is indexed.
-If this is not set, then <link linkend="cv-RANLIBCOM"><envar>$RANLIBCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RANLIBCOM"><envar>$RANLIBCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(RANLIBCOMSTR = "Indexing $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RANLIBFLAGS">
     <term>RANLIBFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the archive indexer.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RC">
     <term>RC</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The resource compiler used to build
 a Microsoft Visual C++ resource file.
 </para>
@@ -5223,7 +5675,8 @@ a Microsoft Visual C++ resource file.
   </varlistentry>
   <varlistentry id="cv-RCCOM">
     <term>RCCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to build
 a Microsoft Visual C++ resource file.
 </para>
@@ -5231,60 +5684,66 @@ a Microsoft Visual C++ resource file.
   </varlistentry>
   <varlistentry id="cv-RCCOMSTR">
     <term>RCCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when invoking the resource compiler
 to build a Microsoft Visual C++ resource file.
-If this is not set, then <link linkend="cv-RCCOM"><envar>$RCCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RCCOM"><envar>$RCCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RCFLAGS">
     <term>RCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The flags passed to the resource compiler by the RES builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RCINCFLAGS">
     <term>RCINCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the command-line options
 for specifying directories to be searched
 by the resource compiler.
-The value of <envar>$RCINCFLAGS</envar> is created
+The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCFLAGS</envar> is created
 by respectively prepending and appending
-<envar>$RCINCPREFIX</envar> and <envar>$RCINCSUFFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCSUFFIX</envar>
 to the beginning and end
-of each directory in <envar>$CPPPATH</envar>.
+of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RCINCPREFIX">
     <term>RCINCPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix (flag) used to specify an include directory
 on the resource compiler command line.
 This will be prepended to the beginning of each directory
-in the <envar>$CPPPATH</envar> construction variable
-when the <envar>$RCINCFLAGS</envar> variable is expanded.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCFLAGS</envar> variable is expanded.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RCINCSUFFIX">
     <term>RCINCSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used to specify an include directory
 on the resource compiler command line.
 This will be appended to the end of each directory
-in the <envar>$CPPPATH</envar> construction variable
-when the <envar>$RCINCFLAGS</envar> variable is expanded.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$CPPPATH</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCFLAGS</envar> variable is expanded.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RDirs">
     <term>RDirs</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A function that converts a string into a list of Dir instances by
 searching the repositories.
 </para>
@@ -5292,35 +5751,39 @@ searching the repositories.
   </varlistentry>
   <varlistentry id="cv-REGSVR">
     <term>REGSVR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The program used on Windows systems
 to register a newly-built DLL library
-whenever the <function>SharedLibrary</function> builder
+whenever the <function xmlns="http://www.scons.org/dbxsd/v1.0">SharedLibrary</function> builder
 is passed a keyword argument of <literal>register=1</literal>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-REGSVRCOM">
     <term>REGSVRCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used on Windows systems
 to register a newly-built DLL library
-whenever the <function>SharedLibrary</function> builder
+whenever the <function xmlns="http://www.scons.org/dbxsd/v1.0">SharedLibrary</function> builder
 is passed a keyword argument of <literal>register=1</literal>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-REGSVRCOMSTR">
     <term>REGSVRCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when registering a newly-built DLL file.
-If this is not set, then <link linkend="cv-REGSVRCOM"><envar>$REGSVRCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-REGSVRCOM"><envar>$REGSVRCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-REGSVRFLAGS">
     <term>REGSVRFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Flags passed to the DLL registration program
 on Windows systems when a newly-built DLL library is registered.
 By default,
@@ -5332,66 +5795,72 @@ and requiring user attention.
   </varlistentry>
   <varlistentry id="cv-RMIC">
     <term>RMIC</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Java RMI stub compiler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RMICCOM">
     <term>RMICCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile stub
 and skeleton class files
 from Java classes that contain RMI implementations.
-Any options specified in the <link linkend="cv-RMICFLAGS"><envar>$RMICFLAGS</envar></link> construction variable
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RMICFLAGS"><envar>$RMICFLAGS</envar></link> construction variable
 are included on this command line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RMICCOMSTR">
     <term>RMICCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when compiling
 stub and skeleton class files
 from Java classes that contain RMI implementations.
-If this is not set, then <link linkend="cv-RMICCOM"><envar>$RMICCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RMICCOM"><envar>$RMICCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(RMICCOMSTR = "Generating stub/skeleton class files $TARGETS from $SOURCES")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RMICFLAGS">
     <term>RMICFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the Java RMI stub compiler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_RPATH">
     <term>_RPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the rpath flags to be used when linking
 a program with shared libraries.
-The value of <envar>$_RPATH</envar> is created
-by respectively prepending <envar>$RPATHPREFIX</envar> and appending <envar>$RPATHSUFFIX</envar>
+The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_RPATH</envar> is created
+by respectively prepending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATHPREFIX</envar> and appending <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATHSUFFIX</envar>
 to the beginning and end
-of each directory in <envar>$RPATH</envar>.
+of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATH</envar>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RPATH">
     <term>RPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A list of paths to search for shared libraries when running programs.
 Currently only used in the GNU (gnulink),
 IRIX (sgilink) and Sun (sunlink) linkers.
 Ignored on platforms and toolchains that don't support it.
 Note that the paths added to RPATH
 are not transformed by
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 in any way:  if you want an absolute
 path, you must make it absolute yourself.
 </para>
@@ -5399,87 +5868,96 @@ path, you must make it absolute yourself.
   </varlistentry>
   <varlistentry id="cv-RPATHPREFIX">
     <term>RPATHPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify a directory to be searched for
 shared libraries when running programs.
 This will be prepended to the beginning of each directory
-in the <envar>$RPATH</envar> construction variable
-when the <envar>$_RPATH</envar> variable is automatically generated.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATH</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_RPATH</envar> variable is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RPATHSUFFIX">
     <term>RPATHSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used to specify a directory to be searched for
 shared libraries when running programs.
 This will be appended to the end of each directory
-in the <envar>$RPATH</envar> construction variable
-when the <envar>$_RPATH</envar> variable is automatically generated.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RPATH</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_RPATH</envar> variable is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RPCGEN">
     <term>RPCGEN</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The RPC protocol compiler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RPCGENCLIENTFLAGS">
     <term>RPCGENCLIENTFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options passed to the RPC protocol compiler
 when generating client side stubs.
 These are in addition to any flags specified in the
-<link linkend="cv-RPCGENFLAGS"><envar>$RPCGENFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RPCGENFLAGS"><envar>$RPCGENFLAGS</envar></link>
 construction variable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RPCGENFLAGS">
     <term>RPCGENFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the RPC protocol compiler.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RPCGENHEADERFLAGS">
     <term>RPCGENHEADERFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options passed to the RPC protocol compiler
 when generating a header file.
 These are in addition to any flags specified in the
-<link linkend="cv-RPCGENFLAGS"><envar>$RPCGENFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RPCGENFLAGS"><envar>$RPCGENFLAGS</envar></link>
 construction variable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RPCGENSERVICEFLAGS">
     <term>RPCGENSERVICEFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options passed to the RPC protocol compiler
 when generating server side stubs.
 These are in addition to any flags specified in the
-<link linkend="cv-RPCGENFLAGS"><envar>$RPCGENFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RPCGENFLAGS"><envar>$RPCGENFLAGS</envar></link>
 construction variable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-RPCGENXDRFLAGS">
     <term>RPCGENXDRFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options passed to the RPC protocol compiler
 when generating XDR routines.
 These are in addition to any flags specified in the
-<link linkend="cv-RPCGENFLAGS"><envar>$RPCGENFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RPCGENFLAGS"><envar>$RPCGENFLAGS</envar></link>
 construction variable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SCANNERS">
     <term>SCANNERS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A list of the available implicit dependency scanners.
 New file scanners may be added by
 appending to this list,
@@ -5494,47 +5972,51 @@ below, for more information.
   </varlistentry>
   <varlistentry id="cv-SCONS_HOME">
     <term>SCONS_HOME</term>
-    <listitem><para>The
+    <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
 (optional) path to the SCons library directory, initialized from the external
 environment. If set, this is used to construct a shorter and more efficient
-search path in the <link linkend="cv-MSVSSCONS"><envar>$MSVSSCONS</envar></link> command line executed from Microsoft
+search path in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MSVSSCONS"><envar>$MSVSSCONS</envar></link> command line executed from Microsoft
 Visual Studio project files. </para> </listitem>
   </varlistentry>
   <varlistentry id="cv-SHCC">
     <term>SHCC</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The C compiler used for generating shared-library objects.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHCCCOM">
     <term>SHCCCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a C source file
 to a shared-library object file.
-Any options specified in the <link linkend="cv-SHCFLAGS"><envar>$SHCFLAGS</envar></link>,
-<link linkend="cv-SHCCFLAGS"><envar>$SHCCFLAGS</envar></link> and
-<link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHCFLAGS"><envar>$SHCFLAGS</envar></link>,
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHCCFLAGS"><envar>$SHCCFLAGS</envar></link> and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHCCCOMSTR">
     <term>SHCCCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a C source file
 is compiled to a shared object file.
-If this is not set, then <link linkend="cv-SHCCCOM"><envar>$SHCCCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHCCCOM"><envar>$SHCCCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(SHCCCOMSTR = "Compiling shared object $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHCCFLAGS">
     <term>SHCCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options that are passed to the C and C++ compilers
 to generate shared-library objects.
 </para>
@@ -5542,7 +6024,8 @@ to generate shared-library objects.
   </varlistentry>
   <varlistentry id="cv-SHCFLAGS">
     <term>SHCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options that are passed to the C compiler (only; not C++)
 to generate shared-library objects.
 </para>
@@ -5550,38 +6033,42 @@ to generate shared-library objects.
   </varlistentry>
   <varlistentry id="cv-SHCXX">
     <term>SHCXX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The C++ compiler used for generating shared-library objects.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHCXXCOM">
     <term>SHCXXCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a C++ source file
 to a shared-library object file.
-Any options specified in the <link linkend="cv-SHCXXFLAGS"><envar>$SHCXXFLAGS</envar></link> and
-<link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHCXXFLAGS"><envar>$SHCXXFLAGS</envar></link> and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHCXXCOMSTR">
     <term>SHCXXCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a C++ source file
 is compiled to a shared object file.
-If this is not set, then <link linkend="cv-SHCXXCOM"><envar>$SHCXXCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHCXXCOM"><envar>$SHCXXCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(SHCXXCOMSTR = "Compiling shared object $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHCXXFLAGS">
     <term>SHCXXFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options that are passed to the C++ compiler
 to generate shared-library objects.
 </para>
@@ -5589,15 +6076,18 @@ to generate shared-library objects.
   </varlistentry>
   <varlistentry id="cv-SHDC">
     <term>SHDC</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The name of the compiler to use when compiling D source
   destined to be in a shared objects.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The name of the compiler to use when compiling D source
   destined to be in a shared objects.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The name of the compiler to use when compiling D source
   destined to be in a shared objects.
 </para>
@@ -5605,42 +6095,50 @@ to generate shared-library objects.
   </varlistentry>
   <varlistentry id="cv-SHDCOM">
     <term>SHDCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when compiling code to be part of shared objects.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when compiling code to be part of shared objects.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when compiling code to be part of shared objects.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHDLIBVERSION">
     <term>SHDLIBVERSION</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 SHDLIBVERSION.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-SHDLIBVERSIONFLAGS">
     <term>SHDLIBVERSIONFLAGS</term>
-    <listitem><para>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
                 SHDLIBVERSIONFLAGS.
             </para>
         </listitem>
   </varlistentry>
   <varlistentry id="cv-SHDLINK">
     <term>SHDLINK</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The linker to use when creating shared objects for code bases
   include D sources.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The linker to use when creating shared objects for code bases
   include D sources.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The linker to use when creating shared objects for code bases
   include D sources.
 </para>
@@ -5648,62 +6146,71 @@ to generate shared-library objects.
   </varlistentry>
   <varlistentry id="cv-SHDLINKCOM">
     <term>SHDLINKCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when generating shared objects.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when generating shared objects.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The command line to use when generating shared objects.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHDLINKFLAGS">
     <term>SHDLINKFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The list of flags to use when generating a shared object.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The list of flags to use when generating a shared object.
 </para>
-<para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
   The list of flags to use when generating a shared object.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHELL">
     <term>SHELL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A string naming the shell program that will be passed to the
-<envar>$SPAWN</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$SPAWN</envar>
 function.
 See the
-<envar>$SPAWN</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$SPAWN</envar>
 construction variable for more information.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF03">
     <term>SHF03</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Fortran 03 compiler used for generating shared-library objects.
-You should normally set the <link linkend="cv-SHFORTRAN"><envar>$SHFORTRAN</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRAN"><envar>$SHFORTRAN</envar></link> variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
-You only need to set <link linkend="cv-SHF03"><envar>$SHF03</envar></link> if you need to use a specific compiler
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF03"><envar>$SHF03</envar></link> if you need to use a specific compiler
 or compiler version for Fortran 03 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF03COM">
     <term>SHF03COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 03 source file
 to a shared-library object file.
-You only need to set <link linkend="cv-SHF03COM"><envar>$SHF03COM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF03COM"><envar>$SHF03COM</envar></link> if you need to use a specific
 command line for Fortran 03 files.
-You should normally set the <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link> variable,
 which specifies the default command line
 for all Fortran versions.
 </para>
@@ -5711,22 +6218,24 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF03COMSTR">
     <term>SHF03COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 03 source file
 is compiled to a shared-library object file.
-If this is not set, then <link linkend="cv-SHF03COM"><envar>$SHF03COM</envar></link> or <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF03COM"><envar>$SHF03COM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF03FLAGS">
     <term>SHF03FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options that are passed to the Fortran 03 compiler
 to generated shared-library objects.
-You only need to set <link linkend="cv-SHF03FLAGS"><envar>$SHF03FLAGS</envar></link> if you need to define specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF03FLAGS"><envar>$SHF03FLAGS</envar></link> if you need to define specific
 user options for Fortran 03 files.
-You should normally set the <link linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
@@ -5735,15 +6244,16 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF03PPCOM">
     <term>SHF03PPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 03 source file to a
 shared-library object file
 after first running the file through the C preprocessor.
-Any options specified in the <link linkend="cv-SHF03FLAGS"><envar>$SHF03FLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF03FLAGS"><envar>$SHF03FLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
-You only need to set <link linkend="cv-SHF03PPCOM"><envar>$SHF03PPCOM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF03PPCOM"><envar>$SHF03PPCOM</envar></link> if you need to use a specific
 C-preprocessor command line for Fortran 03 files.
-You should normally set the <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link> variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
 </para>
@@ -5751,35 +6261,38 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF03PPCOMSTR">
     <term>SHF03PPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 03 source file
 is compiled to a shared-library object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-SHF03PPCOM"><envar>$SHF03PPCOM</envar></link> or <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF03PPCOM"><envar>$SHF03PPCOM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF08">
     <term>SHF08</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Fortran 08 compiler used for generating shared-library objects.
-You should normally set the <link linkend="cv-SHFORTRAN"><envar>$SHFORTRAN</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRAN"><envar>$SHFORTRAN</envar></link> variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
-You only need to set <link linkend="cv-SHF08"><envar>$SHF08</envar></link> if you need to use a specific compiler
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF08"><envar>$SHF08</envar></link> if you need to use a specific compiler
 or compiler version for Fortran 08 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF08COM">
     <term>SHF08COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 08 source file
 to a shared-library object file.
-You only need to set <link linkend="cv-SHF08COM"><envar>$SHF08COM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF08COM"><envar>$SHF08COM</envar></link> if you need to use a specific
 command line for Fortran 08 files.
-You should normally set the <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link> variable,
 which specifies the default command line
 for all Fortran versions.
 </para>
@@ -5787,22 +6300,24 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF08COMSTR">
     <term>SHF08COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 08 source file
 is compiled to a shared-library object file.
-If this is not set, then <link linkend="cv-SHF08COM"><envar>$SHF08COM</envar></link> or <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF08COM"><envar>$SHF08COM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF08FLAGS">
     <term>SHF08FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options that are passed to the Fortran 08 compiler
 to generated shared-library objects.
-You only need to set <link linkend="cv-SHF08FLAGS"><envar>$SHF08FLAGS</envar></link> if you need to define specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF08FLAGS"><envar>$SHF08FLAGS</envar></link> if you need to define specific
 user options for Fortran 08 files.
-You should normally set the <link linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
@@ -5811,15 +6326,16 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF08PPCOM">
     <term>SHF08PPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 08 source file to a
 shared-library object file
 after first running the file through the C preprocessor.
-Any options specified in the <link linkend="cv-SHF08FLAGS"><envar>$SHF08FLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF08FLAGS"><envar>$SHF08FLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
-You only need to set <link linkend="cv-SHF08PPCOM"><envar>$SHF08PPCOM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF08PPCOM"><envar>$SHF08PPCOM</envar></link> if you need to use a specific
 C-preprocessor command line for Fortran 08 files.
-You should normally set the <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link> variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
 </para>
@@ -5827,35 +6343,38 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF08PPCOMSTR">
     <term>SHF08PPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 08 source file
 is compiled to a shared-library object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-SHF08PPCOM"><envar>$SHF08PPCOM</envar></link> or <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF08PPCOM"><envar>$SHF08PPCOM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF77">
     <term>SHF77</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Fortran 77 compiler used for generating shared-library objects.
-You should normally set the <link linkend="cv-SHFORTRAN"><envar>$SHFORTRAN</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRAN"><envar>$SHFORTRAN</envar></link> variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
-You only need to set <link linkend="cv-SHF77"><envar>$SHF77</envar></link> if you need to use a specific compiler
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF77"><envar>$SHF77</envar></link> if you need to use a specific compiler
 or compiler version for Fortran 77 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF77COM">
     <term>SHF77COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 77 source file
 to a shared-library object file.
-You only need to set <link linkend="cv-SHF77COM"><envar>$SHF77COM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF77COM"><envar>$SHF77COM</envar></link> if you need to use a specific
 command line for Fortran 77 files.
-You should normally set the <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link> variable,
 which specifies the default command line
 for all Fortran versions.
 </para>
@@ -5863,22 +6382,24 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF77COMSTR">
     <term>SHF77COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 77 source file
 is compiled to a shared-library object file.
-If this is not set, then <link linkend="cv-SHF77COM"><envar>$SHF77COM</envar></link> or <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF77COM"><envar>$SHF77COM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF77FLAGS">
     <term>SHF77FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options that are passed to the Fortran 77 compiler
 to generated shared-library objects.
-You only need to set <link linkend="cv-SHF77FLAGS"><envar>$SHF77FLAGS</envar></link> if you need to define specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF77FLAGS"><envar>$SHF77FLAGS</envar></link> if you need to define specific
 user options for Fortran 77 files.
-You should normally set the <link linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
@@ -5887,15 +6408,16 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF77PPCOM">
     <term>SHF77PPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 77 source file to a
 shared-library object file
 after first running the file through the C preprocessor.
-Any options specified in the <link linkend="cv-SHF77FLAGS"><envar>$SHF77FLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF77FLAGS"><envar>$SHF77FLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
-You only need to set <link linkend="cv-SHF77PPCOM"><envar>$SHF77PPCOM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF77PPCOM"><envar>$SHF77PPCOM</envar></link> if you need to use a specific
 C-preprocessor command line for Fortran 77 files.
-You should normally set the <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link> variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
 </para>
@@ -5903,35 +6425,38 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF77PPCOMSTR">
     <term>SHF77PPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 77 source file
 is compiled to a shared-library object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-SHF77PPCOM"><envar>$SHF77PPCOM</envar></link> or <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF77PPCOM"><envar>$SHF77PPCOM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF90">
     <term>SHF90</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Fortran 90 compiler used for generating shared-library objects.
-You should normally set the <link linkend="cv-SHFORTRAN"><envar>$SHFORTRAN</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRAN"><envar>$SHFORTRAN</envar></link> variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
-You only need to set <link linkend="cv-SHF90"><envar>$SHF90</envar></link> if you need to use a specific compiler
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF90"><envar>$SHF90</envar></link> if you need to use a specific compiler
 or compiler version for Fortran 90 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF90COM">
     <term>SHF90COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 90 source file
 to a shared-library object file.
-You only need to set <link linkend="cv-SHF90COM"><envar>$SHF90COM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF90COM"><envar>$SHF90COM</envar></link> if you need to use a specific
 command line for Fortran 90 files.
-You should normally set the <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link> variable,
 which specifies the default command line
 for all Fortran versions.
 </para>
@@ -5939,22 +6464,24 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF90COMSTR">
     <term>SHF90COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 90 source file
 is compiled to a shared-library object file.
-If this is not set, then <link linkend="cv-SHF90COM"><envar>$SHF90COM</envar></link> or <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF90COM"><envar>$SHF90COM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF90FLAGS">
     <term>SHF90FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options that are passed to the Fortran 90 compiler
 to generated shared-library objects.
-You only need to set <link linkend="cv-SHF90FLAGS"><envar>$SHF90FLAGS</envar></link> if you need to define specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF90FLAGS"><envar>$SHF90FLAGS</envar></link> if you need to define specific
 user options for Fortran 90 files.
-You should normally set the <link linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
@@ -5963,15 +6490,16 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF90PPCOM">
     <term>SHF90PPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 90 source file to a
 shared-library object file
 after first running the file through the C preprocessor.
-Any options specified in the <link linkend="cv-SHF90FLAGS"><envar>$SHF90FLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF90FLAGS"><envar>$SHF90FLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
-You only need to set <link linkend="cv-SHF90PPCOM"><envar>$SHF90PPCOM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF90PPCOM"><envar>$SHF90PPCOM</envar></link> if you need to use a specific
 C-preprocessor command line for Fortran 90 files.
-You should normally set the <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link> variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
 </para>
@@ -5979,35 +6507,38 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF90PPCOMSTR">
     <term>SHF90PPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 90 source file
 is compiled to a shared-library object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-SHF90PPCOM"><envar>$SHF90PPCOM</envar></link> or <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF90PPCOM"><envar>$SHF90PPCOM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF95">
     <term>SHF95</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The Fortran 95 compiler used for generating shared-library objects.
-You should normally set the <link linkend="cv-SHFORTRAN"><envar>$SHFORTRAN</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRAN"><envar>$SHFORTRAN</envar></link> variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
-You only need to set <link linkend="cv-SHF95"><envar>$SHF95</envar></link> if you need to use a specific compiler
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF95"><envar>$SHF95</envar></link> if you need to use a specific compiler
 or compiler version for Fortran 95 files.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF95COM">
     <term>SHF95COM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 95 source file
 to a shared-library object file.
-You only need to set <link linkend="cv-SHF95COM"><envar>$SHF95COM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF95COM"><envar>$SHF95COM</envar></link> if you need to use a specific
 command line for Fortran 95 files.
-You should normally set the <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link> variable,
 which specifies the default command line
 for all Fortran versions.
 </para>
@@ -6015,22 +6546,24 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF95COMSTR">
     <term>SHF95COMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 95 source file
 is compiled to a shared-library object file.
-If this is not set, then <link linkend="cv-SHF95COM"><envar>$SHF95COM</envar></link> or <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF95COM"><envar>$SHF95COM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHF95FLAGS">
     <term>SHF95FLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options that are passed to the Fortran 95 compiler
 to generated shared-library objects.
-You only need to set <link linkend="cv-SHF95FLAGS"><envar>$SHF95FLAGS</envar></link> if you need to define specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF95FLAGS"><envar>$SHF95FLAGS</envar></link> if you need to define specific
 user options for Fortran 95 files.
-You should normally set the <link linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
@@ -6039,15 +6572,16 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF95PPCOM">
     <term>SHF95PPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran 95 source file to a
 shared-library object file
 after first running the file through the C preprocessor.
-Any options specified in the <link linkend="cv-SHF95FLAGS"><envar>$SHF95FLAGS</envar></link> and <link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF95FLAGS"><envar>$SHF95FLAGS</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
-You only need to set <link linkend="cv-SHF95PPCOM"><envar>$SHF95PPCOM</envar></link> if you need to use a specific
+You only need to set <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF95PPCOM"><envar>$SHF95PPCOM</envar></link> if you need to use a specific
 C-preprocessor command line for Fortran 95 files.
-You should normally set the <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link> variable,
+You should normally set the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link> variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
 </para>
@@ -6055,25 +6589,28 @@ for all Fortran versions.
   </varlistentry>
   <varlistentry id="cv-SHF95PPCOMSTR">
     <term>SHF95PPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran 95 source file
 is compiled to a shared-library object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-SHF95PPCOM"><envar>$SHF95PPCOM</envar></link> or <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHF95PPCOM"><envar>$SHF95PPCOM</envar></link> or <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHFORTRAN">
     <term>SHFORTRAN</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The default Fortran compiler used for generating shared-library objects.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHFORTRANCOM">
     <term>SHFORTRANCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran source file
 to a shared-library object file.
 </para>
@@ -6081,17 +6618,19 @@ to a shared-library object file.
   </varlistentry>
   <varlistentry id="cv-SHFORTRANCOMSTR">
     <term>SHFORTRANCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran source file
 is compiled to a shared-library object file.
-If this is not set, then <link linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANCOM"><envar>$SHFORTRANCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHFORTRANFLAGS">
     <term>SHFORTRANFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Options that are passed to the Fortran compiler
 to generate shared-library objects.
 </para>
@@ -6099,94 +6638,104 @@ to generate shared-library objects.
   </varlistentry>
   <varlistentry id="cv-SHFORTRANPPCOM">
     <term>SHFORTRANPPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to compile a Fortran source file to a
 shared-library object file
 after first running the file through the C preprocessor.
 Any options specified
-in the <link linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> and
-<link linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
+in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANFLAGS"><envar>$SHFORTRANFLAGS</envar></link> and
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CPPFLAGS"><envar>$CPPFLAGS</envar></link> construction variables
 are included on this command line.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHFORTRANPPCOMSTR">
     <term>SHFORTRANPPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when a Fortran source file
 is compiled to a shared-library object file
 after first running the file through the C preprocessor.
-If this is not set, then <link linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHFORTRANPPCOM"><envar>$SHFORTRANPPCOM</envar></link>
 (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHLIBEMITTER">
     <term>SHLIBEMITTER</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 TODO
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHLIBNOVERSIONSYMLINKS">
     <term>SHLIBNOVERSIONSYMLINKS</term>
-    <listitem><para>
-Instructs the <link linkend="b-SharedLibrary"><function>SharedLibrary</function></link> builder to not create symlinks for versioned
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Instructs the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link> builder to not create symlinks for versioned
 shared libraries.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHLIBPREFIX">
     <term>SHLIBPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for shared library file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_SHLIBSONAME">
     <term>_SHLIBSONAME</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A macro that automatically generates shared library's SONAME based on $TARGET,
-$SHLIBVERSION and $SHLIBSUFFIX. Used by <link linkend="b-SharedLibrary"><function>SharedLibrary</function></link> builder when
-the linker tool supports SONAME (e.g. <link linkend="t-gnulink"><literal>gnulink</literal></link>).
+$SHLIBVERSION and $SHLIBSUFFIX. Used by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link> builder when
+the linker tool supports SONAME (e.g. <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-gnulink"><literal>gnulink</literal></link>).
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHLIBSUFFIX">
     <term>SHLIBSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for shared library file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHLIBVERSION">
     <term>SHLIBVERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When this construction variable is defined, a versioned shared library
-is created by <link linkend="b-SharedLibrary"><function>SharedLibrary</function></link> builder. This activates the
-<link linkend="cv-_SHLIBVERSIONFLAGS"><envar>$_SHLIBVERSIONFLAGS</envar></link> and thus modifies the <link linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> as
+is created by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link> builder. This activates the
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_SHLIBVERSIONFLAGS"><envar>$_SHLIBVERSIONFLAGS</envar></link> and thus modifies the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> as
 required, adds the version number to the library name, and creates the symlinks
-that are needed.  <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> versions should exist as alpha-numeric,
+that are needed.  <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> versions should exist as alpha-numeric,
 decimal-delimited values as defined by the regular expression "\w+[\.\w+]*".
-Example <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> values include '1', '1.2.3', and '1.2.gitaa412c8b'.
+Example <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> values include '1', '1.2.3', and '1.2.gitaa412c8b'.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHLIBVERSIONFLAGS">
     <term>SHLIBVERSIONFLAGS</term>
-    <listitem><para>
-Extra flags added to <link linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when building versioned
-<link linkend="b-SharedLibrary"><function>SharedLibrary</function></link>. These flags are only used when <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Extra flags added to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when building versioned
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link>. These flags are only used when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is
 set.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_SHLIBVERSIONFLAGS">
     <term>_SHLIBVERSIONFLAGS</term>
-    <listitem><para>
-This macro automatically introduces extra flags to <link linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when
-building versioned <link linkend="b-SharedLibrary"><function>SharedLibrary</function></link> (that is when <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>
-is set). <literal>_SHLIBVERSIONFLAGS</literal> usually adds <link linkend="cv-SHLIBVERSIONFLAGS"><envar>$SHLIBVERSIONFLAGS</envar></link>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This macro automatically introduces extra flags to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when
+building versioned <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link> (that is when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>
+is set). <literal>_SHLIBVERSIONFLAGS</literal> usually adds <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSIONFLAGS"><envar>$SHLIBVERSIONFLAGS</envar></link>
 and some extra dynamically generated options (such as
 <literal>-Wl,-soname=$_SHLIBSONAME</literal>. It is unused by "plain"
 (unversioned) shared libraries.
@@ -6195,49 +6744,53 @@ and some extra dynamically generated options (such as
   </varlistentry>
   <varlistentry id="cv-SHLINK">
     <term>SHLINK</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The linker for programs that use shared libraries.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHLINKCOM">
     <term>SHLINKCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to link programs using shared libraries.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHLINKCOMSTR">
     <term>SHLINKCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when programs using shared libraries are linked.
-If this is not set, then <link linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(SHLINKCOMSTR = "Linking shared $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHLINKFLAGS">
     <term>SHLINKFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General user options passed to the linker for programs using shared libraries.
 Note that this variable should
 <emphasis>not</emphasis>
 contain
 <option>-l</option>
-(or similar) options for linking with the libraries listed in <link linkend="cv-LIBS"><envar>$LIBS</envar></link>,
+(or similar) options for linking with the libraries listed in <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBS"><envar>$LIBS</envar></link>,
 nor
 <option>-L</option>
 (or similar) include search path options
-that scons generates automatically from <link linkend="cv-LIBPATH"><envar>$LIBPATH</envar></link>.
+that scons generates automatically from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-LIBPATH"><envar>$LIBPATH</envar></link>.
 See
-<link linkend="cv-_LIBFLAGS"><envar>$_LIBFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_LIBFLAGS"><envar>$_LIBFLAGS</envar></link>
 above,
 for the variable that expands to library-link options,
 and
-<link linkend="cv-_LIBDIRFLAGS"><envar>$_LIBDIRFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-_LIBDIRFLAGS"><envar>$_LIBDIRFLAGS</envar></link>
 above,
 for the variable that expands to library search path options.
 </para>
@@ -6245,32 +6798,36 @@ for the variable that expands to library search path options.
   </varlistentry>
   <varlistentry id="cv-SHOBJPREFIX">
     <term>SHOBJPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for shared object file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SHOBJSUFFIX">
     <term>SHOBJSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for shared object file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SONAME">
     <term>SONAME</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Variable used to hard-code SONAME for versioned shared library/loadable module.
 <example_commands>
 env.SharedLibrary('test', 'test.c', SHLIBVERSION='0.1.2', SONAME='libtest.so.2')
 </example_commands>
-The variable is used, for example, by <link linkend="t-gnulink"><literal>gnulink</literal></link> linker tool.
+The variable is used, for example, by <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-gnulink"><literal>gnulink</literal></link> linker tool.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SOURCE">
     <term>SOURCE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A reserved variable name
 that may not be set or used in a construction environment.
 (See "Variable Substitution," below.)
@@ -6279,7 +6836,8 @@ that may not be set or used in a construction environment.
   </varlistentry>
   <varlistentry id="cv-SOURCE_URL">
     <term>SOURCE_URL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The URL
 (web address)
 of the location from which the project was retrieved.
@@ -6291,7 +6849,8 @@ field in the controlling information for Ipkg and RPM packages.
   </varlistentry>
   <varlistentry id="cv-SOURCES">
     <term>SOURCES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A reserved variable name
 that may not be set or used in a construction environment.
 (See "Variable Substitution," below.)
@@ -6300,16 +6859,17 @@ that may not be set or used in a construction environment.
   </varlistentry>
   <varlistentry id="cv-SPAWN">
     <term>SPAWN</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A command interpreter function that will be called to execute command line
 strings. The function must expect the following arguments:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 def spawn(shell, escape, cmd, args, env):
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 <varname>sh</varname>
 is a string naming the shell program to use.
 <varname>escape</varname>
@@ -6327,15 +6887,17 @@ in which the command should be executed.
   </varlistentry>
   <varlistentry id="cv-STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME">
     <term>STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME</term>
-    <listitem><para>
+    <listitem>
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
       When this variable is true, static objects and shared objects are assumed to be the same; that is, SCons does not check for linking static objects into a shared library.
     </para>
   </listitem>
   </varlistentry>
   <varlistentry id="cv-SUBST_DICT">
     <term>SUBST_DICT</term>
-    <listitem><para>
-The dictionary used by the <function>Substfile</function> or <function>Textfile</function> builders
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The dictionary used by the <function xmlns="http://www.scons.org/dbxsd/v1.0">Substfile</function> or <function xmlns="http://www.scons.org/dbxsd/v1.0">Textfile</function> builders
 for substitution values.
 It can be anything acceptable to the dict() constructor,
 so in addition to a dictionary,
@@ -6345,23 +6907,26 @@ lists of tuples are also acceptable.
   </varlistentry>
   <varlistentry id="cv-SUBSTFILEPREFIX">
     <term>SUBSTFILEPREFIX</term>
-    <listitem><para>
-The prefix used for <function>Substfile</function> file names,
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The prefix used for <function xmlns="http://www.scons.org/dbxsd/v1.0">Substfile</function> file names,
 the null string by default.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SUBSTFILESUFFIX">
     <term>SUBSTFILESUFFIX</term>
-    <listitem><para>
-The suffix used for <function>Substfile</function> file names,
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The suffix used for <function xmlns="http://www.scons.org/dbxsd/v1.0">Substfile</function> file names,
 the null string by default.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SUMMARY">
     <term>SUMMARY</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A short summary of what the project is about.
 This is used to fill in the
 <literal>Summary:</literal>
@@ -6374,32 +6939,35 @@ field in MSI packages.
   </varlistentry>
   <varlistentry id="cv-SWIG">
     <term>SWIG</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The scripting language wrapper and interface generator.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SWIGCFILESUFFIX">
     <term>SWIGCFILESUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix that will be used for intermediate C
 source files generated by
 the scripting language wrapper and interface generator.
 The default value is
-<filename>_wrap</filename><link linkend="cv-CFILESUFFIX"><envar>$CFILESUFFIX</envar></link>.
+<filename>_wrap</filename><link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CFILESUFFIX"><envar>$CFILESUFFIX</envar></link>.
 By default, this value is used whenever the
 <option>-c++</option>
 option is
 <emphasis>not</emphasis>
 specified as part of the
-<link linkend="cv-SWIGFLAGS"><envar>$SWIGFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SWIGFLAGS"><envar>$SWIGFLAGS</envar></link>
 construction variable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SWIGCOM">
     <term>SWIGCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call
 the scripting language wrapper and interface generator.
 </para>
@@ -6407,32 +6975,35 @@ the scripting language wrapper and interface generator.
   </varlistentry>
   <varlistentry id="cv-SWIGCOMSTR">
     <term>SWIGCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when calling
 the scripting language wrapper and interface generator.
-If this is not set, then <link linkend="cv-SWIGCOM"><envar>$SWIGCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SWIGCOM"><envar>$SWIGCOM</envar></link> (the command line) is displayed.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SWIGCXXFILESUFFIX">
     <term>SWIGCXXFILESUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix that will be used for intermediate C++
 source files generated by
 the scripting language wrapper and interface generator.
 The default value is
-<filename>_wrap</filename><link linkend="cv-CFILESUFFIX"><envar>$CFILESUFFIX</envar></link>.
+<filename>_wrap</filename><link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CFILESUFFIX"><envar>$CFILESUFFIX</envar></link>.
 By default, this value is used whenever the
 <filename>-c++</filename>
 option is specified as part of the
-<link linkend="cv-SWIGFLAGS"><envar>$SWIGFLAGS</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SWIGFLAGS"><envar>$SWIGFLAGS</envar></link>
 construction variable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SWIGDIRECTORSUFFIX">
     <term>SWIGDIRECTORSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix that will be used for intermediate C++ header
 files generated by the scripting language wrapper and interface generator.
 These are only generated for C++ code when the SWIG 'directors' feature is
@@ -6444,7 +7015,8 @@ The default value is
   </varlistentry>
   <varlistentry id="cv-SWIGFLAGS">
     <term>SWIGFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to
 the scripting language wrapper and interface generator.
 This is where you should set
@@ -6455,57 +7027,61 @@ or whatever other options you want to specify to SWIG.
 If you set the
 <option>-c++</option>
 option in this variable,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will, by default,
 generate a C++ intermediate source file
 with the extension that is specified as the
-<link linkend="cv-CXXFILESUFFIX"><envar>$CXXFILESUFFIX</envar></link>
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CXXFILESUFFIX"><envar>$CXXFILESUFFIX</envar></link>
 variable.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_SWIGINCFLAGS">
     <term>_SWIGINCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An automatically-generated construction variable
 containing the SWIG command-line options
 for specifying directories to be searched for included files.
-The value of <envar>$_SWIGINCFLAGS</envar> is created
+The value of <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_SWIGINCFLAGS</envar> is created
 by respectively prepending and appending
-<envar>$SWIGINCPREFIX</envar> and <envar>$SWIGINCSUFFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGINCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGINCSUFFIX</envar>
 to the beginning and end
-of each directory in <envar>$SWIGPATH</envar>.
+of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGPATH</envar>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SWIGINCPREFIX">
     <term>SWIGINCPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used to specify an include directory on the SWIG command line.
 This will be prepended to the beginning of each directory
-in the <envar>$SWIGPATH</envar> construction variable
-when the <envar>$_SWIGINCFLAGS</envar> variable is automatically generated.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGPATH</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_SWIGINCFLAGS</envar> variable is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SWIGINCSUFFIX">
     <term>SWIGINCSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used to specify an include directory on the SWIG command line.
 This will be appended to the end of each directory
-in the <envar>$SWIGPATH</envar> construction variable
-when the <envar>$_SWIGINCFLAGS</envar> variable is automatically generated.
+in the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGPATH</envar> construction variable
+when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_SWIGINCFLAGS</envar> variable is automatically generated.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SWIGOUTDIR">
     <term>SWIGOUTDIR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Specifies the output directory in which
 the scripting language wrapper and interface generator
 should place generated language-specific files.
 This will be used by SCons to identify
-the files that will be generated by the <application>swig</application> call,
+the files that will be generated by the <application xmlns="http://www.scons.org/dbxsd/v1.0">swig</application> call,
 and translated into the
 <literal>swig -outdir</literal> option on the command line.
 </para>
@@ -6513,14 +7089,15 @@ and translated into the
   </varlistentry>
   <varlistentry id="cv-SWIGPATH">
     <term>SWIGPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The list of directories that the scripting language wrapper
 and interface generate will search for included files.
 The SWIG implicit dependency scanner will search these
 directories for include files. The default value is an empty list.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Don't explicitly put include directory
 arguments in SWIGFLAGS;
 the result will be non-portable
@@ -6528,90 +7105,96 @@ and the directories will not be searched by the dependency scanner.
 Note: directory names in SWIGPATH will be looked-up relative to the SConscript
 directory when they are used in a command.
 To force
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 to look-up a directory relative to the root of the source tree use #:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(SWIGPATH='#/include')
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory look-up can also be forced using the
-<function>Dir</function>()
+<function xmlns="http://www.scons.org/dbxsd/v1.0">Dir</function>()
 function:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 include = Dir('include')
 env = Environment(SWIGPATH=include)
 </example_commands>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The directory list will be added to command lines
 through the automatically-generated
-<envar>$_SWIGINCFLAGS</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$_SWIGINCFLAGS</envar>
 construction variable,
 which is constructed by
 respectively prepending and appending the values of the
-<envar>$SWIGINCPREFIX</envar> and <envar>$SWIGINCSUFFIX</envar>
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGINCPREFIX</envar> and <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGINCSUFFIX</envar>
 construction variables
 to the beginning and end
-of each directory in <envar>$SWIGPATH</envar>.
+of each directory in <envar xmlns="http://www.scons.org/dbxsd/v1.0">$SWIGPATH</envar>.
 Any command lines you define that need
 the SWIGPATH directory list should
-include <envar>$_SWIGINCFLAGS</envar>:
+include <envar xmlns="http://www.scons.org/dbxsd/v1.0">$_SWIGINCFLAGS</envar>:
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(SWIGCOM="my_swig -o $TARGET $_SWIGINCFLAGS $SOURCES")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-SWIGVERSION">
     <term>SWIGVERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The version number of the SWIG tool.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TAR">
     <term>TAR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The tar archiver.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TARCOM">
     <term>TARCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call the tar archiver.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TARCOMSTR">
     <term>TARCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when archiving files
 using the tar archiver.
-If this is not set, then <link linkend="cv-TARCOM"><envar>$TARCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-TARCOM"><envar>$TARCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(TARCOMSTR = "Archiving $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TARFLAGS">
     <term>TARFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the tar archiver.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TARGET">
     <term>TARGET</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A reserved variable name
 that may not be set or used in a construction environment.
 (See "Variable Substitution," below.)
@@ -6620,16 +7203,18 @@ that may not be set or used in a construction environment.
   </varlistentry>
   <varlistentry id="cv-TARGET_ARCH">
     <term>TARGET_ARCH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
         The name of the target hardware architecture for the compiled objects
         created by this Environment.
         This defaults to the value of HOST_ARCH, and the user can override it.
         Currently only set for Win32.
 </para>
-    <para>
+    
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets the target architecture for Visual Studio compiler (i.e. the arch
 of the binaries generated by the compiler). If not set, default to
-<envar>$HOST_ARCH</envar>, or, if that is unset, to the architecture of the
+<envar xmlns="http://www.scons.org/dbxsd/v1.0">$HOST_ARCH</envar>, or, if that is unset, to the architecture of the
 running machine's OS (note that the python build or architecture has no
 effect).
 This variable must be passed as an argument to the Environment()
@@ -6638,7 +7223,7 @@ This is currently only used on Windows, but in the future it will be
 used on other OSes as well.
 </para>
 
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Valid values for Windows are
 <literal>x86</literal>,
 <literal>i386</literal>
@@ -6655,7 +7240,8 @@ For example, if you want to compile 64-bit binaries, you would set
   </varlistentry>
   <varlistentry id="cv-TARGET_OS">
     <term>TARGET_OS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
         The name of the target operating system for the compiled objects
         created by this Environment.
         This defaults to the value of HOST_OS, and the user can override it.
@@ -6665,7 +7251,8 @@ For example, if you want to compile 64-bit binaries, you would set
   </varlistentry>
   <varlistentry id="cv-TARGETS">
     <term>TARGETS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A reserved variable name
 that may not be set or used in a construction environment.
 (See "Variable Substitution," below.)
@@ -6674,14 +7261,16 @@ that may not be set or used in a construction environment.
   </varlistentry>
   <varlistentry id="cv-TARSUFFIX">
     <term>TARSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for tar file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TEMPFILEPREFIX">
     <term>TEMPFILEPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix for a temporary file used
 to execute lines longer than $MAXLINELENGTH.
 The default is '@'.
@@ -6693,41 +7282,46 @@ or '-via' for ARM toolchain.
   </varlistentry>
   <varlistentry id="cv-TEX">
     <term>TEX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The TeX formatter and typesetter.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TEXCOM">
     <term>TEXCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call the TeX formatter and typesetter.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TEXCOMSTR">
     <term>TEXCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when calling
 the TeX formatter and typesetter.
-If this is not set, then <link linkend="cv-TEXCOM"><envar>$TEXCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-TEXCOM"><envar>$TEXCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(TEXCOMSTR = "Building $TARGET from TeX input $SOURCES")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TEXFLAGS">
     <term>TEXFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the TeX formatter and typesetter.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TEXINPUTS">
     <term>TEXINPUTS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 List of directories that the LaTeX program will search
 for include directories.
 The LaTeX implicit dependency scanner will search these
@@ -6737,23 +7331,26 @@ directories for \include and \import files.
   </varlistentry>
   <varlistentry id="cv-TEXTFILEPREFIX">
     <term>TEXTFILEPREFIX</term>
-    <listitem><para>
-The prefix used for <function>Textfile</function> file names,
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The prefix used for <function xmlns="http://www.scons.org/dbxsd/v1.0">Textfile</function> file names,
 the null string by default.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TEXTFILESUFFIX">
     <term>TEXTFILESUFFIX</term>
-    <listitem><para>
-The suffix used for <function>Textfile</function> file names;
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The suffix used for <function xmlns="http://www.scons.org/dbxsd/v1.0">Textfile</function> file names;
 <filename>.txt</filename> by default.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-TOOLS">
     <term>TOOLS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A list of the names of the Tool specifications
 that are part of this construction environment.
 </para>
@@ -6761,7 +7358,8 @@ that are part of this construction environment.
   </varlistentry>
   <varlistentry id="cv-UNCHANGED_SOURCES">
     <term>UNCHANGED_SOURCES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A reserved variable name
 that may not be set or used in a construction environment.
 (See "Variable Substitution," below.)
@@ -6770,7 +7368,8 @@ that may not be set or used in a construction environment.
   </varlistentry>
   <varlistentry id="cv-UNCHANGED_TARGETS">
     <term>UNCHANGED_TARGETS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A reserved variable name
 that may not be set or used in a construction environment.
 (See "Variable Substitution," below.)
@@ -6779,7 +7378,8 @@ that may not be set or used in a construction environment.
   </varlistentry>
   <varlistentry id="cv-VENDOR">
     <term>VENDOR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The person or organization who supply the packaged software.
 This is used to fill in the
 <literal>Vendor:</literal>
@@ -6792,60 +7392,68 @@ field in the controlling information for MSI packages.
   </varlistentry>
   <varlistentry id="cv-VERSION">
     <term>VERSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The version of the project, specified as a string.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WIN32_INSERT_DEF">
     <term>WIN32_INSERT_DEF</term>
-    <listitem><para>
-A deprecated synonym for <link linkend="cv-WINDOWS_INSERT_DEF"><envar>$WINDOWS_INSERT_DEF</envar></link>.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+A deprecated synonym for <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-WINDOWS_INSERT_DEF"><envar>$WINDOWS_INSERT_DEF</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WIN32DEFPREFIX">
     <term>WIN32DEFPREFIX</term>
-    <listitem><para>
-A deprecated synonym for <link linkend="cv-WINDOWSDEFPREFIX"><envar>$WINDOWSDEFPREFIX</envar></link>.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+A deprecated synonym for <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-WINDOWSDEFPREFIX"><envar>$WINDOWSDEFPREFIX</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WIN32DEFSUFFIX">
     <term>WIN32DEFSUFFIX</term>
-    <listitem><para>
-A deprecated synonym for <link linkend="cv-WINDOWSDEFSUFFIX"><envar>$WINDOWSDEFSUFFIX</envar></link>.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+A deprecated synonym for <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-WINDOWSDEFSUFFIX"><envar>$WINDOWSDEFSUFFIX</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WIN32EXPPREFIX">
     <term>WIN32EXPPREFIX</term>
-    <listitem><para>
-A deprecated synonym for <link linkend="cv-WINDOWSEXPSUFFIX"><envar>$WINDOWSEXPSUFFIX</envar></link>.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+A deprecated synonym for <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-WINDOWSEXPSUFFIX"><envar>$WINDOWSEXPSUFFIX</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WIN32EXPSUFFIX">
     <term>WIN32EXPSUFFIX</term>
-    <listitem><para>
-A deprecated synonym for <link linkend="cv-WINDOWSEXPSUFFIX"><envar>$WINDOWSEXPSUFFIX</envar></link>.
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+A deprecated synonym for <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-WINDOWSEXPSUFFIX"><envar>$WINDOWSEXPSUFFIX</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WINDOWS_EMBED_MANIFEST">
     <term>WINDOWS_EMBED_MANIFEST</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Set this variable to True or 1 to embed the compiler-generated manifest
 (normally <literal>${TARGET}.manifest</literal>)
 into all Windows exes and DLLs built with this environment,
 as a resource during their link step.
-This is done using <link linkend="cv-MT"><envar>$MT</envar></link> and <link linkend="cv-MTEXECOM"><envar>$MTEXECOM</envar></link> and <link linkend="cv-MTSHLIBCOM"><envar>$MTSHLIBCOM</envar></link>.
+This is done using <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MT"><envar>$MT</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MTEXECOM"><envar>$MTEXECOM</envar></link> and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-MTSHLIBCOM"><envar>$MTSHLIBCOM</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WINDOWS_INSERT_DEF">
     <term>WINDOWS_INSERT_DEF</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When this is set to true,
 a library build of a Windows shared library
 (<filename>.dll</filename> file)
@@ -6859,9 +7467,10 @@ The default is 0 (do not build a <filename>.def</filename> file).
   </varlistentry>
   <varlistentry id="cv-WINDOWS_INSERT_MANIFEST">
     <term>WINDOWS_INSERT_MANIFEST</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 When this is set to true,
-<filename>scons</filename>
+<filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename>
 will be aware of the
 <filename>.manifest</filename>
 files generated by Microsoft Visua C/C++ 8.
@@ -6870,35 +7479,40 @@ files generated by Microsoft Visua C/C++ 8.
   </varlistentry>
   <varlistentry id="cv-WINDOWSDEFPREFIX">
     <term>WINDOWSDEFPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for Windows <filename>.def</filename> file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WINDOWSDEFSUFFIX">
     <term>WINDOWSDEFSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for Windows <filename>.def</filename> file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WINDOWSEXPPREFIX">
     <term>WINDOWSEXPPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for Windows <filename>.exp</filename> file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WINDOWSEXPSUFFIX">
     <term>WINDOWSEXPSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for Windows <filename>.exp</filename> file names.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-WINDOWSPROGMANIFESTPREFIX">
     <term>WINDOWSPROGMANIFESTPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for executable program <filename>.manifest</filename> files
 generated by Microsoft Visual C/C++.
 </para>
@@ -6906,7 +7520,8 @@ generated by Microsoft Visual C/C++.
   </varlistentry>
   <varlistentry id="cv-WINDOWSPROGMANIFESTSUFFIX">
     <term>WINDOWSPROGMANIFESTSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for executable program <filename>.manifest</filename> files
 generated by Microsoft Visual C/C++.
 </para>
@@ -6914,7 +7529,8 @@ generated by Microsoft Visual C/C++.
   </varlistentry>
   <varlistentry id="cv-WINDOWSSHLIBMANIFESTPREFIX">
     <term>WINDOWSSHLIBMANIFESTPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The prefix used for shared library <filename>.manifest</filename> files
 generated by Microsoft Visual C/C++.
 </para>
@@ -6922,7 +7538,8 @@ generated by Microsoft Visual C/C++.
   </varlistentry>
   <varlistentry id="cv-WINDOWSSHLIBMANIFESTSUFFIX">
     <term>WINDOWSSHLIBMANIFESTSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for shared library <filename>.manifest</filename> files
 generated by Microsoft Visual C/C++.
 </para>
@@ -6930,7 +7547,8 @@ generated by Microsoft Visual C/C++.
   </varlistentry>
   <varlistentry id="cv-X_IPK_DEPENDS">
     <term>X_IPK_DEPENDS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Depends:</literal>
 field in the controlling information for Ipkg packages.
@@ -6939,7 +7557,8 @@ field in the controlling information for Ipkg packages.
   </varlistentry>
   <varlistentry id="cv-X_IPK_DESCRIPTION">
     <term>X_IPK_DESCRIPTION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Description:</literal>
 field in the controlling information for Ipkg packages.
@@ -6950,7 +7569,8 @@ The default value is
   </varlistentry>
   <varlistentry id="cv-X_IPK_MAINTAINER">
     <term>X_IPK_MAINTAINER</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Maintainer:</literal>
 field in the controlling information for Ipkg packages.
@@ -6959,7 +7579,8 @@ field in the controlling information for Ipkg packages.
   </varlistentry>
   <varlistentry id="cv-X_IPK_PRIORITY">
     <term>X_IPK_PRIORITY</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Priority:</literal>
 field in the controlling information for Ipkg packages.
@@ -6968,7 +7589,8 @@ field in the controlling information for Ipkg packages.
   </varlistentry>
   <varlistentry id="cv-X_IPK_SECTION">
     <term>X_IPK_SECTION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Section:</literal>
 field in the controlling information for Ipkg packages.
@@ -6977,7 +7599,8 @@ field in the controlling information for Ipkg packages.
   </varlistentry>
   <varlistentry id="cv-X_MSI_LANGUAGE">
     <term>X_MSI_LANGUAGE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Language:</literal>
 attribute in the controlling information for MSI packages.
@@ -6986,7 +7609,8 @@ attribute in the controlling information for MSI packages.
   </varlistentry>
   <varlistentry id="cv-X_MSI_LICENSE_TEXT">
     <term>X_MSI_LICENSE_TEXT</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The text of the software license in RTF format.
 Carriage return characters will be
 replaced with the RTF equivalent \\par.
@@ -6995,14 +7619,16 @@ replaced with the RTF equivalent \\par.
   </varlistentry>
   <varlistentry id="cv-X_MSI_UPGRADE_CODE">
     <term>X_MSI_UPGRADE_CODE</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 TODO
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-X_RPM_AUTOREQPROV">
     <term>X_RPM_AUTOREQPROV</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>AutoReqProv:</literal>
 field in the RPM
@@ -7012,14 +7638,16 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_BUILD">
     <term>X_RPM_BUILD</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 internal, but overridable
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-X_RPM_BUILDREQUIRES">
     <term>X_RPM_BUILDREQUIRES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>BuildRequires:</literal>
 field in the RPM
@@ -7030,21 +7658,24 @@ Note this should only be used on a host managed by rpm as the dependencies will
   </varlistentry>
   <varlistentry id="cv-X_RPM_BUILDROOT">
     <term>X_RPM_BUILDROOT</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 internal, but overridable
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-X_RPM_CLEAN">
     <term>X_RPM_CLEAN</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 internal, but overridable
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-X_RPM_CONFLICTS">
     <term>X_RPM_CONFLICTS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Conflicts:</literal>
 field in the RPM
@@ -7054,7 +7685,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_DEFATTR">
     <term>X_RPM_DEFATTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This value is used as the default attributes
 for the files in the RPM package.
 The default value is
@@ -7064,7 +7696,8 @@ The default value is
   </varlistentry>
   <varlistentry id="cv-X_RPM_DISTRIBUTION">
     <term>X_RPM_DISTRIBUTION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Distribution:</literal>
 field in the RPM
@@ -7074,7 +7707,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_EPOCH">
     <term>X_RPM_EPOCH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Epoch:</literal>
 field in the RPM
@@ -7084,7 +7718,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_EXCLUDEARCH">
     <term>X_RPM_EXCLUDEARCH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>ExcludeArch:</literal>
 field in the RPM
@@ -7094,7 +7729,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_EXLUSIVEARCH">
     <term>X_RPM_EXLUSIVEARCH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>ExclusiveArch:</literal>
 field in the RPM
@@ -7104,7 +7740,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_EXTRADEFS">
     <term>X_RPM_EXTRADEFS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A list used to supply extra defintions or flags
 to be added to the RPM <filename>.spec</filename> file.
 Each item is added as-is with a carriage return appended.
@@ -7120,7 +7757,7 @@ list that does not include the default line.
 Added in version 3.1.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env.Package(
     NAME             = 'foo',
 ...
@@ -7135,7 +7772,8 @@ env.Package(
   </varlistentry>
   <varlistentry id="cv-X_RPM_GROUP">
     <term>X_RPM_GROUP</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Group:</literal>
 field in the RPM
@@ -7145,7 +7783,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_GROUP_lang">
     <term>X_RPM_GROUP_lang</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Group(lang):</literal>
 field in the RPM
@@ -7160,7 +7799,8 @@ the appropriate language code.
   </varlistentry>
   <varlistentry id="cv-X_RPM_ICON">
     <term>X_RPM_ICON</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Icon:</literal>
 field in the RPM
@@ -7170,14 +7810,16 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_INSTALL">
     <term>X_RPM_INSTALL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 internal, but overridable
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-X_RPM_PACKAGER">
     <term>X_RPM_PACKAGER</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Packager:</literal>
 field in the RPM
@@ -7187,7 +7829,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_POSTINSTALL">
     <term>X_RPM_POSTINSTALL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>%post:</literal>
 section in the RPM
@@ -7197,7 +7840,8 @@ section in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_POSTUNINSTALL">
     <term>X_RPM_POSTUNINSTALL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>%postun:</literal>
 section in the RPM
@@ -7207,7 +7851,8 @@ section in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_PREFIX">
     <term>X_RPM_PREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Prefix:</literal>
 field in the RPM
@@ -7217,7 +7862,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_PREINSTALL">
     <term>X_RPM_PREINSTALL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>%pre:</literal>
 section in the RPM
@@ -7227,14 +7873,16 @@ section in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_PREP">
     <term>X_RPM_PREP</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 internal, but overridable
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-X_RPM_PREUNINSTALL">
     <term>X_RPM_PREUNINSTALL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>%preun:</literal>
 section in the RPM
@@ -7244,7 +7892,8 @@ section in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_PROVIDES">
     <term>X_RPM_PROVIDES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Provides:</literal>
 field in the RPM
@@ -7254,7 +7903,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_REQUIRES">
     <term>X_RPM_REQUIRES</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Requires:</literal>
 field in the RPM
@@ -7264,7 +7914,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_SERIAL">
     <term>X_RPM_SERIAL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Serial:</literal>
 field in the RPM
@@ -7274,7 +7925,8 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-X_RPM_URL">
     <term>X_RPM_URL</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This is used to fill in the
 <literal>Url:</literal>
 field in the RPM
@@ -7284,33 +7936,37 @@ field in the RPM
   </varlistentry>
   <varlistentry id="cv-XGETTEXT">
     <term>XGETTEXT</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Path to <command>xgettext(1)</command> program (found via
 <function>Detect()</function>).
-See <link linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-XGETTEXTCOM">
     <term>XGETTEXTCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Complete xgettext command line.
-See <link linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-XGETTEXTCOMSTR">
     <term>XGETTEXTCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 A string that is shown when <command>xgettext(1)</command> command is invoked
-(default: <literal>''</literal>, which means "print <link linkend="cv-XGETTEXTCOM"><envar>$XGETTEXTCOM</envar></link>").
-See <link linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
+(default: <literal>''</literal>, which means "print <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-XGETTEXTCOM"><envar>$XGETTEXTCOM</envar></link>").
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_XGETTEXTDOMAIN">
     <term>_XGETTEXTDOMAIN</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Internal "macro". Generates <command>xgettext</command> domain name
 form source and target (default: <literal>'${TARGET.filebase}'</literal>).
 </para>
@@ -7318,36 +7974,40 @@ form source and target (default: <literal>'${TARGET.filebase}'</literal>).
   </varlistentry>
   <varlistentry id="cv-XGETTEXTFLAGS">
     <term>XGETTEXTFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Additional flags to <command>xgettext(1)</command>.
-See <link linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-XGETTEXTFROM">
     <term>XGETTEXTFROM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Name of file containing list of <command>xgettext(1)</command>'s source
 files. Autotools' users know this as <filename>POTFILES.in</filename> so they
 will in most cases set <literal>XGETTEXTFROM="POTFILES.in"</literal> here.
-The <envar>$XGETTEXTFROM</envar> files have same syntax and semantics as the well known
+The <envar xmlns="http://www.scons.org/dbxsd/v1.0">$XGETTEXTFROM</envar> files have same syntax and semantics as the well known
 GNU <filename>POTFILES.in</filename>.
-See <link linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
+See <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_XGETTEXTFROMFLAGS">
     <term>_XGETTEXTFROMFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Internal "macro". Genrates list of <literal>-D&lt;dir&gt;</literal> flags
-from the <link linkend="cv-XGETTEXTPATH"><envar>$XGETTEXTPATH</envar></link> list.
+from the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-XGETTEXTPATH"><envar>$XGETTEXTPATH</envar></link> list.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-XGETTEXTFROMPREFIX">
     <term>XGETTEXTFROMPREFIX</term>
-    <listitem><para>
-This flag is used to add single <link linkend="cv-XGETTEXTFROM"><envar>$XGETTEXTFROM</envar></link> file to
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+This flag is used to add single <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-XGETTEXTFROM"><envar>$XGETTEXTFROM</envar></link> file to
 <command>xgettext(1)</command>'s commandline (default:
 <literal>'-f'</literal>).
 </para>
@@ -7355,34 +8015,38 @@ This flag is used to add single <link linkend="cv-XGETTEXTFROM"><envar>$XGETTEXT
   </varlistentry>
   <varlistentry id="cv-XGETTEXTFROMSUFFIX">
     <term>XGETTEXTFROMSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 (default: <literal>''</literal>)
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-XGETTEXTPATH">
     <term>XGETTEXTPATH</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 List of directories, there <command>xgettext(1)</command> will look for
 source files (default: <literal>[]</literal>).
 <note><para>
-This variable works only together with <link linkend="cv-XGETTEXTFROM"><envar>$XGETTEXTFROM</envar></link>
+This variable works only together with <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-XGETTEXTFROM"><envar>$XGETTEXTFROM</envar></link>
 </para></note>
-See also <link linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
+See also <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="t-xgettext"><literal>xgettext</literal></link> tool and <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-POTUpdate"><function>POTUpdate</function></link> builder.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-_XGETTEXTPATHFLAGS">
     <term>_XGETTEXTPATHFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 Internal "macro". Generates list of <literal>-f&lt;file&gt;</literal> flags
-from <link linkend="cv-XGETTEXTFROM"><envar>$XGETTEXTFROM</envar></link>.
+from <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-XGETTEXTFROM"><envar>$XGETTEXTFROM</envar></link>.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-XGETTEXTPATHPREFIX">
     <term>XGETTEXTPATHPREFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 This flag is used to add single search path to
 <command>xgettext(1)</command>'s commandline (default:
 <literal>'-D'</literal>).
@@ -7391,21 +8055,24 @@ This flag is used to add single search path to
   </varlistentry>
   <varlistentry id="cv-XGETTEXTPATHSUFFIX">
     <term>XGETTEXTPATHSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 (default: <literal>''</literal>)
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-YACC">
     <term>YACC</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The parser generator.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-YACCCOM">
     <term>YACCCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call the parser generator
 to generate a source file.
 </para>
@@ -7413,22 +8080,24 @@ to generate a source file.
   </varlistentry>
   <varlistentry id="cv-YACCCOMSTR">
     <term>YACCCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when generating a source file
 using the parser generator.
-If this is not set, then <link linkend="cv-YACCCOM"><envar>$YACCCOM</envar></link> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-YACCCOM"><envar>$YACCCOM</envar></link> (the command line) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(YACCCOMSTR = "Yacc'ing $TARGET from $SOURCES")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-YACCFLAGS">
     <term>YACCFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the parser generator.
-If <link linkend="cv-YACCFLAGS"><envar>$YACCFLAGS</envar></link> contains a <option>-d</option> option,
+If <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-YACCFLAGS"><envar>$YACCFLAGS</envar></link> contains a <option>-d</option> option,
 SCons assumes that the call will also create a .h file
 (if the yacc source file ends in a .y suffix)
 or a .hpp file
@@ -7438,7 +8107,8 @@ or a .hpp file
   </varlistentry>
   <varlistentry id="cv-YACCHFILESUFFIX">
     <term>YACCHFILESUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix of the C
 header file generated by the parser generator
 when the
@@ -7456,7 +8126,8 @@ The default value is
   </varlistentry>
   <varlistentry id="cv-YACCHXXFILESUFFIX">
     <term>YACCHXXFILESUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix of the C++
 header file generated by the parser generator
 when the
@@ -7472,7 +8143,7 @@ The default value is
 except on Mac OS X,
 where the default is
 <filename>${TARGET.suffix}.h</filename>.
-because the default <application>bison</application> parser generator just
+because the default <application xmlns="http://www.scons.org/dbxsd/v1.0">bison</application> parser generator just
 appends <filename>.h</filename>
 to the name of the generated C++ file.
 </para>
@@ -7480,7 +8151,8 @@ to the name of the generated C++ file.
   </varlistentry>
   <varlistentry id="cv-YACCVCGFILESUFFIX">
     <term>YACCVCGFILESUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix of the file
 containing the VCG grammar automaton definition
 when the
@@ -7498,14 +8170,16 @@ The default value is
   </varlistentry>
   <varlistentry id="cv-ZIP">
     <term>ZIP</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The zip compression and file packaging utility.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ZIPCOM">
     <term>ZIPCOM</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The command line used to call the zip utility,
 or the internal Python function used to create a
 zip archive.
@@ -7514,7 +8188,8 @@ zip archive.
   </varlistentry>
   <varlistentry id="cv-ZIPCOMPRESSION">
     <term>ZIPCOMPRESSION</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The
 <varname>compression</varname>
 flag
@@ -7534,39 +8209,42 @@ module is unavailable.
   </varlistentry>
   <varlistentry id="cv-ZIPCOMSTR">
     <term>ZIPCOMSTR</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when archiving files
 using the zip utility.
-If this is not set, then <link linkend="cv-ZIPCOM"><envar>$ZIPCOM</envar></link>
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-ZIPCOM"><envar>$ZIPCOM</envar></link>
 (the command line or internal Python function) is displayed.
 </para>
 
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment(ZIPCOMSTR = "Zipping $TARGET")
 </example_commands>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ZIPFLAGS">
     <term>ZIPFLAGS</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 General options passed to the zip utility.
 </para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-ZIPROOT">
     <term>ZIPROOT</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 An optional zip root directory (default empty).  The filenames stored
 in the zip file will be relative to this directory, if given.
 Otherwise the filenames are relative to the current directory of the
 command.
 For instance:
 </para>
-<example_commands>
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
 env = Environment()
 env.Zip('foo.zip', 'subdir1/subdir2/file1', ZIPROOT='subdir1')
 </example_commands>
-<para>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 will produce a zip file <literal>foo.zip</literal>
 containing a file with the name
 <literal>subdir2/file1</literal> rather than
@@ -7576,7 +8254,8 @@ containing a file with the name
   </varlistentry>
   <varlistentry id="cv-ZIPSUFFIX">
     <term>ZIPSUFFIX</term>
-    <listitem><para>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
 The suffix used for zip file names.
 </para>
 </listitem>
author	William Deegan <bill@baddogconsulting.com>	2018-12-31 23:12:44 (GMT)
committer	William Deegan <bill@baddogconsulting.com>	2018-12-31 23:12:44 (GMT)
commit	6e4aa886cfb593b04ac2e57fd7b1d7cb9494d660 (patch)
tree	2a15723fde907a6f80c37dbe580c57480872844d /doc
parent	40f85c31422728d2614d1dbe8e69a9f0932a3570 (diff)
download	SCons-6e4aa886cfb593b04ac2e57fd7b1d7cb9494d660.zip SCons-6e4aa886cfb593b04ac2e57fd7b1d7cb9494d660.tar.gz SCons-6e4aa886cfb593b04ac2e57fd7b1d7cb9494d660.tar.bz2