From 2c3f144cd5097bc6b308e04d3e66020d9adb0ffd Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Fri, 5 Oct 2018 17:21:36 +0200
Subject: [PATCH] Update docs
---
doc/changelog.asciidoc | 6 ++++++
doc/help/settings.asciidoc | 16 ++++++++++++++--
qutebrowser/config/configdata.yml | 4 ++--
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 332d9bc9a..27359df94 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -18,6 +18,12 @@ breaking changes (such as renamed commands) can happen in minor releases.
v1.6.0 (unreleased)
-------------------
+Added
+~~~~~
+
+- New `tabs.new_position.stacking` setting which controls whether new tabs
+ opened from a page should stack on each other or not.
+
Changed
~~~~~~~
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index a401242aa..79f2b44f2 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -256,7 +256,8 @@
|<<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.new_position.stacking,tabs.new_position.stacking>>|Stack related tabs on top of each other when opened consecutively.
+|<<tabs.new_position.unrelated,tabs.new_position.unrelated>>|Position of new tabs which are not 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.
@@ -3156,6 +3157,7 @@ Default: +pass:[true]+
[[tabs.new_position.related]]
=== tabs.new_position.related
Position of new tabs opened from another tab.
+See `tabs.new_position.stacking` for controlling stacking behavior.
Type: <<types,NewTabPosition>>
@@ -3168,9 +3170,19 @@ Valid values:
Default: +pass:[next]+
+[[tabs.new_position.stacking]]
+=== tabs.new_position.stacking
+Stack related tabs on top of each other when opened consecutively.
+Only applies for `next` and `prev` values of `tabs.new_position.related` and `tabs.new_position.unrelated`.
+
+Type: <<types,Bool>>
+
+Default: +pass:[true]+
+
[[tabs.new_position.unrelated]]
=== tabs.new_position.unrelated
-Position of new tabs which aren't opened from another tab.
+Position of new tabs which are not opened from another tab.
+See `tabs.new_position.stacking` for controlling stacking behavior.
Type: <<types,NewTabPosition>>
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 0b7b9f730..d1aff5128 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1494,8 +1494,8 @@ tabs.new_position.stacking:
desc: >-
Stack related tabs on top of each other when opened consecutively.
- Only applies `next` and `prev` values of `tabs.new_position.related` and
- `tabs.new_position.unrelated`.
+ Only applies for `next` and `prev` values of `tabs.new_position.related`
+ and `tabs.new_position.unrelated`.
tabs.padding:
default: