Merged revisions 2880-2883,2885-2895 via svnmerge from

http://scons.tigris.org/svn/scons/branches/core

........
  r2885 | stevenknight | 2008-04-18 21:38:59 -0700 (Fri, 18 Apr 2008) | 2 lines

  Update troubleshooting appendix for new Taskmaster output.
........
  r2886 | bdbaddog | 2008-04-19 15:15:03 -0700 (Sat, 19 Apr 2008) | 5 lines

  Fix infinite loop in Fortran tool initialization.
  Bug 2017.
  Steven fixed, I tested.
........
  r2887 | garyo | 2008-04-20 17:44:46 -0700 (Sun, 20 Apr 2008) | 1 line

  Added this in two sections; simple one when discussing simple builds, and an example in the VariantDir section showing how it still works there.
........
  r2888 | stevenknight | 2008-04-20 21:33:01 -0700 (Sun, 20 Apr 2008) | 4 lines

  Accomodate test/MSVC/msvc.py's reliance on the Windows Platform SDK
  (for now) by making use of the user's %INCLUDE% and %LIB% variables.
  Split some independent embedded subtests into their own test scripts.
........
  r2889 | stevenknight | 2008-04-20 21:38:05 -0700 (Sun, 20 Apr 2008) | 2 lines

  Windows portability fix (line endings).
........
  r2890 | stevenknight | 2008-04-20 21:44:24 -0700 (Sun, 20 Apr 2008) | 2 lines

  Update Windows portion of if:-elif: block for a variable name change.
........
  r2891 | stevenknight | 2008-04-20 21:52:41 -0700 (Sun, 20 Apr 2008) | 3 lines

  On Windows, escape backslashes on the --interactive command line input,
  so people can build targets in other directories.
........
  r2892 | stevenknight | 2008-04-20 21:56:50 -0700 (Sun, 20 Apr 2008) | 3 lines

  Fix ripple effects on Windows from redefining how $CXXFLAGS gets
  added to C++ command lines.
........
  r2893 | stevenknight | 2008-04-20 22:04:50 -0700 (Sun, 20 Apr 2008) | 4 lines

  Handle a ripple effect from redefining the file() and open() builtin
  functions by explicitly restoring the originals whenever we reset
  the global state between tests.
........
  r2894 | stevenknight | 2008-04-20 23:17:23 -0700 (Sun, 20 Apr 2008) | 2 lines

  Remove by-hand backslash escaping, now that --interactive mode is handling it.
........
  r2895 | stevenknight | 2008-04-20 23:23:04 -0700 (Sun, 20 Apr 2008) | 2 lines

  Mention the fix for the Fortran suffix out-of-memory bug
........

1 files changed, 46 insertions, 0 deletions

diff --git a/doc/user/separate.xml b/doc/user/separate.xml
index 57ade04..c5e90e0 100644
--- a/doc/user/separate.xml
+++ b/doc/user/separate.xml
@@ -457,6 +457,52 @@ program using the F<build/foo.c> path name.
 
   </section>
 
+  <section>
+  <title>Using Glob() with &VariantDir;</title>
+
+    <para>
+
+    The Glob() file name pattern matching function
+    works just as usual when using &VariantDir;.
+    For example, if the
+    <filename>src/SConscript</filename>
+    looks like this:
+
+    </para>
+
+    <programlisting>
+      env = Environment()
+      env.Program('hello', Glob('*.c'))
+    </programlisting>
+
+    <para>
+
+    Then with the same &SConstruct; file as in the previous section,
+    and source files f1.c and f2.c in src, we would see the following
+    output:
+
+    </para>
+
+    <screen>
+      % <userinput>ls src</userinput>
+      SConscript  f1.c  f2.c  f2.h
+      % <userinput>scons -Q</userinput>
+      cc -o build/f1.o -c build/f1.c
+      cc -o build/f2.o -c build/f2.c
+      cc -o build/hello build/f1.o build/f2.o
+      % <userinput>ls build</userinput>
+      SConscript  f1.c  f1.o  f2.c  f2.h  f2.o  hello
+    </screen>
+
+    <para>
+
+    The Glob function returns Nodes in the build/ tree, as
+    you'd expect.
+
+    </para>
+
+  </section>
+
   <!--
 
   <section>