Clean up and organize doc files

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
 ---------------------
 

doc.md

@@ -10,41 +10,44 @@ redirect_from:
 - /wiki/QubesDocs/
 ---
 
-
 The Basics
 ----------
+
  * [A Tour of Qubes OS](/tour/)
- *  [Getting Started](/getting-started)
+ * [Getting Started](/getting-started/)
- *  [Users' FAQ](/doc/user-faq/)
+ * [User FAQ](/doc/user-faq/)
- *  [Mailing Lists](/doc/mailing-lists/)
- *  [Documentation Guidelines](/doc/doc-guidelines/)
 
 
 Choosing Your Hardware
 ----------------------
+
  * [System Requirements](/doc/system-requirements/)
  * [Hardware Compatibility List (HCL)](/hcl/)
  * [Qubes-Certified Laptops](/doc/certified-laptops/)
 
 
-Installing Qubes
+Installing & Upgrading Qubes
-----------------
+----------------------------
- *  [Use Qubes without installing: Qubes Live USB (alpha)](/doc/live-usb/)
+
- *  [How to Install Qubes](/doc/installation-guide/)
  * [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 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/)
@@ -53,6 +56,7 @@ Common Tasks
 
 Managing Operating Systems within Qubes
 ---------------------------------------
+
  * [TemplateVMs](/doc/templates/)
  * [Templates: Fedora - minimal](/doc/templates/fedora-minimal/)
  * [Templates: Debian](/doc/templates/debian/)
@@ -73,6 +77,7 @@ Managing Operating Systems within Qubes
 
 Security Guides
 ---------------
+
  * [Qubes OS Project Security Information](/security/)
  * [Security Guidelines](/doc/security-guidelines/)
  * [Understanding Qubes Firewall](/doc/qubes-firewall/)
@@ -86,6 +91,7 @@ Security Guides
 
 Privacy Guides
 --------------
+
  * [Whonix for privacy & anonymization](/doc/whonix/)
  * [Install Whonix in Qubes](/doc/whonix/install/)
  * [Updating Whonix in Qubes](/doc/whonix/update/)
@@ -96,10 +102,12 @@ Privacy Guides
 
 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/)
+ * [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/)
@@ -120,8 +128,10 @@ Configuration Guides
  * [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)
@@ -132,6 +142,7 @@ Customization Guides
 
 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/)
@@ -143,6 +154,7 @@ Troubleshooting
 
 Reference Pages
 ---------------
+
  * [Dom0 Command-Line Tools](/doc/dom0-tools/)
  * [DomU Command-Line Tools](/doc/vm-tools/)
  * [Glossary of Qubes Terminology](/doc/glossary/)
@@ -152,6 +164,7 @@ Reference Pages
 
 For Developers
 --------------
+
  * [System Documentation](/doc/system-doc/)
  * [Developers' FAQ](/doc/devel-faq/)
  * [Reporting Security Issues](/security/)
@@ -159,10 +172,10 @@ For Developers
  * [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/)
- *  [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/)
+

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/)
+