update website via GitHub Actions

Author: actions-user

advanced/apache/index.html

@@ -1436,10 +1436,10 @@ <h1 id="mapserver-and-apache">MapServer and Apache</h1>
 <p>This page is currently in a draft form.</p>
 </div>
 <h2 id="overview">Overview</h2>
-<p>The Apache web server is used by the workshop Docker image. Since version 8.0 MapServer has a global config file.</p>
 <p>At its heart MapServer is a command-line application that can be accessed through a web server.</p>
+<p>The Apache web server is used by the workshop Docker image.</p>
 <p>Apache has a <a href="https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/etc/apache2/conf-enabled/mapserver.conf">configuration file</a>.
-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).</p>
+The Docker image uses a <a href="https://github.com/MapServer/getting-started-with-mapserver/blob/main/docker/runtime/usr/local/bin/start-server">start-up script</a>.</p>
 <p>MapServer uses the <a href="https://httpd.apache.org/mod_fcgid/">mod_fcgid module</a>, which is an Apache module that provides FastCGI support.</p>
 <div class="language-text highlight"><pre><span></span><code><span id="__span-0-1"><a id="__codelineno-0-1" name="__codelineno-0-1" href="#__codelineno-0-1"></a>FcgidMaxRequestsPerProcess ${MAX_REQUESTS_PER_PROCESS}
 </span><span id="__span-0-2"><a id="__codelineno-0-2" name="__codelineno-0-2" href="#__codelineno-0-2"></a>FcgidMinProcessesPerClass ${MIN_PROCESSES}
@@ -1448,8 +1448,8 @@ <h2 id="overview">Overview</h2>
 </span><span id="__span-0-5"><a id="__codelineno-0-5" name="__codelineno-0-5" href="#__codelineno-0-5"></a>FcgidIdleTimeout ${IDLE_TIMEOUT}
 </span><span id="__span-0-6"><a id="__codelineno-0-6" name="__codelineno-0-6" href="#__codelineno-0-6"></a>FcgidIOTimeout ${IO_TIMEOUT}
 </span></code></pre></div>
