53 files changed, 324 insertions, 235 deletions
diff --git a/doc/user/ENV.sgml b/doc/user/ENV.xml
index d843276..d843276 100644
--- a/doc/user/ENV.sgml
+++ b/doc/user/ENV.xml
diff --git a/doc/user/MANIFEST b/doc/user/MANIFEST
index cc7dc1e..565298f 100644
--- a/doc/user/MANIFEST
+++ b/doc/user/MANIFEST
@@ -1,46 +1,46 @@
-actions.sgml
-alias.sgml
-ant.sgml
-builders.sgml
-builders-built-in.sgml
-builders-commands.sgml
-builders-writing.sgml
-build-install.sgml
-caching.sgml
-command-line.sgml
+actions.xml
+alias.xml
+ant.xml
+builders.xml
+builders-built-in.xml
+builders-commands.xml
+builders-writing.xml
+build-install.xml
+caching.xml
+command-line.xml
 cons.pl
-copyright.sgml
-depends.sgml
-ENV.sgml
-environments.sgml
-errors.sgml
-example.sgml
-factories.sgml
-file-removal.sgml
-help.sgml
-hierarchy.sgml
-install.sgml
-java.sgml
-libraries.sgml
-less-simple.sgml
-main.sgml
-make.sgml
-nodes.sgml
-parseconfig.sgml
-preface.sgml
-python.sgml
-repositories.sgml
-run.sgml
-scanners.sgml
-sconf.sgml
-separate.sgml
-simple.sgml
-sourcecode.sgml
-tasks.sgml
-tools.sgml
-troubleshoot.sgml
-variants.sgml
-variables.sgml
+copyright.xml
+depends.xml
+ENV.xml
+environments.xml
+errors.xml
+example.xml
+factories.xml
+file-removal.xml
+help.xml
+hierarchy.xml
+install.xml
+java.xml
+libraries.xml
+less-simple.xml
+main.xml
+make.xml
+nodes.xml
+parseconfig.xml
+preface.xml
+python.xml
+repositories.xml
+run.xml
+scanners.xml
+sconf.xml
+separate.xml
+simple.xml
+sourcecode.xml
+tasks.xml
+tools.xml
+troubleshoot.xml
+variants.xml
+variables.xml
 SCons-win32-install-1.jpg
 SCons-win32-install-2.jpg
 SCons-win32-install-3.jpg
diff --git a/doc/user/actions.sgml b/doc/user/actions.xml
index 928b7ea..928b7ea 100644
--- a/doc/user/actions.sgml
+++ b/doc/user/actions.xml
diff --git a/doc/user/alias.sgml b/doc/user/alias.xml
index f285d70..f285d70 100644
--- a/doc/user/alias.sgml
+++ b/doc/user/alias.xml
diff --git a/doc/user/ant.sgml b/doc/user/ant.xml
index 0df1027..0df1027 100644
--- a/doc/user/ant.sgml
+++ b/doc/user/ant.xml
diff --git a/doc/user/build-install.sgml b/doc/user/build-install.xml
index 763c13e..763c13e 100644
--- a/doc/user/build-install.sgml
+++ b/doc/user/build-install.xml
diff --git a/doc/user/builders-built-in.sgml b/doc/user/builders-built-in.xml
index cf09fd5..cf09fd5 100644
--- a/doc/user/builders-built-in.sgml
+++ b/doc/user/builders-built-in.xml
diff --git a/doc/user/builders-commands.in b/doc/user/builders-commands.in
index 13a5c56..7265a23 100644
--- a/doc/user/builders-commands.in
+++ b/doc/user/builders-commands.in
@@ -79,6 +79,15 @@
      </file>
   </scons_example>
 
+  <para>
+
+  When executed,
+  &SCons; runs the specified command,
+  substituting &cv-link-SOURCE; and &cv-link-TARGET;
+  as expected:
+
+  </para>
+
   <scons_output example="ex1">
     <scons_output_command>scons -Q</scons_output_command>
   </scons_output>
@@ -94,7 +103,9 @@
 
   <para>
 
-  Note that the action you 
+  Note that the action you specify to the
+  &Command; &Builder; can be any legal &SCons; &Action;,
+  such as a Python function:
 
   </para>
 
@@ -111,6 +122,12 @@
      </file>
   </scons_example>
 
+  <para>
+
+  Which executes as follows:
+
+  </para>
+
   <scons_output example="ex2">
     <scons_output_command>scons -Q</scons_output_command>
   </scons_output>
diff --git a/doc/user/builders-commands.sgml b/doc/user/builders-commands.xml
index d2b990a..15a6015 100644
--- a/doc/user/builders-commands.sgml
+++ b/doc/user/builders-commands.xml
@@ -74,6 +74,15 @@
      env.Command('foo.out', 'foo.in', "sed 's/x/y/' &lt; $SOURCE &gt; $TARGET")
   </programlisting>
 
+  <para>
+
+  When executed,
+  &SCons; runs the specified command,
+  substituting &cv-link-SOURCE; and &cv-link-TARGET;
+  as expected:
+
+  </para>
+
   <screen>
     % <userinput>scons -Q</userinput>
     sed 's/x/y/' &lt; foo.in &gt; foo.out
@@ -90,7 +99,9 @@
 
   <para>
 
-  Note that the action you 
+  Note that the action you specify to the
+  &Command; &Builder; can be any legal &SCons; &Action;,
+  such as a Python function:
 
   </para>
 
@@ -102,6 +113,12 @@
      env.Command('foo.out', 'foo.in', build)
   </programlisting>
 
+  <para>
+
+  Which executes as follows:
+
+  </para>
+
   <screen>
     % <userinput>scons -Q</userinput>
     build(["foo.out"], ["foo.in"])
diff --git a/doc/user/builders-writing.in b/doc/user/builders-writing.in
index 62717aa..7497277 100644
--- a/doc/user/builders-writing.in
+++ b/doc/user/builders-writing.in
@@ -219,8 +219,31 @@ This functionality could be invoked as in the following example:
 
     </para>
 
+   <!--
+   The ToolSurrogate stuff that's used to capture output initializes
+   SCons.Defaults.ConstructionEnvironment with its own list of TOOLS.
+   In this next example, we want to show the user that when they
+   set the BUILDERS explicitly, the call to env.Program() generates
+   an AttributeError.  This won't happen with all of the default
+   ToolSurrogates in the default construction environment.  To make the
+   AttributeError show up, we have to overwite the default construction
+   environment's TOOLS variable so Program() builder doesn't show up.
+
+   We do this by executing a slightly different SConstruct file than the
+   one we print in the guide, with two extra statements at the front
+   that overwrite the TOOLS variable as described.  Note that we have
+   to jam those statements on to the first line to keep the line number
+   in the generated error consistent with what the user will see in the
+   User's Guide.
+   -->
     <scons_example name="ex2">
