ChangeLogTag: Tue May 18 15:13:21 UTC 2010 Adam Mitz <mitza@ociweb.com>

2 files changed, 25 insertions, 3 deletions

diff --git a/docs/USAGE b/docs/USAGE
index 50f98d15..3cd3ac4f 100644
--- a/docs/USAGE
+++ b/docs/USAGE
@@ -198,6 +198,9 @@ The -features specifies additional list of features values. Values
 specified by this option overwrite values from features files.
 Example:
 mwc.pl -features "qos=1,ssl=0" ace.mwc
+The -features option can be used multiple times on the same command line, the
+effect is the same as if the parameters had been specified with a single
+-features options, with the parameters joined by commas.
 
 The -value_template option can be used to set various template variables.
 If a template variable value will contain spaces, it is best to enclose the
@@ -234,7 +237,13 @@ MPC Configuration File.  If the base configuration file is not present,
 MPC will try to use $MPC_ROOT/config/MPC.cfg as the MPC Configuration File.
 
 You may reference environment variables, accessed by $NAME, on either side of
-the equals sign.
+the equals sign.  In either this file or the MPC Configuration File
+(see below), an alternate form of environment variable reference may be used
+for variables which are not expected to be defined in all scenarios.  These
+variables use the syntax $?NAME instead of $NAME.  With this syntax, if the
+environment variable NAME is not defined, no error or warning is printed by
+MPC, and the entire substring starting with $?NAME until the next whitespace is
+expanded to the empty string.
 
 
 MPC Configuration File
diff --git a/docs/html/MakeProjectCreator.html b/docs/html/MakeProjectCreator.html
index e19bc8fd..0f285010 100644
--- a/docs/html/MakeProjectCreator.html
+++ b/docs/html/MakeProjectCreator.html
@@ -490,7 +490,11 @@
                 <td rowspan="1" colspan="1">
                   <p class="Tbl-Body">Specifies the feature list to set
                   before processing. This is a comma separated list and
-                  should contain no spaces.</p>
+                  should contain no spaces. The -features option can be
+                  used multiple times on the same command line, the
+                  effect is the same as if the parameters had been
+                  specified with a single -features options, with the
+                  parameters joined by commas.</p>
                 </td>
               </tr>
 
@@ -1090,7 +1094,16 @@
 
           <li class="Body">You may reference environment variables, accessed
           via the dollar sign (e.g., <em class="Code">$NAME</em>), on either
-          side of the equals sign.</li>
+          side of the equals sign. In either this file or the MPC
+          Configuration File (see below), an alternate form of environment
+          variable reference may be used for variables which are not expected
+          to be defined in all scenarios.  These variables use the syntax
+          <em class="Code">$?NAME</em> instead of <em class="Code">$NAME</em>.
+          With this syntax, if the environment variable
+          <em class="Code">NAME</em> is not defined, no error or warning is
+          printed by MPC, and the substring starting with
+          <em class="Code">$?NAME</em> until the next whitespace is expanded
+          to the empty string.</li>
         </ul>
 
         <ul>