From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Mon, 21 Apr 2008 07:04:58 +0000 (+0000)
Subject: Merged revisions 2896-2897 via svnmerge from
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ffe42b89986ec6692aa994971c5aa7b9777e81cb;p=scons.git

Merged revisions 2896-2897 via svnmerge from
http://scons.tigris.org/svn/scons/branches/core

........
  r2897 | stevenknight | 2008-04-21 00:01:19 -0700 (Mon, 21 Apr 2008) | 2 lines

  Add missing close </para> tag to Glob() section.
........


git-svn-id: http://scons.tigris.org/svn/scons/trunk@2898 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/doc/user/less-simple.in b/doc/user/less-simple.in
index 7b452718..cf593194 100644
--- a/doc/user/less-simple.in
+++ b/doc/user/less-simple.in
@@ -230,6 +230,8 @@
     The SCons man page has more details on using Glob() with Variant
     dirs and Repositories and returning strings rather than Nodes.
 
+    </para>
+
   </section>
 
   <section>
diff --git a/doc/user/less-simple.xml b/doc/user/less-simple.xml
index c6ded707..53925189 100644
--- a/doc/user/less-simple.xml
+++ b/doc/user/less-simple.xml
@@ -219,6 +219,8 @@
     The SCons man page has more details on using Glob() with Variant
     dirs and Repositories and returning strings rather than Nodes.
 
+    </para>
+
   </section>
 
   <section>
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 11f6dfb8..b901b5d6 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -18,6 +18,10 @@ RELEASE 0.98.2 - XXX
   - Fix being able to specify --interactive mode command lines with
     \ (backslash) path name separators on Windows.
 
+  From Gary Oberbrunner:
+
+  - Document Glob() in the User's Guide.
+
 
 
 RELEASE 0.98.1 - Fri, 18 Apr 2008 19:11:58 -0700