From 5662407e01f6654d94603596b3d21227bbbedfe2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 11:51:51 +0100
Subject: [PATCH] Update docs

---
 doc/changelog.asciidoc     |  5 +++++
 doc/help/settings.asciidoc | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index b757745a4..6fb47ae9d 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -54,6 +54,9 @@ Changed
   are now applied as soon as the file is saved in the editor.
 - When there are multiple unknown keys in a autoconfig.yml, they now all get
   reported in one error.
+- New `tabs.mode_on_change` setting which replaces
+  `tabs.persist_mode_on_change`. It can now be set to `restore` which remembers
+  input modes (input/passthrough) per tab.
 
 Fixed
 ~~~~~
@@ -79,6 +82,8 @@ Removed
   via hints.
 - The `qutebrowser_viewsource` userscript has been removed as `:view-source
   --edit` can now be used.
+- The `tabs.persist_mode_on_change` setting has been removed and replaced by
+  `tabs.mode_on_change`.
 
 v1.1.1
 ------
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 279e7889e..53dce9e8e 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -238,11 +238,11 @@
 |<<tabs.indicator.padding,tabs.indicator.padding>>|Padding (in pixels) for tab indicators.
 |<<tabs.indicator.width,tabs.indicator.width>>|Width (in pixels) of the progress indicator (0 to disable).
 |<<tabs.last_close,tabs.last_close>>|How to behave when the last tab is closed.
+|<<tabs.mode_on_change,tabs.mode_on_change>>|When switching tabs, what input mode is applied.
 |<<tabs.mousewheel_switching,tabs.mousewheel_switching>>|Switch between tabs using the mouse wheel.
 |<<tabs.new_position.related,tabs.new_position.related>>|Position of new tabs opened from another tab.
 |<<tabs.new_position.unrelated,tabs.new_position.unrelated>>|Position of new tabs which aren't opened from another tab.
 |<<tabs.padding,tabs.padding>>|Padding (in pixels) around text for tabs.
-|<<tabs.mode_on_change,tabs.mode_on_change>>|Set input mode behavior when switching tab.
 |<<tabs.pinned.shrink,tabs.pinned.shrink>>|Shrink pinned tabs down to their contents.
 |<<tabs.position,tabs.position>>|Position of the tab bar.
 |<<tabs.select_on_remove,tabs.select_on_remove>>|Which tab to select when the focused tab is removed.
@@ -2774,6 +2774,20 @@ Valid values:
 
 Default: +pass:[ignore]+
 
+[[tabs.mode_on_change]]
+=== tabs.mode_on_change
+When switching tabs, what input mode is applied.
+
+Type: <<types,String>>
+
+Valid values:
+
+ * +persist+: Retain the current mode.
+ * +restore+: Restore previously saved mode.
+ * +normal+: Always revert to normal mode.
+
+Default: +pass:[normal]+
+
 [[tabs.mousewheel_switching]]
 === tabs.mousewheel_switching
 Switch between tabs using the mouse wheel.
@@ -2825,20 +2839,6 @@ Default:
 - +pass:[right]+: +pass:[5]+
 - +pass:[top]+: +pass:[0]+
 
-[[tabs.mode_on_change]]
-=== tabs.mode_on_change
-When switching tabs, what input mode is applied.
-
-Type: <<types,String>>
-
-Valid values:
-
- * +persist+: Retain the current mode.
- * +restore+: Restore previously saved mode.
- * +normal+: Always revert to normal mode.
-
-Default: +pass:[normal]+
-
 [[tabs.pinned.shrink]]
 === tabs.pinned.shrink
 Shrink pinned tabs down to their contents.