Regenerated docs for 3.0.0 release.

12 files changed, 212 insertions, 26 deletions

diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 3798ec98..6f64f8f3 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="http://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 f4.o -c f4.c
 cc -o f3.o -c f3.c
 cc -o f5.o -c f5.c
 cc -o f1.o -c f1.c
-cc -o f2.o -c f2.c
-cc -o f4.o -c f4.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/environments_ex3_1.xml b/doc/generated/examples/environments_ex3_1.xml
index 4de56be0..5071c6ef 100644
--- a/doc/generated/examples/environments_ex3_1.xml
+++ b/doc/generated/examples/environments_ex3_1.xml
@@ -1,21 +1,21 @@
 <?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>
-UnicodeDecodeError: 'utf8' codec can't decode byte 0xc2 in position 249: invalid continuation byte:
+UnicodeDecodeError: 'utf8' codec can't decode byte 0xc2 in position 547: invalid continuation byte:
   File "/home/my/project/SConstruct", line 6:
     dbg.Program('foo', 'foo.c')
   File "bootstrap/src/engine/SCons/Environment.py", line 260:
     return MethodWrapper.__call__(self, target, source, *args, **kw)
   File "bootstrap/src/engine/SCons/Environment.py", line 224:
     return self.method(*nargs, **kwargs)
-  File "bootstrap/src/engine/SCons/Builder.py", line 634:
+  File "bootstrap/src/engine/SCons/Builder.py", line 635:
     return self._execute(env, target, source, OverrideWarner(kw), ekw)
-  File "bootstrap/src/engine/SCons/Builder.py", line 540:
+  File "bootstrap/src/engine/SCons/Builder.py", line 541:
     source = self.src_builder_sources(env, source, overwarn)
-  File "bootstrap/src/engine/SCons/Builder.py", line 747:
+  File "bootstrap/src/engine/SCons/Builder.py", line 748:
     tlist = bld._execute(env, None, [s], overwarn)
-  File "bootstrap/src/engine/SCons/Builder.py", line 556:
+  File "bootstrap/src/engine/SCons/Builder.py", line 557:
     _node_errors(self, env, tlist, slist)
-  File "bootstrap/src/engine/SCons/Builder.py", line 302:
+  File "bootstrap/src/engine/SCons/Builder.py", line 303:
     msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents.decode('utf-8'),contents.decode('utf-8'))
   File "/usr/lib/python2.7/encodings/utf_8.py", line 16:
     return codecs.utf_8_decode(input, errors, True)
diff --git a/doc/generated/examples/java_jar1_1.xml b/doc/generated/examples/java_jar1_1.xml
index de932275..daa3d1a7 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="http://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
+scons: *** [test.jar] Source `classes.class' not found, needed by target `test.jar'.
 </screen>
diff --git a/doc/generated/examples/sourcecode_bitkeeper_1.xml b/doc/generated/examples/sourcecode_bitkeeper_1.xml
index a070ada6..41af3a21 100644
--- a/doc/generated/examples/sourcecode_bitkeeper_1.xml
+++ b/doc/generated/examples/sourcecode_bitkeeper_1.xml
@@ -1,6 +1,6 @@
 <?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>
-bk get hello.c
-cc -o hello.o -c hello.c
-cc -o hello hello.o
+AttributeError: 'SConsEnvironment' object has no attribute 'BitKeeper':
+  File "/home/my/project/SConstruct", line 2:
+    env.SourceCode('.', env.BitKeeper())
 </screen>
diff --git a/doc/generated/examples/sourcecode_cvs_1.xml b/doc/generated/examples/sourcecode_cvs_1.xml
index 9ec7cd44..01ddb6b6 100644
--- a/doc/generated/examples/sourcecode_cvs_1.xml
+++ b/doc/generated/examples/sourcecode_cvs_1.xml
@@ -1,6 +1,6 @@
 <?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>
-cvs -d /usr/local/CVS co hello.c
-cc -o hello.o -c hello.c
-cc -o hello hello.o
+AttributeError: 'SConsEnvironment' object has no attribute 'CVS':
+  File "/home/my/project/SConstruct", line 2:
+    env.SourceCode('.', env.CVS('/usr/local/CVS'))
 </screen>
diff --git a/doc/generated/examples/sourcecode_rcs_1.xml b/doc/generated/examples/sourcecode_rcs_1.xml
index 5e120ebd..e6b36dd4 100644
--- a/doc/generated/examples/sourcecode_rcs_1.xml
+++ b/doc/generated/examples/sourcecode_rcs_1.xml
@@ -1,6 +1,6 @@
 <?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>
-co hello.c
-cc -o hello.o -c hello.c
-cc -o hello hello.o
+AttributeError: 'SConsEnvironment' object has no attribute 'RCS':
+  File "/home/my/project/SConstruct", line 2:
+    env.SourceCode('.', env.RCS())
 </screen>
