minor formatting

jmckenna · jmckenna · commit 609edb8db696 · 2025-06-27T10:12:39.000-03:00
diff --git a/en/cgi/openlayers.txt b/en/cgi/openlayers.txt
@@ -7,10 +7,10 @@
  MapServer OpenLayers Viewer
 *****************************************************************************
 
-MapServer (since the 6.0 release) provides a simple, built-in method for testing a Mapfile
+MapServer (since the 6.0 release) provides a simple, built-in method for testing a mapfile
 using OpenLayers.  This feature is for testing and development purposes
 only, and not for production or deploying full-featured sites.  You
-can preview, test, and navigate a Mapfile by accessing a special URL
+can preview, test, and navigate a mapfile by accessing a special URL
 which will return a built-in OpenLayers template.
 
 .. note:: This feature was discussed in
@@ -48,7 +48,7 @@ Here is a quick breakdown of that URL:
     layer=lakespy2
     layer=dlgstln2
 
-When using the ``mode=browse`` MapServer will create an image on the server. By default this will be in the same folder as the Mapfile.
+When using the ``mode=browse`` MapServer will create an image on the server. By default this will be in the same folder as the mapfile.
 If this MapServer cannot write to this folder you will see an error similar to:
 
 .. code-block:: bash
@@ -117,7 +117,7 @@ is restricted by setting the following two :ref:`environment_variables`:
 * ``MS_OPENLAYERS_JS_URL`` - the URL to the OpenLayers JavaScript library. 
 * ``MS_OPENLAYERS_CSS_URL`` - the URL to the OpenLayers CSS file used for styling. 
 
-These variables can also be set in a Mapfile, for example to point to the full OpenLayers build on a CDN 
+These variables can also be set in a mapfile, for example to point to the full OpenLayers build on a CDN 
 (Content Delivery Network):
 
 .. code-block:: mapfile
diff --git a/en/development/documentation.txt b/en/development/documentation.txt
@@ -8,7 +8,7 @@
 :Contact: hobu.inc at gmail.com
 :Author:  Jeff McKenna
 :Contact: jmckenna at gatewaygeomatics.com
-:Last Updated: 2024-07-09
+:Last Updated: 2025-06-27
 
 .. contents:: Table of Contents
     :depth: 4
@@ -111,11 +111,12 @@ General Writing Guidelines
 --------------------------
 
 * MapServer instead of mapserver, map server, Map Server, mapServer or
-  map Server.
-* MapScript instead of mapscript, Mapscript, or map script.
-* PostGIS instead of postgis.
+  map Server
+* MapScript instead of mapscript, Mapscript, or map script
+* mapfile instead of Mapfile, MapFile, or map file
+* PostGIS instead of postgis
 * GitHub instead of Github or github
-* HowTo instead of howto or HOWTO.
+* HowTo instead of howto or HOWTO
 * Email addresses should be manually spam protected:
 
   ::
diff --git a/en/glossary.txt b/en/glossary.txt
@@ -89,8 +89,9 @@
     Mapfile
         :ref:`Mapfile <mapfile>` is the declarative language that MapServer
         uses to define data connections, map styling, templating, and server
-        directives. Its format is xml-like and hierarchical, with closing
-        `END` tags, but the format is not xml.
+        directives. It must be named with the `.map` extension, and its format 
+        is XML-like and hierarchical, with closing `END` tags, but the format is 
+        not XML.
     
     MapScript
         :ref:`mapscript` is an alternative the the :ref:`cgi` application 
diff --git a/en/input/raster.txt b/en/input/raster.txt
@@ -250,7 +250,7 @@ file is a tile of the larger raster mosaic available for display. The list of
 files forming a layer can be stored in a shapefile with polygons representing
 the footprint of each file, and the name of the files. This is called a
 'TILEINDEX' and works similarly to the same feature in vector layers. The result
-can be represented in the Mapfile as one layer, but MapServer will first scan
+can be represented in the mapfile as one layer, but MapServer will first scan
 the tile index, and ensure that only raster files overlapping the current
 display request will be opened.
 
