Merge pull request #88 (for real this time). Prev commit was actually #87.

 * Allow multiple options to be specified with --debug=a,b,c
 * Add support for a readonly cache (--cache-readonly)
 * Always print stats if requested
 * Generally try harder to print out a message on build errors

1 files changed, 20 insertions, 8 deletions

diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 0109e225..ab5d35f5 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -61,12 +61,12 @@
 
     <releaseinfo>version &buildversion;</releaseinfo>
   </referenceinfo>
-  
+
   <title>SCons &buildversion;</title>
   <subtitle>MAN page</subtitle>
-  
-  
-<refentry id='scons1'> 
+
+
+<refentry id='scons1'>
 <refmeta>
 <refentrytitle>SCONS</refentrytitle>
 <manvolnum>1</manvolnum>
@@ -79,7 +79,7 @@
 <!-- body begins here -->
 <refsynopsisdiv id='synopsis'>
 <cmdsynopsis>
-  <command>scons</command>    
+  <command>scons</command>
     <arg choice='opt' rep='repeat'><replaceable>options</replaceable></arg>
     <arg choice='opt' rep='repeat'><replaceable>name=val</replaceable></arg>
     <arg choice='opt' rep='repeat'><replaceable>targets</replaceable></arg>
@@ -381,6 +381,7 @@ will be retrieved from the cache instead of being rebuilt locally.
 Caching behavior may be disabled and controlled in other ways by the
 <option>--cache-force</option>,
 <option>--cache-disable</option>,
+<option>--cache-readonly</option>,
 and
 <option>--cache-show</option>
 command-line options.  The
@@ -542,6 +543,15 @@ option.</para>
 
   </listitem>
   </varlistentry>
+<varlistentry>
+  <term>--cache-readonly</term>
+  <listitem>
+<para>Use the cache (if enabled) for reading, but do not not update the
+cache with changed files.
+</para>
+
+  </listitem>
+  </varlistentry>
   <varlistentry>
   <term>--cache-show</term>
   <listitem>
@@ -661,8 +671,9 @@ directory.</para>
   <term>--debug=<emphasis>type</emphasis></term>
   <listitem>
 <para>Debug the build process.
-<emphasis>type</emphasis>
-specifies what type of debugging:</para>
+<emphasis>type[,type...]</emphasis>
+specifies what type of debugging. Multiple types may be specified,
+separated by commas. The following types are valid:</para>
 
   </listitem>
   </varlistentry>
@@ -1094,6 +1105,7 @@ command:</para>
 --cache-debug=FILE
 --cache-disable, --no-cache
 --cache-force, --cache-populate
+--cache-readonly
 --cache-show
 --debug=TYPE
 -i, --ignore-errors
@@ -6783,7 +6795,7 @@ specified in the
 <emphasis role="bold">$MYPATH</emphasis>
 construction variable. It lets SCons detect the file
 <emphasis role="bold">incs/foo.inc</emphasis>
-, even if 
+, even if
 <emphasis role="bold">foo.x</emphasis>
 contains the line
 <emphasis role="bold">include foo.inc</emphasis>