-       <file name="SConstruct" printme="1">
+       <file name="SConstruct">
+       import SCons.Defaults; SCons.Defaults.ConstructionEnvironment['TOOLS'] = {}; bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
+       env = Environment(BUILDERS = {'Foo' : bld})
+       env.Foo('file.foo', 'file.input')
+       env.Program('hello.c')
+       </file>
+       <file name="SConstruct.printme" printme="1">
        bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env = Environment(BUILDERS = {'Foo' : bld})
        env.Foo('file.foo', 'file.input')
diff --git a/doc/user/builders-writing.sgml b/doc/user/builders-writing.xml
index 412d431..50f6556 100644
--- a/doc/user/builders-writing.sgml
+++ b/doc/user/builders-writing.xml
@@ -206,6 +206,23 @@ This functionality could be invoked as in the following example:
 
     </para>
 
+   <!--
+   The ToolSurrogate stuff that's used to capture output initializes
+   SCons.Defaults.ConstructionEnvironment with its own list of TOOLS.
+   In this next example, we want to show the user that when they
+   set the BUILDERS explicitly, the call to env.Program() generates
+   an AttributeError.  This won't happen with all of the default
+   ToolSurrogates in the default construction environment.  To make the
+   AttributeError show up, we have to overwite the default construction
+   environment's TOOLS variable so Program() builder doesn't show up.
+
+   We do this by executing a slightly different SConstruct file than the
+   one we print in the guide, with two extra statements at the front
+   that overwrite the TOOLS variable as described.  Note that we have
+   to jam those statements on to the first line to keep the line number
+   in the generated error consistent with what the user will see in the
+   User's Guide.
+   -->
     <programlisting>
        bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env = Environment(BUILDERS = {'Foo' : bld})
@@ -215,8 +232,8 @@ This functionality could be invoked as in the following example:
 
     <screen>
       % <userinput>scons -Q</userinput>
-      AttributeError: 'SConsEnvironment' object has no attribute 'Program':
-        File "SConstruct", line 4:
+      AttributeError: SConsEnvironment instance has no attribute 'Program':
+        File "/home/my/project/SConstruct", line 4:
           env.Program('hello.c')
     </screen>
 
diff --git a/doc/user/builders.in b/doc/user/builders.in
index 2bc139d..f3989ef 100644
--- a/doc/user/builders.in
+++ b/doc/user/builders.in
@@ -24,7 +24,8 @@
 -->
 
 <!--
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 
 <refentry id="Command">
 
diff --git a/doc/user/builders.sgml b/doc/user/builders.xml
index 2bc139d..f3989ef 100644
--- a/doc/user/builders.sgml
+++ b/doc/user/builders.xml
@@ -24,7 +24,8 @@
 -->
 
 <!--
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 
 <refentry id="Command">
 
diff --git a/doc/user/caching.in b/doc/user/caching.in
index 8dfa731..186ece6 100644
--- a/doc/user/caching.in
+++ b/doc/user/caching.in
@@ -436,7 +436,7 @@
     in a random order without having to specify
     the <literal>--random</literal> on very command line,
     you can use the &SetOption; function to
-    set the <literal>random</litera> option
+    set the <literal>random</literal> option
     within any &SConscript; file:
 
     </para>
diff --git a/doc/user/caching.sgml b/doc/user/caching.xml
index 02c3597..51b30ae 100644
--- a/doc/user/caching.sgml
+++ b/doc/user/caching.xml
@@ -439,6 +439,26 @@
 
     </para>
 
+    <para>
+
+    If you want to make sure dependencies will be built
+    in a random order without having to specify
+    the <literal>--random</literal> on very command line,
+    you can use the &SetOption; function to
+    set the <literal>random</literal> option
+    within any &SConscript; file:
+
+    </para>
+
+    <programlisting>
+       Program('prog',
+               ['f1.c', 'f2.c', 'f3.c', 'f4.c', 'f5.c'])
+
+       SetOption('random', 1)
+       Program('prog',
+               ['f1.c', 'f2.c', 'f3.c', 'f4.c', 'f5.c'])
+    </programlisting>
+
   </section>
 
   <!--
diff --git a/doc/user/command-line.sgml b/doc/user/command-line.xml
index 1bc94d7..d7f3d7b 100644
--- a/doc/user/command-line.sgml
+++ b/doc/user/command-line.xml
@@ -961,7 +961,7 @@
         
         scons: *** Error converting option: RELEASE
         Invalid value for boolean option: bad_value
-        File "/home/my/project/SConstruct", line 4, in ?
+        File "/home/my/project/SConstruct", line 4, in &lt;module&gt;
       </screen>
 
     </section>
@@ -1024,7 +1024,7 @@
         % <userinput>scons -Q COLOR=magenta foo.o</userinput>
         
         scons: *** Invalid value for option COLOR: magenta
-        File "/home/my/project/SConstruct", line 5, in ?
+        File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
       </screen>
 
       <para>
@@ -1080,15 +1080,15 @@
         % <userinput>scons -Q COLOR=Red foo.o</userinput>
         
         scons: *** Invalid value for option COLOR: Red
-        File "/home/my/project/SConstruct", line 5, in ?
+        File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
         % <userinput>scons -Q COLOR=BLUE foo.o</userinput>
         
         scons: *** Invalid value for option COLOR: BLUE
-        File "/home/my/project/SConstruct", line 5, in ?
+        File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
         % <userinput>scons -Q COLOR=nAvY foo.o</userinput>
         
         scons: *** Invalid value for option COLOR: nAvY
-        File "/home/my/project/SConstruct", line 5, in ?
+        File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
       </screen>
 
       <para>
@@ -1241,7 +1241,7 @@
         
         scons: *** Error converting option: COLORS
         Invalid value(s) for option: magenta
-        File "/home/my/project/SConstruct", line 5, in ?
+        File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
       </screen>
 
     </section>
@@ -1298,7 +1298,7 @@
         % <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 ?
+        File "/home/my/project/SConstruct", line 6, in &lt;module&gt;
       </screen>
 
       <para>
diff --git a/doc/user/copyright.sgml b/doc/user/copyright.xml
index 76e3e50..76e3e50 100644
--- a/doc/user/copyright.sgml
+++ b/doc/user/copyright.xml
diff --git a/doc/user/depends.sgml b/doc/user/depends.xml
index 9e055ee..9e055ee 100644
--- a/doc/user/depends.sgml
+++ b/doc/user/depends.xml
diff --git a/doc/user/environments.sgml b/doc/user/environments.xml
index 67a5551..fbcef99 100644
--- a/doc/user/environments.sgml
+++ b/doc/user/environments.xml
@@ -536,7 +536,7 @@ environment undisturbed.
       % <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 ?
