Fix misplaced line in the man page. (Greg Ward)

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

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 26fcc66cee49834980dd296b61062ae3d6f06d13..ffb326dcad290659422fefbbee56f495f44300f5 100644 (file)
--- 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 779a5d63881d901134b33abdea1bcd3465d44110..e1a81ab031278acc281d6f755b2eef0a77bb2b0b 100644 (file)
--- 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