From 0b95dfe4becd59aa8d972d0c6d52624fa1543ad3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Wed, 1 Apr 2020 21:42:05 +0200
Subject: Remove references to the GitHub matching fund

qutebrowser did reach the $5000 cap, so future donations aren't going to be
matched.
---
 README.asciidoc | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'README.asciidoc')

diff --git a/README.asciidoc b/README.asciidoc
index 1f1bb5308..9e2a61a22 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -28,9 +28,6 @@ time, your help is needed! See the
 https://github.com/sponsors/The-Compiler/[GitHub Sponsors page] for more
 information. Depending on your sign-up date and how long you keep a certain
 level, you can get qutebrowser t-shirts, stickers and more!
-
-Thanks to the GitHub Sponsors Matching Fund, all donations done via GitHub
-Sponsors (up to a $5000 total) will be doubled until October 2020.
 // QUTE_WEB_HIDE_END
 
 Screenshots
@@ -153,9 +150,6 @@ https://github.com/sponsors/The-Compiler/[GitHub Sponsors page] for more
 information. Depending on your sign-up date and how long you keep a certain
 level, you can get qutebrowser t-shirts, stickers and more!
 
-Thanks to the GitHub Sponsors Matching Fund, all donations done via GitHub
-Sponsors (up to a $5000 total) will be doubled until October 2020!
-
 Alternatively, the following donation methods are available -- note that
 eligibility for swag (shirts/stickers/etc.) is handled on a case-by-case basis
 for those, please mailto:mail@qutebrowser.org[get in touch] for details.
-- 
cgit v1.2.3-54-g00ecf


From 99048fb466dc26593a35ae936c9f3cf72051e08e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sun, 26 Apr 2020 10:57:22 +0200
Subject: Update old Qt version warning

See #3839
---
 README.asciidoc                      |  4 ++--
 qutebrowser/app.py                   |  2 +-
 qutebrowser/html/warning-old-qt.html | 20 ++++++++++++++------
 qutebrowser/utils/version.py         |  2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'README.asciidoc')

diff --git a/README.asciidoc b/README.asciidoc
index 9e2a61a22..a86be572d 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -106,7 +106,7 @@ Requirements
 The following software and libraries are required to run qutebrowser:
 
 * https://www.python.org/[Python] 3.5.2 or newer (3.6 recommended)
-* https://www.qt.io/[Qt] 5.7.1 or newer (5.14 recommended; support for < 5.9
+* https://www.qt.io/[Qt] 5.7.1 or newer (5.14 recommended; support for < 5.11
   will be dropped soon) with the following modules:
   - QtCore / qtbase
   - QtQuick (part of qtbase in some distributions)
@@ -120,7 +120,7 @@ The following software and libraries are required to run qutebrowser:
     avoid visiting untrusted websites and using it for transmission of
     sensitive data.**
 * https://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.7.0 or newer
-  (5.14 recommended, support for < 5.9 will be dropped soon) for Python 3
+  (5.14 recommended, support for < 5.11 will be dropped soon) for Python 3
 * https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
 * https://fdik.org/pyPEG/[pyPEG2]
 * http://jinja.pocoo.org/[jinja2]
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 445593706..9d38071bf 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -334,7 +334,7 @@ def _open_special_pages(args):
          'qute://warning/webkit'),
 
         ('old-qt-warning-shown',
-         not qtutils.version_check('5.9'),
+         not qtutils.version_check('5.11'),
          'qute://warning/old-qt'),
     ]
 
diff --git a/qutebrowser/html/warning-old-qt.html b/qutebrowser/html/warning-old-qt.html
index 157d50714..e5da57548 100644
--- a/qutebrowser/html/warning-old-qt.html
+++ b/qutebrowser/html/warning-old-qt.html
@@ -7,18 +7,26 @@ qute://warning/old-qt</span> to show it again at a later time.</span>
 
 <p>You're using qutebrowser with Qt {{qt_version}}.</p>
 
+{% if qt_version.startswith('5.7.') %}
 <p>Qt 5.7 was released in June 2016, with the 5.7.1 patch release in December
 2016. It is based on Chromium 49 (March 2016) with (some) security fixes up to
-Chromium 54 (October 2016). It is also
-<a href="https://www.debian.org/releases/stable/amd64/release-notes/ch-information.en.html#browser-security">not covered</a>
-by Debian security updates.</p>
-
+Chromium 54 (October 2016).</p>
+{% elif qt_version.startswith('5.8.') %}
 <p>Qt 5.8 has had various bugs, and has been unsupported (but working to some
 degree) in qutebrowser for a while.</p>