+      File "/home/my/project/SConstruct", line 6, in &lt;module&gt;
    </screen>
 
    <para>
diff --git a/doc/user/example.sgml b/doc/user/errors.xml
index 0891bf8..0891bf8 100644
--- a/doc/user/example.sgml
+++ b/doc/user/errors.xml
diff --git a/doc/user/errors.sgml b/doc/user/example.xml
index 0891bf8..0891bf8 100644
--- a/doc/user/errors.sgml
+++ b/doc/user/example.xml
diff --git a/doc/user/factories.in b/doc/user/factories.in
index 6ef5249..d0c5313 100644
--- a/doc/user/factories.in
+++ b/doc/user/factories.in
@@ -298,9 +298,8 @@
       <file name="S" printme="1">
       Command("file.out", "file.in",
               [
-                Copy("tempfile", "$SOURCE"),
-                "modify tempfile",
-                Move("$TARGET", "tempfile"),
+                Copy("$TARGET", "$SOURCE"),
+                Touch("$TARGET"),
               ])
       </file>
       <file name="SConstruct">
@@ -310,9 +309,6 @@
       SConscript('S')
       </file>
       <file name="file.in">file.in</file>
-      <file name="modify" chmod="0755">
-      touch $*
-      </file>
     </scons_example>
 
     <para>
diff --git a/doc/user/factories.sgml b/doc/user/factories.xml
index e0567f6..7c09e4b 100644
--- a/doc/user/factories.sgml
+++ b/doc/user/factories.xml
@@ -266,9 +266,8 @@
     <programlisting>
       Command("file.out", "file.in",
               [
-                Copy("tempfile", "$SOURCE"),
-                "modify tempfile",
-                Move("$TARGET", "tempfile"),
+                Copy("$TARGET", "$SOURCE"),
+                Touch("$TARGET"),
               ])
     </programlisting>
 
@@ -280,9 +279,8 @@
 
     <screen>
       % <userinput>scons -Q</userinput>
-      Copy("tempfile", "file.in")
-      modify tempfile
-      Move("file.out", "tempfile")
+      Copy("file.out", "file.in")
+      Touch("file.out")
     </screen>
 
   </section>
diff --git a/doc/user/file-removal.sgml b/doc/user/file-removal.xml
index f64d394..f64d394 100644
--- a/doc/user/file-removal.sgml
+++ b/doc/user/file-removal.xml
diff --git a/doc/user/help.sgml b/doc/user/help.xml
index ca44a40..ca44a40 100644
--- a/doc/user/help.sgml
+++ b/doc/user/help.xml
diff --git a/doc/user/hierarchy.in b/doc/user/hierarchy.in
index d93e811..e0d6b00 100644
--- a/doc/user/hierarchy.in
+++ b/doc/user/hierarchy.in
@@ -418,7 +418,7 @@ make no difference to the build.
 
     (Notice that the <literal>lib/foo1.o</literal> object file
     is built in the same directory as its source file.
-    See <xref linkend="chap-separate">, below,
+    See <xref linkend="chap-separate"></xref>, below,
     for information about
     how to build the object file in a different subdirectory.)
 
@@ -470,7 +470,7 @@ make no difference to the build.
     (As was the case with top-relative path names,
     notice that the <literal>/usr/joe/lib/foo1.o</literal> object file
     is built in the same directory as its source file.
-    See <xref linkend="chap-separate">, below,
+    See <xref linkend="chap-separate"></xref>, below,
     for information about
     how to build the object file in a different subdirectory.)
 
diff --git a/doc/user/hierarchy.sgml b/doc/user/hierarchy.xml
index 713d605..4c84d5b 100644
--- a/doc/user/hierarchy.sgml
+++ b/doc/user/hierarchy.xml
@@ -392,7 +392,7 @@ make no difference to the build.
 
     (Notice that the <literal>lib/foo1.o</literal> object file
     is built in the same directory as its source file.
-    See <xref linkend="chap-separate">, below,
+    See <xref linkend="chap-separate"></xref>, below,
     for information about
     how to build the object file in a different subdirectory.)
 
@@ -434,7 +434,7 @@ make no difference to the build.
     (As was the case with top-relative path names,
     notice that the <literal>/usr/joe/lib/foo1.o</literal> object file
     is built in the same directory as its source file.
-    See <xref linkend="chap-separate">, below,
+    See <xref linkend="chap-separate"></xref>, below,
     for information about
     how to build the object file in a different subdirectory.)
 
diff --git a/doc/user/install.sgml b/doc/user/install.xml
index 2a6d1b8..2a6d1b8 100644
--- a/doc/user/install.sgml
+++ b/doc/user/install.xml
diff --git a/doc/user/java.sgml b/doc/user/java.xml
index 1876916..1876916 100644
--- a/doc/user/java.sgml
+++ b/doc/user/java.xml
diff --git a/doc/user/less-simple.in b/doc/user/less-simple.in
index ccc59b6..76afa30 100644
--- a/doc/user/less-simple.in
+++ b/doc/user/less-simple.in
@@ -126,10 +126,10 @@
 
     <scons_example name="ex2">
        <file name="SConstruct" printme="1">
-       Program(['main.c', 'file1.c', 'file2.c'])
+       Program(['prog.c', 'file1.c', 'file2.c'])
        </file>
-       <file name="main.c">
-       int main() { printf("main.c\n"); }
+       <file name="prog.c">
+       int main() { printf("prog.c\n"); }
        </file>
        <file name="file1.c">
        void file1() { printf("file1.c\n"); }
@@ -173,9 +173,9 @@
 
     <scons_example name="ex3">
        <file name="SConstruct" printme="1">
-       Program('program', ['main.c', 'file1.c', 'file2.c'])
+       Program('program', ['prog.c', 'file1.c', 'file2.c'])
        </file>
-       <file name="main.c">
+       <file name="prog.c">
        int main() { printf("prog.c\n"); }
        </file>
        <file name="file1.c">
@@ -509,7 +509,7 @@
     from the common source files,
     which can then be linked into resulting programs.
     (Creating libraries is discussed in
-    <xref linkend="chap-libraries">, below.)
+    <xref linkend="chap-libraries"></xref>, below.)
 
     </para>
 
diff --git a/doc/user/less-simple.sgml b/doc/user/less-simple.xml
index ad20812..eea3425 100644
--- a/doc/user/less-simple.sgml
+++ b/doc/user/less-simple.xml
@@ -124,7 +124,7 @@
     </para>
 
     <programlisting>
-       Program(['main.c', 'file1.c', 'file2.c'])
+       Program(['prog.c', 'file1.c', 'file2.c'])
     </programlisting>
 
     <para>
