Merged revisions 2136-2200,2202-2290,2292-2301 via svnmerge from

http://scons.tigris.org/svn/scons/branches/core ........ r2145 | stevenknight | 2007-07-17 09:15:12 -0500 (Tue, 17 Jul 2007) | 3 lines Don't put null strings (from variable expansion) in a path list. (They get turned into the current directory on later expansion.) ........ r2146 | stevenknight | 2007-07-17 10:47:39 -0500 (Tue, 17 Jul 2007) | 3 lines Add support for optional arguments on command-line long options by specifying nargs='?'. ........ r2149 | stevenknight | 2007-07-17 15:22:24 -0500 (Tue, 17 Jul 2007) | 2 lines Remove left-over Optik mentions. ........ r2150 | stevenknight | 2007-07-17 15:39:34 -0500 (Tue, 17 Jul 2007) | 4 lines Add a $SWIGPATH variable for finding SWIG dependencies, with $SWIGINC{PREFIX,SUFFIX} for adding them to the command line. ........ r2154 | stevenknight | 2007-07-18 20:05:31 -0500 (Wed, 18 Jul 2007) | 2 lines Fix variable misspellings in the doc added for $SWIGOUTPUT. ........ r2155 | stevenknight | 2007-07-18 20:07:28 -0500 (Wed, 18 Jul 2007) | 2 lines Add the Python eggs info file to the RPM packaging build. ........ r2156 | stevenknight | 2007-07-18 20:15:08 -0500 (Wed, 18 Jul 2007) | 2 lines Convert documentation from DocBook SGML to XML. ........ r2158 | stevenknight | 2007-07-19 17:16:19 -0500 (Thu, 19 Jul 2007) | 3 lines Conditionally add the .egg-info the RPM file list only if the distutils in the version of Python that rpmbuild will execute knows about them. ........ r2161 | stevenknight | 2007-07-19 19:12:29 -0500 (Thu, 19 Jul 2007) | 5 lines Capture a test case (contributed by Tilo Prutz) where instantiation of a private class causes javac to generate an additional anonymous inner class file. (No solution yet, but there's no sense throwing away the preparatory work.) ........ r2162 | stevenknight | 2007-07-20 11:29:56 -0500 (Fri, 20 Jul 2007) | 3 lines Support passing a list of .java files as source to the Java() builder. (Leanid Nazdrynau) ........ r2163 | garyo | 2007-07-20 12:00:35 -0500 (Fri, 20 Jul 2007) | 1 line Fixed cut-n-paste error in Touch factory method doc in users guide. ........ r2167 | stevenknight | 2007-07-21 22:59:40 -0500 (Sat, 21 Jul 2007) | 2 lines Don't execute the SWIGOUTDIR test if swig isn't installed. ........ r2168 | stevenknight | 2007-07-21 23:14:17 -0500 (Sat, 21 Jul 2007) | 2 lines Fix the test's ability to run under a path name containing spaces. ........ r2171 | stevenknight | 2007-07-24 15:54:41 -0500 (Tue, 24 Jul 2007) | 2 lines Handle white space in key file names in the packaging build. ........ r2172 | stevenknight | 2007-07-24 21:41:15 -0500 (Tue, 24 Jul 2007) | 2 lines More efficient copying of construction environments. ........ r2173 | stevenknight | 2007-07-25 10:56:02 -0500 (Wed, 25 Jul 2007) | 2 lines Update the SCons build for Subversion and general clean-up. ........ r2174 | stevenknight | 2007-07-25 11:35:16 -0500 (Wed, 25 Jul 2007) | 3 lines Suppress the [brackets] around a node in the --tree=prune output if the node is a source. ........ r2175 | stevenknight | 2007-07-25 12:52:18 -0500 (Wed, 25 Jul 2007) | 3 lines Commonize the skip_test() method and make its behavior configurable via a TESTCOMMON_PASS_SKIPS environment variable. ........ r2178 | stevenknight | 2007-07-25 21:43:47 -0500 (Wed, 25 Jul 2007) | 3 lines Add $JAVACLASSPATH and $JAVASOURCEPATH construction variables. (Leanid Nazdrynau) ........ r2182 | stevenknight | 2007-07-30 12:10:20 -0500 (Mon, 30 Jul 2007) | 3 lines Refactor Builder suffix-adjusting into its own method, so we can (potentially) re-use it for Builders with attached source Builders. ........ r2183 | stevenknight | 2007-07-30 14:51:53 -0500 (Mon, 30 Jul 2007) | 2 lines More efficient source-builder suffix matching. ........ r2184 | stevenknight | 2007-07-30 16:01:42 -0500 (Mon, 30 Jul 2007) | 4 lines Encapsulate initialization of the default FS object by an accessor function in SCons.Node.FS. (This also gets rid of an unnecessary reference to SCons.Node.FS.default_fs in the LaTeX scanner.) ........ r2193 | stevenknight | 2007-07-30 18:24:07 -0500 (Mon, 30 Jul 2007) | 3 lines Fix interpretation of source arguments that have no suffix when the called Builder has both a src_suffix and a src_builder. ........ r2194 | stevenknight | 2007-07-31 10:25:31 -0500 (Tue, 31 Jul 2007) | 2 lines Increase the number of tries for random output from three to ten. ........ r2195 | stevenknight | 2007-07-31 10:52:28 -0500 (Tue, 31 Jul 2007) | 3 lines Skip the test gracefully if the zipfile module can't read the file it just wrote (which is the case for Python 2.1 on 64-bit systems). ........ r2196 | stevenknight | 2007-07-31 13:06:21 -0500 (Tue, 31 Jul 2007) | 2 lines Move the "import zipfile" so it doesn't fail on Python <= 2.0. ........ r2197 | stevenknight | 2007-07-31 14:51:50 -0500 (Tue, 31 Jul 2007) | 3 lines Commonize initialization of the various Java builders so they can be hooked up into a multi-stage Builder chain. (Leanid Nazdrynau) ........ r2198 | stevenknight | 2007-07-31 16:15:18 -0500 (Tue, 31 Jul 2007) | 3 lines Fix use of ${TARGET.dir} and ${SOURCE.dir} expansions in $FORTRANMODDIR $JARCHDIR, $JARFLAGS, $LEXFLAGS, $SWIGFLAGS, $SWIGOUTDIR and $YACCFLAGS. ........ r2199 | stevenknight | 2007-07-31 16:25:48 -0500 (Tue, 31 Jul 2007) | 2 lines Remove left-over Trace() call. ........ r2202 | stevenknight | 2007-08-01 12:31:48 -0500 (Wed, 01 Aug 2007) | 3 lines Bail out via test.skip_test() if wix ("candle") isn't found. Put the main body of code flush left instead of under an if: block. ........ r2203 | stevenknight | 2007-08-01 15:35:55 -0500 (Wed, 01 Aug 2007) | 5 lines Fix Tool.packaging.rpm.package() so it doesn't always overwrite $RPMFLAGS with -ta. Set --buildroot in RPM packaging tests so they don't overwrite each other when run simultaneously. ........ r2204 | stevenknight | 2007-08-01 15:37:36 -0500 (Wed, 01 Aug 2007) | 2 lines Fix a nested scope issue with the internal build_sources() function. ........ r2205 | stevenknight | 2007-08-01 15:46:08 -0500 (Wed, 01 Aug 2007) | 5 lines Normalize (X out) the CreationDate field inside embedded, compressed PostScript streams within the generated PDF files. Also normalize preceding Length field, since compression length is affected by different patterns of input, including the variable CreationDate value. ........ r2211 | stevenknight | 2007-08-02 08:52:06 -0500 (Thu, 02 Aug 2007) | 2 lines Add the new modules from branches/packaging to the SCons packaging build. ........ r2212 | stevenknight | 2007-08-02 19:59:01 -0500 (Thu, 02 Aug 2007) | 2 lines Fix the JAVACLASSPATH test when javah isn't on the default $PATH. ........ r2214 | stevenknight | 2007-08-03 15:05:21 -0500 (Fri, 03 Aug 2007) | 4 lines Hook up the Java builders into a multi-step chain underneath a Java() pseudo-builder (wrapper) that examines its arguments and calls the appropriate underlying file-or-dir builder. ........ r2215 | stevenknight | 2007-08-03 15:49:58 -0500 (Fri, 03 Aug 2007) | 2 lines Fix for old Python versions: use apply() instead of *args, **kw. ........ r2216 | stevenknight | 2007-08-03 16:49:31 -0500 (Fri, 03 Aug 2007) | 2 lines Hook up the SWIG builder as a source builder for .java files. ........ r2217 | stevenknight | 2007-08-03 17:28:19 -0500 (Fri, 03 Aug 2007) | 2 lines Don't use .endswith(), which didn't appear until later Python versions. ........ r2218 | stevenknight | 2007-08-03 17:29:38 -0500 (Fri, 03 Aug 2007) | 2 lines Replace tabs with spaces. ........ r2219 | stevenknight | 2007-08-04 08:06:23 -0500 (Sat, 04 Aug 2007) | 3 lines Initialize a loop-invariant lambda for matching .java suffixes outside the loop. ........ r2220 | stevenknight | 2007-08-07 15:06:13 -0500 (Tue, 07 Aug 2007) | 2 lines Refactor parallel class-generation loops into one. ........ r2221 | stevenknight | 2007-08-07 16:04:06 -0500 (Tue, 07 Aug 2007) | 5 lines Have the Java multi-step builder test actually check for generated files, and fix the generation of .java and .class file names, and interaction with the SWIG builder, so that the files are generated in the correct place. ........ r2222 | stevenknight | 2007-08-07 16:45:05 -0500 (Tue, 07 Aug 2007) | 3 lines Fix dependencies on SWIG-generated .java files so they don't have to be built in multiple passes. ........ r2226 | stevenknight | 2007-08-07 18:00:22 -0500 (Tue, 07 Aug 2007) | 2 lines Fix SWIG when used with BuildDir(). ........ r2227 | stevenknight | 2007-08-07 22:15:55 -0500 (Tue, 07 Aug 2007) | 5 lines User's guide updates: - Make the multiple files example match its text. - Expand a truncated sentence about being able to use Python function actions in the Command() Builder. ........ r2228 | stevenknight | 2007-08-07 23:25:18 -0500 (Tue, 07 Aug 2007) | 3 lines Don't generate an error if a #include file matches a same-named directory in $CPPPATH (or $FORTRANPATH, etc.). ........ r2229 | stevenknight | 2007-08-07 23:40:00 -0500 (Tue, 07 Aug 2007) | 2 lines Fix a code example. (Gary Oberbrunner) ........ r2230 | stevenknight | 2007-08-08 00:05:43 -0500 (Wed, 08 Aug 2007) | 3 lines Capture a test case to make sure AddPostAction() doesn't interfere with normal linking. (Matt Doar, Gary Oberbrunner) ........ r2233 | stevenknight | 2007-08-08 14:15:44 -0500 (Wed, 08 Aug 2007) | 2 lines Fix documentation typo in a construction variable cross-reference. ........ r2234 | stevenknight | 2007-08-08 17:03:25 -0500 (Wed, 08 Aug 2007) | 2 lines Changes to SCons packaging to support checkpoint releases. ........ r2235 | stevenknight | 2007-08-09 10:10:01 -0500 (Thu, 09 Aug 2007) | 2 lines Sidestep false negatives on heavily loaded systems. ........ r2236 | garyo | 2007-08-09 11:16:26 -0500 (Thu, 09 Aug 2007) | 1 line Allow unpackaged files (e.g. *.pyo) to exist in the build dir without being packaged in the RPM. Without this, on some systems the rpmbuild may error out. ........ r2237 | stevenknight | 2007-08-09 11:27:56 -0500 (Thu, 09 Aug 2007) | 5 lines Fix test/SWIG/build-dir.py so it works on old Python versions without distutils.sysconfig. Instead of just cutting-and-pasting initialization code from other SWIG tests, centralize it in some new TestSCons methods. ........ r2238 | garyo | 2007-08-09 11:30:58 -0500 (Thu, 09 Aug 2007) | 1 line Use docbook 4.3 instead of 4.4 for the XML doctype since some older(?) jade parsers can't handle new 4-byte Unicode chars in the 4.4 version of isogrk4.ent. ........ r2240 | stevenknight | 2007-08-09 16:35:06 -0500 (Thu, 09 Aug 2007) | 2 lines User's Guide updates (post packaging changes). ........ r2243 | stevenknight | 2007-08-10 10:31:51 -0500 (Fri, 10 Aug 2007) | 3 lines Fix the User's Guide build to use openjade, and to accomodate a change in the name of the main generated file (book1.html => index.html). ........ r2245 | stevenknight | 2007-08-10 11:09:16 -0500 (Fri, 10 Aug 2007) | 2 lines Update the {CHANGES,RELEASE}.txt datestamp lines. ........ r2253 | stevenknight | 2007-08-10 16:21:54 -0500 (Fri, 10 Aug 2007) | 2 lines Fix the wix Tool module's ability to handle null entries in $PATH. ........ r2261 | stevenknight | 2007-08-11 23:08:12 -0500 (Sat, 11 Aug 2007) | 3 lines Remove unnecessary files (.svnt/*, .{ae,cvs}ignore, www/*) from the scons-src packages. ........ r2262 | stevenknight | 2007-08-11 23:24:49 -0500 (Sat, 11 Aug 2007) | 2 lines Add missing __revision__ lines. ........ r2263 | stevenknight | 2007-08-11 23:33:42 -0500 (Sat, 11 Aug 2007) | 2 lines Skip the test if the MANIFEST file hasn't been built. ........ r2264 | stevenknight | 2007-08-11 23:36:30 -0500 (Sat, 11 Aug 2007) | 2 lines Add recent compatibility modules to the relevant exceptions lists. ........ r2265 | stevenknight | 2007-08-11 23:39:00 -0500 (Sat, 11 Aug 2007) | 3 lines Update __VERSION__ strings in the QMTest/*.py modules, so that packaging tests (src/test_*.py) will pass after builds of checkpoint releases. ........ r2266 | stevenknight | 2007-08-12 07:36:19 -0500 (Sun, 12 Aug 2007) | 2 lines Add a comment about why we construct the __VERSION__ string at run time. ........ r2267 | stevenknight | 2007-08-12 07:42:30 -0500 (Sun, 12 Aug 2007) | 2 lines Avoid reading the MANIFEST file twice. (Courtesy review by Greg Noel.) ........ r2268 | stevenknight | 2007-08-12 08:14:53 -0500 (Sun, 12 Aug 2007) | 3 lines Shift Install() and InstallAs() from being documented as functions to being documented as Builders. ........ r2269 | garyo | 2007-08-13 08:49:52 -0500 (Mon, 13 Aug 2007) | 1 line Tests: Skip some more Java tests if javac is not installed on the test machine so they don't get marked as failing. ........ r2270 | garyo | 2007-08-13 11:09:39 -0500 (Mon, 13 Aug 2007) | 1 line Fixed typo in test (shows up on non-Linux platforms). ........ r2271 | garyo | 2007-08-13 14:09:05 -0500 (Mon, 13 Aug 2007) | 4 lines Test portability fixes for Darwin/OSX and IRIX. This does not make all the tests pass on those OSes, but it takes care of some of the more obvious errors that I have time for right now. More to come. ........ r2272 | stevenknight | 2007-08-13 15:33:29 -0500 (Mon, 13 Aug 2007) | 2 lines Tab => space fix. ........ r2273 | stevenknight | 2007-08-13 15:33:52 -0500 (Mon, 13 Aug 2007) | 2 lines Test for swig, too, which is used to build from the .i file. ........ r2277 | garyo | 2007-08-14 10:40:00 -0500 (Tue, 14 Aug 2007) | 8 lines Test portability on IRIX: test/Actions/pre-post creates target file before building target, then IRIX CC does not chmod +x afterwards. I think this change is safe on all OSes. test/AS/ml.py: I think this is only supposed to be run on win32 (not skipped only on win32); the sense of the skip test was backwards. ........ r2278 | stevenknight | 2007-08-14 11:04:40 -0500 (Tue, 14 Aug 2007) | 2 lines Add -tt when running tests, to catch inconsistent tab usage. ........ r2279 | stevenknight | 2007-08-14 14:00:43 -0500 (Tue, 14 Aug 2007) | 2 lines Minor refactor of logic in File.retrieve_from_cache(). ........ r2280 | stevenknight | 2007-08-15 01:11:40 -0500 (Wed, 15 Aug 2007) | 2 lines Refactor CacheDir support into its own module. ........ r2281 | stevenknight | 2007-08-15 07:24:51 -0500 (Wed, 15 Aug 2007) | 2 lines Move the cachepath() method from FS.File to the CacheDir class. ........ r2282 | stevenknight | 2007-08-15 08:31:34 -0500 (Wed, 15 Aug 2007) | 2 lines Python 1.5.2 fix in the new Null class. ........ r2283 | stevenknight | 2007-08-15 10:45:53 -0500 (Wed, 15 Aug 2007) | 5 lines Refactor CacheDir unit tests to: - restore functionality that was dropped in the transition; - commonize creation of test Nodes and other (mock) objects - separate CacheDir tests from tests of CacheDir through Node.FS.File. ........ r2284 | stevenknight | 2007-08-15 11:46:38 -0500 (Wed, 15 Aug 2007) | 3 lines Replace the Executor.Null.NullEnvironment object with a real Null object, so it will absorb the CacheDir method calls as well. ........ r2285 | stevenknight | 2007-08-15 11:52:57 -0500 (Wed, 15 Aug 2007) | 5 lines Add a get_CacheDir() method to a construction environment, which will be used to fetch per-environment CacheDir specifications. (Right now all calls to it still just return the one attached to underlying default FS object.) ........ r2286 | stevenknight | 2007-08-15 15:15:46 -0500 (Wed, 15 Aug 2007) | 2 lines Support per-construction-environment configuration of CacheDir(). ........ r2287 | stevenknight | 2007-08-15 15:33:04 -0500 (Wed, 15 Aug 2007) | 2 lines Move the tests of CacheDir()-related command-line options into test/CacheDir. ........ r2293 | stevenknight | 2007-08-16 11:14:49 -0500 (Thu, 16 Aug 2007) | 3 lines Add the Package() builder description to the documentation build, fixing the XML so that it will build. ........ r2294 | stevenknight | 2007-08-16 12:51:19 -0500 (Thu, 16 Aug 2007) | 3 lines Reorganize packaging documentation: alphabetize the variable definitions (and function names), document Tag() as a function, not a builder. ........ r2296 | stevenknight | 2007-08-16 12:55:01 -0500 (Thu, 16 Aug 2007) | 2 lines Add a build command. ........ r2300 | stevenknight | 2007-08-16 16:49:13 -0500 (Thu, 16 Aug 2007) | 2 lines First cut at documenting packaging variables. ........ r2301 | stevenknight | 2007-08-16 16:51:21 -0500 (Thu, 16 Aug 2007) | 3 lines Construct the .src.rpm and .arch.rpm file names independnetly, not by trying to massage one into the other. ........
author: Steven Knight <knight@baldmt.com> 2007-08-17 03:17:04 (GMT)
committer: Steven Knight <knight@baldmt.com> 2007-08-17 03:17:04 (GMT)
commit: 8cb34cccc26935bce5d07ed3f51cc29fbbd1ab03 (patch)
tree: 7bc281e44fe45cae35656e0e457fef8f308fbb7b /doc
parent: 5b4b4c6e5384712ab1835bdcf8beea09611b6e62 (diff)
download: SCons-8cb34cccc26935bce5d07ed3f51cc29fbbd1ab03.zip
SCons-8cb34cccc26935bce5d07ed3f51cc29fbbd1ab03.tar.gz
SCons-8cb34cccc26935bce5d07ed3f51cc29fbbd1ab03.tar.bz2
111 files changed, 599 insertions, 439 deletions
diff --git a/doc/.aeignore b/doc/.aeignore
index 52557a7..0a24d57 100644
--- a/doc/.aeignore
+++ b/doc/.aeignore
@@ -2,4 +2,4 @@
 .*.swp
 .consign
 .sconsign