+{% elif qt_version.startswith('5.9.') %}
+<p>Qt 5.9 LTS was released in May 2017 and is based on Chromium 56 (January 2017). It is a long term support release with the 5.9.9 patch release in December 2019 including (some) security fixes up to Chromium 78 (November 2019). However, its usage was found to be low, and the next LTS (Qt 5.12) was released in December 2018.</p>
+{% elif qt_version.startswith('5.10.') %}
+<p>Qt 5.10 was released in December 2017, with the 5.10.1 patch release in February
+2018. It is based on Chromium 65 (March 2018) with (some) security fixes up to
+Chromium 70 (November 2018).</p>
+{% endif %}
+
+Also, note that QtWebEngine is <a href="https://www.debian.org/releases/stable/amd64/release-notes/ch-information.en.html#browser-security">not covered</a> by Debian security updates.
 
 <p>Because of those security issues and the maintaince burden coming with
-supporting old versions, support for Qt < 5.9 will be dropped in a future
-qutebrowser release. You might want to check
+supporting old versions, support for Qt < 5.11 will be dropped in qutebrowser
+v2.0. You might want to check
 <a href="https://qutebrowser.org/doc/install.html">alternate installation methods</a>
 which allow you to get a newer Qt.</p>
 {% endblock %}
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index d10c57411..4b88570ed 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -343,7 +343,7 @@ def _chromium_version() -> str:
 
     Qt 5.9:  Chromium 56
     (LTS)    56.0.2924.122 (2017-01-25)
-             5.9.8: Security fixes up to 72.0.3626.121 (2019-03-01)
+             5.9.9: Security fixes up to 78.0.3904.108 (2019-11-18)
 
     Qt 5.10: Chromium 61
              61.0.3163.140 (2017-09-05)
-- 
cgit v1.2.3-54-g00ecf


From cbb38c528566560c3f6f1b7d1e83460f23947476 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 11 May 2020 21:06:00 +0200
Subject: Upgrade documented Python versions

---
 README.asciidoc | 5 +++--
 setup.py        | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'README.asciidoc')

diff --git a/README.asciidoc b/README.asciidoc
index a86be572d..343fb8f07 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -105,9 +105,10 @@ Requirements
 
 The following software and libraries are required to run qutebrowser:
 
-* https://www.python.org/[Python] 3.5.2 or newer (3.6 recommended)
+* https://www.python.org/[Python] 3.5.2 or newer (3.6 - 3.8 recommended;
+  support for 3.5 will be dropped with qutebrowser v2.0.0)
 * https://www.qt.io/[Qt] 5.7.1 or newer (5.14 recommended; support for < 5.11
-  will be dropped soon) with the following modules:
+  will be dropped with qutebrowser v2.0.0) with the following modules:
   - QtCore / qtbase
   - QtQuick (part of qtbase in some distributions)
   - QtSQL (part of qtbase in some distributions)
diff --git a/setup.py b/setup.py
index 6b2ea0acd..7741a71b7 100755
--- a/setup.py
+++ b/setup.py
@@ -97,6 +97,7 @@ try:
             'Programming Language :: Python :: 3.5',
             'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: 3.7',
+            'Programming Language :: Python :: 3.8',
             'Topic :: Internet',
             'Topic :: Internet :: WWW/HTTP',
             'Topic :: Internet :: WWW/HTTP :: Browsers',
-- 
cgit v1.2.3-54-g00ecf


From 32dffd14cd17832f8c68b06ba076d2f9fbd845f3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Fri, 15 May 2020 12:10:50 +0200
Subject: doc: Update Next browser URL

---
 README.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.asciidoc')

diff --git a/README.asciidoc b/README.asciidoc
index 343fb8f07..41d0e7f1b 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -215,7 +215,7 @@ Active
 * https://fanglingsu.github.io/vimb/[vimb] (C, GTK+ with WebKit2)
 * https://luakit.github.io/luakit/[luakit] (C/Lua, GTK+ with WebKit2)
 * https://surf.suckless.org/[surf] (C, GTK+ with WebKit1/WebKit2)
