From 4b53c4063a3d5769220077d63ff22604fd891a6c Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Wed, 30 Oct 2024 14:14:10 -0700 Subject: [PATCH 1/7] Add introductory note crediting key open source components --- docs/general/introduction.rst | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/docs/general/introduction.rst b/docs/general/introduction.rst index c08acf8..998b883 100644 --- a/docs/general/introduction.rst +++ b/docs/general/introduction.rst @@ -33,4 +33,29 @@ and viewing. SecureDrop Workstation combines all of those steps into one workflow on one machine: a Qubes computer that combines the *Journalist Workstation* and the *Secure Viewing Station*. -For more information on SecureDrop Workstation, see our :doc:`faq <../journalist/faq>`. +Who is behind SecureDrop Workstation? +------------------------------------- +SecureDrop and SecureDrop Workstation are open source projects of +`Freedom of the Press Foundation (FPF) `_, a +US-based nonprofit organization. You can support our work through +`your donation `_ or by +`contributing to SecureDrop development `_. + +Our work would not be possible without the larger open source community. + +The foundation of SecureDrop Workstation is `Qubes OS `_. +FPF has directly sponsored Qubes OS development, and we encourage you to +`donate to Qubes OS `_ as well. + +SecureDrop Workstation uses `Whonix `_ to maintain +connectivity with the Tor network. You can `make a donation to the Whonix project `_. + +In addition, SecureDrop Workstation relies on other open source projects such as +`grsecurity `_, `Python `_, +`Debian `_, `Fedora `_, +`GNOME `_, `GnuPG `_, +`LibreOffice `_, +`Audacious `_, and others. Please consider +contributing to these projects as well. + +For more information on SecureDrop Workstation, see our :doc:`FAQ <../journalist/faq>`. From 769f6aa857286ec04175d3b26bb4f7977164889a Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Wed, 30 Oct 2024 14:16:57 -0700 Subject: [PATCH 2/7] Fix duplicate target --- docs/general/introduction.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/general/introduction.rst b/docs/general/introduction.rst index 998b883..782bc56 100644 --- a/docs/general/introduction.rst +++ b/docs/general/introduction.rst @@ -15,8 +15,6 @@ Broadly speaking, this means that even if files in one of your virtual machines are exposed to malware, files in others still have some protection, which is not true of other operating systems. -.. _`Qubes OS`: https://www.qubes-os.org - What is SecureDrop Workstation? ------------------------------- @@ -43,7 +41,7 @@ US-based nonprofit organization. You can support our work through Our work would not be possible without the larger open source community. -The foundation of SecureDrop Workstation is `Qubes OS `_. +The foundation of SecureDrop Workstation is `Qubes OS`_. FPF has directly sponsored Qubes OS development, and we encourage you to `donate to Qubes OS `_ as well. @@ -59,3 +57,6 @@ In addition, SecureDrop Workstation relies on other open source projects such as contributing to these projects as well. For more information on SecureDrop Workstation, see our :doc:`FAQ <../journalist/faq>`. + + +.. _`Qubes OS`: https://www.qubes-os.org From 11c4a0140771f0d62f0b61e92efaea7f007571b4 Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Fri, 8 Nov 2024 11:45:31 -0800 Subject: [PATCH 3/7] Reword/reorder/flesh out a bit based on feedback --- docs/general/introduction.rst | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/docs/general/introduction.rst b/docs/general/introduction.rst index 782bc56..cb61288 100644 --- a/docs/general/introduction.rst +++ b/docs/general/introduction.rst @@ -35,28 +35,32 @@ Who is behind SecureDrop Workstation? ------------------------------------- SecureDrop and SecureDrop Workstation are open source projects of `Freedom of the Press Foundation (FPF) `_, a -US-based nonprofit organization. You can support our work through -`your donation `_ or by -`contributing to SecureDrop development `_. +US-based nonprofit organization. You can support our work +by `contributing to SecureDrop development `_ +and by making `a donation `_. Our work would not be possible without the larger open source community. -The foundation of SecureDrop Workstation is `Qubes OS`_. +The backbone of SecureDrop Workstation is `Qubes OS`_. FPF has directly sponsored Qubes OS development, and we encourage you to `donate to Qubes OS `_ as well. -SecureDrop Workstation uses `Whonix `_ to maintain -connectivity with the Tor network. You can `make a donation to the Whonix project `_. +We use the `Python `_ programming language and +ecosystem, which you can support by `donating to the Python Software Foundation `_. -In addition, SecureDrop Workstation relies on other open source projects such as -`grsecurity `_, `Python `_, -`Debian `_, `Fedora `_, -`GNOME `_, `GnuPG `_, -`LibreOffice `_, -`Audacious `_, and others. Please consider -contributing to these projects as well. +SecureDrop Workstation VMs are powered by `Debian `_, +`Fedora `_, and `Whonix `_, all +of which rely on volunteer contributions and financial support. The +`GNOME `_ project acts as an umbrella for many of the individual +software components we rely on. -For more information on SecureDrop Workstation, see our :doc:`FAQ <../journalist/faq>`. +Finally, SecureDrop Workstation relies on many other open source projects such as +`grsecurity `_, `GnuPG `_, +`Sequoia `_, `LibreOffice `_, +`Audacious `_, and others. These projects, +in turn, are built on open source foundations. Please consider +directing time and financial support wherever it can make a positive difference. +For more information on SecureDrop Workstation, see our :doc:`FAQ <../journalist/faq>`. .. _`Qubes OS`: https://www.qubes-os.org From 6b3291d96e1a608e3d2d4a514dd4c61145e673d2 Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Fri, 8 Nov 2024 11:58:59 -0800 Subject: [PATCH 4/7] Add shout-outs for translations/localization --- docs/general/introduction.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/general/introduction.rst b/docs/general/introduction.rst index cb61288..cbbe307 100644 --- a/docs/general/introduction.rst +++ b/docs/general/introduction.rst @@ -41,6 +41,15 @@ and by making `a donation `_. Our work would not be possible without the larger open source community. +We're deeply grateful to the SecureDrop volunteer community for translating +our software into many languages. Their work is enabled by `Weblate `_, +an open source platform for continuous localization. You can `make a donation `_ +to support Weblate development. + +Translation of SecureDrop is supported by `Localization Lab `_. You can +`make a donation `_ to support their important +work to help bring open source software into many languages. + The backbone of SecureDrop Workstation is `Qubes OS`_. FPF has directly sponsored Qubes OS development, and we encourage you to `donate to Qubes OS `_ as well. From e80e3b2042c5ff2ccc9fa7d9be0e51d8e3016fda Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Fri, 8 Nov 2024 12:01:32 -0800 Subject: [PATCH 5/7] Fix duplicate target --- docs/general/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/introduction.rst b/docs/general/introduction.rst index cbbe307..2b7f741 100644 --- a/docs/general/introduction.rst +++ b/docs/general/introduction.rst @@ -47,7 +47,7 @@ an open source platform for continuous localization. You can `make a donation `_. You can -`make a donation `_ to support their important +`donate `_ to support their important work to help bring open source software into many languages. The backbone of SecureDrop Workstation is `Qubes OS`_. From 2e8791097cbdf8489128c4ac2319bf95b12ec7ab Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Fri, 8 Nov 2024 12:05:32 -0800 Subject: [PATCH 6/7] Small tweak: just "contributing SecureDrop" instead of "SD Dev" This is more inclusive of all categories of contribution --- docs/general/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/introduction.rst b/docs/general/introduction.rst index 2b7f741..0ebd57c 100644 --- a/docs/general/introduction.rst +++ b/docs/general/introduction.rst @@ -36,7 +36,7 @@ Who is behind SecureDrop Workstation? SecureDrop and SecureDrop Workstation are open source projects of `Freedom of the Press Foundation (FPF) `_, a US-based nonprofit organization. You can support our work -by `contributing to SecureDrop development `_ +by `contributing to SecureDrop `_ and by making `a donation `_. Our work would not be possible without the larger open source community. From 975a870d28f1d3124424b2b2c76ec90b32513eca Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Fri, 8 Nov 2024 12:12:05 -0800 Subject: [PATCH 7/7] Small wording tweak --- docs/general/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/introduction.rst b/docs/general/introduction.rst index 0ebd57c..684889a 100644 --- a/docs/general/introduction.rst +++ b/docs/general/introduction.rst @@ -54,7 +54,7 @@ The backbone of SecureDrop Workstation is `Qubes OS`_. FPF has directly sponsored Qubes OS development, and we encourage you to `donate to Qubes OS `_ as well. -We use the `Python `_ programming language and +We use the `Python `_ programming language and many tools in its ecosystem, which you can support by `donating to the Python Software Foundation `_. SecureDrop Workstation VMs are powered by `Debian `_,