-version.sgml
+version.xml
diff --git a/doc/SConscript b/doc/SConscript
index 8316e6e..8e13294 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -40,9 +40,7 @@ build = os.path.join(build_dir, 'doc')
 #
 #
 #
-doc_tar_gz = os.path.join(build_dir,
-                          'dist',
-                          'scons-doc-%s.tar.gz' % env.Dictionary('VERSION'))
+dist_doc_tar_gz = '$DISTDIR/scons-doc-${VERSION}.tar.gz'
 
 #
 # We'll only try to build text files (for some documents)
@@ -53,7 +51,7 @@ epydoc = whereis('epydoc')
 groff = whereis('groff')
 lynx = whereis('lynx')
 man2html = whereis('man2html')
-jade = whereis('jade')
+jade = whereis('openjade') or whereis('jade')
 jadetex = whereis('jadetex')
 pdfjadetex = whereis('pdfjadetex')
 jw = whereis('jw')
@@ -66,9 +64,9 @@ entity_re = re.compile(r'<!entity\s+(?:%\s+)?(?:\S+)\s+SYSTEM\s+"([^"]*)">', re.
 format_re = re.compile(r'<(?:graphic|imagedata)\s+fileref="([^"]*)"(?:\s+format="([^"]*)")?')
 
 #
-# Find internal dependencies in .sgml files:
+# Find internal dependencies in .xml files:
 #
-#   <!entity bground SYSTEM "bground.sgml">
+#   <!entity bground SYSTEM "bground.xml">
 #   <graphic fileref="file.jpg">
 #   <imagedata fileref="file.jpg">
 #
@@ -76,7 +74,7 @@ format_re = re.compile(r'<(?:graphic|imagedata)\s+fileref="([^"]*)"(?:\s+format=
 # defined as a SYSTEM entity is, in fact, a file included
 # somewhere in the document.
 #
-def scansgml(node, env, target):
+def scanxml(node, env, target):
     includes = []
 
     contents = node.get_contents()
@@ -101,7 +99,7 @@ def scansgml(node, env, target):
 
     return includes
 
-s = Scanner(name = 'sgml', function = scansgml, skeys = ['.sgml', '.mod'])
+s = Scanner(name = 'xml', function = scanxml, skeys = ['.xml', '.mod'])
 
 orig_env = env
 env = orig_env.Clone(SCANNERS = [s],
@@ -127,14 +125,14 @@ scons_doc_files = map(lambda x: File('#src/engine/'+x).rstr(), scons_doc_files)
 
 if jw:
     #
-    # Always create a version.sgml file containing the version information
+    # Always create a version.xml file containing the version information
     # for this run.  Ignore it for dependency purposes so we don't
     # rebuild all the docs every time just because the date changes.
     #
     date, ver, rev = env.Dictionary('DATE', 'VERSION', 'REVISION')
-    version_sgml = File(os.path.join(build, "version.sgml"))
-    #version_sgml = File("version.sgml")
-    verfile = str(version_sgml)
+    version_xml = File(os.path.join(build, "version.xml"))
+    #version_xml = File("version.xml")
+    verfile = str(version_xml)
     try:
         os.unlink(verfile)
     except OSError:
@@ -170,7 +168,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
                         variables_gen, variables_mod]
     b = env.Command(doc_output_files,
                     scons_doc_files,
-                    "$PYTHON $SCONS_PROC_PY --sgml -b ${TARGETS[0]},${TARGETS[1]} -t ${TARGETS[2]},${TARGETS[3]} -v ${TARGETS[4]},${TARGETS[5]} $( $SOURCES $)")
+                    "$PYTHON $SCONS_PROC_PY --xml -b ${TARGETS[0]},${TARGETS[1]} -t ${TARGETS[2]},${TARGETS[3]} -v ${TARGETS[4]},${TARGETS[5]} $( $SOURCES $)")
     env.Depends(b, "$SCONS_PROC_PY")
 
     env.Local(b)
@@ -237,8 +235,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
     }
 
     #
-    # We have to tell SCons to scan the top-level SGML files which
-    # get included by the document SGML files in the subdirectories.
+    # We have to tell SCons to scan the top-level XML files which
+    # get included by the document XML files in the subdirectories.
     #
     manifest = File('MANIFEST').rstr()
     src_files = map(lambda x: x[:-1], open(manifest).readlines())
@@ -266,20 +264,20 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
             if ext in ['.fig', '.jpg']:
                 orig_env.InstallAs(build_s, doc_s)
             else:
-                if build_doc and ext == '.sgml':
+                if build_doc and ext == '.xml':
                     env.Command(doc_s,
                                 base + '.in',
                                 "$PYTHON $SCONSOUTPUT_PY $SOURCE > $TARGET")
                 orig_env.SCons_revision(build_s, doc_s)
             Local(build_s)
 
-        main = os.path.join(build, doc, 'main.sgml')
+        main = os.path.join(build, doc, 'main.xml')
         out = 'main.out'
 
         # Hard-coding the scons-src path is a bit of a hack.  This can
         # be reworked when a better solution presents itself.
         scons_src_main = os.path.join(build_dir, 'scons-src', 'doc', main)
-        env.Ignore(scons_src_main, version_sgml)
+        env.Ignore(scons_src_main, version_xml)
 
         htmldir = os.path.join(build, 'HTML', 'scons-%s' % doc)
         htmlindex = os.path.join(htmldir, docs[doc]['htmlindex'])
@@ -289,12 +287,27 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
         text = os.path.join(build, 'TEXT', 'scons-%s.txt' % doc)
 
         if docs[doc].get('html') and jade:
+            def copy_index_html(target, source, env):
+                # Older versions of DocBook|jw|jade|whatever would
+                # create a book1.html file, while newer versions create
+                # an index.html file (logically enough).  The scons.org
+                # web site links expect book1.html, so we're going to
+                # leave the target as is, and run this post-processing
+                # action function to check that the target really did
+                # get created, and if it didn't, copy it from index.html.
+                t = str(target[0])
+                if not os.path.exists(t):
+                    i = os.path.join(os.path.split(t)[0], 'index.html')
+                    open(t, 'w').write(open(i, 'r').read())
+                return None
+
             cmds = [
                 Delete("${TARGET.dir}/*.html"),
                 "jw -b html -o ${TARGET.dir} $SOURCES",
             ]
             if tidy:
                 cmds.append("tidy -m -q $TARGET || true")
+            cmds.append(Action(copy_index_html))
             env.Command(htmlindex, File(main), cmds)
             Local(htmlindex)
 
@@ -308,7 +321,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
             env.Command(html, File(main), cmds)
             Local(html)
 
-            env.Ignore([html, htmlindex], version_sgml)
+            env.Ignore([html, htmlindex], version_xml)
 
             tar_deps.extend([html, htmlindex])
             tar_list.extend([html, htmldir])
@@ -339,7 +352,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
             ])
             Local(ps)
 
-            env.Ignore(ps, version_sgml)
+            env.Ignore(ps, version_xml)
 
             tar_deps.append(ps)
             tar_list.append(ps)
@@ -369,7 +382,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
             ])
             Local(pdf)
 
-            env.Ignore(pdf, version_sgml)
+            env.Ignore(pdf, version_xml)
 
             tar_deps.append(pdf)
             tar_list.append(pdf)
@@ -378,7 +391,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
             env.Command(text, html, "lynx -dump ${SOURCE.abspath} > $TARGET")
             Local(text)
 
-            env.Ignore(text, version_sgml)
+            env.Ignore(text, version_xml)
 
             tar_deps.append(text)
             tar_list.append(text)
@@ -505,6 +518,9 @@ if epydoc:
 if tar_deps:
     tar_list = string.join(map(lambda x, b=build+'/': string.replace(x, b, ''),
                            tar_list))