@@ -137,8 +137,8 @@
        % <userinput>scons -Q</userinput>
        cc -o file1.o -c file1.c
        cc -o file2.o -c file2.c
-       cc -o main.o -c main.c
-       cc -o main main.o file1.o file2.o
+       cc -o prog.o -c prog.c
+       cc -o prog prog.o file1.o file2.o
     </screen>
 
     <para>
@@ -164,7 +164,7 @@
     </para>
 
     <programlisting>
-       Program('program', ['main.c', 'file1.c', 'file2.c'])
+       Program('program', ['prog.c', 'file1.c', 'file2.c'])
     </programlisting>
 
     <para>
@@ -177,8 +177,8 @@
        % <userinput>scons -Q</userinput>
        cc -o file1.o -c file1.c
        cc -o file2.o -c file2.c
-       cc -o main.o -c main.c
-       cc -o program main.o file1.o file2.o
+       cc -o prog.o -c prog.c
+       cc -o program prog.o file1.o file2.o
     </screen>
 
     <para>
@@ -191,8 +191,8 @@
        C:\><userinput>scons -Q</userinput>
        cl /nologo /c file1.c /Fofile1.obj
        cl /nologo /c file2.c /Fofile2.obj
-       cl /nologo /c main.c /Fomain.obj
-       link /nologo /OUT:program.exe main.obj file1.obj file2.obj
+       cl /nologo /c prog.c /Foprog.obj
+       link /nologo /OUT:program.exe prog.obj file1.obj file2.obj
     </screen>
 
   </section>
@@ -492,7 +492,7 @@
     from the common source files,
     which can then be linked into resulting programs.
     (Creating libraries is discussed in
-    <xref linkend="chap-libraries">, below.)
+    <xref linkend="chap-libraries"></xref>, below.)
 
     </para>
 
diff --git a/doc/user/libraries.in b/doc/user/libraries.in
index 0fe53b8..1ccb1c3 100644
--- a/doc/user/libraries.in
+++ b/doc/user/libraries.in
@@ -142,7 +142,7 @@
 
       Of course, in this example, the object files
       must already exist for the build to succeed.
-      See <xref linkend="chap-nodes">, below,
+      See <xref linkend="chap-nodes"></xref>, below,
       for information about how you can
       build object files explicitly
       and include the built files in a library.
@@ -159,7 +159,7 @@
       The &b-link-Library; function builds a traditional static library.
       If you want to be explicit about the type of library being built,
       you can use the synonym &b-link-StaticLibrary; function
-      instead of &b-Library:
+      instead of &b-Library;:
 
       </para>
 
diff --git a/doc/user/libraries.sgml b/doc/user/libraries.xml
index 772810f..035ebd3 100644
--- a/doc/user/libraries.sgml
+++ b/doc/user/libraries.xml
@@ -130,7 +130,7 @@
 
       Of course, in this example, the object files
       must already exist for the build to succeed.
-      See <xref linkend="chap-nodes">, below,
+      See <xref linkend="chap-nodes"></xref>, below,
       for information about how you can
       build object files explicitly
       and include the built files in a library.
@@ -147,7 +147,7 @@
       The &b-link-Library; function builds a traditional static library.
       If you want to be explicit about the type of library being built,
       you can use the synonym &b-link-StaticLibrary; function
-      instead of &b-Library:
+      instead of &b-Library;:
 
       </para>
 
diff --git a/doc/user/main.in b/doc/user/main.in
index aaddb2a..c3cf2c2 100644
--- a/doc/user/main.in
+++ b/doc/user/main.in
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
   __COPYRIGHT__
@@ -23,10 +24,11 @@
 
 -->
 
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
 
-    <!ENTITY % version SYSTEM "../version.sgml">
+    <!ENTITY % version SYSTEM "../version.xml">
     %version;
 
     <!ENTITY % scons SYSTEM "../scons.mod">
@@ -41,47 +43,47 @@
     <!ENTITY % variables-mod SYSTEM "variables.mod">
     %variables-mod;
 
-    <!ENTITY actions SYSTEM "actions.sgml">
-    <!ENTITY alias SYSTEM "alias.sgml">
-    <!ENTITY ant SYSTEM "ant.sgml">
-    <!ENTITY build-install SYSTEM "build-install.sgml">
-    <!ENTITY builders SYSTEM "builders.sgml">
-    <!ENTITY builders-built-in SYSTEM "builders-built-in.sgml">
-    <!ENTITY builders-commands SYSTEM "builders-commands.sgml">
-    <!ENTITY builders-writing SYSTEM "builders-writing.sgml">
-    <!ENTITY caching SYSTEM "caching.sgml">
-    <!ENTITY command-line SYSTEM "command-line.sgml">
-    <!ENTITY copyright SYSTEM "copyright.sgml">
-    <!ENTITY depends SYSTEM "depends.sgml">
-    <!ENTITY ENV_file SYSTEM "ENV.sgml">
-    <!ENTITY environments SYSTEM "environments.sgml">
-    <!ENTITY errors SYSTEM "errors.sgml">
-    <!ENTITY example SYSTEM "example.sgml">
-    <!ENTITY factories SYSTEM "factories.sgml">
-    <!ENTITY file-removal SYSTEM "file-removal.sgml">
-    <!ENTITY help SYSTEM "help.sgml">
-    <!ENTITY hierarchy SYSTEM "hierarchy.sgml">
-    <!ENTITY java SYSTEM "java.sgml">
-    <!ENTITY install SYSTEM "install.sgml">
-    <!ENTITY less-simple SYSTEM "less-simple.sgml">
-    <!ENTITY libraries SYSTEM "libraries.sgml">
-    <!ENTITY make SYSTEM "make.sgml">
-    <!ENTITY nodes SYSTEM "nodes.sgml">
-    <!ENTITY parseconfig SYSTEM "parseconfig.sgml">
-    <!ENTITY preface SYSTEM "preface.sgml">
-    <!ENTITY python SYSTEM "python.sgml">
-    <!ENTITY repositories SYSTEM "repositories.sgml">
-    <!ENTITY run SYSTEM "run.sgml">
-    <!ENTITY scanners SYSTEM "scanners.sgml">
-    <!ENTITY sconf SYSTEM "sconf.sgml">
-    <!ENTITY separate SYSTEM "separate.sgml">
-    <!ENTITY simple SYSTEM "simple.sgml">
-    <!ENTITY sourcecode SYSTEM "sourcecode.sgml">
-    <!ENTITY tasks SYSTEM "tasks.sgml">
-    <!ENTITY tools SYSTEM "tools.sgml">
-    <!ENTITY troubleshoot SYSTEM "troubleshoot.sgml">
-    <!ENTITY variables SYSTEM "variables.sgml">
-    <!ENTITY variants SYSTEM "variants.sgml">
+    <!ENTITY actions SYSTEM "actions.xml">
+    <!ENTITY alias SYSTEM "alias.xml">
+    <!ENTITY ant SYSTEM "ant.xml">
+    <!ENTITY build-install SYSTEM "build-install.xml">
+    <!ENTITY builders SYSTEM "builders.xml">
+    <!ENTITY builders-built-in SYSTEM "builders-built-in.xml">
+    <!ENTITY builders-commands SYSTEM "builders-commands.xml">
+    <!ENTITY builders-writing SYSTEM "builders-writing.xml">
+    <!ENTITY caching SYSTEM "caching.xml">
+    <!ENTITY command-line SYSTEM "command-line.xml">
+    <!ENTITY copyright SYSTEM "copyright.xml">
+    <!ENTITY depends SYSTEM "depends.xml">
+    <!ENTITY ENV_file SYSTEM "ENV.xml">
+    <!ENTITY environments SYSTEM "environments.xml">
+    <!ENTITY errors SYSTEM "errors.xml">
+    <!ENTITY example SYSTEM "example.xml">
+    <!ENTITY factories SYSTEM "factories.xml">
+    <!ENTITY file-removal SYSTEM "file-removal.xml">
+    <!ENTITY help SYSTEM "help.xml">
+    <!ENTITY hierarchy SYSTEM "hierarchy.xml">
+    <!ENTITY java SYSTEM "java.xml">
+    <!ENTITY install SYSTEM "install.xml">
+    <!ENTITY less-simple SYSTEM "less-simple.xml">
+    <!ENTITY libraries SYSTEM "libraries.xml">
+    <!ENTITY make SYSTEM "make.xml">
+    <!ENTITY nodes SYSTEM "nodes.xml">
+    <!ENTITY parseconfig SYSTEM "parseconfig.xml">
+    <!ENTITY preface SYSTEM "preface.xml">
+    <!ENTITY python SYSTEM "python.xml">
+    <!ENTITY repositories SYSTEM "repositories.xml">
+    <!ENTITY run SYSTEM "run.xml">
+    <!ENTITY scanners SYSTEM "scanners.xml">
+    <!ENTITY sconf SYSTEM "sconf.xml">
+    <!ENTITY separate SYSTEM "separate.xml">
+    <!ENTITY simple SYSTEM "simple.xml">
+    <!ENTITY sourcecode SYSTEM "sourcecode.xml">
+    <!ENTITY tasks SYSTEM "tasks.xml">
+    <!ENTITY tools SYSTEM "tools.xml">
+    <!ENTITY troubleshoot SYSTEM "troubleshoot.xml">
+    <!ENTITY variables SYSTEM "variables.xml">
+    <!ENTITY variants SYSTEM "variants.xml">
 
     <!ENTITY builders-gen SYSTEM "builders.gen">
     <!ENTITY tools-gen SYSTEM "tools.gen">
