Clean up D compiler pages

Manpage duplicated (triplicated, actually) tons of construction variables
because they were defined in each of the three possible names for the
D compiler.  Someone already started a DCommon.xml, this just finishes
off the job of moving them there; the individual compiler-name docs now
do not define any construction vars.

THe ProgramAllAtOnce builder had the same problem, and got the
same treatment.

Note: lots of the cvars don't actually define the term.  I don't use D so
I'm not proposing any changes at this time, but it would be simple enough
to merge in some simple wording if someone thinks it's important enough.

Signed-off-by: Mats Wichmann <mats@linux.com>

7 files changed, 457 insertions, 1368 deletions

diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen
index 7c62558..54c7aaa 100644
--- a/doc/generated/builders.gen
+++ b/doc/generated/builders.gen
@@ -1841,72 +1841,28 @@ env.Program(target = 'foo', source = ['foo.o', 'bar.c', 'baz.f'])
       <function>env.ProgramAllAtOnce()</function>
     </term>
     <listitem>
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      Builds an executable from D sources without first creating individual
-      objects for each file.
-    </para>
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      D sources can be compiled file-by-file as C and C++ source are, and
-      D is integrated into the <filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename> Object and Program builders for
-      this model of build. D codes can though do whole source
-      meta-programming (some of the testing frameworks do this). For this
-      it is imperative that all sources are compiled and linked in a single call of
-      the D compiler. This builder serves that purpose.
-    </para>
-    <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-      env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
-    </example_commands>
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      This command will compile the modules mod_a, mod_b, and mod_c in a
-      single compilation process without first creating object files for
-      the modules. Some of the D compilers will create executable.o others
-      will not.
-    </para>
-  
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      Builds an executable from D sources without first creating individual
-      objects for each file.
-    </para>
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      D sources can be compiled file-by-file as C and C++ source are, and
-      D is integrated into the <filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename> Object and Program builders for
-      this model of build. D codes can though do whole source
-      meta-programming (some of the testing frameworks do this). For this
-      it is imperative that all sources are compiled and linked in a single call of
-      the D compiler. This builder serves that purpose.
-    </para>
-    <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-      env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
-    </example_commands>
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      This command will compile the modules mod_a, mod_b, and mod_c in a
-      single compilation process without first creating object files for
-      the modules. Some of the D compilers will create executable.o others
-      will not.
-    </para>
-  
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      Builds an executable from D sources without first creating individual
-      objects for each file.
-    </para>
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      D sources can be compiled file-by-file as C and C++ source are, and
-      D is integrated into the <filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename> Object and Program builders for
-      this model of build. D codes can though do whole source
-      meta-programming (some of the testing frameworks do this). For this
-      it is imperative that all sources are compiled and linked in a single call of
-      the D compiler. This builder serves that purpose.
-    </para>
-    <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-      env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
-    </example_commands>
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      This command will compile the modules mod_a, mod_b, and mod_c in a
-      single compilation process without first creating object files for
-      the modules. Some of the D compilers will create executable.o others
-      will not.
-    </para>
-  </listitem>
+  <para xmlns="http://www.scons.org/dbxsd/v1.0">
+    Builds an executable from D sources without first creating individual
+    objects for each file.
+  </para>
+  <para xmlns="http://www.scons.org/dbxsd/v1.0">
+    D sources can be compiled file-by-file as C and C++ source are, and
+    D is integrated into the <filename xmlns="http://www.scons.org/dbxsd/v1.0">scons</filename> Object and Program builders for
+    this model of build. D codes can though do whole source
+    meta-programming (some of the testing frameworks do this). For this
+    it is imperative that all sources are compiled and linked in a single
+    call to the D compiler. This builder serves that purpose.
+  </para>
+  <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+    env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
+  </example_commands>
+  <para xmlns="http://www.scons.org/dbxsd/v1.0">
+    This command will compile the modules mod_a, mod_b, and mod_c in a
+    single compilation process without first creating object files for
+    the modules. Some of the D compilers will create executable.o others
+    will not.
+  </para>
+</listitem>
   </varlistentry>
   <varlistentry id="b-RES">
     <term>
diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen
index f8cdba0..e55799c 100644
--- a/doc/generated/functions.gen
+++ b/doc/generated/functions.gen
@@ -1335,7 +1335,7 @@ env.Depends(bar, installed_lib)
 Returns a dictionary object
 containing the <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction variables</literal> in the <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction environment</literal>.
 If there are any arguments specified,
-only the values of the specified <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction variables</literal>
+the values of the specified <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction variables</literal>
 are returned as a string (if one
 argument) or as a list of strings.
 </para>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 3f26933..7be9c63 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -874,35 +874,15 @@ depending on the specific C++ compiler being used.
 <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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The D compiler to use.
-</para>
 </listitem>
   </varlistentry>
   <varlistentry id="cv-DCOM">
     <term>DCOM</term>
     <listitem>
 <para 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>
-
-<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.
+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>
@@ -910,49 +890,25 @@ The D compiler to use.
     <term>DDEBUG</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-  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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-  List of debug tags to enable when compiling.
+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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DDEBUGPREFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DDEBUGPREFIX.
-    </para>
- </listitem>
+<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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DDEBUGSUFFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DDEBUGSUFFIX.
-    </para>
- </listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+DDEBUGSUFFIX.
+</para>
+</listitem>
   </varlistentry>
   <varlistentry id="cv-DESCRIPTION">
     <term>DESCRIPTION</term>
@@ -980,98 +936,50 @@ section of an RPM
   <varlistentry id="cv-DFILESUFFIX">
     <term>DFILESUFFIX</term>
     <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>
+<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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DFLAGPREFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DFLAGPREFIX.
-    </para>
- </listitem>
+<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">
-  General options that are passed to the D compiler.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-  General options that are passed to the D compiler.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-  General options that are passed to the D compiler.
+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.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DFLAGSUFFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DFLAGSUFFIX.
-    </para>
- </listitem>
+<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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DINCPREFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DINCPREFIX.
-    </para>
- </listitem>
+<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">
-      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>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+DLIBFLAGSUFFIX.
+</para>
+</listitem>
   </varlistentry>
   <varlistentry id="cv-Dir">
     <term>Dir</term>
@@ -1100,15 +1008,7 @@ 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">
-  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.
+Name of the lib tool to use for D codes.
 </para>
 </listitem>
   </varlistentry>
@@ -1116,127 +1016,63 @@ into a list of Dir instances relative to the target being built.
     <term>DLIBCOM</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-  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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-  The command line to use when creating libraries.
+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">
-      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>
+<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">
-      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>
+<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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLIBFLAGPREFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLIBFLAGPREFIX.
-    </para>
- </listitem>
+<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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLIBFLAGSUFFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLIBFLAGSUFFIX.
-    </para>
- </listitem>
+<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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLIBLINKPREFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLIBLINKPREFIX.
-    </para>
- </listitem>
+<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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLIBLINKSUFFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLIBLINKSUFFIX.
-    </para>
- </listitem>
+<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">
-  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.
+Name of the linker to use for linking systems including D sources.
 </para>
 </listitem>
   </varlistentry>
@@ -1244,33 +1080,17 @@ into a list of Dir instances relative to the target being built.
     <term>DLINKCOM</term>
     <listitem>
 <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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-  The command line to use when linking systems including D sources.
+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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLINKFLAGPREFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLINKFLAGPREFIX.
-    </para>
- </listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+DLINKFLAGPREFIX.
+</para>
+</listitem>
   </varlistentry>
   <varlistentry id="cv-DLINKFLAGS">
     <term>DLINKFLAGS</term>
@@ -1278,31 +1098,15 @@ into a list of Dir instances relative to the target being built.
 <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>
-
-<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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLINKFLAGSUFFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DLINKFLAGSUFFIX.
-    </para>
- </listitem>
+<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>
@@ -1507,39 +1311,31 @@ for <literal>saxon</literal> and <literal>saxon-xslt</literal>, respectively.
 <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>
-
-<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>
+<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>
+<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>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+DShLibSonameGenerator.
+</para>
+</listitem>
   </varlistentry>
   <varlistentry id="cv-DSUFFIXES">
     <term>DSUFFIXES</term>
@@ -1558,50 +1354,26 @@ The default list is:
   <varlistentry id="cv-DVERPREFIX">
     <term>DVERPREFIX</term>
     <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>