-* https://github.com/next-browser/next/[next] (Lisp, Emacs-like but also offers Vim bindings, various backends - note there was a http://jgkamat.gitlab.io/blog/next-rce.html[critical remote code execution] which was handled quite badly)
+* https://next.atlas.engineer/[next] (Lisp, Emacs-like but also offers Vim bindings, various backends - note there was a http://jgkamat.gitlab.io/blog/next-rce.html[critical remote code execution] which was handled quite badly)
 * https://github.com/parkouss/webmacs/[webmacs] (Python, Emacs-like with QtWebEngine)
 * Chrome/Chromium addons:
   https://vimium.github.io/[Vimium],
-- 
cgit v1.2.3-54-g00ecf


From 1b6f708814e4bf4953cf69ea7327194eddaeb703 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 1 Jun 2020 19:40:11 +0200
Subject: README: Update list of alternatives

---
 README.asciidoc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'README.asciidoc')

diff --git a/README.asciidoc b/README.asciidoc
index 41d0e7f1b..3a7778def 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -206,8 +206,8 @@ link:doc/backers.asciidoc[crowdfunding campaigns]!
 Similar projects
 ----------------
 
-Many projects with a similar goal as qutebrowser exist.
-Most of them were inspirations for qutebrowser in some way, thanks for that!
+Various projects with a similar goal like qutebrowser exist.
+Many of them were inspirations for qutebrowser in some way, thanks for that!
 
 Active
 ~~~~~~
@@ -215,8 +215,9 @@ Active
 * https://fanglingsu.github.io/vimb/[vimb] (C, GTK+ with WebKit2)
 * https://luakit.github.io/luakit/[luakit] (C/Lua, GTK+ with WebKit2)
 * https://surf.suckless.org/[surf] (C, GTK+ with WebKit1/WebKit2)
-* https://next.atlas.engineer/[next] (Lisp, Emacs-like but also offers Vim bindings, various backends - note there was a http://jgkamat.gitlab.io/blog/next-rce.html[critical remote code execution] which was handled quite badly)
+* https://next.atlas.engineer/[next] (Lisp, Emacs-like but also offers Vim bindings, QtWebKit or GTK+/WebKit2 - note there was a http://jgkamat.gitlab.io/blog/next-rce.html[critical remote code execution] which was handled quite badly)
 * https://github.com/parkouss/webmacs/[webmacs] (Python, Emacs-like with QtWebEngine)
+* https://vieb.dev/[Vieb] (JavaScript, Electron)
 * Chrome/Chromium addons:
   https://vimium.github.io/[Vimium],
 * Firefox addons (based on WebExtensions):
-- 
cgit v1.2.3-54-g00ecf


From b300a5464ffaff32bd22d87ebb9f9a5a03d0df63 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Wed, 17 Jun 2020 09:34:12 +0200
Subject: Point to GitHub discussions feature

---
 .github/ISSUE_TEMPLATE/3_Support_question.md | 16 ----------------
 .github/ISSUE_TEMPLATE/config.yml            |  5 +++++
 README.asciidoc                              |  5 +++++
 3 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/3_Support_question.md
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

(limited to 'README.asciidoc')

diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md
deleted file mode 100644
index 9d67d716b..000000000
--- a/.github/ISSUE_TEMPLATE/3_Support_question.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: ❓ Support Question
-about: It's okay to ask questions via GitHub, but IRC/Reddit/Mailinglist might be better.
-
----
-
-<!--
-While it's fine to ask questions here, check the documentation for better
-ways to get help:
-
-https://github.com/qutebrowser/qutebrowser#getting-help
--->
-
-**Version info (see `:version`)**:
-
-**If applicable: Does the issue happen if you start with `--temp-basedir`?**:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..f736a6fd6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: ❓ Support Question
+    url: https://github.com/qutebrowser/qutebrowser/discussions
+    about: Use GitHub's new discussions feature for questions
diff --git a/README.asciidoc b/README.asciidoc
index 3a7778def..1c943da40 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -81,6 +81,11 @@ get sent to the general qutebrowser@ list).
 If you're a reddit user, there's a
 https://www.reddit.com/r/qutebrowser/[/r/qutebrowser] subreddit there.
 
+Finally, qutebrowser is participating in the Beta for GitHub's new Discussions
+feature, so you can also use the
+https://github.com/qutebrowser/qutebrowser/discussions[discussions tab] on
+GitHub to get in touch.
+
 Contributions / Bugs
 --------------------
 
-- 
cgit v1.2.3-54-g00ecf

