Merge branch 'update-html-proofer'

Author: PeterJCLaw

Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
     concurrent-ruby (1.1.8)
     em-websocket (0.5.2)
@@ -15,14 +15,15 @@ GEM
     ffi (1.15.5)
     ffi (1.15.5-x64-mingw32)
     forwardable-extended (2.6.0)
-    html-proofer (3.19.2)
+    html-proofer (4.4.3)
       addressable (~> 2.3)
       mercenary (~> 0.3)
-      nokogumbo (~> 2.0)
-      parallel (~> 1.3)
+      nokogiri (~> 1.13)
+      parallel (~> 1.10)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
+      zeitwerk (~> 2.5)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -58,19 +59,17 @@ GEM
     neat (3.0.0)
       sass (~> 3.4)
       thor (~> 0.19)
-    nokogiri (1.13.6)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.6-x64-mingw32)
+    nokogiri (1.13.9-x64-mingw32)
       racc (~> 1.4)
-    nokogumbo (2.0.5)
-      nokogiri (~> 1.8, >= 1.8.4)
-    parallel (1.21.0)
+    parallel (1.22.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
+    public_suffix (5.0.0)
     racc (1.6.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (12.3.3)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
@@ -88,6 +87,7 @@ GEM
       ethon (>= 0.9.0)
     wdm (0.1.1)
     yell (2.2.2)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   ruby

Rakefile

@@ -113,12 +113,12 @@ end
 
 task :validate_links => [:build] do
   # Explanation of arguments:
-  # --assume-extension  # Tells html-proofer that `.html` files can be accessed without the `.html` part in the url.
-  # --disable-external  # For speed. Ideally we'd check external links too, but ignoring for now.
-  # --empty-alt-ignore  # To avoid needing to fix lots upfront, we can migrate towards this later.
-  # --allow-hash-href   # Allow empty `#` links to mean "top of page". It's true that these can be errors, however we have far too many to really address this.
-  # --url-swap          # Adjust for Jekyll's baseurl. See https://github.com/gjtorikian/html-proofer/issues/618 for more.
-  sh('bundle exec htmlproofer _site --assume-extension --disable-external --empty-alt-ignore --allow-hash-href --url-swap "^/docs/:/"')
+  # --disable-external    # For speed. Ideally we'd check external links too, but ignoring for now.
+  # --ignore-missing-alt  # To avoid needing to fix lots upfront, we can migrate towards this later.
+  # --allow-hash-href     # Allow empty `#` links to mean "top of page". It's true that these can be errors, however we have far too many to really address this.
+  # --allow-missing-href  # Allow missing hrefs as we use them in the troubleshooter and rules (as anchors). It's true that these can be errors, however we have plenty which are legitimate.
+  # --swap-urls           # Adjust for Jekyll's baseurl. See https://github.com/gjtorikian/html-proofer/issues/618 for more.
+  sh('bundle exec htmlproofer _site --disable-external true --ignore-missing-alt true --allow-hash-href true --allow-missing-href true --swap-urls "^/docs/:/"')
 end
 
 task :validate_sidebar_tree => [:build] do

_config.yml

@@ -14,9 +14,9 @@ plugins:
   - jekyll-redirect-from
 
 links:
-  compete: //docs.google.com/forms/d/1Ryg2cfAxfwMOBnT01aj-fzsp51F3B182S5e53ye8aMw/viewform
-  volunteer: //docs.google.com/forms/d/1MIGf3P30dw0QAtP8OkxK2v7VRDEAN_54JoZHCVMbqDY/viewform
-  donate: //link.justgiving.com/v1/charity/donate/charityId/3118662?tipScheme=TipJar2.1&isRecurring=true&amount=20.00&reference=givingcheckout_tj21
+  compete: https://docs.google.com/forms/d/1Ryg2cfAxfwMOBnT01aj-fzsp51F3B182S5e53ye8aMw/viewform
+  volunteer: https://docs.google.com/forms/d/1MIGf3P30dw0QAtP8OkxK2v7VRDEAN_54JoZHCVMbqDY/viewform
+  donate: https://link.justgiving.com/v1/charity/donate/charityId/3118662?tipScheme=TipJar2.1&isRecurring=true&amount=20.00&reference=givingcheckout_tj21
 
 navigation:
   - about

_includes/footer.html

@@ -37,13 +37,13 @@ <h4>Student Robotics</h4>
       <p>&nbsp;</p>
       <p>
         The fantastic photos come from
-        <a href="//www.flickr.com/photos/richardpbarlow/">Richard Barlow</a>,
-        <a href="//www.flickr.com/photos/howiegoing/">Howard Buck</a>,
-        <a href="//www.flickr.com/photos/theorangeone/">Jake Howard</a>,
+        <a href="https://www.flickr.com/photos/richardpbarlow/">Richard Barlow</a>,
+        <a href="https://www.flickr.com/photos/howiegoing/">Howard Buck</a>,
+        <a href="https://www.flickr.com/photos/theorangeone/">Jake Howard</a>,
         Laurie Kirkcaldy,
         Anton Nikitin,
         Antoine Petty, and
-        <a href="http://www.headington.org/">Headington School Oxford</a>.
+        <a href="https://www.headington.org/">Headington School Oxford</a>.
       </p>
     </div>
     <div class="column d-6-12 text-right">

kit/brain_board/index.md

@@ -71,7 +71,7 @@ We recommend using [Etcher](https://etcher.io), as it's simple to use, and avail
 ![Etcher example]({{ site.baseurl }}/images/content/kit/etcher.png)
 
 <div class="info" markdown="1">
-If you choose to use a tool other than Etcher, you may need to extract the `srobo-robot-{{ latest_version }}.img.xz` to `srobo-robot-{{ latest_version }}.img`. There are many tools available for this, e.g. [7-zip](http://www.7-zip.org/).
+If you choose to use a tool other than Etcher, you may need to extract the `srobo-robot-{{ latest_version }}.img.xz` to `srobo-robot-{{ latest_version }}.img`. There are many tools available for this, e.g. [7-zip](https://www.7-zip.org/).
 </div>
 
 ### Flashing

programming/sr/ruggeduinos/custom_firmware.md

@@ -142,4 +142,4 @@ ser = serial.Serial(R.ignored_ruggeduinos[RUGGEDUINO_ID])
 
 ~~~~~
 
-Refer to the [pyserial documentation](http://pyserial.sourceforge.net/) for more information on how to use pyserial.
+Refer to the [pyserial documentation](https://pyserial.readthedocs.org/en/latest/) for more information on how to use pyserial.