diff --git a/doc/user/main.sgml b/doc/user/main.xml
index d864350..c3cf2c2 100644
--- a/doc/user/main.sgml
+++ b/doc/user/main.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
   __COPYRIGHT__
@@ -23,10 +24,11 @@
 
 -->
 
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
 
-    <!ENTITY % version SYSTEM "../version.sgml">
+    <!ENTITY % version SYSTEM "../version.xml">
     %version;
 
     <!ENTITY % scons SYSTEM "../scons.mod">
@@ -41,47 +43,47 @@
     <!ENTITY % variables-mod SYSTEM "variables.mod">
     %variables-mod;
 
-    <!ENTITY actions SYSTEM "actions.sgml">
-    <!ENTITY alias SYSTEM "alias.sgml">
-    <!ENTITY ant SYSTEM "ant.sgml">
-    <!ENTITY build-install SYSTEM "build-install.sgml">
-    <!ENTITY builders SYSTEM "builders.sgml">
-    <!ENTITY builders-built-in SYSTEM "builders-built-in.sgml">
-    <!ENTITY builders-commands SYSTEM "builders-commands.sgml">
-    <!ENTITY builders-writing SYSTEM "builders-writing.sgml">
-    <!ENTITY caching SYSTEM "caching.sgml">
-    <!ENTITY command-line SYSTEM "command-line.sgml">
-    <!ENTITY copyright SYSTEM "copyright.sgml">
-    <!ENTITY depends SYSTEM "depends.sgml">
-    <!ENTITY ENV_file SYSTEM "ENV.sgml">
-    <!ENTITY environments SYSTEM "environments.sgml">
-    <!ENTITY errors SYSTEM "errors.sgml">
-    <!ENTITY example SYSTEM "example.sgml">
-    <!ENTITY factories SYSTEM "factories.sgml">
-    <!ENTITY file-removal SYSTEM "file-removal.sgml">
-    <!ENTITY help SYSTEM "help.sgml">
-    <!ENTITY hierarchy SYSTEM "hierarchy.sgml">
-    <!ENTITY java SYSTEM "java.sgml">
-    <!ENTITY install SYSTEM "install.sgml">
-    <!ENTITY less-simple SYSTEM "less-simple.sgml">
-    <!ENTITY libraries SYSTEM "libraries.sgml">
-    <!ENTITY make SYSTEM "make.sgml">
-    <!ENTITY nodes SYSTEM "nodes.sgml">
-    <!ENTITY parseconfig SYSTEM "parseconfig.sgml">
-    <!ENTITY preface SYSTEM "preface.sgml">
-    <!ENTITY python SYSTEM "python.sgml">
-    <!ENTITY repositories SYSTEM "repositories.sgml">
-    <!ENTITY run SYSTEM "run.sgml">
-    <!ENTITY scanners SYSTEM "scanners.sgml">
-    <!ENTITY sconf SYSTEM "sconf.sgml">
-    <!ENTITY separate SYSTEM "separate.sgml">
-    <!ENTITY simple SYSTEM "simple.sgml">
-    <!ENTITY sourcecode SYSTEM "sourcecode.sgml">
-    <!ENTITY tasks SYSTEM "tasks.sgml">
-    <!ENTITY tools SYSTEM "tools.sgml">
-    <!ENTITY troubleshoot SYSTEM "troubleshoot.sgml">
-    <!ENTITY variables SYSTEM "variables.sgml">
-    <!ENTITY variants SYSTEM "variants.sgml">
+    <!ENTITY actions SYSTEM "actions.xml">
+    <!ENTITY alias SYSTEM "alias.xml">
+    <!ENTITY ant SYSTEM "ant.xml">
+    <!ENTITY build-install SYSTEM "build-install.xml">
+    <!ENTITY builders SYSTEM "builders.xml">
+    <!ENTITY builders-built-in SYSTEM "builders-built-in.xml">
+    <!ENTITY builders-commands SYSTEM "builders-commands.xml">
+    <!ENTITY builders-writing SYSTEM "builders-writing.xml">
+    <!ENTITY caching SYSTEM "caching.xml">
+    <!ENTITY command-line SYSTEM "command-line.xml">
+    <!ENTITY copyright SYSTEM "copyright.xml">
+    <!ENTITY depends SYSTEM "depends.xml">
+    <!ENTITY ENV_file SYSTEM "ENV.xml">
+    <!ENTITY environments SYSTEM "environments.xml">
+    <!ENTITY errors SYSTEM "errors.xml">
+    <!ENTITY example SYSTEM "example.xml">
+    <!ENTITY factories SYSTEM "factories.xml">
+    <!ENTITY file-removal SYSTEM "file-removal.xml">
+    <!ENTITY help SYSTEM "help.xml">
+    <!ENTITY hierarchy SYSTEM "hierarchy.xml">
+    <!ENTITY java SYSTEM "java.xml">
+    <!ENTITY install SYSTEM "install.xml">
+    <!ENTITY less-simple SYSTEM "less-simple.xml">
+    <!ENTITY libraries SYSTEM "libraries.xml">
+    <!ENTITY make SYSTEM "make.xml">
+    <!ENTITY nodes SYSTEM "nodes.xml">
+    <!ENTITY parseconfig SYSTEM "parseconfig.xml">
+    <!ENTITY preface SYSTEM "preface.xml">
+    <!ENTITY python SYSTEM "python.xml">
+    <!ENTITY repositories SYSTEM "repositories.xml">
+    <!ENTITY run SYSTEM "run.xml">
+    <!ENTITY scanners SYSTEM "scanners.xml">
+    <!ENTITY sconf SYSTEM "sconf.xml">
+    <!ENTITY separate SYSTEM "separate.xml">
+    <!ENTITY simple SYSTEM "simple.xml">
+    <!ENTITY sourcecode SYSTEM "sourcecode.xml">
+    <!ENTITY tasks SYSTEM "tasks.xml">
+    <!ENTITY tools SYSTEM "tools.xml">
+    <!ENTITY troubleshoot SYSTEM "troubleshoot.xml">
+    <!ENTITY variables SYSTEM "variables.xml">
+    <!ENTITY variants SYSTEM "variants.xml">
 
     <!ENTITY builders-gen SYSTEM "builders.gen">
     <!ENTITY tools-gen SYSTEM "tools.gen">