-    env.Command(doc_tar_gz, tar_deps,
+    t = env.Command(dist_doc_tar_gz, tar_deps,
                 "tar cf${TAR_HFLAG} - -C %s %s | gzip > $TARGET" % (build, tar_list))
-    Local(doc_tar_gz)
+    Local(t)
+    Alias('doc', t)
+else:
+    Alias('doc', os.path.join(build_dir, 'doc'))
diff --git a/doc/design/MANIFEST b/doc/design/MANIFEST
index 3fb99f0..33ab8f0 100644
--- a/doc/design/MANIFEST
+++ b/doc/design/MANIFEST
@@ -1,14 +1,14 @@
-acks.sgml
-bground.sgml
-copyright.sgml
+acks.xml
+bground.xml
+copyright.xml
 engine.fig
 engine.jpg
-engine.sgml
-goals.sgml
-install.sgml
-intro.sgml
-issues.sgml
-main.sgml
-native.sgml
-overview.sgml
+engine.xml
+goals.xml
+install.xml
+intro.xml
+issues.xml
+main.xml
+native.xml
+overview.xml
 scons.mod
diff --git a/doc/design/acks.sgml b/doc/design/acks.xml
index b1a8a58..b1a8a58 100644
--- a/doc/design/acks.sgml
+++ b/doc/design/acks.xml
diff --git a/doc/design/bground.sgml b/doc/design/bground.xml
index c404e86..c404e86 100644
--- a/doc/design/bground.sgml
+++ b/doc/design/bground.xml
diff --git a/doc/design/copyright.sgml b/doc/design/copyright.xml
index d73906e..d73906e 100644
--- a/doc/design/copyright.sgml
+++ b/doc/design/copyright.xml
diff --git a/doc/design/engine.sgml b/doc/design/engine.xml
index df78e3b..1a1e335 100644
--- a/doc/design/engine.sgml
+++ b/doc/design/engine.xml
@@ -523,7 +523,7 @@
   </tgroup>
  </informaltable>
 
-<REMARK>
+<!--
 &Library; and &SharedLibrary; have nearly identical
 semantics, just different
 tools and &consenvs (paths, etc.) that they use.
@@ -532,7 +532,7 @@ using just the &Library; &Builder; object
 with a different environment.
 I think that's a better way to do it.
 Feedback?
-</REMARK>
+-->
 
  <para>
 
@@ -671,9 +671,9 @@ Feedback?
 
    &Builder; objects raise the following exceptions on error:
 
- <REMARK>
+ <!--
  LIST THESE ONCE WE FIGURE OUT WHAT THEY ARE FROM CODING THEM.
- </REMARK>
+ -->
 
   </para>
  </section>
@@ -735,9 +735,9 @@ Feedback?
 
   </para>
 
- <REMARK>
+ <!--
  NEED AN EXAMPLE HERE.
- </REMARK>
+ -->
 
   <para>
 
@@ -918,7 +918,7 @@ Feedback?
  <section>
   <title>&Builder; maps</title>
 
-<REMARK>
+<!--
 Do we even need this anymore?
 Now that the individual builders
 have specified <literal>suffix</literal>
@@ -929,7 +929,7 @@ I think this is a holdover from before I
 added the <literal>suffix</literal> arguments.
 If you want &MakeBuilder; to do something different,
 you set it up with another environment...
-</REMARK>
+-->
 
   <para>
 
@@ -1264,13 +1264,13 @@ you set it up with another environment...
  <section>
   <title>&Scanner; maps</title>
 
-<REMARK>
+<!--
 If the &BUILDERMAP; proves unnecessary,
 we could/should get rid of this one, too,
 by adding a parallel <literal>src_suffix</literal>
 argument to the &Scanner; factory...
 Comments?
-</REMARK>
+-->
 
   <para>
 
@@ -1543,7 +1543,7 @@ Comments?
 <section id="sect-custom">
  <title>Customizing output</title>
 
-<REMARK>
+<!--
 Take this whole section with a grain of salt.
 I whipped it up without a great deal of thought
 to try to add a "competitive advantage"
@@ -1554,7 +1554,7 @@ feels inflexible,
 but I can't think of another way it would be
 done effectively.
 I dunno, maybe this is fine as it is...
-</REMARK>
+-->
 
  <para>
 
@@ -1732,16 +1732,16 @@ I dunno, maybe this is fine as it is...
 <section id="separate">
  <title>Separate source and build trees</title>
 
-<REMARK>
+<!--
 I've never liked Cons' use of the name <literal>Link</literal>
 for this functionality,
 mainly because the term is overloaded
 with linking object files into an executable.
 Yet I've never come up with anything better.
 Any suggestions?
-</REMARK>
+-->
 
-<REMARK>
+<!--
 Also, I made this an &Environment; method because
 it logically belongs in the API reference
 (the build engine needs to know about it),
@@ -1754,7 +1754,7 @@ associated with a specific environment
 leaves it as a bare function call),
 so maybe we should just follow that example
 and not call it through an environment...
-</REMARK>
+-->
 
  <para>
 
@@ -1833,14 +1833,14 @@ and not call it through an environment...
 <section id="sect-repositories">
  <title>Code repositories</title>
 
-<REMARK>
+<!--
 Like &Link;, &Repository; and &Local; are part of the
 API reference, but not really tied to any specific environment.
 Is it better to be consistent about calling
 everything in the API through an environment,
 or to leave these independent so as
 not to complicate their calling interface?
-</REMARK>
+-->
 
  <para>
 
@@ -1900,10 +1900,10 @@ not to complicate their calling interface?
 <section id="sect-caching">
  <title>Derived-file caching</title>
 
-<REMARK>
+<!--
 There should be extensions to this part of the API for
 auxiliary functions like cleaning the cache.
-</REMARK>
+-->
 
  <para>
 
@@ -1943,12 +1943,12 @@ auxiliary functions like cleaning the cache.
 <section id="sect-jobs">
  <title>Job management</title>
 
-<REMARK>
+<!--
 This has been completely superseded by
 the more sophisticated &Task; manager
 that Anthony Roach has contributed.
 I need to write that up...
-</REMARK>
+-->
 
  <para>
 
diff --git a/doc/design/goals.sgml b/doc/design/goals.xml
index 774e04d..2a7b69b 100644
--- a/doc/design/goals.sgml
+++ b/doc/design/goals.xml
@@ -192,17 +192,25 @@
 <section id="sect-fix-make">
  <title>Fixing &Make;'s problems</title>
 
-<REMARK>
+ <para>
+
+<!--
 To be written.
-</REMARK>
+-->
+
+ </para>
 
 </section>
 
 <section id="sect-fix-cons">
  <title>Fixing &Cons;'s problems</title>
 
-<REMARK>
+  <para>
+
+<!--
 To be written.
-</REMARK>
+-->
+
+  </para>
 
 </section>
diff --git a/doc/design/install.sgml b/doc/design/install.xml
index 918fd64..e670e83 100644
--- a/doc/design/install.sgml
+++ b/doc/design/install.xml
@@ -23,6 +23,6 @@
 
 -->
 
-<REMARK>
+<!--
 THIS CHAPTER NEEDS TO BE DISCUSSED AND WRITTEN.
-</REMARK>
+-->
diff --git a/doc/design/intro.sgml b/doc/design/intro.xml
index 3ab8e3f..561baa4 100644
--- a/doc/design/intro.sgml
+++ b/doc/design/intro.xml
@@ -93,7 +93,7 @@
 
  </para>
 
-<REMARK>
+<!--
 Sections marked like this
 (prefixed with <literal>RATIONALE:</literal> in the HTML,
 surrounded by <literal>BEGIN RATIONALE:</literal>
@@ -106,6 +106,6 @@ I've used these to mark sections that need work,
 but also to cite some open design issues.
 If you have input on any of these marked issues,
 I'm especially eager to hear it.
-</REMARK>
+-->
 
 </section>
diff --git a/doc/design/issues.sgml b/doc/design/issues.xml
index 1f9a78c..1f9a78c 100644
--- a/doc/design/issues.sgml
+++ b/doc/design/issues.xml
diff --git a/doc/design/main.sgml b/doc/design/main.xml
index 6246a73..e991b36 100644
--- a/doc/design/main.sgml
+++ b/doc/design/main.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+
 <!--
 
   Copyright (c) 2001, 2002, 2003 Steven Knight
@@ -23,7 +25,8 @@
 
 -->
 
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
 
     <!--
@@ -31,7 +34,7 @@
     Rather than fool people into thinking that it's
     actually up-to-date and reflects the current design,
     hard-code the version from back when we last updated it.
-    <!ENTITY % version SYSTEM "../version.sgml">
+    <!ENTITY % version SYSTEM "../version.xml">
     %version;
     -->
     <!ENTITY builddate "2001/12/13 20:55:46">
@@ -46,16 +49,16 @@
     <!ENTITY % scons SYSTEM "scons.mod">
     %scons;
 
-    <!ENTITY acks SYSTEM "acks.sgml">
-    <!ENTITY bground SYSTEM "bground.sgml">
-    <!ENTITY copyright SYSTEM "copyright.sgml">
-    <!ENTITY engine SYSTEM "engine.sgml">
-    <!ENTITY goals SYSTEM "goals.sgml">
-    <!ENTITY install SYSTEM "install.sgml">
-    <!ENTITY intro SYSTEM "intro.sgml">
-    <!ENTITY issues SYSTEM "issues.sgml">
-    <!ENTITY native SYSTEM "native.sgml">
-    <!ENTITY overview SYSTEM "overview.sgml">
+    <!ENTITY acks SYSTEM "acks.xml">
+    <!ENTITY bground SYSTEM "bground.xml">
+    <!ENTITY copyright SYSTEM "copyright.xml">
+    <!ENTITY engine SYSTEM "engine.xml">
+    <!ENTITY goals SYSTEM "goals.xml">
+    <!ENTITY install SYSTEM "install.xml">
+    <!ENTITY intro SYSTEM "intro.xml">
+    <!ENTITY issues SYSTEM "issues.xml">
+    <!ENTITY native SYSTEM "native.xml">
+    <!ENTITY overview SYSTEM "overview.xml">
 
 ]>
 
@@ -110,11 +113,15 @@
     &native;
   </chapter>
 
+  <!--
+
   <chapter id="chap-install">
     <title>Installation</title>
     &install;
   </chapter>
 
+  -->
+
   <chapter id="chap-issues">
     <title>Other Issues</title>
     &issues;
diff --git a/doc/design/native.sgml b/doc/design/native.xml
index 5a791a7..8cdd867 100644
--- a/doc/design/native.sgml
+++ b/doc/design/native.xml
@@ -186,7 +186,7 @@
 	SConscript('src/SConscript', Export(env=env, debug=debug, installdir=installdir))
 	</programlisting>
 
-<REMARK>
+<!--
 The <literal>env=env</literal> stuff bugs me
 because it imposes extra work on the normal
 case where you <emphasis>don't</emphasis> rename
@@ -198,7 +198,7 @@ is split into variables that are passed
 through transparently?
 Equivalent to the above example:
 <literal>SConscript('src/SConscript', Export('env debug installdir'))</literal>
-</REMARK>
+-->
 
  <para>
 
@@ -342,10 +342,10 @@ Equivalent to the above example:
 
  </para>
 
-<REMARK>
+<!--
 These need to be specified and explained
 beyond what the man page will have.
-</REMARK>
+-->
 
   <!-- BEGIN HTML -->
 
diff --git a/doc/design/overview.sgml b/doc/design/overview.xml
index 8d6f060..38e4258 100644
--- a/doc/design/overview.sgml
+++ b/doc/design/overview.xml
@@ -48,13 +48,13 @@
 
  </para>
 
-<REMARK>
+<!--
 Including this figure makes our PDF build blow up.
 The figure, however,
 is left over from the Software Carpentry contest
 and is therefore old, out-of-date, and needs to be redone anyway.
 This is where it will go, anyway...
-</REMARK>
+-->
 
    <!--
    YARG!  THIS MAKES THE PDF BUILD BLOW UP.  HELP!
diff --git a/doc/developer/MANIFEST b/doc/developer/MANIFEST
index 12a4de0..eece338 100644
--- a/doc/developer/MANIFEST
+++ b/doc/developer/MANIFEST
@@ -1,9 +1,9 @@
-architecture.sgml
-branches.sgml
-copyright.sgml
-cycle.sgml
-main.sgml
-packaging.sgml
-preface.sgml
-sourcetree.sgml
-testing.sgml
+architecture.xml
+branches.xml
+copyright.xml
+cycle.xml
+main.xml
+packaging.xml
+preface.xml
+sourcetree.xml
+testing.xml
diff --git a/doc/developer/architecture.sgml b/doc/developer/architecture.xml
index 0fc357f..0fc357f 100644
--- a/doc/developer/architecture.sgml
+++ b/doc/developer/architecture.xml
diff --git a/doc/developer/branches.sgml b/doc/developer/branches.xml
index abba398..abba398 100644
--- a/doc/developer/branches.sgml
+++ b/doc/developer/branches.xml
diff --git a/doc/developer/copyright.sgml b/doc/developer/copyright.xml
index d926f5b..d926f5b 100644
--- a/doc/developer/copyright.sgml
+++ b/doc/developer/copyright.xml
diff --git a/doc/developer/cycle.sgml b/doc/developer/cycle.xml
index 629a1a8..629a1a8 100644
--- a/doc/developer/cycle.sgml
+++ b/doc/developer/cycle.xml
diff --git a/doc/developer/main.sgml b/doc/developer/main.xml
index 949287a..e2e414c 100644
--- a/doc/developer/main.sgml
+++ b/doc/developer/main.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+
 <!--
 
   __COPYRIGHT__
@@ -23,23 +25,24 @@
 
 -->
 
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
 
-    <!ENTITY % version SYSTEM "../version.sgml">
+    <!ENTITY % version SYSTEM "../version.xml">
     %version;
 
     <!ENTITY % scons SYSTEM "../scons.mod">
     %scons;
 
-    <!ENTITY architecture SYSTEM "architecture.sgml">
-    <!ENTITY branches SYSTEM "branches.sgml">
-    <!ENTITY copyright SYSTEM "copyright.sgml">
-    <!ENTITY cycle SYSTEM "cycle.sgml">
-    <!ENTITY packaging SYSTEM "packaging.sgml">
-    <!ENTITY preface SYSTEM "preface.sgml">
-    <!ENTITY sourcetree SYSTEM "sourcetree.sgml">
-    <!ENTITY testing SYSTEM "testing.sgml">
+    <!ENTITY architecture SYSTEM "architecture.xml">
+    <!ENTITY branches SYSTEM "branches.xml">
+    <!ENTITY copyright SYSTEM "copyright.xml">
+    <!ENTITY cycle SYSTEM "cycle.xml">
+    <!ENTITY packaging SYSTEM "packaging.xml">
+    <!ENTITY preface SYSTEM "preface.xml">
+    <!ENTITY sourcetree SYSTEM "sourcetree.xml">
+    <!ENTITY testing SYSTEM "testing.xml">
 
 ]>
 
diff --git a/doc/developer/packaging.sgml b/doc/developer/packaging.xml
index 3860ee7..3860ee7 100644
--- a/doc/developer/packaging.sgml
+++ b/doc/developer/packaging.xml
diff --git a/doc/developer/preface.sgml b/doc/developer/preface.xml
index 5784cee..5784cee 100644
--- a/doc/developer/preface.sgml
+++ b/doc/developer/preface.xml
diff --git a/doc/developer/sourcetree.sgml b/doc/developer/sourcetree.xml
index be1c45a..be1c45a 100644
--- a/doc/developer/sourcetree.sgml
+++ b/doc/developer/sourcetree.xml
diff --git a/doc/developer/testing.sgml b/doc/developer/testing.xml
index c577c5c..c577c5c 100644
--- a/doc/developer/testing.sgml
+++ b/doc/developer/testing.xml
diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 769cfc2..a20a0f6 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -2041,8 +2041,8 @@ This function adds a new command-line option to be recognized.
 The specified
 .I arguments
 are the same as supported by the standard Python
