From a32f57b7051cdce083d27bf6342f6a1e5d0c527f Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 22 Feb 2017 07:42:45 +0100 Subject: [PATCH] Update docs --- CHANGELOG.asciidoc | 2 ++ README.asciidoc | 1 + 2 files changed, 3 insertions(+) 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