rebuilt docs

1 files changed, 69 insertions, 76 deletions

diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml
index 3d48b2a..148922e 100644
--- a/doc/user/command-line.xml
+++ b/doc/user/command-line.xml
@@ -150,14 +150,14 @@
 
       <screen>
         % <userinput>scons</userinput>
-        [?1034hscons: Reading SConscript files ...
+        scons: Reading SConscript files ...
         scons: done reading SConscript files.
         scons: Building targets ...
             ... [build output] ...
         scons: done building targets.
         % <userinput>export SCONSFLAGS="-Q"</userinput>
         % <userinput>scons</userinput>
-        [?1034h    ... [build output] ...
+            ... [build output] ...
       </screen>
 
       <para>
@@ -309,7 +309,7 @@
 
       <screen>
         % <userinput>scons -Q</userinput>
-        [?1034hrunning with -j 2
+        running with -j 2
         scons: `.' is up to date.
       </screen>
 
@@ -324,7 +324,7 @@
       <screen>
         % <userinput>export NUM_CPU="4"</userinput>
         % <userinput>scons -Q</userinput>
-        [?1034hrunning with -j 4
+        running with -j 4
         scons: `.' is up to date.
       </screen>
 
@@ -341,11 +341,11 @@
 
       <screen>
         % <userinput>scons -Q -j 7</userinput>
-        [?1034hrunning with -j 7
+        running with -j 7
         scons: `.' is up to date.
         % <userinput>export NUM_CPU="4"</userinput>
         % <userinput>scons -Q -j 3</userinput>
-        [?1034hrunning with -j 3
+        running with -j 3
         scons: `.' is up to date.
       </screen>
 
@@ -630,7 +630,7 @@
 
       <screen>
         % <userinput>scons -Q -n</userinput>
-        [?1034hInstall file: "foo.in" as "/usr/bin/foo.in"
+        Install file: "foo.in" as "/usr/bin/foo.in"
       </screen>
 
       <para>
@@ -643,7 +643,7 @@
 
       <screen>
         % <userinput>scons -Q -n --prefix=/tmp/install</userinput>
-        [?1034hInstall file: "foo.in" as "/tmp/install/usr/bin/foo.in"
+        Install file: "foo.in" as "/tmp/install/usr/bin/foo.in"
       </screen>
 
     </section>
@@ -718,14 +718,15 @@
 
     <screen>
        % <userinput>scons -Q debug=0</userinput>
-       [?1034hcc -o prog.o -c prog.c
+       cc -o prog.o -c prog.c
        cc -o prog prog.o
        % <userinput>scons -Q debug=0</userinput>
-       [?1034hscons: `.' is up to date.
+       scons: `.' is up to date.
        % <userinput>scons -Q debug=1</userinput>
-       [?1034hscons: `.' is up to date.
+       cc -o prog.o -c -g prog.c
+       cc -o prog prog.o
        % <userinput>scons -Q debug=1</userinput>
-       [?1034hscons: `.' is up to date.
+       scons: `.' is up to date.
     </screen>
 
     <para>
@@ -805,9 +806,9 @@
 
     <screen>
        % <userinput>scons -Q define=FOO</userinput>
-       [?1034hcc -o prog.o -c -DFOO prog.c
+       cc -o prog.o -c -DFOO prog.c
        % <userinput>scons -Q define=FOO define=BAR</userinput>
-       [?1034hscons: `.' is up to date.
+       cc -o prog.o -c -DFOO -DBAR prog.c
     </screen>
 
     <para>
@@ -908,7 +909,7 @@
 
       <screen>
         % <userinput>scons -Q RELEASE=1</userinput>
-        [?1034hcc -o bar.o -c -DRELEASE_BUILD=1 bar.c
+        cc -o bar.o -c -DRELEASE_BUILD=1 bar.c
         cc -o foo.o -c -DRELEASE_BUILD=1 foo.c
         cc -o foo foo.o bar.o
       </screen>
@@ -971,7 +972,7 @@
 
       <screen>
         % <userinput>scons -Q -h</userinput>
-        [?1034h
+        
         RELEASE: Set to 1 to build for release
             default: 0
             actual: 0
@@ -1036,7 +1037,7 @@
 
       <screen>
         % <userinput>scons -Q</userinput>
-        [?1034hcc -o bar.o -c -DRELEASE_BUILD=1 bar.c
+        cc -o bar.o -c -DRELEASE_BUILD=1 bar.c
         cc -o foo.o -c -DRELEASE_BUILD=1 foo.c
         cc -o foo foo.o bar.o
       </screen>
@@ -1060,7 +1061,7 @@
 
       <screen>
         % <userinput>scons -Q</userinput>
-        [?1034hcc -o bar.o -c -DRELEASE_BUILD=0 bar.c
+        cc -o bar.o -c -DRELEASE_BUILD=0 bar.c
         cc -o foo.o -c -DRELEASE_BUILD=0 foo.c
         cc -o foo foo.o bar.o
       </screen>
@@ -1126,12 +1127,12 @@
 
         <screen>
           % <userinput>scons -Q RELEASE=yes foo.o</userinput>
-          [?1034hcc -o foo.o -c -DRELEASE_BUILD=True foo.c
+          cc -o foo.o -c -DRELEASE_BUILD=True foo.c
         </screen>
 
         <screen>
           % <userinput>scons -Q RELEASE=t foo.o</userinput>
-          [?1034hcc -o foo.o -c -DRELEASE_BUILD=True foo.c
+          cc -o foo.o -c -DRELEASE_BUILD=True foo.c
         </screen>
 
         <para>
@@ -1157,12 +1158,12 @@
 
         <screen>
           % <userinput>scons -Q RELEASE=no foo.o</userinput>
-          [?1034hcc -o foo.o -c -DRELEASE_BUILD=False foo.c
+          cc -o foo.o -c -DRELEASE_BUILD=False foo.c
         </screen>
 
         <screen>
           % <userinput>scons -Q RELEASE=f foo.o</userinput>
-          [?1034hcc -o foo.o -c -DRELEASE_BUILD=False foo.c
+          cc -o foo.o -c -DRELEASE_BUILD=False foo.c
         </screen>
 
         <para>
@@ -1189,8 +1190,7 @@
           
           scons: *** Error converting option: RELEASE
           Invalid value for boolean option: bad_value
-          File "p:\cyghome\bdeegan\scons\trunk\bootstrap\src\engine\SCons\Variables\__init__.py", line 214, in Update
-          [?1034h
+          File "/home/my/project/SConstruct", line 4, in &lt;module&gt;
         </screen>
 
       </section>
@@ -1233,11 +1233,11 @@
 
         <screen>
           % <userinput>scons -Q COLOR=red foo.o</userinput>
-          [?1034hcc -o foo.o -c -DCOLOR="red" foo.c
+          cc -o foo.o -c -DCOLOR="red" foo.c
           % <userinput>scons -Q COLOR=blue foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DCOLOR="blue" foo.c
           % <userinput>scons -Q COLOR=green foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DCOLOR="green" foo.c
         </screen>
 
         <para>
@@ -1253,8 +1253,7 @@
           % <userinput>scons -Q COLOR=magenta foo.o</userinput>
           
           scons: *** Invalid value for option COLOR: magenta
-          File "p:\cyghome\bdeegan\scons\trunk\bootstrap\src\engine\SCons\Variables\EnumVariable.py", line 51, in _validator
-          [?1034h
+          File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
         </screen>
 
         <para>
@@ -1293,7 +1292,7 @@
 
         <screen>
           % <userinput>scons -Q COLOR=navy foo.o</userinput>
-          [?1034hcc -o foo.o -c -DCOLOR="blue" foo.c
+          cc -o foo.o -c -DCOLOR="blue" foo.c
         </screen>
 
         <para>
@@ -1310,18 +1309,15 @@
           % <userinput>scons -Q COLOR=Red foo.o</userinput>
           
           scons: *** Invalid value for option COLOR: Red
-          File "p:\cyghome\bdeegan\scons\trunk\bootstrap\src\engine\SCons\Variables\EnumVariable.py", line 51, in _validator
-          [?1034h
+          File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
           % <userinput>scons -Q COLOR=BLUE foo.o</userinput>
           
           scons: *** Invalid value for option COLOR: BLUE
-          File "p:\cyghome\bdeegan\scons\trunk\bootstrap\src\engine\SCons\Variables\EnumVariable.py", line 51, in _validator
-          [?1034h
+          File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
           % <userinput>scons -Q COLOR=nAvY foo.o</userinput>
           
           scons: *** Invalid value for option COLOR: nAvY
-          File "p:\cyghome\bdeegan\scons\trunk\bootstrap\src\engine\SCons\Variables\EnumVariable.py", line 51, in _validator
-          [?1034h
+          File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
         </screen>
 
         <para>
@@ -1353,13 +1349,13 @@
 
         <screen>
           % <userinput>scons -Q COLOR=Red foo.o</userinput>
-          [?1034hcc -o foo.o -c -DCOLOR="Red" foo.c
+          cc -o foo.o -c -DCOLOR="Red" foo.c
           % <userinput>scons -Q COLOR=BLUE foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DCOLOR="BLUE" foo.c
           % <userinput>scons -Q COLOR=nAvY foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DCOLOR="blue" foo.c
           % <userinput>scons -Q COLOR=green foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DCOLOR="green" foo.c
         </screen>
 
         <para>
@@ -1397,11 +1393,11 @@
 
         <screen>
           % <userinput>scons -Q COLOR=Red foo.o</userinput>
-          [?1034hcc -o foo.o -c -DCOLOR="red" foo.c
+          cc -o foo.o -c -DCOLOR="red" foo.c
           % <userinput>scons -Q COLOR=nAvY foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DCOLOR="blue" foo.c
           % <userinput>scons -Q COLOR=GREEN foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DCOLOR="green" foo.c
         </screen>
 
       </section>
@@ -1440,9 +1436,9 @@
 
         <screen>
           % <userinput>scons -Q COLORS=red,blue foo.o</userinput>
-          [?1034hcc -o foo.o -c -DCOLORS="red blue" foo.c
+          cc -o foo.o -c -DCOLORS="red blue" foo.c
           % <userinput>scons -Q COLORS=blue,green,red foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DCOLORS="blue green red" foo.c
         </screen>
 
         <para>
@@ -1457,9 +1453,9 @@
 
         <screen>
           % <userinput>scons -Q COLORS=all foo.o</userinput>
-          [?1034hcc -o foo.o -c -DCOLORS="red green blue" foo.c
+          cc -o foo.o -c -DCOLORS="red green blue" foo.c
           % <userinput>scons -Q COLORS=none foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DCOLORS="" foo.c
         </screen>
 
         <para>
@@ -1474,8 +1470,7 @@
           
           scons: *** Error converting option: COLORS
           Invalid value(s) for option: magenta
-          File "p:\cyghome\bdeegan\scons\trunk\bootstrap\src\engine\SCons\Variables\__init__.py", line 214, in Update
-          [?1034h
+          File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
         </screen>
 
       </section>
@@ -1515,9 +1510,9 @@
 
         <screen>
           % <userinput>scons -Q foo.o</userinput>
-          [?1034hcc -o foo.o -c -DCONFIG_FILE="/etc/my_config" foo.c
+          cc -o foo.o -c -DCONFIG_FILE="/etc/my_config" foo.c
           % <userinput>scons -Q CONFIG=/usr/local/etc/other_config foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          scons: `foo.o' is up to date.
         </screen>
 
         <para>
@@ -1532,8 +1527,7 @@
           % <userinput>scons -Q CONFIG=/does/not/exist foo.o</userinput>
           
           scons: *** Path for option CONFIG does not exist: /does/not/exist
-          File "p:\cyghome\bdeegan\scons\trunk\bootstrap\src\engine\SCons\Variables\PathVariable.py", line 117, in PathExists
-          [?1034h
+          File "/home/my/project/SConstruct", line 6, in &lt;module&gt;
         </screen>
 
         <para>
@@ -1661,13 +1655,13 @@
 
         <screen>
           % <userinput>scons -Q foo.o</userinput>
-          [?1034hcc -o foo.o -c -DPACKAGE="/opt/location" foo.c
+          cc -o foo.o -c -DPACKAGE="/opt/location" foo.c
           % <userinput>scons -Q PACKAGE=/usr/local/location foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DPACKAGE="/usr/local/location" foo.c
           % <userinput>scons -Q PACKAGE=yes foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DPACKAGE="True" foo.c
           % <userinput>scons -Q PACKAGE=no foo.o</userinput>
-          [?1034hscons: `foo.o' is up to date.
+          cc -o foo.o -c -DPACKAGE="False" foo.c
         </screen>
 
       </section>
@@ -1787,7 +1781,7 @@
 
       <screen>
         % <userinput>scons -Q NOT_KNOWN=foo</userinput>
-        [?1034hUnknown variables: ['NOT_KNOWN']
+        Unknown variables: ['NOT_KNOWN']
       </screen>
 
       <para>
@@ -1855,10 +1849,10 @@
 
       <screen>
         % <userinput>scons -Q</userinput>
-        [?1034hcc -o foo.o -c foo.c
+        cc -o foo.o -c foo.c
         cc -o foo foo.o
         % <userinput>scons -Q bar</userinput>
-        [?1034hDon't forget to copy `bar' to the archive!
+        Don't forget to copy `bar' to the archive!
         cc -o bar.o -c bar.c
         cc -o bar bar.o
       </screen>
@@ -1914,12 +1908,12 @@
 
       <screen>
          % <userinput>scons -Q</userinput>
-         [?1034hcc -o hello.o -c hello.c
+         cc -o hello.o -c hello.c
          cc -o hello hello.o
          % <userinput>scons -Q</userinput>
-         [?1034hscons: `hello' is up to date.
+         scons: `hello' is up to date.
          % <userinput>scons -Q goodbye</userinput>
-         [?1034hcc -o goodbye.o -c goodbye.c
+         cc -o goodbye.o -c goodbye.c
          cc -o goodbye goodbye.o
       </screen>
 
@@ -1936,7 +1930,7 @@
 
       <screen>
          % <userinput>scons -Q .</userinput>
-         [?1034hcc -o goodbye.o -c goodbye.c
+         cc -o goodbye.o -c goodbye.c
          cc -o goodbye goodbye.o
          cc -o hello.o -c hello.c
          cc -o hello hello.o
@@ -1988,12 +1982,12 @@
 
       <screen>
          % <userinput>scons -Q</userinput>
-         [?1034hcc -o prog1.o -c prog1.c
+         cc -o prog1.o -c prog1.c
          cc -o prog1 prog1.o
          cc -o prog3.o -c prog3.c
          cc -o prog3 prog3.o
          % <userinput>scons -Q .</userinput>
-         [?1034hcc -o prog2.o -c prog2.c
+         cc -o prog2.o -c prog2.c
          cc -o prog2 prog2.o
       </screen>
 
@@ -2020,13 +2014,13 @@
 
       <screen>
          % <userinput>scons -Q</userinput>
-         [?1034hcc -o prog1/foo.o -c prog1/foo.c
+         cc -o prog1/foo.o -c prog1/foo.c
          cc -o prog1/main.o -c prog1/main.c
          cc -o prog1/main prog1/main.o prog1/foo.o
          % <userinput>scons -Q</userinput>
-         [?1034hscons: `prog1' is up to date.
+         scons: `prog1' is up to date.
          % <userinput>scons -Q .</userinput>
-         [?1034hcc -o prog2/bar.o -c prog2/bar.c
+         cc -o prog2/bar.o -c prog2/bar.c
          cc -o prog2/main.o -c prog2/main.c
          cc -o prog2/main prog2/main.o prog2/bar.o
       </screen>
@@ -2056,9 +2050,8 @@
       <screen>
          % <userinput>scons -Q</userinput>
          scons: *** No targets specified and no Default() targets found.  Stop.
-         [?1034h
          % <userinput>scons -Q .</userinput>
-         [?1034hcc -o prog1.o -c prog1.c
+         cc -o prog1.o -c prog1.c
          cc -o prog1 prog1.o
          cc -o prog2.o -c prog2.c
          cc -o prog2 prog2.o
@@ -2101,7 +2094,7 @@
 
         <screen>
            % <userinput>scons</userinput>
-           [?1034hscons: Reading SConscript files ...
+           scons: Reading SConscript files ...
            DEFAULT_TARGETS is ['prog1']
            scons: done reading SConscript files.
            scons: Building targets ...
@@ -2136,7 +2129,7 @@
 
         <screen>
            % <userinput>scons</userinput>
-           [?1034hscons: Reading SConscript files ...
+           scons: Reading SConscript files ...
            DEFAULT_TARGETS is now ['prog1']
            DEFAULT_TARGETS is now ['prog1', 'prog2']
            scons: done reading SConscript files.
@@ -2231,15 +2224,15 @@
 
       <screen>
         % <userinput>scons -Q</userinput>
-        [?1034hBUILD_TARGETS is ['prog1']
+        BUILD_TARGETS is ['prog1']
         cc -o prog1.o -c prog1.c
         cc -o prog1 prog1.o
         % <userinput>scons -Q prog2</userinput>
-        [?1034hBUILD_TARGETS is ['prog2']
+        BUILD_TARGETS is ['prog2']
         cc -o prog2.o -c prog2.c
         cc -o prog2 prog2.o
         % <userinput>scons -Q -c .</userinput>
-        [?1034hBUILD_TARGETS is ['.']
+        BUILD_TARGETS is ['.']
         Removed prog1.o
         Removed prog1
         Removed prog2.o