Merge branch 'qubes-users-ref-update'

external/os-guides/windows/windows-tools.md

@@ -251,7 +251,7 @@ If a specific component is malfunctioning, you can increase its log verbosity as
 Updates
 -------
 
-When we publish new QWT version (which is announced on `qubes-users` Google Group) it's usually pushed to the `current-testing` or `unstable` repository first. To use versions from current-testing, run this in dom0:
+When we publish new QWT version, it's usually pushed to the `current-testing` or `unstable` repository first. To use versions from current-testing, run this in dom0:
 
 `qubes-dom0-update --enablerepo=qubes-dom0-current-testing qubes-windows-tools`
 

introduction/reporting-bugs.md

@@ -16,6 +16,7 @@ redirect_from:
 # Reporting bugs and other issues #
 
 All issues pertaining to the Qubes OS Project (including auxiliary infrastructure such as the [website]) are tracked in [qubes-issues], our GitHub issue tracker.
+If you're looking for help, please see [Help, Support, Mailing Lists, and Forum].
 
 ## Important ##
 
@@ -43,12 +44,12 @@ Issues may have additional labels, if applicable (e.g., `crypto`, `ux`).
 
 [qubes-issues] is not the place to ask questions.
 This includes, but is not limited to, troubleshooting questions and questions about how to do things with Qubes.
-These questions should instead be asked in [qubes-users].
+Instead, see [Help, Support, Mailing Lists, and Forum] for appropriate place to ask questions.
 By contrast, [qubes-issues] is meant for tracking more general bugs, enhancements, and tasks that affect a broad range of Qubes users.
 
 ### Every issue must be about a single, actionable thing ###
 
-If your issue is not actionable, please send it to the appropriate [mailing list][Help, Support, and Mailing Lists] instead.
+If your issue is not actionable, please see [Help, Support, Mailing Lists, and Forum] for the appropriate place to post it.
 If your issue would be about more than one thing, file them as separate issues instead.
 
 ### New issues should not be duplicates of existing issues ###
@@ -134,9 +135,7 @@ If the issue is closed without one of these specific resolutions, then it means,
 [documentation]: /doc/
 [website]: /
 [qubes-issues]: https://github.com/QubesOS/qubes-issues/issues
-[Help, Support, and Mailing Lists]: /support/
+[Help, Support, Mailing Lists, and Forum]: /support/
-[qubes-users]: /support/#qubes-users
-[qubes-devel]: /support/#qubes-devel
 [updates-status]: https://github.com/QubesOS/updates-status/issues
 [how to copy information out of dom0]: /doc/copy-from-dom0/
 [testing]: /doc/testing/

project-security/verifying-signatures.md

@@ -440,7 +440,8 @@ The correct ISO is not in your working directory.
 Carefully read this page again to be certain that you didn't skip any steps.
 In particular, make sure you have the [Qubes Master Signing Key][QMSK], the [Release Signing Key][RSK], *and* the [signature file] and/or [digest file] all for the *correct* Qubes OS version.
 If your question is about GPG, please see the [GPG documentation].
-If you still have a question, please address it to the [qubes-users mailing list].
+Still have question?
+Please see [Help, Support, Mailing Lists, and Forum] for places where you can ask!
 
 
 [website-trust]: /faq/#should-i-trust-this-website
