diff --git a/README.md b/README.md index 16e98c48..3af5aead 100644 --- a/README.md +++ b/README.md @@ -44,5 +44,5 @@ making contributions, please observe the following style conventions: [qubes]: https://github.com/QubesOS [gh-fork]: https://guides.github.com/activities/forking/ [gh-pull]: https://help.github.com/articles/using-pull-requests/ -[patch]: /doc/SourceCode/#sending-a-patch -[lists]: https://www.qubes-os.org/doc/QubesLists/ +[patch]: https://www.qubes-os.org/doc/source-code/#sending-a-patch +[lists]: https://www.qubes-os.org/doc/qubes-lists/ diff --git a/basics/getting-started.md b/basics/getting-started.md index e53dfa12..9d898909 100644 --- a/basics/getting-started.md +++ b/basics/getting-started.md @@ -1,8 +1,9 @@ --- layout: doc title: Getting Started -permalink: /en/doc/getting-started/ +permalink: /doc/getting-started/ redirect_from: +- /en/doc/getting-started/ - /doc/GettingStarted/ - /wiki/GettingStarted/ --- @@ -29,14 +30,14 @@ Each domain, apart from having a distinct name, is also assigned a **label**, wh ![snapshot12.png](/attachment/wiki/GettingStarted/snapshot12.png) -In addition to AppVMs and TemplateVMs, there's one special domain called "dom0," which is where the Desktop Manager runs. This is where you log in to the system. Dom0 is more trusted than any other domain (including TemplateVMs and black-labeled domains). If dom0 were ever compromised, it would be Game OverTM. (The entire system would effectively be compromised.) Due to its overarching importance, dom0 has no network connectivity and is used only for running the Window and Desktop Managers. Dom0 shouldn't be used for anything else. In particular, [you should never run user applications in dom0](/en/doc/security-guidelines/#dom0-precautions). (That's what your AppVMs are for!) +In addition to AppVMs and TemplateVMs, there's one special domain called "dom0," which is where the Desktop Manager runs. This is where you log in to the system. Dom0 is more trusted than any other domain (including TemplateVMs and black-labeled domains). If dom0 were ever compromised, it would be Game OverTM. (The entire system would effectively be compromised.) Due to its overarching importance, dom0 has no network connectivity and is used only for running the Window and Desktop Managers. Dom0 shouldn't be used for anything else. In particular, [you should never run user applications in dom0](/doc/security-guidelines/#dom0-precautions). (That's what your AppVMs are for!) Qubes VM Manager and Command Line Tools --------------------------------------- All aspects of the Qubes system can be controlled using command line tools run under a dom0 console. To open a console window in dom0, either go to Start-\>System Tools-\>Konsole or press Alt-F2 and type `konsole`. -Various command line tools are described as part of this guide, and the whole reference can be found [here](/en/doc/dom0-tools/). +Various command line tools are described as part of this guide, and the whole reference can be found [here](/doc/dom0-tools/). ![r2b1-dom0-konsole.png](/attachment/wiki/GettingStarted/r2b1-dom0-konsole.png) @@ -79,7 +80,7 @@ How Many Domains Do I Need? That's a great question, but there's no one-size-fits-all answer. It depends on the structure of your digital life, and this is at least a little different for everyone. If you plan on using your system for work, then it also depends on what kind of job you do. -It's a good idea to start out with the three domains created automatically by the installer: work, personal, and untrusted. Then, if and when you start to feel that some activity just doesn't fit into any of your existing domains, you can easily create a new domain for it. You'll also be able to easily copy any files you need to the newly created domain, as explained [here](/en/doc/copying-files/). +It's a good idea to start out with the three domains created automatically by the installer: work, personal, and untrusted. Then, if and when you start to feel that some activity just doesn't fit into any of your existing domains, you can easily create a new domain for it. You'll also be able to easily copy any files you need to the newly created domain, as explained [here](/doc/copying-files/). More paranoid people might find it worthwhile to read [this article](http://theinvisiblethings.blogspot.com/2011/03/partitioning-my-digital-life-into.html), which describes how one of the Qubes authors partitions her digital life into security domains. @@ -116,4 +117,4 @@ In order for the changes to take effect, restart the AppVM(s). * * * * * -Now that you're familiar with the basics, please have a look at the rest of the [documentation](/en/doc/). +Now that you're familiar with the basics, please have a look at the rest of the [documentation](/doc/). diff --git a/basics/intro.md b/basics/intro.md index bb418abe..1a88fe8a 100644 --- a/basics/intro.md +++ b/basics/intro.md @@ -1,11 +1,11 @@ --- layout: doc title: Introduction -permalink: /en/intro/ +permalink: /intro/ redirect_from: -- /intro/ -- "/doc/SimpleIntro/" -- "/wiki/SimpleIntro/" +- /en/intro/ +- /doc/SimpleIntro/ +- /wiki/SimpleIntro/ --- A Simple Introduction to Qubes @@ -73,8 +73,8 @@ More information This page is just a brief sketch of what Qubes is all about, and many technical details have been omitted here for the sake of presentation. -- If you're a current or potential Qubes user, you may want to check out the [documentation](/en/doc/) and the [FAQ](/en/doc/user-faq/). -- If you're a developer, there's dedicated [documentation](/en/doc/system-doc/) and an [FAQ](/en/doc/devel-faq/) just for you. +- If you're a current or potential Qubes user, you may want to check out the [documentation](/doc/) and the [FAQ](/doc/user-faq/). +- If you're a developer, there's dedicated [documentation](/doc/system-doc/) and an [FAQ](/doc/devel-faq/) just for you. - Ready to give Qubes a try? Head on over to the [downloads page](/downloads/). -- Once you've installed Qubes, here's a guide on [getting started](/en/doc/getting-started/). +- Once you've installed Qubes, here's a guide on [getting started](/doc/getting-started/). diff --git a/basics/mailing-lists.md b/basics/mailing-lists.md index 54745560..5d78ba08 100644 --- a/basics/mailing-lists.md +++ b/basics/mailing-lists.md @@ -1,8 +1,11 @@ --- layout: doc title: Mailing Lists -permalink: /en/doc/mailing-lists/ +permalink: /doc/mailing-lists/ redirect_from: +- /en/doc/mailing-lists/ +- /en/doc/qubes-lists/ +- /doc/qubes-lists/ - /doc/QubesLists/ - /wiki/QubesLists/ --- @@ -47,8 +50,8 @@ This list is for helping users solve various daily problems with Qubes OS. Examp Please try searching both the Qubes website and the archives of the mailing lists before sending a question. In addition, please make sure that you have read and understood the following basic documentation prior to posting to the list: - [Installation guides, System Requirements, and HCL](/doc/QubesDownloads/) \<-- for problems related to Qubes OS installation -- [Qubes User FAQ](/en/doc/user-faq/) -- [Qubes User Guides](/en/doc/) \<-- for questions about how to use Qubes OS +- [Qubes User FAQ](/doc/user-faq/) +- [Qubes User Guides](/doc/) \<-- for questions about how to use Qubes OS ### How to Subscribe and Post diff --git a/basics/user-faq.md b/basics/user-faq.md index c44ec8eb..ae576814 100644 --- a/basics/user-faq.md +++ b/basics/user-faq.md @@ -1,8 +1,9 @@ --- layout: doc title: Users' FAQ -permalink: /en/doc/user-faq/ +permalink: /doc/user-faq/ redirect_from: +- /en/doc/user-faq/ - /doc/UserFaq/ - /wiki/UserFaq/ --- @@ -141,7 +142,7 @@ Create an issue in [qubes-issues](https://github.com/QubesOS/qubes-issues/issues Installation & Hardware Compatibility ------------------------------------- -(See also: [System Requirements](/en/doc/system-requirements/) and [Hardware Compatibility List](/hcl/).) +(See also: [System Requirements](/doc/system-requirements/) and [Hardware Compatibility List](/hcl/).) ### How much disk space does each AppVM require? @@ -194,7 +195,7 @@ In your TemplateVMs, open a terminal and run `sudo yum upgrade`. ### How do I run a Windows HVM in non-seamless mode (i.e., as a single window)? -Enable "debug mode" in the AppVM's settings, either by checking the box labelled "Run in debug mode" in the Qubes VM Manager AppVM settings menu or by running the [qvm-prefs command](/en/doc/dom0-tools/qvm-prefs/).) +Enable "debug mode" in the AppVM's settings, either by checking the box labelled "Run in debug mode" in the Qubes VM Manager AppVM settings menu or by running the [qvm-prefs command](/doc/dom0-tools/qvm-prefs/).) ### I created a usbVM and assigned usb controllers to it. Now the usbVM wont boot. diff --git a/common-tasks/backup-emergency-restore-v2.md b/common-tasks/backup-emergency-restore-v2.md index 9f820683..05398919 100644 --- a/common-tasks/backup-emergency-restore-v2.md +++ b/common-tasks/backup-emergency-restore-v2.md @@ -1,8 +1,10 @@ --- layout: doc title: Emergency Backup Recovery - format version 2 -permalink: /en/doc/backup-emergency-restore-v2/ -redirect_from: /doc/BackupEmergencyRestoreV2/ +permalink: /doc/backup-emergency-restore-v2/ +redirect_from: +- /en/doc/backup-emergency-restore-v2/ +- /doc/BackupEmergencyRestoreV2/ --- Emergency Backup Recovery without Qubes - format version 2 diff --git a/common-tasks/backup-emergency-restore-v3.md b/common-tasks/backup-emergency-restore-v3.md index 01028e5e..05a84017 100644 --- a/common-tasks/backup-emergency-restore-v3.md +++ b/common-tasks/backup-emergency-restore-v3.md @@ -1,8 +1,10 @@ --- layout: doc title: Emergency Backup Recovery - format version 3 -permalink: /en/doc/backup-emergency-restore-v3/ -redirect_from: /doc/BackupEmergencyRestoreV3/ +permalink: /doc/backup-emergency-restore-v3/ +redirect_from: +- /en/doc/backup-emergency-restore-v3/ +- /doc/BackupEmergencyRestoreV3/ --- Emergency Backup Recovery without Qubes - format version 3 @@ -53,7 +55,7 @@ The Qubes backup system has been designed with emergency disaster recovery in mi compressed=True compression-filter=gzip - **Note:** If you see `version=2` here, go to [Emergency Backup Recovery - format version 2](/doc/BackupEmergencyRestoreV2/) instead. + **Note:** If you see `version=2` here, go to [Emergency Backup Recovery - format version 2](/doc/backup-emergency-restore-v2/) instead. 4. Verify the integrity of the `private.img` file which houses your data. diff --git a/common-tasks/backup-restore.md b/common-tasks/backup-restore.md index f20fcc30..4848ae03 100644 --- a/common-tasks/backup-restore.md +++ b/common-tasks/backup-restore.md @@ -1,8 +1,9 @@ --- layout: doc title: Backup, Restoration, and Migration -permalink: /en/doc/backup-restore/ +permalink: /doc/backup-restore/ redirect_from: +- /en/doc/backup-restore/ - /doc/BackupRestore/ - /wiki/BackupRestore/ --- @@ -20,7 +21,7 @@ Qubes Backup, Restoration, and Migration With Qubes, it's easy to back up and restore your whole system, as well as to migrate between two physical machines. -As of Qubes R2B3, these functions are integrated into the Qubes VM Manager GUI. There are also two command-line tools available which perform the same functions: [qvm-backup](/en/doc/dom0-tools/qvm-backup/) and [qvm-backup-restore](/en/doc/dom0-tools/qvm-backup-restore/). +As of Qubes R2B3, these functions are integrated into the Qubes VM Manager GUI. There are also two command-line tools available which perform the same functions: [qvm-backup](/doc/dom0-tools/qvm-backup/) and [qvm-backup-restore](/doc/dom0-tools/qvm-backup-restore/). Creating a Backup @@ -36,7 +37,7 @@ Creating a Backup 3. Select the destination for the backup: - - If you wish to send your backup to a [USB mass storage device](/en/doc/stick-mounting/), select the device in the dropdown box next to **Device** (feature removed in R3, select appropriate **Target AppVM** and mount the stick with one click in file selection dialog). + - If you wish to send your backup to a [USB mass storage device](/doc/stick-mounting/), select the device in the dropdown box next to **Device** (feature removed in R3, select appropriate **Target AppVM** and mount the stick with one click in file selection dialog). - If you wish to send your backup to a (currently running) AppVM, select the AppVM in the dropdown box next to **Target AppVM**. You must also specify a directory on the device or in the AppVM, or a command to be executed in the AppVM as a destination for your backup. For example, if you wish to send your backup to the `~/backups` folder in the target AppVM, you would simply type `backups` in this field. This destination directory must already exist. If it does not exist, you must create it manually prior to backing up. @@ -59,7 +60,7 @@ Restoring from a Backup 2. Select the source location of the backup to be restored: - - If your backup is located on a [USB mass storage device](/en/doc/stick-mounting/), select the device in the dropdown box next to **Device**. + - If your backup is located on a [USB mass storage device](/doc/stick-mounting/), select the device in the dropdown box next to **Device**. - If your backup is located in a (currently running) AppVM, select the AppVM in the dropdown box next to **AppVM**. You must also specify the directory in which the backup resides (or a command to be executed in an AppVM). If you followed the instructions in the previous section, "Creating a Backup," then your backup is most likely in the location you chose as the destination in step 3. For example, if you had chosen the `~/backups` directory of an AppVM as your destination in step 3, you would now select the same AppVM and again type `backups` into the **Backup directory** field. @@ -85,13 +86,13 @@ Emergency Backup Recovery without Qubes The Qubes backup system has been designed with emergency disaster recovery in mind. No special Qubes-specific tools are required to access data backed up by Qubes. In the event a Qubes system is unavailable, you can access your data on any GNU/Linux system with the following procedure. -For emergency restore of backup created on Qubes R2 or newer take a look [here](/doc/BackupEmergencyRestoreV3/). For backups created on earlier Qubes version, take a look [here](/doc/BackupEmergencyRestoreV2/). +For emergency restore of backup created on Qubes R2 or newer take a look [here](/doc/backup-emergency-restore-v3/). For backups created on earlier Qubes version, take a look [here](/doc/backup-emergency-restore-v2/). Migrating Between Two Physical Machines --------------------------------------- -In order to migrate your Qubes system from one physical machine to another, simply follow the backup procedure on the old machine, [install Qubes](/doc/QubesDownloads/) on the new machine, and follow the restoration procedure on the new machine. All of your settings and data will be preserved! +In order to migrate your Qubes system from one physical machine to another, simply follow the backup procedure on the old machine, [install Qubes](/doc/downloads/) on the new machine, and follow the restoration procedure on the new machine. All of your settings and data will be preserved! Notes diff --git a/common-tasks/copy-paste.md b/common-tasks/copy-paste.md index 618af974..2a8785cf 100644 --- a/common-tasks/copy-paste.md +++ b/common-tasks/copy-paste.md @@ -1,8 +1,9 @@ --- layout: doc title: Copy and Paste -permalink: /en/doc/copy-paste/ +permalink: /doc/copy-paste/ redirect_from: +- /en/doc/copy-paste/ - /doc/CopyPaste/ - /wiki/CopyPaste/ --- @@ -46,7 +47,7 @@ You may now paste the log contents to any VM as you normally would (i.e., Ctrl-S For data other than logs, there are two options: -1. [Copy it as a file.](/en/doc/copy-to-dom0/) +1. [Copy it as a file.](/doc/copy-to-dom0/) 2. Paste the data to `/var/run/qubes/qubes-clipboard.bin`, then write "dom0" to `/var/run/qubes/qubes-clipboard.bin.source`. Then use Ctrl-Shift-V to paste the data to the desired VM. Clipboard automatic policy enforcement diff --git a/common-tasks/copy-to-dom0.md b/common-tasks/copy-to-dom0.md index 829d1b49..4de9359e 100644 --- a/common-tasks/copy-to-dom0.md +++ b/common-tasks/copy-to-dom0.md @@ -1,8 +1,9 @@ --- layout: doc title: Copying to and from dom0 -permalink: /en/doc/copy-to-dom0/ +permalink: /doc/copy-to-dom0/ redirect_from: +- /en/doc/copy-to-dom0/ - /doc/CopyToDomZero/ - /wiki/CopyToDomZero/ --- diff --git a/common-tasks/copying-files.md b/common-tasks/copying-files.md index ce2f7c07..3832eae8 100644 --- a/common-tasks/copying-files.md +++ b/common-tasks/copying-files.md @@ -1,8 +1,9 @@ --- layout: doc title: Copying Files between Domains -permalink: /en/doc/copying-files/ +permalink: /doc/copying-files/ redirect_from: +- /en/doc/copying-files/ - /doc/CopyingFiles/ - /wiki/CopyingFiles/ --- @@ -28,7 +29,7 @@ GUI CLI --- -[qvm-copy-to-vm](/en/doc/vm-tools/qvm-copy-to-vm/) +[qvm-copy-to-vm](/doc/vm-tools/qvm-copy-to-vm/) On inter-domain file copy security ---------------------------------- diff --git a/common-tasks/dispvm.md b/common-tasks/dispvm.md index b55c7fc3..bb44e01c 100644 --- a/common-tasks/dispvm.md +++ b/common-tasks/dispvm.md @@ -1,8 +1,9 @@ --- layout: doc title: Disposable VMs -permalink: /en/doc/dispvm/ +permalink: /doc/dispvm/ redirect_from: +- /en/doc/dispvm/ - /doc/DisposableVms/ - /wiki/DisposableVMs/ --- @@ -73,7 +74,7 @@ Customizing Disposable VMs --------------------------------------------------------- You can change the template used to generate the Disposable VM, and change settings used in the Disposable VM savefile. These changes will be reflected in every new Disposable VM. -Full instructions are [here](/en/doc/disp-vm-customization/) +Full instructions are [here](/doc/disp-vm-customization/) Disposable VMs and Local Forensics diff --git a/common-tasks/full-screen-mode.md b/common-tasks/full-screen-mode.md index 54847aae..d7a91130 100644 --- a/common-tasks/full-screen-mode.md +++ b/common-tasks/full-screen-mode.md @@ -1,8 +1,9 @@ --- layout: doc title: Full Screen Mode -permalink: /en/doc/full-screen-mode/ +permalink: /doc/full-screen-mode/ redirect_from: +- /en/doc/full-screen-mode/ - /doc/FullScreenMode/ - /wiki/FullScreenMode/ --- diff --git a/common-tasks/managing-appvm-shortcuts.md b/common-tasks/managing-appvm-shortcuts.md index def8e038..8f75dd85 100644 --- a/common-tasks/managing-appvm-shortcuts.md +++ b/common-tasks/managing-appvm-shortcuts.md @@ -1,8 +1,9 @@ --- layout: doc title: Managing AppVm Shortcuts -permalink: /en/doc/managing-appvm-shortcuts/ +permalink: /doc/managing-appvm-shortcuts/ redirect_from: +- /en/doc/managing-appvm-shortcuts/ - /doc/ManagingAppVmShortcuts/ - /wiki/ManagingAppVmShortcuts/ --- @@ -31,6 +32,6 @@ List of installed applications for each AppVM is stored in its template's `/var/ Actual command lines for the menu shortcuts involve `qvm-run` command which starts a process in another domain. Example: `qvm-run -q --tray -a w7s 'cmd.exe /c "C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\Accessories\\Calculator.lnk"'` or `qvm-run -q --tray -a untrusted 'firefox %u'` -`qvm-sync-appmenus` works by invoking *GetAppMenus* [Qubes service](/en/doc/qrexec/) in the target domain. This service enumerates installed applications and sends formatted info back to the dom0 script (`/usr/libexec/qubes-appmenus/qubes-receive-appmenus`) which creates .desktop files in the AppVM/TemplateVM directory. +`qvm-sync-appmenus` works by invoking *GetAppMenus* [Qubes service](/doc/qrexec/) in the target domain. This service enumerates installed applications and sends formatted info back to the dom0 script (`/usr/libexec/qubes-appmenus/qubes-receive-appmenus`) which creates .desktop files in the AppVM/TemplateVM directory. For Linux VMs the service script is in `/etc/qubes-rpc/qubes.GetAppMenus`. In Windows it's a PowerShell script located in `c:\Program Files\Invisible Things Lab\Qubes OS Windows Tools\qubes-rpc-services\get-appmenus.ps1` by default. diff --git a/common-tasks/recording-optical-discs.md b/common-tasks/recording-optical-discs.md index 61827b13..5d4bca74 100644 --- a/common-tasks/recording-optical-discs.md +++ b/common-tasks/recording-optical-discs.md @@ -1,7 +1,8 @@ --- layout: doc title: Recording Optical Discs -permalink: /en/doc/recording-optical-discs/ +permalink: /doc/recording-optical-discs/ +redirect_from: /en/doc/recording-optical-discs/ --- Recording Optical Discs diff --git a/common-tasks/software-update-dom0.md b/common-tasks/software-update-dom0.md index 9c02a088..8a6a9030 100644 --- a/common-tasks/software-update-dom0.md +++ b/common-tasks/software-update-dom0.md @@ -1,8 +1,9 @@ --- layout: doc title: Updating software in dom0 -permalink: /en/doc/software-update-dom0/ +permalink: /doc/software-update-dom0/ redirect_from: +- /en/doc/software-update-dom0/ - /doc/SoftwareUpdateDom0/ - /wiki/SoftwareUpdateDom0/ --- diff --git a/common-tasks/software-update-vm.md b/common-tasks/software-update-vm.md index e39286dd..51347884 100644 --- a/common-tasks/software-update-vm.md +++ b/common-tasks/software-update-vm.md @@ -1,8 +1,9 @@ --- layout: doc title: Installing and updating software in VMs -permalink: /en/doc/software-update-vm/ +permalink: /doc/software-update-vm/ redirect_from: +- /en/doc/software-update-vm/ - /doc/SoftwareUpdateVM/ - /wiki/SoftwareUpdateVM/ --- @@ -41,7 +42,7 @@ As the template VM is used for creating filesystems for other AppVMs, where you There are several ways to deal with this problem: -- Only install packages from trusted sources -- e.g. from the pre-configured Fedora repositories. All those packages are signed by Fedora, and as we expect that at least the package's installation scripts are not malicious. This is enforced by default (at the [firewall VM level](/en/doc/qubes-firewall/)), by not allowing any networking connectivity in the default template VM, except for access to the Fedora repos. +- Only install packages from trusted sources -- e.g. from the pre-configured Fedora repositories. All those packages are signed by Fedora, and as we expect that at least the package's installation scripts are not malicious. This is enforced by default (at the [firewall VM level](/doc/qubes-firewall/)), by not allowing any networking connectivity in the default template VM, except for access to the Fedora repos. - Use *standalone VMs* (see below) for installation of untrusted software packages. @@ -51,7 +52,7 @@ Some popular questions: - So, why should we actually trust Fedora repos -- it also contains large amount of 3rd party software that might buggy, right? -As long as template's compromise is considered, it doesn't really matter whether /usr/bin/firefox is buggy and can be exploited, or not. What matters is whether its *installation* scripts (such as %post in the rpm.spec) are benign or not. Template VM should be used only for installation of packages, and nothing more, so it should never get a chance to actually run the /usr/bin/firefox and got infected from it, in case it was compromised. Also, some of your more trusted AppVMs, would have networking restrictions enforced by the [firewall VM](/en/doc/qubes-firewall/), and again they should not fear this proverbial /usr/bin/firefox being potentially buggy and easy to compromise. +As long as template's compromise is considered, it doesn't really matter whether /usr/bin/firefox is buggy and can be exploited, or not. What matters is whether its *installation* scripts (such as %post in the rpm.spec) are benign or not. Template VM should be used only for installation of packages, and nothing more, so it should never get a chance to actually run the /usr/bin/firefox and got infected from it, in case it was compromised. Also, some of your more trusted AppVMs, would have networking restrictions enforced by the [firewall VM](/doc/qubes-firewall/), and again they should not fear this proverbial /usr/bin/firefox being potentially buggy and easy to compromise. - But why trusting Fedora? diff --git a/common-tasks/stick-mounting.md b/common-tasks/stick-mounting.md index 20151186..367c68ef 100644 --- a/common-tasks/stick-mounting.md +++ b/common-tasks/stick-mounting.md @@ -1,8 +1,9 @@ --- layout: doc title: Mounting USB Sticks -permalink: /en/doc/stick-mounting/ +permalink: /doc/stick-mounting/ redirect_from: +- /en/doc/stick-mounting/ - /doc/StickMounting/ - /wiki/StickMounting/ --- @@ -12,7 +13,7 @@ How to Mount USB Sticks to AppVMs (**Note:** In the present context, the term "USB stick" denotes any [USB mass storage device](https://en.wikipedia.org/wiki/USB_mass_storage_device_class). In addition to smaller flash memory sticks, this includes things like USB external hard drives.) -Qubes supports the ability to attach a USB stick (or just one or more of its partitions) to any AppVM easily, no matter which VM actually handles the USB controller. (The USB controller may be assigned on the **Devices** tab of an AppVM's settings page in Qubes VM Manager or by using the [qvm-pci command](/en/doc/assigning-devices/).) +Qubes supports the ability to attach a USB stick (or just one or more of its partitions) to any AppVM easily, no matter which VM actually handles the USB controller. (The USB controller may be assigned on the **Devices** tab of an AppVM's settings page in Qubes VM Manager or by using the [qvm-pci command](/doc/assigning-devices/).) As of Qubes R2 Beta 3, USB stick mounting has been integrated into the Qubes VM Manager GUI. Simply insert your USB stick, right-click the desired AppVM in the Qubes VM Manager list, click **Attach/detach block devices**, and select your desired action and device. This, however, only works for the whole device. If you would like to attach individual partitions you must use the command-line tool (shown below). The reason for this is that when attaching a single partition, it used to be that Nautilus file manager would not see it and automatically mount it (see [this ticket](https://github.com/QubesOS/qubes-issues/issues/623)). This problem, however, seems to be resolved (see [this issue comment](https://github.com/QubesOS/qubes-issues/issues/1072#issuecomment-124270051)). diff --git a/configuration/assigning-devices.md b/configuration/assigning-devices.md index 6dc27ba6..66772bb5 100644 --- a/configuration/assigning-devices.md +++ b/configuration/assigning-devices.md @@ -1,8 +1,9 @@ --- layout: doc title: Assigning Devices -permalink: /en/doc/assigning-devices/ +permalink: /doc/assigning-devices/ redirect_from: +- /en/doc/assigning-devices/ - /doc/AssigningDevices/ - /wiki/AssigningDevices/ --- diff --git a/configuration/config-files.md b/configuration/config-files.md index e54d1600..faa5695b 100644 --- a/configuration/config-files.md +++ b/configuration/config-files.md @@ -1,8 +1,9 @@ --- layout: doc title: Config Files -permalink: /en/doc/config-files/ +permalink: /doc/config-files/ redirect_from: +- /en/doc/config-files/ - /doc/ConfigFiles/ - "/doc/UserDoc/ConfigFiles/" - "/wiki/UserDoc/ConfigFiles/" diff --git a/configuration/disk-trim.md b/configuration/disk-trim.md index 3f43417f..932c316d 100644 --- a/configuration/disk-trim.md +++ b/configuration/disk-trim.md @@ -1,8 +1,9 @@ --- layout: doc title: Disk TRIM -permalink: /en/doc/disk-trim/ +permalink: /doc/disk-trim/ redirect_from: +- /en/doc/disk-trim/ - /doc/DiskTRIM/ - /wiki/DiskTRIM/ --- diff --git a/configuration/external-audio.md b/configuration/external-audio.md index b943cc76..27f05ae7 100644 --- a/configuration/external-audio.md +++ b/configuration/external-audio.md @@ -1,8 +1,9 @@ --- layout: doc title: External Audio -permalink: /en/doc/external-audio/ +permalink: /doc/external-audio/ redirect_from: +- /en/doc/external-audio/ - /doc/ExternalAudio/ - /wiki/ExternalAudio/ --- diff --git a/configuration/external-device-mount-point.md b/configuration/external-device-mount-point.md index 2fc70174..e37e64b3 100644 --- a/configuration/external-device-mount-point.md +++ b/configuration/external-device-mount-point.md @@ -1,8 +1,9 @@ --- layout: doc title: External Device Mount Point -permalink: /en/doc/external-device-mount-point/ +permalink: /doc/external-device-mount-point/ redirect_from: +- /en/doc/external-device-mount-point/ - /doc/ExternalDeviceMountPoint/ - /wiki/ExternalDeviceMountPoint/ --- diff --git a/configuration/fetchmail.md b/configuration/fetchmail.md index ff563526..9d4d8206 100644 --- a/configuration/fetchmail.md +++ b/configuration/fetchmail.md @@ -1,8 +1,9 @@ --- layout: doc title: Fetchmail -permalink: /en/doc/fetchmail/ +permalink: /doc/fetchmail/ redirect_from: +- /en/doc/fetchmail/ - /doc/Fetchmail/ - /wiki/Fetchmail/ --- @@ -10,7 +11,7 @@ redirect_from: Fetchmail ========= -Fetchmail is standalone MRA (Mail Retrieval Agent) aka "IMAP/POP3 client". Its sole purpose is to fetch your messages and store it locally or feed to local MTA (Message Transfer Agent). It cannot "read" messages — for that, use a MUA like Thunderbird or [Mutt](/en/doc/mutt/). +Fetchmail is standalone MRA (Mail Retrieval Agent) aka "IMAP/POP3 client". Its sole purpose is to fetch your messages and store it locally or feed to local MTA (Message Transfer Agent). It cannot "read" messages — for that, use a MUA like Thunderbird or [Mutt](/doc/mutt/). Installation ------------ @@ -22,7 +23,7 @@ Configuration Assuming you have more than one account (safe assumption these days), you need to spawn multiple fetchmail instances, one for each IMAP/POP3 server (though one instance can watch over several accounts on one server). The easiest way is to create template systemd unit and start it several times. Fedora does not supply any, so we have to write one anyway. -**NOTE:** this assumes you use [Postfix](/en/doc/postfix/) as your local MTA. +**NOTE:** this assumes you use [Postfix](/doc/postfix/) as your local MTA. In TemplateVM create `/etc/systemd/system/fetchmail@.service`: diff --git a/configuration/mutt.md b/configuration/mutt.md index 9fcbd5f0..879e9753 100644 --- a/configuration/mutt.md +++ b/configuration/mutt.md @@ -1,8 +1,9 @@ --- layout: doc title: Mutt -permalink: /en/doc/mutt/ +permalink: /doc/mutt/ redirect_from: +- /en/doc/mutt/ - /doc/Mutt/ - /wiki/Mutt/ --- @@ -15,8 +16,8 @@ Mutt is a fast, standards-compliant, efficient MUA (Mail User Agent). In some ar Mutt lacks true MTA (Message Transfer Agent aka "SMTP client") and MRA (Mail Retrieval Agent aka "IMAP/POP3 client"), thus there are some provisions built-in. In principle it is only mail reader and composer. You may install -true MTA such as [Postfix](/en/doc/postfix/) or Exim and MRA such as -[Fetchmail](/en/doc/fetchmail/). Alternatively you can synchronize your mailbox +true MTA such as [Postfix](/doc/postfix/) or Exim and MRA such as +[Fetchmail](/doc/fetchmail/). Alternatively you can synchronize your mailbox using [OfflineIMAP](https://github.com/OfflineIMAP/offlineimap) and just stick to integrated SMTP support. You can even use integrated IMAP client, but it is not very convenient. @@ -29,7 +30,7 @@ Installation Configuration ------------- -Mutt generally works out of the box. This configuration guide discusses only Qubes-specific setup. In this example we will have one TemplateVM and several AppVMs. It also takes advantage of [SplitGPG](/en/doc/split-gpg/), which is assumed to be already working. +Mutt generally works out of the box. This configuration guide discusses only Qubes-specific setup. In this example we will have one TemplateVM and several AppVMs. It also takes advantage of [SplitGPG](/doc/split-gpg/), which is assumed to be already working. **NOTE:** this requires `qubes-gpg-split >= 2.0.9`. 2.0.8 and earlier contains bug which causes this setup to hang in specific situations and does not allow to list keys. diff --git a/configuration/network-bridge-support.md b/configuration/network-bridge-support.md index cf0d935a..002b57f8 100644 --- a/configuration/network-bridge-support.md +++ b/configuration/network-bridge-support.md @@ -1,8 +1,9 @@ --- layout: doc title: Network Bridge Support -permalink: /en/doc/network-bridge-support/ +permalink: /doc/network-bridge-support/ redirect_from: +- /en/doc/network-bridge-support/ - /doc/NetworkBridgeSupport/ - /wiki/NetworkBridgeSupport/ --- diff --git a/configuration/network-printer.md b/configuration/network-printer.md index dbe80e2b..8ff5dda1 100644 --- a/configuration/network-printer.md +++ b/configuration/network-printer.md @@ -1,8 +1,9 @@ --- layout: doc title: Network Printer -permalink: /en/doc/network-printer/ +permalink: /doc/network-printer/ redirect_from: +- /en/doc/network-printer/ - /doc/NetworkPrinter/ - /wiki/NetworkPrinter/ --- diff --git a/configuration/postfix.md b/configuration/postfix.md index 5565c57b..47545989 100644 --- a/configuration/postfix.md +++ b/configuration/postfix.md @@ -1,8 +1,9 @@ --- layout: doc title: Postfix -permalink: /en/doc/postfix/ +permalink: /doc/postfix/ redirect_from: +- /en/doc/postfix/ - /doc/Postfix/ - /wiki/Postfix/ --- @@ -10,7 +11,7 @@ redirect_from: Postfix ======= -Postfix is full featured MTA (Message Transfer Agent). Here we will configure it in smarthost mode as part of common [Mutt](/en/doc/mutt/)+Postfix+[Fetchmail](/en/doc/fetchmail/) stack. +Postfix is full featured MTA (Message Transfer Agent). Here we will configure it in smarthost mode as part of common [Mutt](/doc/mutt/)+Postfix+[Fetchmail](/doc/fetchmail/) stack. Installation ------------ diff --git a/configuration/resize-disk-image.md b/configuration/resize-disk-image.md index 77ba022e..67bb19f7 100644 --- a/configuration/resize-disk-image.md +++ b/configuration/resize-disk-image.md @@ -1,8 +1,9 @@ --- layout: doc title: Resize Disk Image -permalink: /en/doc/resize-disk-image/ +permalink: /doc/resize-disk-image/ redirect_from: +- /en/doc/resize-disk-image/ - /doc/ResizeDiskImage/ - /wiki/ResizeDiskImage/ --- @@ -17,7 +18,7 @@ There are several disk images which can be easily extended. 1048576 MB is the maximum size which can be assigned to a private storage through qubes-manager. -To grow the private disk image of a AppVM beyond this limit [qubes-grow-private](/en/doc/dom0-tools/qvm-grow-private/) can be used: +To grow the private disk image of a AppVM beyond this limit [qubes-grow-private](/doc/dom0-tools/qvm-grow-private/) can be used: ~~~ qvm-grow-private diff --git a/configuration/resize-root-disk-image.md b/configuration/resize-root-disk-image.md index 07c33802..b1498e1b 100644 --- a/configuration/resize-root-disk-image.md +++ b/configuration/resize-root-disk-image.md @@ -1,8 +1,9 @@ --- layout: doc title: Resize Root Disk Image -permalink: /en/doc/resize-root-disk-image/ +permalink: /doc/resize-root-disk-image/ redirect_from: +- /en/doc/resize-root-disk-image/ - /doc/ResizeRootDiskImage/ - /wiki/ResizeRootDiskImage/ --- diff --git a/configuration/rxvt.md b/configuration/rxvt.md index 5a1c4f0e..21b5cb91 100644 --- a/configuration/rxvt.md +++ b/configuration/rxvt.md @@ -1,8 +1,9 @@ --- layout: doc title: Rxvt -permalink: /en/doc/rxvt/ +permalink: /doc/rxvt/ redirect_from: +- /en/doc/rxvt/ - /doc/Rxvt/ - /wiki/Rxvt/ --- diff --git a/configuration/secondary-storage.md b/configuration/secondary-storage.md index b213929b..a4314bbe 100644 --- a/configuration/secondary-storage.md +++ b/configuration/secondary-storage.md @@ -1,8 +1,9 @@ --- layout: doc title: Secondary Storage -permalink: /en/doc/secondary-storage/ +permalink: /doc/secondary-storage/ redirect_from: +- /en/doc/secondary-storage/ - /doc/SecondaryStorage/ - /wiki/SecondaryStorage/ --- diff --git a/configuration/torvm.md b/configuration/torvm.md index 6801cca2..2f334496 100644 --- a/configuration/torvm.md +++ b/configuration/torvm.md @@ -1,11 +1,12 @@ --- layout: doc title: TorVM -permalink: /en/doc/torvm/ +permalink: /doc/torvm/ redirect_from: +- /en/doc/torvm/ - /doc/TorVM/ -- "/doc/UserDoc/TorVM/" -- "/wiki/UserDoc/TorVM/" +- /doc/UserDoc/TorVM/ +- /wiki/UserDoc/TorVM/ --- Known issues: diff --git a/configuration/vpn.md b/configuration/vpn.md index 29131c5b..e1e25e79 100644 --- a/configuration/vpn.md +++ b/configuration/vpn.md @@ -1,8 +1,9 @@ --- layout: doc title: VPN -permalink: /en/doc/vpn/ +permalink: /doc/vpn/ redirect_from: +- /en/doc/vpn/ - /doc/VPN/ - /wiki/VPN/ --- diff --git a/configuration/zfs.md b/configuration/zfs.md index 035144b8..47d6ff71 100644 --- a/configuration/zfs.md +++ b/configuration/zfs.md @@ -1,8 +1,9 @@ --- layout: doc title: ZFS -permalink: /en/doc/zfs/ +permalink: /doc/zfs/ redirect_from: +- /en/doc/zfs/ - /doc/ZFS/ - /wiki/ZFS/ --- diff --git a/customization/dispvm-customization.md b/customization/dispvm-customization.md index 550b3a10..9ec6c7ad 100644 --- a/customization/dispvm-customization.md +++ b/customization/dispvm-customization.md @@ -1,11 +1,12 @@ --- layout: doc title: DispVM Customization -permalink: /en/doc/dispvm-customization/ +permalink: /doc/dispvm-customization/ redirect_from: +- /en/doc/dispvm-customization/ - /doc/DispVMCustomization/ -- "/doc/UserDoc/DispVMCustomization/" -- "/wiki/UserDoc/DispVMCustomization/" +- /doc/UserDoc/DispVMCustomization/ +- /wiki/UserDoc/DispVMCustomization/ --- Changing the template used as a basis for Disposable VM diff --git a/customization/fedora-minimal-template-customization.md b/customization/fedora-minimal-template-customization.md index 9cf62fee..c822eb2c 100644 --- a/customization/fedora-minimal-template-customization.md +++ b/customization/fedora-minimal-template-customization.md @@ -1,7 +1,8 @@ --- layout: doc title: Fedora Minimal Template Customization -permalink: /en/doc/fedora-minimal-template-customization/ +permalink: /doc/fedora-minimal-template-customization/ +redirect_from: /en/doc/fedora-minimal-template-customization/ --- FEDORA Packages Recommendations diff --git a/customization/kde.md b/customization/kde.md index 083ae8d1..bbba0dcf 100644 --- a/customization/kde.md +++ b/customization/kde.md @@ -1,7 +1,8 @@ --- layout: doc title: KDE -permalink: /en/doc/kde/ +permalink: /doc/kde/ +redirect_from: /en/doc/kde/ --- Using KDE in dom0 diff --git a/customization/language-localization.md b/customization/language-localization.md index 30f0382f..b6bf55be 100644 --- a/customization/language-localization.md +++ b/customization/language-localization.md @@ -1,8 +1,9 @@ --- layout: doc title: Language Localization -permalink: /en/doc/language-localization/ +permalink: /doc/language-localization/ redirect_from: +- /en/doc/language-localization/ - /doc/LanguageLocalization/ - /wiki/LanguageLocalization/ --- diff --git a/customization/windows-template-customization.md b/customization/windows-template-customization.md index fa5e4606..2d4acdc8 100644 --- a/customization/windows-template-customization.md +++ b/customization/windows-template-customization.md @@ -1,7 +1,8 @@ --- layout: doc title: Windows Template Customization -permalink: /en/doc/windows-template-customization/ +permalink: /doc/windows-template-customization/ +redirect_from: /en/doc/windows-template-customization/ --- Disable/Uninstall unecessary features/services diff --git a/customization/xfce.md b/customization/xfce.md index e7bad6af..b1622c90 100644 --- a/customization/xfce.md +++ b/customization/xfce.md @@ -1,8 +1,9 @@ --- layout: doc title: XFCE -permalink: /en/doc/xfce/ +permalink: /doc/xfce/ redirect_from: +- /en/doc/xfce/ - /doc/XFCE/ - "/doc/UserDoc/XFCE/" - "/wiki/UserDoc/XFCE/" diff --git a/developers/building/building-archlinux-template.md b/developers/building/building-archlinux-template.md index a84de320..0e30ee0e 100644 --- a/developers/building/building-archlinux-template.md +++ b/developers/building/building-archlinux-template.md @@ -1,8 +1,9 @@ --- layout: doc title: Building Archlinux Template -permalink: /en/doc/building-archlinux-template/ +permalink: /doc/building-archlinux-template/ redirect_from: +- /en/doc/building-archlinux-template/ - /doc/BuildingArchlinuxTemplate/ - /wiki/BuildingArchlinuxTemplate/ --- diff --git a/developers/building/building-non-fedora-template.md b/developers/building/building-non-fedora-template.md index 34a35a14..4b84faef 100644 --- a/developers/building/building-non-fedora-template.md +++ b/developers/building/building-non-fedora-template.md @@ -1,8 +1,9 @@ --- layout: doc title: Building Non-Fedora Template -permalink: /en/doc/building-non-fedora-template/ +permalink: /doc/building-non-fedora-template/ redirect_from: +- /en/doc/building-non-fedora-template/ - /doc/BuildingNonFedoraTemplate/ - /wiki/BuildingNonFedoraTemplate/ --- @@ -138,7 +139,7 @@ As soon as you manage to make qrexec and qubes-gui-agent working, it should be s Several XEN libraries are required for Qubes to work correctly. In fact, you need to make xenstore commands working before anything else. For this, Qubes git can be used as several patches have been selected by Qubes developpers that could impact the activity inside a VM. Start be retrieving a recent git and identify how you can build a package from it: `git clone git://git.qubes-os.org/marmarek/xen` -Find the .spec file in the git repository (this is the file being used to build rpm packages), and try to adapt it to your OS in order to build a package similar to the target 'xen-vm'. For example, a PKGBUILD has been created for [ArchLinux](/en/doc/templates/archlinux/) and can be found on [http://aur.archlinux.org/packages/qu/qubes-vm-xen/PKGBUILD](http://aur.archlinux.org/packages/qu/qubes-vm-xen/PKGBUILD). +Find the .spec file in the git repository (this is the file being used to build rpm packages), and try to adapt it to your OS in order to build a package similar to the target 'xen-vm'. For example, a PKGBUILD has been created for [ArchLinux](/doc/templates/archlinux/) and can be found on [http://aur.archlinux.org/packages/qu/qubes-vm-xen/PKGBUILD](http://aur.archlinux.org/packages/qu/qubes-vm-xen/PKGBUILD). Don't be afraid with the complexity of the PKGBUILD, most of the code is almost a copy/paste of required sources and patches found in the .spec file provided in the git repository. diff --git a/developers/building/development-workflow.md b/developers/building/development-workflow.md index 2f2595d8..c7da50bf 100644 --- a/developers/building/development-workflow.md +++ b/developers/building/development-workflow.md @@ -1,8 +1,9 @@ --- layout: doc title: Development Workflow -permalink: /en/doc/development-workflow/ +permalink: /doc/development-workflow/ redirect_from: +- /en/doc/development-workflow/ - /doc/DevelopmentWorkflow/ - /wiki/DevelopmentWorkflow/ --- @@ -12,7 +13,7 @@ Development Workflow A workflow for developing Qubes OS+ -First things first, setup [QubesBuilder](/en/doc/qubes-builder/). This guide assumes you're using qubes-builder to build Qubes. +First things first, setup [QubesBuilder](/doc/qubes-builder/). This guide assumes you're using qubes-builder to build Qubes. Repositories and committing Code -------------------------------- @@ -130,7 +131,7 @@ RPMS will appear in qubes-src/kernel/rpm/x86\_64: -rw-rw-r-- 1 user user 54502117 Nov 17 05:37 kernel-qubes-vm-3.4.18-1debug20121117a.pvops.qubes.x86_64.rpm ~~~ -### Useful [QubesBuilder](/en/doc/qubes-builder/) commands +### Useful [QubesBuilder](/doc/qubes-builder/) commands 1. *make check* - will check if all the code was commited into repository and if all repository are tagged with signed tag. 2. *make show-vtags* - show version of each component (based on git tags) - mostly useful just before building ISO. **Note:** this will not show version for components containing changes since last version tag @@ -144,7 +145,7 @@ When developing it is convenient to be able to rapidly test changes. Assuming yo Here are some handy scripts Marek has shared to facilitate this. -You may also like to run your [test environment on separate machine](/en/doc/test-bench/). +You may also like to run your [test environment on separate machine](/doc/test-bench/). ### Syncing dom0 files diff --git a/developers/building/installation-iso-building.md b/developers/building/installation-iso-building.md index 223c634e..658ecc3c 100644 --- a/developers/building/installation-iso-building.md +++ b/developers/building/installation-iso-building.md @@ -1,8 +1,9 @@ --- layout: doc title: Installation ISO Building -permalink: /en/doc/installation-iso-building/ +permalink: /doc/installation-iso-building/ redirect_from: +- /en/doc/installation-iso-building/ - /doc/InstallationIsoBuilding/ - /wiki/InstallationIsoBuilding/ --- diff --git a/developers/building/kde-dom0.md b/developers/building/kde-dom0.md index b006d18d..5e0a9bbc 100644 --- a/developers/building/kde-dom0.md +++ b/developers/building/kde-dom0.md @@ -1,8 +1,9 @@ --- layout: doc title: KDE dom0 -permalink: /en/doc/kde-dom0/ +permalink: /doc/kde-dom0/ redirect_from: +- /en/doc/kde-dom0/ - /doc/KdeDom0/ - /wiki/KdeDom0/ --- @@ -10,7 +11,7 @@ redirect_from: Qubes-customized KDE packages for Dom0 ====================================== -The Qubes kde-dom0 project (see [Source Code](/en/doc/source-code/)) contains the source code needed for building the customized KDE packages for use in Qubes Dom0 (the user desktop). The packages are based on Fedora 12 KDE packages, but are heavily slimmed down (Qubes doesn't need lots of KDE functionality in Dom0, such as most of the KDE apps). In the near future those KDE packages will also get some Qubes specific extensions, such as coloured titlebars/frames nicely integrated into the KDE Window Manager. And, of course, custom themes, e.g. for KDM :) +The Qubes kde-dom0 project (see [Source Code](/doc/source-code/)) contains the source code needed for building the customized KDE packages for use in Qubes Dom0 (the user desktop). The packages are based on Fedora 12 KDE packages, but are heavily slimmed down (Qubes doesn't need lots of KDE functionality in Dom0, such as most of the KDE apps). In the near future those KDE packages will also get some Qubes specific extensions, such as coloured titlebars/frames nicely integrated into the KDE Window Manager. And, of course, custom themes, e.g. for KDM :) Getting the sources ------------------- diff --git a/developers/building/qubes-builder-details.md b/developers/building/qubes-builder-details.md index 129bede8..735c4cc5 100644 --- a/developers/building/qubes-builder-details.md +++ b/developers/building/qubes-builder-details.md @@ -1,24 +1,25 @@ --- layout: doc title: Qubes Builder Details -permalink: /en/doc/qubes-builder-details/ +permalink: /doc/qubes-builder-details/ redirect_from: +- /en/doc/qubes-builder-details/ - /doc/QubesBuilderDetails/ - /wiki/QubesBuilderDetails/ --- -[QubesBuilder](/en/doc/qubes-builder/) "API" +[QubesBuilder](/doc/qubes-builder/) "API" ======================================== Components Makefile.builder file -------------------------------- -[QubesBuilder](/en/doc/qubes-builder/) expects that each component have *Makefile.builder* file in its root directory. This file specifies what should be done to build the package. As name suggests, this is normal makefile, which is included by builder as its configuration. Its main purpose is to set some variables. Generally all available variables/settings are described as comments at the beginning of Makefile.\* in [QubesBuilder](/en/doc/qubes-builder/). +[QubesBuilder](/doc/qubes-builder/) expects that each component have *Makefile.builder* file in its root directory. This file specifies what should be done to build the package. As name suggests, this is normal makefile, which is included by builder as its configuration. Its main purpose is to set some variables. Generally all available variables/settings are described as comments at the beginning of Makefile.\* in [QubesBuilder](/doc/qubes-builder/). Variables for Linux build: -- `RPM_SPEC_FILES` List (space separated) of spec files for RPM package build. Path should be relative to component root directory. [QubesBuilder](/en/doc/qubes-builder/) will install all BuildRequires (in chroot environment) before the build. In most Qubes components all spec files are kept in *rpm\_spec* directory. This is mainly used for Fedora packages build. -- `ARCH_BUILD_DIRS` List (space separated) of directories with PKGBUILD files for Archlinux package build. Similar to RPM build, [QubesBuilder](/en/doc/qubes-builder/) will install all makedepends, then build the package. +- `RPM_SPEC_FILES` List (space separated) of spec files for RPM package build. Path should be relative to component root directory. [QubesBuilder](/doc/qubes-builder/) will install all BuildRequires (in chroot environment) before the build. In most Qubes components all spec files are kept in *rpm\_spec* directory. This is mainly used for Fedora packages build. +- `ARCH_BUILD_DIRS` List (space separated) of directories with PKGBUILD files for Archlinux package build. Similar to RPM build, [QubesBuilder](/doc/qubes-builder/) will install all makedepends, then build the package. Most components uses *archlinux* directory for this purpose, so its good to keep this style. @@ -37,8 +38,8 @@ Variables for Windows build: - `SIGNTOOL` Path to signtool - `WIN_PACKAGE_CMD` Command used to produce installation package (msi or msm). Default value is *wix.bat*, similar to above - use *true* if you don't want this command. - `WIN_OUTPUT_HEADERS` Directory (relative to `WIN_SOURCE_SUBDIRS` element) with public headers of the package - for use in other components. -- `WIN_OUTPUT_LIBS` Directory (relative to `WIN_SOURCE_SUBDIRS` element) with libraries (both DLL and implib) of the package - for use in other components. Note that [QubesBuilder](/en/doc/qubes-builder/) will copy files specified as *\$(WIN\_OUTPUT\_LIBS)/\*/\** to match WDK directory layout (*\/\/\*), so you in mingw build you need to place libraries in some additional subdirectory. -- `WIN_BUILD_DEPS` List of components required to build this one. [QubesBuilder](/en/doc/qubes-builder/) will copy files specified with `WIN_OUTPUT_HEADERS` and `WIN_OUTPUT_LIBS` of those components to some directory and provide its path with `QUBES_INCLUDES` and `QUBES_LIBS` variables. Use those variables in your build scripts (*sources* or *Makefile* - depending on selected compiler). You can assume that the variables are always set and directories always exists, even if empty. +- `WIN_OUTPUT_LIBS` Directory (relative to `WIN_SOURCE_SUBDIRS` element) with libraries (both DLL and implib) of the package - for use in other components. Note that [QubesBuilder](/doc/qubes-builder/) will copy files specified as *\$(WIN\_OUTPUT\_LIBS)/\*/\** to match WDK directory layout (*\/\/\*), so you in mingw build you need to place libraries in some additional subdirectory. +- `WIN_BUILD_DEPS` List of components required to build this one. [QubesBuilder](/doc/qubes-builder/) will copy files specified with `WIN_OUTPUT_HEADERS` and `WIN_OUTPUT_LIBS` of those components to some directory and provide its path with `QUBES_INCLUDES` and `QUBES_LIBS` variables. Use those variables in your build scripts (*sources* or *Makefile* - depending on selected compiler). You can assume that the variables are always set and directories always exists, even if empty. builder.conf settings --------------------- diff --git a/developers/building/qubes-builder.md b/developers/building/qubes-builder.md index 4d8cb1ef..545ae968 100644 --- a/developers/building/qubes-builder.md +++ b/developers/building/qubes-builder.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes Builder -permalink: /en/doc/qubes-builder/ +permalink: /doc/qubes-builder/ redirect_from: +- /en/doc/qubes-builder/ - /doc/QubesBuilder/ - /wiki/QubesBuilder/ --- @@ -89,9 +90,9 @@ You can also build selected component separately. Eg. to compile only gui virtua make gui-daemon Full list you can get from make help. For advanced use and preparing sources -for use with [QubesBuilder](/en/doc/qubes-builder/) take a look at [doc directory +for use with [QubesBuilder](/doc/qubes-builder/) take a look at [doc directory in QubesBuilder](https://github.com/marmarek/qubes-builder/tree/master/doc) or -[QubesBuilderDetails](/en/doc/qubes-builder-details/) page. +[QubesBuilderDetails](/doc/qubes-builder-details/) page. Making customized build ----------------------- @@ -127,7 +128,7 @@ If you want to somehow modify sources, you can also do it, here are some basic s Code verification keys management ================================= -[QubesBuilder](/en/doc/qubes-builder/) by default verifies signed tags on every downloaded code. Public keys used for that are stored in `keyrings/git`. By default Qubes developers' keys are imported automatically, but if you need some additional keys (for example your own), you can add them using: +[QubesBuilder](/doc/qubes-builder/) by default verifies signed tags on every downloaded code. Public keys used for that are stored in `keyrings/git`. By default Qubes developers' keys are imported automatically, but if you need some additional keys (for example your own), you can add them using: GNUPGHOME=$PWD/keyrings/git gpg --import /path/to/key.asc GNUPGHOME=$PWD/keyrings/git gpg --edit-key ID_OF_JUST_IMPORTED_KEY diff --git a/developers/building/qubes-r3-building.md b/developers/building/qubes-r3-building.md index 58a4f270..d4c34512 100644 --- a/developers/building/qubes-r3-building.md +++ b/developers/building/qubes-r3-building.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes R3 Building -permalink: /en/doc/qubes-r3-building/ +permalink: /doc/qubes-r3-building/ redirect_from: +- /en/doc/qubes-r3-building/ - /doc/QubesR3Building/ - /wiki/QubesR3Building/ --- @@ -10,7 +11,7 @@ redirect_from: Building Qubes OS 3.0 ISO ========================= -Ensure your system is rpm-based and that you have necessary dependencies installed (see [QubesBuilder](/en/doc/qubes-builder/) for more info): +Ensure your system is rpm-based and that you have necessary dependencies installed (see [QubesBuilder](/doc/qubes-builder/) for more info): ~~~ sudo yum install git createrepo rpm-build make wget rpmdevtools pandoc diff --git a/developers/building/usbvm.md b/developers/building/usbvm.md index 33ed512b..37be8e35 100644 --- a/developers/building/usbvm.md +++ b/developers/building/usbvm.md @@ -1,8 +1,9 @@ --- layout: doc title: USBVM -permalink: /en/doc/usbvm/ +permalink: /doc/usbvm/ redirect_from: +- /en/doc/usbvm/ - /doc/USBVM/ - /wiki/USBVM/ --- diff --git a/developers/coding-style.md b/developers/coding-style.md index e11f9c04..e65fdedf 100644 --- a/developers/coding-style.md +++ b/developers/coding-style.md @@ -1,8 +1,9 @@ --- layout: doc title: Coding Style -permalink: /en/doc/coding-style/ +permalink: /doc/coding-style/ redirect_from: +- /en/doc/coding-style/ - /doc/CodingStyle/ - /wiki/CodingStyle/ - /trac/wiki/CodingStyle/ diff --git a/developers/contributing.md b/developers/contributing.md index 0ee76e51..e85c6718 100644 --- a/developers/contributing.md +++ b/developers/contributing.md @@ -1,11 +1,11 @@ --- layout: doc title: Contributing -permalink: /en/doc/contributing/ +permalink: /doc/contributing/ redirect_from: -- /doc/contributing/ -- "/doc/ContributingHowto/" -- "/wiki/ContributingHowto/" +- /en/doc/contributing/ +- /doc/ContributingHowto/ +- /wiki/ContributingHowto/ --- How can I contribute to the Qubes Project? @@ -15,16 +15,16 @@ Ok, so you think Qubes Project is cool and you would like to contribute? You are First you should decide what you are interested in (and good in). The Qubes project would welcome contributions in various areas: -- Testing and [bug reporting](/en/doc/reporting-bugs/) +- Testing and [bug reporting](/doc/reporting-bugs/) - Code audit (e.g. gui-daemon) - New features - Artwork (plymouth themes, KDM themes, installer themes, wallpapers, etc) Perhaps the best starting point is to have a look at the [issues](https://github.com/QubesOS/qubes-issues/issues) to see what are the most urgent tasks to do. -Before you engage in some longer activity, e.g. implementing a new feature, it's always good to contact us first (preferably via the [qubes-devel](/en/doc/qubes-lists/) list), to avoid a situation when two or more independent people would work on the same feature at the same time, doubling each others work. When you contact us and devote to a particular task, we will create a ticket for this task with info who is working on this feature and what is the expected date of some early code to be posted. +Before you engage in some longer activity, e.g. implementing a new feature, it's always good to contact us first (preferably via the [qubes-devel](/doc/mailing-lists/) list), to avoid a situation when two or more independent people would work on the same feature at the same time, doubling each others work. When you contact us and devote to a particular task, we will create a ticket for this task with info who is working on this feature and what is the expected date of some early code to be posted. -When you are ready to start some work, read how to [access Qubes sources and send patches](/en/doc/source-code/). +When you are ready to start some work, read how to [access Qubes sources and send patches](/doc/source-code/). You can also contribute in other areas than coding and testing, e.g. by providing mirrors for Qubes rpm repositories, providing feedback about what features you would like to have in Qubes, or perhaps even preparing some cool You Tube videos that would demonstrate some Qubes' features. You are always encouraged to discuss your ideas on qubes-devel. diff --git a/developers/debugging/automated-tests.md b/developers/debugging/automated-tests.md index b3c5b5a3..1013dd6d 100644 --- a/developers/debugging/automated-tests.md +++ b/developers/debugging/automated-tests.md @@ -1,8 +1,10 @@ --- layout: doc title: Automated Tests -permalink: /en/doc/automated-tests/ -redirect_from: /doc/AutomatedTests/ +permalink: /doc/automated-tests/ +redirect_from: +- /en/doc/automated-tests/ +- /doc/AutomatedTests/ --- Automatic tests @@ -104,7 +106,7 @@ Example test run: After you added a new unit test to [core-admin/tests](https://github.com/QubesOS/qubes-core-admin/tree/master/tests) you have to make sure of two things: -1. The test will be added to the RPM file created by [QubesBuilder](/en/doc/qubes-builder/) +1. The test will be added to the RPM file created by [QubesBuilder](/doc/qubes-builder/) For this you need to edit [core-admin/tests/Makefile](https://github.com/QubesOS/qubes-core-admin/tree/master/tests/Makefile) 2. The test will be loaded by [core-admin/tests/\_\_init\_\_.py](https://github.com/QubesOS/qubes-core-admin/tree/master/tests/__init__.py) diff --git a/developers/debugging/profiling.md b/developers/debugging/profiling.md index 93a9956e..fd8dfeec 100644 --- a/developers/debugging/profiling.md +++ b/developers/debugging/profiling.md @@ -1,8 +1,9 @@ --- layout: doc title: Profiling -permalink: /en/doc/profiling/ +permalink: /doc/profiling/ redirect_from: +- /en/doc/profiling/ - /doc/Profiling/ - /wiki/Profiling/ --- diff --git a/developers/debugging/test-bench.md b/developers/debugging/test-bench.md index 8d223c05..9e0ce469 100644 --- a/developers/debugging/test-bench.md +++ b/developers/debugging/test-bench.md @@ -1,8 +1,9 @@ --- layout: doc title: Test Bench -permalink: /en/doc/test-bench/ +permalink: /doc/test-bench/ redirect_from: +- /en/doc/test-bench/ - /doc/TestBench/ - /wiki/TestBench/ --- @@ -12,7 +13,7 @@ Test bench for Dom0 This guide shows how to set up simple test bench that automatically test your code you're about to push. It is written especially for `core3` branch of `core-admin.git` repo, but some ideas are universal. -We will set up a spare machine (bare metal, not a virtual) that will be hosting our experimental Dom0. We will communicate with it via Ethernet and SSH. This tutorial assumes you are familiar with [QubesBuilder](/en/doc/qubes-builder/) and you have it set up and running flawlessly. +We will set up a spare machine (bare metal, not a virtual) that will be hosting our experimental Dom0. We will communicate with it via Ethernet and SSH. This tutorial assumes you are familiar with [QubesBuilder](/doc/qubes-builder/) and you have it set up and running flawlessly. Setting up the machine ---------------------- diff --git a/developers/debugging/vm-interface.md b/developers/debugging/vm-interface.md index 3bf208c2..7f801102 100644 --- a/developers/debugging/vm-interface.md +++ b/developers/debugging/vm-interface.md @@ -1,11 +1,12 @@ --- layout: doc title: VM Configuration Interface -permalink: /en/doc/vm-interface/ +permalink: /doc/vm-interface/ redirect_from: +- /en/doc/vm-interface/ - /doc/VMInterface/ -- "/doc/SystemDoc/VMInterface/" -- "/wiki/SystemDoc/VMInterface/" +- /doc/SystemDoc/VMInterface/ +- /wiki/SystemDoc/VMInterface/ --- VM Configuration Interface @@ -83,16 +84,16 @@ Other Qrexec services installed by default: - `qubes.DetachPciDevice` - service called in reaction to `qvm-pci -d` call on running VM. The service receives one word - BDF of device to detach. When the service call ends, the device will be detached -- `qubes.Filecopy` - receive some files from other VM. Files sent in [qfile format](/en/doc/qfilecopy/) +- `qubes.Filecopy` - receive some files from other VM. Files sent in [qfile format](/doc/qfilecopy/) - `qubes.OpenInVM` - open a file in called VM. Service receives a single file on stdin (in - [qfile format](/en/doc/qfilecopy/). After a file viewer/editor is terminated, if + [qfile format](/doc/qfilecopy/). After a file viewer/editor is terminated, if the file was modified, can be sent back (just raw content, without any headers); otherwise service should just terminate without sending anything. This service is used by both `qvm-open-in-vm` and `qvm-open-in-dvm` tools. When called in DispVM, service termination will trigger DispVM cleanup. - `qubes.Restore` - retrieve Qubes backup. The service receives backup location entered by the user (one line, terminated by '\n'), then should output backup - archive in [qfile format](/en/doc/qfilecopy/) (core-agent-linux component contains + archive in [qfile format](/doc/qfilecopy/) (core-agent-linux component contains `tar2qfile` utility to do the conversion - `qubes.SelectDirectory`, `qubes.SelectFile` - services which should show file/directory selection dialog and return (to stdout) a single line @@ -118,7 +119,7 @@ abstraction. This will change in the future. Those tools are: - `nm-online -x` - called before `qubes.SyncNtpClock` service call by `qvm-sync-clock` tool - `resize2fs` - called to resize filesystem on /rw partition by `qvm-grow-private` tool - `gpk-update-viewer` - called by Qubes Manager to display available updates in a TemplateVM -- `systemctl start qubes-update-check.timer` (and similarly stop) - called when enabling/disabling updates checking in given VM (`qubes-update-check` [qvm-service](/en/doc/qubes-service/)) +- `systemctl start qubes-update-check.timer` (and similarly stop) - called when enabling/disabling updates checking in given VM (`qubes-update-check` [qvm-service](/doc/qubes-service/)) Additionally automatic tests extensively calls various commands directly in VMs. We do not plan to change that. diff --git a/developers/debugging/windows-debugging.md b/developers/debugging/windows-debugging.md index fb5fbeda..141a643d 100644 --- a/developers/debugging/windows-debugging.md +++ b/developers/debugging/windows-debugging.md @@ -1,8 +1,9 @@ --- layout: doc title: Windows Debugging -permalink: /en/doc/windows-debugging/ +permalink: /doc/windows-debugging/ redirect_from: +- /en/doc/windows-debugging/ - /doc/WindowsDebugging/ - /wiki/WindowsDebugging/ --- diff --git a/developers/devel-books.md b/developers/devel-books.md index a7d2da4a..8f738a5f 100644 --- a/developers/devel-books.md +++ b/developers/devel-books.md @@ -1,8 +1,9 @@ --- layout: doc title: Developer Books -permalink: /en/doc/devel-books/ +permalink: /doc/devel-books/ redirect_from: +- /en/doc/devel-books/ - /doc/DevelBooks/ - /wiki/DevelBooks/ --- diff --git a/developers/devel-faq.md b/developers/devel-faq.md index 0a8206ca..76be513b 100644 --- a/developers/devel-faq.md +++ b/developers/devel-faq.md @@ -1,8 +1,9 @@ --- layout: doc title: Developers' FAQ -permalink: /en/doc/devel-faq/ +permalink: /doc/devel-faq/ redirect_from: +- /en/doc/devel-faq/ - /doc/DevelFaq/ - /wiki/DevelFaq/ --- @@ -24,7 +25,7 @@ There are a few things that are KDE-specific, but generally it should not be a b - Qubes requires KDM (KDE Login Manager), rather than GDM, for the very simple reason that GDM doesn't obey standards and start `/usr/bin/Xorg` instead of `/usr/bin/X`. This is important for Qubes, because we need to load a special "X wrapper" (to make it possible to use Linux usermode shared memory to access Xen shared memory pages in our App Viewers -- see the sources [here](https://github.com/QubesOS/qubes-gui-daemon/tree/master/shmoverride)). So, Qubes makes the `/usr/bin/X` to be a symlink to the Qubes X Wrapper, which, in turn, executes the `/usr/bin/Xorg`. This works well with KDM (and would probably also work with other X login managers), but not with GDM. If somebody succeeded in makeing GDM to execute `/usr/bin/X` instead of `/usr/bin/Xorg`, we would love to hear about it! -- We maintain a special [repository](/en/doc/kde-dom0/) for building packages specifically for Qubes Dom0. +- We maintain a special [repository](/doc/kde-dom0/) for building packages specifically for Qubes Dom0. - We've patched the KDE's Window Manager (specifically [one of the decoration plugins](https://github.com/QubesOS/qubes-desktop-linux-kde/tree/master/plastik-for-qubes)) to draw window decorations in the color of the specific AppVM's label. @@ -38,9 +39,9 @@ Any rpm-based, 64-bit. Preferred Fedora. Q: How to build Qubes from sources? ----------------------------------- -See [the instruction](/en/doc/qubes-builder/) +See [the instruction](/doc/qubes-builder/) Q: How do I submit a patch? --------------------------- -See [Qubes Source Code Repositories](/en/doc/source-code/). +See [Qubes Source Code Repositories](/doc/source-code/). diff --git a/developers/doc-guidelines.md b/developers/doc-guidelines.md index 121e8817..ac67a077 100644 --- a/developers/doc-guidelines.md +++ b/developers/doc-guidelines.md @@ -1,11 +1,11 @@ --- layout: doc title: Documentation Guidelines -permalink: /en/doc/doc-guidelines/ +permalink: /doc/doc-guidelines/ redirect_from: -- /doc/doc-guidelines/ -- "/wiki/DocStyle/" -- "/doc/DocStyle/" +- /en/doc/doc-guidelines/ +- /wiki/DocStyle/ +- /doc/DocStyle/ --- Guidelines for Documentation Contributors diff --git a/developers/fundamentals/gui.md b/developers/fundamentals/gui.md index e3215c5a..6544b81c 100644 --- a/developers/fundamentals/gui.md +++ b/developers/fundamentals/gui.md @@ -1,8 +1,9 @@ --- layout: doc title: GUI -permalink: /en/doc/gui/ +permalink: /doc/gui/ redirect_from: +- /en/doc/gui/ - /en/doc/gui-docs/ - /doc/GUIdocs/ - /wiki/GUIdocs/ diff --git a/developers/fundamentals/qubes-architecture.md b/developers/fundamentals/qubes-architecture.md index cf656bcc..95bd8fec 100644 --- a/developers/fundamentals/qubes-architecture.md +++ b/developers/fundamentals/qubes-architecture.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes Architecture -permalink: /en/doc/qubes-architecture/ +permalink: /doc/qubes-architecture/ redirect_from: +- /en/doc/qubes-architecture/ - /doc/QubesArchitecture/ - /wiki/QubesArchitecture/ --- diff --git a/developers/fundamentals/qubes-net.md b/developers/fundamentals/qubes-net.md index 725970fc..2f40cb96 100644 --- a/developers/fundamentals/qubes-net.md +++ b/developers/fundamentals/qubes-net.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes Networking -permalink: /en/doc/qubes-net/ +permalink: /doc/qubes-net/ redirect_from: +- /en/doc/qubes-net/ - /doc/QubesNet/ - /wiki/QubesNet/ --- diff --git a/developers/fundamentals/security-critical-code.md b/developers/fundamentals/security-critical-code.md index c08f53ff..c9fad6db 100644 --- a/developers/fundamentals/security-critical-code.md +++ b/developers/fundamentals/security-critical-code.md @@ -1,8 +1,9 @@ --- layout: doc title: Security-critical Code -permalink: /en/doc/security-critical-code/ +permalink: /doc/security-critical-code/ redirect_from: +- /en/doc/security-critical-code/ - /doc/SecurityCriticalCode/ - /wiki/SecurityCriticalCode/ - /trac/wiki/SecurityCriticalCode/ @@ -13,7 +14,7 @@ Security-Critical Code in Qubes OS Below is a list of security-critical (AKA trusted) code in Qubes OS. A successful attack against any of those might allow to compromise the Qubes OS security. This code can be thought of as of a Trusted Computing Base (TCB) of Qubes OS. The goal of the project has been to minimize the amount of this trusted code to an absolute minimum. The size of the current TCB is of an order of hundreds thousands of lines of C code, which is several orders of magnitude less than in other OSes, such as Windows, Linux or Mac, where it is of orders of tens of millions of lines of C code. -For more information about the security goals of Qubes OS, see [this page](/en/doc/security-goals/). +For more information about the security goals of Qubes OS, see [this page](/doc/security-goals/). Security-Critical Qubes-Specific Components ------------------------------------------- diff --git a/developers/fundamentals/template-implementation.md b/developers/fundamentals/template-implementation.md index 38995041..b80ef434 100644 --- a/developers/fundamentals/template-implementation.md +++ b/developers/fundamentals/template-implementation.md @@ -1,8 +1,9 @@ --- layout: doc title: Template Implementation -permalink: /en/doc/template-implementation/ +permalink: /doc/template-implementation/ redirect_from: +- /en/doc/template-implementation/ - /doc/TemplateImplementation/ - /wiki/TemplateImplementation/ --- diff --git a/developers/license.md b/developers/license.md index 3eaf4b09..f59a9351 100644 --- a/developers/license.md +++ b/developers/license.md @@ -1,11 +1,11 @@ --- layout: doc title: License -permalink: /en/doc/license/ +permalink: /doc/license/ redirect_from: -- /doc/license/ -- "/doc/QubesLicensing/" -- "/wiki/QubesLicensing/" +- /en/doc/license/ +- /doc/QubesLicensing/ +- /wiki/QubesLicensing/ --- Qubes OS License diff --git a/developers/qubes-research.md b/developers/qubes-research.md index 2a185094..f1927b11 100644 --- a/developers/qubes-research.md +++ b/developers/qubes-research.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes Research -permalink: /en/doc/qubes-research/ +permalink: /doc/qubes-research/ redirect_from: +- /en/doc/qubes-research/ - /doc/QubesResearch/ - /wiki/QubesResearch/ --- diff --git a/developers/reporting-bugs.md b/developers/reporting-bugs.md index c25a028c..98f8c0b1 100644 --- a/developers/reporting-bugs.md +++ b/developers/reporting-bugs.md @@ -1,11 +1,11 @@ --- layout: doc title: Reporting Bugs -permalink: /en/doc/reporting-bugs/ +permalink: /doc/reporting-bugs/ redirect_from: -- /doc/reporting-bugs/ -- "/doc/BugReportingGuide/" -- "/wiki/BugReportingGuide/" +- /en/doc/reporting-bugs/ +- /doc/BugReportingGuide/ +- /wiki/BugReportingGuide/ --- Bug Reporting Guide diff --git a/developers/services/dom0-secure-updates.md b/developers/services/dom0-secure-updates.md index 91d20be0..4465b0a9 100644 --- a/developers/services/dom0-secure-updates.md +++ b/developers/services/dom0-secure-updates.md @@ -1,8 +1,9 @@ --- layout: doc title: Dom0 Secure Updates -permalink: /en/doc/dom0-secure-updates/ +permalink: /doc/dom0-secure-updates/ redirect_from: +- /en/doc/dom0-secure-updates/ - /doc/Dom0SecureUpdates/ - /wiki/Dom0SecureUpdates/ --- diff --git a/developers/services/dvm-impl.md b/developers/services/dvm-impl.md index cc2d0cd9..efb01d9f 100644 --- a/developers/services/dvm-impl.md +++ b/developers/services/dvm-impl.md @@ -1,8 +1,9 @@ --- layout: doc title: DVMimpl -permalink: /en/doc/dvm-impl/ +permalink: /doc/dvm-impl/ redirect_from: +- /en/doc/dvm-impl/ - /doc/DVMimpl/ - /wiki/DVMimpl/ --- diff --git a/developers/services/qfilecopy.md b/developers/services/qfilecopy.md index 93b20d71..42c33128 100644 --- a/developers/services/qfilecopy.md +++ b/developers/services/qfilecopy.md @@ -1,8 +1,9 @@ --- layout: doc title: Qfilecopy -permalink: /en/doc/qfilecopy/ +permalink: /doc/qfilecopy/ redirect_from: +- /en/doc/qfilecopy/ - /doc/Qfilecopy/ - /wiki/Qfilecopy/ --- diff --git a/developers/services/qfileexchgd.md b/developers/services/qfileexchgd.md index 8376b28e..dc6167c3 100644 --- a/developers/services/qfileexchgd.md +++ b/developers/services/qfileexchgd.md @@ -1,8 +1,9 @@ --- layout: doc title: Qfileexchgd -permalink: /en/doc/qfileexchgd/ +permalink: /doc/qfileexchgd/ redirect_from: +- /en/doc/qfileexchgd/ - /doc/Qfileexchgd/ - /wiki/Qfileexchgd/ --- @@ -10,7 +11,7 @@ redirect_from: **This mechanism is obsolete as of Qubes Beta 1!** ================================================== -Please see this [page](/en/doc/qfilecopy/) instead. +Please see this [page](/doc/qfilecopy/) instead. qfilexchgd, the Qubes file exchange daemon ========================================== diff --git a/developers/services/qmemman.md b/developers/services/qmemman.md index 8539c230..2fd8cc63 100644 --- a/developers/services/qmemman.md +++ b/developers/services/qmemman.md @@ -1,8 +1,9 @@ --- layout: doc title: Qmemman -permalink: /en/doc/qmemman/ +permalink: /doc/qmemman/ redirect_from: +- /en/doc/qmemman/ - /doc/Qmemman/ - /wiki/Qmemman/ --- diff --git a/developers/services/qrexec.md b/developers/services/qrexec.md index fc278e0c..3289200c 100644 --- a/developers/services/qrexec.md +++ b/developers/services/qrexec.md @@ -1,8 +1,9 @@ --- layout: doc title: Qrexec -permalink: /en/doc/qrexec/ +permalink: /doc/qrexec/ redirect_from: +- /en/doc/qrexec/ - /doc/Qrexec/ - /wiki/Qrexec/ --- @@ -161,4 +162,4 @@ As previously noted, Qubes aims to provide mechanisms that are very simple and t Qubes RPC internals ------------------- -The internal implementation of qrexec in Qubes R2 is described [here](/en/doc/qrexec2-implementation/), and in Qubes R3 [here](/en/doc/qrexec3-implementation/). +The internal implementation of qrexec in Qubes R2 is described [here](/doc/qrexec2-implementation/), and in Qubes R3 [here](/doc/qrexec3-implementation/). diff --git a/developers/services/qrexec2-implementation.md b/developers/services/qrexec2-implementation.md index a8499e50..98834119 100644 --- a/developers/services/qrexec2-implementation.md +++ b/developers/services/qrexec2-implementation.md @@ -1,8 +1,9 @@ --- layout: doc title: Qrexec2Implementation -permalink: /en/doc/qrexec2-implementation/ +permalink: /doc/qrexec2-implementation/ redirect_from: +- /en/doc/qrexec2-implementation/ - /doc/Qrexec2Implementation/ - /wiki/Qrexec2Implementation/ --- @@ -10,7 +11,7 @@ redirect_from: Implementation of qrexec in Qubes R2 ==================================== -This page describes implementation of the [qrexec framework](/en/doc/qrexec/) in Qubes OS R2. Note that the implementation has changed significantly in Qubes R3 (see [Qrexec3Implementation](/en/doc/qrexec3-implementation/)), although the user API reminded backwards compatible (i.e. qrexec apps written for Qubes R2 should run without modifications on Qubes R3). +This page describes implementation of the [qrexec framework](/doc/qrexec/) in Qubes OS R2. Note that the implementation has changed significantly in Qubes R3 (see [Qrexec3Implementation](/doc/qrexec3-implementation/)), although the user API reminded backwards compatible (i.e. qrexec apps written for Qubes R2 should run without modifications on Qubes R3). Dom0 tools implementation ------------------------- diff --git a/developers/services/qrexec3-implementation.md b/developers/services/qrexec3-implementation.md index e08ab98e..0838a8a4 100644 --- a/developers/services/qrexec3-implementation.md +++ b/developers/services/qrexec3-implementation.md @@ -1,8 +1,9 @@ --- layout: doc title: Qrexec3Implementation -permalink: /en/doc/qrexec3-implementation/ +permalink: /doc/qrexec3-implementation/ redirect_from: +- /en/doc/qrexec3-implementation/ - /doc/Qrexec3Implementation/ - /wiki/Qrexec3Implementation/ --- @@ -10,7 +11,7 @@ redirect_from: Implementation of qrexec in Qubes R3 ==================================== -This page describes implementation of the [qrexec framework](/en/doc/qrexec/) in Qubes OS R3. +This page describes implementation of the [qrexec framework](/doc/qrexec/) in Qubes OS R3. Qrexec framework consists of a number of processes communicating with each other using common IPC protocol (described in detail below). Components residing in the same domain use pipes as the underlying transport medium, while components in separate domains use vchan link. diff --git a/developers/services/qrexec3.md b/developers/services/qrexec3.md index fec69e3e..021e86ac 100644 --- a/developers/services/qrexec3.md +++ b/developers/services/qrexec3.md @@ -1,8 +1,9 @@ --- layout: doc title: Qrexec3 -permalink: /en/doc/qrexec3/ +permalink: /doc/qrexec3/ redirect_from: +- /en/doc/qrexec3/ - /doc/Qrexec3/ - /wiki/Qrexec3/ --- diff --git a/developers/source-code.md b/developers/source-code.md index 5dd8636e..42082921 100644 --- a/developers/source-code.md +++ b/developers/source-code.md @@ -1,8 +1,9 @@ --- layout: doc title: Source Code -permalink: /en/doc/source-code/ +permalink: /doc/source-code/ redirect_from: +- /en/doc/source-code/ - /doc/SourceCode/ - /wiki/SourceCode/ --- diff --git a/developers/system-doc.md b/developers/system-doc.md index b6a30de2..a637fc1f 100644 --- a/developers/system-doc.md +++ b/developers/system-doc.md @@ -1,8 +1,9 @@ --- layout: doc title: System Documentation -permalink: /en/doc/system-doc/ +permalink: /doc/system-doc/ redirect_from: +- /en/doc/system-doc/ - /doc/SystemDoc/ - /wiki/SystemDoc/ --- @@ -12,42 +13,42 @@ System Documentation for Developers Fundamentals ------------ - * [Qubes OS Architecture Overview](/en/doc/qubes-architecture/) + * [Qubes OS Architecture Overview](/doc/qubes-architecture/) * [Qubes OS Architecture Spec v0.3 [PDF]](/attachment/wiki/QubesArchitecture/arch-spec-0.3.pdf) (The original 2009 document that started this all...) - * [Security-critical elements of Qubes OS](/en/doc/security-critical-code/) - * Qubes RPC: [`qrexec` v2](/en/doc/qrexec/) ([R2 implementation](/en/doc/qrexec2-implementation/)) - * Qubes RPC: [`qrexec` v3](/en/doc/qrexec3/) ([R3 implementation](/en/doc/qrexec3-implementation/)) (Odyssey) + * [Security-critical elements of Qubes OS](/doc/security-critical-code/) + * Qubes RPC: [`qrexec` v2](/doc/qrexec/) ([R2 implementation](/doc/qrexec2-implementation/)) + * Qubes RPC: [`qrexec` v3](/doc/qrexec3/) ([R3 implementation](/doc/qrexec3-implementation/)) (Odyssey) * [Example for writing a `qrexec` service in Qubes OS (blog post)](http://theinvisiblethings.blogspot.com/2013/02/converting-untrusted-pdfs-into-trusted.html) - * [Qubes GUI virtualization protocol](/en/doc/gui/) - * [Networking in Qubes](/en/doc/qubes-net/) - * [Implementation of template sharing and updating](/en/doc/template-implementation/) + * [Qubes GUI virtualization protocol](/doc/gui/) + * [Networking in Qubes](/doc/qubes-net/) + * [Implementation of template sharing and updating](/doc/template-implementation/) Services -------- - * [Inter-domain file copying](/en/doc/qfilecopy/) (deprecates [`qfileexchgd`](/en/doc/qfileexchgd/)) - * [Dynamic memory management in Qubes](/en/doc/qmemman/) - * [Implementation of DisposableVMs](/en/doc/dvm-impl/) + * [Inter-domain file copying](/doc/qfilecopy/) (deprecates [`qfileexchgd`](/doc/qfileexchgd/)) + * [Dynamic memory management in Qubes](/doc/qmemman/) + * [Implementation of DisposableVMs](/doc/dvm-impl/) * [Article about disposable VMs](http://theinvisiblethings.blogspot.com/2010/06/disposable-vms.html) - * [Dom0 secure update mechanism](/en/doc/dom0-secure-updates/) + * [Dom0 secure update mechanism](/doc/dom0-secure-updates/) * VM secure update mechanism (forthcoming) Debugging --------- - * [Profiling python code](/en/doc/profiling/) - * [Test environment in separate machine for automatic tests](/en/doc/test-bench/) - * [Automated tests](/en/doc/automated-tests/) - * [VM-dom0 internal configuration interface](/en/doc/vm-interface/) - * [Debugging Windows VMs](/en/doc/windows-debugging/) + * [Profiling python code](/doc/profiling/) + * [Test environment in separate machine for automatic tests](/doc/test-bench/) + * [Automated tests](/doc/automated-tests/) + * [VM-dom0 internal configuration interface](/doc/vm-interface/) + * [Debugging Windows VMs](/doc/windows-debugging/) Building -------- - * [Building Qubes](/en/doc/qubes-builder/) (["API" Details](/en/doc/qubes-builder-details/)) - * [Development Workflow](/en/doc/development-workflow/) - * [KDE Dom0 packages for Qubes](/en/doc/kde-dom0/) - * [How to build Qubes installation ISO](/en/doc/installation-iso-building/) - * [Building Qubes OS 3.0 ISO](/en/doc/qubes-r3-building/) - * [Building USB passthrough support (experimental)](/en/doc/usbvm/) - * [Building a TemplateVM based on a new OS (ArchLinux example)](/en/doc/building-non-fedora-template/) - * [Building the Archlinux Template](/en/doc/building-archlinux-template/) + * [Building Qubes](/doc/qubes-builder/) (["API" Details](/doc/qubes-builder-details/)) + * [Development Workflow](/doc/development-workflow/) + * [KDE Dom0 packages for Qubes](/doc/kde-dom0/) + * [How to build Qubes installation ISO](/doc/installation-iso-building/) + * [Building Qubes OS 3.0 ISO](/doc/qubes-r3-building/) + * [Building USB passthrough support (experimental)](/doc/usbvm/) + * [Building a TemplateVM based on a new OS (ArchLinux example)](/doc/building-non-fedora-template/) + * [Building the Archlinux Template](/doc/building-archlinux-template/) diff --git a/developers/version-scheme.md b/developers/version-scheme.md index 3222def9..38cf0d82 100644 --- a/developers/version-scheme.md +++ b/developers/version-scheme.md @@ -1,8 +1,9 @@ --- layout: doc title: Version Scheme -permalink: /en/doc/version-scheme/ +permalink: /doc/version-scheme/ redirect_from: +- /en/doc/version-scheme/ - /doc/VersionScheme/ - /wiki/VersionScheme/ --- diff --git a/doc.md b/doc.md index aefa77da..70e9a591 100644 --- a/doc.md +++ b/doc.md @@ -1,13 +1,13 @@ --- layout: default title: Qubes OS Documentation -permalink: /en/doc/ +permalink: /doc/ redirect_from: -- /doc/ -- "/doc/UserDoc/" -- "/wiki/UserDoc/" -- "/doc/QubesDocs/" -- "/wiki/QubesDocs/" +- /en/doc/ +- /doc/UserDoc/ +- /wiki/UserDoc/ +- /doc/QubesDocs/ +- /wiki/QubesDocs/ --- Qubes OS Documentation @@ -15,17 +15,17 @@ Qubes OS Documentation The Basics ---------- - * [A Simple Introduction to Qubes](/en/intro/) - * [Getting Started](/en/doc/getting-started/) - * [Users' FAQ](/en/doc/user-faq/) - * [Mailing Lists](/en/doc/mailing-lists/) + * [A Simple Introduction to Qubes](/intro/) + * [Getting Started](/doc/getting-started/) + * [Users' FAQ](/doc/user-faq/) + * [Mailing Lists](/doc/mailing-lists/) * [Further reading: How is Qubes different from...?](http://blog.invisiblethings.org/2012/09/12/how-is-qubes-os-different-from.html) * [Further reading: Why Qubes is more than a collection of VMs](http://www.invisiblethingslab.com/resources/2014/Software_compartmentalization_vs_physical_separation.pdf) Choosing Your Hardware ---------------------- - * [System Requirements](/en/doc/system-requirements/) + * [System Requirements](/doc/system-requirements/) * [Hardware Compatibility List (HCL)](/hcl) * Qubes Certified Laptops ([coming soon!](https://twitter.com/Puri_sm/status/644963433293717504)) @@ -33,124 +33,124 @@ Choosing Your Hardware Installing Qubes ---------------- * [Use Qubes without installing: Qubes Live USB (alpha)](https://groups.google.com/d/msg/qubes-users/IQdCEpkooto/iyMh3LuzCAAJ) - * [How to Install Qubes](/en/doc/installation-guide/) + * [How to Install Qubes](/doc/installation-guide/) * [Qubes Downloads](/downloads/) - * [Why and How to Verify Signatures](/en/doc/verifying-signatures/) - * [Security Considerations when Installing](/en/doc/install-security/) + * [Why and How to Verify Signatures](/doc/verifying-signatures/) + * [Security Considerations when Installing](/doc/install-security/) Common Tasks ------------ - * [Copying and Pasting Text Between Domains](/en/doc/copy-paste/) - * [Copying and Moving Files Between Domains](/en/doc/copying-files/) - * [Copying Files to and from dom0](/en/doc/copy-to-dom0/) - * [Updating Software in dom0](/en/doc/software-update-dom0/) - * [Updating and Installing Software in VMs](/en/doc/software-update-vm/) - * [Backup, Restoration, and Migration](/en/doc/backup-restore/) - * [Disposable VMs](/en/doc/dispvm/) - * [Mounting USB Drives to AppVMs](/en/doc/stick-mounting/) - * [Recording Optical Discs](/en/doc/recording-optical-discs/) - * [Managing Application Shortcuts](/en/doc/managing-appvm-shortcuts/) - * [Enabling Fullscreen Mode](/en/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/) + * [Disposable VMs](/doc/dispvm/) + * [Mounting USB Drives to AppVMs](/doc/stick-mounting/) + * [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](/en/doc/templates/) - * [Templates: Fedora - minimal](/en/doc/templates/fedora-minimal/) - * [Templates: Debian](/en/doc/templates/debian/) - * [Templates: Archlinux](/en/doc/templates/archlinux/) - * [Templates: Ubuntu](/en/doc/templates/ubuntu/) - * [Templates: Whonix](/en/doc/templates/whonix/) - * [Installing and Using Windows-based AppVMs (Qubes R2 Beta 3 and later)](/en/doc/windows-appvms/) - * [Creating and Using HVM and Windows Domains (Qubes R2+)](/en/doc/hvm-create/) - * [Advanced options and troubleshooting of Qubes Tools for Windows (R3)](/en/doc/windows-tools-3/) - * [Advanced options and troubleshooting of Qubes Tools for Windows (R2)](/en/doc/windows-tools-2/) - * [Uninstalling Qubes Tools for Windows 2.x](/en/doc/uninstalling-windows-tools-2/) - * [Upgrading the Fedora 20 Template](/en/doc/fedora-template-upgrade-20/) - * [Upgrading the Fedora 18 Template](/en/doc/fedora-template-upgrade-18/) - * [Tips for Using Linux in an HVM](/en/doc/linux-hvm-tips/) + * [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 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](/en/security/) - * [Security Guidelines](/en/doc/security-guidelines/) - * [Understanding Qubes Firewall](/en/doc/qubes-firewall/) - * [Understanding and Preventing Data Leaks](/en/doc/data-leaks/) - * [Installing Anti Evil Maid](/en/doc/anti-evil-maid/) - * [Using Multi-factor Authentication with Qubes](/en/doc/multifactor-authentication/) - * [Using GPG more securely in Qubes: Split GPG](/en/doc/split-gpg/) - * [Configuring YubiKey for user authentication](/en/doc/yubi-key/) - * [Note regarding password-less root access in VM](/en/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/) Configuration Guides -------------------- - * [Configuration Files](/en/doc/config-files/) - * [How to Install a Transparent Tor ProxyVM (TorVM)](/en/doc/torvm/) - * [How to set up a ProxyVM as a VPN Gateway](/en/doc/vpn/) - * [Storing AppVMs on Secondary Drives](/en/doc/secondary-storage/) - * [Where are my external storage devices mounted?](/en/doc/external-device-mount-point/) - * [Resizing AppVM and HVM Disk Images](/en/doc/resize-disk-image/) - * [Extending `root.img` Size](/en/doc/resize-root-disk-image/) - * [Installing ZFS in Qubes](/en/doc/zfs/) - * [Mutt Guide](/en/doc/mutt/) - * [Postfix Guide](/en/doc/postfix/) - * [Fetchmail Guide](/en/doc/fetchmail/) + * [Configuration Files](/doc/config-files/) + * [How to Install a Transparent Tor ProxyVM (TorVM)](/doc/torvm/) + * [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)](/en/doc/network-bridge-support/) - * [Assigning PCI Devices to AppVMs](/en/doc/assigning-devices/) - * [Enabling TRIM for SSD disks](/en/doc/disk-trim/) - * [Configuring a Network Printer](/en/doc/network-printer/) - * [Using External Audio Devices](/en/doc/external-audio/) + * [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](/en/doc/rxvt/) + * [Rxvt Guide](/doc/rxvt/) Customization Guides -------------------- - * [DispVM Customization](/en/doc/dispvm-customization/) - * [Customizing Fedora minimal templates](/en/doc/fedora-minimal-template-customization) - * [Customizing Windows 7 templates](/en/doc/windows-template-customization) - * [Using KDE in dom0](/en/doc/kde/) - * [Installing XFCE in dom0](/en/doc/xfce/) - * [Language Localization](/en/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](/en/doc/out-of-memory/) + * [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](/en/doc/install-nvidia-driver/) + * [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](/en/doc/sony-vaio-tinkering/) - * [Getting Lenovo 450 to work with Qubes](/en/doc/lenovo450-tinkering/) + * [Getting Sony Vaio Z laptop to work with Qubes](/doc/sony-vaio-tinkering/) + * [Getting Lenovo 450 to work with Qubes](/doc/lenovo450-tinkering/) Reference Pages --------------- - * [Dom0 Command-Line Tools](/en/doc/dom0-tools/) - * [DomU Command-Line Tools](/en/doc/vm-tools/) - * [Glossary of Qubes Terminology](/en/doc/glossary/) - * [Qubes Service Framework](/en/doc/qubes-service/) - * [Command Execution in VMs (and Qubes RPC)](/en/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](/en/doc/system-doc/) - * [Developers' FAQ](/en/doc/devel-faq/) - * [How to Contribute to the Qubes OS Project](/en/doc/contributing/) - * [Reporting Security Issues](/en/security/) - * [Reporting Bugs](/en/doc/reporting-bugs/) - * [Source Code](/en/doc/source-code/) - * [Qubes OS Version Scheme](/en/doc/version-scheme/) - * [Coding Guidelines](/en/doc/coding-style/) - * [Documentation Guidelines](/en/doc/doc-guidelines/) - * [Books for Developers](/en/doc/devel-books/) - * [Research Papers](/en/doc/qubes-research/) - * [Qubes OS License](/en/doc/license/) + * [System Documentation](/doc/system-doc/) + * [Developers' FAQ](/doc/devel-faq/) + * [How to Contribute to the Qubes OS Project](/doc/contributing/) + * [Reporting Security Issues](/security/) + * [Reporting Bugs](/doc/reporting-bugs/) + * [Source Code](/doc/source-code/) + * [Qubes OS Version Scheme](/doc/version-scheme/) + * [Coding Guidelines](/doc/coding-style/) + * [Documentation Guidelines](/doc/doc-guidelines/) + * [Books for Developers](/doc/devel-books/) + * [Research Papers](/doc/qubes-research/) + * [Qubes OS License](/doc/license/) diff --git a/hardware/hcl.md b/hardware/hcl.md index 18e270c4..f605a764 100644 --- a/hardware/hcl.md +++ b/hardware/hcl.md @@ -1,8 +1,9 @@ --- layout: doc title: Hardware Compatibility List (HCL) -permalink: /en/doc/hcl/ +permalink: /doc/hcl/ redirect_from: +- /en/doc/hcl/ - /doc/HCL/ - /wiki/HCL/ - /wiki/HCLR1/ @@ -16,7 +17,7 @@ The [HCL](/hcl) is a compilation of reports generated and submitted by users acr **Note:** Except in the case of developer-reported entries, the Qubes team has not independently verified the accuracy of these reports. Please first consult the data sheets (CPU, chipset, motherboard) prior to buying new hardware for Qubes. - Meet the [SystemRequirements](/en/doc/system-requirements/) and search particular for support of: + Meet the [SystemRequirements](/doc/system-requirements/) and search particular for support of: - HVM ("AMD virtualization (AMD-V)", "Intel virtualization (VT-x)", "VIA virtualization (VIA VT)") - IOMMU ("AMD I/O Virtualization Technology (AMD-Vi)", "Intel Virtualization Technology for Directed I/O (VT-d)") @@ -36,7 +37,7 @@ In order to generate a HCL report in Qubes, simply open a terminal in dom0 (KDE: (Note: If you are working with a new Qubes installation, you may need to update your system in order to download this script.) You are encouraged to submit your HCL report for the benefit of further Qubes development and other users. - If you would like to submit your HCL report, please send the **HCL Info** `.txt` file to [\`qubes-users@googlegroups.com\`](/en/doc/qubes-lists/) with the subject `HCL - `. + If you would like to submit your HCL report, please send the **HCL Info** `.txt` file to [\`qubes-users@googlegroups.com\`](/doc/mailing-lists/) with the subject `HCL - `. Please include any useful information about any Qubes features you may have tested (see the legend below), as well as general machine compatibility (video, networking, sleep, etc.). If you have problems with your hardware try a different kernel in the [Troubleshooting menu](/doc/InstallationGuideR2rc1/#troubleshooting-problems-with-the-installer). Please consider sending the **HCL Support Files** `.cpio.gz` file as well. diff --git a/hardware/system-requirements.md b/hardware/system-requirements.md index 9d5fc9da..d96a9bd9 100644 --- a/hardware/system-requirements.md +++ b/hardware/system-requirements.md @@ -1,8 +1,9 @@ --- layout: doc title: System Requirements -permalink: /en/doc/system-requirements/ +permalink: /doc/system-requirements/ redirect_from: +- /en/doc/system-requirements/ - /doc/SystemRequirements/ - /wiki/SystemRequirements/ --- @@ -23,7 +24,7 @@ Recommended - Fast SSD (strongly recommended) - Intel GPU (strongly preferred) - - Nvidia GPUs may require significant [troubleshooting](/en/doc/install-nvidia-driver/). + - Nvidia GPUs may require significant [troubleshooting](/doc/install-nvidia-driver/). - ATI GPUs have not been formally tested (but see the [Hardware Compatibility List](/hcl/)). - Intel VT-x or AMD-v technology (required for running HVM domains, such as Windows-based AppVMs) - Intel VT-d or AMD IOMMU technology (required for effective isolation of network VMs) diff --git a/installing/install-security.md b/installing/install-security.md index bf2ab6f2..214b1c36 100644 --- a/installing/install-security.md +++ b/installing/install-security.md @@ -1,8 +1,9 @@ --- layout: doc title: Installation Security -permalink: /en/doc/install-security/ +permalink: /doc/install-security/ redirect_from: +- /en/doc/install-security/ - /doc/InstallSecurity/ - /wiki/InstallSecurity/ --- diff --git a/installing/installation-guide.md b/installing/installation-guide.md index 556ad860..fafe3710 100644 --- a/installing/installation-guide.md +++ b/installing/installation-guide.md @@ -1,33 +1,18 @@ --- layout: doc title: Installation Guide -permalink: /en/doc/installation-guide/ +permalink: /doc/installation-guide/ redirect_from: +- /en/doc/installation-guide/ - /doc/InstallationGuide/ - /wiki/InstallationGuide/ -redirect_from: -- - /doc/InstallationGuideR1/ -redirect_from: -- - /doc/InstallationGuideR2B1/ -redirect_from: -- - /doc/InstallationGuideR2B2/ -redirect_from: -- - /doc/InstallationGuideR2B3/ -redirect_from: -- - /doc/InstallationGuideR2rc1/ -redirect_from: -- - /doc/InstallationGuideR2rc2/ -redirect_from: -- - /doc/InstallationGuideR3.0rc1/ -redirect_from: -- - /doc/InstallationGuideR3.0rc2/ --- @@ -51,7 +36,7 @@ Note: We don't recommend installing Qubes in a virtual machine! It will likely n Download installer ISO ---------------------- -See [this page](/doc/QubesDownloads/) for ISO downloads. Remember, we have absolutely no control over those servers, and so you should be assuming that they might be compromised, or just be serving a compromised ISOs because their operators decided so, for whatever reason. Always verify the digital signature on the downloaded ISO. See this [page](/en/doc/verifying-signatures/) for more info about how to download and verify our GPG keys, and then verify the downloaded ISO: +See [this page](/doc/QubesDownloads/) for ISO downloads. Remember, we have absolutely no control over those servers, and so you should be assuming that they might be compromised, or just be serving a compromised ISOs because their operators decided so, for whatever reason. Always verify the digital signature on the downloaded ISO. See this [page](/doc/verifying-signatures/) for more info about how to download and verify our GPG keys, and then verify the downloaded ISO: gpg -v Qubes-R2-x86_64-DVD.iso.asc @@ -88,9 +73,9 @@ See [release notes](/doc/releases/) of appropriate version. Getting Help ------------ -- **User manuals are [here](/en/doc/).** (Strongly recommended!) +- **User manuals are [here](/doc/).** (Strongly recommended!) -- Developers documentation (normally not needed by users) is [here](/en/doc/system-doc/) +- Developers documentation (normally not needed by users) is [here](/doc/system-doc/) - If you don't find answer in the sources given above, write to the *qubes-users* mailing list (you don't need to be subscribed to the list, just send email to the address given below): - [https://groups.google.com/group/qubes-users](https://groups.google.com/group/qubes-users) diff --git a/installing/upgrade-to-r2.md b/installing/upgrade-to-r2.md index 89e7e9af..86c4fdfb 100644 --- a/installing/upgrade-to-r2.md +++ b/installing/upgrade-to-r2.md @@ -1,12 +1,11 @@ --- layout: doc title: Upgrading to R2 -permalink: /en/doc/upgrade-to-r2/ +permalink: /doc/upgrade-to-r2/ redirect_from: +- /en/doc/upgrade-to-r2/ - /doc/UpgradeToR2/ - /doc/UpgradeToR2rc1/ -redirect_from: -- - /wiki/UpgradeToR2rc1/ --- @@ -15,7 +14,7 @@ Upgrading Qubes R2 Beta 3 to R2 Current Qubes R2 Beta 3 (R2B3) systems can be upgraded in-place to the latest R2 (R2) release by following the procedure below. -**Before attempting either an in-place upgrade or a clean installation, we strongly recommend that users back up the system by using the built-in [backup tool](/en/doc/backup-restore/).** +**Before attempting either an in-place upgrade or a clean installation, we strongly recommend that users back up the system by using the built-in [backup tool](/doc/backup-restore/).** Upgrade Template and Standalone VM(s) ------------------------------------- @@ -26,7 +25,7 @@ Upgrade Template and Standalone VM(s) While technically it is possible to use old Fedora 18 template on R2, it is strongly recommended to upgrade all the Template VMs and Standalone VMs, because Fedora 18 no longer receive security updates. -By default, in Qubes R2, there is only one Template VM, however users are free to create more Template VMs for special purposes, as well as Standalone VMs. If more than one template and/or Standalone VMs are used, then it is recommended to upgrade/replace all of them. More information on using multiple Template VMs, as well as Standalone VMs, can be found [here](/en/doc/software-update-vm/). +By default, in Qubes R2, there is only one Template VM, however users are free to create more Template VMs for special purposes, as well as Standalone VMs. If more than one template and/or Standalone VMs are used, then it is recommended to upgrade/replace all of them. More information on using multiple Template VMs, as well as Standalone VMs, can be found [here](/doc/software-update-vm/). Upgrading dom0 -------------- diff --git a/installing/upgrade-to-r2b1.md b/installing/upgrade-to-r2b1.md index 2bda37b9..ef8e9bfb 100644 --- a/installing/upgrade-to-r2b1.md +++ b/installing/upgrade-to-r2b1.md @@ -1,8 +1,9 @@ --- layout: doc title: Upgrading to R2B1 -permalink: /en/doc/upgrade-to-r2b1/ +permalink: /doc/upgrade-to-r2b1/ redirect_from: +- /en/doc/upgrade-to-r2b1/ - /doc/UpgradeToR2B1/ - /wiki/UpgradeToR2B1/ --- diff --git a/installing/upgrade-to-r2b2.md b/installing/upgrade-to-r2b2.md index 6373dc95..ca9d8104 100644 --- a/installing/upgrade-to-r2b2.md +++ b/installing/upgrade-to-r2b2.md @@ -1,8 +1,9 @@ --- layout: doc title: Upgrading to R2B2 -permalink: /en/doc/upgrade-to-r2b2/ +permalink: /doc/upgrade-to-r2b2/ redirect_from: +- /en/doc/upgrade-to-r2b2/ - /doc/UpgradeToR2B2/ - /wiki/UpgradeToR2B2/ --- @@ -10,7 +11,7 @@ redirect_from: Upgrading Qubes R1 to R2 (beta2) ================================ -Existing users of Qubes R1 (but not R1 betas!) can upgrade their systems to the latest R2 beta release by following the procedure below. As usual, it is advisable to backup the system before proceeding with the upgrade. While it is possible to upgrade the system **it is strongly recommended to reinstall it**. You will preserve all your data and settings thanks to [backup and restore tools](/en/doc/backup-restore/). +Existing users of Qubes R1 (but not R1 betas!) can upgrade their systems to the latest R2 beta release by following the procedure below. As usual, it is advisable to backup the system before proceeding with the upgrade. While it is possible to upgrade the system **it is strongly recommended to reinstall it**. You will preserve all your data and settings thanks to [backup and restore tools](/doc/backup-restore/). Upgrade all Template and Standalone VM(s) ----------------------------------------- diff --git a/installing/upgrade-to-r2b3.md b/installing/upgrade-to-r2b3.md index 7d983407..c5079adb 100644 --- a/installing/upgrade-to-r2b3.md +++ b/installing/upgrade-to-r2b3.md @@ -1,8 +1,9 @@ --- layout: doc title: Upgrading to R2B3 -permalink: /en/doc/upgrade-to-r2b3/ +permalink: /doc/upgrade-to-r2b3/ redirect_from: +- /en/doc/upgrade-to-r2b3/ - /doc/UpgradeToR2B3/ - /wiki/UpgradeToR2B3/ --- @@ -10,16 +11,16 @@ redirect_from: Upgrading Qubes R2 Beta 2 to R2 Beta 3 ====================================== -Current Qubes R2 Beta 2 (R2B2) systems can be upgraded in-place to the latest R2 Beta 3 (R2B3) release by following the procedure below. However, upgrading in-place is riskier than performing a clean installation, since there are more things which can go wrong. For this reason, **we strongly recommended that users perform a [clean installation](/en/doc/installation-guide/) of Qubes R2 Beta 3**. +Current Qubes R2 Beta 2 (R2B2) systems can be upgraded in-place to the latest R2 Beta 3 (R2B3) release by following the procedure below. However, upgrading in-place is riskier than performing a clean installation, since there are more things which can go wrong. For this reason, **we strongly recommended that users perform a [clean installation](/doc/installation-guide/) of Qubes R2 Beta 3**. -**Before attempting either an in-place upgrade or a clean installation, we strongly recommend that users back up the system by using the built-in [backup tool](/en/doc/backup-restore/).** +**Before attempting either an in-place upgrade or a clean installation, we strongly recommend that users back up the system by using the built-in [backup tool](/doc/backup-restore/).** -Experienced users may be comfortable accepting the risks of upgrading in-place. Such users may wish to first attempt an in-place upgrade. If nothing goes wrong, then some time and effort will have been saved. If something does go wrong, then the user can simply perform a clean installation, and no significant loss will have occurred (as long as the user [backed up](/en/doc/backup-restore/) correctly!). +Experienced users may be comfortable accepting the risks of upgrading in-place. Such users may wish to first attempt an in-place upgrade. If nothing goes wrong, then some time and effort will have been saved. If something does go wrong, then the user can simply perform a clean installation, and no significant loss will have occurred (as long as the user [backed up](/doc/backup-restore/) correctly!). Upgrade all Template and Standalone VM(s) ----------------------------------------- -By default, in Qubes R2, there is only one Template VM, however users are free to create more Template VMs for special purposes, as well as Standalone VMs. More information on using multiple Template VMs, as well as Standalone VMs, can be found [here](/en/doc/software-update-vm/). The steps described in this section should be repeated in *all* user's Template and Standalone VMs. +By default, in Qubes R2, there is only one Template VM, however users are free to create more Template VMs for special purposes, as well as Standalone VMs. More information on using multiple Template VMs, as well as Standalone VMs, can be found [here](/doc/software-update-vm/). The steps described in this section should be repeated in *all* user's Template and Standalone VMs. It is critical to complete this step **before** proceeding to dom0 upgrade. Otherwise you will most likely ends with unusable system. diff --git a/installing/upgrade-to-r3.0.md b/installing/upgrade-to-r3.0.md index 45845724..fa922053 100644 --- a/installing/upgrade-to-r3.0.md +++ b/installing/upgrade-to-r3.0.md @@ -1,8 +1,9 @@ --- layout: doc title: Upgrading to R3.0 -permalink: /en/doc/upgrade-to-r3.0/ +permalink: /doc/upgrade-to-r3.0/ redirect_from: +- /en/doc/upgrade-to-r3.0/ - /doc/UpgradeToR3.0/ - /doc/UpgradeToR3.0rc1/ --- @@ -12,16 +13,16 @@ Upgrading Qubes R2 to R3.0 **This instruction is highly experimental, the official way to upgrade from R2 is to backup the data and reinstall the system. Use at your own risk!** -Current Qubes R3.0 (R3.0) systems can be upgraded in-place to the latest R3.0 by following the procedure below. However, upgrading in-place is riskier than performing a clean installation, since there are more things which can go wrong. For this reason, **we strongly recommended that users perform a [clean installation](/en/doc/installation-guide/) of Qubes R3.0**. +Current Qubes R3.0 (R3.0) systems can be upgraded in-place to the latest R3.0 by following the procedure below. However, upgrading in-place is riskier than performing a clean installation, since there are more things which can go wrong. For this reason, **we strongly recommended that users perform a [clean installation](/doc/installation-guide/) of Qubes R3.0**. -**Before attempting either an in-place upgrade or a clean installation, we strongly recommend that users back up the system by using the built-in [backup tool](/en/doc/backup-restore/).** +**Before attempting either an in-place upgrade or a clean installation, we strongly recommend that users back up the system by using the built-in [backup tool](/doc/backup-restore/).** -Experienced users may be comfortable accepting the risks of upgrading in-place. Such users may wish to first attempt an in-place upgrade. If nothing goes wrong, then some time and effort will have been saved. If something does go wrong, then the user can simply perform a clean installation, and no significant loss will have occurred (as long as the user [backed up](/en/doc/backup-restore/) correctly!). +Experienced users may be comfortable accepting the risks of upgrading in-place. Such users may wish to first attempt an in-place upgrade. If nothing goes wrong, then some time and effort will have been saved. If something does go wrong, then the user can simply perform a clean installation, and no significant loss will have occurred (as long as the user [backed up](/doc/backup-restore/) correctly!). Upgrade all Template and Standalone VM(s) ----------------------------------------- -By default, in Qubes R2, there is only one Template VM, however users are free to create more Template VMs for special purposes, as well as Standalone VMs. More information on using multiple Template VMs, as well as Standalone VMs, can be found [here](/en/doc/software-update-vm/). The steps described in this section should be repeated in **all** user's Template and Standalone VMs. +By default, in Qubes R2, there is only one Template VM, however users are free to create more Template VMs for special purposes, as well as Standalone VMs. More information on using multiple Template VMs, as well as Standalone VMs, can be found [here](/doc/software-update-vm/). The steps described in this section should be repeated in **all** user's Template and Standalone VMs. It is critical to complete this step **before** proceeding to dom0 upgrade. Otherwise you will most likely end with unusable system. diff --git a/installing/verifying-signatures.md b/installing/verifying-signatures.md index 5ac2642f..0a55343b 100644 --- a/installing/verifying-signatures.md +++ b/installing/verifying-signatures.md @@ -1,8 +1,9 @@ --- layout: doc title: Verifying Signatures -permalink: /en/doc/verifying-signatures/ +permalink: /doc/verifying-signatures/ redirect_from: +- /en/doc/verifying-signatures/ - /doc/VerifyingSignatures/ - /wiki/VerifyingSignatures/ --- @@ -50,7 +51,7 @@ For additional security we also publish the fingerprint of the Qubes Master Sign Key fingerprint = 427F 11FD 0FAA 4B08 0123 F01C DDFA 1A3E 3687 9494 uid Qubes Master Signing Key -There should also be a copy of this key at the project's main website, in the [Qubes Security Pack](/en/doc/security-pack/), and in the archives of the project's [developer](https://groups.google.com/forum/#!msg/qubes-devel/RqR9WPxICwg/kaQwknZPDHkJ) and [user](https://groups.google.com/d/msg/qubes-users/CLnB5uFu_YQ/ZjObBpz0S9UJ) mailing lists. +There should also be a copy of this key at the project's main website, in the [Qubes Security Pack](/doc/security-pack/), and in the archives of the project's [developer](https://groups.google.com/forum/#!msg/qubes-devel/RqR9WPxICwg/kaQwknZPDHkJ) and [user](https://groups.google.com/d/msg/qubes-users/CLnB5uFu_YQ/ZjObBpz0S9UJ) mailing lists. Once you have obtained the Qubes Master Signing Key ([`0x36879494`](https://keys.qubes-os.org/keys/qubes-master-signing-key.asc)), you should verify the fingerprint of this key very carefully by obtaining copies of the fingerprint from trustworthy independent sources and comparing them to the downloaded key's fingerprint to ensure they match. Then set its trust level to "ultimate" (oh, well), so that it can be used to automatically verify all the keys signed by the Qubes Master Signing Key: @@ -108,7 +109,7 @@ For example: Qubes OS Release 2 Signing Key ([`0x0A40E458`](https://keys.qubes-o gpg: Total number processed: 1 gpg: imported: 1 (RSA: 1) -You can also download all the currently used developers' signing keys and current and older release signing keys (and also a copy of the Qubes Master Signing Key) from the [keys directory on our server](https://keys.qubes-os.org/keys/) and from the [Qubes Security Pack](/en/doc/security-pack/). +You can also download all the currently used developers' signing keys and current and older release signing keys (and also a copy of the Qubes Master Signing Key) from the [keys directory on our server](https://keys.qubes-os.org/keys/) and from the [Qubes Security Pack](/doc/security-pack/). The developer signing keys are set to be valid for 1 year only, while the Qubes Master Signing Key ([`0x36879494`](https://keys.qubes-os.org/keys/qubes-master-signing-key.asc)) has no expiration date. This latter key was generated and is kept only within a dedicated, air-gapped "vault" machine, and the private portion will (hopefully) never leave this isolated machine. diff --git a/managing-os/fedora-template-upgrade-18.md b/managing-os/fedora-template-upgrade-18.md index 6855164e..d4f92a76 100644 --- a/managing-os/fedora-template-upgrade-18.md +++ b/managing-os/fedora-template-upgrade-18.md @@ -1,8 +1,9 @@ --- layout: doc title: Upgrading the Fedora 18 Temlpate -permalink: /en/doc/fedora-template-upgrade-18/ +permalink: /doc/fedora-template-upgrade-18/ redirect_from: +- /en/doc/fedora-template-upgrade-18/ - /doc/FedoraTemplateUpgrade18/ - /wiki/FedoraTemplateUpgrade/ --- @@ -10,7 +11,7 @@ redirect_from: Upgrading the Fedora 18 Temlpate ================================ -(**Note:** There is a [newer version of this page for upgrading from Fedora 20 to Fedora 21](/en/doc/fedora-template-upgrade-20/).) +(**Note:** There is a [newer version of this page for upgrading from Fedora 20 to Fedora 21](/doc/fedora-template-upgrade-20/).) This instruction in simplified version of [official Fedora instruction](https://fedoraproject.org/wiki/Upgrading_Fedora_using_yum). Note that only "yum" method will work in Qubes template VM (if you are curious why: mostly because template VM does not have own bootloader). diff --git a/managing-os/fedora-template-upgrade-20.md b/managing-os/fedora-template-upgrade-20.md index d7b79428..c85185db 100644 --- a/managing-os/fedora-template-upgrade-20.md +++ b/managing-os/fedora-template-upgrade-20.md @@ -1,8 +1,9 @@ --- layout: doc title: Upgrading the Fedora 20 Template -permalink: /en/doc/fedora-template-upgrade-20/ +permalink: /doc/fedora-template-upgrade-20/ redirect_from: +- /en/doc/fedora-template-upgrade-20/ - /doc/FedoraTemplateUpgrade20/ - /wiki/FedoraTemplateUpgrade20/ --- @@ -197,7 +198,7 @@ As mentioned above, you may encounter the following `yum` error: In this case, you have several options: - 1. [Increase the TemplateVM's disk image size](/en/doc/resize-disk-image/). + 1. [Increase the TemplateVM's disk image size](/doc/resize-disk-image/). This is the solution mentioned in the main instructions above. 2. Delete files in order to free up space. One way to do this is by uninstalling packages. You may then reinstalling them again after you diff --git a/managing-os/hvm-create.md b/managing-os/hvm-create.md index 920738de..9d0fdd66 100644 --- a/managing-os/hvm-create.md +++ b/managing-os/hvm-create.md @@ -1,8 +1,9 @@ --- layout: doc title: Creating and Using HVM Domains -permalink: /en/doc/hvm-create/ +permalink: /doc/hvm-create/ redirect_from: +- /en/doc/hvm-create/ - /doc/HvmCreate/ - /wiki/HvmCreate/ --- @@ -195,12 +196,12 @@ In the near future we plan on introducing shared template also for HVM domains, Installing Qubes support tools in Windows 7 VMs ----------------------------------------------- -Windows specific steps are described on [separate page](/en/doc/windows-appvms/). +Windows specific steps are described on [separate page](/doc/windows-appvms/). Assigning PCI devices to HVM domains ------------------------------------ -HVM domains (including Windows VMs) can be [assigned PCI devices](/en/doc/assigning-devices/) just like normal AppVMs. E.g. one can assign one of the USB controllers to the Windows VM and should be able to use various devices that require Windows software, such as phones, electronic devices that are configured via FTDI, etc. +HVM domains (including Windows VMs) can be [assigned PCI devices](/doc/assigning-devices/) just like normal AppVMs. E.g. one can assign one of the USB controllers to the Windows VM and should be able to use various devices that require Windows software, such as phones, electronic devices that are configured via FTDI, etc. Once problem, however, at the moment, is that after the whole system gets suspend into S3 sleep, and subsequently resumed, such attached devices stop working and should be restarted within the VM. Under Windows this can be achieved by opening the Device Manager, selecting the actual device, such as a USB controller, and then first 'Disabling', and then 'Enabling' the device again. This is illustrated on the screenshot below: @@ -211,5 +212,5 @@ Further reading Other documents related to HVM: -- [LinuxHVMTips](/en/doc/linux-hvm-tips/) +- [LinuxHVMTips](/doc/linux-hvm-tips/) diff --git a/managing-os/linux-hvm-tips.md b/managing-os/linux-hvm-tips.md index 78d16a38..718d687c 100644 --- a/managing-os/linux-hvm-tips.md +++ b/managing-os/linux-hvm-tips.md @@ -1,8 +1,9 @@ --- layout: doc title: Linux HVM Tips -permalink: /en/doc/linux-hvm-tips/ +permalink: /doc/linux-hvm-tips/ redirect_from: +- /en/doc/linux-hvm-tips/ - /doc/LinuxHVMTips/ - /wiki/LinuxHVMTips/ --- diff --git a/managing-os/templates.md b/managing-os/templates.md index c70d7188..aaf3e3b6 100644 --- a/managing-os/templates.md +++ b/managing-os/templates.md @@ -1,8 +1,9 @@ --- layout: doc title: Templates -permalink: /en/doc/templates/ +permalink: /doc/templates/ redirect_from: +- /en/doc/templates/ - /doc/Templates/ - /wiki/Templates/ --- @@ -16,15 +17,15 @@ TemplateBasedVMs is installed. The default template is based on Fedora, but there are additional templates based on other Linux distributions. There are also templates available with or without certain software preinstalled. The concept of TemplateVMs is initially described -[here](/en/doc/getting-started/#appvms-domains-and-templatevms). The technical +[here](/doc/getting-started/#appvms-domains-and-templatevms). The technical details of this implementation are described in the developer documentation -[here](/en/doc/template-implementation/). +[here](/doc/template-implementation/). Some templates are available in ready-to-use binary form, but some of them are available only as source code, which can be built using -[Qubes Builder](/en/doc/qubes-builder/). In particular, some template "flavors" +[Qubes Builder](/doc/qubes-builder/). In particular, some template "flavors" are available in source code form only. Take a look at the [Qubes Builder -documentation](/en/doc/qubes-builder/) for instructions on how to compile them. +documentation](/doc/qubes-builder/) for instructions on how to compile them. ITL Supported templates @@ -35,8 +36,8 @@ for. ITL guarantees that the binary updates are compiled from exactly the same source code as we publish. * Fedora (default base template) - * [Fedora - Minimal](/en/doc/templates/fedora-minimal) - * [Debian](/en/doc/templates/debian/) + * [Fedora - Minimal](/doc/templates/fedora-minimal) + * [Debian](/doc/templates/debian/) Community Supported templates @@ -52,9 +53,9 @@ By installing these templates, you are trusting not only ITL and the distribution maintainers, but also the template maintainer. In addition, these templates may be somewhat less stable, since ITL does not test them. - * [Whonix](/en/doc/templates/whonix/) - * [Ubuntu](/en/doc/templates/ubuntu/) - * [Archlinux](/en/doc/templates/archlinux/) + * [Whonix](/doc/templates/whonix/) + * [Ubuntu](/doc/templates/ubuntu/) + * [Archlinux](/doc/templates/archlinux/) Important Notes diff --git a/managing-os/templates/archlinux.md b/managing-os/templates/archlinux.md index e8593e36..d7e61f21 100644 --- a/managing-os/templates/archlinux.md +++ b/managing-os/templates/archlinux.md @@ -1,8 +1,9 @@ --- layout: doc title: Archlinux Template -permalink: /en/doc/templates/archlinux/ +permalink: /doc/templates/archlinux/ redirect_from: +- /en/doc/templates/archlinux/ - /doc/Templates/Archlinux/ - /wiki/Templates/Archlinux/ --- @@ -27,7 +28,7 @@ Install ------- Currently we do not ship ready to use binary package. It can be compiled using -[this instructions](/en/doc/building-archlinux-template/). +[this instructions](/doc/building-archlinux-template/). Olivier provides binary package build by himself, you can get it for: * Qubes R2 [here](https://groups.google.com/d/msgid/qubes-devel/54CE3FB1.3050708%40yahoo.fr). @@ -38,4 +39,4 @@ Olivier provides binary package build by himself, you can get it for: Known issues ------------ -If you want to help in improving the template, feel free to [contribute](/en/doc/contributing/). +If you want to help in improving the template, feel free to [contribute](/doc/contributing/). diff --git a/managing-os/templates/debian.md b/managing-os/templates/debian.md index 6d3d9945..a03ca757 100644 --- a/managing-os/templates/debian.md +++ b/managing-os/templates/debian.md @@ -1,8 +1,9 @@ --- layout: doc title: Debian Template -permalink: /en/doc/templates/debian/ +permalink: /doc/templates/debian/ redirect_from: +- /en/doc/templates/debian/ - /doc/Templates/Debian/ - /wiki/Templates/Debian/ --- diff --git a/managing-os/templates/fedora-minimal.md b/managing-os/templates/fedora-minimal.md index 20e76a41..39396fda 100644 --- a/managing-os/templates/fedora-minimal.md +++ b/managing-os/templates/fedora-minimal.md @@ -1,8 +1,9 @@ --- layout: doc title: Fedora Minimal Template -permalink: /en/doc/templates/fedora-minimal/ +permalink: /doc/templates/fedora-minimal/ redirect_from: +- /en/doc/templates/fedora-minimal/ - /doc/Templates/FedoraMinimal/ - /wiki/Templates/FedoraMinimal/ --- diff --git a/managing-os/templates/ubuntu.md b/managing-os/templates/ubuntu.md index 6bc9ba4e..a64d0878 100644 --- a/managing-os/templates/ubuntu.md +++ b/managing-os/templates/ubuntu.md @@ -1,8 +1,9 @@ --- layout: doc title: Ubuntu Template -permalink: /en/doc/templates/ubuntu/ +permalink: /doc/templates/ubuntu/ redirect_from: +- /en/doc/templates/ubuntu/ - /doc/Templates/Ubuntu/ - /wiki/Templates/Ubuntu/ --- @@ -20,7 +21,7 @@ to redistribute a modified Ubuntu. The redistribution is not allowed by their Install ------- -It can built using [Qubes Builder](/en/doc/qubes-builder/). You can also access its +It can built using [Qubes Builder](/doc/qubes-builder/). You can also access its documentation in the [source code repository](https://github.com/QubesOS/qubes-builder/blob/master/README.md). diff --git a/managing-os/templates/whonix.md b/managing-os/templates/whonix.md index b9898418..3ac99ad6 100644 --- a/managing-os/templates/whonix.md +++ b/managing-os/templates/whonix.md @@ -1,8 +1,9 @@ --- layout: doc title: Whonix template -permalink: /en/doc/templates/whonix/ +permalink: /doc/templates/whonix/ redirect_from: +- /en/doc/templates/whonix/ - /doc/Templates/Whonix/ - /wiki/Templates/Whonix/ --- diff --git a/managing-os/uninstalling-windows-tools-2.md b/managing-os/uninstalling-windows-tools-2.md index 938fa350..2236963d 100644 --- a/managing-os/uninstalling-windows-tools-2.md +++ b/managing-os/uninstalling-windows-tools-2.md @@ -1,8 +1,9 @@ --- layout: doc title: Uninstalling Windows Tools 2 -permalink: /en/doc/uninstalling-windows-tools-2/ +permalink: /doc/uninstalling-windows-tools-2/ redirect_from: +- /en/doc/uninstalling-windows-tools-2/ - /doc/UninstallingWindowsTools2/ - /wiki/UninstallingWindowsTools2/ --- diff --git a/managing-os/windows-appvms.md b/managing-os/windows-appvms.md index 993c81d8..a7a7fb71 100644 --- a/managing-os/windows-appvms.md +++ b/managing-os/windows-appvms.md @@ -1,8 +1,9 @@ --- layout: doc title: Windows AppVms -permalink: /en/doc/windows-appvms/ +permalink: /doc/windows-appvms/ redirect_from: +- /en/doc/windows-appvms/ - /doc/WindowsAppVms/ - /wiki/WindowsAppVms/ --- @@ -15,8 +16,8 @@ Qubes provides special support for running Windows-based AppVMs. This requires t Qubes support tools for Windows is a set of programs and drivers that provide integration of Windows AppVMs with the rest of the Qubes system. Currently the following features are available for Windows VMs after installation of those tools: - Seamless GUI mode that integrates apps windows onto the common Qubes trusted desktop (available on Qubes R2 Beta 3 and later) -- Support for [secure clipboard copy/paste](/en/doc/copy-paste/) between the Windows VM and other AppVMs -- Support for [secure file exchange](/en/doc/copying-files/) between the Windows VM and other AppVMs +- Support for [secure clipboard copy/paste](/doc/copy-paste/) between the Windows VM and other AppVMs +- Support for [secure file exchange](/doc/copying-files/) between the Windows VM and other AppVMs - Support for qvm-run and generic qrexec for the Windows VM (e.g. ability to run custom service within/from the Windows VM) - Xen PV drivers for Windows that increase performance compared to qemu emulated devices @@ -27,7 +28,7 @@ NOTE: Currently only 64-bit versions of Windows 7 are support by Qubes Windows T Installing Windows OS in a Qubes VM ----------------------------------- -Please refer to [this page](/en/doc/hvm-create/) for instructions on how to install Windows in a Qubes VM. +Please refer to [this page](/doc/hvm-create/) for instructions on how to install Windows in a Qubes VM. Installing Qubes support tools in Windows 7 VMs ----------------------------------------------- @@ -103,7 +104,7 @@ Qubes allows HVM VMs to share a common root filesystem from a select Template VM qvm-create --hvm-template win7-x64-template -l green ~~~ -... and install Windows OS (or other OS) into this template the same way as you would install it into a normal HVM -- please see [this page](/en/doc/hvm-create/) instructions. However, it would make lots of sense to store the `C:\Users` directory on the 2nd disk which is automatically exposed by Qubes to all HVMs. This 2nd disk is backed by the `private.img` file in the AppVMs' and is not reset upon AppVMs reboot, so the user's directories and profiles would survive the AppVMs reboot, unlike the "root" filesystem which will be reverted to the "golden image" from the Template VM automatically. To facilitate such separation of user profiles, Qubes Windows Tools provide an option to automatically move `C:\Users` directory to the 2nd disk backed by `private.img`. It's a selectable feature of the installer, enabled by default. If that feature is selected during installation, completion of the process requires two reboots: +... and install Windows OS (or other OS) into this template the same way as you would install it into a normal HVM -- please see [this page](/doc/hvm-create/) instructions. However, it would make lots of sense to store the `C:\Users` directory on the 2nd disk which is automatically exposed by Qubes to all HVMs. This 2nd disk is backed by the `private.img` file in the AppVMs' and is not reset upon AppVMs reboot, so the user's directories and profiles would survive the AppVMs reboot, unlike the "root" filesystem which will be reverted to the "golden image" from the Template VM automatically. To facilitate such separation of user profiles, Qubes Windows Tools provide an option to automatically move `C:\Users` directory to the 2nd disk backed by `private.img`. It's a selectable feature of the installer, enabled by default. If that feature is selected during installation, completion of the process requires two reboots: - The private disk is initialized and formatted on the first reboot after tools installation. It can't be done **during** the installation because Xen mass storage drivers are not yet active. - User profiles are moved to the private disk on the next reboot after the private disk is initialized. Reboot is required because the "mover utility" runs very early in the boot process so OS can't yet lock any files in there. This can take some time depending on the profiles' size and because the GUI agent is not yet active dom0/Qubes Manager may complain that the AppVM failed to boot. That's a false alarm (you can increase AppVM's default boot timeout using `qvm-prefs`), the VM should appear "green" in Qubes Manager shortly after. diff --git a/managing-os/windows-tools-2.md b/managing-os/windows-tools-2.md index e81151de..dbd02805 100644 --- a/managing-os/windows-tools-2.md +++ b/managing-os/windows-tools-2.md @@ -1,8 +1,9 @@ --- layout: doc title: Windows Tools 2 -permalink: /en/doc/windows-tools-2/ +permalink: /doc/windows-tools-2/ redirect_from: +- /en/doc/windows-tools-2/ - /doc/WindowsTools2/ - /wiki/WindowsTools2/ --- @@ -36,7 +37,7 @@ If the install process fails you can retry it using the command line below to ge Uninstalling ------------ -See [this page](/en/doc/uninstalling-windows-tools-2/). +See [this page](/doc/uninstalling-windows-tools-2/). Configuration ------------- diff --git a/managing-os/windows-tools-3.md b/managing-os/windows-tools-3.md index 82f342f3..25d6ee62 100644 --- a/managing-os/windows-tools-3.md +++ b/managing-os/windows-tools-3.md @@ -1,13 +1,12 @@ --- layout: doc title: Windows Tools 3 -permalink: /en/doc/windows-tools-3/ +permalink: /doc/windows-tools-3/ redirect_from: +- /en/doc/windows-tools-3/ - /doc/WindowsTools3/ -- /wiki/WindowsTools/ -redirect_from: -- - /doc/WindowsTools/ +- /wiki/WindowsTools/ --- Qubes Tools for Windows: advanced settings and troubleshooting diff --git a/reference/dom0-tools.md b/reference/dom0-tools.md index 6a79ee31..458ec2ab 100644 --- a/reference/dom0-tools.md +++ b/reference/dom0-tools.md @@ -1,36 +1,37 @@ --- layout: doc title: Dom0 Tools -permalink: /en/doc/dom0-tools/ +permalink: /doc/dom0-tools/ redirect_from: +- /en/doc/dom0-tools/ - /doc/DomZeroTools/ - /wiki/DomZeroTools/ --- QVM-tools: -- [qubes-dom0-update](/en/doc/dom0-tools/qubes-dom0-update/) -- [qubes-prefs](/en/doc/dom0-tools/qubes-prefs/) -- [qvm-add-appvm](/en/doc/dom0-tools/qvm-add-appvm/) -- [qvm-add-template](/en/doc/dom0-tools/qvm-add-template/) -- [qvm-backup-restore](/en/doc/dom0-tools/qvm-backup-restore/) -- [qvm-backup](/en/doc/dom0-tools/qvm-backup/) -- [qvm-block](/en/doc/dom0-tools/qvm-block/) -- [qvm-clone](/en/doc/dom0-tools/qvm-clone/) -- [qvm-create-default-dvm](/en/doc/dom0-tools/qvm-create-default-dvm/) -- [qvm-create](/en/doc/dom0-tools/qvm-create/) -- [qvm-firewall](/en/doc/dom0-tools/qvm-firewall/) -- [qvm-grow-private](/en/doc/dom0-tools/qvm-grow-private/) -- [qvm-ls](/en/doc/dom0-tools/qvm-ls/) -- [qvm-kill](/en/doc/dom0-tools/qvm-kill/) -- [qvm-pci](/en/doc/dom0-tools/qvm-pci/) -- [qvm-prefs](/en/doc/dom0-tools/qvm-prefs/) -- [qvm-remove](/en/doc/dom0-tools/qvm-remove/) -- [qvm-revert-template-changes](/en/doc/dom0-tools/qvm-revert-template-changes/) -- [qvm-run](/en/doc/dom0-tools/qvm-run/) -- [qvm-service](/en/doc/dom0-tools/qvm-service/) -- [qvm-shutdown](/en/doc/dom0-tools/qvm-shutdown/) -- [qvm-start](/en/doc/dom0-tools/qvm-start/) -- [qvm-sync-appmenus](/en/doc/dom0-tools/qvm-sync-appmenus/) -- [qvm-template-commit](/en/doc/dom0-tools/qvm-template-commit/) +- [qubes-dom0-update](/doc/dom0-tools/qubes-dom0-update/) +- [qubes-prefs](/doc/dom0-tools/qubes-prefs/) +- [qvm-add-appvm](/doc/dom0-tools/qvm-add-appvm/) +- [qvm-add-template](/doc/dom0-tools/qvm-add-template/) +- [qvm-backup-restore](/doc/dom0-tools/qvm-backup-restore/) +- [qvm-backup](/doc/dom0-tools/qvm-backup/) +- [qvm-block](/doc/dom0-tools/qvm-block/) +- [qvm-clone](/doc/dom0-tools/qvm-clone/) +- [qvm-create-default-dvm](/doc/dom0-tools/qvm-create-default-dvm/) +- [qvm-create](/doc/dom0-tools/qvm-create/) +- [qvm-firewall](/doc/dom0-tools/qvm-firewall/) +- [qvm-grow-private](/doc/dom0-tools/qvm-grow-private/) +- [qvm-ls](/doc/dom0-tools/qvm-ls/) +- [qvm-kill](/doc/dom0-tools/qvm-kill/) +- [qvm-pci](/doc/dom0-tools/qvm-pci/) +- [qvm-prefs](/doc/dom0-tools/qvm-prefs/) +- [qvm-remove](/doc/dom0-tools/qvm-remove/) +- [qvm-revert-template-changes](/doc/dom0-tools/qvm-revert-template-changes/) +- [qvm-run](/doc/dom0-tools/qvm-run/) +- [qvm-service](/doc/dom0-tools/qvm-service/) +- [qvm-shutdown](/doc/dom0-tools/qvm-shutdown/) +- [qvm-start](/doc/dom0-tools/qvm-start/) +- [qvm-sync-appmenus](/doc/dom0-tools/qvm-sync-appmenus/) +- [qvm-template-commit](/doc/dom0-tools/qvm-template-commit/) diff --git a/reference/dom0-tools/qubes-dom0-update.md b/reference/dom0-tools/qubes-dom0-update.md index e016c749..03e3673e 100644 --- a/reference/dom0-tools/qubes-dom0-update.md +++ b/reference/dom0-tools/qubes-dom0-update.md @@ -1,8 +1,9 @@ --- layout: doc title: qubes-dom0-update -permalink: /en/doc/dom0-tools/qubes-dom0-update/ +permalink: /doc/dom0-tools/qubes-dom0-update/ redirect_from: +- /en/doc/dom0-tools/qubes-dom0-update/ - /doc/Dom0Tools/QubesDom0Update/ - /wiki/Dom0Tools/QubesDom0Update/ --- diff --git a/reference/dom0-tools/qubes-prefs.md b/reference/dom0-tools/qubes-prefs.md index 717642d1..fe19f160 100644 --- a/reference/dom0-tools/qubes-prefs.md +++ b/reference/dom0-tools/qubes-prefs.md @@ -1,8 +1,9 @@ --- layout: doc title: qubes-prefs -permalink: /en/doc/dom0-tools/qubes-prefs/ +permalink: /doc/dom0-tools/qubes-prefs/ redirect_from: +- /en/doc/dom0-tools/qubes-prefs/ - /doc/Dom0Tools/QubesPrefs/ - /wiki/Dom0Tools/QubesPrefs/ --- diff --git a/reference/dom0-tools/qvm-add-appvm.md b/reference/dom0-tools/qvm-add-appvm.md index 97713eef..bf497cf2 100644 --- a/reference/dom0-tools/qvm-add-appvm.md +++ b/reference/dom0-tools/qvm-add-appvm.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-add-appvm -permalink: /en/doc/dom0-tools/qvm-add-appvm/ +permalink: /doc/dom0-tools/qvm-add-appvm/ redirect_from: +- /en/doc/dom0-tools/qvm-add-appvm/ - /doc/Dom0Tools/QvmAddAppvm/ - /wiki/Dom0Tools/QvmAddAppvm/ --- diff --git a/reference/dom0-tools/qvm-add-template.md b/reference/dom0-tools/qvm-add-template.md index 745a13a9..2bef4299 100644 --- a/reference/dom0-tools/qvm-add-template.md +++ b/reference/dom0-tools/qvm-add-template.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-add-template -permalink: /en/doc/dom0-tools/qvm-add-template/ +permalink: /doc/dom0-tools/qvm-add-template/ redirect_from: +- /en/doc/dom0-tools/qvm-add-template/ - /doc/Dom0Tools/QvmAddTemplate/ - /wiki/Dom0Tools/QvmAddTemplate/ --- diff --git a/reference/dom0-tools/qvm-backup-restore.md b/reference/dom0-tools/qvm-backup-restore.md index 241f8284..b8c30f26 100644 --- a/reference/dom0-tools/qvm-backup-restore.md +++ b/reference/dom0-tools/qvm-backup-restore.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-backup-restore -permalink: /en/doc/dom0-tools/qvm-backup-restore/ +permalink: /doc/dom0-tools/qvm-backup-restore/ redirect_from: +- /en/doc/dom0-tools/qvm-backup-restore/ - /doc/Dom0Tools/QvmBackupRestore/ - /wiki/Dom0Tools/QvmBackupRestore/ --- diff --git a/reference/dom0-tools/qvm-backup.md b/reference/dom0-tools/qvm-backup.md index 6eb19034..a260317b 100644 --- a/reference/dom0-tools/qvm-backup.md +++ b/reference/dom0-tools/qvm-backup.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-backup -permalink: /en/doc/dom0-tools/qvm-backup/ +permalink: /doc/dom0-tools/qvm-backup/ redirect_from: +- /en/doc/dom0-tools/qvm-backup/ - /doc/Dom0Tools/QvmBackup/ - /wiki/Dom0Tools/QvmBackup/ --- diff --git a/reference/dom0-tools/qvm-block.md b/reference/dom0-tools/qvm-block.md index 02a795ed..efa3c1b1 100644 --- a/reference/dom0-tools/qvm-block.md +++ b/reference/dom0-tools/qvm-block.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-block -permalink: /en/doc/dom0-tools/qvm-block/ +permalink: /doc/dom0-tools/qvm-block/ redirect_from: +- /en/doc/dom0-tools/qvm-block/ - /doc/Dom0Tools/QvmBlock/ - /wiki/Dom0Tools/QvmBlock/ --- diff --git a/reference/dom0-tools/qvm-clone.md b/reference/dom0-tools/qvm-clone.md index ee6bb2b6..c3abd934 100644 --- a/reference/dom0-tools/qvm-clone.md +++ b/reference/dom0-tools/qvm-clone.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-clone -permalink: /en/doc/dom0-tools/qvm-clone/ +permalink: /doc/dom0-tools/qvm-clone/ redirect_from: +- /en/doc/dom0-tools/qvm-clone/ - /doc/Dom0Tools/QvmClone/ - /wiki/Dom0Tools/QvmClone/ --- diff --git a/reference/dom0-tools/qvm-create-default-dvm.md b/reference/dom0-tools/qvm-create-default-dvm.md index da642782..fe907fda 100644 --- a/reference/dom0-tools/qvm-create-default-dvm.md +++ b/reference/dom0-tools/qvm-create-default-dvm.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-create-default-dvm -permalink: /en/doc/dom0-tools/qvm-create-default-dvm/ +permalink: /doc/dom0-tools/qvm-create-default-dvm/ redirect_from: +- /en/doc/dom0-tools/qvm-create-default-dvm/ - /doc/Dom0Tools/QvmCreateDefaultDvm/ - /wiki/Dom0Tools/QvmCreateDefaultDvm/ --- diff --git a/reference/dom0-tools/qvm-create.md b/reference/dom0-tools/qvm-create.md index 1adb208f..037fcdba 100644 --- a/reference/dom0-tools/qvm-create.md +++ b/reference/dom0-tools/qvm-create.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-create -permalink: /en/doc/dom0-tools/qvm-create/ +permalink: /doc/dom0-tools/qvm-create/ redirect_from: +- /en/doc/dom0-tools/qvm-create/ - /doc/Dom0Tools/QvmCreate/ - /wiki/Dom0Tools/QvmCreate/ --- diff --git a/reference/dom0-tools/qvm-firewall.md b/reference/dom0-tools/qvm-firewall.md index e821a439..ff1b5cab 100644 --- a/reference/dom0-tools/qvm-firewall.md +++ b/reference/dom0-tools/qvm-firewall.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-firewall -permalink: /en/doc/dom0-tools/qvm-firewall/ +permalink: /doc/dom0-tools/qvm-firewall/ redirect_from: +- /en/doc/dom0-tools/qvm-firewall/ - /doc/Dom0Tools/QvmFirewall/ - /wiki/Dom0Tools/QvmFirewall/ --- diff --git a/reference/dom0-tools/qvm-grow-private.md b/reference/dom0-tools/qvm-grow-private.md index 2ac3a6af..360a3a5e 100644 --- a/reference/dom0-tools/qvm-grow-private.md +++ b/reference/dom0-tools/qvm-grow-private.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-grow-private -permalink: /en/doc/dom0-tools/qvm-grow-private/ +permalink: /doc/dom0-tools/qvm-grow-private/ redirect_from: +- /en/doc/dom0-tools/qvm-grow-private/ - /doc/Dom0Tools/QvmGrowPrivate/ - /wiki/Dom0Tools/QvmGrowPrivate/ --- diff --git a/reference/dom0-tools/qvm-kill.md b/reference/dom0-tools/qvm-kill.md index 6753472b..cff5f038 100644 --- a/reference/dom0-tools/qvm-kill.md +++ b/reference/dom0-tools/qvm-kill.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-kill -permalink: /en/doc/dom0-tools/qvm-kill/ +permalink: /doc/dom0-tools/qvm-kill/ redirect_from: +- /en/doc/dom0-tools/qvm-kill/ - /doc/Dom0Tools/QvmKill/ - /wiki/Dom0Tools/QvmKill/ --- diff --git a/reference/dom0-tools/qvm-ls.md b/reference/dom0-tools/qvm-ls.md index e2ad8411..643a19ef 100644 --- a/reference/dom0-tools/qvm-ls.md +++ b/reference/dom0-tools/qvm-ls.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-ls -permalink: /en/doc/dom0-tools/qvm-ls/ +permalink: /doc/dom0-tools/qvm-ls/ redirect_from: +- /en/doc/dom0-tools/qvm-ls/ - /doc/Dom0Tools/QvmLs/ - /wiki/Dom0Tools/QvmLs/ --- diff --git a/reference/dom0-tools/qvm-pci.md b/reference/dom0-tools/qvm-pci.md index 24f7866e..0712d01a 100644 --- a/reference/dom0-tools/qvm-pci.md +++ b/reference/dom0-tools/qvm-pci.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-pci -permalink: /en/doc/dom0-tools/qvm-pci/ +permalink: /doc/dom0-tools/qvm-pci/ redirect_from: +- /en/doc/dom0-tools/qvm-pci/ - /doc/Dom0Tools/QvmPci/ - /wiki/Dom0Tools/QvmPci/ --- diff --git a/reference/dom0-tools/qvm-prefs.md b/reference/dom0-tools/qvm-prefs.md index 9b2ad908..1544eee7 100644 --- a/reference/dom0-tools/qvm-prefs.md +++ b/reference/dom0-tools/qvm-prefs.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-prefs -permalink: /en/doc/dom0-tools/qvm-prefs/ +permalink: /doc/dom0-tools/qvm-prefs/ redirect_from: +- /en/doc/dom0-tools/qvm-prefs/ - /doc/Dom0Tools/QvmPrefs/ - /wiki/Dom0Tools/QvmPrefs/ --- diff --git a/reference/dom0-tools/qvm-remove.md b/reference/dom0-tools/qvm-remove.md index 094dc52d..4e436dea 100644 --- a/reference/dom0-tools/qvm-remove.md +++ b/reference/dom0-tools/qvm-remove.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-remove -permalink: /en/doc/dom0-tools/qvm-remove/ +permalink: /doc/dom0-tools/qvm-remove/ redirect_from: +- /en/doc/dom0-tools/qvm-remove/ - /doc/Dom0Tools/QvmRemove/ - /wiki/Dom0Tools/QvmRemove/ --- diff --git a/reference/dom0-tools/qvm-revert-template-changes.md b/reference/dom0-tools/qvm-revert-template-changes.md index e538a0bc..116575b2 100644 --- a/reference/dom0-tools/qvm-revert-template-changes.md +++ b/reference/dom0-tools/qvm-revert-template-changes.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-revert-template-changes -permalink: /en/doc/dom0-tools/qvm-revert-template-changes/ +permalink: /doc/dom0-tools/qvm-revert-template-changes/ redirect_from: +- /en/doc/dom0-tools/qvm-revert-template-changes/ - /doc/Dom0Tools/QvmRevertTemplateChanges/ - /wiki/Dom0Tools/QvmRevertTemplateChanges/ --- diff --git a/reference/dom0-tools/qvm-run.md b/reference/dom0-tools/qvm-run.md index efc1170e..eb7e8b8c 100644 --- a/reference/dom0-tools/qvm-run.md +++ b/reference/dom0-tools/qvm-run.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-run -permalink: /en/doc/dom0-tools/qvm-run/ +permalink: /doc/dom0-tools/qvm-run/ redirect_from: +- /en/doc/dom0-tools/qvm-run/ - /doc/Dom0Tools/QvmRun/ - /wiki/Dom0Tools/QvmRun/ --- diff --git a/reference/dom0-tools/qvm-service.md b/reference/dom0-tools/qvm-service.md index 1dbb4960..505979aa 100644 --- a/reference/dom0-tools/qvm-service.md +++ b/reference/dom0-tools/qvm-service.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-service -permalink: /en/doc/dom0-tools/qvm-service/ +permalink: /doc/dom0-tools/qvm-service/ redirect_from: +- /en/doc/dom0-tools/qvm-service/ - /doc/Dom0Tools/QvmService/ - /wiki/Dom0Tools/QvmService/ --- diff --git a/reference/dom0-tools/qvm-shutdown.md b/reference/dom0-tools/qvm-shutdown.md index 81d5a14f..1cd80810 100644 --- a/reference/dom0-tools/qvm-shutdown.md +++ b/reference/dom0-tools/qvm-shutdown.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-shutdown -permalink: /en/doc/dom0-tools/qvm-shutdown/ +permalink: /doc/dom0-tools/qvm-shutdown/ redirect_from: +- /en/doc/dom0-tools/qvm-shutdown/ - /doc/Dom0Tools/QvmShutdown/ - /wiki/Dom0Tools/QvmShutdown/ --- diff --git a/reference/dom0-tools/qvm-start.md b/reference/dom0-tools/qvm-start.md index 1ceb5407..c66afa89 100644 --- a/reference/dom0-tools/qvm-start.md +++ b/reference/dom0-tools/qvm-start.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-start -permalink: /en/doc/dom0-tools/qvm-start/ +permalink: /doc/dom0-tools/qvm-start/ redirect_from: +- /en/doc/dom0-tools/qvm-start/ - /doc/Dom0Tools/QvmStart/ - /wiki/Dom0Tools/QvmStart/ --- diff --git a/reference/dom0-tools/qvm-sync-appmenus.md b/reference/dom0-tools/qvm-sync-appmenus.md index 01396954..f1cee881 100644 --- a/reference/dom0-tools/qvm-sync-appmenus.md +++ b/reference/dom0-tools/qvm-sync-appmenus.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-sync-appmenus -permalink: /en/doc/dom0-tools/qvm-sync-appmenus/ +permalink: /doc/dom0-tools/qvm-sync-appmenus/ redirect_from: +- /en/doc/dom0-tools/qvm-sync-appmenus/ - /doc/Dom0Tools/QvmSyncAppmenus/ - /wiki/Dom0Tools/QvmSyncAppmenus/ --- diff --git a/reference/dom0-tools/qvm-template-commit.md b/reference/dom0-tools/qvm-template-commit.md index b9e1262b..c0cdd8e5 100644 --- a/reference/dom0-tools/qvm-template-commit.md +++ b/reference/dom0-tools/qvm-template-commit.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-template-commit -permalink: /en/doc/dom0-tools/qvm-template-commit/ +permalink: /doc/dom0-tools/qvm-template-commit/ redirect_from: +- /en/doc/dom0-tools/qvm-template-commit/ - /doc/Dom0Tools/QvmTemplateCommit/ - /wiki/Dom0Tools/QvmTemplateCommit/ --- diff --git a/reference/glossary.md b/reference/glossary.md index 7f5f905e..9292d938 100644 --- a/reference/glossary.md +++ b/reference/glossary.md @@ -1,8 +1,9 @@ --- layout: doc title: Glossary -permalink: /en/doc/glossary/ +permalink: /doc/glossary/ redirect_from: +- /en/doc/glossary/ - /doc/Glossary/ - /wiki/Glossary/ --- diff --git a/reference/qubes-service.md b/reference/qubes-service.md index a9a240e2..b863d1cc 100644 --- a/reference/qubes-service.md +++ b/reference/qubes-service.md @@ -1,13 +1,14 @@ --- layout: doc title: Qubes Service -permalink: /en/doc/qubes-service/ +permalink: /doc/qubes-service/ redirect_from: +- /en/doc/qubes-service/ - /doc/QubesService/ - /wiki/QubesService/ --- -Usage documentation is on [qvm-service manual page](/en/doc/dom0-tools/qvm-service/). There are also described predefined services. +Usage documentation is on [qvm-service manual page](/doc/dom0-tools/qvm-service/). There are also described predefined services. Under the hood enabled service in VM is signaled by file in /var/run/qubes-service. This can be used to implement almost enable/disable **per-VM** switch controlled by dom0. Adding support for systemd services is pretty simple: diff --git a/reference/vm-tools.md b/reference/vm-tools.md index 5229df6c..bca5a278 100644 --- a/reference/vm-tools.md +++ b/reference/vm-tools.md @@ -1,16 +1,17 @@ --- layout: doc title: VM Tools -permalink: /en/doc/vm-tools/ +permalink: /doc/vm-tools/ redirect_from: +- /en/doc/vm-tools/ - /doc/VmTools/ - /wiki/VmTools/ --- VM tools: -- [qvm-copy-to-vm](/en/doc/vm-tools/qvm-copy-to-vm/) -- [qvm-open-in-dvm](/en/doc/vm-tools/qvm-open-in-dvm/) -- [qvm-open-in-vm](/en/doc/vm-tools/qvm-open-in-vm/) -- [qvm-run](/en/doc/vm-tools/qvm-run/) +- [qvm-copy-to-vm](/doc/vm-tools/qvm-copy-to-vm/) +- [qvm-open-in-dvm](/doc/vm-tools/qvm-open-in-dvm/) +- [qvm-open-in-vm](/doc/vm-tools/qvm-open-in-vm/) +- [qvm-run](/doc/vm-tools/qvm-run/) diff --git a/reference/vm-tools/qvm-copy-to-vm.md b/reference/vm-tools/qvm-copy-to-vm.md index 9fd9c541..e9ad5c17 100644 --- a/reference/vm-tools/qvm-copy-to-vm.md +++ b/reference/vm-tools/qvm-copy-to-vm.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-copy-to-vm -permalink: /en/doc/vm-tools/qvm-copy-to-vm/ +permalink: /doc/vm-tools/qvm-copy-to-vm/ redirect_from: +- /en/doc/vm-tools/qvm-copy-to-vm/ - /doc/VmTools/QvmCopyToVm/ - /wiki/VmTools/QvmCopyToVm/ --- diff --git a/reference/vm-tools/qvm-open-in-dvm.md b/reference/vm-tools/qvm-open-in-dvm.md index 523a43c5..17e77d82 100644 --- a/reference/vm-tools/qvm-open-in-dvm.md +++ b/reference/vm-tools/qvm-open-in-dvm.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-open-in-dvm -permalink: /en/doc/vm-tools/qvm-open-in-dvm/ +permalink: /doc/vm-tools/qvm-open-in-dvm/ redirect_from: +- /en/doc/vm-tools/qvm-open-in-dvm/ - /doc/VmTools/QvmOpenInDvm/ - /wiki/VmTools/QvmOpenInDvm/ --- diff --git a/reference/vm-tools/qvm-open-in-vm.md b/reference/vm-tools/qvm-open-in-vm.md index f020f5f2..c8259c9b 100644 --- a/reference/vm-tools/qvm-open-in-vm.md +++ b/reference/vm-tools/qvm-open-in-vm.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-open-in-vm -permalink: /en/doc/vm-tools/qvm-open-in-vm/ +permalink: /doc/vm-tools/qvm-open-in-vm/ redirect_from: +- /en/doc/vm-tools/qvm-open-in-vm/ - /doc/VmTools/QvmOpenInVm/ - /wiki/VmTools/QvmOpenInVm/ --- diff --git a/reference/vm-tools/qvm-run.md b/reference/vm-tools/qvm-run.md index b1c8c69c..a850ed60 100644 --- a/reference/vm-tools/qvm-run.md +++ b/reference/vm-tools/qvm-run.md @@ -1,8 +1,9 @@ --- layout: doc title: qvm-run -permalink: /en/doc/vm-tools/qvm-run/ +permalink: /doc/vm-tools/qvm-run/ redirect_from: +- /en/doc/vm-tools/qvm-run/ - /doc/VmTools/QvmRun/ - /wiki/VmTools/QvmRun/ --- diff --git a/releases/1.0/release-notes.md b/releases/1.0/release-notes.md index 2fa5e08c..993516ab 100644 --- a/releases/1.0/release-notes.md +++ b/releases/1.0/release-notes.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes R1.0 Release Notes -permalink: /en/doc/releases/1.0/release-notes/ -redirect_from: /doc/releases/1.0/release-notes/ +permalink: /doc/releases/1.0/release-notes/ +redirect_from: +- /en/doc/releases/1.0/release-notes/ --- Qubes R1.0 Release Notes @@ -36,7 +37,7 @@ See [Qubes Downloads](/doc/QubesDownloads/). Installation instructions ------------------------- -See [Installation Guide](/en/doc/installation-guide/). +See [Installation Guide](/doc/installation-guide/). Upgrading --------- @@ -47,7 +48,7 @@ If you're already running Qubes 1.0-rc1, you don't need to reinstall, it's just ### From Qubes 1.0 Beta 3 -If you have Qubes Beta 3 currently installed on your system, you must reinstall from scratch, as we offer no direct upgrade option in the installer (sorry). However, we do offer tools for smooth migration of your AppVMs. In order to do that, please backup your AppVMs using the `qvm-backup` tool [as usual](/en/doc/backup-restore/). Then, after you install Qubes 1.0 rc1, you can restore them using `qvm-backup-restore` tool. However, because we have changed the default template in RC1, you should tell qvm-back-restore about that by passing `--replace-template` option: +If you have Qubes Beta 3 currently installed on your system, you must reinstall from scratch, as we offer no direct upgrade option in the installer (sorry). However, we do offer tools for smooth migration of your AppVMs. In order to do that, please backup your AppVMs using the `qvm-backup` tool [as usual](/doc/backup-restore/). Then, after you install Qubes 1.0 rc1, you can restore them using `qvm-backup-restore` tool. However, because we have changed the default template in RC1, you should tell qvm-back-restore about that by passing `--replace-template` option: ~~~ qvm-backup-restore --replace-template=fedora-15-x64:fedora-17-x64 diff --git a/releases/2.0/release-notes.md b/releases/2.0/release-notes.md index 5957037c..c1d01f41 100644 --- a/releases/2.0/release-notes.md +++ b/releases/2.0/release-notes.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes R2.0 Release Notes -permalink: /en/doc/releases/2.0/release-notes/ -redirect_from: /doc/releases/2.0/release-notes/ +permalink: /doc/releases/2.0/release-notes/ +redirect_from: +- /en/doc/releases/2.0/release-notes/ --- Qubes R2.0 Release Notes @@ -52,20 +53,20 @@ See [Qubes Downloads](/doc/QubesDownloads/). Installation instructions ------------------------- -See [Installation Guide](/en/doc/installation-guide/). +See [Installation Guide](/doc/installation-guide/). Upgrading --------- ### From Qubes R2 rc1 -Upgrading from Qubes R2 rc1 should be a simple matter of installing updates for [dom0](/en/doc/software-update-dom0/) and [VMs](/en/doc/software-update-vm/). +Upgrading from Qubes R2 rc1 should be a simple matter of installing updates for [dom0](/doc/software-update-dom0/) and [VMs](/doc/software-update-vm/). ### From Qubes R2 beta 3 and older -The easiest and safest way to upgrade to Qubes R2 (especially from older releases) is to install it from scratch and use [qubes backup and restore tools](/en/doc/backup-restore/) for migrating of all of the user VMs. +The easiest and safest way to upgrade to Qubes R2 (especially from older releases) is to install it from scratch and use [qubes backup and restore tools](/doc/backup-restore/) for migrating of all of the user VMs. -Users of R2 beta 3 can upgrade using procedure that has been described [here](/en/doc/upgrade-to-r2/). +Users of R2 beta 3 can upgrade using procedure that has been described [here](/doc/upgrade-to-r2/). Note: if the user has custom Template VMs (i.e. other than the default template, e.g. created from it by cloning), or Standalone VMs, then the user should perform manual upgrade from R2B3 to R2rc1, as described under the link given above. @@ -73,18 +74,18 @@ Note: if the user has custom Template VMs (i.e. other than the default template, #### From Qubes R1 to R2 beta1 -If you're already running Qubes Release 1, you don't need to reinstall, it's just enough to update the packages in your Dom0 and the template VM(s). This procedure is described [here?](/en/doc/upgrade-to-r2/). +If you're already running Qubes Release 1, you don't need to reinstall, it's just enough to update the packages in your Dom0 and the template VM(s). This procedure is described [here?](/doc/upgrade-to-r2/). #### From Qubes R1 or R2 Beta 1 to R2 beta2 -Because of the distribution change in R2B2 (from fc13 to fc18) it's preferred that users reinstall Qubes R2B2 from scratch, and use [qubes backup and restore tools](/en/doc/backup-restore/) for migrating of all of the user VMs. +Because of the distribution change in R2B2 (from fc13 to fc18) it's preferred that users reinstall Qubes R2B2 from scratch, and use [qubes backup and restore tools](/doc/backup-restore/) for migrating of all of the user VMs. -Advanced users (and advanced users only) can also try a manual upgrade procedure that has been described [here](/en/doc/upgrade-to-r2b2/). It's advisable to backup your VMs before proceeding anyway! +Advanced users (and advanced users only) can also try a manual upgrade procedure that has been described [here](/doc/upgrade-to-r2b2/). It's advisable to backup your VMs before proceeding anyway! #### Upgrading from Qubes R1 or R2 Beta 2 to R2 beta 3 -The easiest and safest way to upgrade to Qubes R2B3 is to install it from scratch and use [qubes backup and restore tools](/en/doc/backup-restore/) for migrating of all of the user VMs. +The easiest and safest way to upgrade to Qubes R2B3 is to install it from scratch and use [qubes backup and restore tools](/doc/backup-restore/) for migrating of all of the user VMs. -Users can also try a manual upgrade procedure that has been described [here](/en/doc/upgrade-to-r2b3/). +Users can also try a manual upgrade procedure that has been described [here](/doc/upgrade-to-r2b3/). Note: if the user has custom Template VMs (i.e. other than the default template, e.g. created from it by cloning), or Standalone VMs, then the user should perform manual upgrade from R2B2 to R2B3, as described under the link given above. diff --git a/releases/3.0/release-notes.md b/releases/3.0/release-notes.md index 41f1ced9..ec3d030d 100644 --- a/releases/3.0/release-notes.md +++ b/releases/3.0/release-notes.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes R3.0 Release Notes -permalink: /en/doc/releases/3.0/release-notes/ -redirect_from: /doc/releases/3.0/release-notes/ +permalink: /doc/releases/3.0/release-notes/ +redirect_from: +- /en/doc/releases/3.0/release-notes/ --- Qubes R3.0 Release Notes @@ -49,7 +50,7 @@ See [Qubes Downloads](/doc/QubesDownloads/). Installation instructions ------------------------- -See [Installation Guide](/en/doc/installation-guide/). +See [Installation Guide](/doc/installation-guide/). Upgrading --------- @@ -60,7 +61,7 @@ If you are using Qubes R3.0rc1, R3.0rc2 or R3.0rc3, just install system updates, ### From R2.0 or earlier -The easiest and safest way to upgrade to Qubes R3.0 is to install it from scratch and use [qubes backup and restore tools](/en/doc/backup-restore/) for migrating of all of the user VMs. +The easiest and safest way to upgrade to Qubes R3.0 is to install it from scratch and use [qubes backup and restore tools](/doc/backup-restore/) for migrating of all of the user VMs. -Users of Qubes R2 can upgrade using [experimental procedure](/en/doc/upgrade-to-r3.0/). +Users of Qubes R2 can upgrade using [experimental procedure](/doc/upgrade-to-r3.0/). diff --git a/releases/3.0/schedule.md b/releases/3.0/schedule.md index 5dacc574..403895f6 100644 --- a/releases/3.0/schedule.md +++ b/releases/3.0/schedule.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes R3.0 Release Schedule -permalink: /en/doc/releases/3.0/schedule/ -redirect_from: /doc/releases/3.0/schedule/ +permalink: /doc/releases/3.0/schedule/ +redirect_from: +- /en/doc/releases/3.0/schedule/ --- Qubes R3.0 Release Schedule diff --git a/releases/releases.md b/releases/releases.md index 71f58b9d..bb9b278a 100644 --- a/releases/releases.md +++ b/releases/releases.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes Releases -permalink: /en/doc/releases/ -redirect_from: /doc/releases/ +permalink: /doc/releases/ +redirect_from: +- /en/doc/releases/ --- Qubes Releases diff --git a/releases/todo.md b/releases/todo.md index b2764092..3cee7067 100644 --- a/releases/todo.md +++ b/releases/todo.md @@ -1,8 +1,9 @@ --- layout: doc title: Release Checklist -permalink: /en/doc/releases/todo/ -redirect_from: /doc/releases/todo/ +permalink: /doc/releases/todo/ +redirect_from: +- /en/doc/releases/todo/ --- Release Checklist diff --git a/security/anti-evil-maid.md b/security/anti-evil-maid.md index 09f19dd1..4c04af9d 100644 --- a/security/anti-evil-maid.md +++ b/security/anti-evil-maid.md @@ -1,8 +1,9 @@ --- layout: doc title: Anti Evil Maid (AEM) -permalink: /en/doc/anti-evil-maid/ +permalink: /doc/anti-evil-maid/ redirect_from: +- /en/doc/anti-evil-maid/ - /doc/AntiEvilMaid/ - /wiki/AntiEvilMaid/ --- @@ -29,7 +30,7 @@ More information regarding configuration in the [README](https://github.com/Qube Security Considerations ----------------------- -[Qubes security guidelines](/en/doc/security-guidelines/) dictate that USB devices should never be attached directly to dom0, since this can result in the entire system being compromised. However, in its default configuration, installing and using AEM requires attaching a USB drive (i.e., [mass storage device](https://en.wikipedia.org/wiki/USB_mass_storage_device_class)) directly to dom0. (The other option is to install AEM to an internal disk. However, this carries significant security implications, as explained [here](http://theinvisiblethings.blogspot.com/2011/09/anti-evil-maid.html).) This presents us with a classic security trade-off: each Qubes user must make a choice between protecting dom0 from a potentially malicious USB drive, on the one hand, and protecting the system from Evil Maid attacks, on the other hand. Given the practical feasibility of attacks like [BadUSB](https://srlabs.de/badusb/) and revelations regarding pervasive government hardware backdoors, this is no longer a straightforward decision. New, factory-sealed USB drives cannot simply be assumed to be "clean" (e.g., to have non-malicious microcontroller firmware). Therefore, it is up to each individual Qubes user to evaluate the relative risk of each attack vector against his or her security model. +[Qubes security guidelines](/doc/security-guidelines/) dictate that USB devices should never be attached directly to dom0, since this can result in the entire system being compromised. However, in its default configuration, installing and using AEM requires attaching a USB drive (i.e., [mass storage device](https://en.wikipedia.org/wiki/USB_mass_storage_device_class)) directly to dom0. (The other option is to install AEM to an internal disk. However, this carries significant security implications, as explained [here](http://theinvisiblethings.blogspot.com/2011/09/anti-evil-maid.html).) This presents us with a classic security trade-off: each Qubes user must make a choice between protecting dom0 from a potentially malicious USB drive, on the one hand, and protecting the system from Evil Maid attacks, on the other hand. Given the practical feasibility of attacks like [BadUSB](https://srlabs.de/badusb/) and revelations regarding pervasive government hardware backdoors, this is no longer a straightforward decision. New, factory-sealed USB drives cannot simply be assumed to be "clean" (e.g., to have non-malicious microcontroller firmware). Therefore, it is up to each individual Qubes user to evaluate the relative risk of each attack vector against his or her security model. For example, a user who frequently travels with a Qubes laptop holding sensitive data may be at a much higher risk of Evil Maid attacks than a home user with a stationary Qubes desktop. If the frequent traveler judges her risk of an Evil Maid attack to be higher than the risk of a malicious USB device, she might reasonably opt to install and use AEM. On the other hand, the home user might deem the probability of an Evil Maid attack occurring in her own home to be so low that there is a higher probability that any USB drive she purchases is already compromised, in which case she might reasonably opt never to attach any USB devices directly to dom0. (In either case, users can--and should--secure dom0 against further USB-related attacks through the use of a [USBVM](/doc/SecurityGuidelines/#creating-and-using-a-usbvm).) diff --git a/security/data-leaks.md b/security/data-leaks.md index d859f6b2..3e01800a 100644 --- a/security/data-leaks.md +++ b/security/data-leaks.md @@ -1,8 +1,9 @@ --- layout: doc title: Data Leaks -permalink: /en/doc/data-leaks/ +permalink: /doc/data-leaks/ redirect_from: +- /en/doc/data-leaks/ - /doc/DataLeaks/ - /wiki/DataLeaks/ --- @@ -13,7 +14,7 @@ Understanding and Preventing Data Leaks The Role of the Firewall ------------------------ -**[Firewalling in Qubes](/en/doc/qubes-firewall/) is not intended to be a leak-prevention mechanism.** +**[Firewalling in Qubes](/doc/qubes-firewall/) is not intended to be a leak-prevention mechanism.** There are several reasons for this, which will be explained below. However, the main reason is that Qubes cannot prevent an attacker who has compromised one AppVM (with restrictive firewall rules) from leaking data via cooperative covert channels through a different AppVM (with sufficiently nonrestrictive firewall rules, if any) which the attacker has also compromised. diff --git a/security/multifactor-authentication.md b/security/multifactor-authentication.md index f89d6a27..3add22bf 100644 --- a/security/multifactor-authentication.md +++ b/security/multifactor-authentication.md @@ -1,8 +1,10 @@ --- layout: doc title: Multifactor Authentication -permalink: /en/doc/multifactor-authentication/ -redirect_from: /doc/Multi-factorAuthentication/ +permalink: /doc/multifactor-authentication/ +redirect_from: +- /en/doc/multifactor-authentication/ +- /doc/Multi-factorAuthentication/ --- Using Multi-factor Authentication with Qubes diff --git a/security/open-pgp.md b/security/open-pgp.md index 45baed8f..b16fa16a 100644 --- a/security/open-pgp.md +++ b/security/open-pgp.md @@ -1,14 +1,15 @@ --- layout: doc title: OpenPGP -permalink: /en/doc/open-pgp/ +permalink: /doc/open-pgp/ redirect_from: +- /en/doc/open-pgp/ - /doc/OpenPGP/ -- "/doc/UserDoc/OpenPGP/" -- "/wiki/UserDoc/OpenPGP/" +- /doc/UserDoc/OpenPGP/ +- /wiki/UserDoc/OpenPGP/ --- -**Note 2014-08-03: This page is deprecated by [SplitGpg](/en/doc/split-gpg/). The content of this page has been integrated into that page.** +**Note 2014-08-03: This page is deprecated by [SplitGpg](/doc/split-gpg/). The content of this page has been integrated into that page.** Using OpenPGP in Qubes ====================== diff --git a/security/qubes-firewall.md b/security/qubes-firewall.md index 7c3bf948..e5abd927 100644 --- a/security/qubes-firewall.md +++ b/security/qubes-firewall.md @@ -1,8 +1,9 @@ --- layout: doc title: Qubes Firewall -permalink: /en/doc/qubes-firewall/ +permalink: /doc/qubes-firewall/ redirect_from: +- /en/doc/qubes-firewall/ - /doc/QubesFirewall/ - /wiki/QubesFirewall/ --- diff --git a/security/security-bulletins.md b/security/security-bulletins.md index 8cfbf760..cb69531f 100644 --- a/security/security-bulletins.md +++ b/security/security-bulletins.md @@ -1,8 +1,9 @@ --- layout: doc title: Security Bulletins -permalink: /en/doc/security-bulletins/ +permalink: /doc/security-bulletins/ redirect_from: +- /en/doc/security-bulletins/ - /doc/SecurityBulletins/ - /wiki/SecurityBulletins/ - /trac/wiki/SecurityBulletins/ @@ -11,7 +12,7 @@ redirect_from: Qubes Security Bulletins ======================== -Qubes Security Bulletins are published through the [Qubes Security Pack](/en/doc/security-pack/). +Qubes Security Bulletins are published through the [Qubes Security Pack](/doc/security-pack/). 2010 ---- diff --git a/security/security-goals.md b/security/security-goals.md index 8040f802..5e2c7076 100644 --- a/security/security-goals.md +++ b/security/security-goals.md @@ -1,8 +1,9 @@ --- layout: doc title: Security Goals -permalink: /en/doc/security-goals/ +permalink: /doc/security-goals/ redirect_from: +- /en/doc/security-goals/ - /doc/SecurityGoals/ - /wiki/SecurityGoals/ --- diff --git a/security/security-guidelines.md b/security/security-guidelines.md index 6a703fbc..632b5452 100644 --- a/security/security-guidelines.md +++ b/security/security-guidelines.md @@ -1,8 +1,9 @@ --- layout: doc title: Security Guidelines -permalink: /en/doc/security-guidelines/ +permalink: /doc/security-guidelines/ redirect_from: +- /en/doc/security-guidelines/ - /doc/SecurityGuidelines/ - /wiki/SecurityGuidelines/ --- @@ -10,24 +11,12 @@ redirect_from: Security Guidelines =================== - * [Download Verification](#download-verification) - * [Observing Security Contexts](#observing-security-contexts) - * [Installing Versus Running Programs](#installing-versus-running-programs) - * [Enabling and Verifying VT-d/IOMMU](#enabling-and-verifying-vt-diommu) - * [Updating Software](#updating-software) - * [Handling Untrusted Files](#handling-untrusted-files) - * [Anti Evil Maid](#anti-evil-maid) - * [Reassigning USB Controllers](#reassigning-usb-controllers) - * [Creating and Using a USBVM](#creating-and-using-a-usbvm) - * [Dom0 Precautions](#dom0-precautions) - * [TemplateBasedVM Directories](#templatebasedvm-directories) - -The [Qubes introduction](http://theinvisiblethings.blogspot.com/2012/09/introducing-qubes-10.html) makes clear that without some active and responsible participation of the user, no real security is possible. So, for example, Qubes does not automagically make your Firefox (or any other app) running in one of the AppVMs suddenly more secure. It is just as [secure (or insecure)](https://en.wikipedia.org/wiki/Computer_insecurity) as on a normal Linux or Windows OS. But what drastically changes is the context in which your applications are used. [This context](/en/doc/qubes-architecture/) is a [responsibility of the user](/en/doc/security-goals/). But participation requires knowledge. So it is worth stressing some basic items: +The [Qubes introduction](http://theinvisiblethings.blogspot.com/2012/09/introducing-qubes-10.html) makes clear that without some active and responsible participation of the user, no real security is possible. So, for example, Qubes does not automagically make your Firefox (or any other app) running in one of the AppVMs suddenly more secure. It is just as [secure (or insecure)](https://en.wikipedia.org/wiki/Computer_insecurity) as on a normal Linux or Windows OS. But what drastically changes is the context in which your applications are used. [This context](/doc/qubes-architecture/) is a [responsibility of the user](/doc/security-goals/). But participation requires knowledge. So it is worth stressing some basic items: Download Verification --------------------- -**Verify the authenticity and integrity of your downloads, [particularly Qubes iso](/en/doc/verifying-signatures/).** +**Verify the authenticity and integrity of your downloads, [particularly Qubes iso](/doc/verifying-signatures/).** Standard program installation @@ -96,21 +85,21 @@ or use the equivalent items in Qubes Manager, which displays an icon when an upd Handling Untrusted Files ------------------------ -When you receive or download any file from an **untrusted source**, do not browse to it with a file manager which has preview enabled. **To disable preview in Nautilus**: Gear (up-right-icon) -\> Preferences -\> Preview (tab) -\> Show thumbnails: Never. Note that this change can be made in a TemplateVM (including the [DispVM template](/en/doc/disp-vm-customization/)) so that future AppVMs created from this TemplateVM will inherit this feature. +When you receive or download any file from an **untrusted source**, do not browse to it with a file manager which has preview enabled. **To disable preview in Nautilus**: Gear (up-right-icon) -\> Preferences -\> Preview (tab) -\> Show thumbnails: Never. Note that this change can be made in a TemplateVM (including the [DispVM template](/doc/dispvm-customization/)) so that future AppVMs created from this TemplateVM will inherit this feature. -Also, **do not open it in trusted VMs**. Rather open it in a **disposable VM** right-clicking on it. You may even modify it within the disposable VM and then [copy it to other VM](/en/doc/copying-files/). +Also, **do not open it in trusted VMs**. Rather open it in a **disposable VM** right-clicking on it. You may even modify it within the disposable VM and then [copy it to other VM](/doc/copying-files/). Alternatively PDFs may be converted to **trusted PDF** right clicking on them. This converts text to graphic form, so size will increase. Anti Evil Maid -------------- -If there is a risk that somebody may **physically attack** your computer when you leave it powered down, or if you use Qubes in **dual boot mode**, then you may want to [install AEM](/en/doc/anti-evil-maid/) (Anti Evil Maid). AEM will inform you of any unauthorized modifications to your BIOS or boot partition. If AEM alerts you of an attack it is really bad news because **there is no true fix**. If you are really serious about security you have to buy a new laptop and install Qubes from a trusted ISO. So buying a used laptop is not an option for a security focused one. +If there is a risk that somebody may **physically attack** your computer when you leave it powered down, or if you use Qubes in **dual boot mode**, then you may want to [install AEM](/doc/anti-evil-maid/) (Anti Evil Maid). AEM will inform you of any unauthorized modifications to your BIOS or boot partition. If AEM alerts you of an attack it is really bad news because **there is no true fix**. If you are really serious about security you have to buy a new laptop and install Qubes from a trusted ISO. So buying a used laptop is not an option for a security focused one. Reassigning USB Controllers --------------------------- -Before you [assign a USB controller to a VM](/en/doc/assigning-devices/) check if any **input devices** are included in that controller. +Before you [assign a USB controller to a VM](/doc/assigning-devices/) check if any **input devices** are included in that controller. Assigning USB keyboard will **deprive Dom0 VM of a keyboard**. Since a USB controller assignment survives reboot, you may find yourself **unable to access your system**. Most non-Apple laptops have a PS/2 input for keyboard and mouse, so this problem does not exist. @@ -136,7 +125,7 @@ To avoid this risk it is possible to prepare and utilize a **USBVM**. However th Also avoid it if you do not have a **USB controller free of input devices** or programmable devices, for the reasons above. However, as already noted most laptops use PS-2 for keyboards and touchpad devices which do not cause problems. -An **USBVM** operates like a dedicated temporary parking area, used just to prevent any contact between dom0 and the USB drive. Then, every time you connect an **untrusted USB external drive** to a USB port managed by that USB controller, you need to attach it to the VM that needs it, using qubes manager or [terminal](/en/doc/stick-mounting/). Again, this **works only for disk-like USB devices**. Other devices cannot be currently virtualized. So once you assign their controller to your **USBVM** they'll be no more available. +An **USBVM** operates like a dedicated temporary parking area, used just to prevent any contact between dom0 and the USB drive. Then, every time you connect an **untrusted USB external drive** to a USB port managed by that USB controller, you need to attach it to the VM that needs it, using qubes manager or [terminal](/doc/stick-mounting/). Again, this **works only for disk-like USB devices**. Other devices cannot be currently virtualized. So once you assign their controller to your **USBVM** they'll be no more available. **The process for creating a USBVM** is: diff --git a/security/security-pack.md b/security/security-pack.md index 9b24c551..560ddce6 100644 --- a/security/security-pack.md +++ b/security/security-pack.md @@ -1,8 +1,9 @@ --- layout: doc title: Security Pack -permalink: /en/doc/security-pack/ +permalink: /doc/security-pack/ redirect_from: +- /en/doc/security-pack/ - /doc/SecurityPack/ - /wiki/SecurityPack/ --- @@ -12,7 +13,7 @@ Qubes Security Pack The **Qubes Security Pack (QSP)** is a Git repository which contains: - * [Qubes Security Bulletins (QSBs)](/en/doc/security-bulletins/) + * [Qubes Security Bulletins (QSBs)](/doc/security-bulletins/) * [Qubes PGP keys](https://keys.qubes-os.org/keys/) * [Qubes warrant canaries](https://canarywatch.org/qubesOS/) * Security-related information and announcements (e.g., key revocations) @@ -212,7 +213,7 @@ its contents, and reading them. a trustworthy source (ideally, multiple sources) *other than* this website and visually compare it (them) to the fingerprint displayed in the preceding step, ensuring they match. You can read more about digital signatures and - key verification [here](/en/doc/verifying-signatures/). + key verification [here](/doc/verifying-signatures/). 4. Verify and read the canaries. diff --git a/security/split-gpg.md b/security/split-gpg.md index e7f39311..2aa15f5c 100644 --- a/security/split-gpg.md +++ b/security/split-gpg.md @@ -1,11 +1,12 @@ --- layout: doc title: Split GPG -permalink: /en/doc/split-gpg/ +permalink: /doc/split-gpg/ redirect_from: +- /en/doc/split-gpg/ - /doc/SplitGpg/ -- "/doc/UserDoc/SplitGpg/" -- "/wiki/UserDoc/SplitGpg/" +- /doc/UserDoc/SplitGpg/ +- /wiki/UserDoc/SplitGpg/ --- Qubes Split GPG diff --git a/security/vm-sudo.md b/security/vm-sudo.md index 95e4fbbf..d8d406de 100644 --- a/security/vm-sudo.md +++ b/security/vm-sudo.md @@ -1,8 +1,9 @@ --- layout: doc title: VM Sudo -permalink: /en/doc/vm-sudo/ +permalink: /doc/vm-sudo/ redirect_from: +- /en/doc/vm-sudo/ - /doc/VMSudo/ - /wiki/VMSudo/ --- diff --git a/security/yubi-key.md b/security/yubi-key.md index 0d7077fd..40a6b5a2 100644 --- a/security/yubi-key.md +++ b/security/yubi-key.md @@ -1,8 +1,10 @@ --- layout: doc title: YubiKey in Qubes -permalink: /en/doc/yubi-key/ -redirect_from: /doc/YubiKey/ +permalink: /doc/yubi-key/ +redirect_from: +- /en/doc/yubi-key/ +- /doc/YubiKey/ --- Using YubiKey to Qubes authentication diff --git a/troubleshooting/install-nvidia-driver.md b/troubleshooting/install-nvidia-driver.md index 623e8c7a..0d27f617 100644 --- a/troubleshooting/install-nvidia-driver.md +++ b/troubleshooting/install-nvidia-driver.md @@ -1,8 +1,9 @@ --- layout: doc title: How to Install an Nvidia Driver -permalink: /en/doc/install-nvidia-driver/ +permalink: /doc/install-nvidia-driver/ redirect_from: +- /en/doc/install-nvidia-driver/ - /doc/InstallNvidiaDriver/ - /wiki/InstallNvidiaDriver/ --- @@ -57,7 +58,7 @@ Reboot. This process is quite complicated: First - download the source from nvidia.com site. Here "NVIDIA-Linux-x86\_64-260.19.44.run" is used. Copy it to dom0. Every next step is done in dom0. -See [this page](/en/doc/copy-to-dom0/) for instructions on how to transfer files to Dom0 (where there is normally no networking). +See [this page](/doc/copy-to-dom0/) for instructions on how to transfer files to Dom0 (where there is normally no networking). **WARNING**: Nvidia doesn't sign their files. To make it worse, you are forced to download them over a plaintext connection. This means there are virtually dozens of possibilities for somebody to modify this file and provide you with a malicious/backdoored file. You should realize that installing untrusted files into your Dom0 is a bad idea. Perhaps it might be a better idea to just get a new laptop with integrated Intel GPU? You have been warned. diff --git a/troubleshooting/lenovo450-tinkering.md b/troubleshooting/lenovo450-tinkering.md index 4a3ff422..3a441c34 100644 --- a/troubleshooting/lenovo450-tinkering.md +++ b/troubleshooting/lenovo450-tinkering.md @@ -1,8 +1,9 @@ --- layout: doc title: Lenovo450 Tinkering -permalink: /en/doc/lenovo450-tinkering/ +permalink: /doc/lenovo450-tinkering/ redirect_from: +- /en/doc/lenovo450-tinkering/ - /doc/Lenovo450Tinkering/ - /wiki/Lenovo450Tinkering/ --- diff --git a/troubleshooting/nvidia-troubleshooting.md b/troubleshooting/nvidia-troubleshooting.md index 6efe9434..deb2ea98 100644 --- a/troubleshooting/nvidia-troubleshooting.md +++ b/troubleshooting/nvidia-troubleshooting.md @@ -1,8 +1,9 @@ --- layout: doc title: Nvidia Troubleshooting -permalink: /en/doc/nvidia-troubleshooting/ +permalink: /doc/nvidia-troubleshooting/ redirect_from: +- /en/doc/nvidia-troubleshooting/ - /doc/NvidiaTroubleshooting/ - /wiki/NvidiaTroubleshooting/ --- diff --git a/troubleshooting/out-of-memory.md b/troubleshooting/out-of-memory.md index b37f1813..28fdf47f 100644 --- a/troubleshooting/out-of-memory.md +++ b/troubleshooting/out-of-memory.md @@ -1,8 +1,9 @@ --- layout: doc title: Out of Memory -permalink: /en/doc/out-of-memory/ +permalink: /doc/out-of-memory/ redirect_from: +- /en/doc/out-of-memory/ - /doc/OutOfmemory/ - /wiki/OutOfmemory/ --- diff --git a/troubleshooting/sony-vaio-tinkering.md b/troubleshooting/sony-vaio-tinkering.md index 81b8672a..45d4c4a7 100644 --- a/troubleshooting/sony-vaio-tinkering.md +++ b/troubleshooting/sony-vaio-tinkering.md @@ -1,8 +1,9 @@ --- layout: doc title: Sony Vaio Tinkering -permalink: /en/doc/sony-vaio-tinkering/ +permalink: /doc/sony-vaio-tinkering/ redirect_from: +- /en/doc/sony-vaio-tinkering/ - /doc/SonyVaioTinkering/ - /wiki/SonyVaioTinkering/ --- diff --git a/unsorted/propaganda.md b/unsorted/propaganda.md index de7b76ae..a4d648f7 100644 --- a/unsorted/propaganda.md +++ b/unsorted/propaganda.md @@ -1,8 +1,9 @@ --- layout: doc title: Propaganda -permalink: /en/doc/propaganda/ +permalink: /doc/propaganda/ redirect_from: +- /en/doc/propaganda/ - /doc/Propaganda/ - /wiki/Propaganda/ --- diff --git a/unsorted/sandbox/include.md b/unsorted/sandbox/include.md index 28a4998f..05b3323e 100644 --- a/unsorted/sandbox/include.md +++ b/unsorted/sandbox/include.md @@ -1,8 +1,9 @@ --- layout: doc title: Include -permalink: /en/doc/sandbox/include/ +permalink: /doc/sandbox/include/ redirect_from: +- /en/doc/sandbox/include/ - /doc/Sandbox/Include/ - /wiki/Sandbox/Include/ ---