From 73a546854ad357a650da99060b5c0847f46d239d Mon Sep 17 00:00:00 2001 From: Axon Date: Sat, 20 Feb 2016 21:15:30 +0000 Subject: [PATCH] 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). --- {privacy => configuration}/vpn.md | 4 ++-- doc.md | 13 ++++++------- privacy/torvm.md | 3 ++- .../{customizing-whonix.md => whonix-customize.md} | 3 ++- privacy/{install-whonix.md => whonix-install.md} | 3 ++- .../{uninstall-whonix.md => whonix-uninstall.md} | 3 ++- privacy/{updating-whonix.md => whonix-update.md} | 3 ++- privacy/whonix.md | 11 ++++++----- 8 files changed, 24 insertions(+), 19 deletions(-) rename {privacy => configuration}/vpn.md (98%) rename privacy/{customizing-whonix.md => whonix-customize.md} (97%) rename privacy/{install-whonix.md => whonix-install.md} (97%) rename privacy/{uninstall-whonix.md => whonix-uninstall.md} (96%) rename privacy/{updating-whonix.md => whonix-update.md} (97%) diff --git a/privacy/vpn.md b/configuration/vpn.md similarity index 98% rename from privacy/vpn.md rename to configuration/vpn.md index 98cf4268..3594a912 100644 --- a/privacy/vpn.md +++ b/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/ --- diff --git a/doc.md b/doc.md index 9dcba3bb..6914972f 100644 --- a/doc.md +++ b/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 diff --git a/privacy/torvm.md b/privacy/torvm.md index 62603475..161d38c7 100644 --- a/privacy/torvm.md +++ b/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/ diff --git a/privacy/customizing-whonix.md b/privacy/whonix-customize.md similarity index 97% rename from privacy/customizing-whonix.md rename to privacy/whonix-customize.md index d12bd690..f43a6e9d 100644 --- a/privacy/customizing-whonix.md +++ b/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 diff --git a/privacy/install-whonix.md b/privacy/whonix-install.md similarity index 97% rename from privacy/install-whonix.md rename to privacy/whonix-install.md index 77a13c32..d8f1cd6f 100644 --- a/privacy/install-whonix.md +++ b/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/ --- diff --git a/privacy/uninstall-whonix.md b/privacy/whonix-uninstall.md similarity index 96% rename from privacy/uninstall-whonix.md rename to privacy/whonix-uninstall.md index dbbe69c5..37307851 100644 --- a/privacy/uninstall-whonix.md +++ b/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 diff --git a/privacy/updating-whonix.md b/privacy/whonix-update.md similarity index 97% rename from privacy/updating-whonix.md rename to privacy/whonix-update.md index 2820259c..47045bac 100644 --- a/privacy/updating-whonix.md +++ b/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 diff --git a/privacy/whonix.md b/privacy/whonix.md index a48a9473..07000511 100644 --- a/privacy/whonix.md +++ b/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.*