diff --git a/doc/generated/examples/sourcecode_sccs_1.xml b/doc/generated/examples/sourcecode_sccs_1.xml
index 354b6807..e0699d18 100644
--- a/doc/generated/examples/sourcecode_sccs_1.xml
+++ b/doc/generated/examples/sourcecode_sccs_1.xml
@@ -1,6 +1,6 @@
 <?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>
-sccs get hello.c
-cc -o hello.o -c hello.c
-cc -o hello hello.o
+AttributeError: 'SConsEnvironment' object has no attribute 'SCCS':
+  File "/home/my/project/SConstruct", line 2:
+    env.SourceCode('.', env.SCCS())
 </screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 36d91391..0ee52a9e 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -3,5 +3,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/home/bdbaddog/devel/scons/scons/src/script/scons.py", line 201, in &lt;module&gt;
+File "/home/bdbaddog/devel/scons/as_scons/src/script/scons.py", line 201, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml
index dc1292ed..4b55f0d9 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_2.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml
@@ -6,7 +6,7 @@ scons: internal stack trace:
     task.prepare()
   File "bootstrap/src/engine/SCons/Script/Main.py", line 175, in prepare
     return SCons.Taskmaster.OutOfDateTask.prepare(self)
-  File "bootstrap/src/engine/SCons/Taskmaster.py", line 195, in prepare
+  File "bootstrap/src/engine/SCons/Taskmaster.py", line 198, in prepare
     executor.prepare()
   File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare
     raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0]))
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index e3bc27f1..f858aa49 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -150,7 +150,7 @@ for the platform on which SCons is running.
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for D language compiler DMD.
 </para>
-<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-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &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>
@@ -394,7 +394,7 @@ Set construction variables for the <application xmlns="http://www.scons.org/dbxs
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the D language compiler GDC.
 </para>
-<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-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &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>
@@ -613,7 +613,7 @@ Sets construction variables for the <application xmlns="http://www.scons.org/dbx
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets construction variables for the D language compiler LDC2.
 </para>
-<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-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &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>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index ab70d73c..8a8dc99d 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -837,6 +837,14 @@ The D compiler to use.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DDEBUGPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DDEBUGPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DDEBUGPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DDEBUGSUFFIX">
@@ -845,6 +853,14 @@ The D compiler to use.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DDEBUGSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DDEBUGSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DDEBUGSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DESCRIPTION">
@@ -876,6 +892,14 @@ section of an RPM
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFILESUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFILESUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFILESUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DFLAGPREFIX">
@@ -884,6 +908,14 @@ section of an RPM
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFLAGPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFLAGPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFLAGPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DFLAGS">
@@ -908,6 +940,14 @@ section of an RPM
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DFLAGSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFLAGSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DFLAGSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DINCPREFIX">
@@ -916,6 +956,14 @@ section of an RPM
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DINCPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DINCPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DINCPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DINCSUFFIX">
@@ -924,6 +972,14 @@ section of an RPM
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-Dir">
@@ -987,6 +1043,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBDIRSUFFIX">
@@ -995,6 +1059,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBFLAGPREFIX">
@@ -1003,6 +1075,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBFLAGSUFFIX">
@@ -1011,6 +1091,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBFLAGSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBFLAGSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBLINKPREFIX">
@@ -1019,6 +1107,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLIBLINKSUFFIX">
@@ -1027,6 +1123,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLIBLINKSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLIBLINKSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLINK">
@@ -1067,6 +1171,14 @@ into a list of Dir instances relative to the target being built.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLINKFLAGPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLINKFLAGPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLINKFLAGPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DLINKFLAGS">
@@ -1091,6 +1203,14 @@ List of linker flags.
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DLINKFLAGSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLINKFLAGSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DLINKFLAGSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DOCBOOK_DEFAULT_XSL_EPUB">
@@ -1306,6 +1426,30 @@ for <literal>saxon</literal> and <literal>saxon-xslt</literal>, respectively.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-DRPATHPREFIX">
+    <term>DRPATHPREFIX</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                DRPATHPREFIX.
+            </para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-DRPATHSUFFIX">
+    <term>DRPATHSUFFIX</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                DRPATHSUFFIX.
+            </para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-DShLibSonameGenerator">
+    <term>DShLibSonameGenerator</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                DShLibSonameGenerator.
+            </para>
+        </listitem>
+  </varlistentry>
   <varlistentry id="cv-DSUFFIXES">
     <term>DSUFFIXES</term>
     <listitem>
@@ -1326,6 +1470,14 @@ The default list is:
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DVERPREFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DVERPREFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DVERPREFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DVERSIONS">
@@ -1350,6 +1502,14 @@ The default list is:
     <para xmlns="http://www.scons.org/dbxsd/v1.0">
       DVERSUFFIX.
     </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DVERSUFFIX.
