Normalize Navbar Labels

legacy_pages/software.html

@@ -12,7 +12,7 @@ description: "Discover a variety of open-source software built to protect your p
     <li class="list-group-item"><a href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a></li>
     <li class="list-group-item"><a href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebook</a></li>
     <li class="list-group-item"><a href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a></li>
-    <li class="list-group-item"><a href="/software/encryption-tools/"><span class="fas fa-lock fa-fw"></span> File Encryption</a></li>
+    <li class="list-group-item"><a href="/software/productivity/#encrypt"><span class="fas fa-lock fa-fw"></span> File Encryption</a></li>
     <li class="list-group-item"><a href="/software/file-sharing/"><span class="fas fa-file-export fa-fw"></span> File Sharing</a></li>
     <li class="list-group-item"><a href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Manager</a></li>
     <li class="list-group-item"><a href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> Productivity Tools</a></li>

legacy_pages/software/encryption.html

@@ -1,6 +1,6 @@
 ---
 layout: page
-permalink: /software/encryption-tools/
+permalink: /software/productivity/#encrypt
 title: "Encryption Tools"
 description: "Discover free, open-source, and secure ways to encrypt your sensitive data to keep it from prying eyes."
 ---

legacy_pages/software/file-sharing.html

@@ -1,8 +1,10 @@
 ---
 layout: page
 permalink: /software/file-sharing/
-title: "File Sharing"
-description: "Discover how to share your files with your friends and family or anonymously, without a middleman."
+title: "File Sharing and Sync"
+description: "Discover how to privately share your files between your devices, with your friends and family, or anonymously online."
 ---
 
 {% include legacy/sections/file-sharing.html %}
+
+{% include legacy/sections/file-sync.html %}

legacy_pages/software/file-sync.html

@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /software/file-sync/
-title: "File Sync"
-description: "Discover free, open-source, and secure ways to sync your files across your devices."
----
-
-{% include legacy/sections/file-sync.html %}

legacy_pages/software/productivity.html

@@ -6,3 +6,7 @@ description: "Get working and collaborating without sharing your documents with
 ---
 
 {% include legacy/sections/productivity-tools.html %}
+
+{% include legacy/sections/metadata-removal-tools.html %}
+
+{% include legacy/sections/file-encryption.html %}