From 4fdf2d6f40a54df39eec37a562a7d26199002fef Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 6 Nov 2017 07:06:27 +0100
Subject: [PATCH] Update docs

---
 doc/changelog.asciidoc            |  1 +
 doc/help/commands.asciidoc        |  3 +++
 doc/help/settings.asciidoc        | 16 +++++++++++++++-
 qutebrowser/config/configdata.yml |  5 +++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 74528494e..3e56f28bf 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -38,6 +38,7 @@ Added
   cursor correctly.
 - New `qute-pass` userscript as alternative to `password_fill` which allows
   selecting accounts via rofi or any other dmenu-compatile application.
+- New `qt.highdpi` setting to turn on Qt's High-DPI scaling.
 
 Changed
 ~~~~~~~
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 7b2d8e6c4..5af25a0bf 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -206,6 +206,9 @@ Focuses window if necessary when index is given. If both index and count are giv
 ==== count
 The tab index to focus, starting with 1.
 
+==== note
+* This command does not split arguments after the last argument and handles quotes literally.
+
 [[close]]
 === close
 Close the current window.
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index e365d7245..60e20c9c5 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -218,6 +218,7 @@
 |<<qt.args,qt.args>>|Additional arguments to pass to Qt, without leading `--`.
 |<<qt.force_platform,qt.force_platform>>|Force a Qt platform to use.
 |<<qt.force_software_rendering,qt.force_software_rendering>>|Force software rendering for QtWebEngine.
+|<<qt.highdpi,qt.highdpi>>|Turn on Qt HighDPI scaling.
 |<<scrolling.bar,scrolling.bar>>|Show a scrollbar.
 |<<scrolling.smooth,scrolling.smooth>>|Enable smooth scrolling for web pages.
 |<<session_default_name,session_default_name>>|Name of the session to save by default.
@@ -2498,6 +2499,7 @@ Default: empty
 === qt.force_platform
 Force a Qt platform to use.
 This sets the `QT_QPA_PLATFORM` environment variable and is useful to force using the XCB plugin when running QtWebEngine on Wayland.
+This setting requires a restart.
 
 Type: <<types,String>>
 
@@ -2506,7 +2508,8 @@ Default: empty
 [[qt.force_software_rendering]]
 === qt.force_software_rendering
 Force software rendering for QtWebEngine.
-This is needed for QtWebEngine to work with Nouveau drivers. This setting requires a restart.
+This is needed for QtWebEngine to work with Nouveau drivers.
+This setting requires a restart.
 
 Type: <<types,Bool>>
 
@@ -2514,6 +2517,17 @@ Default: +pass:[false]+
 
 This setting is only available with the QtWebEngine backend.
 
+[[qt.highdpi]]
+=== qt.highdpi
+Turn on Qt HighDPI scaling.
+This is equivalent to setting QT_AUTO_SCREEN_SCALE_FACTOR=1 in the environment.
+It's off by default as it can cause issues with some bitmap fonts. As an alternative to this, it's possible to set font sizes and the `zoom.default` setting.
+This setting requires a restart.
+
+Type: <<types,Bool>>
+
+Default: +pass:[false]+
+
 [[scrolling.bar]]
 === scrolling.bar
 Show a scrollbar.
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index d9542137c..451ef580e 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -143,6 +143,7 @@ qt.force_software_rendering:
     Force software rendering for QtWebEngine.
 
     This is needed for QtWebEngine to work with Nouveau drivers.
+
     This setting requires a restart.
 
 qt.force_platform:
@@ -156,6 +157,8 @@ qt.force_platform:
     This sets the `QT_QPA_PLATFORM` environment variable and is useful to force
     using the XCB plugin when running QtWebEngine on Wayland.
 
+    This setting requires a restart.
+
 
 qt.highdpi:
   type: Bool
@@ -170,6 +173,8 @@ qt.highdpi:
     As an alternative to this, it's possible to set font sizes and the
     `zoom.default` setting.
 
+    This setting requires a restart.
+
 ## auto_save
 
 auto_save.interval: