summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2017-02-22 07:42:45 +0100
committerFlorian Bruhin <git@the-compiler.org>2017-02-22 07:42:45 +0100
commita32f57b7051cdce083d27bf6342f6a1e5d0c527f (patch)
tree2baefe70978582ad02a0487e283f76bddf71f86f
parent5379138c176597952bf873ca23b2358c65fce783 (diff)
downloadqutebrowser-a32f57b7051cdce083d27bf6342f6a1e5d0c527f.tar.gz
qutebrowser-a32f57b7051cdce083d27bf6342f6a1e5d0c527f.zip
Update docs
-rw-r--r--CHANGELOG.asciidoc2
-rw-r--r--README.asciidoc1
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 851c68cbc..dcbcec1c7 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -45,6 +45,8 @@ Changed
- qutebrowser now automatically uses QtWebEngine if QtWebKit is unavailable
- :history-clear now asks for a confirmation, unless it's run with --force.
- `input -> mouse-zoom-divider` can now be 0 to disable zooming by mouse wheel
+- `network -> proxy` can also be set to `pac+file://...` now to
+ use a local proxy autoconfig file (on QtWebKit)
Fixed
-----
diff --git a/README.asciidoc b/README.asciidoc
index 2bbe9db60..be3211dc4 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -265,6 +265,7 @@ Contributors, sorted by the number of commits in descending order:
* Matthias Lisin
* Marcel Schilling
* Lazlow Carmichael
+* Kirill A. Shutemov
* Kevin Wang
* Ján Kobezda
* Johannes Martinsson