From c641695b54fc270019c618417120953ede327f16 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Wed, 17 Aug 2022 18:05:00 -0700 Subject: [PATCH 1/6] Update description; add FLOSS entry; update license See the discussion at: https://forum.qubes-os.org/t/13035/ --- developer/code/license.md | 3 ++- introduction/faq.md | 23 ++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/developer/code/license.md b/developer/code/license.md index f7fe3682..564fbd0b 100644 --- a/developer/code/license.md +++ b/developer/code/license.md @@ -12,7 +12,8 @@ title: Software license Qubes OS is a compilation of software packages, each under its own license. The compilation is made available under the GNU General Public License version 2 -(GPLv2). +(GPLv2). However, the license for this compilation does not supersede the +license of any package included in the compilation. The source code of Qubes OS is contained in repositories under the [@QubesOS](https://github.com/QubesOS) account on GitHub. This source code is diff --git a/introduction/faq.md b/introduction/faq.md index d9a5d98a..4f61e193 100644 --- a/introduction/faq.md +++ b/introduction/faq.md @@ -19,12 +19,21 @@ title: Frequently asked questions (FAQ) ### What is Qubes OS? -Qubes OS is a security-oriented operating system (OS). -The OS is the software that runs all the other programs on a computer. -Some examples of popular OSes are Windows, macOS, Android, and iOS. -Qubes is free and open-source software (FOSS). -This means that everyone is free to use, copy, and change the software in any way. -It also means that the source code is openly available so others can contribute to and audit it. +Qubes OS is a security-focused operating system that allows you to organize your digital life into compartments called "qubes." If one qube is compromised, the others remain safe, so a single cyberattack can no longer take down your entire digital life in one fell swoop. You can think of using Qubes OS as having many different computers on your desk for different activities but with the convenience of a single physical machine, a single unified desktop environment, and a set of tools for using qubes together securely as parts of a unified system. + +### Is Qubes OS free and open-source software? + +Qubes OS is provided at no cost (gratis), though [donations](/donate/) are greatly appreciated. + +All the software created by the Qubes OS Project is free/libre and open-source software (FLOSS). +This means that everyone is allowed to use, copy, study, and change the software in accordance with its [license](/doc/license/). +It also means that the source code is publicly available so everyone can audit and contribute to it. + +Since Qubes OS is a security-focused operating system, it includes some non-free firmware that was not created by the Qubes OS Project (such as CPU microcode), which is necessary in order to protect against known security vulnerabilities. +Moreover, the nature of Qubes OS as a meta-operating system means that it incorporates other software (including entire operating systems) from various upstream projects, some of which may include non-free software of their own. +In order to make the installation process easier for a wide range of users across many different devices, standard Qubes [templates](/doc/templates/) also include some non-free firmware and drivers. + +Also see: [Will Qubes seek to get certified under the GNU Free System Distribution Guidelines (GNU FSDG)?](#will-qubes-seek-to-get-certified-under-the-gnu-free-system-distribution-guidelines-gnu-fsdg) ### Why is OS security important? @@ -279,7 +288,7 @@ Instead, Qubes aims to be as free as possible *without sacrificing security*. Al The [four essential freedoms](https://www.gnu.org/philosophy/free-sw.html) are part of the core of our philosophy, but so is security. Together, they inform our decisions and motivate our actions. Qubes aims to maximize both security and software freedom to the extent that they are compatible in the world today. -Also see the Qubes OS [software license](/doc/license/). +Also see [Is Qubes free?](#is-qubes-os-free-and-open-source-software) and the Qubes OS [software license](/doc/license/). ### Should I trust this website? From 5b9116cf7c3dde01e28d993edcd3057490fbfa3c Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Wed, 17 Aug 2022 18:25:00 -0700 Subject: [PATCH 2/6] Fix link text --- introduction/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/introduction/faq.md b/introduction/faq.md index 4f61e193..c74e4327 100644 --- a/introduction/faq.md +++ b/introduction/faq.md @@ -288,7 +288,7 @@ Instead, Qubes aims to be as free as possible *without sacrificing security*. Al The [four essential freedoms](https://www.gnu.org/philosophy/free-sw.html) are part of the core of our philosophy, but so is security. Together, they inform our decisions and motivate our actions. Qubes aims to maximize both security and software freedom to the extent that they are compatible in the world today. -Also see [Is Qubes free?](#is-qubes-os-free-and-open-source-software) and the Qubes OS [software license](/doc/license/). +Also see [Is Qubes OS free and open-source software?](#is-qubes-os-free-and-open-source-software) and the Qubes OS [software license](/doc/license/). ### Should I trust this website? From 5c2cac6b545295e6017cda8c040f437e64316ffd Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Wed, 17 Aug 2022 18:38:58 -0700 Subject: [PATCH 3/6] Update "attitude toward changing guest distro" language to reflect intended spirit See the discussion at: https://forum.qubes-os.org/t/13035/ --- introduction/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/introduction/faq.md b/introduction/faq.md index c74e4327..8f86459c 100644 --- a/introduction/faq.md +++ b/introduction/faq.md @@ -676,7 +676,7 @@ See the [Qubes Source Code Repositories](/doc/source-code/) article. ### What is Qubes' attitude toward changing guest distros? -We try to respect each distro's culture, where possible. +In general, we try to respect each distro's culture, but we reserve the right to make modifications that we deem appropriate. See the discussion on issue [#1014](https://github.com/QubesOS/qubes-issues/issues/1014) for an example. The policy is there mostly to ease maintenance, on several levels: From f38e9b67a85484143e1413c5b08d7b763f972fe8 Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Wed, 17 Aug 2022 20:50:12 -0700 Subject: [PATCH 4/6] Add clarifications and links --- introduction/faq.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/introduction/faq.md b/introduction/faq.md index 8f86459c..45d4e56c 100644 --- a/introduction/faq.md +++ b/introduction/faq.md @@ -25,12 +25,12 @@ Qubes OS is a security-focused operating system that allows you to organize your Qubes OS is provided at no cost (gratis), though [donations](/donate/) are greatly appreciated. -All the software created by the Qubes OS Project is free/libre and open-source software (FLOSS). +All the software created by the Qubes OS Project is [free (libre) and open-source software (FOSS or FLOSS)](https://www.gnu.org/philosophy/floss-and-foss.en.html). This means that everyone is allowed to use, copy, study, and change the software in accordance with its [license](/doc/license/). -It also means that the source code is publicly available so everyone can audit and contribute to it. +It also means that the [source code](/doc/source-code/) is [publicly available](https://github.com/QubesOS/) so everyone can audit and contribute to it. Since Qubes OS is a security-focused operating system, it includes some non-free firmware that was not created by the Qubes OS Project (such as CPU microcode), which is necessary in order to protect against known security vulnerabilities. -Moreover, the nature of Qubes OS as a meta-operating system means that it incorporates other software (including entire operating systems) from various upstream projects, some of which may include non-free software of their own. +Moreover, the [architecture](/doc/architecture/) of Qubes OS as a meta-operating system means that it incorporates other software (including entire operating systems) from various upstream projects, some of which may include non-free software of their own. In order to make the installation process easier for a wide range of users across many different devices, standard Qubes [templates](/doc/templates/) also include some non-free firmware and drivers. Also see: [Will Qubes seek to get certified under the GNU Free System Distribution Guidelines (GNU FSDG)?](#will-qubes-seek-to-get-certified-under-the-gnu-free-system-distribution-guidelines-gnu-fsdg) From fe965f05f9277cde64a7b152d7626a858793ed5e Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Mon, 5 Sep 2022 07:22:25 -0700 Subject: [PATCH 5/6] Clarify the two senses of "free" https://forum.qubes-os.org/t/13035/87 --- introduction/faq.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/introduction/faq.md b/introduction/faq.md index 45d4e56c..049104d2 100644 --- a/introduction/faq.md +++ b/introduction/faq.md @@ -23,13 +23,15 @@ Qubes OS is a security-focused operating system that allows you to organize your ### Is Qubes OS free and open-source software? -Qubes OS is provided at no cost (gratis), though [donations](/donate/) are greatly appreciated. +There are two distinct senses of the word "free" when it comes to free software. The difference in commonly expressed by the phrases "free as in beer" and "free as in speech." -All the software created by the Qubes OS Project is [free (libre) and open-source software (FOSS or FLOSS)](https://www.gnu.org/philosophy/floss-and-foss.en.html). +The first senses is straightforward. Qubes OS is "free as in beer," meaning that it is provided at no cost (_gratis_), though [donations](/donate/) are greatly appreciated. + +The second sense is more complicated. Qubes OS is *mostly* "free as in speech," but not entirely. All the software created by the Qubes OS Project *itself* is [free (libre) and open-source software (FOSS or FLOSS)](https://www.gnu.org/philosophy/floss-and-foss.en.html). This means that everyone is allowed to use, copy, study, and change the software in accordance with its [license](/doc/license/). It also means that the [source code](/doc/source-code/) is [publicly available](https://github.com/QubesOS/) so everyone can audit and contribute to it. -Since Qubes OS is a security-focused operating system, it includes some non-free firmware that was not created by the Qubes OS Project (such as CPU microcode), which is necessary in order to protect against known security vulnerabilities. +However, since Qubes OS is a security-focused operating system, it includes some non-free firmware that was not created by the Qubes OS Project (such as CPU microcode), which is necessary in order to protect against known security vulnerabilities. Moreover, the [architecture](/doc/architecture/) of Qubes OS as a meta-operating system means that it incorporates other software (including entire operating systems) from various upstream projects, some of which may include non-free software of their own. In order to make the installation process easier for a wide range of users across many different devices, standard Qubes [templates](/doc/templates/) also include some non-free firmware and drivers. From bf5ebfcf4f94ab93105dda7265decea74425defb Mon Sep 17 00:00:00 2001 From: Andrew David Wong Date: Tue, 6 Sep 2022 10:25:47 -0700 Subject: [PATCH 6/6] Add links https://forum.qubes-os.org/t/13035/89 --- introduction/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/introduction/faq.md b/introduction/faq.md index 049104d2..7dd5877b 100644 --- a/introduction/faq.md +++ b/introduction/faq.md @@ -27,7 +27,7 @@ There are two distinct senses of the word "free" when it comes to free software. The first senses is straightforward. Qubes OS is "free as in beer," meaning that it is provided at no cost (_gratis_), though [donations](/donate/) are greatly appreciated. -The second sense is more complicated. Qubes OS is *mostly* "free as in speech," but not entirely. All the software created by the Qubes OS Project *itself* is [free (libre) and open-source software (FOSS or FLOSS)](https://www.gnu.org/philosophy/floss-and-foss.en.html). +The second sense is more complicated. Qubes OS is *mostly* "free as in speech," but not entirely. All the software created by the Qubes OS Project *itself* is [free (or "libre")](https://www.gnu.org/philosophy/free-sw) and [open-source](https://opensource.org/docs/definition.html) software ([FOSS or FLOSS](https://www.gnu.org/philosophy/floss-and-foss.en.html)). This means that everyone is allowed to use, copy, study, and change the software in accordance with its [license](/doc/license/). It also means that the [source code](/doc/source-code/) is [publicly available](https://github.com/QubesOS/) so everyone can audit and contribute to it.