Fix XML in documentation, and in the bin/scons-doc.py script that generates

the User's Guide XML from the .in files' SGML.

10 files changed, 33 insertions, 33 deletions

diff --git a/doc/user/actions.in b/doc/user/actions.in
index c1e5616..d2a3dad 100644
--- a/doc/user/actions.in
+++ b/doc/user/actions.in
@@ -245,7 +245,7 @@ solutions to the above limitations.
   </para>
 
   <sconstruct>
-    b = Builder(action = 'build < $SOURCE > $TARGET')
+    b = Builder(action = 'build &lt; $SOURCE &gt; $TARGET')
   </sconstruct>
 
   <para>
@@ -255,7 +255,7 @@ solutions to the above limitations.
   </para>
 
   <sconstruct>
-    b = Builder(action = Action('build < $SOURCE > $TARGET'))
+    b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
   </sconstruct>
 
   <para>
diff --git a/doc/user/actions.xml b/doc/user/actions.xml
index 04178b0..ea76eb9 100644
--- a/doc/user/actions.xml
+++ b/doc/user/actions.xml
@@ -245,7 +245,7 @@ solutions to the above limitations.
   </para>
 
   <programlisting>
-    b = Builder(action = 'build < $SOURCE > $TARGET')
+    b = Builder(action = 'build &lt; $SOURCE &gt; $TARGET')
   </programlisting>
 
   <para>
@@ -255,7 +255,7 @@ solutions to the above limitations.
   </para>
 
   <programlisting>
-    b = Builder(action = Action('build < $SOURCE > $TARGET'))
+    b = Builder(action = Action('build &lt; $SOURCE &gt; $TARGET'))
   </programlisting>
 
   <para>
diff --git a/doc/user/builders-writing.in b/doc/user/builders-writing.in
index 2c5cce2..2410831 100644
--- a/doc/user/builders-writing.in
+++ b/doc/user/builders-writing.in
@@ -129,7 +129,7 @@ This functionality could be invoked as in the following example:
     </para>
 
     <programlisting>
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET')
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
     </programlisting>
 
     <para>
@@ -165,7 +165,7 @@ This functionality could be invoked as in the following example:
 
     <scons_example name="ex1">
        <file name="SConstruct">
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET')
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env = Environment(BUILDERS = {'Foo' : bld})
        import os
        env['ENV']['PATH'] = env['ENV']['PATH'] + os.pathsep + os.getcwd()
@@ -180,7 +180,7 @@ This functionality could be invoked as in the following example:
     </scons_example>
 
     <sconstruct>
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET')
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env = Environment(BUILDERS = {'Foo' : bld})
     </sconstruct>
 
@@ -276,7 +276,7 @@ This functionality could be invoked as in the following example:
        env = Environment()
        import os
        env['ENV']['PATH'] = env['ENV']['PATH'] + os.pathsep + os.getcwd()
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET')
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env.Append(BUILDERS = {'Foo' : bld})
        env.Foo('file.foo', 'file.input')
        env.Program('hello.c')
@@ -294,7 +294,7 @@ This functionality could be invoked as in the following example:
 
     <sconstruct>
        env = Environment()
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET')
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env.Append(BUILDERS = {'Foo' : bld})
        env.Foo('file.foo', 'file.input')
        env.Program('hello.c')
@@ -309,7 +309,7 @@ This functionality could be invoked as in the following example:
 
     <sconstruct>
        env = Environment()
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET')
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env['BUILDERS']['Foo'] = bld
        env.Foo('file.foo', 'file.input')
        env.Program('hello.c')
@@ -352,7 +352,7 @@ This functionality could be invoked as in the following example:
 
     <scons_example name="ex4">
        <file name="SConstruct">
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET',
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET',
                      suffix = '.foo',
                      src_suffix = '.input')
        env = Environment(BUILDERS = {'Foo' : bld})
@@ -373,7 +373,7 @@ This functionality could be invoked as in the following example:
     </scons_example>
 
     <sconstruct>
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET',
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET',
                      suffix = '.foo',
                      src_suffix = '.input')
        env = Environment(BUILDERS = {'Foo' : bld})
@@ -544,7 +544,7 @@ This functionality could be invoked as in the following example:
 
     <programlisting>
        def generate_actions(source, target, env, for_signature):