diff --git a/en/input/vector/mssql.txt b/en/input/vector/mssql.txt
@@ -167,8 +167,8 @@ For example:
         END
         ...
 
-The key ``mssql`` can then be used in any Mapfiles to refer to this DLL. Controlling which DLLs are loaded by MapServer
-in the ``CONFIG`` file prevents Mapfiles from loading potentially dangerous DLLs. 
+The key ``mssql`` can then be used in any mapfile to refer to this DLL. Controlling which DLLs are loaded by MapServer
+in the ``CONFIG`` file prevents mapfiles from loading potentially dangerous DLLs. 
 
 Create MapServer Layer
 **********************
diff --git a/en/installation/iis.txt b/en/installation/iis.txt
@@ -37,7 +37,7 @@ Committee (PSC) member.
 
     Which version should I download?
     
-    + Unless you are using deprecated features in your Mapfiles you should download the latest stable release. 
+    + Unless you are using deprecated features in your mapfiles you should download the latest stable release. 
     + Nearly all servers will now have a x64 (64-bit) architecture, so unless you are restricted to a win32 (32-bit) server
       download a x64 rather than a win32 release. 
     + Unless you have a good reason you should use the latest compiler version. MSVC 2022 means the binaries were compiled with
@@ -192,14 +192,14 @@ copied in:
         # point to the certs file for HTTPS access to OWS servers
         CURL_CA_BUNDLE "C:\MapServer\bin\curl\curl-ca-bundle.crt"
         
-        # to set a default Mapfile uncomment below
+        # to set a default mapfile uncomment below
         # MS_MAPFILE "C:/MapServer/apps/test/test.map"
         
-        # to block MapServer from accesssing Mapfile by path uncomment below
+        # to block MapServer from accesssing mapfile by path uncomment below
         # MS_MAP_NO_PATH TRUE
       END
 
-      # allow Mapfiles to be accessed by key
+      # allow mapfiles to be accessed by key
       MAPS
         "test" "C:/MapServer/apps/tests/test.map"
       END
@@ -225,7 +225,7 @@ Alternatively it can beset from the command line with the following command:
 Setting up Applications
 -----------------------
 
-MapServer applications consist of a Mapfile, and additional optional files for data, symbols, logs, and images. The same instance of MapServer
+MapServer applications consist of a mapfile, and additional optional files for data, symbols, logs, and images. The same instance of MapServer
 can be used to serve many applications. In this example we will create a new ``test`` subfolder for a test application in a ``C:\MapServer\apps`` folder. 
 
 .. code-block:: bat
@@ -283,7 +283,7 @@ You can set-up MapServer logging by adding the following lines to your ``MAP`` b
     DEBUG 5 # a value from 0 (OFF) to 5 (detailed)
     CONFIG "MS_ERRORFILE" "logs\ms.log"
 
-The path to the log file is relative to the Mapfile, so in this example you need to create a new ``C:\MapServer\apps\test\logs`` folder:
+The path to the log file is relative to the mapfile, so in this example you need to create a new ``C:\MapServer\apps\test\logs`` folder:
 
 .. code-block:: bat
 
@@ -339,7 +339,7 @@ The ``MS_MAPFILE`` environment variable can be set to a default map as follows:
 You can make then make a request without the query string requiring ``map=C:/MapServer/apps/test/test.map``: http://localhost/mapserver/mapserv?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&LAYERS=country_bounds&STYLES=&CRS=EPSG:4326&BBOX=-180,-90,180,90&WIDTH=400&HEIGHT=300&FORMAT=image/png
 
 In addition to this method the `URL Rewrite module <https://www.iis.net/downloads/microsoft/url-rewrite>`_ 
-can be used to set different Mapfiles dependent on query string parameters or domain names. 
+can be used to set different mapfiles dependent on query string parameters or domain names. 
 
 Setting a Certificates File
 +++++++++++++++++++++++++++