+<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">
-  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.
+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>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DVERSUFFIX.
-    </para>
- 
-    <para xmlns="http://www.scons.org/dbxsd/v1.0">
-      DVERSUFFIX.
-    </para>
- </listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+DVERSUFFIX.
+</para>
+</listitem>
   </varlistentry>
   <varlistentry id="cv-DVIPDF">
     <term>DVIPDF</term>
@@ -6149,18 +5921,8 @@ to generate shared-library objects.
     <term>SHDC</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-  The name of the compiler to use when compiling D source
-  destined to be in a shared objects.
-</para>
-
-<para 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.
+The name of the compiler to use when compiling D source
+destined to be in a shared objects.
 </para>
 </listitem>
   </varlistentry>
@@ -6168,50 +5930,32 @@ to generate shared-library objects.
     <term>SHDCOM</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-  The command line to use when compiling code to be part of shared objects.
-</para>
-
-<para 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.
+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>
+<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>
+<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">
-  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.
+The linker to use when creating shared objects for code bases
+include D sources.
 </para>
 </listitem>
   </varlistentry>
@@ -6219,15 +5963,7 @@ to generate shared-library objects.
     <term>SHDLINKCOM</term>
     <listitem>
 <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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-  The command line to use when generating shared objects.
+The command line to use when generating shared objects.
 </para>
 </listitem>
   </varlistentry>
@@ -6235,15 +5971,7 @@ to generate shared-library objects.
     <term>SHDLINKFLAGS</term>
     <listitem>
 <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>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-  The list of flags to use when generating a shared object.
+The list of flags to use when generating a shared object.
 </para>
 </listitem>
   </varlistentry>
diff --git a/src/engine/SCons/Tool/DCommon.xml b/src/engine/SCons/Tool/DCommon.xml
index f42bea3..8c8c1b5 100644
--- a/src/engine/SCons/Tool/DCommon.xml
+++ b/src/engine/SCons/Tool/DCommon.xml
@@ -23,49 +23,339 @@ See its __doc__ string for a discussion of the format.
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd">
 
+<cvar name="DC">
+<summary>
+<para>
+The D compiler to use.
+</para>
+</summary>
+</cvar>
 
+<cvar name="DCOM">
+<summary>
+<para>
+The command line used to compile a D file to an object file.
+Any options specified in the &cv-link-DFLAGS; construction variable
+is included on this command line.
+</para>
+</summary>
+</cvar>
 
+<cvar name="DDEBUG">
+<summary>
+<para>
+List of debug tags to enable when compiling.
+</para>
+</summary>
+</cvar>
 
+<cvar name="DDEBUGPREFIX">
+<summary>
+<para>
+DDEBUGPREFIX.
+</para>
+</summary>
+</cvar>
 
-    <cvar name="DRPATHPREFIX">
-        <summary>
-            <para>
-                DRPATHPREFIX.
-            </para>
-        </summary>
-    </cvar>
-
-    <cvar name="DRPATHSUFFIX">
-        <summary>
-            <para>
-                DRPATHSUFFIX.
-            </para>
-        </summary>
-    </cvar>
-
-
-    <cvar name="DShLibSonameGenerator">
-        <summary>
-            <para>
-                DShLibSonameGenerator.
-            </para>
-        </summary>
-    </cvar>
-
-    <cvar name="SHDLIBVERSION">
-        <summary>
-            <para>
-                SHDLIBVERSION.
-            </para>
-        </summary>
-    </cvar>
-    <cvar name="SHDLIBVERSIONFLAGS">
-        <summary>
-            <para>
-                SHDLIBVERSIONFLAGS.
-            </para>
-        </summary>
-    </cvar>
+<cvar name="DDEBUGSUFFIX">
+<summary>
+<para>
+DDEBUGSUFFIX.
+</para>
+</summary>
+</cvar>
 
