From 9bb048d0d8d6a7e8b1d05efa4a7ab99cd61db20a Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Fri, 19 Jun 2026 22:51:59 +0200
Subject: [PATCH 1/8] Reformat

---
 workshop/exercises/mapfiles/wfs.map | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/workshop/exercises/mapfiles/wfs.map b/workshop/exercises/mapfiles/wfs.map
index 0945f14..28e0099 100644
--- a/workshop/exercises/mapfiles/wfs.map
+++ b/workshop/exercises/mapfiles/wfs.map
@@ -1,11 +1,15 @@
 MAP
     NAME "WFS"
     EXTENT -180 -90 180 90
-    SIZE 400 400 #
+    SIZE 400 400
     PROJECTION
-        "epsg:4326"
+        "EPSG:4326"
     END
 
+    SYMBOLSET "symbols.sym"
+
+    IMAGETYPE "png"
+
     OUTPUTFORMAT
         NAME "geojson"
         DRIVER "OGR/GEOJSON"
@@ -21,7 +25,6 @@ MAP
             "ows_enable_request" "*" # this enables all OGC requests
             "wfs_getfeature_formatlist" "geojson"
             "wfs_srs" "EPSG:4326 EPSG:3857"
-            "ows_onlineresource" "http://localhost:7000/"
         END
     END
     LAYER
@@ -43,9 +46,9 @@ MAP
         DATA "ne_50m_populated_places_simple"
         CLASS
             STYLE
-                COLOR 60 179 113
-                OUTLINECOLOR 255 255 255
-                OUTLINEWIDTH 0.1
+                SYMBOL "circle"
+                SIZE 22
+                COLOR "#60616c"
             END
         END
     END

From 69c0d99e7ad71f2e247ec727f9df491207cd9489 Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Fri, 19 Jun 2026 22:53:03 +0200
Subject: [PATCH 2/8] Reformat and add all Mapfiles

---
 workshop/exercises/mapfiles/mapserver.conf | 129 ++++++++++++---------
 1 file changed, 77 insertions(+), 52 deletions(-)

diff --git a/workshop/exercises/mapfiles/mapserver.conf b/workshop/exercises/mapfiles/mapserver.conf
index 77e1d53..04a0e42 100644
--- a/workshop/exercises/mapfiles/mapserver.conf
+++ b/workshop/exercises/mapfiles/mapserver.conf
@@ -3,67 +3,92 @@
 #
 CONFIG
 
-  #
-  # Environment variables (see https://mapserver.org/environment_variables.html)
-  #
-  ENV
-
-    MS_ONLINERESOURCE "/"
-
     #
-    # Limit Mapfile Access
+    # Environment variables (see https://mapserver.org/environment_variables.html)
     #
-    # MS_MAP_NO_PATH "1"
-    # MS_MAP_PATTERN "^/opt/mapserver" ## required
+    ENV
 
-    #
-    # Global Log/Debug Setup
-    #
-    # MS_DEBUGLEVEL "5"
-    # MS_ERRORFILE "/opt/mapserver/logs/mapserver.log"
+        MS_ONLINERESOURCE ""
 
-    #
-    # Default Map
-    #
-    # MS_MAPFILE "/opt/mapserver/test/test.map"
+        #
+        # Limit Mapfile Access
+        #
+        # MS_MAP_NO_PATH "1"
+        # MS_MAP_PATTERN "^/opt/mapserver" ## required
 
-    #
-    # Proj Library
-    #
-    # PROJ_LIB ""
+        #
+        # Global Log/Debug Setup
+        #
+        # MS_DEBUGLEVEL "5"
+        # MS_ERRORFILE "/opt/mapserver/logs/mapserver.log"
 
-    #
-    # Request Control
-    #
-    # disable POST requests (allowed by default, any value will do)
-    # MS_NO_POST "1"
+        #
+        # Default Map
+        #
+        # MS_MAPFILE "/opt/mapserver/test/test.map"
 
-    #
-    # Other Options
-    #
-    # MS_ENCRYPTION_KEY
-    # MS_USE_GLOBAL_FT_CACHE
-    # MS_PDF_CREATION_DATE
-    # MS_MAPFILE_PATTERN "\.map$"
-    # MS_XMLMAPFILE_XSLT
-    # MS_MODE
-    # MS_OPENLAYERS_JS_URL
-    # MS_TEMPPATH
-    # MS_MAX_OPEN_FILES
+        #
+        # Proj Library
+        #
+        # PROJ_LIB ""
+
+        #
+        # Request Control
+        #
+        # disable POST requests (allowed by default, any value will do)
+        # MS_NO_POST "1"
+
+        #
+        # Other Options
+        #
+        # MS_ENCRYPTION_KEY
+        # MS_USE_GLOBAL_FT_CACHE
+        # MS_PDF_CREATION_DATE
+        # MS_MAPFILE_PATTERN "\.map$"
+        # MS_XMLMAPFILE_XSLT
+        # MS_MODE
+        # MS_OPENLAYERS_JS_URL
+        # MS_TEMPPATH
+        # MS_MAX_OPEN_FILES
+
+        #
+        # OGC API
+        #
+        OGCAPI_HTML_TEMPLATE_DIRECTORY "/usr/local/share/mapserver/ogcapi/templates/html-bootstrap/"
+        MS_INDEX_TEMPLATE_DIRECTORY "/usr/local/share/mapserver/ogcapi/templates/html-index-bootstrap/"
+        MS_MAP_PATTERN "."
+
+        # MS_TEMPPATH "/etc/mapserver/tmp"
+    END
 
     #