-.B optparse.add_option
-method;
+.BR optparse.add_option ()
+method (with a few additional capabilities noted below);
 see the documentation for
 .B optparse
 for a thorough discussion of its option-processing capabities.
@@ -2054,6 +2054,31 @@ contains a compatible version of the module
 that is used to provide identical functionality
 when run by earlier Python versions.)
 
+In addition to the arguments and values supported by the
+.B optparse.add_option ()
+method,
+the SCons
+.BR AddOption ()
+function allows you to set the
+.B nargs
+keyword value to
+.B '?'
+(a string with just the question mark)
+to indicate that the specified long option(s) take(s) an
+.I optional
+argument.
+When 
+.B "nargs = '?'"
+is passed to the
+.BR AddOption ()
+function, the
+.B const
+keyword argument
+may be used to supply the "default"
+value that should be used when the
+option is specified on the command line
+without an explicit argument.
+
 If no
 .B default=
 keyword argument is supplied when calling
@@ -2459,6 +2484,26 @@ The derived files in the cache will be shared
 among all the builds using the same
 .BR CacheDir ()
 call.
+Specifying a
+.I cache_dir
+of
+.B None
+disables derived file caching.
+
+Calling
+.BR env.CacheDir ()
+will only affect targets built
+through the specified construction environment.
+Calling
+.BR CacheDir ()
+sets a global default
+that will be used by all targets built
+through construction environments
+that do
+.I not
+have an
+.BR env.CacheDir ()
+specified.
 
 When a
 .BR CacheDir ()
@@ -3280,43 +3325,6 @@ Import("*")
 
 '\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.RI Install( dir ", " source )
-.TP
-.RI env.Install( dir ", " source )
-Installs one or more source files or directories
-in a destination directory
-.IR dir .
-The names of the specified source files or directories
-remain the same within the destination directory.
-
-.ES
-env.Install(dir = '/usr/local/bin', source = ['foo', 'bar'])
-.EE
-
-'\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-.TP
-.RI InstallAs( target ", " source )
-.TP
-.RI env.InstallAs( target ", " source )
-Installs one or more source files or directories
-to specific names,
-allowing changing a file or directory name
-as part of the installation.
-It is an error if the
-.I target
-and
-.I source
-arguments list different numbers of files or directories.
-
-.ES
-env.InstallAs(target = '/usr/local/bin/foo',
-              source = 'foo_debug')
-env.InstallAs(target = ['../lib/libfoo.a', '../lib/libbar.a'],
-              source = ['libFOO.a', 'libBAR.a'])
-.EE
-
-'\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-.TP
 .RI Literal( string )
 .TP
 .RI env.Literal( string )
