From 009fa845f426e91a117781f9e2ba6759198768a4 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 13 Nov 2017 07:12:48 +0100
Subject: [PATCH] Update docs

---
 doc/changelog.asciidoc     |  4 ++++
 doc/help/settings.asciidoc | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 16b5ea750..edb24b45f 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -41,6 +41,8 @@ Added
 - New `qt.highdpi` setting to turn on Qt's High-DPI scaling.
 - New `:completion-item-yank` command (bound to `<Ctrl-C>`) to yank the current
   completion item text.
+- New `tabs.pinned.shrink` setting to (`true` by default) to make it possible
+  for pinned tabs and normal tabs to have the same size.
 
 Changed
 ~~~~~~~
@@ -88,6 +90,8 @@ Removed
 - The long-deprecated `:prompt-yes`, `:prompt-no`, `:paste-primary` and `:paste`
   commands have been removed.
 - The `messages.unfocused` option which wasn't used anymore was removed.
+- The `x[xtb]` default bindings got removed again as many users accidentally
+  triggered them.
 
 v1.0.4 (unreleased)
 -------------------
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 15eb79390..bbb6b8d22 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -238,6 +238,7 @@
 |<<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.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.
 |<<tabs.show,tabs.show>>|When to show the tab bar.
@@ -589,10 +590,7 @@ Default:
 * +pass:[wo]+: +pass:[set-cmd-text -s :open -w]+
 * +pass:[wp]+: +pass:[open -w -- {clipboard}]+
 * +pass:[xO]+: +pass:[set-cmd-text :open -b -r {url:pretty}]+
-* +pass:[xb]+: +pass:[config-cycle statusbar.hide]+
 * +pass:[xo]+: +pass:[set-cmd-text -s :open -b]+
-* +pass:[xt]+: +pass:[config-cycle tabs.show always switching]+
-* +pass:[xx]+: +pass:[config-cycle statusbar.hide ;; config-cycle tabs.show always switching]+
 * +pass:[yD]+: +pass:[yank domain -s]+
 * +pass:[yP]+: +pass:[yank pretty-url -s]+
 * +pass:[yT]+: +pass:[yank title -s]+
@@ -2791,6 +2789,14 @@ Default:
 - +pass:[right]+: +pass:[5]+
 - +pass:[top]+: +pass:[0]+
 
+[[tabs.pinned.shrink]]
+=== tabs.pinned.shrink
+Shrink pinned tabs down to their contents.
+
+Type: <<types,Bool>>
+
+Default: +pass:[true]+
+
 [[tabs.position]]
 === tabs.position
 Position of the tab bar.