+<cvar name="DFILESUFFIX">
+<summary>
+<para>
+DFILESUFFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DFLAGPREFIX">
+<summary>
+<para>
+DFLAGPREFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DFLAGS">
+<summary>
+<para>
+General options that are passed to the D compiler.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DFLAGSUFFIX">
+<summary>
+<para>
+DFLAGSUFFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DINCSUFFIX">
+<summary>
+<para>
+DLIBFLAGSUFFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DINCPREFIX">
+<summary>
+<para>
+DINCPREFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLIB">
+<summary>
+<para>
+Name of the lib tool to use for D codes.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLIBCOM">
+<summary>
+<para>
+The command line to use when creating libraries.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLIBDIRPREFIX">
+<summary>
+<para>
+DLIBLINKPREFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLIBDIRSUFFIX">
+<summary>
+<para>
+DLIBLINKSUFFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLIBFLAGSUFFIX">
+<summary>
+<para>
+DLIBFLAGSUFFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLIBFLAGPREFIX">
+<summary>
+<para>
+DLIBFLAGPREFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLIBLINKPREFIX">
+<summary>
+<para>
+DLIBLINKPREFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLIBLINKSUFFIX">
+<summary>
+<para>
+DLIBLINKSUFFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLINK">
+<summary>
+<para>
+Name of the linker to use for linking systems including D sources.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLINKCOM">
+<summary>
+<para>
+The command line to use when linking systems including D sources.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLINKFLAGS">
+<summary>
+<para>
+List of linker flags.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLINKFLAGSUFFIX">
+<summary>
+<para>
+DLINKFLAGSUFFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DLINKFLAGPREFIX">
+<summary>
+<para>
+DLINKFLAGPREFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DPATH">
+<summary>
+<para>
+  List of paths to search for import modules.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DRPATHPREFIX">
+<summary>
+<para>
+DRPATHPREFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DRPATHSUFFIX">
+<summary>
+<para>
+DRPATHSUFFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DShLibSonameGenerator">
+<summary>
+<para>
+DShLibSonameGenerator.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DVERPREFIX">
+<summary>
+<para>
+DVERPREFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DVERSIONS">
+<summary>
+<para>
+List of version tags to enable when compiling.
+</para>
+</summary>
+</cvar>
+
+<cvar name="DVERSUFFIX">
+<summary>
+<para>
+DVERSUFFIX.
+</para>
+</summary>
+</cvar>
+
+<cvar name="SHDC">
+<summary>
+<para>
+The name of the compiler to use when compiling D source
+destined to be in a shared objects.
+</para>
+</summary>
+</cvar>
+
+<cvar name="SHDCOM">
+<summary>
+<para>
+The command line to use when compiling code to be part of shared objects.
+</para>
+</summary>
+</cvar>
+
+<cvar name="SHDLIBVERSION">
+<summary>
+<para>
+SHDLIBVERSION.
+</para>
+</summary>
+</cvar>
+
+<cvar name="SHDLIBVERSIONFLAGS">
+<summary>
+<para>
+SHDLIBVERSIONFLAGS.
+</para>
+</summary>
+</cvar>
+
+<cvar name="SHDLINK">
+<summary>
+<para>
+The linker to use when creating shared objects for code bases
+include D sources.
+</para>
+</summary>
+</cvar>
+
+<cvar name="SHDLINKCOM">
+<summary>
+<para>
+The command line to use when generating shared objects.
+</para>
+</summary>
+</cvar>
+
+<cvar name="SHDLINKFLAGS">
+<summary>
+<para>
+The list of flags to use when generating a shared object.
+</para>
+</summary>
+</cvar>
+
+
+<builder name="ProgramAllAtOnce">
+<summary>
+  <para>
+    Builds an executable from D sources without first creating individual
+    objects for each file.
+  </para>
+  <para>
+    D sources can be compiled file-by-file as C and C++ source are, and
+    D is integrated into the &scons; Object and Program builders for
+    this model of build. D codes can though do whole source
+    meta-programming (some of the testing frameworks do this). For this
+    it is imperative that all sources are compiled and linked in a single
+    call to the D compiler. This builder serves that purpose.
+  </para>
+  <example_commands>
+    env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
+  </example_commands>
+  <para>
+    This command will compile the modules mod_a, mod_b, and mod_c in a
+    single compilation process without first creating object files for
+    the modules. Some of the D compilers will create executable.o others
+    will not.
+  </para>
+</summary>
+</builder>
 
 </sconsdoc>
diff --git a/src/engine/SCons/Tool/dmd.xml b/src/engine/SCons/Tool/dmd.xml
index 7e220dc..a3620ce 100644
--- a/src/engine/SCons/Tool/dmd.xml
+++ b/src/engine/SCons/Tool/dmd.xml
@@ -73,299 +73,4 @@ Sets construction variables for D language compiler DMD.
 </uses>
 </tool>
 
-<cvar name="DC">
-<summary>
-<para>
-The D compiler to use.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DCOM">
-<summary>
-<para>
-  The command line used to compile a D file to an object file.
-  Any options specified in the &cv-link-DFLAGS; construction variable
-  is included on this command line.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DDEBUG">
-<summary>
-<para>
-  List of debug tags to enable when compiling.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DFLAGS">
-<summary>
-<para>
-  General options that are passed to the D compiler.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLIB">
-<summary>
-<para>
-  Name of the lib tool to use for D codes.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLIBCOM">
-<summary>
-<para>
-  The command line to use when creating libraries.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLINK">
-<summary>
-<para>
-  Name of the linker to use for linking systems including D sources.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLINKCOM">
-<summary>
-<para>
-  The command line to use when linking systems including D sources.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLINKFLAGS">
-<summary>
-<para>
-List of linker flags.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DPATH">
-<summary>
-<para>
-  List of paths to search for import modules.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DVERSIONS">
-<summary>
-<para>
-  List of version tags to enable when compiling.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDC">
-<summary>
-<para>
-  The name of the compiler to use when compiling D source
-  destined to be in a shared objects.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDCOM">
-<summary>
-<para>
-  The command line to use when compiling code to be part of shared objects.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDLINK">
-<summary>
-<para>
-  The linker to use when creating shared objects for code bases
-  include D sources.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDLINKCOM">
-<summary>
-<para>
-  The command line to use when generating shared objects.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDLINKFLAGS">
-<summary>
-<para>
-  The list of flags to use when generating a shared object.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DVERSUFFIX">
-  <summary>
-    <para>
-      DVERSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DVERPREFIX">
-  <summary>
-    <para>
-      DVERPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLINKFLAGSUFFIX">
-  <summary>
-    <para>
-      DLINKFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLINKFLAGPREFIX">
-  <summary>
-    <para>
-      DLINKFLAGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBLINKSUFFIX">
-  <summary>
-    <para>
-      DLIBLINKSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBLINKPREFIX">
-  <summary>
-    <para>
-      DLIBLINKPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBFLAGSUFFIX">
-  <summary>
-    <para>
-      DLIBFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBFLAGPREFIX">
-  <summary>
-    <para>
-      DLIBFLAGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBDIRSUFFIX">
-  <summary>
-    <para>
-      DLIBLINKSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBDIRPREFIX">
-  <summary>
-    <para>
-      DLIBLINKPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DINCSUFFIX">
-  <summary>
-    <para>
-      DLIBFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-
-<cvar name="DINCPREFIX">
-  <summary>
-    <para>
-      DINCPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DFLAGSUFFIX">
-  <summary>
-    <para>
-      DFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DFLAGPREFIX">
-  <summary>
-    <para>
-      DFLAGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DFILESUFFIX">
-  <summary>
-    <para>
-      DFILESUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DDEBUGPREFIX">
-  <summary>
-    <para>
-      DDEBUGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DDEBUGSUFFIX">
-  <summary>
-    <para>
-      DDEBUGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<builder name="ProgramAllAtOnce">
-  <summary>
-    <para>
-      Builds an executable from D sources without first creating individual
-      objects for each file.
-    </para>
-    <para>
-      D sources can be compiled file-by-file as C and C++ source are, and
-      D is integrated into the &scons; Object and Program builders for
-      this model of build. D codes can though do whole source
-      meta-programming (some of the testing frameworks do this). For this
-      it is imperative that all sources are compiled and linked in a single call of
-      the D compiler. This builder serves that purpose.
-    </para>
-    <example_commands>
-      env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
-    </example_commands>
-    <para>
-      This command will compile the modules mod_a, mod_b, and mod_c in a
-      single compilation process without first creating object files for
-      the modules. Some of the D compilers will create executable.o others
-      will not.
-    </para>
-  </summary>
-</builder>
-
 </sconsdoc>
diff --git a/src/engine/SCons/Tool/gdc.xml b/src/engine/SCons/Tool/gdc.xml
index d44489e..4c6c2f8 100644
--- a/src/engine/SCons/Tool/gdc.xml
+++ b/src/engine/SCons/Tool/gdc.xml
@@ -73,299 +73,4 @@ Sets construction variables for the D language compiler GDC.
 </uses>
 </tool>
 