-    # OGC API
+    # Map Aliases
     #
-    OGCAPI_HTML_TEMPLATE_DIRECTORY "/usr/local/share/mapserver/ogcapi/templates/html-bootstrap/"
-    MS_INDEX_TEMPLATE_DIRECTORY "/usr/local/share/mapserver/ogcapi/templates/html-index-bootstrap/"
-    MS_MAP_PATTERN "."
-  END
-
-  #
-  # Map Aliases
-  #
-  MAPS
-    OGCAPI-FEATURES "/etc/mapserver/ogcapi-features.map"
-  END
+    MAPS
+        ARCGIS "/etc/mapserver/arcgis.map"
+        CLUSTERS "/etc/mapserver/clusters.map"
+        CONTOURS "/etc/mapserver/contours.map"
+        COUNTRIES "/etc/mapserver/countries.map"
+        DIRECTION "/etc/mapserver/direction.map"
+        GDALG "/etc/mapserver/gdalg.map"
+        LAKES "/etc/mapserver/lakes.map"
+        LANDUSE "/etc/mapserver/landuse.map"
+        LINES "/etc/mapserver/lines.map"
+        OGCAPI-FEATURES "/etc/mapserver/ogcapi-features.map"
+        OTHER-PROJECTIONS "/etc/mapserver/other-projections.map"
+        POINTS "/etc/mapserver/points.map"
+        POLYGONS "/etc/mapserver/polygons.map"
+        POSTGIS "/etc/mapserver/postgis.map"
+        RAILWAYS "/etc/mapserver/railways.map"
+        RASTER "/etc/mapserver/raster.map"
+        SLD "/etc/mapserver/sld.map"
+        STAC "/etc/mapserver/stac.map"
+        STARS "/etc/mapserver/stars.map"
+        TILES "/etc/mapserver/tiles.map"
+        TIMISOARA "/etc/mapserver/timisoara.map"
+        VECTOR-TILES "/etc/mapserver/vector-tiles.map"
+        WCS "/etc/mapserver/wcs.map"
+        WFS "/etc/mapserver/wfs.map"
+    END
 
 END

From 4326281175f496b901c4ae69ea01b4c6887a08ba Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Fri, 19 Jun 2026 22:53:59 +0200
Subject: [PATCH 3/8] Reformat

---
 workshop/exercises/mapfiles/landuse.map | 44 ++++++++++++-------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/workshop/exercises/mapfiles/landuse.map b/workshop/exercises/mapfiles/landuse.map
index ced2d59..185bd70 100644
--- a/workshop/exercises/mapfiles/landuse.map
+++ b/workshop/exercises/mapfiles/landuse.map
@@ -7,21 +7,21 @@ MAP
         "epsg:4326"
     END
     SYMBOL
-  NAME 'octahedron'
-  TYPE VECTOR
-  POINTS
-    20 18
-    22 18
-    24 20
-    24 22
-    22 24
-    20 24
-    18 22
-    18 20
-    20 18
-  END
-  FILLED FALSE
-  END
+        NAME "octahedron"
+        TYPE VECTOR
+        POINTS
+            20 18
+            22 18
+            24 20
+            24 22
+            22 24
+            20 24
+            18 22
+            18 20
+            20 18
+        END
+        FILLED FALSE
+    END
     SYMBOL
         NAME "marsh_isom"
         TYPE VECTOR
@@ -166,7 +166,6 @@ MAP
                 SYMBOL "wetland"
             END
         END
-
         CLASS
             EXPRESSION {park,grass}
             STYLE
@@ -181,19 +180,18 @@ MAP
         END
         CLASS
             EXPRESSION "forest"
-             STYLE
-                #COLOR 231 255 170
+            STYLE
                 COLOR 34 139 34
-              END
-              STYLE
+            END
+            STYLE
                 SYMBOL "tree" # "octahedron"
                 SIZE 10
                 COLOR 100 100 100
             END
-            #STYLE
-            #    SYMBOL "paper"
-            #END
         END
+        #STYLE
+        #    SYMBOL "paper"
+        #END
         #CLASS
         #    STYLE
         #        SYMBOL "marsh_isom" # uncrossablemarsh_isom  indistinctmarsh_isom  marsh_isom

From e720dec6d8e6ffffcd6e48703487e5c1b52eace6 Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Fri, 19 Jun 2026 22:55:34 +0200
Subject: [PATCH 4/8] Remove ows_onlineresource and add IMAGEPATH

---
 workshop/exercises/mapfiles/arcgis.map            | 1 +
 workshop/exercises/mapfiles/clusters.map          | 1 +
 workshop/exercises/mapfiles/contours.map          | 1 +
 workshop/exercises/mapfiles/countries.map         | 3 +++
 workshop/exercises/mapfiles/gdalg.map             | 1 +
 workshop/exercises/mapfiles/lakes.map             | 1 +
 workshop/exercises/mapfiles/lines.map             | 1 +
 workshop/exercises/mapfiles/other-projections.map | 3 +--
 workshop/exercises/mapfiles/points.map            | 1 +
 workshop/exercises/mapfiles/polygons.map          | 1 +
 10 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/workshop/exercises/mapfiles/arcgis.map b/workshop/exercises/mapfiles/arcgis.map
