Merge branch 'feature/upstream' into develop

1 files changed, 431 insertions, 374 deletions

diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 064ddef..8a8dc99 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -205,53 +205,6 @@ and typesetter and the LaTeX structured formatter and typesetter.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-BITKEEPER">
-    <term>BITKEEPER</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The BitKeeper executable.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-BITKEEPERCOM">
-    <term>BITKEEPERCOM</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The command line for
-fetching source files using BitKeeper.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-BITKEEPERCOMSTR">
-    <term>BITKEEPERCOMSTR</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The string displayed when fetching
-a source file using BitKeeper.
-If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-BITKEEPERCOM"><envar>$BITKEEPERCOM</envar></link>
-(the command line) is displayed.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-BITKEEPERGET">
-    <term>BITKEEPERGET</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The command (<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-BITKEEPER"><envar>$BITKEEPER</envar></link>) and subcommand
-for fetching source files using BitKeeper.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-BITKEEPERGETFLAGS">
-    <term>BITKEEPERGETFLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Options that are passed to the BitKeeper
-<command>get</command>
-subcommand.
-</para>
-</listitem>
-  </varlistentry>
   <varlistentry id="cv-BUILDERS">
     <term>BUILDERS</term>
     <listitem>
@@ -742,63 +695,6 @@ The default list is:
 </example_commands>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-CVS">
-    <term>CVS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The CVS executable.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-CVSCOFLAGS">
-    <term>CVSCOFLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Options that are passed to the CVS checkout subcommand.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-CVSCOM">
-    <term>CVSCOM</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The command line used to
-fetch source files from a CVS repository.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-CVSCOMSTR">
-    <term>CVSCOMSTR</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The string displayed when fetching
-a source file from a CVS repository.
-If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CVSCOM"><envar>$CVSCOM</envar></link>
-(the command line) is displayed.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-CVSFLAGS">
-    <term>CVSFLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-General options that are passed to CVS.
-By default, this is set to
-<literal>-d $CVSREPOSITORY</literal>
-to specify from where the files must be fetched.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-CVSREPOSITORY">
-    <term>CVSREPOSITORY</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The path to the CVS repository.
-This is referenced in the default
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-CVSFLAGS"><envar>$CVSFLAGS</envar></link> value.
-</para>
-</listitem>
-  </varlistentry>
   <varlistentry id="cv-CXX">
     <term>CXX</term>
     <listitem>
@@ -885,7 +781,15 @@ depending on the specific C++ compiler being used.
     <term>DC</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DC.
+The D compiler to use.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The D compiler to use.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+The D compiler to use.
 </para>
 </listitem>
   </varlistentry>
@@ -893,7 +797,21 @@ DC.
     <term>DCOM</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DCOM.
+  The command line used to compile a D file to an object file.
+  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 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 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 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 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>
@@ -901,33 +819,49 @@ DCOM.
     <term>DDEBUG</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DDEBUG.
+  List of debug tags to enable when compiling.
 </para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-_DDEBUGFLAGS">
-    <term>_DDEBUGFLAGS</term>
-    <listitem>
+
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-_DDEBUGFLAGS.
+  List of debug tags to enable when compiling.
+</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 xmlns="http://www.scons.org/dbxsd/v1.0">
-DDEBUGPREFIX.
-</para>
-</listitem>
+    <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">
     <term>DDEBUGSUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DDEBUGSUFFIX.
-</para>
-</listitem>
+    <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">
     <term>DESCRIPTION</term>
@@ -955,66 +889,98 @@ section of an RPM
   <varlistentry id="cv-DFILESUFFIX">
     <term>DFILESUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DFILESUFFIX.
-</para>
-</listitem>
+    <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">
     <term>DFLAGPREFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DFLAGPREFIX.
-</para>
-</listitem>
+    <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">
     <term>DFLAGS</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DFLAGS.
+  General options that are passed to the D compiler.
 </para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-_DFLAGS">
-    <term>_DFLAGS</term>
-    <listitem>
+
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-_DFLAGS.
+  General options that are passed to the D compiler.
 </para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-DFLAGSUFFIX">
-    <term>DFLAGSUFFIX</term>
-    <listitem>
+
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DFLAGSUFFIX.
+  General options that are passed to the D compiler.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-_DINCFLAGS">
-    <term>_DINCFLAGS</term>
+  <varlistentry id="cv-DFLAGSUFFIX">
+    <term>DFLAGSUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-_DINCFLAGS.
-</para>
-</listitem>
+    <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">
     <term>DINCPREFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DINCPREFIX.
-</para>
-</listitem>
+    <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">
     <term>DINCSUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DINCSUFFIX.
-</para>
-</listitem>
+    <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">
     <term>Dir</term>
@@ -1043,7 +1009,15 @@ into a list of Dir instances relative to the target being built.
     <term>DLIB</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DLIB.
+  Name of the lib tool to use for D codes.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+  Name of the lib tool to use for D codes.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+  Name of the lib tool to use for D codes.
 </para>
 </listitem>
   </varlistentry>
@@ -1051,79 +1025,127 @@ DLIB.
     <term>DLIBCOM</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DLIBCOM.
+  The command line to use when creating libraries.
 </para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-_DLIBDIRFLAGS">
-    <term>_DLIBDIRFLAGS</term>
-    <listitem>
+
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-_DLIBDIRFLAGS.
+  The command line to use when creating libraries.
+</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 xmlns="http://www.scons.org/dbxsd/v1.0">
-DLIBDIRPREFIX.
-</para>
-</listitem>
+    <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">
     <term>DLIBDIRSUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DLIBDIRSUFFIX.
-</para>
-</listitem>
+    <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">
     <term>DLIBFLAGPREFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DLIBFLAGPREFIX.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-_DLIBFLAGS">
-    <term>_DLIBFLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-_DLIBFLAGS.
-</para>
-</listitem>
+    <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">
     <term>DLIBFLAGSUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DLIBFLAGSUFFIX.
-</para>
-</listitem>
+    <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">
     <term>DLIBLINKPREFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DLIBLINKPREFIX.
-</para>
-</listitem>
+    <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">
     <term>DLIBLINKSUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DLIBLINKSUFFIX.
-</para>
-</listitem>
+    <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">
     <term>DLINK</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DLINK.
+  Name of the linker to use for linking systems including D sources.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+  Name of the linker to use for linking systems including D sources.
+</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>
@@ -1131,33 +1153,65 @@ DLINK.
     <term>DLINKCOM</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DLINKCOM.
+  The command line to use when linking systems including D sources.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+  The command line to use when linking systems including D sources.
+</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 xmlns="http://www.scons.org/dbxsd/v1.0">
-DLINKFLAGPREFIX.
-</para>
-</listitem>
+    <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">
     <term>DLINKFLAGS</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DLINKFLAGS.
+List of linker flags.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+List of linker flags.
+</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 xmlns="http://www.scons.org/dbxsd/v1.0">
-DLINKFLAGSUFFIX.
-</para>
-</listitem>
+    <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">
     <term>DOCBOOK_DEFAULT_XSL_EPUB</term>
@@ -1360,10 +1414,42 @@ for <literal>saxon</literal> and <literal>saxon-xslt</literal>, respectively.
     <term>DPATH</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DPATH.
+  List of paths to search for import modules.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+  List of paths to search for import modules.
+</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 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>
@@ -1378,37 +1464,53 @@ The default list is:
 </example_commands>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-_DVERFLAGS">
-    <term>_DVERFLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-_DVERFLAGS.
-</para>
-</listitem>
-  </varlistentry>
   <varlistentry id="cv-DVERPREFIX">
     <term>DVERPREFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-DVERPREFIX.
-</para>
-</listitem>
+    <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">
     <term>DVERSIONS</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-DVERSIONS.
+  List of version tags to enable when compiling.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+  List of version tags to enable when compiling.
+</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 xmlns="http://www.scons.org/dbxsd/v1.0">
-DVERSUFFIX.
-</para>
-</listitem>
+    <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">
     <term>DVIPDF</term>
@@ -3104,7 +3206,7 @@ The command line used to call the Java archive tool.
 <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 xmlns="http://www.scons.org/dbxsd/v1.0">$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 xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -3114,7 +3216,7 @@ env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET")
 <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 xmlns="http://www.scons.org/dbxsd/v1.0" 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 xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -4237,6 +4339,29 @@ window and importing the shell's environment variables.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-MSVC_UWP_APP">
+    <term>MSVC_UWP_APP</term>
+    <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Build libraries for a Universal Windows Platform (UWP) Application.
+</para>
+
+<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.
+This flag will only have an effect with Visual Studio 2015+.
+This variable must be passed as an argument to the Environment()
+constructor; setting it later has no effect.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Valid values are '1' or '0'
+</para>
+
+</listitem>
+  </varlistentry>
   <varlistentry id="cv-MSVC_VERSION">
     <term>MSVC_VERSION</term>
     <listitem>
@@ -4254,6 +4379,8 @@ constructor; setting it later has no effect.
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Valid values for Windows are
+<literal>14.0</literal>,
+<literal>14.0Exp</literal>,
 <literal>12.0</literal>,
 <literal>12.0Exp</literal>,
 <literal>11.0</literal>,
@@ -4616,41 +4743,6 @@ The suffix used for (static) object file names.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-P4">
-    <term>P4</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The Perforce executable.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-P4COM">
-    <term>P4COM</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The command line used to
-fetch source files from Perforce.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-P4COMSTR">
-    <term>P4COMSTR</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The string displayed when
-fetching a source file from Perforce.
-If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-P4COM"><envar>$P4COM</envar></link> (the command line) is displayed.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-P4FLAGS">
-    <term>P4FLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-General options that are passed to Perforce.
-</para>
-</listitem>
-  </varlistentry>
   <varlistentry id="cv-PACKAGEROOT">
     <term>PACKAGEROOT</term>
     <listitem>
@@ -5539,56 +5631,6 @@ when the <envar xmlns="http://www.scons.org/dbxsd/v1.0">$RCINCFLAGS</envar> vari
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-RCS">
-    <term>RCS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The RCS executable.
-Note that this variable is not actually used
-for the command to fetch source files from RCS;
-see the
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RCS_CO"><envar>$RCS_CO</envar></link>
-construction variable, below.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-RCS_CO">
-    <term>RCS_CO</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The RCS "checkout" executable,
-used to fetch source files from RCS.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-RCS_COCOM">
-    <term>RCS_COCOM</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The command line used to
-fetch (checkout) source files from RCS.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-RCS_COCOMSTR">
-    <term>RCS_COCOMSTR</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The string displayed when fetching
-a source file from RCS.
-If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RCS_COCOM"><envar>$RCS_COCOM</envar></link>
-(the command line) is displayed.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-RCS_COFLAGS">
-    <term>RCS_COFLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Options that are passed to the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-RCS_CO"><envar>$RCS_CO</envar></link> command.
-</para>
-</listitem>
-  </varlistentry>
   <varlistentry id="cv-RDirs">
     <term>RDirs</term>
     <listitem>
@@ -5819,53 +5861,6 @@ below, for more information.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-SCCS">
-    <term>SCCS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The SCCS executable.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-SCCSCOM">
-    <term>SCCSCOM</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The command line used to
-fetch source files from SCCS.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-SCCSCOMSTR">
-    <term>SCCSCOMSTR</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The string displayed when fetching
-a source file from a CVS repository.
-If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SCCSCOM"><envar>$SCCSCOM</envar></link>
-(the command line) is displayed.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-SCCSFLAGS">
-    <term>SCCSFLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-General options that are passed to SCCS.
-</para>
-</listitem>
-  </varlistentry>
-  <varlistentry id="cv-SCCSGETFLAGS">
-    <term>SCCSGETFLAGS</term>
-    <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Options that are passed specifically to the SCCS "get" subcommand.
-This can be set, for example, to
-<option>-e</option>
-to check out editable files from SCCS.
-</para>
-</listitem>
-  </varlistentry>
   <varlistentry id="cv-SCONS_HOME">
     <term>SCONS_HOME</term>
     <listitem> <para xmlns="http://www.scons.org/dbxsd/v1.0">The
@@ -5974,7 +5969,18 @@ to generate shared-library objects.
     <term>SHDC</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-SHDC.
+  The name of the compiler to use when compiling D source
+  destined to be in a shared objects.
+</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 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>
 </listitem>
   </varlistentry>
@@ -5982,15 +5988,50 @@ SHDC.
     <term>SHDCOM</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-SHDCOM.
+  The command line to use when compiling code to be part of shared objects.
+</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 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 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>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-SHDLINK.
+  The linker to use when creating shared objects for code bases
+  include D sources.
+</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 xmlns="http://www.scons.org/dbxsd/v1.0">
+  The linker to use when creating shared objects for code bases
+  include D sources.
 </para>
 </listitem>
   </varlistentry>
@@ -5998,7 +6039,15 @@ SHDLINK.
     <term>SHDLINKCOM</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-SHDLINKCOM.
+  The command line to use when generating shared objects.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+  The command line to use when generating shared objects.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+  The command line to use when generating shared objects.
 </para>
 </listitem>
   </varlistentry>
@@ -6006,7 +6055,15 @@ SHDLINKCOM.
     <term>SHDLINKFLAGS</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-SHDLINKFLAGS.
+  The list of flags to use when generating a shared object.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+  The list of flags to use when generating a shared object.
+</para>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+  The list of flags to use when generating a shared object.
 </para>
 </listitem>
   </varlistentry>
@@ -6553,6 +6610,16 @@ Example <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION">
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-SHLIBVERSIONFLAGS">
+    <term>SHLIBVERSIONFLAGS</term>
+    <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>
@@ -6566,16 +6633,6 @@ and some extra dynamically generated options (such as
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="cv-SHLIBVERSIONFLAGS">
-    <term>SHLIBVERSIONFLAGS</term>
-    <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-SHLINK">
     <term>SHLINK</term>
     <listitem>