-<cvar name="DC">
-<summary>
-<para>
-The D compiler to use.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DCOM">
-<summary>
-<para>
-  The command line used to compile a D file to an object file.
-  Any options specified in the &cv-link-DFLAGS; construction variable
-  is included on this command line.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DDEBUG">
-<summary>
-<para>
-  List of debug tags to enable when compiling.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DFLAGS">
-<summary>
-<para>
-  General options that are passed to the D compiler.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLIB">
-<summary>
-<para>
-  Name of the lib tool to use for D codes.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLIBCOM">
-<summary>
-<para>
-  The command line to use when creating libraries.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLINK">
-<summary>
-<para>
-  Name of the linker to use for linking systems including D sources.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLINKCOM">
-<summary>
-<para>
-  The command line to use when linking systems including D sources.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLINKFLAGS">
-<summary>
-<para>
-List of linker flags.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DPATH">
-<summary>
-<para>
-  List of paths to search for import modules.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DVERSIONS">
-<summary>
-<para>
-  List of version tags to enable when compiling.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDC">
-<summary>
-<para>
-  The name of the compiler to use when compiling D source
-  destined to be in a shared objects.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDCOM">
-<summary>
-<para>
-  The command line to use when compiling code to be part of shared objects.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDLINK">
-<summary>
-<para>
-  The linker to use when creating shared objects for code bases
-  include D sources.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDLINKCOM">
-<summary>
-<para>
-  The command line to use when generating shared objects.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDLINKFLAGS">
-<summary>
-<para>
-  The list of flags to use when generating a shared object.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DVERSUFFIX">
-  <summary>
-    <para>
-      DVERSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DVERPREFIX">
-  <summary>
-    <para>
-      DVERPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLINKFLAGSUFFIX">
-  <summary>
-    <para>
-      DLINKFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLINKFLAGPREFIX">
-  <summary>
-    <para>
-      DLINKFLAGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBLINKSUFFIX">
-  <summary>
-    <para>
-      DLIBLINKSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBLINKPREFIX">
-  <summary>
-    <para>
-      DLIBLINKPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBFLAGSUFFIX">
-  <summary>
-    <para>
-      DLIBFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBFLAGPREFIX">
-  <summary>
-    <para>
-      DLIBFLAGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBDIRSUFFIX">
-  <summary>
-    <para>
-      DLIBLINKSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBDIRPREFIX">
-  <summary>
-    <para>
-      DLIBLINKPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DINCSUFFIX">
-  <summary>
-    <para>
-      DLIBFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-
-<cvar name="DINCPREFIX">
-  <summary>
-    <para>
-      DINCPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DFLAGSUFFIX">
-  <summary>
-    <para>
-      DFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DFLAGPREFIX">
-  <summary>
-    <para>
-      DFLAGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DFILESUFFIX">
-  <summary>
-    <para>
-      DFILESUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DDEBUGPREFIX">
-  <summary>
-    <para>
-      DDEBUGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DDEBUGSUFFIX">
-  <summary>
-    <para>
-      DDEBUGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<builder name="ProgramAllAtOnce">
-  <summary>
-    <para>
-      Builds an executable from D sources without first creating individual
-      objects for each file.
-    </para>
-    <para>
-      D sources can be compiled file-by-file as C and C++ source are, and
-      D is integrated into the &scons; Object and Program builders for
-      this model of build. D codes can though do whole source
-      meta-programming (some of the testing frameworks do this). For this
-      it is imperative that all sources are compiled and linked in a single call of
-      the D compiler. This builder serves that purpose.
-    </para>
-    <example_commands>
-      env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
-    </example_commands>
-    <para>
-      This command will compile the modules mod_a, mod_b, and mod_c in a
-      single compilation process without first creating object files for
-      the modules. Some of the D compilers will create executable.o others
-      will not.
-    </para>
-  </summary>
-</builder>
-
 </sconsdoc>
diff --git a/src/engine/SCons/Tool/ldc.xml b/src/engine/SCons/Tool/ldc.xml
index 495b8bc..6a80436 100644
--- a/src/engine/SCons/Tool/ldc.xml
+++ b/src/engine/SCons/Tool/ldc.xml
@@ -73,299 +73,4 @@ Sets construction variables for the D language compiler LDC2.
 </uses>
 </tool>
 
