update for 8.6.1 release

Author: jmckenna

conf.py

@@ -34,7 +34,7 @@ def __getattr__(cls, name):
 sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 
 
-import mapscript
+#import mapscript
 
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
@@ -587,9 +587,9 @@ def setup(app):
 
     # copy the mapscript sourcecode so it can be used 
     # for doc examples with literalinclude
-    dst_folder =  "./en/mapscript/mapscript-api/mapscript"
-    if os.path.exists(dst_folder) == False:
-        os.symlink(os.path.dirname(mapscript.__file__), dst_folder)
+    # dst_folder =  "./en/mapscript/mapscript-api/mapscript"
+    # if os.path.exists(dst_folder) == False:
+        # os.symlink(os.path.dirname(mapscript.__file__), dst_folder)
 
 # avoid warnings of "nonlocal image URI found" (this parameter requires Sphinx >=1.4)
 suppress_warnings = ['image.nonlocal_uri']

en/announcements/announcements_archive.txt

@@ -12,8 +12,8 @@
 The maintenance release of MapServer 8.6.1 has been issued in order to fix
 a security flaw in the SLD parser.
 See the :ref:`changelog <changelog-8-6-1>` for the list of changes. 
-You may also review MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__, 
-as well as this `Security Advisory <https://github.com/MapServer/MapServer/security/advisories/GHSA-cv4m-mr84-fgjp>`__.
+You may also review this `Security Advisory <https://github.com/MapServer/MapServer/security/advisories/GHSA-cv4m-mr84-fgjp>`__, 
+as well as MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__.
 As security for the 7.6 branch has ended, and branches 8.4, 8.2 & 8.0 are not supported, 
 all users are strongly encouraged to upgrade to the MapServer 8.6.1 release (see the 
 :ref:`Migration Guide <migration>`).

en/include/announcements.inc

@@ -6,8 +6,8 @@
 The maintenance release of MapServer 8.6.1 has been issued in order to fix
 a security flaw in the SLD parser.
 See the :ref:`changelog <changelog-8-6-1>` for the list of changes. 
-You may also review MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__, 
-as well as this `Security Advisory <https://github.com/MapServer/MapServer/security/advisories/GHSA-cv4m-mr84-fgjp>`__.
+You may also review this `Security Advisory <https://github.com/MapServer/MapServer/security/advisories/GHSA-cv4m-mr84-fgjp>`__, 
+as well as MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__.
 As security for the 7.6 branch has ended, and branches 8.4, 8.2 & 8.0 are not supported, 
 all users are strongly encouraged to upgrade to the MapServer 8.6.1 release (see the 
 :ref:`Migration Guide <migration>`).