@@ -356,7 +356,7 @@ See :ref:`wxs_secure` for further details.
 Securing MapServer in IIS
 --------------------------
 
-MapServer has two environment variables that can be used to restrict which Mapfiles can be accessed. 
+MapServer has two environment variables that can be used to restrict which mapfiles can be accessed. 
 
 .. note::
 
@@ -369,7 +369,7 @@ be set to any value ("True" in this example) so that only the ``MS_MAPFILE`` env
 
   %windir%\system32\inetsrv\appcmd.exe set config -section:system.webServer/fastCgi /+"[fullPath='C:\Mapserver\bin\mapserv.exe'].environmentVariables.[name='MS_MAP_NO_PATH',value='True']" /commit:apphost
 
-``MS_MAP_PATTERN`` can be set to limit the folders from which Mapfiles can be accessed using a regular expression. For example to limit
+``MS_MAP_PATTERN`` can be set to limit the folders from which mapfiles can be accessed using a regular expression. For example to limit
 to the ``C:\MapServer\apps`` (note this path is case-sensitive) folder use the following regular expression: ``"^(C:)?\/MapServer\/apps\/((?!\.{2})[_A-Za-z0-9\-\.]+\/{1})*([_A-Za-z0-9\-\.]+\.(map))$"``
 
 .. code-block:: bat
@@ -378,7 +378,7 @@ to the ``C:\MapServer\apps`` (note this path is case-sensitive) folder use the f
 
 In addition to these methods IIS itself can be used to block or filter query string parameters. The 
 `denyQueryStringSequences <https://docs.microsoft.com/en-us/iis/configuration/system.webserver/security/requestfiltering/denyquerystringsequences/>`_ 
-element can be set to block a Mapfile being set by a URL. Both `map=` and the encoded `map%3d` are blocked. 
+element can be set to block a mapfile being set by a URL. Both `map=` and the encoded `map%3d` are blocked. 
 
 
 .. code-block:: xml
@@ -430,7 +430,7 @@ Common error messages and how to resolve them are listed below.
 
     msLoadMap(): Regular expression error. MS_DEFAULT_MAPFILE_PATTERN validation failed.
 
-+ If the ``CONFIG`` file security regular expressions used to limit access to Mapfiles do not match the supplied Mapfile you will receive the following:
++ If the ``CONFIG`` file security regular expressions used to limit access to mapfiles do not match the supplied mapfile you will receive the following:
 
   .. code-block:: bat
   