-<p>These are all documented on the [reference page(https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html).</p>
-<p>These all have defaults in the Docker file, but can be overridden using environment variables.</p>
+<p>These are all documented on the <a href="https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html">reference page</a>.</p>
+<p>These all have defaults in the Docker file, but can be overridden using Docker environment variables.</p>
 <div class="language-text highlight"><pre><span></span><code><span id="__span-1-1"><a id="__codelineno-1-1" name="__codelineno-1-1" href="#__codelineno-1-1"></a>ENV MS_DEBUGLEVEL=0 \
 </span><span id="__span-1-2"><a id="__codelineno-1-2" name="__codelineno-1-2" href="#__codelineno-1-2"></a>    MS_ERRORFILE=stderr \
 </span><span id="__span-1-3"><a id="__codelineno-1-3" name="__codelineno-1-3" href="#__codelineno-1-3"></a>    MAPSERVER_CONFIG_FILE=/etc/mapserver.conf \

advanced/debugging/index.html

@@ -1396,7 +1396,10 @@
 
 
 <h1 id="debugging-mapserver">Debugging MapServer</h1>
-<p>TODO</p>
+<div class="admonition warning">
+<p class="admonition-title">Warning</p>
+<p>This page is currently in a draft form.</p>
+</div>
 <div class="language-scala highlight"><pre><span></span><code><span id="__span-0-1"><a id="__codelineno-0-1" name="__codelineno-0-1" href="#__codelineno-0-1"></a><span class="w">    </span><span class="nc">LAYER</span>
 </span><span id="__span-0-2"><a id="__codelineno-0-2" name="__codelineno-0-2" href="#__codelineno-0-2"></a><span class="w">        </span><span class="nc">NAME</span><span class="w"> </span><span class="s">&quot;countries&quot;</span>
 </span><span id="__span-0-3"><a id="__codelineno-0-3" name="__codelineno-0-3" href="#__codelineno-0-3"></a><span class="w">        </span><span class="nc">DEBUG</span><span class="w"> </span><span class="mi">5</span>
@@ -1405,7 +1408,8 @@ <h1 id="debugging-mapserver">Debugging MapServer</h1>
 CONFIG MS_ERRORFILE &quot;stderr&quot;
 </code></pre></div>
 <p>Then follow live logs:</p>
-<p>docker logs -f mapserver</p>
+<div class="language-text highlight"><pre><span></span><code><span id="__span-1-1"><a id="__codelineno-1-1" name="__codelineno-1-1" href="#__codelineno-1-1"></a>docker logs -f mapserver
+</span></code></pre></div>
 
 
 

advanced/gdalg/index.html

@@ -1661,6 +1661,17 @@ <h2 id="overview">Overview</h2>
   <iframe src="https://mapserver.github.io/getting-started-with-mapserver-demo/gdalg.html"></iframe>
 </div>
 
+<p>The pipeline we will be running in this example reads a dataset from a FlatGeoBuf file, and applies
+a buffer to it:</p>
+<div>
+<object
+    type="image/svg+xml"
+    data="/assets/images/roads.gdalg.svg"
+    width="100%"
+    height="200">
+</object>
+</div>
+
 <h2 id="checking-the-pipelines-with-gdal">Checking the Pipelines with GDAL</h2>
 <p>Before configuring MapServer, it is often easier to test your pipelines directly with GDAL, to ensure they run correctly.
 Run the commands below to connect to the MapServer Docker container and use GDAL to get information about the pipelines.</p>

credits/index.html

@@ -1409,11 +1409,16 @@
 
 <h1 id="authors">Authors</h1>
 <ul>
-<li><a href="https://geographika.net/">Seth Girvin</a> (found on GitHub at <a href="https://github.com/geographika">@geographika</a>). Please get in touch if you'd like a particular topic added to the workshop, or require any MapServer development.</li>
+<li><a href="https://geographika.net/">Seth Girvin</a> (found on GitHub at <a href="https://github.com/geographika">@geographika</a>,
+  and Mastodon at <a href="https://mastodon.social/@geographika">@geographika</a>).
+  Please get in touch if you'd like a particular topic added to the workshop, or require any MapServer development.</li>
 </ul>
 <h1 id="thanks">Thanks</h1>
 <p>Thanks to the following for helping this workshop to be created and improved:</p>
 <ul>
+<li>The workshop participants at <a href="https://2025.europe.foss4g.org/">FOSS4G Europe 2025</a> in Mostar, for their enthusiasm and feedback.</li>
+<li><a href="https://www.osgeo.org/member/even-rouault/">Even Rouault</a> and <a href="https://www.osgeo.org/member/tom-kralidis/">Tom Kralidis</a> for
+  assisting, and valuable comments and additions at FOSS4G Europe 2025.</li>
 <li>The workshop participants at <a href="https://2024.europe.foss4g.org/">FOSS4G Europe 2024</a> for their participation, feedback, and for having everything installed ready for a 9am start!</li>
 <li><a href="https://www.osgeo.org/member/michael-smith/">Michael Smith</a> for co-hosting the FOSS4G Europe 2024 workshop, and providing valuable tips and assistance.</li>
 <li>Colleagues at <a href="https://compass.ie/">Compass Informatics</a> for trialling the workshop and providing valuable feedback.</li>

inputs/databases/index.html

@@ -1598,10 +1598,10 @@ <h2 id="overview">Overview</h2>
 <p>MapServer can connect to most geospatial databases. There are native MapServer drivers for <a href="https://mapserver.org/input/vector/postgis.html">PostgreSQL/PostGIS</a>,
 <a href="https://mapserver.org/input/vector/oracle.html">Oracle</a>, and <a href="https://mapserver.org/input/vector/mssql.html">Microsoft SQL Server</a>. Other databases
 can be accessed through OGR, for example <a href="https://mapserver.org/input/vector/mysql.html">MySQL</a>.</p>
-<p>In this exercise we'll be connecting to a PostGIS database to display water polygon features using a MapServer WMS. <a href="https://postgis.net/">PostGIS</a> spatially enables the <a href="https://www.postgresql.org/">PostgreSQL</a>
-databases. </p>
+<p>In this exercise we'll be connecting to a PostGIS database to display water polygon features using a MapServer WMS.
+<a href="https://postgis.net/">PostGIS</a> spatially enables <a href="https://www.postgresql.org/">PostgreSQL</a> databases. </p>
 <h2 id="docker-setup">Docker Setup</h2>
-<p>To avoid having to install and setup a database we'll be using the <a href="https://hub.docker.com/r/kartoza/postgis/">PostGIS Docker image</a> provided
+<p>To avoid having to install and set up a database we'll be using the <a href="https://hub.docker.com/r/kartoza/postgis/">PostGIS Docker image</a> provided
 by <a href="https://kartoza.com/">Kartoza</a>.</p>
 <div class="admonition info">
 <p class="admonition-title">Info</p>
@@ -1640,7 +1640,7 @@ <h2 id="checking-the-database-connection-with-qgis">Checking the Database Connec
 </ul>
 </div>
 <h2 id="adding-data-to-the-database">Adding Data to The Database</h2>
-<p>We can use the OGR tool <a href="https://gdal.org/programs/ogr2ogr.html">ogr2ogr</a> installed on the MapServer container to add datasets to the PostgreSQL database.</p>
+<p>We can use the GDAL CLI tool <a href="https://gdal.org/en/stable/programs/gdal_vector_convert.html">gdal vector convert</a> installed on the MapServer container to add datasets to the PostgreSQL database.</p>
 <div class="language-bash highlight"><pre><span></span><code><span id="__span-1-1"><a id="__codelineno-1-1" name="__codelineno-1-1" href="#__codelineno-1-1"></a><span class="c1"># connect to the MapServer Docker image which includes OGR tools for importing data</span>
 </span><span id="__span-1-2"><a id="__codelineno-1-2" name="__codelineno-1-2" href="#__codelineno-1-2"></a>docker<span class="w"> </span><span class="nb">exec</span><span class="w"> </span>-it<span class="w"> </span>mapserver2<span class="w"> </span>bash
 </span><span id="__span-1-3"><a id="__codelineno-1-3" name="__codelineno-1-3" href="#__codelineno-1-3"></a><span class="c1"># navigate to the folder containing the OSM FlatGeobuf files</span>
@@ -1745,11 +1745,11 @@ <h2 id="code">Code</h2>
 </details>
 <h2 id="exercises">Exercises</h2>
 <ol>
-<li>Try and load another dataset into the database using the <code>ogr2ogr</code> approach above.</li>
+<li>Try to load another dataset into the database using the <code>gdal vector convert</code> approach above.</li>
 <li>Now add a new layer to the Mapfile to display the layer. You can make a direct request to MapServer in the form:
   <a href="http://localhost:7000/?map=/etc/mapserver/postgis.map&amp;mode=map&amp;layers=water%20NEWLAYERNAME">http://localhost:7000/?map=/etc/mapserver/postgis.map&amp;mode=map&amp;layers=water%20NEWLAYERNAME</a>.</li>
 <li>
-<p>Now update the JS file so the layer is visible as part of the interactive map, through WMS:</p>
+<p>Now update the JS file so the layer is visible in the interactive map via WMS:</p>
 <div class="language-js highlight"><pre><span></span><code><span id="__span-4-1"><a id="__codelineno-4-1" name="__codelineno-4-1" href="#__codelineno-4-1"></a><span class="w">  </span><span class="nx">source</span><span class="o">:</span><span class="w"> </span><span class="ow">new</span><span class="w"> </span><span class="nx">ImageWMS</span><span class="p">({</span>
 </span><span id="__span-4-2"><a id="__codelineno-4-2" name="__codelineno-4-2" href="#__codelineno-4-2"></a><span class="w">      </span><span class="nx">url</span><span class="o">:</span><span class="w"> </span><span class="nx">mapserverUrl</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="nx">mapfilesPath</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="s1">&#39;postgis.map&amp;&#39;</span><span class="p">,</span>
 </span><span id="__span-4-3"><a id="__codelineno-4-3" name="__codelineno-4-3" href="#__codelineno-4-3"></a><span class="w">      </span><span class="nx">params</span><span class="o">:</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="s1">&#39;LAYERS&#39;</span><span class="o">:</span><span class="w"> </span><span class="s1">&#39;water,NEWLAYERNAME&#39;</span><span class="p">,</span><span class="w"> </span><span class="s1">&#39;STYLES&#39;</span><span class="o">:</span><span class="w"> </span><span class="s1">&#39;&#39;</span><span class="w"> </span><span class="p">},</span>

inputs/raster/index.html

@@ -1617,9 +1617,9 @@
 
 <h1 id="raster-data">Raster Data</h1>
 <h2 id="overview">Overview</h2>
-<p>MapServer can serve both <a href="https://mapserver.org/input/vector/index.html">vector</a> and <a href="https://mapserver.org/input/raster.html">raster</a> data.</p>
-<p>The dataset used in this example is elevation data from the <a href="https://geoportaal.maaamet.ee/eng/Spatial-Data/Elevation-Data-p308.html">Estonian Geoportal</a>,
-and data provided by the Estonian Land Board 2024. It covers Tartu center and is from map sheet 474659.</p>
+<p>MapServer can serve both <a href="https://mapserver.org/input/vector/index.html">vector</a> and <a href="https://mapserver.org/input/raster.html">raster</a> data.
+The dataset used in this example is elevation data from the <a href="https://geoportaal.maaamet.ee/eng/Spatial-Data/Elevation-Data-p308.html">Estonian Geoportal</a>,
+provided by the Estonian Land Board (2024). It covers Tartu center and is from map sheet 474659.</p>
 <div class="map">
   <iframe src="https://mapserver.github.io/getting-started-with-mapserver-demo/raster.html"></iframe>
 </div>
@@ -1652,7 +1652,7 @@ <h2 id="a-raster-layer">A Raster LAYER</h2>
 </span><span id="__span-1-13"><a id="__codelineno-1-13" name="__codelineno-1-13" href="#__codelineno-1-13"></a><span class="w">  </span><span class="nc">INCLUDE</span><span class="w"> </span><span class="s">&quot;terrain.include&quot;</span>
 </span><span id="__span-1-14"><a id="__codelineno-1-14" name="__codelineno-1-14" href="#__codelineno-1-14"></a><span class="nc">END</span>
 </span></code></pre></div>
-<p>There are a few points to note in this Mapfile. </p>
+<p>There are a few points to note about this Mapfile.</p>
 <h2 id="include-files">Include Files</h2>
 <p>We are making use of the <a href="https://mapserver.org/mapfile/include.html">INCLUDE</a> 
 directive. This allows us to include additional files within our Mapfile. Any file extensions can be used, and paths are always relative to the main
@@ -1677,7 +1677,7 @@ <h2 id="include-files">Include Files</h2>
 </span><span id="__span-2-13"><a id="__codelineno-2-13" name="__codelineno-2-13" href="#__codelineno-2-13"></a><span class="nc">END</span>
 </span></code></pre></div>
 <h2 id="composite-blocks">Composite Blocks</h2>
-<p>A <a href="https://mapserver.org/mapfile/composite.html">COMPOSITE</a> block is used on the layer to make it 20% transparent.</p>
+<p>A <a href="https://mapserver.org/mapfile/composite.html">COMPOSITE</a> block is used to make the layer 20% transparent.</p>
 <h2 id="code">Code</h2>
 <div class="admonition example">
 <p class="admonition-title">Example</p>

inputs/vector/index.html

@@ -1564,7 +1564,7 @@ <h2 id="overview">Overview</h2>
 
 <h2 id="remote-datasets-using-virtual-file-systems">Remote Datasets using  Virtual File Systems</h2>
 <p>GDAL's <a href="https://gdal.org/user/virtual_file_systems.html">Virtual File Systems</a> can be used to
-access data over stored on a network, for example on a server or Amazon S3 bucket. </p>
+access data stored on a network, for example on a server or Amazon S3 bucket. </p>
 <div class="language-scala highlight"><pre><span></span><code><span id="__span-0-1"><a id="__codelineno-0-1" name="__codelineno-0-1" href="#__codelineno-0-1"></a><span class="nc">CONNECTIONTYPE</span><span class="w"> </span><span class="nc">OGR</span>
 </span><span id="__span-0-2"><a id="__codelineno-0-2" name="__codelineno-0-2" href="#__codelineno-0-2"></a><span class="nc">CONNECTION</span><span class="w"> </span><span class="s">&quot;/vsicurl/https://raw.githubusercontent.com/ofrohn/d3-celestial/master/data/constellations.lines.json&quot;</span>
 </span></code></pre></div>
@@ -1725,7 +1725,7 @@ <h2 id="exercises">Exercises</h2>
 </span><span id="__span-3-14"><a id="__codelineno-3-14" name="__codelineno-3-14" href="#__codelineno-3-14"></a><span class="w">    </span><span class="nc">END</span>
 </span><span id="__span-3-15"><a id="__codelineno-3-15" name="__codelineno-3-15" href="#__codelineno-3-15"></a><span class="nc">END</span>
 </span></code></pre></div>
-<p>In the <code>stars.js</code> you will need to ensure the <code>milkyway</code> layer is added to the OpenLayers map:</p>
+<p>In the <code>stars.js</code> file you will need to ensure the <code>milkyway</code> layer is added to the OpenLayers map:</p>
 <div class="language-js highlight"><pre><span></span><code><span id="__span-4-1"><a id="__codelineno-4-1" name="__codelineno-4-1" href="#__codelineno-4-1"></a><span class="nx">params</span><span class="o">:</span><span class="w"> </span><span class="p">{</span><span class="w"> </span><span class="s1">&#39;LAYERS&#39;</span><span class="o">:</span><span class="w"> </span><span class="s1">&#39;constellations,stars,stars2,milkyway&#39;</span><span class="p">},</span>
 </span></code></pre></div>
 </li>

introduction/commandline/index.html

@@ -1425,23 +1425,23 @@ <h1 id="mapserver-on-the-command-line">MapServer on the Command Line</h1>
 </span><span id="__span-1-4"><a id="__codelineno-1-4" name="__codelineno-1-4" href="#__codelineno-1-4"></a>INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE INPUT=FLATGEOBUF
 </span></code></pre></div>
 <p>When run through a web server, data is passed to the <code>mapserv</code> application, which generates output that is then sent back through the web server.
-All web requests can be recreated and tested on the command line, this makes it a handy debugging tool. </p>
+All web requests can be recreated and tested on the command line, making it a handy debugging tool.</p>
 <p>To test a URL such as <a href="http://localhost:7000/?map=/etc/mapserver/countries.map&amp;mode=map">http://localhost:7000/?map=/etc/mapserver/countries.map&amp;mode=map</a> run the following command:</p>
 <div class="language-bash highlight"><pre><span></span><code><span id="__span-2-1"><a id="__codelineno-2-1" name="__codelineno-2-1" href="#__codelineno-2-1"></a>mapserv<span class="w"> </span><span class="s2">&quot;QUERY_STRING=map=/etc/mapserver/countries.map&amp;mode=map&quot;</span>
 </span></code></pre></div>
 <p>This will output a PNG image to the command line - this will look like garbage!</p>
 <p>We can save the output by redirecting it to a file using <code>&gt;</code>. 
 As the <code>mapserv</code> program returns responses for a web client it also returns HTTP headers. To create a valid image file we need to strip these
-header by using the <code>-nh</code> (no headers) switch.</p>
+headers by using the <code>-nh</code> (no headers) switch.</p>
 <div class="language-bash highlight"><pre><span></span><code><span id="__span-3-1"><a id="__codelineno-3-1" name="__codelineno-3-1" href="#__codelineno-3-1"></a>mapserv<span class="w"> </span>-nh<span class="w"> </span><span class="s2">&quot;QUERY_STRING=map=/etc/mapserver/countries.map&amp;mode=map&quot;</span><span class="w"> </span>&gt;<span class="w"> </span>/etc/mapserver/test.png
 </span></code></pre></div>
-<p><code>test.png</code> should now be on your local disk at <code>getting-started-with-mapserver/workshop/exercises/mapfiles</code>.</p>
+<p><code>test.png</code> should now be available on your local disk at <code>getting-started-with-mapserver/workshop/exercises/mapfiles</code>.</p>
 <p><img alt="Test output generated at the command line" src="../../assets/images/command-line-test.png" /></p>
 <div class="admonition tip">
 <p class="admonition-title">Tip</p>
 <p>The <code>docker-compose.yml</code> file maps local folders to folders on the Docker container. Files created in the Docker
 container will be visible on your local disk, and files on your local disk will be visible in the container.
-This is set in in the <code>volumes</code> section, using the syntax <code>- LOCAL_FOLDER:CONTAINER_FOLDER</code></p>
+This is set in the <code>volumes</code> section, using the syntax <code>- LOCAL_FOLDER:CONTAINER_FOLDER</code></p>
 <div class="language-yaml highlight"><pre><span></span><code><span id="__span-4-1"><a id="__codelineno-4-1" name="__codelineno-4-1" href="#__codelineno-4-1"></a><span class="nt">volumes</span><span class="p">:</span>
 </span><span id="__span-4-2"><a id="__codelineno-4-2" name="__codelineno-4-2" href="#__codelineno-4-2"></a><span class="w">  </span><span class="p p-Indicator">-</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">./scripts:/scripts</span>
 </span><span id="__span-4-3"><a id="__codelineno-4-3" name="__codelineno-4-3" href="#__codelineno-4-3"></a><span class="w">  </span><span class="p p-Indicator">-</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">./mapfiles:/etc/mapserver</span>