+    </para>
+ 
+    <para xmlns="http://www.scons.org/dbxsd/v1.0">
+      DVERSUFFIX.
+    </para>
  </listitem>
   </varlistentry>
   <varlistentry id="cv-DVIPDF">
@@ -5840,6 +6000,22 @@ to generate shared-library objects.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-SHDLIBVERSION">
+    <term>SHDLIBVERSION</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                SHDLIBVERSION.
+            </para>
+        </listitem>
+  </varlistentry>
+  <varlistentry id="cv-SHDLIBVERSIONFLAGS">
+    <term>SHDLIBVERSIONFLAGS</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                SHDLIBVERSIONFLAGS.
+            </para>
+        </listitem>
+  </varlistentry>
   <varlistentry id="cv-SHDLINK">
     <term>SHDLINK</term>
     <listitem>
diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod
index 319ac669..6ecf6c96 100644
--- a/doc/generated/variables.mod
+++ b/doc/generated/variables.mod
@@ -107,6 +107,9 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-DOCBOOK_XSLTPROCFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DOCBOOK_XSLTPROCFLAGS</envar>">
 <!ENTITY cv-DOCBOOK_XSLTPROCPARAMS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DOCBOOK_XSLTPROCPARAMS</envar>">
 <!ENTITY cv-DPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DPATH</envar>">
+<!ENTITY cv-DRPATHPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DRPATHPREFIX</envar>">
+<!ENTITY cv-DRPATHSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DRPATHSUFFIX</envar>">
+<!ENTITY cv-DShLibSonameGenerator "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DShLibSonameGenerator</envar>">
 <!ENTITY cv-DSUFFIXES "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DSUFFIXES</envar>">
 <!ENTITY cv-DVERPREFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DVERPREFIX</envar>">
 <!ENTITY cv-DVERSIONS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$DVERSIONS</envar>">
@@ -445,6 +448,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-SHCXXFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHCXXFLAGS</envar>">
 <!ENTITY cv-SHDC "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDC</envar>">
 <!ENTITY cv-SHDCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDCOM</envar>">
+<!ENTITY cv-SHDLIBVERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDLIBVERSION</envar>">
+<!ENTITY cv-SHDLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDLIBVERSIONFLAGS</envar>">
 <!ENTITY cv-SHDLINK "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDLINK</envar>">
 <!ENTITY cv-SHDLINKCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDLINKCOM</envar>">
 <!ENTITY cv-SHDLINKFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHDLINKFLAGS</envar>">
@@ -731,6 +736,9 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-DOCBOOK_XSLTPROCFLAGS "<link linkend='cv-DOCBOOK_XSLTPROCFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DOCBOOK_XSLTPROCFLAGS</envar></link>">
 <!ENTITY cv-link-DOCBOOK_XSLTPROCPARAMS "<link linkend='cv-DOCBOOK_XSLTPROCPARAMS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DOCBOOK_XSLTPROCPARAMS</envar></link>">
 <!ENTITY cv-link-DPATH "<link linkend='cv-DPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DPATH</envar></link>">
+<!ENTITY cv-link-DRPATHPREFIX "<link linkend='cv-DRPATHPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DRPATHPREFIX</envar></link>">
+<!ENTITY cv-link-DRPATHSUFFIX "<link linkend='cv-DRPATHSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DRPATHSUFFIX</envar></link>">
+<!ENTITY cv-link-DShLibSonameGenerator "<link linkend='cv-DShLibSonameGenerator' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DShLibSonameGenerator</envar></link>">
 <!ENTITY cv-link-DSUFFIXES "<link linkend='cv-DSUFFIXES' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DSUFFIXES</envar></link>">
 <!ENTITY cv-link-DVERPREFIX "<link linkend='cv-DVERPREFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DVERPREFIX</envar></link>">
 <!ENTITY cv-link-DVERSIONS "<link linkend='cv-DVERSIONS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$DVERSIONS</envar></link>">
@@ -1069,6 +1077,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-SHCXXFLAGS "<link linkend='cv-SHCXXFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHCXXFLAGS</envar></link>">
 <!ENTITY cv-link-SHDC "<link linkend='cv-SHDC' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDC</envar></link>">
 <!ENTITY cv-link-SHDCOM "<link linkend='cv-SHDCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDCOM</envar></link>">
+<!ENTITY cv-link-SHDLIBVERSION "<link linkend='cv-SHDLIBVERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDLIBVERSION</envar></link>">
+<!ENTITY cv-link-SHDLIBVERSIONFLAGS "<link linkend='cv-SHDLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDLIBVERSIONFLAGS</envar></link>">
 <!ENTITY cv-link-SHDLINK "<link linkend='cv-SHDLINK' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDLINK</envar></link>">
 <!ENTITY cv-link-SHDLINKCOM "<link linkend='cv-SHDLINKCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDLINKCOM</envar></link>">
 <!ENTITY cv-link-SHDLINKFLAGS "<link linkend='cv-SHDLINKFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHDLINKFLAGS</envar></link>">