more updates for main/master

MIGRATION_GUIDE.txt

@@ -8,7 +8,7 @@ at https://mapserver.org/MIGRATION_GUIDE.html.
 
 For developers:
 
-The master copy of the MIGRATION_GUIDE is now located in the root of the 
+The main copy of the MIGRATION_GUIDE is now located in the root of the 
 /MapServer/MapServer-documentation source tree ( https://github.com/MapServer/MapServer-documentation ). 
 Developers are welcome and encouraged to edit/update the guide in the documentation 
 tree directly.

README.rst

@@ -91,7 +91,7 @@ License
   SOFTWARE.
 
 
-.. |Build Status| image:: https://travis-ci.com/MapServer/MapServer.svg?branch=master
+.. |Build Status| image:: https://travis-ci.com/MapServer/MapServer.svg?branch=main
    :target: https://travis-ci.com/MapServer/MapServer
 
 .. |Appveyor Build Status| image:: https://ci.appveyor.com/api/projects/status/vw1n07095a8bg23u?svg=true

mapscript/python/README.rst

@@ -2,7 +2,7 @@ Python MapScript for MapServer README
 =====================================
 
 :Author: MapServer Team
-:Last Updated: 2020-03-02
+:Last Updated: 2021-01-16
 
 Introduction
 ------------
@@ -35,7 +35,7 @@ Advantages of ready-made wheels on PyPI include:
 + mapscript can be easily added to a Python `Virtual Environment <https://docs.python-guide.org/dev/virtualenvs/>`_
 + Python2 or Python3 versions of mapscript can be installed and work with a single installation of MapServer
 
-Wheels are built based on the `Appveyor build environments <https://github.com/mapserver/mapserver/blob/master/appveyor.yml>`_. 
+Wheels are built based on the `Appveyor build environments <https://github.com/MapServer/MapServer/blob/main/appveyor.yml>`_. 
 These are as follows at the time of writing:
 
 + Python 2.7 x32
@@ -68,6 +68,10 @@ Windows binary packages can be downloaded from `GIS Internals <https://www.gisin
 To ensure compatibility with the wheels, please use identical release packages, e.g. ``release-1911-x64-gdal-2-3-mapserver-7-4``
 for mapscript 7.4. 
 
+.. NOTE::
+   `MS4W <https://www.ms4w.com>`_ (MapServer for Windows) is a full installer that contains Python & Python
+   MapScript already configured out-of-the-box, as well as default OGC web services and over 60 working mapfiles.
+
 When using these packages the MapServer path will be similar to ``C:\release-1911-x64-gdal-2-3-mapserver-7-2\bin``. 
 
 Prior to installing mapscript it is recommended to update pip to the latest version with the following command: