From 4d080d320952b0c66797d9d0fbea10e5e65b737e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Fri, 28 Sep 2018 12:35:24 +0200
Subject: [PATCH] Update docs

---
 doc/changelog.asciidoc     |  2 ++
 doc/help/settings.asciidoc | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index a98716cc2..c4b24640f 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -43,6 +43,8 @@ Added
 - Running qutebrowser with QtWebKit or Qt < 5.9 now shows a warning (only
   once), as support for those is going to be removed in a future release.
 - New t[iI][hHu] default bindings (similar to `tsh` etc.) to toggle images.
+- New `tabs.max_width` setting which allows to have a more "normal" look for
+  tabs.
 
 Changed
 ~~~~~~~
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index be3ceae77..eb4b7f79c 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -250,6 +250,7 @@
 |<<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.max_width,tabs.max_width>>|Maximum width (in pixels) of tabs (-1 for no maximum).
 |<<tabs.min_width,tabs.min_width>>|Minimum width (in pixels) of tabs (-1 for the default minimum size behavior).
 |<<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.
@@ -3086,6 +3087,17 @@ Valid values:
 
 Default: +pass:[ignore]+
 
+[[tabs.max_width]]
+=== tabs.max_width
+Maximum width (in pixels) of tabs (-1 for no maximum).
+This setting only applies when tabs are horizontal.
+This setting does not apply to pinned tabs, unless `tabs.pinned.shrink` is False.
+This setting may not apply properly if max_width is smaller than the minimum size of tab contents, or smaller than tabs.min_width.
+
+Type: <<types,Int>>
+
+Default: +pass:[-1]+
+
 [[tabs.min_width]]
 === tabs.min_width
 Minimum width (in pixels) of tabs (-1 for the default minimum size behavior).