-<cvar name="DC">
-<summary>
-<para>
-The D compiler to use.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DCOM">
-<summary>
-<para>
-  The command line used to compile a D file to an object file.
-  Any options specified in the &cv-link-DFLAGS; construction variable
-  is included on this command line.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DDEBUG">
-<summary>
-<para>
-  List of debug tags to enable when compiling.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DFLAGS">
-<summary>
-<para>
-  General options that are passed to the D compiler.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLIB">
-<summary>
-<para>
-  Name of the lib tool to use for D codes.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLIBCOM">
-<summary>
-<para>
-  The command line to use when creating libraries.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLINK">
-<summary>
-<para>
-  Name of the linker to use for linking systems including D sources.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLINKCOM">
-<summary>
-<para>
-  The command line to use when linking systems including D sources.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DLINKFLAGS">
-<summary>
-<para>
-List of linker flags.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DPATH">
-<summary>
-<para>
-  List of paths to search for import modules.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DVERSIONS">
-<summary>
-<para>
-  List of version tags to enable when compiling.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDC">
-<summary>
-<para>
-  The name of the compiler to use when compiling D source
-  destined to be in a shared objects.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDCOM">
-<summary>
-<para>
-  The command line to use when compiling code to be part of shared objects.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDLINK">
-<summary>
-<para>
-  The linker to use when creating shared objects for code bases
-  include D sources.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDLINKCOM">
-<summary>
-<para>
-  The command line to use when generating shared objects.
-</para>
-</summary>
-</cvar>
-
-<cvar name="SHDLINKFLAGS">
-<summary>
-<para>
-  The list of flags to use when generating a shared object.
-</para>
-</summary>
-</cvar>
-
-<cvar name="DVERSUFFIX">
-  <summary>
-    <para>
-      DVERSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DVERPREFIX">
-  <summary>
-    <para>
-      DVERPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLINKFLAGSUFFIX">
-  <summary>
-    <para>
-      DLINKFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLINKFLAGPREFIX">
-  <summary>
-    <para>
-      DLINKFLAGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBLINKSUFFIX">
-  <summary>
-    <para>
-      DLIBLINKSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBLINKPREFIX">
-  <summary>
-    <para>
-      DLIBLINKPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBFLAGSUFFIX">
-  <summary>
-    <para>
-      DLIBFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBFLAGPREFIX">
-  <summary>
-    <para>
-      DLIBFLAGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBDIRSUFFIX">
-  <summary>
-    <para>
-      DLIBLINKSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DLIBDIRPREFIX">
-  <summary>
-    <para>
-      DLIBLINKPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DINCSUFFIX">
-  <summary>
-    <para>
-      DLIBFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-
-<cvar name="DINCPREFIX">
-  <summary>
-    <para>
-      DINCPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DFLAGSUFFIX">
-  <summary>
-    <para>
-      DFLAGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DFLAGPREFIX">
-  <summary>
-    <para>
-      DFLAGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DFILESUFFIX">
-  <summary>
-    <para>
-      DFILESUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DDEBUGPREFIX">
-  <summary>
-    <para>
-      DDEBUGPREFIX.
-    </para>
- </summary>
-</cvar>
-
-<cvar name="DDEBUGSUFFIX">
-  <summary>
-    <para>
-      DDEBUGSUFFIX.
-    </para>
- </summary>
-</cvar>
-
-<builder name="ProgramAllAtOnce">
-  <summary>
-    <para>
-      Builds an executable from D sources without first creating individual
-      objects for each file.
-    </para>
-    <para>
-      D sources can be compiled file-by-file as C and C++ source are, and
-      D is integrated into the &scons; Object and Program builders for
-      this model of build. D codes can though do whole source
-      meta-programming (some of the testing frameworks do this). For this
-      it is imperative that all sources are compiled and linked in a single call of
-      the D compiler. This builder serves that purpose.
-    </para>
-    <example_commands>
-      env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d'])
-    </example_commands>
-    <para>
-      This command will compile the modules mod_a, mod_b, and mod_c in a
-      single compilation process without first creating object files for
-      the modules. Some of the D compilers will create executable.o others
-      will not.
-    </para>
-  </summary>
-</builder>
-
 </sconsdoc>