index 408bc5d..f2102a6 100644
--- a/workshop/exercises/mapfiles/arcgis.map
+++ b/workshop/exercises/mapfiles/arcgis.map
@@ -6,6 +6,7 @@ MAP
         "init=epsg:4326"
     END
     WEB
+        IMAGEPATH "/etc/mapserver/tmp/"
         METADATA
             "ows_enable_request" "*" 
             "ows_srs" "EPSG:4326 EPSG:3857" 
diff --git a/workshop/exercises/mapfiles/clusters.map b/workshop/exercises/mapfiles/clusters.map
index 5efad04..7cd655f 100644
--- a/workshop/exercises/mapfiles/clusters.map
+++ b/workshop/exercises/mapfiles/clusters.map
@@ -8,6 +8,7 @@ MAP
     END
     FONTSET "data/fonts/fontset.txt"
     WEB
+        IMAGEPATH "/etc/mapserver/tmp/"
         METADATA
             "ows_enable_request" "*" 
             "ows_srs" "EPSG:4326 EPSG:3857" 
diff --git a/workshop/exercises/mapfiles/contours.map b/workshop/exercises/mapfiles/contours.map
index 370f666..08c8976 100644
--- a/workshop/exercises/mapfiles/contours.map
+++ b/workshop/exercises/mapfiles/contours.map
@@ -11,6 +11,7 @@ MAP
   END
 
   WEB
+    IMAGEPATH "/etc/mapserver/tmp/"
     METADATA
       "ows_enable_request" "*"
       "ows_srs" "EPSG:4326 EPSG:3857"
diff --git a/workshop/exercises/mapfiles/countries.map b/workshop/exercises/mapfiles/countries.map
index 4cb92f4..693b9f9 100644
--- a/workshop/exercises/mapfiles/countries.map
+++ b/workshop/exercises/mapfiles/countries.map
@@ -11,6 +11,9 @@ MAP
         "epsg:4326"
     END
 
+    WEB
+        IMAGEPATH "/etc/mapserver/tmp/"
+    END
 
     # the extent of the map in the projection
     EXTENT -180 -90 180 90
diff --git a/workshop/exercises/mapfiles/gdalg.map b/workshop/exercises/mapfiles/gdalg.map
index e07be4c..d24011d 100644
--- a/workshop/exercises/mapfiles/gdalg.map
+++ b/workshop/exercises/mapfiles/gdalg.map
@@ -7,6 +7,7 @@ MAP
     "init=epsg:4326"
   END
   WEB
+    IMAGEPATH "/etc/mapserver/tmp/"
     METADATA
       "ows_enable_request" "*"
       "ows_srs" "EPSG:4326 EPSG:3857"
diff --git a/workshop/exercises/mapfiles/lakes.map b/workshop/exercises/mapfiles/lakes.map
index 570ed3a..c38aa85 100644
--- a/workshop/exercises/mapfiles/lakes.map
+++ b/workshop/exercises/mapfiles/lakes.map
@@ -7,6 +7,7 @@ MAP
     END
     FONTSET "data/fonts/fontset.txt"
     WEB
+        IMAGEPATH "/etc/mapserver/tmp/"
         METADATA
             "ows_enable_request" "*" 
             "ows_srs" "EPSG:4326 EPSG:3857" 
diff --git a/workshop/exercises/mapfiles/lines.map b/workshop/exercises/mapfiles/lines.map
index d2b0c48..0eb9868 100644
--- a/workshop/exercises/mapfiles/lines.map
+++ b/workshop/exercises/mapfiles/lines.map
@@ -8,6 +8,7 @@ MAP
   END
 
   WEB
+    IMAGEPATH "/etc/mapserver/tmp/"
     METADATA
       "ows_enable_request" "*"
       "ows_srs" "EPSG:4326 EPSG:3857"
diff --git a/workshop/exercises/mapfiles/other-projections.map b/workshop/exercises/mapfiles/other-projections.map
index 7a6b96e..f06cd1d 100644
--- a/workshop/exercises/mapfiles/other-projections.map
+++ b/workshop/exercises/mapfiles/other-projections.map
@@ -1,5 +1,5 @@
 MAP
-    NAME "OTHER_PROJECTIONS"
+    NAME "Other_Projections"
     SIZE 1200 1200
     EXTENT -18019909.21 -9009954.61 18019909.21 9009954.61
 
@@ -23,7 +23,6 @@ MAP
     WEB
         METADATA
             "ows_enable_request" "*"
-            "ows_onlineresource" "http://localhost/path/to/other-projections?"
             "ows_srs" "ESRI:53009 EPSG:4326"
             "wfs_getfeature_formatlist" "geojson"
         END
diff --git a/workshop/exercises/mapfiles/points.map b/workshop/exercises/mapfiles/points.map
index 70e1e30..fb7345f 100644
--- a/workshop/exercises/mapfiles/points.map
+++ b/workshop/exercises/mapfiles/points.map
@@ -7,6 +7,7 @@ MAP
     END
     FONTSET "data/fonts/fontset.txt"
     WEB
+        IMAGEPATH "/etc/mapserver/tmp/"
         METADATA
             "wms_enable_request" "*"
             "wms_srs" "EPSG:4326 EPSG:3857"
diff --git a/workshop/exercises/mapfiles/polygons.map b/workshop/exercises/mapfiles/polygons.map
index c60c589..3588da3 100644
--- a/workshop/exercises/mapfiles/polygons.map
+++ b/workshop/exercises/mapfiles/polygons.map
@@ -7,6 +7,7 @@ MAP
         "epsg:4326"
     END
     WEB
+        IMAGEPATH "/etc/mapserver/tmp/"
         METADATA
             "ows_title" "OSM Buildings"
             "ows_enable_request" "*"

From 52670bf3cf64d92e795914087294191c3f600679 Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Fri, 19 Jun 2026 22:57:12 +0200
Subject: [PATCH 5/8] Add Inbuilt OpenLayers viewer links

---
 workshop/content/docs/mapfile/labels.md   | 3 ++-
 workshop/content/docs/mapfile/lines.md    | 1 +
 workshop/content/docs/mapfile/points.md   | 3 ++-
 workshop/content/docs/mapfile/polygons.md | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/workshop/content/docs/mapfile/labels.md b/workshop/content/docs/mapfile/labels.md
index 1554d85..9f44374 100644
--- a/workshop/content/docs/mapfile/labels.md
+++ b/workshop/content/docs/mapfile/labels.md
@@ -42,6 +42,7 @@ GEOMTRANSFORM (centerline(densify([shape], 0.1)))
 !!! example
 
     - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/lakes.map&mode=map&layer=lakes&layer=lake-labels>
+    - Inbuilt OpenLayers viewer: <http://localhost:7000/lakes/?template=openlayers&mode=browse&layers=all>
     - Local OpenLayers example: <http://localhost:7001/lakes.html>
 
 ??? JavaScript "lakes.js"
@@ -61,7 +62,7 @@ GEOMTRANSFORM (centerline(densify([shape], 0.1)))
 1. Use a different font for the label by adding the following to the `LABEL` block: `FONT MonsieurLaDoulaise` and increasing the `SIZE` to `28`.
    The list of fonts available can be found in `workshop/exercises/mapfiles/data/fonts/fontset.txt`.
 2. Comment out the `GEOMTRANSFORM (centerline([shape]))` and `ANGLE FOLLOW` lines (using `#`) to see its effect on the map.
-3. If you have time, download a font you like from https://fonts.google.com/ and unzip the .TTF file to `workshop/exercises/mapfiles/data/fonts/`
+3. If you have time, download a font you like from <https://fonts.google.com/> and unzip the .TTF file to `workshop/exercises/mapfiles/data/fonts/`
    add a new entry to `fontset.txt` and use this font to draw your Map labels.
 <!--
 ``` xml
diff --git a/workshop/content/docs/mapfile/lines.md b/workshop/content/docs/mapfile/lines.md
index 0188802..24b1500 100644
--- a/workshop/content/docs/mapfile/lines.md
+++ b/workshop/content/docs/mapfile/lines.md
@@ -65,6 +65,7 @@ END
 !!! example
 
     - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/lines.map&mode=map&layer=roads>
+    - Inbuilt OpenLayers viewer: <http://localhost:7000/lines/?template=openlayers&mode=browse&layers=all>
     - Local OpenLayers example: <http://localhost:7001/lines.html>
 
 !!! tip
diff --git a/workshop/content/docs/mapfile/points.md b/workshop/content/docs/mapfile/points.md
index f9e1f01..9edebb4 100644
--- a/workshop/content/docs/mapfile/points.md
+++ b/workshop/content/docs/mapfile/points.md
@@ -44,7 +44,7 @@ LiberationMono         LiberationMono-Regular.ttf
 LiberationSans         LiberationSans-Regular.ttf
 ```
 
-In the Mapfile itself we then reference this file and use any of the font aliases for symbols and labels. 
+We then reference this file in the Mapfile, and use any of the font aliases for symbols and labels. 
 
 In the example below we're using a
 cinema character from Google's [Material Symbols](https://fonts.google.com/icons).
@@ -66,6 +66,7 @@ END
 !!! example
 
     - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/points.map&mode=map&layer=pois>
+    - Inbuilt OpenLayers viewer: <http://localhost:7000/points/?template=openlayers&mode=browse&layers=all>
     - Local OpenLayers example: <http://localhost:7001/points.html>
 
 ??? JavaScript "points.js"
diff --git a/workshop/content/docs/mapfile/polygons.md b/workshop/content/docs/mapfile/polygons.md
index a7f8d3a..c6892a9 100644
--- a/workshop/content/docs/mapfile/polygons.md
+++ b/workshop/content/docs/mapfile/polygons.md
@@ -51,6 +51,7 @@ CLASS
 !!! example
 
     - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/polygons.map&mode=map&layer=buildings>
+    - Inbuilt OpenLayers viewer: <http://localhost:7000/polygons/?template=openlayers&mode=browse&layers=all>
     - Local OpenLayers example: <http://localhost:7001/polygons.html>
 
 !!! tip

