Clean up and organize privacy pages

* Logically organize the Whonix-related pages
* Move the VPN page to /configuration/
  * VPNs are used for more than just privacy, and many VPN setups and
    services either can't or don't claim to provide privacy.
* Remove `/privacy/` from URLs
  * These directory names are just for organizing the source pages,
    *unless* an actual page resides there. Since there is no
    /doc/privacy/ page, it's unnecessary and misleading to have this in
    the URLs. It also breaks uniformity, since none of the other pages
    have their informal group name in their URL (again, unless there's
    a page with that name).

configuration/vpn.md

@@ -1,10 +1,10 @@
 ---
 layout: doc
 title: VPN
-permalink: /doc/privacy/vpn/
+permalink: /doc/vpn/
 redirect_from:
+- /doc/privacy/vpn/
 - /en/doc/vpn/
-- /doc/vpn/
 - /doc/VPN/
 - /wiki/VPN/
 ---

doc.md

@@ -85,13 +85,12 @@ Security Guides
 
 Privacy Guides
 --------------
-  *  [Whonix for privacy & anonymization](/doc/privacy/whonix/)
-  *  [Install Whonix in Qubes](/doc/privacy/install-whonix/)
-  *  [Updating Whonix in Qubes](/doc/privacy/updating-whonix/)
-  *  [Customizing Whonix](/doc/privacy/customizing-whonix/)
-  *  [Uninstall Whonix from Qubes](/doc/privacy/uninstall-whonix/)
-  *  [How to Install TorVM](/doc/privacy/torvm/)
-  *  [How to set up a ProxyVM as a VPN Gateway](/doc/privacy/vpn/)
+  *  [Whonix for privacy & anonymization](/doc/whonix/)
+  *  [Install Whonix in Qubes](/doc/whonix/install/)
+  *  [Updating Whonix in Qubes](/doc/whonix/update/)
+  *  [Customizing Whonix](/doc/whonix/customize/)
+  *  [Uninstall Whonix from Qubes](/doc/whonix/uninstall/)
+  *  [How to Install TorVM](/doc/torvm/)
 
 
 Configuration Guides

privacy/torvm.md

@@ -1,8 +1,9 @@
 ---
 layout: doc
 title: TorVM
-permalink: /doc/privacy/torvm/
+permalink: /doc/torvm/
 redirect_from:
+- /doc/privacy/torvm/
 - /en/doc/torvm/
 - /doc/TorVM/
 - /doc/UserDoc/TorVM/

privacy/whonix-customize.md

@@ -1,7 +1,8 @@
 ---
 layout: doc
 title: Customizing Whonix
-permalink: /doc/privacy/customizing-whonix/
+permalink: /doc/whonix/customize/
+redirect_from: /doc/privacy/customizing-whonix/
 ---
 
 Customizing Whonix

privacy/whonix-install.md

@@ -1,7 +1,8 @@
 ---
 layout: doc
 title: Install Whonix in Qubes
-permalink: /doc/privacy/install-whonix/
+permalink: /doc/whonix/install/
+redirect_from: /doc/privacy/install-whonix/
 ---
 
 

privacy/whonix-uninstall.md

@@ -1,7 +1,8 @@
 ---
 layout: doc
 title: Uninstall Whonix from Qubes
-permalink: /doc/privacy/uninstall-whonix/
+permalink: /doc/whonix/uninstall/
+redirect_from: /doc/privacy/uninstall-whonix/
 ---
 
 Uninstall Whonix from Qubes

privacy/whonix-update.md

@@ -1,7 +1,8 @@
 ---
 layout: doc
 title: Updating Whonix in Qubes
-permalink: /doc/privacy/updating-whonix/
+permalink: /doc/whonix/update/
+redirect_from: /doc/privacy/updating-whonix/
 ---
 
 Updating Whonix in Qubes

privacy/whonix.md

@@ -1,7 +1,8 @@
 ---
 layout: doc
 title: Whonix for privacy & anonymizations
-permalink: /doc/privacy/whonix/
+permalink: /doc/whonix/
+redirect_from: /doc/privacy/whonix/
 ---
 
 Whonix for Privacy & Anonymity
@@ -15,13 +16,13 @@ To improve your privacy & anonymity on the internet, you can install the [Whonix
 
 To install Whonix, you must have a working Qubes machine already.
 
-*  [Install Whonix in Qubes](/doc/privacy/install-whonix/)
-*  [Updating Whonix in Qubes](/doc/privacy/updating-whonix/)
+*  [Install Whonix in Qubes](/doc/whonix/install/)
+*  [Updating Whonix in Qubes](/doc/whonix/update/)
 
 ### Customizing & Uninstalling Whonix
 
-*  [Customizing Whonix](/doc/privacy/customizing-whonix/)
-*  [Uninstall Whonix from Qubes](/doc/privacy/uninstall-whonix/)
+*  [Customizing Whonix](/doc/whonix/customize/)
+*  [Uninstall Whonix from Qubes](/doc/whonix/uninstall/)
 
 *The following links are on Whonix's website and are technical.*