@@ -117,6 +119,9 @@
   XXX SetOption('duplicate')
   XXX - - duplicate=
 
+  XXX GetOption('help')
+  XXX SetOption('help')
+
   XXX GetOption('num_jobs')
   XXX SetOption('num_jobs')
 
diff --git a/doc/user/make.sgml b/doc/user/make.xml
index 72b2df1..72b2df1 100644
--- a/doc/user/make.sgml
+++ b/doc/user/make.xml
diff --git a/doc/user/nodes.sgml b/doc/user/nodes.xml
index 4ada5b7..4ada5b7 100644
--- a/doc/user/nodes.sgml
+++ b/doc/user/nodes.xml
diff --git a/doc/user/parseconfig.sgml b/doc/user/parseconfig.xml
index 067ef37..067ef37 100644
--- a/doc/user/parseconfig.sgml
+++ b/doc/user/parseconfig.xml
diff --git a/doc/user/preface.sgml b/doc/user/preface.xml
index 694f41b..694f41b 100644
--- a/doc/user/preface.sgml
+++ b/doc/user/preface.xml
diff --git a/doc/user/python.sgml b/doc/user/python.xml
index e2a7cdd..e2a7cdd 100644
--- a/doc/user/python.sgml
+++ b/doc/user/python.xml
diff --git a/doc/user/repositories.sgml b/doc/user/repositories.xml
index f22611b..f22611b 100644
--- a/doc/user/repositories.sgml
+++ b/doc/user/repositories.xml
diff --git a/doc/user/run.sgml b/doc/user/run.xml
index 56b8fa2..56b8fa2 100644
--- a/doc/user/run.sgml
+++ b/doc/user/run.xml
diff --git a/doc/user/scanners.sgml b/doc/user/scanners.xml
index c068d03..c068d03 100644
--- a/doc/user/scanners.sgml
+++ b/doc/user/scanners.xml
diff --git a/doc/user/sconf.sgml b/doc/user/sconf.xml
index df530fe..df530fe 100644
--- a/doc/user/sconf.sgml
+++ b/doc/user/sconf.xml
diff --git a/doc/user/separate.sgml b/doc/user/separate.xml
index 57acd48..57acd48 100644
--- a/doc/user/separate.sgml
+++ b/doc/user/separate.xml
diff --git a/doc/user/simple.in b/doc/user/simple.in
index 57fdd3a..b468f9a 100644
--- a/doc/user/simple.in
+++ b/doc/user/simple.in
@@ -239,7 +239,7 @@
    We'll cover Java builds in more detail,
    including building Java archive (<filename>.jar</filename>)
    and other types of file,
-   in <xref linkend="chap-java">.
+   in <xref linkend="chap-java"></xref>.
 
    </para>
 
@@ -389,7 +389,7 @@
      (and any other files) whenever it's necessary.
      (We'll learn more about how
      &SCons; decides when building or rebuilding a file
-     is necessary in <xref linkend="chap-depends">, below.)
+     is necessary in <xref linkend="chap-depends"></xref>, below.)
  
      </para>
  
diff --git a/doc/user/simple.sgml b/doc/user/simple.xml
index 9d3617d..c5ef430 100644
--- a/doc/user/simple.sgml
+++ b/doc/user/simple.xml
@@ -245,7 +245,7 @@
    We'll cover Java builds in more detail,
    including building Java archive (<filename>.jar</filename>)
    and other types of file,
-   in <xref linkend="chap-java">.
+   in <xref linkend="chap-java"></xref>.
 
    </para>
 
@@ -412,7 +412,7 @@
      (and any other files) whenever it's necessary.
      (We'll learn more about how
      &SCons; decides when building or rebuilding a file
-     is necessary in <xref linkend="chap-depends">, below.)
+     is necessary in <xref linkend="chap-depends"></xref>, below.)
  
      </para>
  
diff --git a/doc/user/sourcecode.sgml b/doc/user/sourcecode.xml
index 6cb4162..6cb4162 100644
--- a/doc/user/sourcecode.sgml
+++ b/doc/user/sourcecode.xml
diff --git a/doc/user/tasks.sgml b/doc/user/tasks.xml
index 7be3562..7be3562 100644
--- a/doc/user/tasks.sgml
+++ b/doc/user/tasks.xml
diff --git a/doc/user/tools.sgml b/doc/user/tools.xml
index 512bf97..512bf97 100644
--- a/doc/user/tools.sgml
+++ b/doc/user/tools.xml
diff --git a/doc/user/troubleshoot.sgml b/doc/user/troubleshoot.xml
index 3df9c67..6ec6185 100644
--- a/doc/user/troubleshoot.sgml
+++ b/doc/user/troubleshoot.xml
@@ -261,7 +261,7 @@
     <screen>
       % <userinput>scons</userinput>
       scons: Reading SConscript files ...
-      { 'BUILDERS': {},
+      { 'BUILDERS': {'InstallAs': &lt;function InstallAsBuilderWrapper at 0xb23a28&gt;, 'Install': &lt;function InstallBuilderWrapper at 0xb1b7d0&gt;},
         'CONFIGUREDIR': '#/.sconf_temp',
         'CONFIGURELOG': '#/config.log',
         'CPPSUFFIXES': [ '.c',
@@ -284,14 +284,13 @@
                          '.spp',
                          '.SPP'],
         'DSUFFIXES': ['.d'],
-        'Dir': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c3fdac&gt;,
-        'Dirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c3fdcc&gt;,
+        'Dir': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1eb48&gt;,
+        'Dirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1eb90&gt;,
         'ENV': {'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin'},
-        'ESCAPE': &lt;function escape at 0xb7ba1f0c&gt;,
-        'File': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c3fdec&gt;,
+        'ESCAPE': &lt;function escape at 0xb1fa28&gt;,
+        'File': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1ebd8&gt;,
         'IDLSUFFIXES': ['.idl', '.IDL'],
-        'INSTALL': &lt;function installFunc at 0xb7c4317c&gt;,
-        'INSTALLSTR': &lt;function installStr at 0xb7c431b4&gt;,
+        'INSTALL': &lt;function copyFunc at 0xb23aa0&gt;,
         'LATEXSUFFIXES': ['.tex', '.ltx', '.latex'],
         'LIBPREFIX': 'lib',
         'LIBPREFIXES': '$LIBPREFIX',
@@ -303,27 +302,26 @@
         'PLATFORM': 'posix',
         'PROGPREFIX': '',
         'PROGSUFFIX': '',
-        'PSPAWN': &lt;function piped_env_spawn at 0xb7bb12cc&gt;,
-        'RDirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c3fe0c&gt;,
+        'PSPAWN': &lt;function piped_env_spawn at 0xb23230&gt;,
+        'RDirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1ec20&gt;,
         'SCANNERS': [],
         'SHELL': 'sh',
         'SHLIBPREFIX': '$LIBPREFIX',
         'SHLIBSUFFIX': '.so',
         'SHOBJPREFIX': '$OBJPREFIX',
         'SHOBJSUFFIX': '$OBJSUFFIX',
-        'SPAWN': &lt;function spawnvpe_spawn at 0xb7ba1d4c&gt;,
-        'TEMPFILE': &lt;class SCons.Platform.TempFileMunge at 0xb7bce89c&gt;,
+        'SPAWN': &lt;function spawnvpe_spawn at 0xb1f7d0&gt;,
+        'TEMPFILE': &lt;class SCons.Platform.TempFileMunge at 0xa4e170&gt;,
         'TEMPFILEPREFIX': '@',
-        'TOOLS': [],
+        'TOOLS': ['install', 'install'],
         '_CPPDEFFLAGS': '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__)}',
         '_CPPINCFLAGS': '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
         '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
         '_LIBFLAGS': '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}',
         '__RPATH': '$_RPATH',
-        '_concat': &lt;function _concat at 0xb7c43224&gt;,
-        '_defines': &lt;function _defines at 0xb7c432cc&gt;,
-        '_installStr': &lt;function installStr at 0xb7c431b4&gt;,
-        '_stripixes': &lt;function _stripixes at 0xb7c43294&gt;}
+        '_concat': &lt;function _concat at 0xa3d398&gt;,
+        '_defines': &lt;function _defines at 0xa3d500&gt;,
+        '_stripixes': &lt;function _stripixes at 0xa3d488&gt;}
       scons: done reading SConscript files.
       scons: Building targets ...
       scons: `.' is up to date.
@@ -340,9 +338,9 @@
     <screen>
       C:\><userinput>scons</userinput>
       scons: Reading SConscript files ...
-      { 'BUILDERS': {'Object': &lt;SCons.Builder.CompositeBuilder instance at 0xb7b6354c&gt;, 'SharedObject': &lt;SCons.Builder.CompositeBuilder instance at 0xb7b636cc&gt;, 'StaticObject': &lt;SCons.Builder.CompositeBuilder instance at 0xb7b6354c&gt;, 'PCH': &lt;SCons.Builder.BuilderBase instance at 0xb7bd6e8c&gt;, 'RES': &lt;SCons.Builder.BuilderBase instance at 0xb7b5b9ec&gt;},
+      { 'BUILDERS': {'RES': &lt;SCons.Builder.BuilderBase instance at 0xb39518&gt;, 'Object': &lt;SCons.Builder.CompositeBuilder instance at 0xb4a710&gt;, 'InstallAs': &lt;function InstallAsBuilderWrapper at 0xb45c08&gt;, 'PCH': &lt;SCons.Builder.BuilderBase instance at 0xb1cef0&gt;, 'Install': &lt;function InstallBuilderWrapper at 0xb1b7d0&gt;, 'SharedObject': &lt;SCons.Builder.CompositeBuilder instance at 0xb4aa28&gt;, 'StaticObject': &lt;SCons.Builder.CompositeBuilder instance at 0xb4a710&gt;},
         'CC': 'cl',
-        'CCCOM': &lt;SCons.Action.FunctionAction instance at 0xb7b63b6c&gt;,
+        'CCCOM': &lt;SCons.Action.FunctionAction instance at 0xb4c290&gt;,
         'CCCOMFLAGS': '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo$TARGET $CCPCHFLAGS $CCPDBFLAGS',
         'CCFLAGS': ['/nologo'],
         'CCPCHFLAGS': ['${(PCH and "/Yu%s /Fp%s"%(PCHSTOP or "",File(PCH))) or ""}'],
@@ -377,20 +375,19 @@
         'CXXFILESUFFIX': '.cc',
         'CXXFLAGS': ['$CCFLAGS', '$(', '/TP', '$)'],
         'DSUFFIXES': ['.d'],
-        'Dir': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c5adac&gt;,
-        'Dirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c5adcc&gt;,
+        'Dir': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1eb48&gt;,
+        'Dirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1eb90&gt;,
         'ENV': { 'INCLUDE': 'C:\\Program Files\\Microsoft Visual Studio/VC98\\include',
                  'LIB': 'C:\\Program Files\\Microsoft Visual Studio/VC98\\lib',
                  'PATH': 'C:\\Program Files\\Microsoft Visual Studio\\Common\\tools\\WIN95;C:\\Program Files\\Microsoft Visual Studio\\Common\\MSDev98\\bin;C:\\Program Files\\Microsoft Visual Studio\\Common\\tools;C:\\Program Files\\Microsoft Visual Studio/VC98\\bin',
                  'PATHEXT': '.COM;.EXE;.BAT;.CMD',
                  'SystemRoot': 'C:/WINDOWS'},
-        'ESCAPE': &lt;function escape at 0xb7bcf454&gt;,
-        'File': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c5adec&gt;,
+        'ESCAPE': &lt;function escape at 0xb24848&gt;,
+        'File': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1ebd8&gt;,
         'IDLSUFFIXES': ['.idl', '.IDL'],
         'INCPREFIX': '/I',
         'INCSUFFIX': '',
-        'INSTALL': &lt;function installFunc at 0xb7c5e17c&gt;,
-        'INSTALLSTR': &lt;function installStr at 0xb7c5e1b4&gt;,
+        'INSTALL': &lt;function copyFunc at 0xb45c80&gt;,
         'LATEXSUFFIXES': ['.tex', '.ltx', '.latex'],
         'LIBPREFIX': '',
         'LIBPREFIXES': ['$LIBPREFIX'],
@@ -406,14 +403,14 @@
         'PLATFORM': 'win32',
         'PROGPREFIX': '',
         'PROGSUFFIX': '.exe',
-        'PSPAWN': &lt;function piped_spawn at 0xb7bcf3ac&gt;,
+        'PSPAWN': &lt;function piped_spawn at 0xb20488&gt;,
         'RC': 'rc',
         'RCCOM': '$RC $_CPPDEFFLAGS $_CPPINCFLAGS $RCFLAGS /fo$TARGET $SOURCES',
         'RCFLAGS': [],
-        'RDirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c5ae0c&gt;,
+        'RDirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1ec20&gt;,
         'SCANNERS': [],
         'SHCC': '$CC',
-        'SHCCCOM': &lt;SCons.Action.FunctionAction instance at 0xb7b63bcc&gt;,
+        'SHCCCOM': &lt;SCons.Action.FunctionAction instance at 0xb4c320&gt;,
         'SHCCFLAGS': ['$CCFLAGS'],
         'SHCFLAGS': ['$CFLAGS'],
         'SHCXX': '$CXX',
@@ -424,19 +421,18 @@
         'SHLIBSUFFIX': '.dll',
         'SHOBJPREFIX': '$OBJPREFIX',
         'SHOBJSUFFIX': '$OBJSUFFIX',
-        'SPAWN': &lt;function spawn at 0xb7bcf41c&gt;,
+        'SPAWN': &lt;function spawn at 0xb247d0&gt;,
         'STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME': 1,
-        'TEMPFILE': &lt;class SCons.Platform.TempFileMunge at 0xb7be989c&gt;,
+        'TEMPFILE': &lt;class SCons.Platform.TempFileMunge at 0xa4e170&gt;,
         'TEMPFILEPREFIX': '@',
-        'TOOLS': ['msvc'],
+        'TOOLS': ['msvc', 'install', 'install'],
         '_CPPDEFFLAGS': '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__)}',
         '_CPPINCFLAGS': '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
         '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
         '_LIBFLAGS': '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}',
-        '_concat': &lt;function _concat at 0xb7c5e224&gt;,
-        '_defines': &lt;function _defines at 0xb7c5e2cc&gt;,
-        '_installStr': &lt;function installStr at 0xb7c5e1b4&gt;,
-        '_stripixes': &lt;function _stripixes at 0xb7c5e294&gt;}
+        '_concat': &lt;function _concat at 0xa3d398&gt;,
+        '_defines': &lt;function _defines at 0xa3d500&gt;,
+        '_stripixes': &lt;function _stripixes at 0xa3d488&gt;}
       scons: done reading SConscript files.
       scons: Building targets ...
       scons: `.' is up to date.
