From b5f9135f98da3cea01babbfcd646bd4a085bf375 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 15 Nov 2016 23:23:34 +0100
Subject: [PATCH] Update docs

---
 CHANGELOG.asciidoc         |  1 +
 doc/help/settings.asciidoc | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8dc7caa3a..efe83cd4c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -146,6 +146,7 @@ Changed
 - Various commands/settings taking `left`/`right`/`previous` arguments now take
   `prev`/`next`/`last-used` to remove ambiguity.
 - The `ui -> user-stylesheet` setting now only takes filenames, not CSS snippets
+- `ui -> window-title-format` now has a new `{backend} ` replacement
 
 Deprecated
 ~~~~~~~~~~
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index c7da3e82e..6e2d3d67c 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -44,7 +44,8 @@
 |<<ui-confirm-quit,confirm-quit>>|Whether to confirm quitting the application.
 |<<ui-zoom-text-only,zoom-text-only>>|Whether the zoom factor on a frame applies only to the text or to all content.
 |<<ui-frame-flattening,frame-flattening>>|Whether to  expand each subframe to its contents.
-|<<ui-user-stylesheet,user-stylesheet>>|User stylesheet to use (absolute filename, filename relative to the config directory or CSS string). Will expand environment variables.
+|<<ui-user-stylesheet,user-stylesheet>>|User stylesheet to use (absolute filename or filename relative to the config directory). Will expand environment variables.
+|<<ui-hide-scrollbar,hide-scrollbar>>|Hide the main scrollbar.
 |<<ui-css-media-type,css-media-type>>|Set the CSS media type.
 |<<ui-smooth-scrolling,smooth-scrolling>>|Whether to enable smooth scrolling for webpages.
 |<<ui-remove-finished-downloads,remove-finished-downloads>>|Number of milliseconds to wait before removing finished downloads. Will not be removed if value is -1.
@@ -618,11 +619,20 @@ This setting is only available with the QtWebKit backend.
 
 [[ui-user-stylesheet]]
 === user-stylesheet
-User stylesheet to use (absolute filename, filename relative to the config directory or CSS string). Will expand environment variables.
+User stylesheet to use (absolute filename or filename relative to the config directory). Will expand environment variables.
 
-Default: +pass:[html &gt; ::-webkit-scrollbar { width: 0px; height: 0px; }]+
+Default: empty
 
-This setting is only available with the QtWebKit backend.
+[[ui-hide-scrollbar]]
+=== hide-scrollbar
+Hide the main scrollbar.
+
+Valid values:
+
+ * +true+
+ * +false+
+
+Default: +pass:[true]+
 
 [[ui-css-media-type]]
 === css-media-type
@@ -677,6 +687,7 @@ The format to use for the window title. The following placeholders are defined:
 * `{id}`: The internal window ID of this window.
 * `{scroll_pos}`: The page scroll position.
 * `{host}`: The host of the current web page.
+* `{backend}`: Either 'webkit' or 'webengine'
 
 Default: +pass:[{perc}{title}{title_sep}qutebrowser]+
 
@@ -756,8 +767,6 @@ User agent to send. Empty to send the default.
 
 Default: empty
 
-This setting is only available with the QtWebKit backend.
-
 [[network-proxy]]
 === proxy
 The proxy to use.
@@ -1195,6 +1204,7 @@ The format to use for the tab title. The following placeholders are defined:
 * `{id}`: The internal tab ID of this tab.
 * `{scroll_pos}`: The page scroll position.
 * `{host}`: The host of the current web page.
+* `{backend}`: Either 'webkit' or 'webengine'
 
 Default: +pass:[{index}: {title}]+