Accumulated documentation changes.

1 files changed, 33 insertions, 33 deletions

diff --git a/doc/user/java.in b/doc/user/java.in
index 66b9c86..9768dab 100644
--- a/doc/user/java.in
+++ b/doc/user/java.in
@@ -38,7 +38,7 @@
   </para>
 
   <section>
-  <title>Building Java Class Files:  the &Java; Builder</title>
+  <title>Building Java Class Files:  the &b-Java; Builder</title>
 
     <para>
 
@@ -49,7 +49,7 @@
     to turn them into one or more
     <filename>.class</filename> files.
     In &SCons;, you do this
-    by giving the &Java; Builder
+    by giving the &b-link-Java; Builder
     a target directory in which
     to put the <filename>.class</filename> files,
     and a source directory that contains
@@ -99,7 +99,7 @@
     </para>
 
     <scons_output example="java">
-      <command>scons -Q</command>
+      <scons_output_command>scons -Q</scons_output_command>
     </scons_output>
 
     <para>
@@ -191,8 +191,8 @@
     </para>
 
     <scons_output example="java-classes">
-      <command>scons -Q</command>
-      <command>scons -Q classes</command>
+      <scons_output_command>scons -Q</scons_output_command>
+      <scons_output_command>scons -Q classes</scons_output_command>
     </scons_output>
 
     <para>
@@ -215,25 +215,25 @@
     </para>
 
     <scons_output example="java-classes">
-      <command>scons -Q</command>
-      <command>scons -Q -c classes</command>
+      <scons_output_command>scons -Q</scons_output_command>
+      <scons_output_command>scons -Q -c classes</scons_output_command>
     </scons_output>
 
   </section>
 
   <section>
-  <title>Building Java Archive (<filename>.jar</filename>) Files:  the &Jar; Builder</title>
+  <title>Building Java Archive (<filename>.jar</filename>) Files:  the &b-Jar; Builder</title>
 
     <para>
 
     After building the class files,
     it's common to collect them into
     a Java archive (<filename>.jar</filename>) file,
-    which you do by calling the &Jar; Builder method.
+    which you do by calling the &b-link-Jar; Builder method.
     If you want to just collect all of the
     class files within a subdirectory,
     you can just specify that subdirectory
-    as the &Jar; source:
+    as the &b-Jar; source:
 
     </para>
 
@@ -281,7 +281,7 @@
     </para>
 
     <scons_output example="jar1">
-      <command>scons -Q</command>
+      <scons_output_command>scons -Q</scons_output_command>
     </scons_output>
 
     <para>
@@ -291,13 +291,13 @@
     for multiple programs in one location,
     and only archive some of them in
     each <filename>.jar</filename> file,
-    you can pass the &Jar; builder a
+    you can pass the &b-Jar; builder a
     list of files as its source.
     It's extremely simple to create multiple
     <filename>.jar</filename> files this way,
     using the lists of target class files created
-    by calls to the &Java; builder
-    as sources to the various &Jar; calls:
+    by calls to the &b-link-Java; builder
+    as sources to the various &b-Jar; calls:
 
     </para>
 
@@ -357,19 +357,19 @@
     </para>
 
     <scons_output example="jar2">
-      <command>scons -Q</command>
+      <scons_output_command>scons -Q</scons_output_command>
     </scons_output>
 
   </section>
 
   <section>
-  <title>Building C Header and Stub Files:  the &JavaH; Builder</title>
+  <title>Building C Header and Stub Files:  the &b-JavaH; Builder</title>
 
     <para>
 
     You can generate C header and source files
     for implementing native methods,
-    by using the &JavaH; Builder.
+    by using the &b-link-JavaH; Builder.
     There are several ways of using the &JavaH Builder.
     One typical invocation might look like:
 
@@ -412,7 +412,7 @@
     <para>
 
     The source is a list of class files generated by the
-    call to the &Java; Builder,
+    call to the &b-link-Java; Builder,
     and the target is the output directory in
     which we want the C header files placed.
     The target
@@ -422,7 +422,7 @@
     </para>
 
     <scons_output example="javah">
-      <command>scons -Q</command>
+      <scons_output_command>scons -Q</scons_output_command>
     </scons_output>
 
     <para>
@@ -447,15 +447,15 @@
 
     Although it's more convenient to use
     the list of class files returned by
-    the &Java; Builder
-    as the source of a call to the &JavaH; Builder,
+    the &b-Java; Builder
+    as the source of a call to the &b-JavaH; Builder,
     you <emphasis>can</emphasis>
     specify the list of class files
     by hand, if you prefer.
     If you do,
     you need to set the
-    &JAVACLASSDIR; construction variable
-    when calling &JavaH;:
+    &cv-link-JAVACLASSDIR; construction variable
+    when calling &b-JavaH;:
 
     </para>
 
@@ -498,14 +498,14 @@
 
     <para>
 
-    The &JAVACLASSDIR; value then
+    The &cv-JAVACLASSDIR; value then
     gets converted into the <option>-classpath</option>
     when &SCons; runs &javah;:
 
     </para>
 
     <scons_output example="JAVACLASSDIR">
-      <command>scons -Q</command>
+      <scons_output_command>scons -Q</scons_output_command>
     </scons_output>
 
     <para>
@@ -513,7 +513,7 @@
     Lastly, if you don't want a separate header file
     generated for each source file,
     you can specify an explicit File Node
-    as the target of the &JavaH; Builder:
+    as the target of the &b-JavaH; Builder:
 
     </para>
 
@@ -554,7 +554,7 @@
     <para>
 
     Because &SCons; assumes by default
-    that the target of the &JavaH; builder is a directory,
+    that the target of the &b-JavaH; builder is a directory,
     you need to use the &File; function
     to make sure that &SCons; doesn't
     create a directory named <filename>native.h</filename>.
@@ -565,20 +565,20 @@
     </para>
 
     <scons_output example="javah_file">
-      <command>scons -Q</command>
+      <scons_output_command>scons -Q</scons_output_command>
     </scons_output>
 
   </section>
 
   <section>
-  <title>Building RMI Stub and Skeleton Class Files:  the &RMIC; Builder</title>
+  <title>Building RMI Stub and Skeleton Class Files:  the &b-RMIC; Builder</title>
 
     <para>
 
     You can generate Remote Method Invocation stubs
-    by using the &RMIC; Builder.
+    by using the &b-link-RMIC; Builder.
     The source is a list of directories,
-    typically returned by a call to the &Java; Builder,
+    typically returned by a call to the &b-link-Java; Builder,
     and the target is an output directory
     where the <filename>_Stub.class</filename>
     and <filename>_Skel.class</filename> files will
@@ -613,7 +613,7 @@
 
     <para>
 
-    As it did with the &JavaH; Builder,
+    As it did with the &b-link-JavaH; Builder,
     &SCons; remembers the class directory
     and passes it as the <option>-classpath</option> option
     to &rmic:
@@ -621,7 +621,7 @@
     </para>
 
     <scons_output example="RMIC">
-      <command>scons -Q</command>
+      <scons_output_command>scons -Q</scons_output_command>
     </scons_output>
 
     <para>