Minor fixes: CR-LF in scons.bat file, remove old name keyword from Builder doc.

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

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 00db84e4e1b68d3c05fdec3bb62633c56daeb70a..002793cfd6e9edb070871444250c6be6855c0164 100644 (file)
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -2780,11 +2780,6 @@ The
 .B Builder
 function accepts the following arguments:
 
-.IP name
-The name of the builder. This will be the
-name of the construction environment method
-used to create an instance of the builder.
-
 .IP action
 The command line string used to build the target from the source. 
 .B action

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 7cd7e36184e191c17ea6c6fd8bb15073b3759f7f..83dbc9acb6f90a62129abed193b46084e3c89680 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -22,6 +22,13 @@ RELEASE 0.11 - XXX
 
   - Allow libraries in the LIBS variable to explicitly include the prefix
     and suffix, even when using the GNU linker.
+    (Bug reported by Neal Becker.)
+
+  - Use DOS-standard CR-LF line endings in the scons.bat file.
+    (Bug reported by Gary Ruben.)
+
+  - Doc changes:  Eliminate description of deprecated "name" keyword
+    argument from Builder definition (reported by Gary Ruben).
 
   From Anthony Roach: