Fixup some content issues and recompress a BMP image

Author: Firefishy

Dockerfile

@@ -1,14 +1,16 @@
-FROM docker.io/hugomods/hugo:debian-base-0.147.8 AS hugo
+FROM docker.io/hugomods/hugo:debian-base-0.147.8@sha256:9a4344c6db750e7d4114cece2b391c3fa49d213da02d090a9a8f63e30c215cac AS hugo
 
 COPY site /src
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 RUN hugo build \
         --minify \
         --gc \
         --cleanDestinationDir \
         --config /src/config.toml
 
-RUN find /src/public -type f \( -name '*.html' -o -name '*.css' -o -name '*.js' -o -name '*.xml' -o -name '*.json' -o -name '*.svg' -o -name '*.txt' \) -print0 | xargs -0 -P4 -n1 gzip -9kf
+RUN find /src/public -type f \( -name '*.html' -o -name '*.css' -o -name '*.js' -o -name '*.xml' -o -name '*.json' -o -name '*.svg' -o -name '*.txt' \) -print0 | xargs -0 -P4 -n32 gzip --best -kf
 
 # ---------------------------------------------------
 

README.md

@@ -8,8 +8,7 @@ Thank you to Wireshark! ❤️
 
 1. Edit or Remove as applicable in `./import/questions/`
 2. Run `./tools/convert-questions.py` which populates `./site/content/questions/`
-3. Note the manually edited out questions in https://github.com/openstreetmap/help-website/commit/5b0088538073086f41530cfed88f2c2c987e590d (Tip: do not `git add` them)
-4. `cd ./site/; hugo serve` to confirm desired output
-5. GitHub Actions will rebuild container on push
-6. Chef will update container shortly
-7. Live!
+3. `cd ./site/; hugo serve` to confirm desired output
+4. GitHub Actions will rebuild container on push
+5. Chef will update container shortly
+6. Live!

import/questions/1.how-do-you-make-the-osm2pgsql-diff-imports-run-faster-than-molasses-on-postgres-84.html

@@ -7,7 +7,7 @@
         <meta name="description" content="Using postgres 8.4 diff imports seem to run as slow as a license change. I&#39;ve hear that it&#39;s better to use postgres 8.3. Is there any other way?" />
         <meta name="keywords" content="diff,rendering,osm2pgsql,postgres" />
 
-        <link rel="canonical" href="https://help.openstreetmap.org/questions/1/how-do-you-make-the-osm2pgsql-diff-imports-run-faster-than-molasses-on-postgres-84" />
+        <link rel="canonical" href="/questions/1/how-do-you-make-the-osm2pgsql-diff-imports-run-faster-than-molasses-on-postgres-84" />
         <link rel="alternate" type="application/rss+xml" title="RSS" href="/questions/1/how-do-you-make-the-osm2pgsql-diff-imports-run-faster-than-molasses-on-postgres-84?type=rss">
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -371,7 +371,7 @@ <h1><a href="/questions/1/how-do-you-make-the-osm2pgsql-diff-imports-run-faster-
                                 <td>
                                     <div class="item-right">
                                         <div class="answer-body">
-                                            <p>Frederik Ramm mentioned this in <a href="http://wiki.openstreetmap.org/wiki/SotM_2010_session:Tuning_the_Mapnik_Rendering_Chain">his SOTM10 presentation</a> and he has had a chance to try Postgres 9.0 (with Postgis 1.5) and that apparently no longer suffers from this slowdown - in fact it is apparently faster than Postgres 8.3 in his benchmarks.</p>
+                                            <p>Frederik Ramm mentioned this in <a href="https://wiki.openstreetmap.org/wiki/SotM_2010_session:Tuning_the_Mapnik_Rendering_Chain">his SOTM10 presentation</a> and he has had a chance to try Postgres 9.0 (with Postgis 1.5) and that apparently no longer suffers from this slowdown - in fact it is apparently faster than Postgres 8.3 in his benchmarks.</p>
                                         </div>
                                         <div class="answer-controls post-controls">
 
@@ -616,7 +616,7 @@ <h3 class="subtitle">Follow this question</h3><strong>By Email:</strong><p>Once
 
 <div id="sidebar-upper" class="boxC">
     <div class="body">
-        <p>This was the support site for <a href="http://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
+        <p>This was the support site for <a href="https://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
      </div>
 </div>
 

import/questions/10010.entering-a-no-entry-restriction-in-josm-with-more-than-one-from-way.html