-           return 'foobuild < %s > %s' % (target[0], source[0])
+           return 'foobuild &lt; %s &gt; %s' % (target[0], source[0])
     </programlisting>
 
     <para>
@@ -647,7 +647,7 @@ This functionality could be invoked as in the following example:
     <scons_example name="ex6">
        <file name="SConstruct">
        def generate_actions(source, target, env, for_signature):
-           return 'foobuild < %s > %s' % (source[0], target[0])
+           return 'foobuild &lt; %s &gt; %s' % (source[0], target[0])
        bld = Builder(generator = generate_actions,
                      suffix = '.foo',
                      src_suffix = '.input')
@@ -666,7 +666,7 @@ This functionality could be invoked as in the following example:
 
     <sconstruct>
        def generate_actions(source, target, env, for_signature):
-           return 'foobuild < %s > %s' % (source[0], target[0])
+           return 'foobuild &lt; %s &gt; %s' % (source[0], target[0])
        bld = Builder(generator = generate_actions,
                      suffix = '.foo',
                      src_suffix = '.input')
@@ -790,7 +790,7 @@ This functionality could be invoked as in the following example:
     <scons_example name="MY_EMITTER">
 
       <file name="SConstruct" printme="1">
-        bld = Builder(action = 'my_command $SOURCES > $TARGET',
+        bld = Builder(action = 'my_command $SOURCES &gt; $TARGET',
                       suffix = '.foo',
                       src_suffix = '.input',
                       emitter = '$MY_EMITTER')
@@ -828,7 +828,7 @@ This functionality could be invoked as in the following example:
     </scons_example>
 
     <sconstruct>
-      bld = Builder(action = 'my_command $SOURCES > $TARGET',
+      bld = Builder(action = 'my_command $SOURCES &gt; $TARGET',
                     suffix = '.foo',
                     src_suffix = '.input',
                     emitter = '$MY_EMITTER')
@@ -934,8 +934,8 @@ This functionality could be invoked as in the following example:
       <file name="site_scons/site_init.py" printme=1>
         def TOOL_ADD_HEADER(env):
            """A Tool to add a header from $HEADER to the source file"""
-           add_header = Builder(action=['echo "$HEADER" > $TARGET',
-                                        'cat $SOURCE >> $TARGET'])
+           add_header = Builder(action=['echo "$HEADER" &gt; $TARGET',
+                                        'cat $SOURCE &gt;&gt; $TARGET'])
            env.Append(BUILDERS = {'AddHeader' : add_header})
            env['HEADER'] = '' # set default value
       </file>
diff --git a/doc/user/builders-writing.xml b/doc/user/builders-writing.xml
index 3932181..99dfc94 100644
--- a/doc/user/builders-writing.xml
+++ b/doc/user/builders-writing.xml
@@ -166,7 +166,7 @@ This functionality could be invoked as in the following example:
     
 
     <programlisting>
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET')
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env = Environment(BUILDERS = {'Foo' : bld})
     </programlisting>
 
@@ -251,7 +251,7 @@ This functionality could be invoked as in the following example:
 
     <programlisting>
        env = Environment()
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET')
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env.Append(BUILDERS = {'Foo' : bld})
        env.Foo('file.foo', 'file.input')
        env.Program('hello.c')
@@ -266,7 +266,7 @@ This functionality could be invoked as in the following example:
 
     <programlisting>
        env = Environment()
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET')
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env['BUILDERS']['Foo'] = bld
        env.Foo('file.foo', 'file.input')
        env.Program('hello.c')
@@ -313,7 +313,7 @@ This functionality could be invoked as in the following example:
     
 
     <programlisting>
-       bld = Builder(action = 'foobuild < $SOURCE > $TARGET',
+       bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET',
                      suffix = '.foo',
                      src_suffix = '.input')
        env = Environment(BUILDERS = {'Foo' : bld})
@@ -586,7 +586,7 @@ This functionality could be invoked as in the following example:
 
     <programlisting>
        def generate_actions(source, target, env, for_signature):
-           return 'foobuild < %s > %s' % (source[0], target[0])
+           return 'foobuild &lt; %s &gt; %s' % (source[0], target[0])
        bld = Builder(generator = generate_actions,
                      suffix = '.foo',
                      src_suffix = '.input')
@@ -708,7 +708,7 @@ This functionality could be invoked as in the following example:
     </programlisting>
 
     <programlisting>
-      bld = Builder(action = 'my_command $SOURCES > $TARGET',
+      bld = Builder(action = 'my_command $SOURCES &gt; $TARGET',
                     suffix = '.foo',
                     src_suffix = '.input',
                     emitter = '$MY_EMITTER')
diff --git a/doc/user/command-line.in b/doc/user/command-line.in
index 6834d2a..f26f2c7 100644
--- a/doc/user/command-line.in
+++ b/doc/user/command-line.in
@@ -1237,7 +1237,7 @@
         choices to a specific set of allowed colors.
         This can be set up quite easily
         using the &EnumVariable;,
-        which takes a list of &allowed_values
+        which takes a list of &allowed_values;
         in addition to the variable name,
         default value,
         and help text arguments:
@@ -2154,7 +2154,7 @@
 
         &SCons; supports a &DEFAULT_TARGETS; variable
         that lets you get at the current list of default targets.
-        The &DEFAULT_TARGETS variable has
+        The &DEFAULT_TARGETS; variable has
         two important differences from the &COMMAND_LINE_TARGETS; variable.
         First, the &DEFAULT_TARGETS; variable is a list of
         internal &SCons; nodes,
diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml
index 148922e..f5e70ad 100644
--- a/doc/user/command-line.xml
+++ b/doc/user/command-line.xml
@@ -1208,7 +1208,7 @@
         choices to a specific set of allowed colors.
         This can be set up quite easily
         using the &EnumVariable;,
-        which takes a list of &allowed_values
+        which takes a list of &allowed_values;
         in addition to the variable name,
         default value,
         and help text arguments:
@@ -2064,7 +2064,7 @@
 
         &SCons; supports a &DEFAULT_TARGETS; variable
         that lets you get at the current list of default targets.
-        The &DEFAULT_TARGETS variable has
+        The &DEFAULT_TARGETS; variable has
         two important differences from the &COMMAND_LINE_TARGETS; variable.
         First, the &DEFAULT_TARGETS; variable is a list of
         internal &SCons; nodes,
diff --git a/doc/user/environments.in b/doc/user/environments.in
index afd1463..7bb9d01 100644
--- a/doc/user/environments.in
+++ b/doc/user/environments.in
@@ -1553,7 +1553,7 @@ environment, of directory names, suffixes, etc.
       #!/usr/bin/env python
       import os
       import sys
-      if len(sys.argv) > 1:
+      if len(sys.argv) &gt; 1:
           keys = sys.argv[1:]
       else:
           keys = sorted(os.environ.keys())
diff --git a/doc/user/environments.xml b/doc/user/environments.xml
index 563d635..8f62b3b 100644
--- a/doc/user/environments.xml
+++ b/doc/user/environments.xml
@@ -1540,7 +1540,7 @@ environment, of directory names, suffixes, etc.
       #!/usr/bin/env python
       import os
       import sys
-      if len(sys.argv) > 1:
+      if len(sys.argv) &gt; 1:
           keys = sys.argv[1:]
       else:
           keys = sorted(os.environ.keys())
diff --git a/doc/user/parseflags.xml b/doc/user/parseflags.xml
index 09533d2..e5aadec 100644
--- a/doc/user/parseflags.xml
+++ b/doc/user/parseflags.xml
@@ -155,7 +155,7 @@
  <programlisting>
     env = Environment()
     d = env.ParseFlags(["!echo -I/opt/include", "!echo -L/opt/lib", "-lfoo"])
-    for k,v in l:
+    for k,v in sorted(d.items()):
         if v:
             print k, v
     env.MergeFlags(d)
diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml
index a3339e0..ffc37fc 100644
--- a/doc/user/troubleshoot.xml
+++ b/doc/user/troubleshoot.xml
@@ -1118,7 +1118,7 @@
       % <userinput>scons -Q --debug=stacktrace</userinput>
       scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'.
       scons: internal stack trace:
-        File "bootstrap/src/engine/SCons/Job.py", line 197, in start
+        File "bootstrap/src/engine/SCons/Job.py", line 199, in start
           task.prepare()
         File "bootstrap/src/engine/SCons/Script/Main.py", line 167, in prepare
           return SCons.Taskmaster.OutOfDateTask.prepare(self)