Merge branch '117-update-missing-content-from-software-hifis-net' into...

Merge branch '117-update-missing-content-from-software-hifis-net' into 'hifis-unified-step-1-after-vc-20210317'

Resolve "Update missing content from software.hifis.net"

See merge request hifis/hifis.net!213

_includes/contact_us/mini-form.html

+<span class="team-card-mini">
+    <a href="https://survey.pt-dlr.de/index.php?r=survey/index&sid=958212&lang=en&newtest=Y">
+        <i class="far fa-envelope"></i>
+        <span class="name">Request a Consultation</span>
+    </a>
+</span>

_includes/frontpage/title-content.html

@@ -10,7 +10,7 @@
         <a href="https://aai.helmholtz.de" class="btn btn-light btn-lg text-dark">
             <i class="fas fa-network-wired"></i>Helmholtz AAI
         </a>
-        <a href="{{ '/services/software/consulting' | relative_url }}" class="btn btn-light btn-lg text-dark">
+        <a href="{% link services/software/consulting.html %}" class="btn btn-light btn-lg text-dark">
             <i class="fas fa-chart-line"></i> Consulting
         </a>
         <a href="{{ '/services/software/training' | relative_url }}" class="btn btn-light btn-lg text-dark">

_posts/2020/08/2020-08-19-introducing-consulting.md

@@ -53,7 +53,7 @@ HIFIS Consulting is free, and available to any group or team that falls under th
 All you need to do is fill out the form on our [**consulting page**][hifis/consulting],
 and we will be in touch as soon as possible.
 
-[hifis/consulting]: <https://software.hifis.net/services/consulting>
+[hifis/consulting]: {% link services/software/consulting.html %}
 
 <br />
 
@@ -63,6 +63,6 @@ and we will be in touch as soon as possible.
     If you work for a Helmholtz-affilliated institution, and think that something like this would be useful to you, send us an e-mail at
     <strong><a href="mailto:{{site.contact_mail}}">{{site.contact_mail}}</a></strong>,
     or fill in our
-    <strong><a href="https://software.hifis.net/services/consulting#consultation-request-form">consultation request form</a></strong>.
+    <strong><a href="{% link services/software/consulting.html %}#consultation-request-form">consultation request form</a></strong>.
   </p>
 </div>

_posts/2020/09/2020-09-23-getting-started-with-docker-1.md

@@ -114,6 +114,12 @@ this is essentially just the core part of Docker that runs containers.
 The installation instructions for Mac, Windows, and Linux are available at the [Get Docker](https://docs.docker.com/get-docker/) page --
 if you want to follow along with the rest of these commands, feel free to complete those installation instructions, and then come back here.
 
+{:.summary}
+> N.B. On most Linux distributions, you will need to also follow the post-installation steps
+> (linked at the bottom of the installation page and [here](https://docs.docker.com/engine/install/linux-postinstall/))
+> in order to run the `docker` command without `sudo` as a non-root user.
+> If you're getting errors about invalid permissions when running any of the following commands, this is probably the issue you are facing.
+
 [^3]:
     Why?
     As I mentioned in the previous footnote,
@@ -286,7 +292,7 @@ View part two [here]({% post_url 2020/09/2020-09-25-getting-started-with-docker-
     If you work for a Helmholtz-affiliated institution, and think that this would be useful to you, send us an e-mail at
     <strong><a href="mailto:{{site.contact_mail}}">{{site.contact_mail}}</a></strong>,
     or fill in our
-    <strong><a href="https://software.hifis.net/services/consulting#consultation-request-form">consultation request form</a></strong>.
+    <strong><a href="{% link services/software/consulting.html %}#consultation-request-form">consultation request form</a></strong>.
   </p>
 </div>
 

_posts/2020/09/2020-09-25-getting-started-with-docker-2.md

@@ -283,11 +283,11 @@ View part three [here]({% post_url 2020/09/2020-09-29-getting-started-with-docke
   <p>
     HIFIS offers free-of-charge workshops and consulting to research groups within the Helmholtz umbrella.
     You can read more about what we offer on our
-    <strong><a href="https://software.hifis.net/services">services page</a></strong>.
+    <strong><a href="{% link services/index.md %}">services page</a></strong>.
     If you work for a Helmholtz-affiliated institution, and think that something like this would be useful to you, send us an e-mail at
     <strong><a href="mailto:{{site.contact_mail}}">{{site.contact_mail}}</a></strong>,
     or fill in our
-    <strong><a href="https://software.hifis.net/services/consulting.html#consultation-request-form">consultation request form</a></strong>.
+    <strong><a href="{% link services/software/consulting.html %}#consultation-request-form">consultation request form</a></strong>.
   </p>
 </div>
 

_posts/2020/09/2020-09-29-getting-started-with-docker-3.md

@@ -338,11 +338,11 @@ For more details about this, see the "Get In Touch" box below.
   <p>
     HIFIS offers free-of-charge workshops and consulting to research groups within the Helmholtz umbrella.
     You can read more about what we offer on our
-    <strong><a href="https://software.hifis.net/services">services page</a></strong>.
+    <strong><a href="{% link services/index.md %}">services page</a></strong>.
     If you work for a Helmholtz-affilliated institution, and think that something like this would be useful to you, send us an e-mail at
     <strong><a href="mailto:{{site.contact_mail}}">{{site.contact_mail}}</a></strong>,
     or fill in our
-    <strong><a href="https://software.hifis.net/services/consulting.html#consultation-request-form">consultation request form</a></strong>.
+    <strong><a href="{% link services/software/consulting.html %}#consultation-request-form">consultation request form</a></strong>.
   </p>
 </div>
 

services/software/consulting.html

@@ -4,7 +4,7 @@ title_image: jamie-street-_94HLr_QXo8-unsplash.jpg
 layout: services/default
 author: none
 additional_css:
-    - services/consulting-help-images.css
+    - services/services-page-images.css
 excerpt: >-
     We offer free-of-charge consulting in software engineering
     as a service to research groups under the Helmholtz umbrella.
@@ -110,4 +110,6 @@ excerpt: >-
     directly.
 </p>
 
-<a href="https://survey.pt-dlr.de/index.php?r=survey/index&sid=958212&lang=en&newtest=Y">Request a consultation.</a>
+<p id="consultation-request-form">
+    {% include contact_us/mini-form.html %}
+</p>