@@ -7,7 +7,7 @@
         <meta name="description" content="I understand from the wiki that you can have more than one &quot;from&quot; way in a &quot;no entry&quot; turn restriction. However when I try to create such a restriction in JOSM the validator throws up errors to say that more than one &quot;from&quot; is invalid. Is JOSM&#39;s validator wrong or is the wiki wrong?" />
         <meta name="keywords" content="josm,turn_restrictions,no_entry" />
 
-        <link rel="canonical" href="https://help.openstreetmap.org/questions/10010/entering-a-no-entry-restriction-in-josm-with-more-than-one-from-way" />
+        <link rel="canonical" href="/questions/10010/entering-a-no-entry-restriction-in-josm-with-more-than-one-from-way" />
         <link rel="alternate" type="application/rss+xml" title="RSS" href="/questions/10010/entering-a-no-entry-restriction-in-josm-with-more-than-one-from-way?type=rss">
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -449,9 +449,9 @@ <h1><a href="/questions/10010/entering-a-no-entry-restriction-in-josm-with-more-
                                     <div class="item-right">
                                         <div class="answer-body">
                                             <p>The wiki is contradictory. If you look at:</p>
-<p><a href="http://wiki.openstreetmap.org/wiki/Relation:restriction#Members">http://wiki.openstreetmap.org/wiki/Relation:restriction#Members</a></p>
+<p><a href="https://wiki.openstreetmap.org/wiki/Relation:restriction#Members">https://wiki.openstreetmap.org/wiki/Relation:restriction#Members</a></p>
 <p>it says you have one from way, one to way, then one via node or one or more via ways. The road signs table on the other hand contradict this just for no entry signs:</p>
-<p><a href="http://wiki.openstreetmap.org/wiki/Relation:restriction#Road_signs">http://wiki.openstreetmap.org/wiki/Relation:restriction#Road_signs</a></p>
+<p><a href="https://wiki.openstreetmap.org/wiki/Relation:restriction#Road_signs">https://wiki.openstreetmap.org/wiki/Relation:restriction#Road_signs</a></p>
 <p>The no entry ones were only added to the wiki on 11th October last year, and I can't remember seeing discussion about them. I personally would have suggested sticking with the same definition of the relation, and if necessary creating one for each "from" way. </p>
 <p>As a reminder, no entry restrictions aren't needed for one way streets.</p>
                                         </div>
@@ -670,7 +670,7 @@ <h3 class="subtitle">Follow this question</h3><strong>By Email:</strong><p>Once
 
 <div id="sidebar-upper" class="boxC">
     <div class="body">
-        <p>This was the support site for <a href="http://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
+        <p>This was the support site for <a href="https://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
      </div>
 </div>
 

import/questions/10015.westernized-chinese-city-add-pinyin.html

@@ -7,7 +7,7 @@
         <meta name="description" content="I&#39;m trying to figure out what I have been doing is correct or not. I have been adding pinyin(romanization of chinese) to the current hanzi(chinese characters) for the city of Shanghai, China. This is too reflect another westernized chinese city, Hong Kong, China. There is a huge amount of expats liv..." />
         <meta name="keywords" content="pinyin,shanghai,china,name,hanzi" />
 
-        <link rel="canonical" href="https://help.openstreetmap.org/questions/10015/westernized-chinese-city-add-pinyin" />
+        <link rel="canonical" href="/questions/10015/westernized-chinese-city-add-pinyin" />
         <link rel="alternate" type="application/rss+xml" title="RSS" href="/questions/10015/westernized-chinese-city-add-pinyin?type=rss">
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -419,7 +419,7 @@ <h1><a href="/questions/10015/westernized-chinese-city-add-pinyin">Westernized C
                                 <td>
                                     <div class="item-right">
                                         <div class="answer-body">