@@ -4494,6 +4502,26 @@ files = Split("""
 
 '\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
+.RI Tag( node ", " tags )
+Annotates file or directory Nodes with
+information about how the
+.BR Package ()
+Builder should package those files or directories.
+All tags are optional.
+
+.ES
+# makes sure the built library will be installed with 0644 file
+# access mode
+Tag( Library( 'lib.c' ), UNIX_ATTR="0644" )
+
+# marks file2.txt to be a documentation file
+Tag( 'file2.txt', DOC )
+.EE
+</summary>
+</builder>
+
+'\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+.TP
 .RI TargetSignatures( type )
 .TP
 .RI env.TargetSignatures( type )
@@ -7026,7 +7054,7 @@ class foo:
         self.arg = arg
 
     def __call__(self, target, source, env, for_signature):
-        return arg + " bar"
+        return self.arg + " bar"
 
 # Will expand $BAR to "my argument bar baz"
 env=Environment(FOO=foo, BAR="${FOO('my argument')} baz")
diff --git a/doc/python10/MANIFEST b/doc/python10/MANIFEST
index e962e6a..c9484d8 100644
--- a/doc/python10/MANIFEST
+++ b/doc/python10/MANIFEST
@@ -1,16 +1,16 @@
-abstract.sgml
-acks.sgml
+abstract.xml
+acks.xml
 arch.fig
 builder.fig
-copyright.sgml
-design.sgml
-future.sgml
-install.sgml
-intro.sgml
+copyright.xml
+design.xml
+future.xml
+install.xml
+intro.xml
 job-task.fig
-main.sgml
+main.xml
 node.fig
-process.sgml
+process.xml
 scanner.fig
 scons.mod
 sig.fig
diff --git a/doc/python10/abstract.sgml b/doc/python10/abstract.xml
index 294180b..294180b 100644
--- a/doc/python10/abstract.sgml
+++ b/doc/python10/abstract.xml
diff --git a/doc/python10/acks.sgml b/doc/python10/acks.xml
index 895bad7..895bad7 100644
--- a/doc/python10/acks.sgml
+++ b/doc/python10/acks.xml
diff --git a/doc/python10/copyright.sgml b/doc/python10/copyright.xml
index d141fc6..d141fc6 100644
--- a/doc/python10/copyright.sgml
+++ b/doc/python10/copyright.xml
diff --git a/doc/python10/design.sgml b/doc/python10/design.xml
index cb58af9..cb58af9 100644
--- a/doc/python10/design.sgml
+++ b/doc/python10/design.xml
diff --git a/doc/python10/future.sgml b/doc/python10/future.xml
index 272d508..272d508 100644
--- a/doc/python10/future.sgml
+++ b/doc/python10/future.xml
diff --git a/doc/python10/install.sgml b/doc/python10/install.xml
index d150beb..d150beb 100644
--- a/doc/python10/install.sgml
+++ b/doc/python10/install.xml
diff --git a/doc/python10/intro.sgml b/doc/python10/intro.xml
index d3057be..d3057be 100644
--- a/doc/python10/intro.sgml
+++ b/doc/python10/intro.xml
diff --git a/doc/python10/main.sgml b/doc/python10/main.xml
index ff1e317..42bc4af 100644
--- a/doc/python10/main.sgml
+++ b/doc/python10/main.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+
 <!--
 
   Copyright (c) 2001, 2002, 2003 Steven Knight
@@ -23,20 +25,21 @@
 
 -->
 
-<!doctype article PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
 
     <!ENTITY % scons SYSTEM "scons.mod">
     %scons;
 
-    <!ENTITY abstract SYSTEM "abstract.sgml">
-    <!ENTITY acks SYSTEM "acks.sgml">
-    <!ENTITY copyright SYSTEM "copyright.sgml">
-    <!ENTITY design SYSTEM "design.sgml">
-    <!ENTITY future SYSTEM "future.sgml">
-    <!ENTITY install SYSTEM "install.sgml">
-    <!ENTITY intro SYSTEM "intro.sgml">
-    <!ENTITY process SYSTEM "process.sgml">
+    <!ENTITY abstract SYSTEM "abstract.xml">
+    <!ENTITY acks SYSTEM "acks.xml">
+    <!ENTITY copyright SYSTEM "copyright.xml">
+    <!ENTITY design SYSTEM "design.xml">
+    <!ENTITY future SYSTEM "future.xml">
+    <!ENTITY install SYSTEM "install.xml">
+    <!ENTITY intro SYSTEM "intro.xml">
+    <!ENTITY process SYSTEM "process.xml">
 
 ]>
 
diff --git a/doc/python10/process.sgml b/doc/python10/process.xml
index f1b2479..f1b2479 100644
--- a/doc/python10/process.sgml
+++ b/doc/python10/process.xml
diff --git a/doc/reference/Alias.sgml b/doc/reference/Alias.xml
index b87967d..b87967d 100644
--- a/doc/reference/Alias.sgml
+++ b/doc/reference/Alias.xml
diff --git a/doc/reference/CFile.sgml b/doc/reference/CFile.xml
index f76c390..f76c390 100644
--- a/doc/reference/CFile.sgml
+++ b/doc/reference/CFile.xml
diff --git a/doc/reference/CXXFile.sgml b/doc/reference/CXXFile.xml
index c1c038e..c1c038e 100644
--- a/doc/reference/CXXFile.sgml
+++ b/doc/reference/CXXFile.xml
diff --git a/doc/reference/Command.sgml b/doc/reference/Command.xml
index abb3a58..abb3a58 100644
--- a/doc/reference/Command.sgml
+++ b/doc/reference/Command.xml
diff --git a/doc/reference/Install.sgml b/doc/reference/Install.xml
index 2d06e3b..2d06e3b 100644
--- a/doc/reference/Install.sgml
+++ b/doc/reference/Install.xml
diff --git a/doc/reference/InstallAs.sgml b/doc/reference/InstallAs.xml
index ed8cb78..ed8cb78 100644
--- a/doc/reference/InstallAs.sgml
+++ b/doc/reference/InstallAs.xml
diff --git a/doc/reference/Library.sgml b/doc/reference/Library.xml
index 19a3e96..19a3e96 100644
--- a/doc/reference/Library.sgml
+++ b/doc/reference/Library.xml
diff --git a/doc/reference/MANIFEST b/doc/reference/MANIFEST
index 1ea958e..438aada 100644
--- a/doc/reference/MANIFEST
+++ b/doc/reference/MANIFEST
@@ -1,21 +1,21 @@
-Alias.sgml
-CFile.sgml
-CXXFile.sgml
-Command.sgml
-Install.sgml
-InstallAs.sgml
-Library.sgml
-Object.sgml
-PCH.sgml
-PDF.sgml
-PostScript.sgml
-Program.sgml
-RES.sgml
-SharedLibrary.sgml
-SharedObject.sgml
-StaticLibrary.sgml
-StaticObject.sgml
-copyright.sgml
-errors.sgml
-main.sgml
-preface.sgml
+Alias.xml
+CFile.xml
+CXXFile.xml
+Command.xml
+Install.xml
+InstallAs.xml
+Library.xml
+Object.xml
+PCH.xml
+PDF.xml
+PostScript.xml
+Program.xml
+RES.xml
+SharedLibrary.xml
+SharedObject.xml
+StaticLibrary.xml
+StaticObject.xml
+copyright.xml
+errors.xml
+main.xml
+preface.xml
diff --git a/doc/reference/Object.sgml b/doc/reference/Object.xml
index 9e887d8..9e887d8 100644
--- a/doc/reference/Object.sgml
+++ b/doc/reference/Object.xml
diff --git a/doc/reference/PCH.sgml b/doc/reference/PCH.xml
index b2a4d75..b2a4d75 100644
--- a/doc/reference/PCH.sgml
+++ b/doc/reference/PCH.xml
diff --git a/doc/reference/PDF.sgml b/doc/reference/PDF.xml
index b3a25dc..b3a25dc 100644
--- a/doc/reference/PDF.sgml
+++ b/doc/reference/PDF.xml
diff --git a/doc/reference/PostScript.sgml b/doc/reference/PostScript.xml
index f5a6579..f5a6579 100644
--- a/doc/reference/PostScript.sgml
+++ b/doc/reference/PostScript.xml
diff --git a/doc/reference/Program.sgml b/doc/reference/Program.xml
index 30f90d2..30f90d2 100644
--- a/doc/reference/Program.sgml
+++ b/doc/reference/Program.xml
diff --git a/doc/reference/RES.sgml b/doc/reference/RES.xml
index 15c0aea..15c0aea 100644
--- a/doc/reference/RES.sgml
+++ b/doc/reference/RES.xml
diff --git a/doc/reference/SharedLibrary.sgml b/doc/reference/SharedLibrary.xml
index 603dab1..603dab1 100644
--- a/doc/reference/SharedLibrary.sgml
+++ b/doc/reference/SharedLibrary.xml
diff --git a/doc/reference/SharedObject.sgml b/doc/reference/SharedObject.xml
index 0860769..0860769 100644
--- a/doc/reference/SharedObject.sgml
+++ b/doc/reference/SharedObject.xml
diff --git a/doc/reference/StaticLibrary.sgml b/doc/reference/StaticLibrary.xml
index ea7ae5b..ea7ae5b 100644
--- a/doc/reference/StaticLibrary.sgml
+++ b/doc/reference/StaticLibrary.xml
diff --git a/doc/reference/StaticObject.sgml b/doc/reference/StaticObject.xml
index ff8dae8..ff8dae8 100644
--- a/doc/reference/StaticObject.sgml
+++ b/doc/reference/StaticObject.xml
diff --git a/doc/reference/copyright.sgml b/doc/reference/copyright.xml
index 7f6059c..7f6059c 100644
--- a/doc/reference/copyright.sgml
+++ b/doc/reference/copyright.xml
diff --git a/doc/reference/errors.sgml b/doc/reference/errors.xml
index 448777f..448777f 100644
--- a/doc/reference/errors.sgml
+++ b/doc/reference/errors.xml
diff --git a/doc/reference/main.sgml b/doc/reference/main.xml
index 87b4a84..ed122f6 100644
--- a/doc/reference/main.sgml
+++ b/doc/reference/main.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+
 <!--
 
   Copyright (c) 2001, 2002, 2003 Steven Knight
@@ -23,39 +25,40 @@
 
 -->
 
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
 
-    <!ENTITY % version SYSTEM "../version.sgml">
+    <!ENTITY % version SYSTEM "../version.xml">
     %version;
 
     <!ENTITY % scons SYSTEM "../scons.mod">
     %scons;
 
     <!-- Builders -->
-    <!ENTITY Alias_file SYSTEM "Alias.sgml">
-    <!ENTITY CFile_file SYSTEM "CFile.sgml">
-    <!ENTITY CXXFile_file SYSTEM "CXXFile.sgml">
-    <!ENTITY Command_file SYSTEM "Command.sgml">
-    <!ENTITY Install_file SYSTEM "Install.sgml">
-    <!ENTITY InstallAs_file SYSTEM "InstallAs.sgml">
-    <!ENTITY Library_file SYSTEM "Library.sgml">
-    <!ENTITY Object_file SYSTEM "Object.sgml">
-    <!ENTITY PCH_file SYSTEM "PCH.sgml">
-    <!ENTITY PDF_file SYSTEM "PDF.sgml">
-    <!ENTITY PostScript_file SYSTEM "PostScript.sgml">
-    <!ENTITY Program_file SYSTEM "Program.sgml">
-    <!ENTITY RES_file SYSTEM "RES.sgml">
-    <!ENTITY SharedLibrary_file SYSTEM "SharedLibrary.sgml">
-    <!ENTITY SharedObject_file SYSTEM "SharedObject.sgml">
-    <!ENTITY StaticLibrary_file SYSTEM "StaticLibrary.sgml">
-    <!ENTITY StaticObject_file SYSTEM "StaticObject.sgml">
+    <!ENTITY Alias_file SYSTEM "Alias.xml">
+    <!ENTITY CFile_file SYSTEM "CFile.xml">
+    <!ENTITY CXXFile_file SYSTEM "CXXFile.xml">
+    <!ENTITY Command_file SYSTEM "Command.xml">
+    <!ENTITY Install_file SYSTEM "Install.xml">
+    <!ENTITY InstallAs_file SYSTEM "InstallAs.xml">
+    <!ENTITY Library_file SYSTEM "Library.xml">
+    <!ENTITY Object_file SYSTEM "Object.xml">
+    <!ENTITY PCH_file SYSTEM "PCH.xml">
+    <!ENTITY PDF_file SYSTEM "PDF.xml">
+    <!ENTITY PostScript_file SYSTEM "PostScript.xml">
+    <!ENTITY Program_file SYSTEM "Program.xml">
+    <!ENTITY RES_file SYSTEM "RES.xml">
+    <!ENTITY SharedLibrary_file SYSTEM "SharedLibrary.xml">
+    <!ENTITY SharedObject_file SYSTEM "SharedObject.xml">
+    <!ENTITY StaticLibrary_file SYSTEM "StaticLibrary.xml">
+    <!ENTITY StaticObject_file SYSTEM "StaticObject.xml">
 
     <!-- Construction Variables -->
 
-    <!ENTITY copyright SYSTEM "copyright.sgml">
-    <!ENTITY errors SYSTEM "errors.sgml">
-    <!ENTITY preface SYSTEM "preface.sgml">
+    <!ENTITY copyright SYSTEM "copyright.xml">
+    <!ENTITY errors SYSTEM "errors.xml">
+    <!ENTITY preface SYSTEM "preface.xml">
 
 ]>
 
diff --git a/doc/reference/preface.sgml b/doc/reference/preface.xml
index 82ea44a..82ea44a 100644
--- a/doc/reference/preface.sgml
+++ b/doc/reference/preface.xml
diff --git a/doc/scons.mod b/doc/scons.mod
index 652787a..f3c1a86 100644
--- a/doc/scons.mod
+++ b/doc/scons.mod
@@ -175,6 +175,7 @@
 <!ENTITY Export "<function>Export</function>">
 <!ENTITY File "<function>File</function>">
 <!ENTITY FindFile "<function>FindFile</function>">
+<!ENTITY FindInstalledFiles "<function>FindInstalledFiles</function>">
 <!ENTITY Finish "<function>Finish</function>">
 <!ENTITY GenerateHelpText "<function>GenerateHelpText</function>">
 <!ENTITY GetOption "<function>GetOption</function>">
@@ -212,10 +213,12 @@
 <!ENTITY Salt "<function>Salt</function>">
 <!ENTITY SetBuildSignatureType "<function>SetBuildSignatureType</function>">
 <!ENTITY SetContentSignatureType "<function>SetContentSignatureType</function>">
+<!ENTITY SetOption "<function>SetOption</function>">
 <!ENTITY SideEffect "<function>SideEffect</function>">
 <!ENTITY SourceSignature "<function>SourceSignature</function>">
 <!ENTITY SourceSignatures "<function>SourceSignatures</function>">
 <!ENTITY Split "<function>Split</function>">
+<!ENTITY Tag "<function>Tag</function>">
 <!ENTITY TargetSignatures "<function>TargetSignatures</function>">
 <!ENTITY Task "<function>Task</function>">
 <!ENTITY Touch "<function>Touch</function>">
diff --git a/doc/user/ENV.sgml b/doc/user/ENV.xml
index d843276..d843276 100644
--- a/doc/user/ENV.sgml
+++ b/doc/user/ENV.xml
diff --git a/doc/user/MANIFEST b/doc/user/MANIFEST
index cc7dc1e..565298f 100644
--- a/doc/user/MANIFEST
+++ b/doc/user/MANIFEST
@@ -1,46 +1,46 @@
-actions.sgml
-alias.sgml
-ant.sgml
-builders.sgml
-builders-built-in.sgml
-builders-commands.sgml
-builders-writing.sgml
-build-install.sgml
-caching.sgml
-command-line.sgml
+actions.xml
+alias.xml
+ant.xml
+builders.xml
+builders-built-in.xml
+builders-commands.xml
+builders-writing.xml
+build-install.xml
+caching.xml
+command-line.xml
 cons.pl
-copyright.sgml
-depends.sgml
-ENV.sgml
-environments.sgml
-errors.sgml
-example.sgml
-factories.sgml
-file-removal.sgml
-help.sgml
-hierarchy.sgml
-install.sgml
-java.sgml
-libraries.sgml
-less-simple.sgml
-main.sgml
-make.sgml
-nodes.sgml
-parseconfig.sgml
-preface.sgml
-python.sgml
-repositories.sgml
-run.sgml
-scanners.sgml
-sconf.sgml
-separate.sgml
-simple.sgml
-sourcecode.sgml
-tasks.sgml
-tools.sgml
-troubleshoot.sgml
-variants.sgml
-variables.sgml
+copyright.xml
+depends.xml
+ENV.xml
+environments.xml
+errors.xml
+example.xml
+factories.xml
+file-removal.xml
+help.xml
+hierarchy.xml
+install.xml
+java.xml
+libraries.xml
+less-simple.xml
+main.xml
+make.xml
+nodes.xml
+parseconfig.xml
+preface.xml
+python.xml
+repositories.xml
+run.xml
+scanners.xml
+sconf.xml
+separate.xml
+simple.xml
+sourcecode.xml
+tasks.xml
+tools.xml
+troubleshoot.xml
+variants.xml
+variables.xml
 SCons-win32-install-1.jpg
 SCons-win32-install-2.jpg
 SCons-win32-install-3.jpg
diff --git a/doc/user/actions.sgml b/doc/user/actions.xml
index 928b7ea..928b7ea 100644
--- a/doc/user/actions.sgml
+++ b/doc/user/actions.xml
diff --git a/doc/user/alias.sgml b/doc/user/alias.xml
index f285d70..f285d70 100644
--- a/doc/user/alias.sgml
+++ b/doc/user/alias.xml
diff --git a/doc/user/ant.sgml b/doc/user/ant.xml
index 0df1027..0df1027 100644
--- a/doc/user/ant.sgml
+++ b/doc/user/ant.xml
diff --git a/doc/user/build-install.sgml b/doc/user/build-install.xml
index 763c13e..763c13e 100644
--- a/doc/user/build-install.sgml
+++ b/doc/user/build-install.xml
diff --git a/doc/user/builders-built-in.sgml b/doc/user/builders-built-in.xml
index cf09fd5..cf09fd5 100644
--- a/doc/user/builders-built-in.sgml
+++ b/doc/user/builders-built-in.xml
diff --git a/doc/user/builders-commands.in b/doc/user/builders-commands.in
index 13a5c56..7265a23 100644
--- a/doc/user/builders-commands.in
+++ b/doc/user/builders-commands.in
@@ -79,6 +79,15 @@
      </file>
   </scons_example>
 
+  <para>
+
+  When executed,
+  &SCons; runs the specified command,
+  substituting &cv-link-SOURCE; and &cv-link-TARGET;
+  as expected:
+
+  </para>
+
   <scons_output example="ex1">
     <scons_output_command>scons -Q</scons_output_command>
   </scons_output>
@@ -94,7 +103,9 @@
 
   <para>
 
-  Note that the action you 
+  Note that the action you specify to the
+  &Command; &Builder; can be any legal &SCons; &Action;,
+  such as a Python function:
 
   </para>
 
@@ -111,6 +122,12 @@
      </file>
   </scons_example>
 
+  <para>
+
+  Which executes as follows:
+
+  </para>
+
   <scons_output example="ex2">
     <scons_output_command>scons -Q</scons_output_command>
   </scons_output>
diff --git a/doc/user/builders-commands.sgml b/doc/user/builders-commands.xml
index d2b990a..15a6015 100644
--- a/doc/user/builders-commands.sgml
+++ b/doc/user/builders-commands.xml
@@ -74,6 +74,15 @@
      env.Command('foo.out', 'foo.in', "sed 's/x/y/' &lt; $SOURCE &gt; $TARGET")
   </programlisting>
 
+  <para>
+
+  When executed,
+  &SCons; runs the specified command,
+  substituting &cv-link-SOURCE; and &cv-link-TARGET;
+  as expected:
+
+  </para>
+
   <screen>
     % <userinput>scons -Q</userinput>
     sed 's/x/y/' &lt; foo.in &gt; foo.out
@@ -90,7 +99,9 @@
 
   <para>
 
-  Note that the action you 
+  Note that the action you specify to the
+  &Command; &Builder; can be any legal &SCons; &Action;,
+  such as a Python function:
 
   </para>
 
@@ -102,6 +113,12 @@
      env.Command('foo.out', 'foo.in', build)
   </programlisting>
 
+  <para>
+
+  Which executes as follows:
+
+  </para>
+
   <screen>
     % <userinput>scons -Q</userinput>
     build(["foo.out"], ["foo.in"])
diff --git a/doc/user/builders-writing.in b/doc/user/builders-writing.in
index 62717aa..7497277 100644
--- a/doc/user/builders-writing.in
+++ b/doc/user/builders-writing.in
@@ -219,8 +219,31 @@ This functionality could be invoked as in the following example:
 
     </para>
 
+   <!--
+   The ToolSurrogate stuff that's used to capture output initializes
+   SCons.Defaults.ConstructionEnvironment with its own list of TOOLS.
+   In this next example, we want to show the user that when they
+   set the BUILDERS explicitly, the call to env.Program() generates
+   an AttributeError.  This won't happen with all of the default
+   ToolSurrogates in the default construction environment.  To make the
+   AttributeError show up, we have to overwite the default construction
+   environment's TOOLS variable so Program() builder doesn't show up.
+
+   We do this by executing a slightly different SConstruct file than the
+   one we print in the guide, with two extra statements at the front
+   that overwrite the TOOLS variable as described.  Note that we have
+   to jam those statements on to the first line to keep the line number
+   in the generated error consistent with what the user will see in the
+   User's Guide.
+   -->
     <scons_example name="ex2">
-       <file name="SConstruct" printme="1">
+       <file name="SConstruct">
+       import SCons.Defaults; SCons.Defaults.ConstructionEnvironment['TOOLS'] = {}; bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
+       env = Environment(BUILDERS = {'Foo' : bld})
+       env.Foo('file.foo', 'file.input')
+       env.Program('hello.c')
+       </file>
+       <file name="SConstruct.printme" printme="1">
        bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env = Environment(BUILDERS = {'Foo' : bld})
        env.Foo('file.foo', 'file.input')
diff --git a/doc/user/builders-writing.sgml b/doc/user/builders-writing.xml
index 412d431..50f6556 100644
--- a/doc/user/builders-writing.sgml
+++ b/doc/user/builders-writing.xml
@@ -206,6 +206,23 @@ This functionality could be invoked as in the following example:
 
     </para>
 
+   <!--
+   The ToolSurrogate stuff that's used to capture output initializes
+   SCons.Defaults.ConstructionEnvironment with its own list of TOOLS.
+   In this next example, we want to show the user that when they
+   set the BUILDERS explicitly, the call to env.Program() generates
+   an AttributeError.  This won't happen with all of the default
+   ToolSurrogates in the default construction environment.  To make the
+   AttributeError show up, we have to overwite the default construction
+   environment's TOOLS variable so Program() builder doesn't show up.
+
+   We do this by executing a slightly different SConstruct file than the
+   one we print in the guide, with two extra statements at the front
+   that overwrite the TOOLS variable as described.  Note that we have
+   to jam those statements on to the first line to keep the line number
+   in the generated error consistent with what the user will see in the
+   User's Guide.
+   -->
     <programlisting>
        bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
        env = Environment(BUILDERS = {'Foo' : bld})
@@ -215,8 +232,8 @@ This functionality could be invoked as in the following example:
 
     <screen>
       % <userinput>scons -Q</userinput>
-      AttributeError: 'SConsEnvironment' object has no attribute 'Program':
-        File "SConstruct", line 4:
+      AttributeError: SConsEnvironment instance has no attribute 'Program':
+        File "/home/my/project/SConstruct", line 4:
           env.Program('hello.c')
     </screen>
 
diff --git a/doc/user/builders.in b/doc/user/builders.in
index 2bc139d..f3989ef 100644
--- a/doc/user/builders.in
+++ b/doc/user/builders.in
@@ -24,7 +24,8 @@
 -->
 
 <!--
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 
 <refentry id="Command">
 
diff --git a/doc/user/builders.sgml b/doc/user/builders.xml
index 2bc139d..f3989ef 100644
--- a/doc/user/builders.sgml
+++ b/doc/user/builders.xml
@@ -24,7 +24,8 @@
 -->
 
 <!--
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 
 <refentry id="Command">
 
diff --git a/doc/user/caching.in b/doc/user/caching.in
index 8dfa731..186ece6 100644
--- a/doc/user/caching.in
+++ b/doc/user/caching.in
@@ -436,7 +436,7 @@
     in a random order without having to specify
     the <literal>--random</literal> on very command line,
     you can use the &SetOption; function to
-    set the <literal>random</litera> option
+    set the <literal>random</literal> option
     within any &SConscript; file:
 
     </para>
diff --git a/doc/user/caching.sgml b/doc/user/caching.xml
index 02c3597..51b30ae 100644
--- a/doc/user/caching.sgml
+++ b/doc/user/caching.xml
@@ -439,6 +439,26 @@
 
     </para>
 
+    <para>
+
+    If you want to make sure dependencies will be built
+    in a random order without having to specify
+    the <literal>--random</literal> on very command line,
+    you can use the &SetOption; function to
+    set the <literal>random</literal> option
+    within any &SConscript; file:
+
+    </para>
+
+    <programlisting>
+       Program('prog',
+               ['f1.c', 'f2.c', 'f3.c', 'f4.c', 'f5.c'])
+
+       SetOption('random', 1)
+       Program('prog',
+               ['f1.c', 'f2.c', 'f3.c', 'f4.c', 'f5.c'])
+    </programlisting>
+
   </section>
 
   <!--
diff --git a/doc/user/command-line.sgml b/doc/user/command-line.xml
index 1bc94d7..d7f3d7b 100644
--- a/doc/user/command-line.sgml
+++ b/doc/user/command-line.xml
@@ -961,7 +961,7 @@
         
         scons: *** Error converting option: RELEASE
         Invalid value for boolean option: bad_value
-        File "/home/my/project/SConstruct", line 4, in ?
+        File "/home/my/project/SConstruct", line 4, in &lt;module&gt;
       </screen>
 
     </section>
@@ -1024,7 +1024,7 @@
         % <userinput>scons -Q COLOR=magenta foo.o</userinput>
         
         scons: *** Invalid value for option COLOR: magenta
-        File "/home/my/project/SConstruct", line 5, in ?
+        File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
       </screen>
 
       <para>
@@ -1080,15 +1080,15 @@
         % <userinput>scons -Q COLOR=Red foo.o</userinput>
         
         scons: *** Invalid value for option COLOR: Red
-        File "/home/my/project/SConstruct", line 5, in ?
+        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 "/home/my/project/SConstruct", line 5, in ?
+        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 "/home/my/project/SConstruct", line 5, in ?
+        File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
       </screen>
 
       <para>
@@ -1241,7 +1241,7 @@
         
         scons: *** Error converting option: COLORS
         Invalid value(s) for option: magenta
-        File "/home/my/project/SConstruct", line 5, in ?
+        File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
       </screen>
 
     </section>
@@ -1298,7 +1298,7 @@
         % <userinput>scons -Q CONFIG=/does/not/exist foo.o</userinput>
         
         scons: *** Path for option CONFIG does not exist: /does/not/exist
-        File "/home/my/project/SConstruct", line 6, in ?
+        File "/home/my/project/SConstruct", line 6, in &lt;module&gt;
       </screen>
 
       <para>
diff --git a/doc/user/copyright.sgml b/doc/user/copyright.xml
index 76e3e50..76e3e50 100644
--- a/doc/user/copyright.sgml
+++ b/doc/user/copyright.xml
diff --git a/doc/user/depends.sgml b/doc/user/depends.xml
index 9e055ee..9e055ee 100644
--- a/doc/user/depends.sgml
+++ b/doc/user/depends.xml
diff --git a/doc/user/environments.sgml b/doc/user/environments.xml
index 67a5551..fbcef99 100644
--- a/doc/user/environments.sgml
+++ b/doc/user/environments.xml
@@ -536,7 +536,7 @@ environment undisturbed.
       % <userinput>scons -Q</userinput>
       
       scons: *** Two environments with different actions were specified for the same target: foo.o
-      File "/home/my/project/SConstruct", line 6, in ?
+      File "/home/my/project/SConstruct", line 6, in &lt;module&gt;
    </screen>
 
    <para>
diff --git a/doc/user/example.sgml b/doc/user/errors.xml
index 0891bf8..0891bf8 100644
--- a/doc/user/example.sgml
+++ b/doc/user/errors.xml
diff --git a/doc/user/errors.sgml b/doc/user/example.xml
index 0891bf8..0891bf8 100644
--- a/doc/user/errors.sgml
+++ b/doc/user/example.xml
diff --git a/doc/user/factories.in b/doc/user/factories.in
index 6ef5249..d0c5313 100644
--- a/doc/user/factories.in
+++ b/doc/user/factories.in
@@ -298,9 +298,8 @@
       <file name="S" printme="1">
       Command("file.out", "file.in",
               [
-                Copy("tempfile", "$SOURCE"),
-                "modify tempfile",
-                Move("$TARGET", "tempfile"),
+                Copy("$TARGET", "$SOURCE"),
+                Touch("$TARGET"),
               ])
       </file>
       <file name="SConstruct">
@@ -310,9 +309,6 @@
       SConscript('S')
       </file>
       <file name="file.in">file.in</file>
-      <file name="modify" chmod="0755">
-      touch $*
-      </file>
     </scons_example>
 
     <para>
diff --git a/doc/user/factories.sgml b/doc/user/factories.xml
index e0567f6..7c09e4b 100644
--- a/doc/user/factories.sgml
+++ b/doc/user/factories.xml
@@ -266,9 +266,8 @@
     <programlisting>
       Command("file.out", "file.in",
               [
-                Copy("tempfile", "$SOURCE"),
-                "modify tempfile",
-                Move("$TARGET", "tempfile"),
+                Copy("$TARGET", "$SOURCE"),
+                Touch("$TARGET"),
               ])
     </programlisting>
 
@@ -280,9 +279,8 @@
 
     <screen>
       % <userinput>scons -Q</userinput>
-      Copy("tempfile", "file.in")
-      modify tempfile
-      Move("file.out", "tempfile")
+      Copy("file.out", "file.in")
+      Touch("file.out")
     </screen>
 
   </section>
diff --git a/doc/user/file-removal.sgml b/doc/user/file-removal.xml
index f64d394..f64d394 100644
--- a/doc/user/file-removal.sgml
+++ b/doc/user/file-removal.xml
diff --git a/doc/user/help.sgml b/doc/user/help.xml
index ca44a40..ca44a40 100644
--- a/doc/user/help.sgml
+++ b/doc/user/help.xml
diff --git a/doc/user/hierarchy.in b/doc/user/hierarchy.in
index d93e811..e0d6b00 100644
--- a/doc/user/hierarchy.in
+++ b/doc/user/hierarchy.in
@@ -418,7 +418,7 @@ make no difference to the build.
 
     (Notice that the <literal>lib/foo1.o</literal> object file
     is built in the same directory as its source file.
-    See <xref linkend="chap-separate">, below,
+    See <xref linkend="chap-separate"></xref>, below,
     for information about
     how to build the object file in a different subdirectory.)
 
@@ -470,7 +470,7 @@ make no difference to the build.
     (As was the case with top-relative path names,
     notice that the <literal>/usr/joe/lib/foo1.o</literal> object file
     is built in the same directory as its source file.
-    See <xref linkend="chap-separate">, below,
+    See <xref linkend="chap-separate"></xref>, below,
     for information about
     how to build the object file in a different subdirectory.)
 
diff --git a/doc/user/hierarchy.sgml b/doc/user/hierarchy.xml
index 713d605..4c84d5b 100644
--- a/doc/user/hierarchy.sgml
+++ b/doc/user/hierarchy.xml
@@ -392,7 +392,7 @@ make no difference to the build.
 
     (Notice that the <literal>lib/foo1.o</literal> object file
     is built in the same directory as its source file.
-    See <xref linkend="chap-separate">, below,
+    See <xref linkend="chap-separate"></xref>, below,
     for information about
     how to build the object file in a different subdirectory.)
 
@@ -434,7 +434,7 @@ make no difference to the build.
     (As was the case with top-relative path names,
     notice that the <literal>/usr/joe/lib/foo1.o</literal> object file
     is built in the same directory as its source file.
-    See <xref linkend="chap-separate">, below,
+    See <xref linkend="chap-separate"></xref>, below,
     for information about
     how to build the object file in a different subdirectory.)
 
diff --git a/doc/user/install.sgml b/doc/user/install.xml
index 2a6d1b8..2a6d1b8 100644
--- a/doc/user/install.sgml
+++ b/doc/user/install.xml
diff --git a/doc/user/java.sgml b/doc/user/java.xml
index 1876916..1876916 100644
--- a/doc/user/java.sgml
+++ b/doc/user/java.xml
diff --git a/doc/user/less-simple.in b/doc/user/less-simple.in
index ccc59b6..76afa30 100644
--- a/doc/user/less-simple.in
+++ b/doc/user/less-simple.in
@@ -126,10 +126,10 @@
 
     <scons_example name="ex2">
        <file name="SConstruct" printme="1">
-       Program(['main.c', 'file1.c', 'file2.c'])
+       Program(['prog.c', 'file1.c', 'file2.c'])
        </file>
-       <file name="main.c">
-       int main() { printf("main.c\n"); }
+       <file name="prog.c">
+       int main() { printf("prog.c\n"); }
        </file>
        <file name="file1.c">
        void file1() { printf("file1.c\n"); }
@@ -173,9 +173,9 @@
 
     <scons_example name="ex3">
        <file name="SConstruct" printme="1">
-       Program('program', ['main.c', 'file1.c', 'file2.c'])
+       Program('program', ['prog.c', 'file1.c', 'file2.c'])
        </file>
-       <file name="main.c">
+       <file name="prog.c">
        int main() { printf("prog.c\n"); }
        </file>
        <file name="file1.c">
@@ -509,7 +509,7 @@
     from the common source files,
     which can then be linked into resulting programs.
     (Creating libraries is discussed in
-    <xref linkend="chap-libraries">, below.)
+    <xref linkend="chap-libraries"></xref>, below.)
 
     </para>
 
diff --git a/doc/user/less-simple.sgml b/doc/user/less-simple.xml
index ad20812..eea3425 100644
--- a/doc/user/less-simple.sgml
+++ b/doc/user/less-simple.xml
@@ -124,7 +124,7 @@
     </para>
 
     <programlisting>
-       Program(['main.c', 'file1.c', 'file2.c'])
+       Program(['prog.c', 'file1.c', 'file2.c'])
     </programlisting>
 
     <para>
@@ -137,8 +137,8 @@
        % <userinput>scons -Q</userinput>
        cc -o file1.o -c file1.c
        cc -o file2.o -c file2.c
-       cc -o main.o -c main.c
-       cc -o main main.o file1.o file2.o
+       cc -o prog.o -c prog.c
+       cc -o prog prog.o file1.o file2.o
     </screen>
 
     <para>
@@ -164,7 +164,7 @@
     </para>
 
     <programlisting>
-       Program('program', ['main.c', 'file1.c', 'file2.c'])
+       Program('program', ['prog.c', 'file1.c', 'file2.c'])
     </programlisting>
 
     <para>
@@ -177,8 +177,8 @@
        % <userinput>scons -Q</userinput>
        cc -o file1.o -c file1.c
        cc -o file2.o -c file2.c
-       cc -o main.o -c main.c
-       cc -o program main.o file1.o file2.o
+       cc -o prog.o -c prog.c
+       cc -o program prog.o file1.o file2.o
     </screen>
 
     <para>
@@ -191,8 +191,8 @@
        C:\><userinput>scons -Q</userinput>
        cl /nologo /c file1.c /Fofile1.obj
        cl /nologo /c file2.c /Fofile2.obj
-       cl /nologo /c main.c /Fomain.obj
-       link /nologo /OUT:program.exe main.obj file1.obj file2.obj
+       cl /nologo /c prog.c /Foprog.obj
+       link /nologo /OUT:program.exe prog.obj file1.obj file2.obj
     </screen>
 
   </section>
@@ -492,7 +492,7 @@
     from the common source files,
     which can then be linked into resulting programs.
     (Creating libraries is discussed in
-    <xref linkend="chap-libraries">, below.)
+    <xref linkend="chap-libraries"></xref>, below.)
 
     </para>
 
diff --git a/doc/user/libraries.in b/doc/user/libraries.in
index 0fe53b8..1ccb1c3 100644
--- a/doc/user/libraries.in
+++ b/doc/user/libraries.in
@@ -142,7 +142,7 @@
 
       Of course, in this example, the object files
       must already exist for the build to succeed.
-      See <xref linkend="chap-nodes">, below,
+      See <xref linkend="chap-nodes"></xref>, below,
       for information about how you can
       build object files explicitly
       and include the built files in a library.
@@ -159,7 +159,7 @@
       The &b-link-Library; function builds a traditional static library.
       If you want to be explicit about the type of library being built,
       you can use the synonym &b-link-StaticLibrary; function
-      instead of &b-Library:
+      instead of &b-Library;:
 
       </para>
 
diff --git a/doc/user/libraries.sgml b/doc/user/libraries.xml
index 772810f..035ebd3 100644
--- a/doc/user/libraries.sgml
+++ b/doc/user/libraries.xml
@@ -130,7 +130,7 @@
 
       Of course, in this example, the object files
       must already exist for the build to succeed.
-      See <xref linkend="chap-nodes">, below,
+      See <xref linkend="chap-nodes"></xref>, below,
       for information about how you can
       build object files explicitly
       and include the built files in a library.
@@ -147,7 +147,7 @@
       The &b-link-Library; function builds a traditional static library.
       If you want to be explicit about the type of library being built,
       you can use the synonym &b-link-StaticLibrary; function
-      instead of &b-Library:
+      instead of &b-Library;:
 
       </para>
 
diff --git a/doc/user/main.in b/doc/user/main.in
index aaddb2a..c3cf2c2 100644
--- a/doc/user/main.in
+++ b/doc/user/main.in
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
   __COPYRIGHT__
@@ -23,10 +24,11 @@
 
 -->
 
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
 
-    <!ENTITY % version SYSTEM "../version.sgml">
+    <!ENTITY % version SYSTEM "../version.xml">
     %version;
 
     <!ENTITY % scons SYSTEM "../scons.mod">
@@ -41,47 +43,47 @@
     <!ENTITY % variables-mod SYSTEM "variables.mod">
     %variables-mod;
 
-    <!ENTITY actions SYSTEM "actions.sgml">
-    <!ENTITY alias SYSTEM "alias.sgml">
-    <!ENTITY ant SYSTEM "ant.sgml">
-    <!ENTITY build-install SYSTEM "build-install.sgml">
-    <!ENTITY builders SYSTEM "builders.sgml">
-    <!ENTITY builders-built-in SYSTEM "builders-built-in.sgml">
-    <!ENTITY builders-commands SYSTEM "builders-commands.sgml">
-    <!ENTITY builders-writing SYSTEM "builders-writing.sgml">
-    <!ENTITY caching SYSTEM "caching.sgml">
-    <!ENTITY command-line SYSTEM "command-line.sgml">
-    <!ENTITY copyright SYSTEM "copyright.sgml">
-    <!ENTITY depends SYSTEM "depends.sgml">
-    <!ENTITY ENV_file SYSTEM "ENV.sgml">
-    <!ENTITY environments SYSTEM "environments.sgml">
-    <!ENTITY errors SYSTEM "errors.sgml">
-    <!ENTITY example SYSTEM "example.sgml">
-    <!ENTITY factories SYSTEM "factories.sgml">
-    <!ENTITY file-removal SYSTEM "file-removal.sgml">
-    <!ENTITY help SYSTEM "help.sgml">
-    <!ENTITY hierarchy SYSTEM "hierarchy.sgml">
-    <!ENTITY java SYSTEM "java.sgml">
-    <!ENTITY install SYSTEM "install.sgml">
-    <!ENTITY less-simple SYSTEM "less-simple.sgml">
-    <!ENTITY libraries SYSTEM "libraries.sgml">
-    <!ENTITY make SYSTEM "make.sgml">
-    <!ENTITY nodes SYSTEM "nodes.sgml">
-    <!ENTITY parseconfig SYSTEM "parseconfig.sgml">
-    <!ENTITY preface SYSTEM "preface.sgml">
-    <!ENTITY python SYSTEM "python.sgml">
-    <!ENTITY repositories SYSTEM "repositories.sgml">
-    <!ENTITY run SYSTEM "run.sgml">
-    <!ENTITY scanners SYSTEM "scanners.sgml">
-    <!ENTITY sconf SYSTEM "sconf.sgml">
-    <!ENTITY separate SYSTEM "separate.sgml">
-    <!ENTITY simple SYSTEM "simple.sgml">
-    <!ENTITY sourcecode SYSTEM "sourcecode.sgml">
-    <!ENTITY tasks SYSTEM "tasks.sgml">
-    <!ENTITY tools SYSTEM "tools.sgml">
-    <!ENTITY troubleshoot SYSTEM "troubleshoot.sgml">
-    <!ENTITY variables SYSTEM "variables.sgml">
-    <!ENTITY variants SYSTEM "variants.sgml">
+    <!ENTITY actions SYSTEM "actions.xml">
+    <!ENTITY alias SYSTEM "alias.xml">
+    <!ENTITY ant SYSTEM "ant.xml">
+    <!ENTITY build-install SYSTEM "build-install.xml">
+    <!ENTITY builders SYSTEM "builders.xml">
+    <!ENTITY builders-built-in SYSTEM "builders-built-in.xml">
+    <!ENTITY builders-commands SYSTEM "builders-commands.xml">
+    <!ENTITY builders-writing SYSTEM "builders-writing.xml">
+    <!ENTITY caching SYSTEM "caching.xml">
+    <!ENTITY command-line SYSTEM "command-line.xml">
+    <!ENTITY copyright SYSTEM "copyright.xml">
+    <!ENTITY depends SYSTEM "depends.xml">
+    <!ENTITY ENV_file SYSTEM "ENV.xml">
+    <!ENTITY environments SYSTEM "environments.xml">
+    <!ENTITY errors SYSTEM "errors.xml">
+    <!ENTITY example SYSTEM "example.xml">
+    <!ENTITY factories SYSTEM "factories.xml">
+    <!ENTITY file-removal SYSTEM "file-removal.xml">
+    <!ENTITY help SYSTEM "help.xml">
+    <!ENTITY hierarchy SYSTEM "hierarchy.xml">
+    <!ENTITY java SYSTEM "java.xml">
+    <!ENTITY install SYSTEM "install.xml">
+    <!ENTITY less-simple SYSTEM "less-simple.xml">
+    <!ENTITY libraries SYSTEM "libraries.xml">
+    <!ENTITY make SYSTEM "make.xml">
+    <!ENTITY nodes SYSTEM "nodes.xml">
+    <!ENTITY parseconfig SYSTEM "parseconfig.xml">
+    <!ENTITY preface SYSTEM "preface.xml">
+    <!ENTITY python SYSTEM "python.xml">
+    <!ENTITY repositories SYSTEM "repositories.xml">
+    <!ENTITY run SYSTEM "run.xml">
+    <!ENTITY scanners SYSTEM "scanners.xml">
+    <!ENTITY sconf SYSTEM "sconf.xml">
+    <!ENTITY separate SYSTEM "separate.xml">
+    <!ENTITY simple SYSTEM "simple.xml">
+    <!ENTITY sourcecode SYSTEM "sourcecode.xml">
+    <!ENTITY tasks SYSTEM "tasks.xml">
+    <!ENTITY tools SYSTEM "tools.xml">
+    <!ENTITY troubleshoot SYSTEM "troubleshoot.xml">
+    <!ENTITY variables SYSTEM "variables.xml">
+    <!ENTITY variants SYSTEM "variants.xml">
 
     <!ENTITY builders-gen SYSTEM "builders.gen">
     <!ENTITY tools-gen SYSTEM "tools.gen">
diff --git a/doc/user/main.sgml b/doc/user/main.xml
index d864350..c3cf2c2 100644
--- a/doc/user/main.sgml
+++ b/doc/user/main.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
 
   __COPYRIGHT__
@@ -23,10 +24,11 @@
 
 -->
 
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
 
-    <!ENTITY % version SYSTEM "../version.sgml">
+    <!ENTITY % version SYSTEM "../version.xml">
     %version;
 
     <!ENTITY % scons SYSTEM "../scons.mod">
@@ -41,47 +43,47 @@
     <!ENTITY % variables-mod SYSTEM "variables.mod">
     %variables-mod;
 
-    <!ENTITY actions SYSTEM "actions.sgml">
-    <!ENTITY alias SYSTEM "alias.sgml">
-    <!ENTITY ant SYSTEM "ant.sgml">
-    <!ENTITY build-install SYSTEM "build-install.sgml">
-    <!ENTITY builders SYSTEM "builders.sgml">
-    <!ENTITY builders-built-in SYSTEM "builders-built-in.sgml">
-    <!ENTITY builders-commands SYSTEM "builders-commands.sgml">
-    <!ENTITY builders-writing SYSTEM "builders-writing.sgml">
-    <!ENTITY caching SYSTEM "caching.sgml">
-    <!ENTITY command-line SYSTEM "command-line.sgml">
-    <!ENTITY copyright SYSTEM "copyright.sgml">
-    <!ENTITY depends SYSTEM "depends.sgml">
-    <!ENTITY ENV_file SYSTEM "ENV.sgml">
-    <!ENTITY environments SYSTEM "environments.sgml">
-    <!ENTITY errors SYSTEM "errors.sgml">
-    <!ENTITY example SYSTEM "example.sgml">
-    <!ENTITY factories SYSTEM "factories.sgml">
-    <!ENTITY file-removal SYSTEM "file-removal.sgml">
-    <!ENTITY help SYSTEM "help.sgml">
-    <!ENTITY hierarchy SYSTEM "hierarchy.sgml">
-    <!ENTITY java SYSTEM "java.sgml">
-    <!ENTITY install SYSTEM "install.sgml">
-    <!ENTITY less-simple SYSTEM "less-simple.sgml">
-    <!ENTITY libraries SYSTEM "libraries.sgml">
-    <!ENTITY make SYSTEM "make.sgml">
-    <!ENTITY nodes SYSTEM "nodes.sgml">
-    <!ENTITY parseconfig SYSTEM "parseconfig.sgml">
-    <!ENTITY preface SYSTEM "preface.sgml">
-    <!ENTITY python SYSTEM "python.sgml">
-    <!ENTITY repositories SYSTEM "repositories.sgml">
-    <!ENTITY run SYSTEM "run.sgml">
-    <!ENTITY scanners SYSTEM "scanners.sgml">
-    <!ENTITY sconf SYSTEM "sconf.sgml">
-    <!ENTITY separate SYSTEM "separate.sgml">
-    <!ENTITY simple SYSTEM "simple.sgml">
-    <!ENTITY sourcecode SYSTEM "sourcecode.sgml">
-    <!ENTITY tasks SYSTEM "tasks.sgml">
-    <!ENTITY tools SYSTEM "tools.sgml">
-    <!ENTITY troubleshoot SYSTEM "troubleshoot.sgml">
-    <!ENTITY variables SYSTEM "variables.sgml">
-    <!ENTITY variants SYSTEM "variants.sgml">
+    <!ENTITY actions SYSTEM "actions.xml">
+    <!ENTITY alias SYSTEM "alias.xml">
+    <!ENTITY ant SYSTEM "ant.xml">
+    <!ENTITY build-install SYSTEM "build-install.xml">
+    <!ENTITY builders SYSTEM "builders.xml">
+    <!ENTITY builders-built-in SYSTEM "builders-built-in.xml">
+    <!ENTITY builders-commands SYSTEM "builders-commands.xml">
+    <!ENTITY builders-writing SYSTEM "builders-writing.xml">
+    <!ENTITY caching SYSTEM "caching.xml">
+    <!ENTITY command-line SYSTEM "command-line.xml">
+    <!ENTITY copyright SYSTEM "copyright.xml">
+    <!ENTITY depends SYSTEM "depends.xml">
+    <!ENTITY ENV_file SYSTEM "ENV.xml">
+    <!ENTITY environments SYSTEM "environments.xml">
+    <!ENTITY errors SYSTEM "errors.xml">
+    <!ENTITY example SYSTEM "example.xml">
+    <!ENTITY factories SYSTEM "factories.xml">
+    <!ENTITY file-removal SYSTEM "file-removal.xml">
+    <!ENTITY help SYSTEM "help.xml">
+    <!ENTITY hierarchy SYSTEM "hierarchy.xml">
+    <!ENTITY java SYSTEM "java.xml">
+    <!ENTITY install SYSTEM "install.xml">
+    <!ENTITY less-simple SYSTEM "less-simple.xml">
+    <!ENTITY libraries SYSTEM "libraries.xml">
+    <!ENTITY make SYSTEM "make.xml">
+    <!ENTITY nodes SYSTEM "nodes.xml">
+    <!ENTITY parseconfig SYSTEM "parseconfig.xml">
+    <!ENTITY preface SYSTEM "preface.xml">
+    <!ENTITY python SYSTEM "python.xml">
+    <!ENTITY repositories SYSTEM "repositories.xml">
+    <!ENTITY run SYSTEM "run.xml">
+    <!ENTITY scanners SYSTEM "scanners.xml">
+    <!ENTITY sconf SYSTEM "sconf.xml">
+    <!ENTITY separate SYSTEM "separate.xml">
+    <!ENTITY simple SYSTEM "simple.xml">
+    <!ENTITY sourcecode SYSTEM "sourcecode.xml">
+    <!ENTITY tasks SYSTEM "tasks.xml">
+    <!ENTITY tools SYSTEM "tools.xml">
+    <!ENTITY troubleshoot SYSTEM "troubleshoot.xml">
+    <!ENTITY variables SYSTEM "variables.xml">
+    <!ENTITY variants SYSTEM "variants.xml">
 
     <!ENTITY builders-gen SYSTEM "builders.gen">
     <!ENTITY tools-gen SYSTEM "tools.gen">
@@ -117,6 +119,9 @@
   XXX SetOption('duplicate')
   XXX - - duplicate=
 
+  XXX GetOption('help')
+  XXX SetOption('help')
+
   XXX GetOption('num_jobs')
   XXX SetOption('num_jobs')
 
diff --git a/doc/user/make.sgml b/doc/user/make.xml
index 72b2df1..72b2df1 100644
--- a/doc/user/make.sgml
+++ b/doc/user/make.xml
diff --git a/doc/user/nodes.sgml b/doc/user/nodes.xml
index 4ada5b7..4ada5b7 100644
--- a/doc/user/nodes.sgml
+++ b/doc/user/nodes.xml
diff --git a/doc/user/parseconfig.sgml b/doc/user/parseconfig.xml
index 067ef37..067ef37 100644
--- a/doc/user/parseconfig.sgml
+++ b/doc/user/parseconfig.xml
diff --git a/doc/user/preface.sgml b/doc/user/preface.xml
index 694f41b..694f41b 100644
--- a/doc/user/preface.sgml
+++ b/doc/user/preface.xml
diff --git a/doc/user/python.sgml b/doc/user/python.xml
index e2a7cdd..e2a7cdd 100644
--- a/doc/user/python.sgml
+++ b/doc/user/python.xml
diff --git a/doc/user/repositories.sgml b/doc/user/repositories.xml
index f22611b..f22611b 100644
--- a/doc/user/repositories.sgml
+++ b/doc/user/repositories.xml
diff --git a/doc/user/run.sgml b/doc/user/run.xml
index 56b8fa2..56b8fa2 100644
--- a/doc/user/run.sgml
+++ b/doc/user/run.xml
diff --git a/doc/user/scanners.sgml b/doc/user/scanners.xml
index c068d03..c068d03 100644
--- a/doc/user/scanners.sgml
+++ b/doc/user/scanners.xml
diff --git a/doc/user/sconf.sgml b/doc/user/sconf.xml
index df530fe..df530fe 100644
--- a/doc/user/sconf.sgml
+++ b/doc/user/sconf.xml
diff --git a/doc/user/separate.sgml b/doc/user/separate.xml
index 57acd48..57acd48 100644
--- a/doc/user/separate.sgml
+++ b/doc/user/separate.xml
diff --git a/doc/user/simple.in b/doc/user/simple.in
index 57fdd3a..b468f9a 100644
--- a/doc/user/simple.in
+++ b/doc/user/simple.in
@@ -239,7 +239,7 @@
    We'll cover Java builds in more detail,
    including building Java archive (<filename>.jar</filename>)
    and other types of file,
-   in <xref linkend="chap-java">.
+   in <xref linkend="chap-java"></xref>.
 
    </para>
 
@@ -389,7 +389,7 @@
      (and any other files) whenever it's necessary.
      (We'll learn more about how
      &SCons; decides when building or rebuilding a file
-     is necessary in <xref linkend="chap-depends">, below.)
+     is necessary in <xref linkend="chap-depends"></xref>, below.)
  
      </para>
  
diff --git a/doc/user/simple.sgml b/doc/user/simple.xml
index 9d3617d..c5ef430 100644
--- a/doc/user/simple.sgml
+++ b/doc/user/simple.xml
@@ -245,7 +245,7 @@
    We'll cover Java builds in more detail,
    including building Java archive (<filename>.jar</filename>)
    and other types of file,
-   in <xref linkend="chap-java">.
+   in <xref linkend="chap-java"></xref>.
 
    </para>
 
@@ -412,7 +412,7 @@
      (and any other files) whenever it's necessary.
      (We'll learn more about how
      &SCons; decides when building or rebuilding a file
-     is necessary in <xref linkend="chap-depends">, below.)
+     is necessary in <xref linkend="chap-depends"></xref>, below.)
  
      </para>
  
diff --git a/doc/user/sourcecode.sgml b/doc/user/sourcecode.xml
index 6cb4162..6cb4162 100644
--- a/doc/user/sourcecode.sgml
+++ b/doc/user/sourcecode.xml
diff --git a/doc/user/tasks.sgml b/doc/user/tasks.xml
index 7be3562..7be3562 100644
--- a/doc/user/tasks.sgml
+++ b/doc/user/tasks.xml
diff --git a/doc/user/tools.sgml b/doc/user/tools.xml
index 512bf97..512bf97 100644
--- a/doc/user/tools.sgml
+++ b/doc/user/tools.xml
diff --git a/doc/user/troubleshoot.sgml b/doc/user/troubleshoot.xml
index 3df9c67..6ec6185 100644
--- a/doc/user/troubleshoot.sgml
+++ b/doc/user/troubleshoot.xml
@@ -261,7 +261,7 @@
     <screen>
       % <userinput>scons</userinput>
       scons: Reading SConscript files ...
-      { 'BUILDERS': {},
+      { 'BUILDERS': {'InstallAs': &lt;function InstallAsBuilderWrapper at 0xb23a28&gt;, 'Install': &lt;function InstallBuilderWrapper at 0xb1b7d0&gt;},
         'CONFIGUREDIR': '#/.sconf_temp',
         'CONFIGURELOG': '#/config.log',
         'CPPSUFFIXES': [ '.c',
@@ -284,14 +284,13 @@
                          '.spp',
                          '.SPP'],
         'DSUFFIXES': ['.d'],
-        'Dir': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c3fdac&gt;,
-        'Dirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c3fdcc&gt;,
+        'Dir': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1eb48&gt;,
+        'Dirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1eb90&gt;,
         'ENV': {'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin'},
-        'ESCAPE': &lt;function escape at 0xb7ba1f0c&gt;,
-        'File': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c3fdec&gt;,
+        'ESCAPE': &lt;function escape at 0xb1fa28&gt;,
+        'File': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1ebd8&gt;,
         'IDLSUFFIXES': ['.idl', '.IDL'],
-        'INSTALL': &lt;function installFunc at 0xb7c4317c&gt;,
-        'INSTALLSTR': &lt;function installStr at 0xb7c431b4&gt;,
+        'INSTALL': &lt;function copyFunc at 0xb23aa0&gt;,
         'LATEXSUFFIXES': ['.tex', '.ltx', '.latex'],
         'LIBPREFIX': 'lib',
         'LIBPREFIXES': '$LIBPREFIX',
@@ -303,27 +302,26 @@
         'PLATFORM': 'posix',
         'PROGPREFIX': '',
         'PROGSUFFIX': '',
-        'PSPAWN': &lt;function piped_env_spawn at 0xb7bb12cc&gt;,
-        'RDirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c3fe0c&gt;,
+        'PSPAWN': &lt;function piped_env_spawn at 0xb23230&gt;,
+        'RDirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1ec20&gt;,
         'SCANNERS': [],
         'SHELL': 'sh',
         'SHLIBPREFIX': '$LIBPREFIX',
         'SHLIBSUFFIX': '.so',
         'SHOBJPREFIX': '$OBJPREFIX',
         'SHOBJSUFFIX': '$OBJSUFFIX',
-        'SPAWN': &lt;function spawnvpe_spawn at 0xb7ba1d4c&gt;,
-        'TEMPFILE': &lt;class SCons.Platform.TempFileMunge at 0xb7bce89c&gt;,
+        'SPAWN': &lt;function spawnvpe_spawn at 0xb1f7d0&gt;,
+        'TEMPFILE': &lt;class SCons.Platform.TempFileMunge at 0xa4e170&gt;,
         'TEMPFILEPREFIX': '@',
-        'TOOLS': [],
+        'TOOLS': ['install', 'install'],
         '_CPPDEFFLAGS': '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__)}',
         '_CPPINCFLAGS': '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
         '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
         '_LIBFLAGS': '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}',
         '__RPATH': '$_RPATH',
-        '_concat': &lt;function _concat at 0xb7c43224&gt;,
-        '_defines': &lt;function _defines at 0xb7c432cc&gt;,
-        '_installStr': &lt;function installStr at 0xb7c431b4&gt;,
-        '_stripixes': &lt;function _stripixes at 0xb7c43294&gt;}
+        '_concat': &lt;function _concat at 0xa3d398&gt;,
+        '_defines': &lt;function _defines at 0xa3d500&gt;,
+        '_stripixes': &lt;function _stripixes at 0xa3d488&gt;}
       scons: done reading SConscript files.
       scons: Building targets ...
       scons: `.' is up to date.
@@ -340,9 +338,9 @@
     <screen>
       C:\><userinput>scons</userinput>
       scons: Reading SConscript files ...
-      { 'BUILDERS': {'Object': &lt;SCons.Builder.CompositeBuilder instance at 0xb7b6354c&gt;, 'SharedObject': &lt;SCons.Builder.CompositeBuilder instance at 0xb7b636cc&gt;, 'StaticObject': &lt;SCons.Builder.CompositeBuilder instance at 0xb7b6354c&gt;, 'PCH': &lt;SCons.Builder.BuilderBase instance at 0xb7bd6e8c&gt;, 'RES': &lt;SCons.Builder.BuilderBase instance at 0xb7b5b9ec&gt;},
+      { 'BUILDERS': {'RES': &lt;SCons.Builder.BuilderBase instance at 0xb39518&gt;, 'Object': &lt;SCons.Builder.CompositeBuilder instance at 0xb4a710&gt;, 'InstallAs': &lt;function InstallAsBuilderWrapper at 0xb45c08&gt;, 'PCH': &lt;SCons.Builder.BuilderBase instance at 0xb1cef0&gt;, 'Install': &lt;function InstallBuilderWrapper at 0xb1b7d0&gt;, 'SharedObject': &lt;SCons.Builder.CompositeBuilder instance at 0xb4aa28&gt;, 'StaticObject': &lt;SCons.Builder.CompositeBuilder instance at 0xb4a710&gt;},
         'CC': 'cl',
-        'CCCOM': &lt;SCons.Action.FunctionAction instance at 0xb7b63b6c&gt;,
+        'CCCOM': &lt;SCons.Action.FunctionAction instance at 0xb4c290&gt;,
         'CCCOMFLAGS': '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo$TARGET $CCPCHFLAGS $CCPDBFLAGS',
         'CCFLAGS': ['/nologo'],
         'CCPCHFLAGS': ['${(PCH and "/Yu%s /Fp%s"%(PCHSTOP or "",File(PCH))) or ""}'],
@@ -377,20 +375,19 @@
         'CXXFILESUFFIX': '.cc',
         'CXXFLAGS': ['$CCFLAGS', '$(', '/TP', '$)'],
         'DSUFFIXES': ['.d'],
-        'Dir': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c5adac&gt;,
-        'Dirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c5adcc&gt;,
+        'Dir': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1eb48&gt;,
+        'Dirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1eb90&gt;,
         'ENV': { 'INCLUDE': 'C:\\Program Files\\Microsoft Visual Studio/VC98\\include',
                  'LIB': 'C:\\Program Files\\Microsoft Visual Studio/VC98\\lib',
                  'PATH': 'C:\\Program Files\\Microsoft Visual Studio\\Common\\tools\\WIN95;C:\\Program Files\\Microsoft Visual Studio\\Common\\MSDev98\\bin;C:\\Program Files\\Microsoft Visual Studio\\Common\\tools;C:\\Program Files\\Microsoft Visual Studio/VC98\\bin',
                  'PATHEXT': '.COM;.EXE;.BAT;.CMD',
                  'SystemRoot': 'C:/WINDOWS'},
-        'ESCAPE': &lt;function escape at 0xb7bcf454&gt;,
-        'File': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c5adec&gt;,
+        'ESCAPE': &lt;function escape at 0xb24848&gt;,
+        'File': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1ebd8&gt;,
         'IDLSUFFIXES': ['.idl', '.IDL'],
         'INCPREFIX': '/I',
         'INCSUFFIX': '',
-        'INSTALL': &lt;function installFunc at 0xb7c5e17c&gt;,
-        'INSTALLSTR': &lt;function installStr at 0xb7c5e1b4&gt;,
+        'INSTALL': &lt;function copyFunc at 0xb45c80&gt;,
         'LATEXSUFFIXES': ['.tex', '.ltx', '.latex'],
         'LIBPREFIX': '',
         'LIBPREFIXES': ['$LIBPREFIX'],
@@ -406,14 +403,14 @@
         'PLATFORM': 'win32',
         'PROGPREFIX': '',
         'PROGSUFFIX': '.exe',
-        'PSPAWN': &lt;function piped_spawn at 0xb7bcf3ac&gt;,
+        'PSPAWN': &lt;function piped_spawn at 0xb20488&gt;,
         'RC': 'rc',
         'RCCOM': '$RC $_CPPDEFFLAGS $_CPPINCFLAGS $RCFLAGS /fo$TARGET $SOURCES',
         'RCFLAGS': [],
-        'RDirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xb7c5ae0c&gt;,
+        'RDirs': &lt;SCons.Defaults.Variable_Method_Caller instance at 0xa1ec20&gt;,
         'SCANNERS': [],
         'SHCC': '$CC',
-        'SHCCCOM': &lt;SCons.Action.FunctionAction instance at 0xb7b63bcc&gt;,
+        'SHCCCOM': &lt;SCons.Action.FunctionAction instance at 0xb4c320&gt;,
         'SHCCFLAGS': ['$CCFLAGS'],
         'SHCFLAGS': ['$CFLAGS'],
         'SHCXX': '$CXX',
@@ -424,19 +421,18 @@
         'SHLIBSUFFIX': '.dll',
         'SHOBJPREFIX': '$OBJPREFIX',
         'SHOBJSUFFIX': '$OBJSUFFIX',
-        'SPAWN': &lt;function spawn at 0xb7bcf41c&gt;,
+        'SPAWN': &lt;function spawn at 0xb247d0&gt;,
         'STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME': 1,
-        'TEMPFILE': &lt;class SCons.Platform.TempFileMunge at 0xb7be989c&gt;,
+        'TEMPFILE': &lt;class SCons.Platform.TempFileMunge at 0xa4e170&gt;,
         'TEMPFILEPREFIX': '@',
-        'TOOLS': ['msvc'],
+        'TOOLS': ['msvc', 'install', 'install'],
         '_CPPDEFFLAGS': '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__)}',
         '_CPPINCFLAGS': '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
         '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
         '_LIBFLAGS': '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}',
-        '_concat': &lt;function _concat at 0xb7c5e224&gt;,
-        '_defines': &lt;function _defines at 0xb7c5e2cc&gt;,
-        '_installStr': &lt;function installStr at 0xb7c5e1b4&gt;,
-        '_stripixes': &lt;function _stripixes at 0xb7c5e294&gt;}
+        '_concat': &lt;function _concat at 0xa3d398&gt;,
+        '_defines': &lt;function _defines at 0xa3d500&gt;,
+        '_stripixes': &lt;function _stripixes at 0xa3d488&gt;}
       scons: done reading SConscript files.
       scons: Building targets ...
       scons: `.' is up to date.
@@ -891,17 +887,17 @@
         +-SConstruct
         +-f1.c
         +-f1.o
-        | +-[f1.c]
+        | +-f1.c
         | +-inc.h
         +-f2.c
         +-f2.o
-        | +-[f2.c]
-        | +-[inc.h]
+        | +-f2.c
+        | +-inc.h
         +-f3.c
         +-f3.o
-        | +-[f3.c]
-        | +-[inc.h]
-        +-[inc.h]
+        | +-f3.c
+        | +-inc.h
+        +-inc.h
         +-libfoo.a
         | +-[f1.o]
         | +-[f2.o]
@@ -909,16 +905,16 @@
         +-prog1
         | +-prog1.o
         | | +-prog1.c
-        | | +-[inc.h]
+        | | +-inc.h
         | +-[libfoo.a]
-        +-[prog1.c]
+        +-prog1.c
         +-[prog1.o]
         +-prog2
         | +-prog2.o
         | | +-prog2.c
-        | | +-[inc.h]
+        | | +-inc.h
         | +-[libfoo.a]
-        +-[prog2.c]
+        +-prog2.c
         +-[prog2.o]
     </screen>
 
@@ -1112,14 +1108,10 @@
       % <userinput>scons -Q --debug=stacktrace</userinput>
       scons: *** Source `prog.c' not found, needed by target `prog.o'.  Stop.
       scons: internal stack trace:
-        File "/home/knight/SCons/scons.0.96.C763/bootstrap/src/engine/SCons/Job.py", line 111, in start
-          task.prepare()
-        File "/home/knight/SCons/scons.0.96.C763/bootstrap/src/engine/SCons/Taskmaster.py", line 166, in prepare
-          t.prepare()
-        File "/home/knight/SCons/scons.0.96.C763/bootstrap/src/engine/SCons/Node/FS.py", line 2137, in prepare
-          SCons.Node.Node.prepare(self)
-        File "/home/knight/SCons/scons.0.96.C763/bootstrap/src/engine/SCons/Node/__init__.py", line 806, in prepare
-          raise SCons.Errors.StopError, desc
+        File "bootstrap/src/engine/SCons/Job.py", line 114, in start
+        File "bootstrap/src/engine/SCons/Taskmaster.py", line 169, in prepare
+        File "bootstrap/src/engine/SCons/Node/FS.py", line 2220, in prepare
+        File "bootstrap/src/engine/SCons/Node/__init__.py", line 819, in prepare
     </screen>
 
     <para>
diff --git a/doc/user/variables.sgml b/doc/user/variables.xml
index 7009996..7009996 100644
--- a/doc/user/variables.sgml
+++ b/doc/user/variables.xml
diff --git a/doc/user/variants.sgml b/doc/user/variants.xml
index 6727859..6727859 100644
--- a/doc/user/variants.sgml
+++ b/doc/user/variants.xml
author	Steven Knight <knight@baldmt.com>	2007-08-17 03:17:04 (GMT)
committer	Steven Knight <knight@baldmt.com>	2007-08-17 03:17:04 (GMT)
commit	8cb34cccc26935bce5d07ed3f51cc29fbbd1ab03 (patch)
tree	7bc281e44fe45cae35656e0e457fef8f308fbb7b /doc
parent	5b4b4c6e5384712ab1835bdcf8beea09611b6e62 (diff)
download	SCons-8cb34cccc26935bce5d07ed3f51cc29fbbd1ab03.zip SCons-8cb34cccc26935bce5d07ed3f51cc29fbbd1ab03.tar.gz SCons-8cb34cccc26935bce5d07ed3f51cc29fbbd1ab03.tar.bz2