correct copyright statement per mwichmann's feedback

6 files changed, 14 insertions, 10 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index f5e7233..7f9a455 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,9 +8,6 @@ NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support
 
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
-  From Michał Górny:
-    - Fix dvipdf test failure due to passing incorrect flag to dvipdf.
-
   From Joseph Brill:
     - Internal MSVC and test updates: Rework the msvc installed versions cache so that it
       is not exposed externally and update external references accordingly.
@@ -21,10 +18,17 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fix yacc tool, not respecting YACC set at time of tool initialization.
     - Refactor SCons.Tool to move all common shared and loadable module linking logic to SCons.Tool.linkCommon
 
+  From Michał Górny:
+    - Fix dvipdf test failure due to passing incorrect flag to dvipdf.
+
   From Adam Gross:
     - Fix minor bug affecting SCons.Node.FS.File.get_csig()'s usage of the MD5 chunksize.
       User-facing behavior does not change with this fix (GH Issue #3726).
 
+  From Joachim Kuebart:
+    - Suppress missing SConscript deprecation warning if `must_exist=False`
+      is used.
+
   From Rocco Matano:
     - Fix Zip tool to respect ZIPCOMSTR. Previously all zip builder calls would yield something
       like zip(["test.zip"], ["zip_scons.py"]) and ignore ZIPCOMSTR if ZIPCOM and ZIPCOMSTR
@@ -47,9 +51,6 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       - passing a dict to merge where the values are strings failed (issue #2961).
     - Include previously-excluded SideEffect section in User Guide.
 
-  From Joachim Kuebart:
-    - Suppress missing SConscript deprecation warning if `must_exist=False`
-      is used.
 
   From Simon Tegelid
     - Fix using TEMPFILE in multiple actions in an action list.
diff --git a/SCons/Platform/PlatformTests.py b/SCons/Platform/PlatformTests.py
index 8fedf7a..8c357df 100644
--- a/SCons/Platform/PlatformTests.py
+++ b/SCons/Platform/PlatformTests.py
@@ -1,5 +1,5 @@
 #
-# __COPYRIGHT__
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
diff --git a/SCons/Platform/__init__.py b/SCons/Platform/__init__.py
index bf8a4c8..a68eb53 100644
--- a/SCons/Platform/__init__.py
+++ b/SCons/Platform/__init__.py
@@ -20,7 +20,7 @@ their own platform definition.
 """
 
 #
-# __COPYRIGHT__
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -41,7 +41,6 @@ their own platform definition.
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import SCons.compat
 
diff --git a/runtest.py b/runtest.py
index a36ba85..7ca347b 100755
--- a/runtest.py
+++ b/runtest.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# __COPYRIGHT__
+# Copyright The SCons Foundation
 #
 # runtest.py - wrapper script for running SCons tests
 #
diff --git a/test/TEMPFILE/TEMPFILE-actionlist.py b/test/TEMPFILE/TEMPFILE-actionlist.py
index 5e5390b..d66b217 100644
--- a/test/TEMPFILE/TEMPFILE-actionlist.py
+++ b/test/TEMPFILE/TEMPFILE-actionlist.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 #
+# Copyright The SCons Foundation
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
diff --git a/test/long-lines/signature.py b/test/long-lines/signature.py
index c1c1c79..7f9ba43 100644
--- a/test/long-lines/signature.py
+++ b/test/long-lines/signature.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 #
+# Copyright The SCons Foundation
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including