Update a coupled of README files a bit.

Signed-off-by: Mats Wichmann <mats@linux.com>

2 files changed, 58 insertions, 25 deletions

diff --git a/README-local b/README-local
index 584234d59..314d73532 100644
--- a/README-local
+++ b/README-local
@@ -44,13 +44,14 @@ scons-local package, or any SCons package, at the SCons download page:
 EXECUTION REQUIREMENTS
 ======================
 
-Running SCons requires Python version 2.4 or later.  There should be
-no other dependencies or requirements to run SCons.
+Running SCons requires either Python version 2.7.* or Python 3.5 or higher.
+There should be no other dependencies or requirements to run SCons.
 
 The default SCons configuration assumes use of the Microsoft Visual C++
-compiler suite on WIN32 systems, and assumes a C compiler named 'cc',
-a C++ compiler named 'c++', and a Fortran compiler named 'g77' (such
-as found in the GNU C compiler suite) on any other type of system.
+compiler suite on WIN32 systems (either through the Visual Studio
+product, or through the separate Build Tools), and assumes a C compiler
+named 'cc', a C++ compiler named 'c++', and a Fortran compiler named 'g77'
+(such as found in the GNU Compiler Collection) on any other type of system.
 You may, of course, override these default values by appropriate
 configuration of Environment construction variables.
 
@@ -157,14 +158,23 @@ available at:
 REPORTING BUGS
 ==============
 
-You can report bugs either by following the "Tracker - Bugs" link
-on the SCons project page:
+The SCons project welcomes bug reports and feature requests.
 
-        http://sourceforge.net/projects/scons/
+Please make sure you send email with the problem or feature request to
+the SCons users mailing list, which you can join via the link below:
 
-or by sending mail to the SCons developers mailing list:
+        http://two.pairlist.net/mailman/listinfo/scons-users
+
+Once you have discussed your issue on the users mailing list and the
+community has confirmed that it is either a new bug or a duplicate of an
+existing bug, then please follow the instructions the community provides
+to file a new bug or to add yourself to the CC list for an existing bug
+
+You can explore the list of existing bugs, which may include workarounds
+for the problem you've run into, on GitHub:
+
+        https://github.com/SCons/scons/issues
 
-        scons-devel@lists.sourceforge.net
 
 
 MAILING LISTS
@@ -173,11 +183,34 @@ MAILING LISTS
 A mailing list for users of SCons is available.  You may send questions
 or comments to the list at:
 
-        scons-users@lists.sourceforge.net
+        scons-users@scons.org
 
 You may subscribe to the scons-users mailing list at:
 
-        http://lists.sourceforge.net/lists/listinfo/scons-users
+        http://two.pairlist.net/mailman/listinfo/scons-users
+
+An active mailing list for developers of SCons is available.  You may
+send questions or comments to the list at:
+
+        scons-dev@scons.org
+
+You may subscribe to the developer's mailing list using form on this page:
+
+        http://two.pairlist.net/mailman/listinfo/scons-dev
+
+Subscription to the developer's mailing list is by approval.  In practice, no
+one is refused list membership, but we reserve the right to limit membership
+in the future and/or weed out lurkers.
+
+There is also a low-volume mailing list available for announcements about
+SCons.  Subscribe by sending email to:
+
+        announce-subscribe@scons.tigris.org
+
+There are other mailing lists available for SCons users, for notification of
+SCons code changes, and for notification of updated bug reports and project
+documents.  Please see our mailing lists page for details.
+
 
 
 FOR MORE INFORMATION
diff --git a/README.rst b/README.rst
index cffd4f3a0..ce6f68caf 100755
--- a/README.rst
+++ b/README.rst
@@ -4,15 +4,15 @@ SCons - a software construction tool
 .. image:: https://img.shields.io/badge/IRC-scons-blue.svg
    :target: http://webchat.freenode.net/?channels=%23scons&uio=d4
    :alt: IRC
-   
+
 .. image:: https://img.shields.io/sourceforge/dm/scons.svg
    :target: https://sourceforge.net/projects/scons
    :alt: Sourceforge Monthly Downloads
-   
+
 .. image:: https://img.shields.io/sourceforge/dt/scons.svg
    :target: https://sourceforge.net/projects/scons
    :alt: Sourceforge Total Downloads
-   
+
 .. image:: https://travis-ci.org/SCons/scons.svg?branch=master
    :target: https://travis-ci.org/SCons/scons
    :alt: Travis CI build status
@@ -20,7 +20,7 @@ SCons - a software construction tool
 .. image:: https://ci.appveyor.com/api/projects/status/github/SCons/scons?svg=true&branch=master
    :target: https://ci.appveyor.com/project/SCons/scons
    :alt: AppVeyor CI build Status
-   
+
 .. image:: https://codecov.io/gh/SCons/scons/branch/master/graph/badge.svg
    :target: https://codecov.io/gh/SCons/scons
    :alt: CodeCov Coverage Status
@@ -72,7 +72,7 @@ version at the SCons download page:
 Execution Requirements
 ======================
 
-Running SCons requires Python version 2.7.* and Python 3.5 or higher.  
+Running SCons requires either Python version 2.7.* or Python 3.5 or higher.
 There should be no other dependencies or requirements to run SCons.
 
 The default SCons configuration assumes use of the Microsoft Visual C++
@@ -680,22 +680,22 @@ Reporting Bugs
 
 The SCons project welcomes bug reports and feature requests.
 
-Please make sure you send email with the problem or feature request to the SCons user's mailing list, 
-which you can join via the link below:
+Please make sure you send email with the problem or feature request to
+the SCons users mailing list, which you can join via the link below:
 
         http://two.pairlist.net/mailman/listinfo/scons-users
 
-Once you have discussed your issue on the users mailing list and the community has confirmed that 
-it is either a new bug or a duplicate of an existing bug, then please follow the instructions the c
-ommunity provides to file a new bug or to add yourself to the CC list for an existing bug
+Once you have discussed your issue on the users mailing list and the
+community has confirmed that it is either a new bug or a duplicate of an
+existing bug, then please follow the instructions the community provides
+to file a new bug or to add yourself to the CC list for an existing bug
 
-You can explore the list of existing bugs, which may include workarounds for the problem you've 
-run into on GitHub Issues:
+You can explore the list of existing bugs, which may include workarounds
+for the problem you've run into on GitHub Issues:
 
         https://github.com/SCons/scons/issues
 
 
-
 Mailing Lists
 =============