@@ -462,6 +463,6 @@ If you still have a question, please address it to the [qubes-users mailing list
 [digest file]: #how-to-verify-qubes-iso-digests
 [Qubes repositories]: https://github.com/QubesOS
 [GPG documentation]: https://www.gnupg.org/documentation/
-[qubes-users mailing list]: /support/#qubes-users
+[Help, Support, Mailing Lists, and Forum]: /support/
 [except dom0]: https://github.com/QubesOS/qubes-issues/issues/2544
 

user/downloading-installing-upgrading/installation-guide.md

@@ -328,10 +328,11 @@ Getting Help
    We urge you to read it! It may very well contain the answers to your questions. 
    (Since the documentation is a community effort, we'd also greatly appreciate your help in [improving] it!)
 
- * If you don't find your answer in the documentation, it may be time to consult the [mailing lists], as well as the many other available sources of [help].
+ * If you don't find your answer in the documentation, please see [Help, Support, Mailing Lists, and Forum] for places to ask.
+
+ * Please do **not** email individual members of the Qubes team with questions about installation or other problems. 
+   Instead, please see [Help, Support, Mailing Lists, and Forum] for appropriate places to ask questions.
 
- * Please do not email individual developers (Marek, etc.) with questions about installation or other problems. 
- Please send all such questions to the appropriate mailing list.
 
 [QSB #46]: /news/2019/01/23/qsb-46/
 [system requirements]: /doc/system-requirements/
@@ -346,6 +347,5 @@ Getting Help
 [Rufus]: https://rufus.akeo.ie/
 [documentation]: /doc/
 [improving]: /doc/doc-guidelines/
-[mailing lists]: /support/
+[Help, Support, Mailing Lists, and Forum]: /support/
-[help]: /help/
 

user/downloading-installing-upgrading/upgrade/upgrade-to-r4.0.md

@@ -44,7 +44,7 @@ Backup R3.2
 
 7. If your backup verifies successfully, proceed to the next section.
    If it does not, **stop**.
-   Go back and repeat the backup steps, review the documentation or search the qubes-users mailing list, or ask for assistance on the [qubes-users mailing list](/support/#qubes-users) or IRC.
+   Go back and repeat the backup steps, review the documentation, and ask for [help].
 
 
 Install R4.0
@@ -62,7 +62,7 @@ For further details, please see the [installation guide](/doc/installation-guide
    If you did not successfully verify your backup in the previous section, cancel the installation, and go back to do that now. 
 
 3. Complete the R4.0 installation.
-   Ask for assistance on the [qubes-users mailing list](/support/#qubes-users) if you run into trouble.
+   Ask for [help] if you run into trouble.
 
 4. If you are unable to successfully install R4.0 on your system, all is not lost.
    Use the R3.2 installer to reinstall R3.2, then restore from your backup.
@@ -119,3 +119,6 @@ Please see [Supported Versions](/doc/supported-versions/) for information on sup
  * [Upgrading Debian TemplateVMs](/doc/templates/debian/#upgrading)
  * [Updating Whonix TemplateVMs](https://www.whonix.org/wiki/Qubes/Update)
 
+
+[help]: /support/
+

user/downloading-installing-upgrading/version-scheme.md

@@ -39,11 +39,11 @@ production. You may ask for support on mailing lists (specifically
 When enough development has been made, we announce the first stable version,
 like e.g. `3.0.0` (i.e. without `-rc`). This version is considered stable and
 we support it for some period. Core components are branched at this moment and
-bugfixes are backported from master branch. Questions about stable release
+bugfixes are backported from master branch. Please see [Help, Support, Mailing
-should be directed to the **qubes-users** mailing list. No major features and
+Lists, and Forum] for places to ask questions about stable releases. No major
-interface incompatibilities are to be included in this release. We release
+features and interface incompatibilities are to be included in this release. We
-bugfixes as `3.0.1`, `3.0.2` and so on, while new features come into the next
+release bugfixes as `3.0.1`, `3.0.2` and so on, while new features come into the
-release e.g. `3.1-rcX`.
+next release e.g. `3.1-rcX`.
 
 Tickets in the tracker are sorted out by release major.minor, such as `3.0`,
 `3.1` (trac calls this “milestone”).
@@ -155,3 +155,7 @@ Check installed version
 
 If you want to know which version you are running, for example to report
 an issue, you can either check in the Qubes Manager menu under About / Qubes OS  or in the file /etc/qubes-release in dom0. For the latter you can use a command like `cat /etc/qubes-release` in a dom0 terminal.
+
+
+[Help, Support, Mailing Lists, and Forum]: /support/
+

user/managing-os/minimal-templates.md

@@ -25,7 +25,9 @@ There are currently three Minimal TemplateVMs corresponding to the standard [Fed
    If you encounter problems with the Minimal TemplateVMs, we recommend that you use their standard TemplateVM counterparts instead.
 
 2. If something works with a standard TemplateVM but not the minimal version, this is most likely due to user error (e.g., a missing package or misconfiguration) rather than a bug.
-   In such cases, you should write to [qubes-users] to ask for help rather than filing a bug report, then [contribute what you learn to the documentation][doc-guidelines].
+   In such cases, please do *not* file a bug report.
+   Instead, please see [Help, Support, Mailing Lists, and Forum] for the appropriate place to ask for help.
+   Once you have learned how to solve your problem, please [contribute what you learned to the documentation][doc-guidelines].
 
 3. The Minimal TemplateVMs are intentionally *minimal*.
    [Do not ask for your favorite package to be added to the minimal template by default.][pref-default]
@@ -211,7 +213,7 @@ You could, of course, use `qubes-vm-recommended` to automatically install many o
 [Fedora]: /doc/templates/fedora/
 [Debian]: /doc/templates/debian/
 [CentOS]: /doc/templates/centos/
-[qubes-users]: /support/#qubes-users
+[Help, Support, Mailing Lists, and Forum]: /support/
 [doc-guidelines]: /doc/doc-guidelines/
 [pref-default]: /faq/#could-you-please-make-my-preference-the-default
 [testing]: /doc/testing/