Accumulated documentation changes.

1 files changed, 20 insertions, 20 deletions

diff --git a/doc/user/simple.in b/doc/user/simple.in
index 4ac6d33..57fdd3a 100644
--- a/doc/user/simple.in
+++ b/doc/user/simple.in
@@ -77,7 +77,7 @@
    and the input file from
    which you want it built
    (the <filename>hello.c</filename> file).
-   &Program; is a &builder_method;,
+   &b-link-Program; is a <firstterm>builder_method</firstterm>,
    a Python call that tells &SCons; that you want to build an
    executable program.
 
@@ -92,7 +92,7 @@
    </para>
 
    <scons_output example="ex1" os="posix">
-      <command>scons</command>
+      <scons_output_command>scons</scons_output_command>
    </scons_output>
 
    <para>
@@ -103,7 +103,7 @@
    </para>
 
    <scons_output example="ex1" os="win32">
-      <command>scons</command>
+      <scons_output_command>scons</scons_output_command>
    </scons_output>
 
    <para>
@@ -147,10 +147,10 @@
 
    <para>
 
-   The &Program; builder method is only one of
+   The &b-link-Program; builder method is only one of
    many builder methods that &SCons; provides
    to build different types of files.
-   Another is the &Object; builder method,
+   Another is the &b-link-Object; builder method,
    which tells &SCons; to build an object file
    from the specified source file:
 
@@ -173,7 +173,7 @@
    </para>
 
    <scons_output example="Object" os="posix">
-      <command>scons</command>
+      <scons_output_command>scons</scons_output_command>
    </scons_output>
 
    <para>
@@ -184,7 +184,7 @@
    </para>
 
    <scons_output example="Object" os="win32">
-      <command>scons</command>
+      <scons_output_command>scons</scons_output_command>
    </scons_output>
 
  </section>
@@ -195,8 +195,8 @@
    <para>
 
    &SCons; also makes building with Java extremely easy.
-   Unlike the &Program; and &Object; builder methods,
-   however, the &Java; builder method
+   Unlike the &b-link-Program; and &b-link-Object; builder methods,
+   however, the &b-link-Java; builder method
    requires that you specify
    the name of a destination directory in which
    you want the class files placed,
@@ -231,7 +231,7 @@
    </para>
 
    <scons_output example="java" os="posix">
-      <command>scons</command>
+      <scons_output_command>scons</scons_output_command>
    </scons_output>
 
    <para>
@@ -272,8 +272,8 @@
    </scons_example>
 
    <scons_output example="clean" os="posix">
-      <command>scons</command>
-      <command>scons -c</command>
+      <scons_output_command>scons</scons_output_command>
+      <scons_output_command>scons -c</scons_output_command>
    </scons_output>
 
    <para>
@@ -283,8 +283,8 @@
    </para>
 
    <scons_output example="clean" os="win32">
-      <command>scons</command>
-      <command>scons -c</command>
+      <scons_output_command>scons</scons_output_command>
+      <scons_output_command>scons -c</scons_output_command>
    </scons_output>
 
    <para>
@@ -378,7 +378,7 @@
      which to do things.
      </para>
      </footnote>
-     In other words, when you call the &Program; builder
+     In other words, when you call the &b-link-Program; builder
      (or any other builder method),
      you're not telling &SCons; to build
      the program at the instant the builder method is called.
@@ -396,7 +396,7 @@
      <para>
 
      &SCons; reflects this distinction between
-     <emphasis>calling a builder method like</emphasis> &Program;>
+     <emphasis>calling a builder method like</emphasis> &b-Program;>
      and <emphasis>actually building the program</emphasis>
      by printing the status messages that indicate
      when it's "just reading" the &SConstruct; file,
@@ -415,7 +415,7 @@
      Python has a <literal>print</literal> statement that
      prints a string of characters to the screen.
      If we put <literal>print</literal> statements around
-     our calls to the &Program; builder method:
+     our calls to the &b-Program; builder method:
 
      </para>
 
@@ -447,7 +447,7 @@
      </para>
 
      <scons_output example="declarative" os="posix">
-       <command>scons</command>
+       <scons_output_command>scons</scons_output_command>
      </scons_output>
 
      <para>
@@ -475,7 +475,7 @@
    </para>
 
    <scons_output example="ex1" os="win32">
-      <command>scons</command>
+      <scons_output_command>scons</scons_output_command>
    </scons_output>
 
    <para>
@@ -501,7 +501,7 @@
    </para>
 
    <scons_output example="ex1" os="win32">
-      <command>scons -Q</command>
+      <scons_output_command>scons -Q</scons_output_command>
    </scons_output>
 
    <para>