Merge branch 'master' into 'cherry-pick-4d6c160d'

# Conflicts:
#   source/pages/os/documentation/install-guides/install-devuan.html

source/pages/os/documentation/install-guides/graphic-disk-encryption.html

@@ -42,7 +42,8 @@
 <h2>Full disk encryption</h2>
 
 
-<p>This is an easy to follow guide to setting up full disk encryption during a Devuan install.<br />
+<p>This is an easy to follow guide to setting up full disk encryption during a Devuan<br />
+graphical install.
 </p>
 
 <p>You will need to complete all other steps and reach the part on partitioning disks before<br />
@@ -114,7 +115,7 @@ the changes to disk. </strong></p>
 </div>
 <div id="foot">
     <ul class="inline">
-      <li><a href="start-here">Start here</a> |</li>
+      <li><a href="start-here">Start here</a></li>
 		</ul>
     <ul class="inline">
       <li><a href="install-devuan.html">Classic install</a> |</li>

source/pages/os/documentation/install-guides/graphic-install.html

@@ -208,7 +208,7 @@ the Devuan graphical environment.</strong></p>
 </div>
 <div id="foot">
     <ul class="inline">
-      <li><a href="start-here">Start here</a> |</li>
+      <li><a href="start-here">Start here</a></li>
 		</ul>
     <ul class="inline">
       <li><a href="install-devuan.html">Classic install</a> |</li>

source/pages/os/documentation/install-guides/install-devuan.html

@@ -209,7 +209,7 @@ to the Devuan graphical environment.</strong></p>
 </div>
 <div id="foot">
     <ul class="inline">
-      <li><a href="start-here">Start here</a> |</li>
+      <li><a href="start-here">Start here</a></li>
 		</ul>
     <ul class="inline">
       <li><a href="install-devuan.html">Classic install</a> |</li>