-                                            <p>This kind of issue is often discussed on the project page for that country. (for China see <a href="http://wiki.openstreetmap.org/wiki/China">http://wiki.openstreetmap.org/wiki/China</a> ) It may also be discussed on <a href="http://wiki.openstreetmap.org/wiki/Multilingual_names">http://wiki.openstreetmap.org/wiki/Multilingual_names</a></p>
+                                            <p>This kind of issue is often discussed on the project page for that country. (for China see <a href="https://wiki.openstreetmap.org/wiki/China">https://wiki.openstreetmap.org/wiki/China</a> ) It may also be discussed on <a href="https://wiki.openstreetmap.org/wiki/Multilingual_names">https://wiki.openstreetmap.org/wiki/Multilingual_names</a></p>
 <p>The convention for mainland China seems to be that name= has the Chinese name only, while for Hong Kong the convention seems to be name= has the Chinese name followed by the English name (which may be different to the Chinese name using Pinyin).</p>
                                         </div>
                                         <div class="answer-controls post-controls">
@@ -697,7 +697,7 @@ <h3 class="subtitle">Follow this question</h3><strong>By Email:</strong><p>Once
 
 <div id="sidebar-upper" class="boxC">
     <div class="body">
-        <p>This was the support site for <a href="http://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
+        <p>This was the support site for <a href="https://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
      </div>
 </div>
 

import/questions/10019.how-can-i-convert-this.html

@@ -7,7 +7,7 @@
         <meta name="description" content="latitude : 42.358372000000003 longitude : -8.8580850000000009 how can I convert to  Latitude: 42° 21&#39; N Longitude: 8° 51&#39; W ?? Any tools (js scripts, libraries..) ?? thanks!" />
         <meta name="keywords" content="covert" />
 
-        <link rel="canonical" href="https://help.openstreetmap.org/questions/10019/how-can-i-convert-this" />
+        <link rel="canonical" href="/questions/10019/how-can-i-convert-this" />
         <link rel="alternate" type="application/rss+xml" title="RSS" href="/questions/10019/how-can-i-convert-this?type=rss">
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -645,7 +645,7 @@ <h3 class="subtitle">Follow this question</h3><strong>By Email:</strong><p>Once
 
 <div id="sidebar-upper" class="boxC">
     <div class="body">
-        <p>This was the support site for <a href="http://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
+        <p>This was the support site for <a href="https://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
      </div>
 </div>
 

import/questions/10023.adding-a-dedicated-turn-lane.html

@@ -7,7 +7,7 @@
         <meta name="description" content="I&#39;ve scoured the forums and cannot find the answer to this: How do I add a dedicated turn lane to a roadway? TIGER mapped the major roadway, and I have updated it to say lanes=2; however, there are various points at which a 3rd lane appears - and it is dedicated to a left or right turn at the next i..." />
         <meta name="keywords" content="turn,leftturn,rightturn,turnlanes" />
 
-        <link rel="canonical" href="https://help.openstreetmap.org/questions/10023/adding-a-dedicated-turn-lane" />
+        <link rel="canonical" href="/questions/10023/adding-a-dedicated-turn-lane" />
         <link rel="alternate" type="application/rss+xml" title="RSS" href="/questions/10023/adding-a-dedicated-turn-lane?type=rss">
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -361,7 +361,7 @@ <h1><a href="/questions/10023/adding-a-dedicated-turn-lane">Adding a dedicated t
                                 <td>
                                     <div class="item-right">
                                         <div class="answer-body">
-                                            <p>Find a junction of a similar type that as been mapped already, then open your editor and inspect what they have done.Then exit without saving. To add a lane or slip road is the same procedure of creating a node and drawing a way from that point. ask again if not sure. The editing videos are very good have a look at those too. <a href="http://wiki.openstreetmap.org/wiki/Video_tutorials">http://wiki.openstreetmap.org/wiki/Video_tutorials</a></p>
+                                            <p>Find a junction of a similar type that as been mapped already, then open your editor and inspect what they have done.Then exit without saving. To add a lane or slip road is the same procedure of creating a node and drawing a way from that point. ask again if not sure. The editing videos are very good have a look at those too. <a href="https://wiki.openstreetmap.org/wiki/Video_tutorials">https://wiki.openstreetmap.org/wiki/Video_tutorials</a></p>
                                         </div>
                                         <div class="answer-controls post-controls">
 
@@ -461,12 +461,12 @@ <h1><a href="/questions/10023/adding-a-dedicated-turn-lane">Adding a dedicated t
                                             <p>There are multiple proposals on this on wiki. I would suggest to read the proposals on wiki, choose one, help it get better (approved) and use it. Apparently there is no clear straightforward way to do this.<br>
 I will not be any more specific, since I have not decided for any of them yet.</p>
 <p>The lane proposals (there might be more):</p>
-<p><a href="http://wiki.openstreetmap.org/wiki/Proposed_features/Turn_Lanes">http://wiki.openstreetmap.org/wiki/Proposed_features/Turn_Lanes</a><br>
-<a href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Lane">http://wiki.openstreetmap.org/wiki/Relations/Proposed/Lane</a>  <br>
-<a href="http://wiki.openstreetmap.org/wiki/Proposed_features/lane_and_lane_group">http://wiki.openstreetmap.org/wiki/Proposed_features/lane_and_lane_group</a>  <br>
-<a href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/turn_lanes">http://wiki.openstreetmap.org/wiki/Relations/Proposed/turn_lanes</a>  <br>
-<a href="http://wiki.openstreetmap.org/wiki/Proposed_features/Lanes_as_Relations">http://wiki.openstreetmap.org/wiki/Proposed_features/Lanes_as_Relations</a>  <br>
-<a href="http://wiki.openstreetmap.org/wiki/Proposed_features/Lanes_as_Relations/Examples">http://wiki.openstreetmap.org/wiki/Proposed_features/Lanes_as_Relations/Examples</a>  <br>
+<p><a href="https://wiki.openstreetmap.org/wiki/Proposed_features/Turn_Lanes">https://wiki.openstreetmap.org/wiki/Proposed_features/Turn_Lanes</a><br>
+<a href="https://wiki.openstreetmap.org/wiki/Relations/Proposed/Lane">https://wiki.openstreetmap.org/wiki/Relations/Proposed/Lane</a>  <br>
+<a href="https://wiki.openstreetmap.org/wiki/Proposed_features/lane_and_lane_group">https://wiki.openstreetmap.org/wiki/Proposed_features/lane_and_lane_group</a>  <br>
+<a href="https://wiki.openstreetmap.org/wiki/Relations/Proposed/turn_lanes">https://wiki.openstreetmap.org/wiki/Relations/Proposed/turn_lanes</a>  <br>
+<a href="https://wiki.openstreetmap.org/wiki/Proposed_features/Lanes_as_Relations">https://wiki.openstreetmap.org/wiki/Proposed_features/Lanes_as_Relations</a>  <br>
+<a href="https://wiki.openstreetmap.org/wiki/Proposed_features/Lanes_as_Relations/Examples">https://wiki.openstreetmap.org/wiki/Proposed_features/Lanes_as_Relations/Examples</a>  <br>
 </p>
                                         </div>
                                         <div class="answer-controls post-controls">
@@ -592,7 +592,7 @@ <h3 class="subtitle">Follow this question</h3><strong>By Email:</strong><p>Once
 
 <div id="sidebar-upper" class="boxC">
     <div class="body">
-        <p>This was the support site for <a href="http://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
+        <p>This was the support site for <a href="https://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
      </div>
 </div>
 

import/questions/10024.increase-decrease-lane-count-for-a-small-segment-of-roadway.html

@@ -7,7 +7,7 @@
         <meta name="description" content="How does one increase or decrease the lane count for a segment of a roadway. In the specific example I have in mind, the roadway grows from 2 lanes to 3 lanes - with two designated as &quot;thru&quot; and one designated as the &quot;ramp&quot; / turn lane (merges onto a primary highway). Hows does one model this within..." />
         <meta name="keywords" content="lanecount,removinglanes,variablelanes,addinglanes" />
 
-        <link rel="canonical" href="https://help.openstreetmap.org/questions/10024/increase-decrease-lane-count-for-a-small-segment-of-roadway" />
+        <link rel="canonical" href="/questions/10024/increase-decrease-lane-count-for-a-small-segment-of-roadway" />
         <link rel="alternate" type="application/rss+xml" title="RSS" href="/questions/10024/increase-decrease-lane-count-for-a-small-segment-of-roadway?type=rss">
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -574,7 +574,7 @@ <h3 class="subtitle">Follow this question</h3><strong>By Email:</strong><p>Once
 
 <div id="sidebar-upper" class="boxC">
     <div class="body">
-        <p>This was the support site for <a href="http://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
+        <p>This was the support site for <a href="https://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
      </div>
 </div>
 

import/questions/10029.my-bollard-is-not-displayed-.html

@@ -7,7 +7,7 @@
         <meta name="description" content="hello, why bollard is not viewed on the map ? only when i edit...." />
         <meta name="keywords" content="bollard" />
 
-        <link rel="canonical" href="https://help.openstreetmap.org/questions/10029/my-bollard-is-not-displayed-" />
+        <link rel="canonical" href="/questions/10029/my-bollard-is-not-displayed-" />
         <link rel="alternate" type="application/rss+xml" title="RSS" href="/questions/10029/my-bollard-is-not-displayed-?type=rss">
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -514,7 +514,7 @@ <h3 class="subtitle">Follow this question</h3><strong>By Email:</strong><p>Once
 
 <div id="sidebar-upper" class="boxC">
     <div class="body">
-        <p>This was the support site for <a href="http://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
+        <p>This was the support site for <a href="https://www.openstreetmap.org/">OpenStreetMap</a>. It has now been replaced by <a href="https://community.openstreetmap.org/">community.osm.org</a>.</p>
      </div>
 </div>