From 4c77a8c6f4c02cdbe2d078cd0566ea1bd89f83a4 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Thu, 16 May 2019 19:12:56 -0500 Subject: [PATCH 01/12] Make licensing description consistent with COPYING Fixes QubesOS/qubes-issues#5042 --- basics_dev/style-guide.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/basics_dev/style-guide.md b/basics_dev/style-guide.md index ada9121c..795a0c5e 100644 --- a/basics_dev/style-guide.md +++ b/basics_dev/style-guide.md @@ -68,7 +68,10 @@ Currently, all the icons on the Qubes-OS.org website are generated using [FontAw ## Logos -The following is a collection of various sizes and versions of the Qubes logo used both in the OS itself and on our website. All of these files are licensed GPLv2 and the source can be [downloaded here](https://github.com/QubesOS/qubes-artwork). +The following is a collection of various sizes and versions of the Qubes logo used both in the OS itself and on our website. +The artwork is licensed under Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0). +The code is licensed under GNU GPLv2. +GPLv2 and the source code can be [downloaded here](https://github.com/QubesOS/qubes-artwork).
{% for logo in site.data.styleguide.logos %} From 46e1830ba2240131528e90433b70422c77133ba1 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Thu, 16 May 2019 19:15:47 -0500 Subject: [PATCH 02/12] Add CC BY-SA 4.0 license for qubes-doc Fixes QubesOS/qubes-issues#4219 --- LICENSE | 428 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 428 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..fe8dbc50 --- /dev/null +++ b/LICENSE @@ -0,0 +1,428 @@ +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + + including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + From e2130e6f7dc6d7db0d9be2e51086fb3ad6e0b591 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Thu, 16 May 2019 19:23:21 -0500 Subject: [PATCH 03/12] Add licensing info about documentation and artwork QubesOS/qubes-issues#4219 QubesOS/qubes-issues#5042 --- basics_dev/license.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/basics_dev/license.md b/basics_dev/license.md index 1a7879a2..e0272109 100644 --- a/basics_dev/license.md +++ b/basics_dev/license.md @@ -15,7 +15,15 @@ Qubes is a compilation of software packages, each under its own license. The com The full text of the GPL v2 license can be found [here](http://www.gnu.org/licenses/gpl-2.0.html). + Note on rights to double-licensing of the Qubes code ---------------------------------------------------- Invisible Things Lab (ITL), who has funded and run the Qubes project since the beginning, and who has contributed the majority of Qubes-specific code (specifically: `core-*`, `gui-*`, and `qubes-*` repositories) would like to have a right to redistribute parts of this code under proprietary licenses. This is especially important for Qubes R3 and later, where the new architecture allows the creation of many editions of Qubes, using different hypervisors, some of which might not be open source. That's why we ask every developer who contributes code to Qubes project to grant ITL permission to reuse the code under a different license, and to express this consent by including the [standard signed-off line](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=HEAD#n416) in the commit. + + +Documentation and artwork +------------------------- + +Qubes documentation and artwork is licensed under [Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)](https://creativecommons.org/licenses/by-sa/4.0/). + From 12592976822299fc5d6d57f585ce90dc15fc885a Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Fri, 17 May 2019 01:12:17 -0500 Subject: [PATCH 04/12] Revert "Add CC BY-SA 4.0 license for qubes-doc" This reverts commit 46e1830ba2240131528e90433b70422c77133ba1. @strugee has raised the question of whether we must ask all copyright holders to agree to this license. See QubesOS/qubes-issues#4219. --- LICENSE | 428 -------------------------------------------------------- 1 file changed, 428 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index fe8dbc50..00000000 --- a/LICENSE +++ /dev/null @@ -1,428 +0,0 @@ -Attribution-ShareAlike 4.0 International - -======================================================================= - -Creative Commons Corporation ("Creative Commons") is not a law firm and -does not provide legal services or legal advice. Distribution of -Creative Commons public licenses does not create a lawyer-client or -other relationship. Creative Commons makes its licenses and related -information available on an "as-is" basis. Creative Commons gives no -warranties regarding its licenses, any material licensed under their -terms and conditions, or any related information. Creative Commons -disclaims all liability for damages resulting from their use to the -fullest extent possible. - -Using Creative Commons Public Licenses - -Creative Commons public licenses provide a standard set of terms and -conditions that creators and other rights holders may use to share -original works of authorship and other material subject to copyright -and certain other rights specified in the public license below. The -following considerations are for informational purposes only, are not -exhaustive, and do not form part of our licenses. - - Considerations for licensors: Our public licenses are - intended for use by those authorized to give the public - permission to use material in ways otherwise restricted by - copyright and certain other rights. Our licenses are - irrevocable. Licensors should read and understand the terms - and conditions of the license they choose before applying it. - Licensors should also secure all rights necessary before - applying our licenses so that the public can reuse the - material as expected. Licensors should clearly mark any - material not subject to the license. This includes other CC- - licensed material, or material used under an exception or - limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors - - Considerations for the public: By using one of our public - licenses, a licensor grants the public permission to use the - licensed material under specified terms and conditions. If - the licensor's permission is not necessary for any reason--for - example, because of any applicable exception or limitation to - copyright--then that use is not regulated by the license. Our - licenses grant only permissions under copyright and certain - other rights that a licensor has authority to grant. Use of - the licensed material may still be restricted for other - reasons, including because others have copyright or other - rights in the material. A licensor may make special requests, - such as asking that all changes be marked or described. - Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More considerations - for the public: - wiki.creativecommons.org/Considerations_for_licensees - -======================================================================= - -Creative Commons Attribution-ShareAlike 4.0 International Public -License - -By exercising the Licensed Rights (defined below), You accept and agree -to be bound by the terms and conditions of this Creative Commons -Attribution-ShareAlike 4.0 International Public License ("Public -License"). To the extent this Public License may be interpreted as a -contract, You are granted the Licensed Rights in consideration of Your -acceptance of these terms and conditions, and the Licensor grants You -such rights in consideration of benefits the Licensor receives from -making the Licensed Material available under these terms and -conditions. - - -Section 1 -- Definitions. - - a. Adapted Material means material subject to Copyright and Similar - Rights that is derived from or based upon the Licensed Material - and in which the Licensed Material is translated, altered, - arranged, transformed, or otherwise modified in a manner requiring - permission under the Copyright and Similar Rights held by the - Licensor. For purposes of this Public License, where the Licensed - Material is a musical work, performance, or sound recording, - Adapted Material is always produced where the Licensed Material is - synched in timed relation with a moving image. - - b. Adapter's License means the license You apply to Your Copyright - and Similar Rights in Your contributions to Adapted Material in - accordance with the terms and conditions of this Public License. - - c. BY-SA Compatible License means a license listed at - creativecommons.org/compatiblelicenses, approved by Creative - Commons as essentially the equivalent of this Public License. - - d. Copyright and Similar Rights means copyright and/or similar rights - closely related to copyright including, without limitation, - performance, broadcast, sound recording, and Sui Generis Database - Rights, without regard to how the rights are labeled or - categorized. For purposes of this Public License, the rights - specified in Section 2(b)(1)-(2) are not Copyright and Similar - Rights. - - e. Effective Technological Measures means those measures that, in the - absence of proper authority, may not be circumvented under laws - fulfilling obligations under Article 11 of the WIPO Copyright - Treaty adopted on December 20, 1996, and/or similar international - agreements. - - f. Exceptions and Limitations means fair use, fair dealing, and/or - any other exception or limitation to Copyright and Similar Rights - that applies to Your use of the Licensed Material. - - g. License Elements means the license attributes listed in the name - of a Creative Commons Public License. The License Elements of this - Public License are Attribution and ShareAlike. - - h. Licensed Material means the artistic or literary work, database, - or other material to which the Licensor applied this Public - License. - - i. Licensed Rights means the rights granted to You subject to the - terms and conditions of this Public License, which are limited to - all Copyright and Similar Rights that apply to Your use of the - Licensed Material and that the Licensor has authority to license. - - j. Licensor means the individual(s) or entity(ies) granting rights - under this Public License. - - k. Share means to provide material to the public by any means or - process that requires permission under the Licensed Rights, such - as reproduction, public display, public performance, distribution, - dissemination, communication, or importation, and to make material - available to the public including in ways that members of the - public may access the material from a place and at a time - individually chosen by them. - - l. Sui Generis Database Rights means rights other than copyright - resulting from Directive 96/9/EC of the European Parliament and of - the Council of 11 March 1996 on the legal protection of databases, - as amended and/or succeeded, as well as other essentially - equivalent rights anywhere in the world. - - m. You means the individual or entity exercising the Licensed Rights - under this Public License. Your has a corresponding meaning. - - -Section 2 -- Scope. - - a. License grant. - - 1. Subject to the terms and conditions of this Public License, - the Licensor hereby grants You a worldwide, royalty-free, - non-sublicensable, non-exclusive, irrevocable license to - exercise the Licensed Rights in the Licensed Material to: - - a. reproduce and Share the Licensed Material, in whole or - in part; and - - b. produce, reproduce, and Share Adapted Material. - - 2. Exceptions and Limitations. For the avoidance of doubt, where - Exceptions and Limitations apply to Your use, this Public - License does not apply, and You do not need to comply with - its terms and conditions. - - 3. Term. The term of this Public License is specified in Section - 6(a). - - 4. Media and formats; technical modifications allowed. The - Licensor authorizes You to exercise the Licensed Rights in - all media and formats whether now known or hereafter created, - and to make technical modifications necessary to do so. The - Licensor waives and/or agrees not to assert any right or - authority to forbid You from making technical modifications - necessary to exercise the Licensed Rights, including - technical modifications necessary to circumvent Effective - Technological Measures. For purposes of this Public License, - simply making modifications authorized by this Section 2(a) - (4) never produces Adapted Material. - - 5. Downstream recipients. - - a. Offer from the Licensor -- Licensed Material. Every - recipient of the Licensed Material automatically - receives an offer from the Licensor to exercise the - Licensed Rights under the terms and conditions of this - Public License. - - b. Additional offer from the Licensor -- Adapted Material. - Every recipient of Adapted Material from You - automatically receives an offer from the Licensor to - exercise the Licensed Rights in the Adapted Material - under the conditions of the Adapter's License You apply. - - c. No downstream restrictions. You may not offer or impose - any additional or different terms or conditions on, or - apply any Effective Technological Measures to, the - Licensed Material if doing so restricts exercise of the - Licensed Rights by any recipient of the Licensed - Material. - - 6. No endorsement. Nothing in this Public License constitutes or - may be construed as permission to assert or imply that You - are, or that Your use of the Licensed Material is, connected - with, or sponsored, endorsed, or granted official status by, - the Licensor or others designated to receive attribution as - provided in Section 3(a)(1)(A)(i). - - b. Other rights. - - 1. Moral rights, such as the right of integrity, are not - licensed under this Public License, nor are publicity, - privacy, and/or other similar personality rights; however, to - the extent possible, the Licensor waives and/or agrees not to - assert any such rights held by the Licensor to the limited - extent necessary to allow You to exercise the Licensed - Rights, but not otherwise. - - 2. Patent and trademark rights are not licensed under this - Public License. - - 3. To the extent possible, the Licensor waives any right to - collect royalties from You for the exercise of the Licensed - Rights, whether directly or through a collecting society - under any voluntary or waivable statutory or compulsory - licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties. - - -Section 3 -- License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the -following conditions. - - a. Attribution. - - 1. If You Share the Licensed Material (including in modified - form), You must: - - a. retain the following if it is supplied by the Licensor - with the Licensed Material: - - i. identification of the creator(s) of the Licensed - Material and any others designated to receive - attribution, in any reasonable manner requested by - the Licensor (including by pseudonym if - designated); - - ii. a copyright notice; - - iii. a notice that refers to this Public License; - - iv. a notice that refers to the disclaimer of - warranties; - - v. a URI or hyperlink to the Licensed Material to the - extent reasonably practicable; - - b. indicate if You modified the Licensed Material and - retain an indication of any previous modifications; and - - c. indicate the Licensed Material is licensed under this - Public License, and include the text of, or the URI or - hyperlink to, this Public License. - - 2. You may satisfy the conditions in Section 3(a)(1) in any - reasonable manner based on the medium, means, and context in - which You Share the Licensed Material. For example, it may be - reasonable to satisfy the conditions by providing a URI or - hyperlink to a resource that includes the required - information. - - 3. If requested by the Licensor, You must remove any of the - information required by Section 3(a)(1)(A) to the extent - reasonably practicable. - - b. ShareAlike. - - In addition to the conditions in Section 3(a), if You Share - Adapted Material You produce, the following conditions also apply. - - 1. The Adapter's License You apply must be a Creative Commons - license with the same License Elements, this version or - later, or a BY-SA Compatible License. - - 2. You must include the text of, or the URI or hyperlink to, the - Adapter's License You apply. You may satisfy this condition - in any reasonable manner based on the medium, means, and - context in which You Share Adapted Material. - - 3. You may not offer or impose any additional or different terms - or conditions on, or apply any Effective Technological - Measures to, Adapted Material that restrict exercise of the - rights granted under the Adapter's License You apply. - - -Section 4 -- Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that -apply to Your use of the Licensed Material: - - a. for the avoidance of doubt, Section 2(a)(1) grants You the right - to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database; - - b. if You include all or a substantial portion of the database - contents in a database in which You have Sui Generis Database - Rights, then the database in which You have Sui Generis Database - Rights (but not its individual contents) is Adapted Material, - - including for purposes of Section 3(b); and - c. You must comply with the conditions in Section 3(a) if You Share - all or a substantial portion of the contents of the database. - -For the avoidance of doubt, this Section 4 supplements and does not -replace Your obligations under this Public License where the Licensed -Rights include other Copyright and Similar Rights. - - -Section 5 -- Disclaimer of Warranties and Limitation of Liability. - - a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE - EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS - AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF - ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, - IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, - WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, - ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT - KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT - ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. - - b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE - TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, - NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, - INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, - COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR - USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR - DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR - IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. - - c. The disclaimer of warranties and limitation of liability provided - above shall be interpreted in a manner that, to the extent - possible, most closely approximates an absolute disclaimer and - waiver of all liability. - - -Section 6 -- Term and Termination. - - a. This Public License applies for the term of the Copyright and - Similar Rights licensed here. However, if You fail to comply with - this Public License, then Your rights under this Public License - terminate automatically. - - b. Where Your right to use the Licensed Material has terminated under - Section 6(a), it reinstates: - - 1. automatically as of the date the violation is cured, provided - it is cured within 30 days of Your discovery of the - violation; or - - 2. upon express reinstatement by the Licensor. - - For the avoidance of doubt, this Section 6(b) does not affect any - right the Licensor may have to seek remedies for Your violations - of this Public License. - - c. For the avoidance of doubt, the Licensor may also offer the - Licensed Material under separate terms or conditions or stop - distributing the Licensed Material at any time; however, doing so - will not terminate this Public License. - - d. Sections 1, 5, 6, 7, and 8 survive termination of this Public - License. - - -Section 7 -- Other Terms and Conditions. - - a. The Licensor shall not be bound by any additional or different - terms or conditions communicated by You unless expressly agreed. - - b. Any arrangements, understandings, or agreements regarding the - Licensed Material not stated herein are separate from and - independent of the terms and conditions of this Public License. - - -Section 8 -- Interpretation. - - a. For the avoidance of doubt, this Public License does not, and - shall not be interpreted to, reduce, limit, restrict, or impose - conditions on any use of the Licensed Material that could lawfully - be made without permission under this Public License. - - b. To the extent possible, if any provision of this Public License is - deemed unenforceable, it shall be automatically reformed to the - minimum extent necessary to make it enforceable. If the provision - cannot be reformed, it shall be severed from this Public License - without affecting the enforceability of the remaining terms and - conditions. - - c. No term or condition of this Public License will be waived and no - failure to comply consented to unless expressly agreed to by the - Licensor. - - d. Nothing in this Public License constitutes or may be interpreted - as a limitation upon, or waiver of, any privileges and immunities - that apply to the Licensor or You, including from the legal - processes of any jurisdiction or authority. - - -======================================================================= - -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at -creativecommons.org/policies, Creative Commons does not authorize the -use of the trademark "Creative Commons" or any other trademark or logo -of Creative Commons without its prior written consent including, -without limitation, in connection with any unauthorized modifications -to any of its public licenses or any other arrangements, -understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. - -Creative Commons may be contacted at creativecommons.org. - From 6379696d1d2c6a37a5c78485b3f3ee0419e1b7f7 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Fri, 17 May 2019 01:14:38 -0500 Subject: [PATCH 05/12] Revert "Add licensing info about documentation and artwork" This reverts commit e2130e6f7dc6d7db0d9be2e51086fb3ad6e0b591. @strugee has raised the question of whether we must ask all copyright holders to agree to this license. See QubesOS/qubes-issues#4219. --- basics_dev/license.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/basics_dev/license.md b/basics_dev/license.md index e0272109..1a7879a2 100644 --- a/basics_dev/license.md +++ b/basics_dev/license.md @@ -15,15 +15,7 @@ Qubes is a compilation of software packages, each under its own license. The com The full text of the GPL v2 license can be found [here](http://www.gnu.org/licenses/gpl-2.0.html). - Note on rights to double-licensing of the Qubes code ---------------------------------------------------- Invisible Things Lab (ITL), who has funded and run the Qubes project since the beginning, and who has contributed the majority of Qubes-specific code (specifically: `core-*`, `gui-*`, and `qubes-*` repositories) would like to have a right to redistribute parts of this code under proprietary licenses. This is especially important for Qubes R3 and later, where the new architecture allows the creation of many editions of Qubes, using different hypervisors, some of which might not be open source. That's why we ask every developer who contributes code to Qubes project to grant ITL permission to reuse the code under a different license, and to express this consent by including the [standard signed-off line](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=HEAD#n416) in the commit. - - -Documentation and artwork -------------------------- - -Qubes documentation and artwork is licensed under [Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)](https://creativecommons.org/licenses/by-sa/4.0/). - From 40a25185f0e78a19b577d9df2dd1109de1bc8aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 20 May 2019 17:15:39 +0200 Subject: [PATCH 06/12] automated-tests: add info about testing PyQT applications --- debugging/automated-tests.md | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/debugging/automated-tests.md b/debugging/automated-tests.md index a50ed96f..96204005 100644 --- a/debugging/automated-tests.md +++ b/debugging/automated-tests.md @@ -152,6 +152,59 @@ Again, given the hypothetical `example.py` test: ): ~~~ +### Testing PyQt applications + +When testing (Py)QT application, it's useful to create separate QApplication object for each test. +But QT framework does not allow to have multiple QApplication objects in the same process at the same time. +This means it's critical to reliably cleanup previous instance before creating the new one. +This turns out to be non-trivial task, especially if _any_ test uses event loop. +Failure to perform proper cleanup in many cases results in SEGV. +Below you can find steps for the proper cleanup: + +~~~python +import asyncio +import quamash +import unittest +import gc + +class SomeTestCase(unittest.TestCase): + def setUp(self): + [...] + + # force "cleanlooks" style, the default one on Xfce (GtkStyle) use + # static variable internally and caches pointers to later destroyed + # objects (result: SEGV) + self.qtapp = QtGui.QApplication(["test", "-style", "cleanlooks"]) + + # construct event loop even if this particular test doesn't use it, + # otherwise events with qtapp references will be queued there anyway and the + # first test that actually use event loop will try to dereference (already + # destroyed) objects, resulting in SEGV + self.loop = quamash.QEventLoop(self.qtapp) + + def tearDown(self): + [...] + # process any pending events before destroying the object + self.qtapp.processEvents() + + # queue destroying the QApplication object, do that for any other QT + # related objects here too + self.qtapp.deleteLater() + + # process any pending events (other than just queued destroy), just in case + self.qtapp.processEvents() + + # execute main loop, which will process all events, _including just queued destroy_ + self.loop.run_until_complete(asyncio.sleep(0)) + + # at this point it QT objects are destroyed, cleanup all remaining references; + # del other QT object here too + self.loop.close() + del self.qtapp + del self.loop + gc.collect() +~~~ + Installation Tests with openQA ------------------------------ From 419ae30c6b895db973d8e12c241db5bd6fa8eb24 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sun, 26 May 2019 18:45:38 -0500 Subject: [PATCH 07/12] Add links to closely-related pages --- installing/installation-guide.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/installing/installation-guide.md b/installing/installation-guide.md index 3620f1e0..9a43acd7 100644 --- a/installing/installation-guide.md +++ b/installing/installation-guide.md @@ -94,6 +94,8 @@ The installer loads Xen right at the beginning, so chances are high that if you can see the installer's graphical screen and you pass the compatibility check that runs immediately after that, Qubes will work on your system. :) +If you're an advanced user, and you'd like to customize your installation, please see [Custom Installation]. + Installing to a USB drive ------------------------- @@ -113,9 +115,7 @@ the disk(s) I selected and return me to the main menu”. Upgrading --------- -For instructions in upgrading an existing installation, please see the **Release -Notes** of the version to which you want to upgrade. All of these release notes -are available from the main [downloads] page. +For instructions in upgrading an existing installation, please see [Upgrade Guides]. Getting Help @@ -141,6 +141,8 @@ Getting Help [downloads]: /downloads/ [verifying signatures]: /security/verifying-signatures/ [security considerations]: /doc/install-security/ +[Custom Installation]: /doc/custom-install/ +[Upgrade Guides]: /doc/upgrade/ [Rufus]: https://rufus.akeo.ie/ [documentation]: /doc/ [improving]: /doc/doc-guidelines/ From 5cc99a23d106eb921abab04514979f9e64610c25 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sun, 26 May 2019 18:46:01 -0500 Subject: [PATCH 08/12] Move non-core docs into new "External" section QubesOS/qubes-issues#4693 --- doc.md | 273 +++++++++++++++++++++++++++------------------------------ 1 file changed, 130 insertions(+), 143 deletions(-) diff --git a/doc.md b/doc.md index 9a5d4f17..a433cb0f 100644 --- a/doc.md +++ b/doc.md @@ -14,19 +14,17 @@ redirect_from: - /community/ --- -## User Documentation - -### The Basics +## Introduction * [What is Qubes OS?](/intro/) * [Video Tours](/video-tours/) * [Screenshots](/screenshots/) - * [Getting Started](/getting-started/) * [User FAQ](/faq/#users) + * [Reporting Bugs and Other Issues](/doc/reporting-bugs/) * [Help, Support, and Mailing Lists](/support/) * [How to Contribute](/doc/contributing/) -### Security Information +## Project Security * [Security Center](/security/) * [Security FAQ](/faq/#general--security) @@ -34,184 +32,94 @@ redirect_from: * [Security Bulletins](/security/bulletins/) * [Canaries](/security/canaries/) * [Xen Security Advisory (XSA) Tracker](/security/xsa/) - * [Why and How to Verify Signatures](/security/verifying-signatures/) + * [Verifying Signatures](/security/verifying-signatures/) * [Qubes PGP Keys](https://keys.qubes-os.org/keys/) + +## User Documentation + +Core documentation for Qubes users. + ### Choosing Your Hardware * [System Requirements](/doc/system-requirements/) * [Certified Hardware](/doc/certified-hardware/) * [Hardware Compatibility List (HCL)](/hcl/) -### Installing & Upgrading Qubes +### Downloading, Installing, and Upgrading Qubes - * [Qubes Downloads](/downloads/) - * [Qubes Download Mirrors](/downloads/mirrors/) + * [Downloads](/downloads/) * [Installation Guide](/doc/installation-guide/) * [Upgrade Guides](/doc/upgrade/) - * [Why and How to Verify Signatures](/security/verifying-signatures/) - * [Security Considerations when Installing](/doc/install-security/) - * [Try Qubes without installing: Qubes Live USB (alpha)](/doc/live-usb/) * [Supported Versions](/doc/supported-versions/) * [Version Scheme](/doc/version-scheme/) - * [Custom Installation](/doc/custom-install/) - * [Testing new releases and updates](/doc/testing/) + * [Testing New Releases and Updates](/doc/testing/) ### Common Tasks + * [Getting Started](/getting-started/) * [Copying and Pasting Text Between Domains](/doc/copy-paste/) * [Copying and Moving Files Between Domains](/doc/copying-files/) * [Copying from (and to) dom0](/doc/copy-from-dom0/) * [Installing and Updating Software in dom0](/doc/software-update-dom0/) * [Installing and Updating Software in VMs](/doc/software-update-vm/) * [Backup, Restoration, and Migration](/doc/backup-restore/) - * [Using DisposableVMs](/doc/disposablevm/) + * [DisposableVMs](/doc/disposablevm/) * [Block (or Storage) Devices](/doc/block-devices/) * [USB Devices](/doc/usb-devices) * [PCI Devices](/doc/pci-devices/) * [Device Handling](/doc/device-handling/) * [Optical Discs](/doc/optical-discs/) - * [Managing Application Shortcuts](/doc/managing-appvm-shortcuts/) - * [Enabling Fullscreen Mode](/doc/full-screen-mode/) - * [Tips and Tricks](/doc/tips-and-tricks/) + * [Application Shortcuts](/doc/managing-appvm-shortcuts/) + * [Fullscreen Mode](/doc/full-screen-mode/) ### Managing Operating Systems within Qubes * [TemplateVMs](/doc/templates/) - * [Templates: Fedora](/doc/templates/fedora/) - * [Templates: Fedora Minimal](/doc/templates/fedora-minimal/) - * [Templates: Debian](/doc/templates/debian/) - * [Templates: Debian Minimal](/doc/templates/debian-minimal/) - * [Templates: Archlinux](/doc/templates/archlinux/) - * [Templates: Ubuntu](/doc/templates/ubuntu/) - * [Templates: Whonix](/doc/whonix/) - * [Pentesting](/doc/pentesting/) - * [Pentesting: BlackArch](/doc/pentesting/blackarch/) - * [Pentesting: Kali](/doc/pentesting/kali/) - * [Pentesting: PTF](/doc/pentesting/ptf/) + * [Template: Fedora](/doc/templates/fedora/) + * [Template: Fedora Minimal](/doc/templates/fedora-minimal/) + * [Template: Debian](/doc/templates/debian/) + * [Template: Debian Minimal](/doc/templates/debian-minimal/) * [Windows](/doc/windows/) - * [Creating and Using HVM Domains](/doc/hvm/) - * [Tips for Using Linux in an HVM](/doc/linux-hvm-tips/) - * [Creating a NetBSD VM](/doc/netbsd/) - * [How to Reinstall a TemplateVM](/doc/reinstall-template/) + * [HVM Domains](/doc/hvm/) +### Security in Qubes -### Security Guides - - * [Qubes OS Project Security Information](/security/) - * [Security Guidelines](/doc/security-guidelines/) - * [Understanding Qubes Firewall](/doc/firewall/) + * [Qubes Firewall](/doc/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/) - * [The Qubes U2F Proxy](/doc/u2f-proxy/) - * [How to Set Up a Split Bitcoin Wallet in Qubes](/doc/split-bitcoin/) - * [[Unofficial] Split dm-crypt](https://github.com/rustybird/qubes-split-dm-crypt) - * [Configuring YubiKey for user authentication](/doc/yubi-key/) - * [Security Considerations When Handling Devices](/doc/device-handling-security/) - * [Note regarding password-less root access in VM](/doc/vm-sudo/) + * [Anti Evil Maid](/doc/anti-evil-maid/) + * [Split GPG](/doc/split-gpg/) + * [U2F Proxy](/doc/u2f-proxy/) - -### Privacy Guides - - * [Whonix for Privacy & Anonymity](/doc/whonix/) - * [Running Tails in Qubes](/doc/tails/) - * [Anonymizing your MAC Address](/doc/anonymizing-your-mac-address/) - * [Martus](/doc/martus/) - * [Signal](/doc/signal/) - * [Reducing the fingerprint of the text-based web browser w3m](/doc/w3m/) - - -### Configuration Guides +### Advanced Configuration * [Configuration Files](/doc/config-files/) - * [How to set up a ProxyVM as a VPN Gateway](/doc/vpn/) * [Storing AppVMs on Secondary Drives](/doc/secondary-storage/) - * [Multibooting](/doc/multiboot/) - * [Resize Disk Image](/doc/resize-disk-image/) * [RPC Policies](/doc/rpc-policy/) - * [Changing your Time Zone](/doc/change-time-zone/) - * [GUI Configuration and Troubleshooting](/doc/gui-configuration/) - * [Installing ZFS in Qubes](/doc/zfs/) - * [Mutt Guide](/doc/mutt/) - * [Postfix Guide](/doc/postfix/) - * [Fetchmail Guide](/doc/fetchmail/) - * [Creating Custom NetVMs and ProxyVMs](https://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) - * [Adding Bridge Support to the NetVM (EXPERIMENTAL)](/doc/network-bridge-support/) * [USB Qubes](/doc/usb-qubes/) - * [Enabling TRIM for SSD disks](/doc/disk-trim/) - * [Configuring a Network Printer](/doc/network-printer/) - * [Using External Audio Devices](/doc/external-audio/) - * [Rxvt Guide](/doc/rxvt/) * [Managing VM kernel](/doc/managing-vm-kernel/) * [Salt management stack](/doc/salt/) - * [Adding SSD storage cache](https://groups.google.com/d/msgid/qubes-users/a08359c9-9eb0-4d1a-ad92-a8a9bc676ea6%40googlegroups.com) - * [How to Make a Multimedia TemplateVM](/doc/multimedia/) - - -### Customization Guides - * [DisposableVM Customization](/doc/disposablevm-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 i3 in dom0](/doc/i3/) - * [Using awesome in dom0](/doc/awesome/) - * [Language Localization](/doc/language-localization/) - * [Dark Theme in Dom0 and DomU](/doc/dark-theme/) * [How to make any file in a TemplateBasedVM persistent using bind-dirs](/doc/bind-dirs/) - * [Safely Removing TemplateVM Packages (Example: Thunderbird)](/doc/removing-templatevm-packages/) - - -### Troubleshooting - - * [Home directory is out of disk space error](/doc/out-of-memory/) - * [Newer hardware doesn't work](/doc/newer-hardware-troubleshooting/) - * [Installing on system with new AMD GPU (missing firmware problem)](https://groups.google.com/group/qubes-devel/browse_thread/thread/e27a57b0eda62f76) - * [How to install an Nvidia driver in dom0](/doc/install-nvidia-driver/) - * [Nvidia troubleshooting guide](/doc/nvidia-troubleshooting/) - * [Lenovo ThinkPad Troubleshooting](/doc/thinkpad-troubleshooting/) - * [Apple MacBook Troubleshooting](/doc/macbook-troubleshooting/) - * [Getting Sony Vaio Z laptop to work with Qubes](/doc/sony-vaio-tinkering/) - * [Troubleshooting UEFI related problems](/doc/uefi-troubleshooting/) - * [Fixing wireless on suspend & resume](/doc/wireless-troubleshooting/) - * [How to remove VMs manually](/doc/remove-vm-manually/) - * [Intel Integrated Graphics Troubleshooting](/doc/intel-igfx-troubleshooting/) - ### Reference Pages - * [Command-line tools](/doc/tools/) - * [Glossary of Qubes Terminology](/doc/glossary/) + * [Command-line Tools](/doc/tools/) + * [Glossary](/doc/glossary/) * [Qubes Service Framework](/doc/qubes-service/) * [Command Execution in VMs (and Qubes RPC)](/doc/qrexec/) - * [Deprecated documentation](https://github.com/QubesOS/qubesos.github.io#deprecated-documentation) + * [Deprecated Documentation](https://github.com/QubesOS/qubesos.github.io#deprecated-documentation) -### Presentation Slides - - * [[PDF] LinuxCon 2014 -- Qubes OS R2 Tutorial](/attachment/wiki/slides/LinuxCon_2014_Qubes_Tutorial.pdf) - * [[PDF] LinuxCon 2014 -- Qubes OS Keynote](/attachment/wiki/slides/LinuxCon_2014_Qubes_Keynote.pdf) - * [[PDF] RMLL 2016 -- Improving client systems security with Qubes OS](/attachment/wiki/slides/RMLL_2016_Improving-client-systems-security.pdf) - * [[PDF] Golem and Friends 2017 -- Towards Reasonably Secure Computing in the Decentralized World](/attachment/wiki/slides/Secure_Computing_in_Decentralized_World.pdf) - ## Developer Documentation -### The Basics +Core documentation for Qubes developers and advanced users. + +### General * [Developer FAQ](/faq/#developers) - * [Report a Security Issue](/security/) - * [Report a Bug](/doc/reporting-bugs/) - * [How to Contribute](/doc/contributing/) * [Package Contributions](/doc/package-contributions/) - * [Testing new releases and updates](/doc/testing/) - * [Source Code](/doc/source-code/) - * [Qubes OS License](/doc/license/) - * [Coding Guidelines](/doc/coding-style/) * [Documentation Guidelines](/doc/doc-guidelines/) - * [Code Signing](/doc/code-signing/) * [Community-Developed Feature Tracker](/qubes-issues/) * [Google Summer of Code](/gsoc/) * [Google Season of Docs](/gsod/) @@ -219,19 +127,12 @@ redirect_from: * [Style Guide](/doc/style-guide/) * [Usability & UX](/doc/usability-ux/) -### Security Information +### Code - * [Security Center](/security/) - * [Security FAQ](/faq/#general--security) - * [Security Pack](/security/pack/) - * [Security Bulletins](/security/bulletins/) - * [Security Bulletin Checklist](/security/bulletins/checklist/) - * [Security Bulletin Template](/security/bulletins/template/) - * [Canaries](/security/canaries/) - * [Canary Template](/security/canaries/template/) - * [Xen Security Advisory (XSA) Tracker](/security/xsa/) - * [Why and How to Verify Signatures](/security/verifying-signatures/) - * [Qubes PGP Keys](http://keys.qubes-os.org/keys/) + * [Source Code](/doc/source-code/) + * [Software License](/doc/license/) + * [Coding Guidelines](/doc/coding-style/) + * [Code Signing](/doc/code-signing/) ### System @@ -254,7 +155,6 @@ redirect_from: * [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 DisposableVMs](http://theinvisiblethings.blogspot.com/2010/06/disposable-vms.html) * [Dom0 secure update mechanism](/doc/dom0-secure-updates/) ### Debugging @@ -272,11 +172,7 @@ redirect_from: * [Building Qubes](/doc/qubes-builder/) (["API" Details](/doc/qubes-builder-details/)) * [Development Workflow](/doc/development-workflow/) * [Building Qubes OS ISO](/doc/qubes-iso-building/) - * [Building Qubes Templates](https://github.com/QubesOS/qubes-template-configs) - * [Building a TemplateVM based on a new OS (ArchLinux example)](/doc/building-non-fedora-template/) - * [Building the Archlinux Template](/doc/building-archlinux-template/) - * [Building the Whonix Templates](/doc/building-whonix-template/) - * [How to compile kernels for dom0](https://groups.google.com/d/topic/qubes-users/yBeUJPwKwHM/discussion) + * [Qubes Template Configuration Files](https://github.com/QubesOS/qubes-template-configs) ### Releases @@ -284,3 +180,94 @@ redirect_from: * [Release schedules](/doc/releases/schedules/) * [Release checklist](/doc/releases/todo/) + +## External Documentation + +Unofficial, third-party documentation from the Qubes community and others. + +### Managing Operating Systems within Qubes + + * [Template: Archlinux](/doc/templates/archlinux/) + * [Template: Ubuntu](/doc/templates/ubuntu/) + * [Template: Whonix](/doc/whonix/) + * [Pentesting](/doc/pentesting/) + * [Pentesting: BlackArch](/doc/pentesting/blackarch/) + * [Pentesting: Kali](/doc/pentesting/kali/) + * [Pentesting: PTF](/doc/pentesting/ptf/) + * [Tips for Using Linux in an HVM](/doc/linux-hvm-tips/) + * [Creating a NetBSD VM](/doc/netbsd/) + +### Security Guides + + * [Security Guidelines](/doc/security-guidelines/) + * [Using Multi-factor Authentication with Qubes](/doc/multifactor-authentication/) + * [How to Set Up a Split Bitcoin Wallet in Qubes](/doc/split-bitcoin/) + * [Split dm-crypt](https://github.com/rustybird/qubes-split-dm-crypt) + * [Configuring YubiKey for user authentication](/doc/yubi-key/) + * [Security Considerations When Handling Devices](/doc/device-handling-security/) + * [Note regarding password-less root access in VM](/doc/vm-sudo/) + +### Privacy Guides + + * [Whonix for Privacy & Anonymity](/doc/whonix/) + * [Running Tails in Qubes](/doc/tails/) + * [Anonymizing your MAC Address](/doc/anonymizing-your-mac-address/) + * [Martus](/doc/martus/) + * [Signal](/doc/signal/) + * [Reducing the fingerprint of the text-based web browser w3m](/doc/w3m/) + +### Configuration Guides + + * [Qubes Tips and Tricks](/doc/tips-and-tricks/) + * [How to set up a ProxyVM as a VPN Gateway](/doc/vpn/) + * [Multibooting](/doc/multiboot/) + * [Resize Disk Image](/doc/resize-disk-image/) + * [Changing your Time Zone](/doc/change-time-zone/) + * [GUI Configuration and Troubleshooting](/doc/gui-configuration/) + * [Installing ZFS in Qubes](/doc/zfs/) + * [Mutt Guide](/doc/mutt/) + * [Postfix Guide](/doc/postfix/) + * [Fetchmail Guide](/doc/fetchmail/) + * [Creating Custom NetVMs and ProxyVMs](https://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) + * [Adding Bridge Support to the NetVM (EXPERIMENTAL)](/doc/network-bridge-support/) + * [Enabling TRIM for SSD disks](/doc/disk-trim/) + * [Configuring a Network Printer](/doc/network-printer/) + * [Using External Audio Devices](/doc/external-audio/) + * [Rxvt Guide](/doc/rxvt/) + * [Adding SSD storage cache](https://groups.google.com/d/msgid/qubes-users/a08359c9-9eb0-4d1a-ad92-a8a9bc676ea6%40googlegroups.com) + * [How to Make a Multimedia TemplateVM](/doc/multimedia/) + +### Customization Guides + + * [Customizing Fedora minimal templates](/doc/fedora-minimal-template-customization/) + * [Customizing Windows 7 templates](/doc/windows-template-customization/) + * [Using KDE in dom0](/doc/kde/) + * [Installing i3 in dom0](/doc/i3/) + * [Using awesome in dom0](/doc/awesome/) + * [Language Localization](/doc/language-localization/) + * [Dark Theme in Dom0 and DomU](/doc/dark-theme/) + * [Safely Removing TemplateVM Packages (Example: Thunderbird)](/doc/removing-templatevm-packages/) + +### Troubleshooting + + * [Home directory is out of disk space error](/doc/out-of-memory/) + * [Newer hardware doesn't work](/doc/newer-hardware-troubleshooting/) + * [Installing on system with new AMD GPU (missing firmware problem)](https://groups.google.com/group/qubes-devel/browse_thread/thread/e27a57b0eda62f76) + * [How to install an Nvidia driver in dom0](/doc/install-nvidia-driver/) + * [Nvidia troubleshooting guide](/doc/nvidia-troubleshooting/) + * [Lenovo ThinkPad Troubleshooting](/doc/thinkpad-troubleshooting/) + * [Apple MacBook Troubleshooting](/doc/macbook-troubleshooting/) + * [Getting Sony Vaio Z laptop to work with Qubes](/doc/sony-vaio-tinkering/) + * [Troubleshooting UEFI related problems](/doc/uefi-troubleshooting/) + * [Fixing wireless on suspend & resume](/doc/wireless-troubleshooting/) + * [How to remove VMs manually](/doc/remove-vm-manually/) + * [Intel Integrated Graphics Troubleshooting](/doc/intel-igfx-troubleshooting/) + +### Building + + * [Building a TemplateVM based on a new OS (ArchLinux example)](/doc/building-non-fedora-template/) + * [Building the Archlinux Template](/doc/building-archlinux-template/) + * [Building the Whonix Templates](/doc/building-whonix-template/) + * [How to compile kernels for dom0](https://groups.google.com/d/topic/qubes-users/yBeUJPwKwHM/discussion) + From d31c786942d90d11856dd54daabf882da27435f2 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sun, 26 May 2019 19:32:45 -0500 Subject: [PATCH 09/12] Reorganize files to account for new "External" section QubesOS/qubes-issues#4693 --- {building => developer/building}/development-workflow.md | 0 {building => developer/building}/qubes-builder-details.md | 0 {building => developer/building}/qubes-builder.md | 0 {building => developer/building}/qubes-iso-building.md | 0 {basics_dev => developer/code}/code-signing.md | 0 {basics_dev => developer/code}/coding-style.md | 0 {basics_dev => developer/code}/license.md | 0 {basics_dev => developer/code}/source-code.md | 0 {debugging => developer/debugging}/automated-tests.md | 0 {debugging => developer/debugging}/mount-lvm-image.md | 0 {debugging => developer/debugging}/profiling.md | 0 {debugging => developer/debugging}/safe-remote-ttys.md | 0 {debugging => developer/debugging}/test-bench.md | 0 {debugging => developer/debugging}/vm-interface.md | 0 {debugging => developer/debugging}/windows-debugging.md | 0 {basics_dev => developer/general}/devel-books.md | 0 {basics_user => developer/general}/doc-guidelines.md | 0 {basics_dev => developer/general}/gsoc.md | 0 {basics_dev => developer/general}/gsod.md | 0 {about => developer/general}/join.md | 0 {basics_dev => developer/general}/package-contributions.md | 0 {basics_dev => developer/general}/style-guide.md | 0 {basics_dev => developer/general}/usability-ux.md | 0 {releases => developer/releases}/1.0/release-notes.md | 0 {releases => developer/releases}/2.0/release-notes.md | 0 {releases => developer/releases}/3.0/release-notes.md | 0 {releases => developer/releases}/3.0/schedule.md | 0 {releases => developer/releases}/3.1/release-notes.md | 0 {releases => developer/releases}/3.1/schedule.md | 0 {releases => developer/releases}/3.2/release-notes.md | 0 {releases => developer/releases}/3.2/schedule.md | 0 {releases => developer/releases}/4.0/release-notes.md | 0 {releases => developer/releases}/4.0/schedule.md | 0 {releases => developer/releases}/notes.md | 0 {releases => developer/releases}/schedules.md | 0 {releases => developer/releases}/todo.md | 0 {services => developer/services}/admin-api.md | 0 {services => developer/services}/dom0-secure-updates.md | 0 {services => developer/services}/dvm-impl.md | 0 {services => developer/services}/qfilecopy.md | 0 {services => developer/services}/qfileexchgd.md | 0 {services => developer/services}/qmemman.md | 0 {services => developer/services}/qrexec2.md | 0 {services => developer/services}/qrexec3.md | 0 {system => developer/system}/architecture.md | 0 {system => developer/system}/audio.md | 0 {system => developer/system}/gui.md | 0 {system => developer/system}/networking.md | 0 {system => developer/system}/security-critical-code.md | 0 {system => developer/system}/storage-pools.md | 0 {basics_dev => developer/system}/system-doc.md | 0 {system => developer/system}/template-implementation.md | 0 {building => external/building}/building-archlinux-template.md | 0 {building => external/building}/building-non-fedora-template.md | 0 {building => external/building}/building-whonix-template.md | 0 .../configuration-guides}/change-time-zone.md | 0 {configuration => external/configuration-guides}/disk-trim.md | 0 .../configuration-guides}/external-audio.md | 0 {configuration => external/configuration-guides}/fetchmail.md | 0 .../configuration-guides}/gui-configuration.md | 0 {configuration => external/configuration-guides}/multiboot.md | 0 {configuration => external/configuration-guides}/multimedia.md | 0 {configuration => external/configuration-guides}/mutt.md | 0 .../configuration-guides}/network-bridge-support.md | 0 .../configuration-guides}/network-printer.md | 0 {configuration => external/configuration-guides}/postfix.md | 0 .../configuration-guides}/resize-disk-image.md | 0 {configuration => external/configuration-guides}/rxvt.md | 0 .../configuration-guides}/tips-and-tricks.md | 0 {configuration => external/configuration-guides}/vpn.md | 0 {configuration => external/configuration-guides}/w3m.md | 0 {configuration => external/configuration-guides}/zfs.md | 0 {customization => external/customization-guides}/awesome.md | 0 {customization => external/customization-guides}/dark-theme.md | 0 .../fedora-minimal-template-customization.md | 0 {customization => external/customization-guides}/i3.md | 0 {customization => external/customization-guides}/kde.md | 0 .../customization-guides}/language-localization.md | 0 .../customization-guides}/removing-templatevm-packages.md | 0 .../customization-guides}/windows-template-customization.md | 0 {managing-os/templates => external/managing-os}/archlinux.md | 0 {managing-os => external/managing-os}/linux-hvm-tips.md | 0 {managing-os => external/managing-os}/netbsd.md | 0 {managing-os => external/managing-os}/pentesting.md | 0 {managing-os => external/managing-os}/pentesting/blackarch.md | 0 {managing-os => external/managing-os}/pentesting/kali.md | 0 {managing-os => external/managing-os}/pentesting/ptf.md | 0 {managing-os/templates => external/managing-os}/ubuntu.md | 0 {managing-os => external/managing-os}/windows/windows-tools.md | 0 {managing-os => external/managing-os}/windows/windows-vm.md | 0 .../privacy-guides}/anonymizing-your-mac-address.md | 0 {privacy => external/privacy-guides}/martus.md | 0 {privacy => external/privacy-guides}/signal.md | 0 {privacy => external/privacy-guides}/tails.md | 0 {privacy => external/privacy-guides}/torvm.md | 0 {privacy => external/privacy-guides}/whonix.md | 0 .../security-guides}/device-handling-security.md | 0 .../security-guides}/multifactor-authentication.md | 0 {security => external/security-guides}/security-guidelines.md | 0 {security => external/security-guides}/split-bitcoin.md | 0 {security => external/security-guides}/vm-sudo.md | 0 {security => external/security-guides}/yubi-key.md | 0 .../troubleshooting}/install-nvidia-driver.md | 0 .../troubleshooting}/intel-igfx-troubleshooting.md | 0 .../troubleshooting}/macbook-troubleshooting.md | 0 .../troubleshooting}/newer-hardware-troubleshooting.md | 0 .../troubleshooting}/nvidia-troubleshooting.md | 0 {troubleshooting => external/troubleshooting}/out-of-memory.md | 0 .../troubleshooting}/remove-vm-manually.md | 0 .../troubleshooting}/sony-vaio-tinkering.md | 0 .../troubleshooting}/thinkpad-troubleshooting.md | 0 .../troubleshooting}/uefi-troubleshooting.md | 0 .../troubleshooting}/updating-debian-and-whonix.md | 0 .../troubleshooting}/wireless-troubleshooting.md | 0 {about => introduction}/code-of-conduct.md | 0 {basics_user => introduction}/contributing.md | 0 {about => introduction}/experts.md | 0 {about => introduction}/faq.md | 0 {basics_user => introduction}/intro.md | 0 {basics_user => introduction}/reporting-bugs.md | 0 {about => introduction}/screenshots.md | 0 {about => introduction}/statistics.md | 0 {about => introduction}/support.md | 0 {about => introduction}/video-tours.html | 0 {security-info => project-security}/canaries.md | 0 {security-info => project-security}/canary-checklist.md | 0 {security-info => project-security}/canary-template.md | 0 .../security-bulletins-checklist.md | 0 .../security-bulletins-template.md | 0 {security-info => project-security}/security-bulletins.md | 0 {security-info => project-security}/security-goals.md | 0 {security-info => project-security}/security-pack.md | 0 {security-info => project-security}/security.md | 0 {security-info => project-security}/verifying-signatures.md | 0 {security-info => project-security}/xsa.md | 0 {customization => user/advanced-configuration}/bind-dirs.md | 0 {configuration => user/advanced-configuration}/config-files.md | 0 .../advanced-configuration}/disposablevm-customization.md | 0 .../advanced-configuration}/managing-vm-kernel.md | 0 {configuration => user/advanced-configuration}/rpc-policy.md | 0 {configuration => user/advanced-configuration}/salt.md | 0 .../advanced-configuration}/secondary-storage.md | 0 {configuration => user/advanced-configuration}/usb-qubes.md | 0 .../common-tasks}/backup-emergency-restore-v2.md | 0 .../common-tasks}/backup-emergency-restore-v3.md | 0 .../common-tasks}/backup-emergency-restore-v4.md | 0 {common-tasks => user/common-tasks}/backup-restore.md | 0 {common-tasks => user/common-tasks}/block-devices.md | 0 {common-tasks => user/common-tasks}/copy-from-dom0.md | 0 {common-tasks => user/common-tasks}/copy-paste.md | 0 {common-tasks => user/common-tasks}/copying-files.md | 0 {common-tasks => user/common-tasks}/device-handling.md | 0 {common-tasks => user/common-tasks}/disposablevm.md | 0 {common-tasks => user/common-tasks}/full-screen-mode.md | 0 {basics_user => user/common-tasks}/getting-started.md | 0 {common-tasks => user/common-tasks}/managing-appvm-shortcuts.md | 0 {common-tasks => user/common-tasks}/optical-discs.md | 0 {common-tasks => user/common-tasks}/pci-devices.md | 0 {common-tasks => user/common-tasks}/software-update-dom0.md | 0 {common-tasks => user/common-tasks}/software-update-vm.md | 0 {common-tasks => user/common-tasks}/usb-devices.md | 0 .../downloading-installing-upgrading}/custom-install.md | 0 .../downloading-installing-upgrading}/download-mirrors.md | 0 .../downloading-installing-upgrading}/install-security.md | 0 .../downloading-installing-upgrading}/installation-guide.md | 0 {installing => user/downloading-installing-upgrading}/live-usb.md | 0 .../downloading-installing-upgrading}/supported-versions.md | 0 {basics_user => user/downloading-installing-upgrading}/testing.md | 0 .../downloading-installing-upgrading}/upgrade/upgrade-to-r2.md | 0 .../downloading-installing-upgrading}/upgrade/upgrade-to-r2b1.md | 0 .../downloading-installing-upgrading}/upgrade/upgrade-to-r2b2.md | 0 .../downloading-installing-upgrading}/upgrade/upgrade-to-r2b3.md | 0 .../downloading-installing-upgrading}/upgrade/upgrade-to-r3.0.md | 0 .../downloading-installing-upgrading}/upgrade/upgrade-to-r3.1.md | 0 .../downloading-installing-upgrading}/upgrade/upgrade-to-r3.2.md | 0 .../downloading-installing-upgrading}/upgrade/upgrade-to-r4.0.md | 0 .../downloading-installing-upgrading}/upgrade/upgrade.md | 0 .../downloading-installing-upgrading}/version-scheme.md | 0 {hardware => user/hardware}/certified-hardware.md | 0 {hardware => user/hardware}/hcl.html | 0 {hardware => user/hardware}/hcl.md | 0 {hardware => user/hardware}/system-requirements.md | 0 .../templates => user/managing-os/debian}/debian-minimal.md | 0 .../managing-os/debian/debian-upgrade-8-to-9.md | 0 {managing-os/templates => user/managing-os/debian}/debian.md | 0 .../templates => user/managing-os/fedora}/fedora-minimal.md | 0 .../managing-os/fedora/fedora-upgrade-26-to-27.md | 0 .../managing-os/fedora/fedora-upgrade-27-to-28.md | 0 .../managing-os/fedora/fedora-upgrade-28-to-29.md | 0 {managing-os/templates => user/managing-os/fedora}/fedora.md | 0 {managing-os => user/managing-os}/hvm.md | 0 {managing-os => user/managing-os}/reinstall-template.md | 0 {managing-os => user/managing-os}/templates.md | 0 {managing-os => user/managing-os}/windows.md | 0 {reference => user/reference}/glossary.md | 0 {reference => user/reference}/qubes-service.md | 0 {about => user/reference}/research.md | 0 {reference => user/reference}/tools.md | 0 {security => user/security-in-qubes}/anti-evil-maid.md | 0 {security => user/security-in-qubes}/data-leaks.md | 0 {security => user/security-in-qubes}/firewall.md | 0 {security => user/security-in-qubes}/split-gpg.md | 0 {security => user/security-in-qubes}/u2f-proxy.md | 0 203 files changed, 0 insertions(+), 0 deletions(-) rename {building => developer/building}/development-workflow.md (100%) rename {building => developer/building}/qubes-builder-details.md (100%) rename {building => developer/building}/qubes-builder.md (100%) rename {building => developer/building}/qubes-iso-building.md (100%) rename {basics_dev => developer/code}/code-signing.md (100%) rename {basics_dev => developer/code}/coding-style.md (100%) rename {basics_dev => developer/code}/license.md (100%) rename {basics_dev => developer/code}/source-code.md (100%) rename {debugging => developer/debugging}/automated-tests.md (100%) rename {debugging => developer/debugging}/mount-lvm-image.md (100%) rename {debugging => developer/debugging}/profiling.md (100%) rename {debugging => developer/debugging}/safe-remote-ttys.md (100%) rename {debugging => developer/debugging}/test-bench.md (100%) rename {debugging => developer/debugging}/vm-interface.md (100%) rename {debugging => developer/debugging}/windows-debugging.md (100%) rename {basics_dev => developer/general}/devel-books.md (100%) rename {basics_user => developer/general}/doc-guidelines.md (100%) rename {basics_dev => developer/general}/gsoc.md (100%) rename {basics_dev => developer/general}/gsod.md (100%) rename {about => developer/general}/join.md (100%) rename {basics_dev => developer/general}/package-contributions.md (100%) rename {basics_dev => developer/general}/style-guide.md (100%) rename {basics_dev => developer/general}/usability-ux.md (100%) rename {releases => developer/releases}/1.0/release-notes.md (100%) rename {releases => developer/releases}/2.0/release-notes.md (100%) rename {releases => developer/releases}/3.0/release-notes.md (100%) rename {releases => developer/releases}/3.0/schedule.md (100%) rename {releases => developer/releases}/3.1/release-notes.md (100%) rename {releases => developer/releases}/3.1/schedule.md (100%) rename {releases => developer/releases}/3.2/release-notes.md (100%) rename {releases => developer/releases}/3.2/schedule.md (100%) rename {releases => developer/releases}/4.0/release-notes.md (100%) rename {releases => developer/releases}/4.0/schedule.md (100%) rename {releases => developer/releases}/notes.md (100%) rename {releases => developer/releases}/schedules.md (100%) rename {releases => developer/releases}/todo.md (100%) rename {services => developer/services}/admin-api.md (100%) rename {services => developer/services}/dom0-secure-updates.md (100%) rename {services => developer/services}/dvm-impl.md (100%) rename {services => developer/services}/qfilecopy.md (100%) rename {services => developer/services}/qfileexchgd.md (100%) rename {services => developer/services}/qmemman.md (100%) rename {services => developer/services}/qrexec2.md (100%) rename {services => developer/services}/qrexec3.md (100%) rename {system => developer/system}/architecture.md (100%) rename {system => developer/system}/audio.md (100%) rename {system => developer/system}/gui.md (100%) rename {system => developer/system}/networking.md (100%) rename {system => developer/system}/security-critical-code.md (100%) rename {system => developer/system}/storage-pools.md (100%) rename {basics_dev => developer/system}/system-doc.md (100%) rename {system => developer/system}/template-implementation.md (100%) rename {building => external/building}/building-archlinux-template.md (100%) rename {building => external/building}/building-non-fedora-template.md (100%) rename {building => external/building}/building-whonix-template.md (100%) rename {configuration => external/configuration-guides}/change-time-zone.md (100%) rename {configuration => external/configuration-guides}/disk-trim.md (100%) rename {configuration => external/configuration-guides}/external-audio.md (100%) rename {configuration => external/configuration-guides}/fetchmail.md (100%) rename {configuration => external/configuration-guides}/gui-configuration.md (100%) rename {configuration => external/configuration-guides}/multiboot.md (100%) rename {configuration => external/configuration-guides}/multimedia.md (100%) rename {configuration => external/configuration-guides}/mutt.md (100%) rename {configuration => external/configuration-guides}/network-bridge-support.md (100%) rename {configuration => external/configuration-guides}/network-printer.md (100%) rename {configuration => external/configuration-guides}/postfix.md (100%) rename {configuration => external/configuration-guides}/resize-disk-image.md (100%) rename {configuration => external/configuration-guides}/rxvt.md (100%) rename {common-tasks => external/configuration-guides}/tips-and-tricks.md (100%) rename {configuration => external/configuration-guides}/vpn.md (100%) rename {configuration => external/configuration-guides}/w3m.md (100%) rename {configuration => external/configuration-guides}/zfs.md (100%) rename {customization => external/customization-guides}/awesome.md (100%) rename {customization => external/customization-guides}/dark-theme.md (100%) rename {customization => external/customization-guides}/fedora-minimal-template-customization.md (100%) rename {customization => external/customization-guides}/i3.md (100%) rename {customization => external/customization-guides}/kde.md (100%) rename {customization => external/customization-guides}/language-localization.md (100%) rename {customization => external/customization-guides}/removing-templatevm-packages.md (100%) rename {customization => external/customization-guides}/windows-template-customization.md (100%) rename {managing-os/templates => external/managing-os}/archlinux.md (100%) rename {managing-os => external/managing-os}/linux-hvm-tips.md (100%) rename {managing-os => external/managing-os}/netbsd.md (100%) rename {managing-os => external/managing-os}/pentesting.md (100%) rename {managing-os => external/managing-os}/pentesting/blackarch.md (100%) rename {managing-os => external/managing-os}/pentesting/kali.md (100%) rename {managing-os => external/managing-os}/pentesting/ptf.md (100%) rename {managing-os/templates => external/managing-os}/ubuntu.md (100%) rename {managing-os => external/managing-os}/windows/windows-tools.md (100%) rename {managing-os => external/managing-os}/windows/windows-vm.md (100%) rename {privacy => external/privacy-guides}/anonymizing-your-mac-address.md (100%) rename {privacy => external/privacy-guides}/martus.md (100%) rename {privacy => external/privacy-guides}/signal.md (100%) rename {privacy => external/privacy-guides}/tails.md (100%) rename {privacy => external/privacy-guides}/torvm.md (100%) rename {privacy => external/privacy-guides}/whonix.md (100%) rename {security => external/security-guides}/device-handling-security.md (100%) rename {security => external/security-guides}/multifactor-authentication.md (100%) rename {security => external/security-guides}/security-guidelines.md (100%) rename {security => external/security-guides}/split-bitcoin.md (100%) rename {security => external/security-guides}/vm-sudo.md (100%) rename {security => external/security-guides}/yubi-key.md (100%) rename {troubleshooting => external/troubleshooting}/install-nvidia-driver.md (100%) rename {troubleshooting => external/troubleshooting}/intel-igfx-troubleshooting.md (100%) rename {troubleshooting => external/troubleshooting}/macbook-troubleshooting.md (100%) rename {troubleshooting => external/troubleshooting}/newer-hardware-troubleshooting.md (100%) rename {troubleshooting => external/troubleshooting}/nvidia-troubleshooting.md (100%) rename {troubleshooting => external/troubleshooting}/out-of-memory.md (100%) rename {troubleshooting => external/troubleshooting}/remove-vm-manually.md (100%) rename {troubleshooting => external/troubleshooting}/sony-vaio-tinkering.md (100%) rename {troubleshooting => external/troubleshooting}/thinkpad-troubleshooting.md (100%) rename {troubleshooting => external/troubleshooting}/uefi-troubleshooting.md (100%) rename {troubleshooting => external/troubleshooting}/updating-debian-and-whonix.md (100%) rename {troubleshooting => external/troubleshooting}/wireless-troubleshooting.md (100%) rename {about => introduction}/code-of-conduct.md (100%) rename {basics_user => introduction}/contributing.md (100%) rename {about => introduction}/experts.md (100%) rename {about => introduction}/faq.md (100%) rename {basics_user => introduction}/intro.md (100%) rename {basics_user => introduction}/reporting-bugs.md (100%) rename {about => introduction}/screenshots.md (100%) rename {about => introduction}/statistics.md (100%) rename {about => introduction}/support.md (100%) rename {about => introduction}/video-tours.html (100%) rename {security-info => project-security}/canaries.md (100%) rename {security-info => project-security}/canary-checklist.md (100%) rename {security-info => project-security}/canary-template.md (100%) rename {security-info => project-security}/security-bulletins-checklist.md (100%) rename {security-info => project-security}/security-bulletins-template.md (100%) rename {security-info => project-security}/security-bulletins.md (100%) rename {security-info => project-security}/security-goals.md (100%) rename {security-info => project-security}/security-pack.md (100%) rename {security-info => project-security}/security.md (100%) rename {security-info => project-security}/verifying-signatures.md (100%) rename {security-info => project-security}/xsa.md (100%) rename {customization => user/advanced-configuration}/bind-dirs.md (100%) rename {configuration => user/advanced-configuration}/config-files.md (100%) rename {customization => user/advanced-configuration}/disposablevm-customization.md (100%) rename {configuration => user/advanced-configuration}/managing-vm-kernel.md (100%) rename {configuration => user/advanced-configuration}/rpc-policy.md (100%) rename {configuration => user/advanced-configuration}/salt.md (100%) rename {configuration => user/advanced-configuration}/secondary-storage.md (100%) rename {configuration => user/advanced-configuration}/usb-qubes.md (100%) rename {common-tasks => user/common-tasks}/backup-emergency-restore-v2.md (100%) rename {common-tasks => user/common-tasks}/backup-emergency-restore-v3.md (100%) rename {common-tasks => user/common-tasks}/backup-emergency-restore-v4.md (100%) rename {common-tasks => user/common-tasks}/backup-restore.md (100%) rename {common-tasks => user/common-tasks}/block-devices.md (100%) rename {common-tasks => user/common-tasks}/copy-from-dom0.md (100%) rename {common-tasks => user/common-tasks}/copy-paste.md (100%) rename {common-tasks => user/common-tasks}/copying-files.md (100%) rename {common-tasks => user/common-tasks}/device-handling.md (100%) rename {common-tasks => user/common-tasks}/disposablevm.md (100%) rename {common-tasks => user/common-tasks}/full-screen-mode.md (100%) rename {basics_user => user/common-tasks}/getting-started.md (100%) rename {common-tasks => user/common-tasks}/managing-appvm-shortcuts.md (100%) rename {common-tasks => user/common-tasks}/optical-discs.md (100%) rename {common-tasks => user/common-tasks}/pci-devices.md (100%) rename {common-tasks => user/common-tasks}/software-update-dom0.md (100%) rename {common-tasks => user/common-tasks}/software-update-vm.md (100%) rename {common-tasks => user/common-tasks}/usb-devices.md (100%) rename {installing => user/downloading-installing-upgrading}/custom-install.md (100%) rename {about => user/downloading-installing-upgrading}/download-mirrors.md (100%) rename {installing => user/downloading-installing-upgrading}/install-security.md (100%) rename {installing => user/downloading-installing-upgrading}/installation-guide.md (100%) rename {installing => user/downloading-installing-upgrading}/live-usb.md (100%) rename {installing => user/downloading-installing-upgrading}/supported-versions.md (100%) rename {basics_user => user/downloading-installing-upgrading}/testing.md (100%) rename {installing => user/downloading-installing-upgrading}/upgrade/upgrade-to-r2.md (100%) rename {installing => user/downloading-installing-upgrading}/upgrade/upgrade-to-r2b1.md (100%) rename {installing => user/downloading-installing-upgrading}/upgrade/upgrade-to-r2b2.md (100%) rename {installing => user/downloading-installing-upgrading}/upgrade/upgrade-to-r2b3.md (100%) rename {installing => user/downloading-installing-upgrading}/upgrade/upgrade-to-r3.0.md (100%) rename {installing => user/downloading-installing-upgrading}/upgrade/upgrade-to-r3.1.md (100%) rename {installing => user/downloading-installing-upgrading}/upgrade/upgrade-to-r3.2.md (100%) rename {installing => user/downloading-installing-upgrading}/upgrade/upgrade-to-r4.0.md (100%) rename {installing => user/downloading-installing-upgrading}/upgrade/upgrade.md (100%) rename {installing => user/downloading-installing-upgrading}/version-scheme.md (100%) rename {hardware => user/hardware}/certified-hardware.md (100%) rename {hardware => user/hardware}/hcl.html (100%) rename {hardware => user/hardware}/hcl.md (100%) rename {hardware => user/hardware}/system-requirements.md (100%) rename {managing-os/templates => user/managing-os/debian}/debian-minimal.md (100%) rename managing-os/templates/debian/upgrade-8-to-9.md => user/managing-os/debian/debian-upgrade-8-to-9.md (100%) rename {managing-os/templates => user/managing-os/debian}/debian.md (100%) rename {managing-os/templates => user/managing-os/fedora}/fedora-minimal.md (100%) rename managing-os/templates/fedora/upgrade-26-to-27.md => user/managing-os/fedora/fedora-upgrade-26-to-27.md (100%) rename managing-os/templates/fedora/upgrade-27-to-28.md => user/managing-os/fedora/fedora-upgrade-27-to-28.md (100%) rename managing-os/templates/fedora/upgrade-28-to-29.md => user/managing-os/fedora/fedora-upgrade-28-to-29.md (100%) rename {managing-os/templates => user/managing-os/fedora}/fedora.md (100%) rename {managing-os => user/managing-os}/hvm.md (100%) rename {managing-os => user/managing-os}/reinstall-template.md (100%) rename {managing-os => user/managing-os}/templates.md (100%) rename {managing-os => user/managing-os}/windows.md (100%) rename {reference => user/reference}/glossary.md (100%) rename {reference => user/reference}/qubes-service.md (100%) rename {about => user/reference}/research.md (100%) rename {reference => user/reference}/tools.md (100%) rename {security => user/security-in-qubes}/anti-evil-maid.md (100%) rename {security => user/security-in-qubes}/data-leaks.md (100%) rename {security => user/security-in-qubes}/firewall.md (100%) rename {security => user/security-in-qubes}/split-gpg.md (100%) rename {security => user/security-in-qubes}/u2f-proxy.md (100%) diff --git a/building/development-workflow.md b/developer/building/development-workflow.md similarity index 100% rename from building/development-workflow.md rename to developer/building/development-workflow.md diff --git a/building/qubes-builder-details.md b/developer/building/qubes-builder-details.md similarity index 100% rename from building/qubes-builder-details.md rename to developer/building/qubes-builder-details.md diff --git a/building/qubes-builder.md b/developer/building/qubes-builder.md similarity index 100% rename from building/qubes-builder.md rename to developer/building/qubes-builder.md diff --git a/building/qubes-iso-building.md b/developer/building/qubes-iso-building.md similarity index 100% rename from building/qubes-iso-building.md rename to developer/building/qubes-iso-building.md diff --git a/basics_dev/code-signing.md b/developer/code/code-signing.md similarity index 100% rename from basics_dev/code-signing.md rename to developer/code/code-signing.md diff --git a/basics_dev/coding-style.md b/developer/code/coding-style.md similarity index 100% rename from basics_dev/coding-style.md rename to developer/code/coding-style.md diff --git a/basics_dev/license.md b/developer/code/license.md similarity index 100% rename from basics_dev/license.md rename to developer/code/license.md diff --git a/basics_dev/source-code.md b/developer/code/source-code.md similarity index 100% rename from basics_dev/source-code.md rename to developer/code/source-code.md diff --git a/debugging/automated-tests.md b/developer/debugging/automated-tests.md similarity index 100% rename from debugging/automated-tests.md rename to developer/debugging/automated-tests.md diff --git a/debugging/mount-lvm-image.md b/developer/debugging/mount-lvm-image.md similarity index 100% rename from debugging/mount-lvm-image.md rename to developer/debugging/mount-lvm-image.md diff --git a/debugging/profiling.md b/developer/debugging/profiling.md similarity index 100% rename from debugging/profiling.md rename to developer/debugging/profiling.md diff --git a/debugging/safe-remote-ttys.md b/developer/debugging/safe-remote-ttys.md similarity index 100% rename from debugging/safe-remote-ttys.md rename to developer/debugging/safe-remote-ttys.md diff --git a/debugging/test-bench.md b/developer/debugging/test-bench.md similarity index 100% rename from debugging/test-bench.md rename to developer/debugging/test-bench.md diff --git a/debugging/vm-interface.md b/developer/debugging/vm-interface.md similarity index 100% rename from debugging/vm-interface.md rename to developer/debugging/vm-interface.md diff --git a/debugging/windows-debugging.md b/developer/debugging/windows-debugging.md similarity index 100% rename from debugging/windows-debugging.md rename to developer/debugging/windows-debugging.md diff --git a/basics_dev/devel-books.md b/developer/general/devel-books.md similarity index 100% rename from basics_dev/devel-books.md rename to developer/general/devel-books.md diff --git a/basics_user/doc-guidelines.md b/developer/general/doc-guidelines.md similarity index 100% rename from basics_user/doc-guidelines.md rename to developer/general/doc-guidelines.md diff --git a/basics_dev/gsoc.md b/developer/general/gsoc.md similarity index 100% rename from basics_dev/gsoc.md rename to developer/general/gsoc.md diff --git a/basics_dev/gsod.md b/developer/general/gsod.md similarity index 100% rename from basics_dev/gsod.md rename to developer/general/gsod.md diff --git a/about/join.md b/developer/general/join.md similarity index 100% rename from about/join.md rename to developer/general/join.md diff --git a/basics_dev/package-contributions.md b/developer/general/package-contributions.md similarity index 100% rename from basics_dev/package-contributions.md rename to developer/general/package-contributions.md diff --git a/basics_dev/style-guide.md b/developer/general/style-guide.md similarity index 100% rename from basics_dev/style-guide.md rename to developer/general/style-guide.md diff --git a/basics_dev/usability-ux.md b/developer/general/usability-ux.md similarity index 100% rename from basics_dev/usability-ux.md rename to developer/general/usability-ux.md diff --git a/releases/1.0/release-notes.md b/developer/releases/1.0/release-notes.md similarity index 100% rename from releases/1.0/release-notes.md rename to developer/releases/1.0/release-notes.md diff --git a/releases/2.0/release-notes.md b/developer/releases/2.0/release-notes.md similarity index 100% rename from releases/2.0/release-notes.md rename to developer/releases/2.0/release-notes.md diff --git a/releases/3.0/release-notes.md b/developer/releases/3.0/release-notes.md similarity index 100% rename from releases/3.0/release-notes.md rename to developer/releases/3.0/release-notes.md diff --git a/releases/3.0/schedule.md b/developer/releases/3.0/schedule.md similarity index 100% rename from releases/3.0/schedule.md rename to developer/releases/3.0/schedule.md diff --git a/releases/3.1/release-notes.md b/developer/releases/3.1/release-notes.md similarity index 100% rename from releases/3.1/release-notes.md rename to developer/releases/3.1/release-notes.md diff --git a/releases/3.1/schedule.md b/developer/releases/3.1/schedule.md similarity index 100% rename from releases/3.1/schedule.md rename to developer/releases/3.1/schedule.md diff --git a/releases/3.2/release-notes.md b/developer/releases/3.2/release-notes.md similarity index 100% rename from releases/3.2/release-notes.md rename to developer/releases/3.2/release-notes.md diff --git a/releases/3.2/schedule.md b/developer/releases/3.2/schedule.md similarity index 100% rename from releases/3.2/schedule.md rename to developer/releases/3.2/schedule.md diff --git a/releases/4.0/release-notes.md b/developer/releases/4.0/release-notes.md similarity index 100% rename from releases/4.0/release-notes.md rename to developer/releases/4.0/release-notes.md diff --git a/releases/4.0/schedule.md b/developer/releases/4.0/schedule.md similarity index 100% rename from releases/4.0/schedule.md rename to developer/releases/4.0/schedule.md diff --git a/releases/notes.md b/developer/releases/notes.md similarity index 100% rename from releases/notes.md rename to developer/releases/notes.md diff --git a/releases/schedules.md b/developer/releases/schedules.md similarity index 100% rename from releases/schedules.md rename to developer/releases/schedules.md diff --git a/releases/todo.md b/developer/releases/todo.md similarity index 100% rename from releases/todo.md rename to developer/releases/todo.md diff --git a/services/admin-api.md b/developer/services/admin-api.md similarity index 100% rename from services/admin-api.md rename to developer/services/admin-api.md diff --git a/services/dom0-secure-updates.md b/developer/services/dom0-secure-updates.md similarity index 100% rename from services/dom0-secure-updates.md rename to developer/services/dom0-secure-updates.md diff --git a/services/dvm-impl.md b/developer/services/dvm-impl.md similarity index 100% rename from services/dvm-impl.md rename to developer/services/dvm-impl.md diff --git a/services/qfilecopy.md b/developer/services/qfilecopy.md similarity index 100% rename from services/qfilecopy.md rename to developer/services/qfilecopy.md diff --git a/services/qfileexchgd.md b/developer/services/qfileexchgd.md similarity index 100% rename from services/qfileexchgd.md rename to developer/services/qfileexchgd.md diff --git a/services/qmemman.md b/developer/services/qmemman.md similarity index 100% rename from services/qmemman.md rename to developer/services/qmemman.md diff --git a/services/qrexec2.md b/developer/services/qrexec2.md similarity index 100% rename from services/qrexec2.md rename to developer/services/qrexec2.md diff --git a/services/qrexec3.md b/developer/services/qrexec3.md similarity index 100% rename from services/qrexec3.md rename to developer/services/qrexec3.md diff --git a/system/architecture.md b/developer/system/architecture.md similarity index 100% rename from system/architecture.md rename to developer/system/architecture.md diff --git a/system/audio.md b/developer/system/audio.md similarity index 100% rename from system/audio.md rename to developer/system/audio.md diff --git a/system/gui.md b/developer/system/gui.md similarity index 100% rename from system/gui.md rename to developer/system/gui.md diff --git a/system/networking.md b/developer/system/networking.md similarity index 100% rename from system/networking.md rename to developer/system/networking.md diff --git a/system/security-critical-code.md b/developer/system/security-critical-code.md similarity index 100% rename from system/security-critical-code.md rename to developer/system/security-critical-code.md diff --git a/system/storage-pools.md b/developer/system/storage-pools.md similarity index 100% rename from system/storage-pools.md rename to developer/system/storage-pools.md diff --git a/basics_dev/system-doc.md b/developer/system/system-doc.md similarity index 100% rename from basics_dev/system-doc.md rename to developer/system/system-doc.md diff --git a/system/template-implementation.md b/developer/system/template-implementation.md similarity index 100% rename from system/template-implementation.md rename to developer/system/template-implementation.md diff --git a/building/building-archlinux-template.md b/external/building/building-archlinux-template.md similarity index 100% rename from building/building-archlinux-template.md rename to external/building/building-archlinux-template.md diff --git a/building/building-non-fedora-template.md b/external/building/building-non-fedora-template.md similarity index 100% rename from building/building-non-fedora-template.md rename to external/building/building-non-fedora-template.md diff --git a/building/building-whonix-template.md b/external/building/building-whonix-template.md similarity index 100% rename from building/building-whonix-template.md rename to external/building/building-whonix-template.md diff --git a/configuration/change-time-zone.md b/external/configuration-guides/change-time-zone.md similarity index 100% rename from configuration/change-time-zone.md rename to external/configuration-guides/change-time-zone.md diff --git a/configuration/disk-trim.md b/external/configuration-guides/disk-trim.md similarity index 100% rename from configuration/disk-trim.md rename to external/configuration-guides/disk-trim.md diff --git a/configuration/external-audio.md b/external/configuration-guides/external-audio.md similarity index 100% rename from configuration/external-audio.md rename to external/configuration-guides/external-audio.md diff --git a/configuration/fetchmail.md b/external/configuration-guides/fetchmail.md similarity index 100% rename from configuration/fetchmail.md rename to external/configuration-guides/fetchmail.md diff --git a/configuration/gui-configuration.md b/external/configuration-guides/gui-configuration.md similarity index 100% rename from configuration/gui-configuration.md rename to external/configuration-guides/gui-configuration.md diff --git a/configuration/multiboot.md b/external/configuration-guides/multiboot.md similarity index 100% rename from configuration/multiboot.md rename to external/configuration-guides/multiboot.md diff --git a/configuration/multimedia.md b/external/configuration-guides/multimedia.md similarity index 100% rename from configuration/multimedia.md rename to external/configuration-guides/multimedia.md diff --git a/configuration/mutt.md b/external/configuration-guides/mutt.md similarity index 100% rename from configuration/mutt.md rename to external/configuration-guides/mutt.md diff --git a/configuration/network-bridge-support.md b/external/configuration-guides/network-bridge-support.md similarity index 100% rename from configuration/network-bridge-support.md rename to external/configuration-guides/network-bridge-support.md diff --git a/configuration/network-printer.md b/external/configuration-guides/network-printer.md similarity index 100% rename from configuration/network-printer.md rename to external/configuration-guides/network-printer.md diff --git a/configuration/postfix.md b/external/configuration-guides/postfix.md similarity index 100% rename from configuration/postfix.md rename to external/configuration-guides/postfix.md diff --git a/configuration/resize-disk-image.md b/external/configuration-guides/resize-disk-image.md similarity index 100% rename from configuration/resize-disk-image.md rename to external/configuration-guides/resize-disk-image.md diff --git a/configuration/rxvt.md b/external/configuration-guides/rxvt.md similarity index 100% rename from configuration/rxvt.md rename to external/configuration-guides/rxvt.md diff --git a/common-tasks/tips-and-tricks.md b/external/configuration-guides/tips-and-tricks.md similarity index 100% rename from common-tasks/tips-and-tricks.md rename to external/configuration-guides/tips-and-tricks.md diff --git a/configuration/vpn.md b/external/configuration-guides/vpn.md similarity index 100% rename from configuration/vpn.md rename to external/configuration-guides/vpn.md diff --git a/configuration/w3m.md b/external/configuration-guides/w3m.md similarity index 100% rename from configuration/w3m.md rename to external/configuration-guides/w3m.md diff --git a/configuration/zfs.md b/external/configuration-guides/zfs.md similarity index 100% rename from configuration/zfs.md rename to external/configuration-guides/zfs.md diff --git a/customization/awesome.md b/external/customization-guides/awesome.md similarity index 100% rename from customization/awesome.md rename to external/customization-guides/awesome.md diff --git a/customization/dark-theme.md b/external/customization-guides/dark-theme.md similarity index 100% rename from customization/dark-theme.md rename to external/customization-guides/dark-theme.md diff --git a/customization/fedora-minimal-template-customization.md b/external/customization-guides/fedora-minimal-template-customization.md similarity index 100% rename from customization/fedora-minimal-template-customization.md rename to external/customization-guides/fedora-minimal-template-customization.md diff --git a/customization/i3.md b/external/customization-guides/i3.md similarity index 100% rename from customization/i3.md rename to external/customization-guides/i3.md diff --git a/customization/kde.md b/external/customization-guides/kde.md similarity index 100% rename from customization/kde.md rename to external/customization-guides/kde.md diff --git a/customization/language-localization.md b/external/customization-guides/language-localization.md similarity index 100% rename from customization/language-localization.md rename to external/customization-guides/language-localization.md diff --git a/customization/removing-templatevm-packages.md b/external/customization-guides/removing-templatevm-packages.md similarity index 100% rename from customization/removing-templatevm-packages.md rename to external/customization-guides/removing-templatevm-packages.md diff --git a/customization/windows-template-customization.md b/external/customization-guides/windows-template-customization.md similarity index 100% rename from customization/windows-template-customization.md rename to external/customization-guides/windows-template-customization.md diff --git a/managing-os/templates/archlinux.md b/external/managing-os/archlinux.md similarity index 100% rename from managing-os/templates/archlinux.md rename to external/managing-os/archlinux.md diff --git a/managing-os/linux-hvm-tips.md b/external/managing-os/linux-hvm-tips.md similarity index 100% rename from managing-os/linux-hvm-tips.md rename to external/managing-os/linux-hvm-tips.md diff --git a/managing-os/netbsd.md b/external/managing-os/netbsd.md similarity index 100% rename from managing-os/netbsd.md rename to external/managing-os/netbsd.md diff --git a/managing-os/pentesting.md b/external/managing-os/pentesting.md similarity index 100% rename from managing-os/pentesting.md rename to external/managing-os/pentesting.md diff --git a/managing-os/pentesting/blackarch.md b/external/managing-os/pentesting/blackarch.md similarity index 100% rename from managing-os/pentesting/blackarch.md rename to external/managing-os/pentesting/blackarch.md diff --git a/managing-os/pentesting/kali.md b/external/managing-os/pentesting/kali.md similarity index 100% rename from managing-os/pentesting/kali.md rename to external/managing-os/pentesting/kali.md diff --git a/managing-os/pentesting/ptf.md b/external/managing-os/pentesting/ptf.md similarity index 100% rename from managing-os/pentesting/ptf.md rename to external/managing-os/pentesting/ptf.md diff --git a/managing-os/templates/ubuntu.md b/external/managing-os/ubuntu.md similarity index 100% rename from managing-os/templates/ubuntu.md rename to external/managing-os/ubuntu.md diff --git a/managing-os/windows/windows-tools.md b/external/managing-os/windows/windows-tools.md similarity index 100% rename from managing-os/windows/windows-tools.md rename to external/managing-os/windows/windows-tools.md diff --git a/managing-os/windows/windows-vm.md b/external/managing-os/windows/windows-vm.md similarity index 100% rename from managing-os/windows/windows-vm.md rename to external/managing-os/windows/windows-vm.md diff --git a/privacy/anonymizing-your-mac-address.md b/external/privacy-guides/anonymizing-your-mac-address.md similarity index 100% rename from privacy/anonymizing-your-mac-address.md rename to external/privacy-guides/anonymizing-your-mac-address.md diff --git a/privacy/martus.md b/external/privacy-guides/martus.md similarity index 100% rename from privacy/martus.md rename to external/privacy-guides/martus.md diff --git a/privacy/signal.md b/external/privacy-guides/signal.md similarity index 100% rename from privacy/signal.md rename to external/privacy-guides/signal.md diff --git a/privacy/tails.md b/external/privacy-guides/tails.md similarity index 100% rename from privacy/tails.md rename to external/privacy-guides/tails.md diff --git a/privacy/torvm.md b/external/privacy-guides/torvm.md similarity index 100% rename from privacy/torvm.md rename to external/privacy-guides/torvm.md diff --git a/privacy/whonix.md b/external/privacy-guides/whonix.md similarity index 100% rename from privacy/whonix.md rename to external/privacy-guides/whonix.md diff --git a/security/device-handling-security.md b/external/security-guides/device-handling-security.md similarity index 100% rename from security/device-handling-security.md rename to external/security-guides/device-handling-security.md diff --git a/security/multifactor-authentication.md b/external/security-guides/multifactor-authentication.md similarity index 100% rename from security/multifactor-authentication.md rename to external/security-guides/multifactor-authentication.md diff --git a/security/security-guidelines.md b/external/security-guides/security-guidelines.md similarity index 100% rename from security/security-guidelines.md rename to external/security-guides/security-guidelines.md diff --git a/security/split-bitcoin.md b/external/security-guides/split-bitcoin.md similarity index 100% rename from security/split-bitcoin.md rename to external/security-guides/split-bitcoin.md diff --git a/security/vm-sudo.md b/external/security-guides/vm-sudo.md similarity index 100% rename from security/vm-sudo.md rename to external/security-guides/vm-sudo.md diff --git a/security/yubi-key.md b/external/security-guides/yubi-key.md similarity index 100% rename from security/yubi-key.md rename to external/security-guides/yubi-key.md diff --git a/troubleshooting/install-nvidia-driver.md b/external/troubleshooting/install-nvidia-driver.md similarity index 100% rename from troubleshooting/install-nvidia-driver.md rename to external/troubleshooting/install-nvidia-driver.md diff --git a/troubleshooting/intel-igfx-troubleshooting.md b/external/troubleshooting/intel-igfx-troubleshooting.md similarity index 100% rename from troubleshooting/intel-igfx-troubleshooting.md rename to external/troubleshooting/intel-igfx-troubleshooting.md diff --git a/troubleshooting/macbook-troubleshooting.md b/external/troubleshooting/macbook-troubleshooting.md similarity index 100% rename from troubleshooting/macbook-troubleshooting.md rename to external/troubleshooting/macbook-troubleshooting.md diff --git a/troubleshooting/newer-hardware-troubleshooting.md b/external/troubleshooting/newer-hardware-troubleshooting.md similarity index 100% rename from troubleshooting/newer-hardware-troubleshooting.md rename to external/troubleshooting/newer-hardware-troubleshooting.md diff --git a/troubleshooting/nvidia-troubleshooting.md b/external/troubleshooting/nvidia-troubleshooting.md similarity index 100% rename from troubleshooting/nvidia-troubleshooting.md rename to external/troubleshooting/nvidia-troubleshooting.md diff --git a/troubleshooting/out-of-memory.md b/external/troubleshooting/out-of-memory.md similarity index 100% rename from troubleshooting/out-of-memory.md rename to external/troubleshooting/out-of-memory.md diff --git a/troubleshooting/remove-vm-manually.md b/external/troubleshooting/remove-vm-manually.md similarity index 100% rename from troubleshooting/remove-vm-manually.md rename to external/troubleshooting/remove-vm-manually.md diff --git a/troubleshooting/sony-vaio-tinkering.md b/external/troubleshooting/sony-vaio-tinkering.md similarity index 100% rename from troubleshooting/sony-vaio-tinkering.md rename to external/troubleshooting/sony-vaio-tinkering.md diff --git a/troubleshooting/thinkpad-troubleshooting.md b/external/troubleshooting/thinkpad-troubleshooting.md similarity index 100% rename from troubleshooting/thinkpad-troubleshooting.md rename to external/troubleshooting/thinkpad-troubleshooting.md diff --git a/troubleshooting/uefi-troubleshooting.md b/external/troubleshooting/uefi-troubleshooting.md similarity index 100% rename from troubleshooting/uefi-troubleshooting.md rename to external/troubleshooting/uefi-troubleshooting.md diff --git a/troubleshooting/updating-debian-and-whonix.md b/external/troubleshooting/updating-debian-and-whonix.md similarity index 100% rename from troubleshooting/updating-debian-and-whonix.md rename to external/troubleshooting/updating-debian-and-whonix.md diff --git a/troubleshooting/wireless-troubleshooting.md b/external/troubleshooting/wireless-troubleshooting.md similarity index 100% rename from troubleshooting/wireless-troubleshooting.md rename to external/troubleshooting/wireless-troubleshooting.md diff --git a/about/code-of-conduct.md b/introduction/code-of-conduct.md similarity index 100% rename from about/code-of-conduct.md rename to introduction/code-of-conduct.md diff --git a/basics_user/contributing.md b/introduction/contributing.md similarity index 100% rename from basics_user/contributing.md rename to introduction/contributing.md diff --git a/about/experts.md b/introduction/experts.md similarity index 100% rename from about/experts.md rename to introduction/experts.md diff --git a/about/faq.md b/introduction/faq.md similarity index 100% rename from about/faq.md rename to introduction/faq.md diff --git a/basics_user/intro.md b/introduction/intro.md similarity index 100% rename from basics_user/intro.md rename to introduction/intro.md diff --git a/basics_user/reporting-bugs.md b/introduction/reporting-bugs.md similarity index 100% rename from basics_user/reporting-bugs.md rename to introduction/reporting-bugs.md diff --git a/about/screenshots.md b/introduction/screenshots.md similarity index 100% rename from about/screenshots.md rename to introduction/screenshots.md diff --git a/about/statistics.md b/introduction/statistics.md similarity index 100% rename from about/statistics.md rename to introduction/statistics.md diff --git a/about/support.md b/introduction/support.md similarity index 100% rename from about/support.md rename to introduction/support.md diff --git a/about/video-tours.html b/introduction/video-tours.html similarity index 100% rename from about/video-tours.html rename to introduction/video-tours.html diff --git a/security-info/canaries.md b/project-security/canaries.md similarity index 100% rename from security-info/canaries.md rename to project-security/canaries.md diff --git a/security-info/canary-checklist.md b/project-security/canary-checklist.md similarity index 100% rename from security-info/canary-checklist.md rename to project-security/canary-checklist.md diff --git a/security-info/canary-template.md b/project-security/canary-template.md similarity index 100% rename from security-info/canary-template.md rename to project-security/canary-template.md diff --git a/security-info/security-bulletins-checklist.md b/project-security/security-bulletins-checklist.md similarity index 100% rename from security-info/security-bulletins-checklist.md rename to project-security/security-bulletins-checklist.md diff --git a/security-info/security-bulletins-template.md b/project-security/security-bulletins-template.md similarity index 100% rename from security-info/security-bulletins-template.md rename to project-security/security-bulletins-template.md diff --git a/security-info/security-bulletins.md b/project-security/security-bulletins.md similarity index 100% rename from security-info/security-bulletins.md rename to project-security/security-bulletins.md diff --git a/security-info/security-goals.md b/project-security/security-goals.md similarity index 100% rename from security-info/security-goals.md rename to project-security/security-goals.md diff --git a/security-info/security-pack.md b/project-security/security-pack.md similarity index 100% rename from security-info/security-pack.md rename to project-security/security-pack.md diff --git a/security-info/security.md b/project-security/security.md similarity index 100% rename from security-info/security.md rename to project-security/security.md diff --git a/security-info/verifying-signatures.md b/project-security/verifying-signatures.md similarity index 100% rename from security-info/verifying-signatures.md rename to project-security/verifying-signatures.md diff --git a/security-info/xsa.md b/project-security/xsa.md similarity index 100% rename from security-info/xsa.md rename to project-security/xsa.md diff --git a/customization/bind-dirs.md b/user/advanced-configuration/bind-dirs.md similarity index 100% rename from customization/bind-dirs.md rename to user/advanced-configuration/bind-dirs.md diff --git a/configuration/config-files.md b/user/advanced-configuration/config-files.md similarity index 100% rename from configuration/config-files.md rename to user/advanced-configuration/config-files.md diff --git a/customization/disposablevm-customization.md b/user/advanced-configuration/disposablevm-customization.md similarity index 100% rename from customization/disposablevm-customization.md rename to user/advanced-configuration/disposablevm-customization.md diff --git a/configuration/managing-vm-kernel.md b/user/advanced-configuration/managing-vm-kernel.md similarity index 100% rename from configuration/managing-vm-kernel.md rename to user/advanced-configuration/managing-vm-kernel.md diff --git a/configuration/rpc-policy.md b/user/advanced-configuration/rpc-policy.md similarity index 100% rename from configuration/rpc-policy.md rename to user/advanced-configuration/rpc-policy.md diff --git a/configuration/salt.md b/user/advanced-configuration/salt.md similarity index 100% rename from configuration/salt.md rename to user/advanced-configuration/salt.md diff --git a/configuration/secondary-storage.md b/user/advanced-configuration/secondary-storage.md similarity index 100% rename from configuration/secondary-storage.md rename to user/advanced-configuration/secondary-storage.md diff --git a/configuration/usb-qubes.md b/user/advanced-configuration/usb-qubes.md similarity index 100% rename from configuration/usb-qubes.md rename to user/advanced-configuration/usb-qubes.md diff --git a/common-tasks/backup-emergency-restore-v2.md b/user/common-tasks/backup-emergency-restore-v2.md similarity index 100% rename from common-tasks/backup-emergency-restore-v2.md rename to user/common-tasks/backup-emergency-restore-v2.md diff --git a/common-tasks/backup-emergency-restore-v3.md b/user/common-tasks/backup-emergency-restore-v3.md similarity index 100% rename from common-tasks/backup-emergency-restore-v3.md rename to user/common-tasks/backup-emergency-restore-v3.md diff --git a/common-tasks/backup-emergency-restore-v4.md b/user/common-tasks/backup-emergency-restore-v4.md similarity index 100% rename from common-tasks/backup-emergency-restore-v4.md rename to user/common-tasks/backup-emergency-restore-v4.md diff --git a/common-tasks/backup-restore.md b/user/common-tasks/backup-restore.md similarity index 100% rename from common-tasks/backup-restore.md rename to user/common-tasks/backup-restore.md diff --git a/common-tasks/block-devices.md b/user/common-tasks/block-devices.md similarity index 100% rename from common-tasks/block-devices.md rename to user/common-tasks/block-devices.md diff --git a/common-tasks/copy-from-dom0.md b/user/common-tasks/copy-from-dom0.md similarity index 100% rename from common-tasks/copy-from-dom0.md rename to user/common-tasks/copy-from-dom0.md diff --git a/common-tasks/copy-paste.md b/user/common-tasks/copy-paste.md similarity index 100% rename from common-tasks/copy-paste.md rename to user/common-tasks/copy-paste.md diff --git a/common-tasks/copying-files.md b/user/common-tasks/copying-files.md similarity index 100% rename from common-tasks/copying-files.md rename to user/common-tasks/copying-files.md diff --git a/common-tasks/device-handling.md b/user/common-tasks/device-handling.md similarity index 100% rename from common-tasks/device-handling.md rename to user/common-tasks/device-handling.md diff --git a/common-tasks/disposablevm.md b/user/common-tasks/disposablevm.md similarity index 100% rename from common-tasks/disposablevm.md rename to user/common-tasks/disposablevm.md diff --git a/common-tasks/full-screen-mode.md b/user/common-tasks/full-screen-mode.md similarity index 100% rename from common-tasks/full-screen-mode.md rename to user/common-tasks/full-screen-mode.md diff --git a/basics_user/getting-started.md b/user/common-tasks/getting-started.md similarity index 100% rename from basics_user/getting-started.md rename to user/common-tasks/getting-started.md diff --git a/common-tasks/managing-appvm-shortcuts.md b/user/common-tasks/managing-appvm-shortcuts.md similarity index 100% rename from common-tasks/managing-appvm-shortcuts.md rename to user/common-tasks/managing-appvm-shortcuts.md diff --git a/common-tasks/optical-discs.md b/user/common-tasks/optical-discs.md similarity index 100% rename from common-tasks/optical-discs.md rename to user/common-tasks/optical-discs.md diff --git a/common-tasks/pci-devices.md b/user/common-tasks/pci-devices.md similarity index 100% rename from common-tasks/pci-devices.md rename to user/common-tasks/pci-devices.md diff --git a/common-tasks/software-update-dom0.md b/user/common-tasks/software-update-dom0.md similarity index 100% rename from common-tasks/software-update-dom0.md rename to user/common-tasks/software-update-dom0.md diff --git a/common-tasks/software-update-vm.md b/user/common-tasks/software-update-vm.md similarity index 100% rename from common-tasks/software-update-vm.md rename to user/common-tasks/software-update-vm.md diff --git a/common-tasks/usb-devices.md b/user/common-tasks/usb-devices.md similarity index 100% rename from common-tasks/usb-devices.md rename to user/common-tasks/usb-devices.md diff --git a/installing/custom-install.md b/user/downloading-installing-upgrading/custom-install.md similarity index 100% rename from installing/custom-install.md rename to user/downloading-installing-upgrading/custom-install.md diff --git a/about/download-mirrors.md b/user/downloading-installing-upgrading/download-mirrors.md similarity index 100% rename from about/download-mirrors.md rename to user/downloading-installing-upgrading/download-mirrors.md diff --git a/installing/install-security.md b/user/downloading-installing-upgrading/install-security.md similarity index 100% rename from installing/install-security.md rename to user/downloading-installing-upgrading/install-security.md diff --git a/installing/installation-guide.md b/user/downloading-installing-upgrading/installation-guide.md similarity index 100% rename from installing/installation-guide.md rename to user/downloading-installing-upgrading/installation-guide.md diff --git a/installing/live-usb.md b/user/downloading-installing-upgrading/live-usb.md similarity index 100% rename from installing/live-usb.md rename to user/downloading-installing-upgrading/live-usb.md diff --git a/installing/supported-versions.md b/user/downloading-installing-upgrading/supported-versions.md similarity index 100% rename from installing/supported-versions.md rename to user/downloading-installing-upgrading/supported-versions.md diff --git a/basics_user/testing.md b/user/downloading-installing-upgrading/testing.md similarity index 100% rename from basics_user/testing.md rename to user/downloading-installing-upgrading/testing.md diff --git a/installing/upgrade/upgrade-to-r2.md b/user/downloading-installing-upgrading/upgrade/upgrade-to-r2.md similarity index 100% rename from installing/upgrade/upgrade-to-r2.md rename to user/downloading-installing-upgrading/upgrade/upgrade-to-r2.md diff --git a/installing/upgrade/upgrade-to-r2b1.md b/user/downloading-installing-upgrading/upgrade/upgrade-to-r2b1.md similarity index 100% rename from installing/upgrade/upgrade-to-r2b1.md rename to user/downloading-installing-upgrading/upgrade/upgrade-to-r2b1.md diff --git a/installing/upgrade/upgrade-to-r2b2.md b/user/downloading-installing-upgrading/upgrade/upgrade-to-r2b2.md similarity index 100% rename from installing/upgrade/upgrade-to-r2b2.md rename to user/downloading-installing-upgrading/upgrade/upgrade-to-r2b2.md diff --git a/installing/upgrade/upgrade-to-r2b3.md b/user/downloading-installing-upgrading/upgrade/upgrade-to-r2b3.md similarity index 100% rename from installing/upgrade/upgrade-to-r2b3.md rename to user/downloading-installing-upgrading/upgrade/upgrade-to-r2b3.md diff --git a/installing/upgrade/upgrade-to-r3.0.md b/user/downloading-installing-upgrading/upgrade/upgrade-to-r3.0.md similarity index 100% rename from installing/upgrade/upgrade-to-r3.0.md rename to user/downloading-installing-upgrading/upgrade/upgrade-to-r3.0.md diff --git a/installing/upgrade/upgrade-to-r3.1.md b/user/downloading-installing-upgrading/upgrade/upgrade-to-r3.1.md similarity index 100% rename from installing/upgrade/upgrade-to-r3.1.md rename to user/downloading-installing-upgrading/upgrade/upgrade-to-r3.1.md diff --git a/installing/upgrade/upgrade-to-r3.2.md b/user/downloading-installing-upgrading/upgrade/upgrade-to-r3.2.md similarity index 100% rename from installing/upgrade/upgrade-to-r3.2.md rename to user/downloading-installing-upgrading/upgrade/upgrade-to-r3.2.md diff --git a/installing/upgrade/upgrade-to-r4.0.md b/user/downloading-installing-upgrading/upgrade/upgrade-to-r4.0.md similarity index 100% rename from installing/upgrade/upgrade-to-r4.0.md rename to user/downloading-installing-upgrading/upgrade/upgrade-to-r4.0.md diff --git a/installing/upgrade/upgrade.md b/user/downloading-installing-upgrading/upgrade/upgrade.md similarity index 100% rename from installing/upgrade/upgrade.md rename to user/downloading-installing-upgrading/upgrade/upgrade.md diff --git a/installing/version-scheme.md b/user/downloading-installing-upgrading/version-scheme.md similarity index 100% rename from installing/version-scheme.md rename to user/downloading-installing-upgrading/version-scheme.md diff --git a/hardware/certified-hardware.md b/user/hardware/certified-hardware.md similarity index 100% rename from hardware/certified-hardware.md rename to user/hardware/certified-hardware.md diff --git a/hardware/hcl.html b/user/hardware/hcl.html similarity index 100% rename from hardware/hcl.html rename to user/hardware/hcl.html diff --git a/hardware/hcl.md b/user/hardware/hcl.md similarity index 100% rename from hardware/hcl.md rename to user/hardware/hcl.md diff --git a/hardware/system-requirements.md b/user/hardware/system-requirements.md similarity index 100% rename from hardware/system-requirements.md rename to user/hardware/system-requirements.md diff --git a/managing-os/templates/debian-minimal.md b/user/managing-os/debian/debian-minimal.md similarity index 100% rename from managing-os/templates/debian-minimal.md rename to user/managing-os/debian/debian-minimal.md diff --git a/managing-os/templates/debian/upgrade-8-to-9.md b/user/managing-os/debian/debian-upgrade-8-to-9.md similarity index 100% rename from managing-os/templates/debian/upgrade-8-to-9.md rename to user/managing-os/debian/debian-upgrade-8-to-9.md diff --git a/managing-os/templates/debian.md b/user/managing-os/debian/debian.md similarity index 100% rename from managing-os/templates/debian.md rename to user/managing-os/debian/debian.md diff --git a/managing-os/templates/fedora-minimal.md b/user/managing-os/fedora/fedora-minimal.md similarity index 100% rename from managing-os/templates/fedora-minimal.md rename to user/managing-os/fedora/fedora-minimal.md diff --git a/managing-os/templates/fedora/upgrade-26-to-27.md b/user/managing-os/fedora/fedora-upgrade-26-to-27.md similarity index 100% rename from managing-os/templates/fedora/upgrade-26-to-27.md rename to user/managing-os/fedora/fedora-upgrade-26-to-27.md diff --git a/managing-os/templates/fedora/upgrade-27-to-28.md b/user/managing-os/fedora/fedora-upgrade-27-to-28.md similarity index 100% rename from managing-os/templates/fedora/upgrade-27-to-28.md rename to user/managing-os/fedora/fedora-upgrade-27-to-28.md diff --git a/managing-os/templates/fedora/upgrade-28-to-29.md b/user/managing-os/fedora/fedora-upgrade-28-to-29.md similarity index 100% rename from managing-os/templates/fedora/upgrade-28-to-29.md rename to user/managing-os/fedora/fedora-upgrade-28-to-29.md diff --git a/managing-os/templates/fedora.md b/user/managing-os/fedora/fedora.md similarity index 100% rename from managing-os/templates/fedora.md rename to user/managing-os/fedora/fedora.md diff --git a/managing-os/hvm.md b/user/managing-os/hvm.md similarity index 100% rename from managing-os/hvm.md rename to user/managing-os/hvm.md diff --git a/managing-os/reinstall-template.md b/user/managing-os/reinstall-template.md similarity index 100% rename from managing-os/reinstall-template.md rename to user/managing-os/reinstall-template.md diff --git a/managing-os/templates.md b/user/managing-os/templates.md similarity index 100% rename from managing-os/templates.md rename to user/managing-os/templates.md diff --git a/managing-os/windows.md b/user/managing-os/windows.md similarity index 100% rename from managing-os/windows.md rename to user/managing-os/windows.md diff --git a/reference/glossary.md b/user/reference/glossary.md similarity index 100% rename from reference/glossary.md rename to user/reference/glossary.md diff --git a/reference/qubes-service.md b/user/reference/qubes-service.md similarity index 100% rename from reference/qubes-service.md rename to user/reference/qubes-service.md diff --git a/about/research.md b/user/reference/research.md similarity index 100% rename from about/research.md rename to user/reference/research.md diff --git a/reference/tools.md b/user/reference/tools.md similarity index 100% rename from reference/tools.md rename to user/reference/tools.md diff --git a/security/anti-evil-maid.md b/user/security-in-qubes/anti-evil-maid.md similarity index 100% rename from security/anti-evil-maid.md rename to user/security-in-qubes/anti-evil-maid.md diff --git a/security/data-leaks.md b/user/security-in-qubes/data-leaks.md similarity index 100% rename from security/data-leaks.md rename to user/security-in-qubes/data-leaks.md diff --git a/security/firewall.md b/user/security-in-qubes/firewall.md similarity index 100% rename from security/firewall.md rename to user/security-in-qubes/firewall.md diff --git a/security/split-gpg.md b/user/security-in-qubes/split-gpg.md similarity index 100% rename from security/split-gpg.md rename to user/security-in-qubes/split-gpg.md diff --git a/security/u2f-proxy.md b/user/security-in-qubes/u2f-proxy.md similarity index 100% rename from security/u2f-proxy.md rename to user/security-in-qubes/u2f-proxy.md From 9ee193896bf74ebd70ed5499e321e6e4e8d3701d Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sun, 26 May 2019 19:56:33 -0500 Subject: [PATCH 10/12] Rename External subsections to avoid name collision QubesOS/qubes-issues#4693 --- doc.md | 4 ++-- .../building-archlinux-template.md | 0 .../building-non-fedora-template.md | 0 .../{building => building-guides}/building-whonix-template.md | 0 external/{managing-os => os-guides}/archlinux.md | 0 external/{managing-os => os-guides}/linux-hvm-tips.md | 0 external/{managing-os => os-guides}/netbsd.md | 0 external/{managing-os => os-guides}/pentesting.md | 0 external/{managing-os => os-guides}/pentesting/blackarch.md | 0 external/{managing-os => os-guides}/pentesting/kali.md | 0 external/{managing-os => os-guides}/pentesting/ptf.md | 0 external/{managing-os => os-guides}/ubuntu.md | 0 external/{managing-os => os-guides}/windows/windows-tools.md | 0 external/{managing-os => os-guides}/windows/windows-vm.md | 0 14 files changed, 2 insertions(+), 2 deletions(-) rename external/{building => building-guides}/building-archlinux-template.md (100%) rename external/{building => building-guides}/building-non-fedora-template.md (100%) rename external/{building => building-guides}/building-whonix-template.md (100%) rename external/{managing-os => os-guides}/archlinux.md (100%) rename external/{managing-os => os-guides}/linux-hvm-tips.md (100%) rename external/{managing-os => os-guides}/netbsd.md (100%) rename external/{managing-os => os-guides}/pentesting.md (100%) rename external/{managing-os => os-guides}/pentesting/blackarch.md (100%) rename external/{managing-os => os-guides}/pentesting/kali.md (100%) rename external/{managing-os => os-guides}/pentesting/ptf.md (100%) rename external/{managing-os => os-guides}/ubuntu.md (100%) rename external/{managing-os => os-guides}/windows/windows-tools.md (100%) rename external/{managing-os => os-guides}/windows/windows-vm.md (100%) diff --git a/doc.md b/doc.md index a433cb0f..6fdc7d67 100644 --- a/doc.md +++ b/doc.md @@ -185,7 +185,7 @@ Core documentation for Qubes developers and advanced users. Unofficial, third-party documentation from the Qubes community and others. -### Managing Operating Systems within Qubes +### Operating System Guides * [Template: Archlinux](/doc/templates/archlinux/) * [Template: Ubuntu](/doc/templates/ubuntu/) @@ -264,7 +264,7 @@ Unofficial, third-party documentation from the Qubes community and others. * [How to remove VMs manually](/doc/remove-vm-manually/) * [Intel Integrated Graphics Troubleshooting](/doc/intel-igfx-troubleshooting/) -### Building +### Building Guides * [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/external/building/building-archlinux-template.md b/external/building-guides/building-archlinux-template.md similarity index 100% rename from external/building/building-archlinux-template.md rename to external/building-guides/building-archlinux-template.md diff --git a/external/building/building-non-fedora-template.md b/external/building-guides/building-non-fedora-template.md similarity index 100% rename from external/building/building-non-fedora-template.md rename to external/building-guides/building-non-fedora-template.md diff --git a/external/building/building-whonix-template.md b/external/building-guides/building-whonix-template.md similarity index 100% rename from external/building/building-whonix-template.md rename to external/building-guides/building-whonix-template.md diff --git a/external/managing-os/archlinux.md b/external/os-guides/archlinux.md similarity index 100% rename from external/managing-os/archlinux.md rename to external/os-guides/archlinux.md diff --git a/external/managing-os/linux-hvm-tips.md b/external/os-guides/linux-hvm-tips.md similarity index 100% rename from external/managing-os/linux-hvm-tips.md rename to external/os-guides/linux-hvm-tips.md diff --git a/external/managing-os/netbsd.md b/external/os-guides/netbsd.md similarity index 100% rename from external/managing-os/netbsd.md rename to external/os-guides/netbsd.md diff --git a/external/managing-os/pentesting.md b/external/os-guides/pentesting.md similarity index 100% rename from external/managing-os/pentesting.md rename to external/os-guides/pentesting.md diff --git a/external/managing-os/pentesting/blackarch.md b/external/os-guides/pentesting/blackarch.md similarity index 100% rename from external/managing-os/pentesting/blackarch.md rename to external/os-guides/pentesting/blackarch.md diff --git a/external/managing-os/pentesting/kali.md b/external/os-guides/pentesting/kali.md similarity index 100% rename from external/managing-os/pentesting/kali.md rename to external/os-guides/pentesting/kali.md diff --git a/external/managing-os/pentesting/ptf.md b/external/os-guides/pentesting/ptf.md similarity index 100% rename from external/managing-os/pentesting/ptf.md rename to external/os-guides/pentesting/ptf.md diff --git a/external/managing-os/ubuntu.md b/external/os-guides/ubuntu.md similarity index 100% rename from external/managing-os/ubuntu.md rename to external/os-guides/ubuntu.md diff --git a/external/managing-os/windows/windows-tools.md b/external/os-guides/windows/windows-tools.md similarity index 100% rename from external/managing-os/windows/windows-tools.md rename to external/os-guides/windows/windows-tools.md diff --git a/external/managing-os/windows/windows-vm.md b/external/os-guides/windows/windows-vm.md similarity index 100% rename from external/managing-os/windows/windows-vm.md rename to external/os-guides/windows/windows-vm.md From 43a39e35b9a5266947b0d9b8b2e457623e00f0f9 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sun, 26 May 2019 20:04:23 -0500 Subject: [PATCH 11/12] Use default doc layout for project security docs --- project-security/canaries.md | 2 +- project-security/canary-checklist.md | 2 +- project-security/canary-template.md | 2 +- project-security/security-bulletins-checklist.md | 2 +- project-security/security-bulletins-template.md | 2 +- project-security/security-bulletins.md | 2 +- project-security/security-goals.md | 2 +- project-security/security-pack.md | 2 +- project-security/security.md | 2 +- project-security/verifying-signatures.md | 2 +- project-security/xsa.md | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/project-security/canaries.md b/project-security/canaries.md index e91d1bb3..c82eeefe 100644 --- a/project-security/canaries.md +++ b/project-security/canaries.md @@ -1,5 +1,5 @@ --- -layout: security +layout: doc title: Canaries permalink: /security/canaries/ redirect_from: /doc/canaries/ diff --git a/project-security/canary-checklist.md b/project-security/canary-checklist.md index af1fd820..487a8ba3 100644 --- a/project-security/canary-checklist.md +++ b/project-security/canary-checklist.md @@ -1,5 +1,5 @@ --- -layout: security +layout: doc title: Canary Checklist permalink: /security/canaries/checklist/ --- diff --git a/project-security/canary-template.md b/project-security/canary-template.md index 6bd9cd20..3aac7bad 100644 --- a/project-security/canary-template.md +++ b/project-security/canary-template.md @@ -1,5 +1,5 @@ --- -layout: security +layout: doc title: Canary Template permalink: /security/canaries/template/ redirect_from: /doc/canaries/template/ diff --git a/project-security/security-bulletins-checklist.md b/project-security/security-bulletins-checklist.md index a94883af..03ba2234 100644 --- a/project-security/security-bulletins-checklist.md +++ b/project-security/security-bulletins-checklist.md @@ -1,5 +1,5 @@ --- -layout: security +layout: doc title: Security Bulletin Checklist permalink: /security/bulletins/checklist/ redirect_from: /doc/security-bulletins/checklist/ diff --git a/project-security/security-bulletins-template.md b/project-security/security-bulletins-template.md index 24289219..f6d41ba6 100644 --- a/project-security/security-bulletins-template.md +++ b/project-security/security-bulletins-template.md @@ -1,5 +1,5 @@ --- -layout: security +layout: doc title: Security Bulletin Template permalink: /security/bulletins/template/ redirect_from: /doc/security-bulletins/template/ diff --git a/project-security/security-bulletins.md b/project-security/security-bulletins.md index 0b2f287e..3f77c891 100644 --- a/project-security/security-bulletins.md +++ b/project-security/security-bulletins.md @@ -1,5 +1,5 @@ --- -layout: security +layout: doc title: Qubes Security Bulletins permalink: /security/bulletins/ redirect_from: diff --git a/project-security/security-goals.md b/project-security/security-goals.md index 5f64e4e1..8e0581a5 100644 --- a/project-security/security-goals.md +++ b/project-security/security-goals.md @@ -1,5 +1,5 @@ --- -layout: security +layout: doc title: Security Goals permalink: /security/goals/ redirect_from: diff --git a/project-security/security-pack.md b/project-security/security-pack.md index e6d34238..e2363bc1 100644 --- a/project-security/security-pack.md +++ b/project-security/security-pack.md @@ -1,5 +1,5 @@ --- -layout: security +layout: doc title: Security Pack permalink: /security/pack/ redirect_from: diff --git a/project-security/security.md b/project-security/security.md index 3935de42..a3ab976e 100644 --- a/project-security/security.md +++ b/project-security/security.md @@ -1,5 +1,5 @@ --- -layout: default +layout: doc title: Security permalink: /security/ redirect_from: diff --git a/project-security/verifying-signatures.md b/project-security/verifying-signatures.md index 7a55cea4..e7677568 100644 --- a/project-security/verifying-signatures.md +++ b/project-security/verifying-signatures.md @@ -1,5 +1,5 @@ --- -layout: security +layout: doc title: Verifying Signatures permalink: /security/verifying-signatures/ redirect_from: diff --git a/project-security/xsa.md b/project-security/xsa.md index aba882cb..6341cf6a 100644 --- a/project-security/xsa.md +++ b/project-security/xsa.md @@ -1,5 +1,5 @@ --- -layout: security +layout: doc title: Xen Security Advisory (XSA) Tracker permalink: /security/xsa/ --- From 3a5024b2798cba53837ea9f899778a0fadf8bfe0 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Sun, 26 May 2019 20:39:21 -0500 Subject: [PATCH 12/12] Add link to external OnlyKey guide --- doc.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc.md b/doc.md index 6fdc7d67..42d976e4 100644 --- a/doc.md +++ b/doc.md @@ -206,6 +206,7 @@ Unofficial, third-party documentation from the Qubes community and others. * [Configuring YubiKey for user authentication](/doc/yubi-key/) * [Security Considerations When Handling Devices](/doc/device-handling-security/) * [Note regarding password-less root access in VM](/doc/vm-sudo/) + * [Using OnlyKey with Qubes OS](https://docs.crp.to/qubes.html) ### Privacy Guides