From 82bafaa80cc129d0e5f12c5ba976800613060b2d Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Fri, 19 Jun 2026 22:58:50 +0200
Subject: [PATCH 6/8] Update Apache notes

---
 workshop/content/docs/advanced/apache.md | 119 +++++++++++------------
 1 file changed, 59 insertions(+), 60 deletions(-)

diff --git a/workshop/content/docs/advanced/apache.md b/workshop/content/docs/advanced/apache.md
index 533ee02..56ea216 100644
--- a/workshop/content/docs/advanced/apache.md
+++ b/workshop/content/docs/advanced/apache.md
@@ -1,60 +1,59 @@
-# MapServer and Apache
-
-!!! warning
-
-    This page is currently in a draft form.
-    
-## Overview
-
-The Apache web server is used by the workshop Docker image. Since version 8.0 MapServer has a global config file.
-
-At its heart MapServer is a command-line application that can be accessed through a web server.
-
-https://github.com/camptocamp/docker-mapserver/blob/master/runtime/usr/local/bin/start-server
-
-Apache has a [configuration file](https://github.com/camptocamp/docker-mapserver/blob/master/runtime/etc/apache2/conf-enabled/mapserver.conf).
-
-[mod_fcgid module](https://httpd.apache.org/mod_fcgid/), which is an Apache module that provides FastCGI support.
-
-```
-FcgidMaxRequestsPerProcess ${MAX_REQUESTS_PER_PROCESS}
-FcgidMinProcessesPerClass ${MIN_PROCESSES}
-FcgidMaxProcessesPerClass ${MAX_PROCESSES}
-FcgidBusyTimeout ${BUSY_TIMEOUT}
-FcgidIdleTimeout ${IDLE_TIMEOUT}
-FcgidIOTimeout ${IO_TIMEOUT}
-```
-
-These are all documented on the [reference page(https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html).
-
-These all have defaults in the Docker file, but can be overriden using environment variables.
-
-```
-ENV MS_DEBUGLEVEL=0 \
-    MS_ERRORFILE=stderr \
-    MAPSERVER_CONFIG_FILE=/etc/mapserver.conf \
-    MAPSERVER_BASE_PATH= \
-    MAX_REQUESTS_PER_PROCESS=1000 \
-    MIN_PROCESSES=1 \
-    MAX_PROCESSES=5 \
-    BUSY_TIMEOUT=300 \
-    IDLE_TIMEOUT=300 \
-```
-
-
-All requests to the server are mapped to `mapserv_wrapper` - a small 
-
-```
-ScriptAliasMatch "^${MAPSERVER_BASE_PATH}/(.*)" /usr/local/bin/mapserv_wrapper/$1
-ScriptAliasMatch "^${MAPSERVER_BASE_PATH}" /usr/local/bin/mapserv_wrapper
-```
-
-Restarting Apache:
-
-```bash
-docker restart mapserver
-```
-
-## Other Web Servers
-
-* [IIS](https://mapserver.org/installation/iis.html)
+# MapServer and Apache
+
+!!! warning
+
+    This page is currently in a draft form.
+    
+## Overview
+
+The Apache web server is used by the workshop Docker image. Since version 8.0 MapServer has a global config file.
+
+At its heart MapServer is a command-line application that can be accessed through a web server.
+
+Apache has a [configuration file](https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/etc/apache2/conf-enabled/mapserver.conf).
+The Docker image uses a [start-up script(https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/usr/local/bin/start-server).
+
+MapServer uses the [mod_fcgid module](https://httpd.apache.org/mod_fcgid/), which is an Apache module that provides FastCGI support.
+
+```
+FcgidMaxRequestsPerProcess ${MAX_REQUESTS_PER_PROCESS}
+FcgidMinProcessesPerClass ${MIN_PROCESSES}
+FcgidMaxProcessesPerClass ${MAX_PROCESSES}
+FcgidBusyTimeout ${BUSY_TIMEOUT}
+FcgidIdleTimeout ${IDLE_TIMEOUT}
+FcgidIOTimeout ${IO_TIMEOUT}
+```
+
+These are all documented on the [reference page(https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html).
+
+These all have defaults in the Docker file, but can be overridden using environment variables.
+
+```
+ENV MS_DEBUGLEVEL=0 \
+    MS_ERRORFILE=stderr \
+    MAPSERVER_CONFIG_FILE=/etc/mapserver.conf \
+    MAPSERVER_BASE_PATH= \
+    MAX_REQUESTS_PER_PROCESS=1000 \
+    MIN_PROCESSES=1 \
+    MAX_PROCESSES=5 \
+    BUSY_TIMEOUT=300 \
+    IDLE_TIMEOUT=300 \
+```
+
+
+All requests to the server are mapped to [mapserv_wrapper](https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/usr/local/bin/mapserv_wrapper) - a small wrapper script. 
+
+```
+ScriptAliasMatch "^${MAPSERVER_BASE_PATH}/(.*)" /usr/local/bin/mapserv_wrapper/$1
+ScriptAliasMatch "^${MAPSERVER_BASE_PATH}" /usr/local/bin/mapserv_wrapper
+```
+
+Restarting Apache:
+
+```bash
+docker restart mapserver
+```
+
+## Other Web Servers
+
+* [IIS](https://mapserver.org/installation/iis.html)

From aa8ee473901ee83822b3b3b73b0e90821b013ea2 Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Fri, 19 Jun 2026 23:00:36 +0200
Subject: [PATCH 7/8] Minor updates to setup and intro

---
 workshop/content/docs/index.md                     |  2 +-
 workshop/content/docs/introduction/commandline.md  | 10 +++++-----
 workshop/content/docs/introduction/docker.md       |  8 ++++----
 workshop/content/docs/introduction/introduction.md |  6 +++---
 workshop/content/docs/setup.md                     | 14 +++++++-------
 workshop/exercises/README.md                       |  2 ++
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/workshop/content/docs/index.md b/workshop/content/docs/index.md
index dbcfed3..ad570a4 100644
--- a/workshop/content/docs/index.md
+++ b/workshop/content/docs/index.md
@@ -4,7 +4,7 @@ title: Getting Started with MapServer
 
 # Welcome to the Getting Started with MapServer workshop!
 
-Version: 1.0
+Version: 1.1
 
 ![mapserver logo](assets/images/mapserver-banner-large.png)
 
diff --git a/workshop/content/docs/introduction/commandline.md b/workshop/content/docs/introduction/commandline.md
index 3aad4e1..a58aeb0 100644
--- a/workshop/content/docs/introduction/commandline.md
+++ b/workshop/content/docs/introduction/commandline.md
@@ -12,10 +12,10 @@ mapserv -v
 This should output the MapServer version, along with other details such as PROJ and GDAL versions, and supported input and output formats:
 
 ```
-MapServer version 8.4.0 PROJ version 9.5 GDAL version 3.10 OUTPUT=PNG OUTPUT=JPEG OUTPUT=KML SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE 
+MapServer version 8.7-dev PROJ version 9.8 GDAL version 3.13 OUTPUT=PNG OUTPUT=JPEG OUTPUT=KML SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE 
 SUPPORTS=CAIRO SUPPORTS=SVG_SYMBOLS SUPPORTS=RSVG SUPPORTS=ICONV SUPPORTS=FRIBIDI SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER 
-SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER SUPPORTS=OGCAPI_SERVER SUPPORTS=FASTCGI SUPPORTS=GEOS SUPPORTS=PBF INPUT=JPEG 
-INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE INPUT=FLATGEOBUF
+SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=OGCAPI_SERVER SUPPORTS=FASTCGI SUPPORTS=GEOS SUPPORTS=PBF INPUT=JPEG INPUT=POSTGIS 
+INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE INPUT=FLATGEOBUF
 ```
 
 When run through a web server, data is passed to the `mapserv` application, which generates output that is then sent back through the web server.
@@ -27,7 +27,7 @@ To test a URL such as <http://localhost:7000/?map=/etc/mapserver/countries.map&m
 mapserv "QUERY_STRING=map=/etc/mapserver/countries.map&mode=map"
 ```
 
-This will output a PNG image to the command line - this will look like gargabe!
+This will output a PNG image to the command line - this will look like garbage!
 
 We can save the output by redirecting it to a file using `>`. 
 As the `mapserv` program returns responses for a web client it also returns HTTP headers. To create a valid image file we need to strip these
@@ -56,7 +56,7 @@ mapserv -nh "QUERY_STRING=map=/etc/mapserver/countries.map&mode=map" > /etc/maps
 We can see all command options using the `--help` switch:
 
 ```bash
-mapserver --help
+mapserv --help
 ```
 
 All MapServer output can be returned on the command line, not just images. For example, to see a WMS GetCapabilities XML response, run the following command:
diff --git a/workshop/content/docs/introduction/docker.md b/workshop/content/docs/introduction/docker.md
index 6104d44..a6f00a2 100644
--- a/workshop/content/docs/introduction/docker.md
+++ b/workshop/content/docs/introduction/docker.md
@@ -4,13 +4,13 @@ We will be using MapServer on a Docker image for the workshop. This ensures that
 
 ## Docker MapServer
 
-The MapServer Docker image is provided by [Camptocamp](https://github.com/camptocamp/docker-mapserver), and the Dockerfile is found [here](https://github.com/camptocamp/docker-mapserver/blob/master/Dockerfile). 
+A custom MapServer Docker image has been created for the workshop, and the Dockerfile is found [here](https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/Dockerfile). 
 
 MapServer runs on the Apache web server - see the [Apache page](../advanced/apache.md) page for further details. 
 
 It uses the Apache [mod_fcgid module](https://httpd.apache.org/mod_fcgid/), module that provides FastCGI support.
 
-MapServer runs on port 80 on the Docker container, which is mapped to port 7000 on the local machine, as can be seen in the Docker compose file
+MapServer runs on port `8080` on the Docker container, which is mapped to port `7000` on the local machine, as can be seen in the Docker compose file
 located at `workshop\exercises\docker-compose.yml`:
 
 ```yaml
@@ -18,7 +18,7 @@ located at `workshop\exercises\docker-compose.yml`:
     image: geographika/mapserver-workshop:latest
     container_name: mapserver
     ports:
-      - 7000:80
+      - 7000:8080
     environment:
       MAPSERVER_CONFIG_FILE: "/etc/mapserver/mapserver.conf"
     volumes:
@@ -30,7 +30,7 @@ located at `workshop\exercises\docker-compose.yml`:
 
 ## JavaScript Application
 
-A second container that serves the JavaScript example pages is also run using Docker. This uses node and runs on port 7001 on both the container and the host machine.
+A second container that serves the JavaScript example pages is also run using Docker. This uses Node and runs on port 7001 on both the container and the host machine.
 
 ```yaml
   node:
diff --git a/workshop/content/docs/introduction/introduction.md b/workshop/content/docs/introduction/introduction.md
index d93823f..6cd4626 100644
--- a/workshop/content/docs/introduction/introduction.md
+++ b/workshop/content/docs/introduction/introduction.md
@@ -7,8 +7,8 @@ This workshop is divided into the major topics listed below.
 1. **Introduction**. An introduction to MapServer and the software used for the workshop. This
 includes Docker, OpenLayers, and Apache.
 
-2. The **Mapfile**. A Mapfile is MapServer's configuration file. It points
-to the data the Map will display, it defines how the data will be displayed,
+2. The **Mapfile**. A Mapfile defines a map and its layers in MapServer. It points
+to the data the map will display, it defines how the data will be displayed,
 and how the data will be served to client applications such as an Internet
 browser. This first set of exercises will help to get familiar with the structure,
 keywords, and syntax of a Mapfile. 
@@ -24,7 +24,7 @@ standards as these are free, open and interoperable.
 5. **Advanced** topics. These are a collection of miscellaneous exercises that cover
 a wide range of MapServer functionality. Selected exercises will be chosen based on the
 needs to the workshop participants. MapServer has over 25 years of development and 
-features so new topics will be added over time. 
+features, so new topics will be added over time. 
 
 ## Workshop Outline
 
diff --git a/workshop/content/docs/setup.md b/workshop/content/docs/setup.md
index 1089a23..6d03549 100644
--- a/workshop/content/docs/setup.md
+++ b/workshop/content/docs/setup.md
@@ -33,7 +33,7 @@ MapServer can be installed directly to various operating systems (see the [docum
 for more information), but Docker is used so a fully reproducible environment can be setup.
 
 [Docker Compose](https://docs.docker.com/compose) is an addition to Docker to facilitate
-the orchestration (configuration) of one or more Docker 'Containers' (a Container is a running instance of a Docker image)
+the orchestration (configuration) of one or more Docker 'Containers' (a container is a running instance of a Docker image)
 using a configuration convention (the Docker Compose YAML file), usually named `docker-compose.yml`.
 
 ## Docker Installation
@@ -66,7 +66,7 @@ Some installation notes for different operating systems:
 
 ### Mac
 
-* If you are using [Homebrew](https://brew.sh), consider using the [brew Docker formula](https://formulae.brew.sh/formula/Docker)
+* If you are using [Homebrew](https://brew.sh), consider using the [brew Docker formula](https://formulae.brew.sh/formula/docker)
 
 ### Linux
 
@@ -116,10 +116,10 @@ If all goes well, you should be able to run Docker from the command line as foll
 
 ```bash
 docker --version
-# Docker version 28.2.2, build e6534b4
+# Docker version 29.4.0, build 9d7ad9f
 
 docker compose version
-# Docker Compose version v2.36.2-desktop.1
+# Docker Compose version v5.1.1
 ```
 
 Your version numbers don't have to match those above exactly.
@@ -150,7 +150,7 @@ Once the containers are downloaded you can test they are running and you can con
 and navigate to <http://localhost:7000/>, and you should see the "MapServer Homepage" which means MapServer
 is running correctly.
 
-Next we can check that the front-end container is running by opening <http://localhost:7001/points.html>.
+Next we will check that the front-end container is running by opening <http://localhost:7001/points.html>.
 Hopefully you'll see a map, and we're ready to start the workshop.
 
 ## Possible Errors
@@ -161,5 +161,5 @@ Hopefully you'll see a map, and we're ready to start the workshop.
 by another program trying to update Ubuntu. Rebooting may fix this, or you can try running `sudo kill <process_id>` for example in this case `sudo kill 46288`. 
 * `docker-desktop : Depends: docker-ce-cli but it is not installable` - you are attempting to install Docker Desktop, but have not yet installed the Docker Engine.
 * `unable to get image 'node:lts-slim': error during connect: in the default daemon configuration on Windows, the docker client must be 
-   run with elevated privileges to connect: Get "http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.50/images/node:lts-slim/json": open //./pipe/docker_engine: The system cannot find the file specified.`
-   - you will need 
+   run with elevated privileges to connect: Get "http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.50/images/node:lts-slim/json": open //./pipe/docker_engine: The system cannot find the file specified.` - 
+   Docker Desktop is not running or the Docker daemon has not started. Start Docker Desktop and wait until it reports that Docker is running. If the problem persists, restart Docker Desktop and run the terminal as Administrator.
diff --git a/workshop/exercises/README.md b/workshop/exercises/README.md
index 333d036..8dd1563 100644
--- a/workshop/exercises/README.md
+++ b/workshop/exercises/README.md
@@ -7,6 +7,8 @@ First ensure the Docker service is running, then to start Docker Compose,
 navigate to the `workshop/exercises` folder and run the following command:
 
 ```bash
+# change the path below to match your setup
+cd D:\GitHub\getting-started-with-mapserver\workshop\exercises
 docker compose up -d
 ```
 

From 025b3818bd1ace33507131bb23ac8f27d3c36989 Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Fri, 19 Jun 2026 23:06:34 +0200
Subject: [PATCH 8/8] EOL

---
 workshop/content/docs/advanced/apache.md | 118 +++++++++++------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/workshop/content/docs/advanced/apache.md b/workshop/content/docs/advanced/apache.md
index 56ea216..b05b627 100644
--- a/workshop/content/docs/advanced/apache.md
+++ b/workshop/content/docs/advanced/apache.md
@@ -1,59 +1,59 @@
-# MapServer and Apache
-
-!!! warning
-
-    This page is currently in a draft form.
-    
-## Overview
-
-The Apache web server is used by the workshop Docker image. Since version 8.0 MapServer has a global config file.
-
-At its heart MapServer is a command-line application that can be accessed through a web server.
-
-Apache has a [configuration file](https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/etc/apache2/conf-enabled/mapserver.conf).
-The Docker image uses a [start-up script(https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/usr/local/bin/start-server).
-
-MapServer uses the [mod_fcgid module](https://httpd.apache.org/mod_fcgid/), which is an Apache module that provides FastCGI support.
-
-```
-FcgidMaxRequestsPerProcess ${MAX_REQUESTS_PER_PROCESS}
-FcgidMinProcessesPerClass ${MIN_PROCESSES}
-FcgidMaxProcessesPerClass ${MAX_PROCESSES}
-FcgidBusyTimeout ${BUSY_TIMEOUT}
-FcgidIdleTimeout ${IDLE_TIMEOUT}
-FcgidIOTimeout ${IO_TIMEOUT}
-```
-
-These are all documented on the [reference page(https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html).
-
-These all have defaults in the Docker file, but can be overridden using environment variables.
-
-```
-ENV MS_DEBUGLEVEL=0 \
-    MS_ERRORFILE=stderr \
-    MAPSERVER_CONFIG_FILE=/etc/mapserver.conf \
-    MAPSERVER_BASE_PATH= \
-    MAX_REQUESTS_PER_PROCESS=1000 \
-    MIN_PROCESSES=1 \
-    MAX_PROCESSES=5 \
-    BUSY_TIMEOUT=300 \
-    IDLE_TIMEOUT=300 \
-```
-
-
-All requests to the server are mapped to [mapserv_wrapper](https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/usr/local/bin/mapserv_wrapper) - a small wrapper script. 
-
-```
-ScriptAliasMatch "^${MAPSERVER_BASE_PATH}/(.*)" /usr/local/bin/mapserv_wrapper/$1
-ScriptAliasMatch "^${MAPSERVER_BASE_PATH}" /usr/local/bin/mapserv_wrapper
-```
-
-Restarting Apache:
-
-```bash
-docker restart mapserver
-```
-
-## Other Web Servers
-
-* [IIS](https://mapserver.org/installation/iis.html)
+# MapServer and Apache
+
+!!! warning
+
+    This page is currently in a draft form.
+    
+## Overview
+
+The Apache web server is used by the workshop Docker image. Since version 8.0 MapServer has a global config file.
+
+At its heart MapServer is a command-line application that can be accessed through a web server.
+
+Apache has a [configuration file](https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/etc/apache2/conf-enabled/mapserver.conf).
+The Docker image uses a [start-up script(https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/usr/local/bin/start-server).
+
+MapServer uses the [mod_fcgid module](https://httpd.apache.org/mod_fcgid/), which is an Apache module that provides FastCGI support.
+
+```
+FcgidMaxRequestsPerProcess ${MAX_REQUESTS_PER_PROCESS}
+FcgidMinProcessesPerClass ${MIN_PROCESSES}
+FcgidMaxProcessesPerClass ${MAX_PROCESSES}
+FcgidBusyTimeout ${BUSY_TIMEOUT}
+FcgidIdleTimeout ${IDLE_TIMEOUT}
+FcgidIOTimeout ${IO_TIMEOUT}
+```
+
+These are all documented on the [reference page(https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html).
+
+These all have defaults in the Docker file, but can be overridden using environment variables.
+
+```
+ENV MS_DEBUGLEVEL=0 \
+    MS_ERRORFILE=stderr \
+    MAPSERVER_CONFIG_FILE=/etc/mapserver.conf \
+    MAPSERVER_BASE_PATH= \
+    MAX_REQUESTS_PER_PROCESS=1000 \
+    MIN_PROCESSES=1 \
+    MAX_PROCESSES=5 \
+    BUSY_TIMEOUT=300 \
+    IDLE_TIMEOUT=300 \
+```
+
+
+All requests to the server are mapped to [mapserv_wrapper](https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/usr/local/bin/mapserv_wrapper) - a small wrapper script. 
+
+```
+ScriptAliasMatch "^${MAPSERVER_BASE_PATH}/(.*)" /usr/local/bin/mapserv_wrapper/$1
+ScriptAliasMatch "^${MAPSERVER_BASE_PATH}" /usr/local/bin/mapserv_wrapper
+```
+
+Restarting Apache:
+
+```bash
+docker restart mapserver
+```
+
+## Other Web Servers
+
+* [IIS](https://mapserver.org/installation/iis.html)