Updated docs post updating Java tool xml file

7 files changed, 233 insertions, 213 deletions

diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen
index ada4e43..680f72f 100644
--- a/doc/generated/builders.gen
+++ b/doc/generated/builders.gen
@@ -572,75 +572,77 @@ env.Jar(target = 'bar.jar',
       <function>env.Java()</function>
     </term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Builds one or more Java class files.
-The sources may be any combination of explicit
-<filename>.java</filename> files,
-or directory trees which will be scanned
-for <filename>.java</filename> files.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-SCons will parse each source <filename>.java</filename> file
-to find the classes
-(including inner classes)
-defined within that file,
-and from that figure out the
-target <filename>.class</filename> files that will be created.
-The class files will be placed underneath
-the specified target directory.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-SCons will also search each Java file
-for the Java package name,
-which it assumes can be found on a line
-beginning with the string
-<literal>package</literal>
-in the first column;
-the resulting <filename>.class</filename> files
-will be placed in a directory reflecting
-the specified package name.
-For example,
-the file
-<filename>Foo.java</filename>
-defining a single public
-<classname>Foo</classname>
-class and
-containing a package name of
-<classname>sub.dir</classname>
-will generate a corresponding
-<filename>sub/dir/Foo.class</filename>
-class file.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Examples:
-</para>
-
-<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-env.Java(target = 'classes', source = 'src')
-env.Java(target = 'classes', source = ['src1', 'src2'])
-env.Java(target = 'classes', source = ['File1.java', 'File2.java'])
-</example_commands>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Java source files can use the native encoding for the underlying OS.
-Since SCons compiles in simple ASCII mode by default,
-the compiler will generate warnings about unmappable characters,
-which may lead to errors as the file is processed further.
-In this case, the user must specify the <literal>LANG</literal>
-environment variable to tell the compiler what encoding is used.
-For portibility, it's best if the encoding is hard-coded
-so that the compile will work if it is done on a system
-with a different encoding.
-</para>
-
-<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-env = Environment()
-env['ENV']['LANG'] = 'en_GB.UTF-8'
-</example_commands>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Builds one or more Java class files.
+                The sources may be any combination of explicit
+                <filename>.java</filename>
+                files,
+                or directory trees which will be scanned
+                for <filename>.java</filename> files.
+            </para>
+
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                SCons will parse each source <filename>.java</filename> file
+                to find the classes
+                (including inner classes)
+                defined within that file,
+                and from that figure out the
+                target <filename>.class</filename> files that will be created.
+                The class files will be placed underneath
+                the specified target directory.
+            </para>
+
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                SCons will also search each Java file
+                for the Java package name,
+                which it assumes can be found on a line
+                beginning with the string
+                <literal>package</literal>
+                in the first column;
+                the resulting <filename>.class</filename> files
+                will be placed in a directory reflecting
+                the specified package name.
+                For example,
+                the file
+                <filename>Foo.java</filename>
+                defining a single public
+                <classname>Foo</classname>
+                class and
+                containing a package name of
+                <classname>sub.dir</classname>
+                will generate a corresponding
+                <filename>sub/dir/Foo.class</filename>
+                class file.
+            </para>
+
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Examples:
+            </para>
+
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+                env.Java(target = 'classes', source = 'src')
+                env.Java(target = 'classes', source = ['src1', 'src2'])
+                env.Java(target = 'classes', source = ['File1.java', 'File2.java'])
+            </example_commands>
+
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Java source files can use the native encoding for the underlying OS.
+                Since SCons compiles in simple ASCII mode by default,
+                the compiler will generate warnings about unmappable characters,
+                which may lead to errors as the file is processed further.
+                In this case, the user must specify the
+                <literal>LANG</literal>
+                environment variable to tell the compiler what encoding is used.
+                For portibility, it's best if the encoding is hard-coded
+                so that the compile will work if it is done on a system
+                with a different encoding.
+            </para>
+
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+                env = Environment()
+                env['ENV']['LANG'] = 'en_GB.UTF-8'
+            </example_commands>
+        </listitem>
   </varlistentry>
   <varlistentry id="b-JavaH">
     <term>
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 18b04eb..3009e65 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 f3.o -c f3.c
 cc -o f5.o -c f5.c
-cc -o f4.o -c f4.c
 cc -o f2.o -c f2.c
+cc -o f4.o -c f4.c
 cc -o f1.o -c f1.c
+cc -o f3.o -c f3.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 064fdcb..56a7417 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/scons/git/scons/bootstrap/src/script/scons.py", line 201, in &lt;module&gt;
+File "/home/bdeegan/devel/scons/scons-bugfixes-1/bootstrap/src/script/scons.py", line 201, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index f858aa4..01fb559 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -586,10 +586,10 @@ Sets construction variables for the <application xmlns="http://www.scons.org/dbx
   <varlistentry id="t-javac">
     <term>javac</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
-</para>
-<para>Sets:  &cv-link-JAVABOOTCLASSPATH;, &cv-link-JAVAC;, &cv-link-JAVACCOM;, &cv-link-JAVACFLAGS;, &cv-link-JAVACLASSPATH;, &cv-link-JAVACLASSSUFFIX;, &cv-link-JAVASOURCEPATH;, &cv-link-JAVASUFFIX;.</para><para>Uses:  &cv-link-JAVACCOMSTR;.</para></listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Sets construction variables for the <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
+            </para>
+        <para>Sets:  &cv-link-JAVABOOTCLASSPATH;, &cv-link-JAVAC;, &cv-link-JAVACCOM;, &cv-link-JAVACFLAGS;, &cv-link-JAVACLASSPATH;, &cv-link-JAVACLASSSUFFIX;, &cv-link-JAVAINCLUDES;, &cv-link-JAVASOURCEPATH;, &cv-link-JAVASUFFIX;.</para><para>Uses:  &cv-link-JAVACCOMSTR;.</para></listitem>
   </varlistentry>
   <varlistentry id="t-javah">
     <term>javah</term>
@@ -778,19 +778,19 @@ Sets construction variables for the
 </para>
 <para>Sets:  &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.</para><para>Uses:  &cv-link-ASCOMSTR;, &cv-link-ASPPCOMSTR;.</para></listitem>
   </varlistentry>
-  <varlistentry id="t-Packaging">
-    <term>Packaging</term>
+  <varlistentry id="t-packaging">
+    <term>packaging</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
+A framework for building binary and source packages.
 </para>
 </listitem>
   </varlistentry>
-  <varlistentry id="t-packaging">
-    <term>packaging</term>
+  <varlistentry id="t-Packaging">
+    <term>Packaging</term>
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-A framework for building binary and source packages.
+Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
 </para>
 </listitem>
   </varlistentry>
diff --git a/doc/generated/tools.mod b/doc/generated/tools.mod
index 1209d74..f9bc1d7 100644
--- a/doc/generated/tools.mod
+++ b/doc/generated/tools.mod
@@ -78,8 +78,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY t-mwcc "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>mwcc</literal>">
 <!ENTITY t-mwld "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>mwld</literal>">
 <!ENTITY t-nasm "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>nasm</literal>">
-<!ENTITY t-Packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>Packaging</literal>">
 <!ENTITY t-packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>packaging</literal>">
+<!ENTITY t-Packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>Packaging</literal>">
 <!ENTITY t-pdf "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdf</literal>">
 <!ENTITY t-pdflatex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdflatex</literal>">
 <!ENTITY t-pdftex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdftex</literal>">
@@ -186,8 +186,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY t-link-mwcc "<link linkend='t-mwcc' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>mwcc</literal></link>">
 <!ENTITY t-link-mwld "<link linkend='t-mwld' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>mwld</literal></link>">
 <!ENTITY t-link-nasm "<link linkend='t-nasm' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>nasm</literal></link>">
-<!ENTITY t-link-Packaging "<link linkend='t-Packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>Packaging</literal></link>">
 <!ENTITY t-link-packaging "<link linkend='t-packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>packaging</literal></link>">
+<!ENTITY t-link-Packaging "<link linkend='t-Packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>Packaging</literal></link>">
 <!ENTITY t-link-pdf "<link linkend='t-pdf' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdf</literal></link>">
 <!ENTITY t-link-pdflatex "<link linkend='t-pdflatex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdflatex</literal></link>">
 <!ENTITY t-link-pdftex "<link linkend='t-pdftex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdftex</literal></link>">
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 9246249..17aab7b 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -3269,107 +3269,111 @@ by default.
   <varlistentry id="cv-JAVABOOTCLASSPATH">
     <term>JAVABOOTCLASSPATH</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Specifies the list of directories that
-will be added to the
-<application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> command line
-via the <option>-bootclasspath</option> option.
-The individual directory names will be
-separated by the operating system's path separate character
-(<filename>:</filename> on UNIX/Linux/POSIX,
-<filename>;</filename> on Windows).
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Specifies the list of directories that
+                will be added to the
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> command line
+                via the <option>-bootclasspath</option> option.
+                The individual directory names will be
+                separated by the operating system's path separate character
+                (<filename>:</filename> on UNIX/Linux/POSIX,
+                <filename>;</filename>
+                on Windows).
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVAC">
     <term>JAVAC</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The Java compiler.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The Java compiler.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACCOM">
     <term>JAVACCOM</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The command line used to compile a directory tree containing
-Java source files to
-corresponding Java class files.
-Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACFLAGS"><envar>$JAVACFLAGS</envar></link> construction variable
-are included on this command line.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The command line used to compile a directory tree containing
+                Java source files to
+                corresponding Java class files.
+                Any options specified in the <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACFLAGS"><envar>$JAVACFLAGS</envar></link> construction variable
+                are included on this command line.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACCOMSTR">
     <term>JAVACCOMSTR</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The string displayed when compiling
-a directory tree of Java source files to
-corresponding Java class files.
-If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACCOM"><envar>$JAVACCOM</envar></link> (the command line) is displayed.
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The string displayed when compiling
+                a directory tree of Java source files to
+                corresponding Java class files.
+                If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JAVACCOM"><envar>$JAVACCOM</envar></link> (the command line) is displayed.
+            </para>
 
-<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-env = Environment(JAVACCOMSTR = "Compiling class files $TARGETS from $SOURCES")
-</example_commands>
-</listitem>
+            <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+                env = Environment(JAVACCOMSTR = "Compiling class files $TARGETS from $SOURCES")
+            </example_commands>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACFLAGS">
     <term>JAVACFLAGS</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-General options that are passed to the Java compiler.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                General options that are passed to the Java compiler.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACLASSDIR">
     <term>JAVACLASSDIR</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The directory in which Java class files may be found.
-This is stripped from the beginning of any Java .class
-file names supplied to the
-<literal>JavaH</literal>
-builder.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The directory in which Java class files may be found.
+                This is stripped from the beginning of any Java .class
+                file names supplied to the
+                <literal>JavaH</literal>
+                builder.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACLASSPATH">
     <term>JAVACLASSPATH</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Specifies the list of directories that
-will be searched for Java
-<filename>.class</filename> file.
-The directories in this list will be added to the
-<application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> and <application xmlns="http://www.scons.org/dbxsd/v1.0">javah</application> command lines
-via the <option>-classpath</option> option.
-The individual directory names will be
-separated by the operating system's path separate character
-(<filename>:</filename> on UNIX/Linux/POSIX,
-<filename>;</filename> on Windows).
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Specifies the list of directories that
+                will be searched for Java
+                <filename>.class</filename>
+                file.
+                The directories in this list will be added to the
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> and <application xmlns="http://www.scons.org/dbxsd/v1.0">javah</application> command lines
+                via the <option>-classpath</option> option.
+                The individual directory names will be
+                separated by the operating system's path separate character
+                (<filename>:</filename> on UNIX/Linux/POSIX,
+                <filename>;</filename>
+                on Windows).
+            </para>
 
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Note that this currently just adds the specified
-directory via the <option>-classpath</option> option.
-<application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> does not currently search the
-<envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVACLASSPATH</envar> directories for dependency
-<filename>.class</filename> files.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Note that this currently just adds the specified
+                directory via the <option>-classpath</option> option.
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> does not currently search the
+                <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVACLASSPATH</envar> directories for dependency
+                <filename>.class</filename>
+                files.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVACLASSSUFFIX">
     <term>JAVACLASSSUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The suffix for Java class files;
-<filename>.class</filename>
-by default.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The suffix for Java class files;
+                <filename>.class</filename>
+                by default.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVAH">
     <term>JAVAH</term>
@@ -3413,65 +3417,77 @@ for Java classes.
 </para>
 </listitem>
   </varlistentry>
+  <varlistentry id="cv-JAVAINCLUDES">
+    <term>JAVAINCLUDES</term>
+    <listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Include path for Java header files (such as jni.h)
+            </para>
+        </listitem>
+  </varlistentry>
   <varlistentry id="cv-JAVASOURCEPATH">
     <term>JAVASOURCEPATH</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Specifies the list of directories that
-will be searched for input
-<filename>.java</filename> file.
-The directories in this list will be added to the
-<application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> command line
-via the <option>-sourcepath</option> option.
-The individual directory names will be
-separated by the operating system's path separate character
-(<filename>:</filename> on UNIX/Linux/POSIX,
-<filename>;</filename> on Windows).
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Specifies the list of directories that
+                will be searched for input
+                <filename>.java</filename>
+                file.
+                The directories in this list will be added to the
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> command line
+                via the <option>-sourcepath</option> option.
+                The individual directory names will be
+                separated by the operating system's path separate character
+                (<filename>:</filename> on UNIX/Linux/POSIX,
+                <filename>;</filename>
+                on Windows).
+            </para>
 
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Note that this currently just adds the specified
-directory via the <option>-sourcepath</option> option.
-<application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> does not currently search the
-<envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVASOURCEPATH</envar> directories for dependency
-<filename>.java</filename> files.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Note that this currently just adds the specified
+                directory via the <option>-sourcepath</option> option.
+                <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> does not currently search the
+                <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVASOURCEPATH</envar> directories for dependency
+                <filename>.java</filename>
+                files.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVASUFFIX">
     <term>JAVASUFFIX</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The suffix for Java files;
-<filename>.java</filename>
-by default.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                The suffix for Java files;
+                <filename>.java</filename>
+                by default.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-JAVAVERSION">
     <term>JAVAVERSION</term>
     <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Specifies the Java version being used by the <function xmlns="http://www.scons.org/dbxsd/v1.0">Java</function> builder.
-This is <emphasis>not</emphasis> currently used to select one
-version of the Java compiler vs. another.
-Instead, you should set this to specify the version of Java
-supported by your <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
-The default is <literal>1.4</literal>.
-</para>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                Specifies the Java version being used by the <function xmlns="http://www.scons.org/dbxsd/v1.0">Java</function> builder.
+                This is <emphasis>not</emphasis> currently used to select one
+                version of the Java compiler vs. another.
+                Instead, you should set this to specify the version of Java
+                supported by your <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
+                The default is <literal>1.4</literal>.
+            </para>
 
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-This is sometimes necessary because
-Java 1.5 changed the file names that are created
-for nested anonymous inner classes,
-which can cause a mismatch with the files
-that <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> expects will be generated by the <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
-Setting <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVAVERSION</envar> to <literal>1.5</literal>
-(or <literal>1.6</literal>, as appropriate)
-can make <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> realize that a Java 1.5 or 1.6
-build is actually up to date.
-</para>
-</listitem>
+            <para xmlns="http://www.scons.org/dbxsd/v1.0">
+                This is sometimes necessary because
+                Java 1.5 changed the file names that are created
+                for nested anonymous inner classes,
+                which can cause a mismatch with the files
+                that <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> expects will be generated by the <application xmlns="http://www.scons.org/dbxsd/v1.0">javac</application> compiler.
+                Setting <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JAVAVERSION</envar> to
+                <literal>1.5</literal>
+                (or <literal>1.6</literal>, as appropriate)
+                can make <application xmlns="http://www.scons.org/dbxsd/v1.0">SCons</application> realize that a Java 1.5 or 1.6
+                build is actually up to date.
+            </para>
+        </listitem>
   </varlistentry>
   <varlistentry id="cv-LATEX">
     <term>LATEX</term>
@@ -6615,16 +6631,6 @@ 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>
@@ -6638,6 +6644,16 @@ 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>
diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod
index 52ee4e1..9106e94 100644
--- a/doc/generated/variables.mod
+++ b/doc/generated/variables.mod
@@ -232,6 +232,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-JAVAHCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAHCOM</envar>">
 <!ENTITY cv-JAVAHCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAHCOMSTR</envar>">
 <!ENTITY cv-JAVAHFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAHFLAGS</envar>">
+<!ENTITY cv-JAVAINCLUDES "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAINCLUDES</envar>">
 <!ENTITY cv-JAVASOURCEPATH "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVASOURCEPATH</envar>">
 <!ENTITY cv-JAVASUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVASUFFIX</envar>">
 <!ENTITY cv-JAVAVERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$JAVAVERSION</envar>">
@@ -496,8 +497,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-_SHLIBSONAME "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_SHLIBSONAME</envar>">
 <!ENTITY cv-SHLIBSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBSUFFIX</envar>">
 <!ENTITY cv-SHLIBVERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBVERSION</envar>">
-<!ENTITY cv-SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBVERSIONFLAGS</envar>">
 <!ENTITY cv-_SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_SHLIBVERSIONFLAGS</envar>">
+<!ENTITY cv-SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBVERSIONFLAGS</envar>">
 <!ENTITY cv-SHLINK "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLINK</envar>">
 <!ENTITY cv-SHLINKCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLINKCOM</envar>">
 <!ENTITY cv-SHLINKCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLINKCOMSTR</envar>">
@@ -862,6 +863,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-JAVAHCOM "<link linkend='cv-JAVAHCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAHCOM</envar></link>">
 <!ENTITY cv-link-JAVAHCOMSTR "<link linkend='cv-JAVAHCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAHCOMSTR</envar></link>">
 <!ENTITY cv-link-JAVAHFLAGS "<link linkend='cv-JAVAHFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAHFLAGS</envar></link>">
+<!ENTITY cv-link-JAVAINCLUDES "<link linkend='cv-JAVAINCLUDES' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAINCLUDES</envar></link>">
 <!ENTITY cv-link-JAVASOURCEPATH "<link linkend='cv-JAVASOURCEPATH' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVASOURCEPATH</envar></link>">
 <!ENTITY cv-link-JAVASUFFIX "<link linkend='cv-JAVASUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVASUFFIX</envar></link>">
 <!ENTITY cv-link-JAVAVERSION "<link linkend='cv-JAVAVERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$JAVAVERSION</envar></link>">
@@ -1126,8 +1128,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY cv-link-_SHLIBSONAME "<link linkend='cv-_SHLIBSONAME' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_SHLIBSONAME</envar></link>">
 <!ENTITY cv-link-SHLIBSUFFIX "<link linkend='cv-SHLIBSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBSUFFIX</envar></link>">
 <!ENTITY cv-link-SHLIBVERSION "<link linkend='cv-SHLIBVERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBVERSION</envar></link>">
-<!ENTITY cv-link-SHLIBVERSIONFLAGS "<link linkend='cv-SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBVERSIONFLAGS</envar></link>">
 <!ENTITY cv-link-_SHLIBVERSIONFLAGS "<link linkend='cv-_SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_SHLIBVERSIONFLAGS</envar></link>">
+<!ENTITY cv-link-SHLIBVERSIONFLAGS "<link linkend='cv-SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBVERSIONFLAGS</envar></link>">
 <!ENTITY cv-link-SHLINK "<link linkend='cv-SHLINK' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLINK</envar></link>">
 <!ENTITY cv-link-SHLINKCOM "<link linkend='cv-SHLINKCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLINKCOM</envar></link>">
 <!ENTITY cv-link-SHLINKCOMSTR "<link linkend='cv-SHLINKCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLINKCOMSTR</envar></link>">