From 8561b1b01d8ec7c60cd17a4ea4d7225aa36105b2 Mon Sep 17 00:00:00 2001 From: Axon Date: Fri, 18 Mar 2016 16:45:48 +0000 Subject: [PATCH] Organize Whonix pages Fixes QubesOS/qubes-issues#1664 --- doc.md | 10 +++------- managing-os/templates/whonix.md | 23 ----------------------- privacy/whonix.md | 25 ++++++++++++++++++------- 3 files changed, 21 insertions(+), 37 deletions(-) delete mode 100644 managing-os/templates/whonix.md diff --git a/doc.md b/doc.md index eae48826..17c78df4 100644 --- a/doc.md +++ b/doc.md @@ -62,7 +62,7 @@ Managing Operating Systems within Qubes * [Templates: Debian](/doc/templates/debian/) * [Templates: Archlinux](/doc/templates/archlinux/) * [Templates: Ubuntu](/doc/templates/ubuntu/) - * [Templates: Whonix](/doc/templates/whonix/) + * [Templates: Whonix](/doc/whonix/) * [Installing and Using Windows-based AppVMs (Qubes R2 Beta 3 and later)](/doc/windows-appvms/) * [Creating and Using HVM and Windows Domains (Qubes R2+)](/doc/hvm-create/) * [Advanced options and troubleshooting of Qubes Tools for Windows (R3)](/doc/windows-tools-3/) @@ -92,12 +92,8 @@ Security Guides Privacy Guides -------------- - * [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/) + * [Whonix for Privacy & Anonymity](/doc/whonix/) + * [TorVM](/doc/torvm/) Configuration Guides diff --git a/managing-os/templates/whonix.md b/managing-os/templates/whonix.md deleted file mode 100644 index dfd6e477..00000000 --- a/managing-os/templates/whonix.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -layout: doc -title: Whonix template -permalink: /doc/templates/whonix/ -redirect_from: -- /en/doc/templates/whonix/ -- /doc/Templates/Whonix/ -- /wiki/Templates/Whonix/ ---- - -Whonix template(s) -================== - -Whonix is an operating system focused on anonymity, privacy and security. It's -based on the Tor anonymity network, Debian GNU/Linux and security by isolation. -Its primary isolation mechanism is VirtualBox, but now it is also possible to -run it on top of Qubes OS! - -Whonix template(s) are another Qubes community contribution. Currently Whonix actively maintains those templates. - -### Installation & Details - -To learn more and for installation instructions, read our privacy guide: [Whonix for privacy & anonymization](/doc/whonix/) diff --git a/privacy/whonix.md b/privacy/whonix.md index 07000511..dfcca26e 100644 --- a/privacy/whonix.md +++ b/privacy/whonix.md @@ -1,25 +1,35 @@ --- layout: doc -title: Whonix for privacy & anonymizations +title: Whonix for Privacy & Anonymity permalink: /doc/whonix/ -redirect_from: /doc/privacy/whonix/ +redirect_from: +- /doc/privacy/whonix/ +- /doc/templates/whonix/ +- /en/doc/templates/whonix/ +- /doc/Templates/Whonix/ +- /wiki/Templates/Whonix/ --- Whonix for Privacy & Anonymity ============================== -To improve your privacy & anonymity on the internet, you can install the [Whonix Template](/doc/templates/whonix/) on your Qubes machine. +To improve your privacy and anonymity on the internet, you can install the +Whonix Template on your Qubes machine. -[Whonix](https://www.whonix.org) is based on [Debian](https://www.debian.org) and [Tor](https://www.torproject.org) and utilizes two VMs, a **"gateway"** and a **"workstation"**. Qubes security architecture makes use of Whonix's isolation by using the gateway as a ProxyVM to route all network traffic through Tor, while the workstation is used for making AppVMs. +[Whonix](https://www.whonix.org) is based on [Debian](https://www.debian.org) +and [Tor](https://www.torproject.org) and utilizes two VMs, a **"gateway"** and +a **"workstation"**. Qubes security architecture makes use of Whonix's isolation +by using the gateway as a ProxyVM to route all network traffic through Tor, +while the workstation is used for making AppVMs. -### Getting Started with Whonix +## Getting Started with Whonix To install Whonix, you must have a working Qubes machine already. * [Install Whonix in Qubes](/doc/whonix/install/) * [Updating Whonix in Qubes](/doc/whonix/update/) -### Customizing & Uninstalling Whonix +## Customizing & Uninstalling Whonix * [Customizing Whonix](/doc/whonix/customize/) * [Uninstall Whonix from Qubes](/doc/whonix/uninstall/) @@ -30,7 +40,7 @@ To install Whonix, you must have a working Qubes machine already. * [How to set up Tor Bridges in Whonix on Qubes](https://www.whonix.org/wiki/Bridges#How_to_use_bridges_in_Whonix) * [Using Multiple Whonix-Workstations with Whonix on Qubes](https://www.whonix.org/wiki/Multiple_Whonix-Workstations#Qubes-Whonix) -### Support for Whonix +## Support for Whonix *The following links are on Whonix's site.* @@ -38,3 +48,4 @@ To install Whonix, you must have a working Qubes machine already. * [Whonix Qubes Forum](https://forums.whonix.org/c/qubes) - Whonix specific issues You can also use [Qubes support](/help/), but not all Qubes users run Whonix. +