diff --git a/en/mapcache/dimensions.txt b/en/mapcache/dimensions.txt
@@ -22,7 +22,7 @@ WMS layers in MapServer can support dimensions, see :ref:`WMS Dimension <wms_dim
 MapCache also supports dimensions for tilesets. 
 
 Storing separate tile caches for different dimensions has several practical use cases such as creating caches for different 
-spatial boundaries, elevations, or time periods. It also provides a mechanism for dynamically switching Mapfiles based on a dimension value. 
+spatial boundaries, elevations, or time periods. It also provides a mechanism for dynamically switching mapfiles based on a dimension value. 
 
 MapCache uses Dimensions to:
 
@@ -122,7 +122,7 @@ Regex Dimensions
 An alternative to the hard-coded list of values is to use regular expressions. 
 
 The following example creates a MAPFILE dimension, for using the same MapCache tileset with different MapServer 
-Mapfiles. The name of the Mapfiles need not be known to MapCache, and can therefore be created even after MapCache has been started.
+mapfiles. The name of the mapfiles need not be known to MapCache, and can therefore be created even after MapCache has been started.
 
 When a user passes a `MAPFILE=/path/to/mapfile`, the string `/path/to/mapfile` is validated against
 the supplied (PCRE) regular expression. The one in this example allows a name composed of alphanumeric characters
diff --git a/en/mapfile/index.txt b/en/mapfile/index.txt
@@ -11,13 +11,17 @@
 :Contact: steve.lime at dnr.state.mn.us
 :Author: Jeff McKenna
 :Contact: jmckenna at gatewaygeomatics.com
-:Last Updated: 2025-06-04
+:Last Updated: 2025-06-27
 
-The Mapfile is the heart of MapServer.  It defines the relationships
+The mapfile is the heart of MapServer.  It defines the relationships
 between objects, points MapServer to where data are located and
 defines how things are to be drawn.
 
-The Mapfile consists of a :ref:`MAP` object, which has to start with
+The mapfile must have a `.map` extension or MapServer will not recognize 
+it. (if you try with another file extension, MapServer will throw an error of 
+*"Filename validation failed"*)
+
+The mapfile consists of a :ref:`MAP` object, which has to start with
 the word `MAP`.
 
 There are some important concepts that you must understand before you
@@ -77,10 +81,10 @@ styling using :ref:`CLASS` and :ref:`STYLE` directives.
 Notes
 -----------------------------------------------------------------------------
 
-* The Mapfile is NOT case-sensitive.
+* The mapfile is NOT case-sensitive.
 
-* The **Mapfile is read from top to bottom by MapServer**; this means
-  that LAYERs near the top of your Mapfile will be drawn before those
+* The **mapfile is read from top to bottom by MapServer**; this means
+  that LAYERs near the top of your mapfile will be drawn before those
   near the bottom.  Therefore users commonly place background imagery
   and other background layer types near the top of their mapfile, and
   lines and points near the bottom of their mapfile.
@@ -89,7 +93,7 @@ Notes
   keyword MUST be quoted. It is recommended to put ALL strings in
   double-quotes.
 
-* As of MapServer 7.0, Mapfiles are expected to be **UTF-8 encoded**. 
+* As of MapServer 7.0, mapfiles are expected to be **UTF-8 encoded**. 
   Non UTF-8 encoded mapfiles will need to be iconv’ed to UTF-8.
 
 * For MapServer versions < 5, there was a default maximum of 200
diff --git a/en/mapfile/layer.txt b/en/mapfile/layer.txt
@@ -1726,7 +1726,7 @@ STYLEITEM [<attribute>|auto|<javascript file>|<sld file>]
       .. versionadded:: 8.2.0
 
       A path to an SLD file. The path mush start with the prefix **sld://**, and
-      can be a path relative to the Mapfile, or an absolute path.
+      can be a path relative to the mapfile, or an absolute path.
       :ref:`CLASS` and :ref:`STYLE` blocks will then be generated based on the SLD document.
 
       .. code-block:: mapfile
diff --git a/en/mapfile/symbology/examples.txt b/en/mapfile/symbology/examples.txt
@@ -10,7 +10,7 @@
 :Author:        Jeff McKenna
 :Contact:       jmckenna at gatewaygeomatics.com
 :Author:        Håvard Tveite
-:Last Updated:  201-05-11
+:Last Updated:  2022-08-15
 
 .. contents:: Table of Contents
     :depth: 2
diff --git a/en/mapscript/python.txt b/en/mapscript/python.txt
@@ -152,7 +152,7 @@ __str__() : string
 =============================================================================
 
 The Python MapScript module maps a few MapServer errors into Python exceptions.  
-Attempting to load a non-existent Mapfile raises an 'IOError', for example
+Attempting to load a non-existent mapfile raises an 'IOError', for example
 
 ::
 
diff --git a/en/mapscript/querying.txt b/en/mapscript/querying.txt
@@ -24,7 +24,7 @@ Introduction
 
 The MapScript HowTo docs are intended to complement the API reference with
 examples of usage for specific subjects.  All examples in this document refer
-to the Mapfile and testing layers distributed with MapServer and found in source control
+to the mapfile and testing layers distributed with MapServer and found in source control
 under ``Mapserver/tests``.
 
 The examples below are written in Python. All MapScript languages use the
diff --git a/en/tinyows/mapfileconfig.txt b/en/tinyows/mapfileconfig.txt
@@ -7,19 +7,19 @@ Configuring TinyOWS with a standard Mapfile
 Mapfile Config File support for TinyOWS 
 -----------------------------------------------------------------------------
 
-TinyOWS supports as a configuration file a standard MapServer Mapfile. 
+TinyOWS supports as a configuration file a standard MapServer mapfile. 
 This allow a single file to configure both MapServer and TinyOWS. 
 (e.g could be useful if you use them both, as one for WMS and the other as WFS-T)
 
-TinyOWS does not handle all of the parameters in a Mapfile, but will ignore,
+TinyOWS does not handle all of the parameters in a mapfile, but will ignore,
 without error, any extra parameters that are not implemented in TinyOWS.
 
 If you prefer, you can configure TinyOWS using an XML file (:ref:`tinyows_configfile`).
 
-To indicate where your Mapfile is located, to TinyOWS binary, use 
+To indicate where your mapfile is located, to TinyOWS binary, use 
 the ''TINYOWS_MAPFILE'' environment variable.
 
-Here an example of a single Mapfile: 
+Here an example of a single mapfile: 
 
 .. code-block:: mapfile
 
@@ -30,7 +30,7 @@ Here an example of a single Mapfile:
 	     METADATA
 			"tinyows_schema_dir" "/usr/local/share/tinyows/schema/"
 			"tinyows_onlineresource" "127.0.0.1/cgi-bin/tinyows.fcgi"
-			"wfs_title" "TinyOWS service provided by a MapFile"
+			"wfs_title" "TinyOWS service provided by a mapFile"
 			"wfs_contact" "foo@bar.net"
 	     END
         END
@@ -55,12 +55,12 @@ Here an example of a single Mapfile:
 Current concepts and limitations:
 
 - Only the PostGIS `CONNECTIONTYPE` is handled
-- TinyOWS does not support all of the WFS parameters available in a Mapfile. But on the other hand, you *are* able to configure every part of TinyOWS with a Mapfile.  
+- TinyOWS does not support all of the WFS parameters available in a mapfile. But on the other hand, you *are* able to configure every part of TinyOWS with a Mapfile.  
 - The `CONNECTION` string value in each layer must be the same.
 - Mapfile `PROJECTION` content is not parsed, so use explicit `wfs_srs`. 
 - Mapfile `LAYER` and `FILTER` are not parsed.
 - Default values are TinyOWS ones, even for common properties shared by both TinyOWS and MapServer.
-- TinyOWS does not use `DATA` element from Mapfile, so you have to use `tinyows_table` (and `tinyows_schema` if needed) in each layer.
+- TinyOWS does not use `DATA` element from mapfile, so you have to use `tinyows_table` (and `tinyows_schema` if needed) in each layer.
 - If `DUMP` is not set to `TRUE` on a layer, both read and write access are disabled for the layer.
 
 Mapfile path of each TinyOWS config element
diff --git a/en/utilities/manage.txt b/en/utilities/manage.txt
@@ -25,8 +25,8 @@ MapServer follows two rules:
 2. Files may be given using a relative path where the path is relative to 
    the location of the file they are being referenced from.
 
-So, for files referenced in the Mapfile they can be given relative
-to the location of the Mapfile. Same holds true for symbol sets and font sets.
+So, for files referenced in the mapfile they can be given relative
+to the location of the mapfile. Same holds true for symbol sets and font sets.
 
 .. index::
    single: Temporary files
@@ -38,7 +38,7 @@ MapServer also can produce a number of files (i.e. maps, legends, scalebars, etc
 These files **must** be accessible using a web server. To accomplish this 
 MapServer creates these files in a scratch directory. The location of that 
 directory is given using the IMAGEPATH and IMAGEURL parameters in the web 
-section of a Mapfile. The scratch directory must be writable by the user that 
+section of a mapfile. The scratch directory must be writable by the user that 
 the web server runs under, usually *nobody*. It is recommended for security 
 reasons that the web user own the scratch directory rather than making it 
 world writable. The scratch area will need to be cleaned periodically. 
diff --git a/en/utilities/msencrypt.txt b/en/utilities/msencrypt.txt
