From ba5ac6139a694722e4c008175b1a1c744ebd05f6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 5 Feb 2017 00:09:18 +0100
Subject: [PATCH] Update docs

---
 README.asciidoc                  | 2 +-
 doc/help/settings.asciidoc       | 4 ++--
 qutebrowser/config/configdata.py | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.asciidoc b/README.asciidoc
index d0c85d5f6..73276634c 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -221,6 +221,7 @@ Contributors, sorted by the number of commits in descending order:
 * Samuel Loury
 * Peter Michely
 * Panashe M. Fundira
+* Lucas Hoffmann
 * Link
 * Larry Hynes
 * Johannes Altmanninger
@@ -234,7 +235,6 @@ Contributors, sorted by the number of commits in descending order:
 * Regina Hug
 * Mathias Fussenegger
 * Marcelo Santos
-* Lucas Hoffmann
 * Joel Bradshaw
 * Jean-Louis Fuchs
 * Franz Fellner
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 114a9c9d6..122203d93 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -796,6 +796,8 @@ The proxy to use.
 
 In addition to the listed values, you can use a `socks://...` or `http://...` URL.
 
+This setting only works with Qt 5.8 or newer when using the QtWebEngine backend.
+
 Valid values:
 
  * +system+: Use the system wide proxy.
@@ -803,8 +805,6 @@ Valid values:
 
 Default: +pass:[system]+
 
-This setting is only available with the QtWebKit backend.
-
 [[network-proxy-dns-requests]]
 === proxy-dns-requests
 Whether to send DNS requests over the configured proxy.
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index 657e26857..f68e6cad5 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -437,7 +437,9 @@ def data(readonly=False):
                                     else [usertypes.Backend.QtWebKit])),
              "The proxy to use.\n\n"
              "In addition to the listed values, you can use a `socks://...` "
-             "or `http://...` URL."),
+             "or `http://...` URL.\n\n"
+             "This setting only works with Qt 5.8 or newer when using the "
+             "QtWebEngine backend."),
 
             ('proxy-dns-requests',
              SettingValue(typ.Bool(), 'true',