@@ -891,17 +887,17 @@
         +-SConstruct
         +-f1.c
         +-f1.o
-        | +-[f1.c]
+        | +-f1.c
         | +-inc.h
         +-f2.c
         +-f2.o
-        | +-[f2.c]
-        | +-[inc.h]
+        | +-f2.c
+        | +-inc.h
         +-f3.c
         +-f3.o
-        | +-[f3.c]
-        | +-[inc.h]
-        +-[inc.h]
+        | +-f3.c
+        | +-inc.h
+        +-inc.h
         +-libfoo.a
         | +-[f1.o]
         | +-[f2.o]
@@ -909,16 +905,16 @@
         +-prog1
         | +-prog1.o
         | | +-prog1.c
-        | | +-[inc.h]
+        | | +-inc.h
         | +-[libfoo.a]
-        +-[prog1.c]
+        +-prog1.c
         +-[prog1.o]
         +-prog2
         | +-prog2.o
         | | +-prog2.c
-        | | +-[inc.h]
+        | | +-inc.h
         | +-[libfoo.a]
-        +-[prog2.c]
+        +-prog2.c
         +-[prog2.o]
     </screen>
 
@@ -1112,14 +1108,10 @@
       % <userinput>scons -Q --debug=stacktrace</userinput>
       scons: *** Source `prog.c' not found, needed by target `prog.o'.  Stop.
       scons: internal stack trace:
-        File "/home/knight/SCons/scons.0.96.C763/bootstrap/src/engine/SCons/Job.py", line 111, in start
-          task.prepare()
-        File "/home/knight/SCons/scons.0.96.C763/bootstrap/src/engine/SCons/Taskmaster.py", line 166, in prepare
-          t.prepare()
-        File "/home/knight/SCons/scons.0.96.C763/bootstrap/src/engine/SCons/Node/FS.py", line 2137, in prepare
-          SCons.Node.Node.prepare(self)
-        File "/home/knight/SCons/scons.0.96.C763/bootstrap/src/engine/SCons/Node/__init__.py", line 806, in prepare
-          raise SCons.Errors.StopError, desc
+        File "bootstrap/src/engine/SCons/Job.py", line 114, in start
+        File "bootstrap/src/engine/SCons/Taskmaster.py", line 169, in prepare
+        File "bootstrap/src/engine/SCons/Node/FS.py", line 2220, in prepare
+        File "bootstrap/src/engine/SCons/Node/__init__.py", line 819, in prepare
     </screen>
 
     <para>
diff --git a/doc/user/variables.sgml b/doc/user/variables.xml
index 7009996..7009996 100644
--- a/doc/user/variables.sgml
+++ b/doc/user/variables.xml
diff --git a/doc/user/variants.sgml b/doc/user/variants.xml
index 6727859..6727859 100644
--- a/doc/user/variants.sgml
+++ b/doc/user/variants.xml