From a582625d9d12b24b9b10df7799146471e8f3aad7 Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Tue, 5 Apr 2005 09:11:07 +0000
Subject: Fix misplaced line in the man page.  (Greg Ward)

---
 doc/man/scons.1 | 13 +++++++------
 src/CHANGES.txt |  4 ++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 26fcc66..ffb326d 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -8386,12 +8386,6 @@ b = Builder("my_build < $TARGET > $SOURCE",
             emitter = {'.suf1' : e_suf1,
                        '.suf2' : e_suf2})
 .EE
-.IP
-The 
-.I generator
-and
-.I action
-arguments must not both be used for the same Builder.
 
 .IP multi
 Specifies whether this builder is allowed to be called multiple times for
@@ -8441,6 +8435,13 @@ def g(source, target, env, for_signature):
 b = Builder(generator=g)
 .EE
 
+.IP
+The 
+.I generator
+and
+.I action
+arguments must not both be used for the same Builder.
+
 .IP src_builder
 Specifies a builder to use when a source file name suffix does not match
 any of the suffixes of the builder. Using this argument produces a
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 779a5d6..e1a81ab 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -494,6 +494,10 @@ RELEASE 0.97 - XXX
 
   - Allow $JARCHDIR to be expanded to other construction variables.
 
+  From Greg Ward:
+
+  - Fix a misplaced line in the man page.
+
   From Christoph Wiedemann:
 
   - Add an Environment.SetDefault() method that only sets values if
-- 
cgit v0.12