diff --git a/installing/multiboot.md b/configuration/multiboot.md similarity index 98% rename from installing/multiboot.md rename to configuration/multiboot.md index 7232b3db..01a77d18 100644 --- a/installing/multiboot.md +++ b/configuration/multiboot.md @@ -7,11 +7,6 @@ permalink: /doc/multiboot/ Multibooting Qubes ======================================== -1. [Introduction](#introduction) -2. [Windows](#windows) -3. [Linux](#linux) -4. [Troubleshooting](#troubleshooting) - Introduction --------------------- diff --git a/doc.md b/doc.md index a5f3a127..eae48826 100644 --- a/doc.md +++ b/doc.md @@ -10,159 +10,172 @@ redirect_from: - /wiki/QubesDocs/ --- - The Basics ---------- - * [A Tour of Qubes OS](/tour/) - * [Getting Started](/getting-started) - * [Users' FAQ](/doc/user-faq/) - * [Mailing Lists](/doc/mailing-lists/) - * [Documentation Guidelines](/doc/doc-guidelines/) + + * [A Tour of Qubes OS](/tour/) + * [Getting Started](/getting-started/) + * [User FAQ](/doc/user-faq/) Choosing Your Hardware ---------------------- - * [System Requirements](/doc/system-requirements/) - * [Hardware Compatibility List (HCL)](/hcl/) - * [Qubes-Certified Laptops](/doc/certified-laptops/) + + * [System Requirements](/doc/system-requirements/) + * [Hardware Compatibility List (HCL)](/hcl/) + * [Qubes-Certified Laptops](/doc/certified-laptops/) -Installing Qubes ----------------- - * [Use Qubes without installing: Qubes Live USB (alpha)](/doc/live-usb/) - * [How to Install Qubes](/doc/installation-guide/) - * [Qubes Downloads](/downloads/) - * [Why and How to Verify Signatures](/doc/verifying-signatures/) - * [Security Considerations when Installing](/doc/install-security/) +Installing & Upgrading Qubes +---------------------------- + * [Qubes Downloads](/downloads/) + * [Installation Guide](/doc/installation-guide/) + * [Upgrade Guides](/doc/upgrade/) + * [Why and How to Verify Signatures](/doc/verifying-signatures/) + * [Security Considerations when Installing](/doc/install-security/) + * [Try Qubes without installing: Qubes Live USB (alpha)](/doc/live-usb/) + * [Supported Versions](/doc/supported-versions/) + * [Version Scheme](/doc/version-scheme/) Common Tasks ------------ - * [Copying and Pasting Text Between Domains](/doc/copy-paste/) - * [Copying and Moving Files Between Domains](/doc/copying-files/) - * [Copying Files to and from dom0](/doc/copy-to-dom0/) - * [Updating Software in dom0](/doc/software-update-dom0/) - * [Updating and Installing Software in VMs](/doc/software-update-vm/) - * [Backup, Restoration, and Migration](/doc/backup-restore/) - * [Disposable VMs](/doc/dispvm/) - * [Using and Managing USB Devices](/doc/usb/) - * [Recording Optical Discs](/doc/recording-optical-discs/) - * [Managing Application Shortcuts](/doc/managing-appvm-shortcuts/) - * [Enabling Fullscreen Mode](/doc/full-screen-mode/) + + * [Copying and Pasting Text Between Domains](/doc/copy-paste/) + * [Copying and Moving Files Between Domains](/doc/copying-files/) + * [Copying Files to and from dom0](/doc/copy-to-dom0/) + * [Updating Software in dom0](/doc/software-update-dom0/) + * [Updating and Installing Software in VMs](/doc/software-update-vm/) + * [Backup, Restoration, and Migration](/doc/backup-restore/) + * [Using Disposable VMs](/doc/dispvm/) + * [Using and Managing USB Devices](/doc/usb/) + * [Recording Optical Discs](/doc/recording-optical-discs/) + * [Managing Application Shortcuts](/doc/managing-appvm-shortcuts/) + * [Enabling Fullscreen Mode](/doc/full-screen-mode/) Managing Operating Systems within Qubes --------------------------------------- - * [TemplateVMs](/doc/templates/) - * [Templates: Fedora - minimal](/doc/templates/fedora-minimal/) - * [Templates: Debian](/doc/templates/debian/) - * [Templates: Archlinux](/doc/templates/archlinux/) - * [Templates: Ubuntu](/doc/templates/ubuntu/) - * [Templates: Whonix](/doc/templates/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/) - * [Advanced options and troubleshooting of Qubes Tools for Windows (R2)](/doc/windows-tools-2/) - * [Uninstalling Qubes Tools for Windows 2.x](/doc/uninstalling-windows-tools-2/) - * [Upgrading the Fedora 21 Template](/doc/fedora-template-upgrade-21/) - * [Upgrading the Fedora 20 Template](/doc/fedora-template-upgrade-20/) - * [Upgrading the Fedora 18 Template](/doc/fedora-template-upgrade-18/) - * [Tips for Using Linux in an HVM](/doc/linux-hvm-tips/) - * [Creating NetBSD VM](https://groups.google.com/group/qubes-devel/msg/4015c8900a813985) + + * [TemplateVMs](/doc/templates/) + * [Templates: Fedora - minimal](/doc/templates/fedora-minimal/) + * [Templates: Debian](/doc/templates/debian/) + * [Templates: Archlinux](/doc/templates/archlinux/) + * [Templates: Ubuntu](/doc/templates/ubuntu/) + * [Templates: Whonix](/doc/templates/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/) + * [Advanced options and troubleshooting of Qubes Tools for Windows (R2)](/doc/windows-tools-2/) + * [Uninstalling Qubes Tools for Windows 2.x](/doc/uninstalling-windows-tools-2/) + * [Upgrading the Fedora 21 Template](/doc/fedora-template-upgrade-21/) + * [Upgrading the Fedora 20 Template](/doc/fedora-template-upgrade-20/) + * [Upgrading the Fedora 18 Template](/doc/fedora-template-upgrade-18/) + * [Tips for Using Linux in an HVM](/doc/linux-hvm-tips/) + * [Creating NetBSD VM](https://groups.google.com/group/qubes-devel/msg/4015c8900a813985) Security Guides --------------- - * [Qubes OS Project Security Information](/security/) - * [Security Guidelines](/doc/security-guidelines/) - * [Understanding Qubes Firewall](/doc/qubes-firewall/) - * [Understanding and Preventing Data Leaks](/doc/data-leaks/) - * [Installing Anti Evil Maid](/doc/anti-evil-maid/) - * [Using Multi-factor Authentication with Qubes](/doc/multifactor-authentication/) - * [Using GPG more securely in Qubes: Split GPG](/doc/split-gpg/) - * [Configuring YubiKey for user authentication](/doc/yubi-key/) - * [Note regarding password-less root access in VM](/doc/vm-sudo/) + + * [Qubes OS Project Security Information](/security/) + * [Security Guidelines](/doc/security-guidelines/) + * [Understanding Qubes Firewall](/doc/qubes-firewall/) + * [Understanding and Preventing Data Leaks](/doc/data-leaks/) + * [Installing Anti Evil Maid](/doc/anti-evil-maid/) + * [Using Multi-factor Authentication with Qubes](/doc/multifactor-authentication/) + * [Using GPG more securely in Qubes: Split GPG](/doc/split-gpg/) + * [Configuring YubiKey for user authentication](/doc/yubi-key/) + * [Note regarding password-less root access in VM](/doc/vm-sudo/) 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 & 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 -------------------- - * [Configuration Files](/doc/config-files/) - * [How to set up a ProxyVM as a VPN Gateway](/doc/vpn/) - * [Storing AppVMs on Secondary Drives](/doc/secondary-storage/) - * [Where are my external storage devices mounted?](/doc/external-device-mount-point/) - * [Resizing AppVM and HVM Disk Images](/doc/resize-disk-image/) - * [Extending `root.img` Size](/doc/resize-root-disk-image/) - * [Installing ZFS in Qubes](/doc/zfs/) - * [Mutt Guide](/doc/mutt/) - * [Postfix Guide](/doc/postfix/) - * [Fetchmail Guide](/doc/fetchmail/) - * [Creating Custom NetVMs and ProxyVMs](http://theinvisiblethings.blogspot.com/2011/09/playing-with-qubes-networking-for-fun.html) - * [How to make proxy for individual tcp connection from networkless VM](https://groups.google.com/group/qubes-devel/msg/4ca950ab6d7cd11a) - * [HTTP filtering proxy in Qubes firewall VM](https://groups.google.com/group/qubes-devel/browse_thread/thread/5252bc3f6ed4b43e/d881deb5afaa2a6c#39c95d63fccca12b) - * [Adding Bridge Support to the NetVM (EXPERIMENTAL)](/doc/network-bridge-support/) - * [Assigning PCI Devices to AppVMs](/doc/assigning-devices/) - * [Enabling TRIM for SSD disks](/doc/disk-trim/) - * [Configuring a Network Printer](/doc/network-printer/) - * [Using External Audio Devices](/doc/external-audio/) - * [Booting with GRUB2 and GPT](https://groups.google.com/group/qubes-devel/browse_thread/thread/e4ac093cabd37d2b/d5090c20d92c4128#d5090c20d92c4128) - * [Rxvt Guide](/doc/rxvt/) - * [Managing VM kernel](/doc/managing-vm-kernel/) - * [Salt management stack](/doc/salt/) - * [Adding SSD storage cache](https://groups.google.com/d/msgid/qubes-users/a08359c9-9eb0-4d1a-ad92-a8a9bc676ea6%40googlegroups.com) + + * [Configuration Files](/doc/config-files/) + * [How to set up a ProxyVM as a VPN Gateway](/doc/vpn/) + * [Storing AppVMs on Secondary Drives](/doc/secondary-storage/) + * [Where are my external storage devices mounted?](/doc/external-device-mount-point/) + * [Multibooting](/doc/multiboot/) + * [Resizing AppVM and HVM Disk Images](/doc/resize-disk-image/) + * [Extending `root.img` Size](/doc/resize-root-disk-image/) + * [Installing ZFS in Qubes](/doc/zfs/) + * [Mutt Guide](/doc/mutt/) + * [Postfix Guide](/doc/postfix/) + * [Fetchmail Guide](/doc/fetchmail/) + * [Creating Custom NetVMs and ProxyVMs](http://theinvisiblethings.blogspot.com/2011/09/playing-with-qubes-networking-for-fun.html) + * [How to make proxy for individual tcp connection from networkless VM](https://groups.google.com/group/qubes-devel/msg/4ca950ab6d7cd11a) + * [HTTP filtering proxy in Qubes firewall VM](https://groups.google.com/group/qubes-devel/browse_thread/thread/5252bc3f6ed4b43e/d881deb5afaa2a6c#39c95d63fccca12b) + * [Adding Bridge Support to the NetVM (EXPERIMENTAL)](/doc/network-bridge-support/) + * [Assigning PCI Devices to AppVMs](/doc/assigning-devices/) + * [Enabling TRIM for SSD disks](/doc/disk-trim/) + * [Configuring a Network Printer](/doc/network-printer/) + * [Using External Audio Devices](/doc/external-audio/) + * [Booting with GRUB2 and GPT](https://groups.google.com/group/qubes-devel/browse_thread/thread/e4ac093cabd37d2b/d5090c20d92c4128#d5090c20d92c4128) + * [Rxvt Guide](/doc/rxvt/) + * [Managing VM kernel](/doc/managing-vm-kernel/) + * [Salt management stack](/doc/salt/) + * [Adding SSD storage cache](https://groups.google.com/d/msgid/qubes-users/a08359c9-9eb0-4d1a-ad92-a8a9bc676ea6%40googlegroups.com) + Customization Guides -------------------- - * [DispVM Customization](/doc/dispvm-customization/) - * [Customizing Fedora minimal templates](/doc/fedora-minimal-template-customization) - * [Customizing Windows 7 templates](/doc/windows-template-customization) - * [Using KDE in dom0](/doc/kde/) - * [Installing XFCE in dom0](/doc/xfce/) - * [Language Localization](/doc/language-localization/) + + * [DispVM Customization](/doc/dispvm-customization/) + * [Customizing Fedora minimal templates](/doc/fedora-minimal-template-customization) + * [Customizing Windows 7 templates](/doc/windows-template-customization) + * [Using KDE in dom0](/doc/kde/) + * [Installing XFCE in dom0](/doc/xfce/) + * [Language Localization](/doc/language-localization/) Troubleshooting --------------- - * [Home directory is out of disk space error](/doc/out-of-memory/) - * [Installing on system with new AMD GPU (missing firmware problem)](https://groups.google.com/group/qubes-devel/browse_thread/thread/e27a57b0eda62f76) - * [How to install an Nvidia driver in dom0](/doc/install-nvidia-driver/) - * [Solving problems with Macbook Air 2012](https://groups.google.com/group/qubes-devel/browse_thread/thread/b8b0d819d2a4fc39/d50a72449107ab21#8a9268c09d105e69) - * [Getting Sony Vaio Z laptop to work with Qubes](/doc/sony-vaio-tinkering/) - * [Getting Lenovo 450 to work with Qubes](/doc/lenovo450-tinkering/) - * [Troubleshooting UEFI related problems](/doc/uefi-troubleshooting/) + + * [Home directory is out of disk space error](/doc/out-of-memory/) + * [Installing on system with new AMD GPU (missing firmware problem)](https://groups.google.com/group/qubes-devel/browse_thread/thread/e27a57b0eda62f76) + * [How to install an Nvidia driver in dom0](/doc/install-nvidia-driver/) + * [Solving problems with Macbook Air 2012](https://groups.google.com/group/qubes-devel/browse_thread/thread/b8b0d819d2a4fc39/d50a72449107ab21#8a9268c09d105e69) + * [Getting Sony Vaio Z laptop to work with Qubes](/doc/sony-vaio-tinkering/) + * [Getting Lenovo 450 to work with Qubes](/doc/lenovo450-tinkering/) + * [Troubleshooting UEFI related problems](/doc/uefi-troubleshooting/) Reference Pages --------------- - * [Dom0 Command-Line Tools](/doc/dom0-tools/) - * [DomU Command-Line Tools](/doc/vm-tools/) - * [Glossary of Qubes Terminology](/doc/glossary/) - * [Qubes Service Framework](/doc/qubes-service/) - * [Command Execution in VMs (and Qubes RPC)](/doc/qrexec/) + + * [Dom0 Command-Line Tools](/doc/dom0-tools/) + * [DomU Command-Line Tools](/doc/vm-tools/) + * [Glossary of Qubes Terminology](/doc/glossary/) + * [Qubes Service Framework](/doc/qubes-service/) + * [Command Execution in VMs (and Qubes RPC)](/doc/qrexec/) For Developers -------------- - * [System Documentation](/doc/system-doc/) - * [Developers' FAQ](/doc/devel-faq/) - * [Reporting Security Issues](/security/) - * [Reporting Bugs](/doc/reporting-bugs/) - * [Source Code](/doc/source-code/) - * [How to Contribute to the Qubes OS Project](/doc/contributing/) - * [Coding Guidelines](/doc/coding-style/) - * [Code Signing](/doc/code-signing/) - * [Qubes OS Version Scheme](/doc/version-scheme/) - * [Supported Versions](/doc/supported-versions/) - * [Books for Developers](/doc/devel-books/) - * [Qubes OS License](/doc/license/) - * [Style Guide](/doc/style-guide/) - * [Usability & UX](/doc/usability-ux/) + + * [System Documentation](/doc/system-doc/) + * [Developers' FAQ](/doc/devel-faq/) + * [Reporting Security Issues](/security/) + * [Reporting Bugs](/doc/reporting-bugs/) + * [Source Code](/doc/source-code/) + * [How to Contribute to the Qubes OS Project](/doc/contributing/) + * [Coding Guidelines](/doc/coding-style/) + * [Documentation Guidelines](/doc/doc-guidelines/) + * [Code Signing](/doc/code-signing/) + * [Books for Developers](/doc/devel-books/) + * [Qubes OS License](/doc/license/) + * [Style Guide](/doc/style-guide/) + * [Usability & UX](/doc/usability-ux/) + diff --git a/releases/supported-versions.md b/installing/supported-versions.md similarity index 100% rename from releases/supported-versions.md rename to installing/supported-versions.md diff --git a/installing/upgrade-to-r2.md b/installing/upgrade/upgrade-to-r2.md similarity index 100% rename from installing/upgrade-to-r2.md rename to installing/upgrade/upgrade-to-r2.md diff --git a/installing/upgrade-to-r2b1.md b/installing/upgrade/upgrade-to-r2b1.md similarity index 100% rename from installing/upgrade-to-r2b1.md rename to installing/upgrade/upgrade-to-r2b1.md diff --git a/installing/upgrade-to-r2b2.md b/installing/upgrade/upgrade-to-r2b2.md similarity index 100% rename from installing/upgrade-to-r2b2.md rename to installing/upgrade/upgrade-to-r2b2.md diff --git a/installing/upgrade-to-r2b3.md b/installing/upgrade/upgrade-to-r2b3.md similarity index 100% rename from installing/upgrade-to-r2b3.md rename to installing/upgrade/upgrade-to-r2b3.md diff --git a/installing/upgrade-to-r3.0.md b/installing/upgrade/upgrade-to-r3.0.md similarity index 100% rename from installing/upgrade-to-r3.0.md rename to installing/upgrade/upgrade-to-r3.0.md diff --git a/installing/upgrade-to-r3.1.md b/installing/upgrade/upgrade-to-r3.1.md similarity index 100% rename from installing/upgrade-to-r3.1.md rename to installing/upgrade/upgrade-to-r3.1.md diff --git a/installing/upgrade/upgrade.md b/installing/upgrade/upgrade.md new file mode 100644 index 00000000..48ba3f50 --- /dev/null +++ b/installing/upgrade/upgrade.md @@ -0,0 +1,16 @@ +--- +layout: doc +title: Upgrade Guides +permalink: /doc/upgrade/ +--- + +Qubes OS Upgrade Guides +======================= + + * [Upgrading from R1 to R2 Beta 1](/doc/upgrade-to-r2b1/) + * [Upgrading from R1 to R2 Beta 2](/doc/upgrade-to-r2b2/) + * [Upgrading from R2 Beta 2 to R2 Beta 3](/doc/upgrade-to-r2b3/) + * [Upgrading from R2 Beta 3 to R2](/doc/upgrade-to-r2/) + * [Upgrading from R2 to R3.0](/doc/upgrade-to-r3.0/) + * [Upgrading from R3.0 to R3.1](/doc/upgrade-to-r3.1/) + diff --git a/developers/version-scheme.md b/installing/version-scheme.md similarity index 100% rename from developers/version-scheme.md rename to installing/version-scheme.md diff --git a/installing/uefi-troubleshooting.md b/troubleshooting/uefi-troubleshooting.md similarity index 100% rename from installing/uefi-troubleshooting.md rename to troubleshooting/uefi-troubleshooting.md