Regenerate documentation

README.asciidoc

@@ -160,6 +160,7 @@ Contributors, sorted by the number of commits in descending order:
 * Lamar Pavel
 * Marshall Lochbaum
 * Bruno Oliveira
+* thuck
 * Martin Tournoij
 * Imran Sobir
 * Alexander Cogneau
@@ -174,6 +175,7 @@ Contributors, sorted by the number of commits in descending order:
 * Fritz Reichwald
 * Corentin Julé
 * meles5
+* Jay Kamat
 * Philipp Hansch
 * Panagiotis Ktistakis
 * Artur Shaik
@@ -191,7 +193,6 @@ Contributors, sorted by the number of commits in descending order:
 * ZDarian
 * Milan Svoboda
 * John ShaggyTwoDope Jenkins
-* Jay Kamat
 * Clayton Craft
 * Peter Vilim
 * Jacob Sword
@@ -225,7 +226,6 @@ Contributors, sorted by the number of commits in descending order:
 * Jussi Timperi
 * Cosmin Popescu
 * Brian Jackson
-* thuck
 * sbinix
 * rsteube
 * neeasade

doc/help/commands.asciidoc

@@ -82,7 +82,7 @@ It is possible to run or bind multiple commands by separating them with `;;`.
 |<<tab-move,tab-move>>|Move the current tab according to the argument and [count].
 |<<tab-next,tab-next>>|Switch to the next tab, or switch [count] tabs forward.
 |<<tab-only,tab-only>>|Close all tabs except for the current one.
-|<<tab-pin,tab-pin>>|Pin the current/[count]th tab.
+|<<tab-pin,tab-pin>>|Pin/Unpin the current/[count]th tab.
 |<<tab-prev,tab-prev>>|Switch to the previous tab, or switch [count] tabs back.
 |<<unbind,unbind>>|Unbind a keychain.
 |<<undo,undo>>|Re-open a closed tab (optionally skipping [count] closed tabs).
@@ -839,9 +839,9 @@ Close the current/[count]th tab.
 ==== optional arguments
 * +*-p*+, +*--prev*+: Force selecting the tab before the current tab.
 * +*-n*+, +*--next*+: Force selecting the tab after the current tab.
-* +*-f*+, +*--force*+: Avoid confirmation for pinned tabs.
 * +*-o*+, +*--opposite*+: Force selecting the tab in the opposite direction of what's configured in 'tabs->select-on-remove'.
 
+* +*-f*+, +*--force*+: Avoid confirmation for pinned tabs.
 
 ==== count
 The tab index to close
@@ -905,16 +905,10 @@ Close all tabs except for the current one.
 
 [[tab-pin]]
 === tab-pin
-Syntax: +:tab-pin+
+Pin/Unpin the current/[count]th tab.
-
-Pin the current/[count]th tab.
 
 ==== count
-The tab index to pin
+The tab index to pin or unpin
-
-==== note
-* Pinning a tab shrinks it to `tabs->pinned-width` size.
-* Attempting to close a pinned tab will cause a confirmation, unless `--force` is passed.
 
 [[tab-prev]]
 === tab-prev

doc/help/settings.asciidoc

@@ -124,15 +124,15 @@
 |<<tabs-wrap,wrap>>|Whether to wrap when changing tabs.
 |<<tabs-movable,movable>>|Whether tabs should be movable.
 |<<tabs-close-mouse-button,close-mouse-button>>|On which mouse button to close tabs.
-|<<tabs-pinned-width,pinned-width>>|The size of pinned tabs.
 |<<tabs-position,position>>|The position of the tab bar.
 |<<tabs-show-favicons,show-favicons>>|Whether to show favicons in the tab bar.
 |<<tabs-favicon-scale,favicon-scale>>|Scale for favicons in the tab bar. The tab size is unchanged, so big favicons also require extra `tabs->padding`.
 |<<tabs-width,width>>|The width of the tab bar if it's vertical, in px or as percentage of the window.
+|<<tabs-pinned-width,pinned-width>>|The width for pinned tabs with a horizontal tabbar, in px.
 |<<tabs-indicator-width,indicator-width>>|Width of the progress indicator (0 to disable).
 |<<tabs-tabs-are-windows,tabs-are-windows>>|Whether to open windows instead of tabs.
 |<<tabs-title-format,title-format>>|The format to use for the tab title. The following placeholders are defined:
-|<<tabs-title-format-pinned,title-format-pinned>>|The format to use for the tab title, when it is pinned. The following placeholders are defined:
+|<<tabs-title-format-pinned,title-format-pinned>>|The format to use for the tab title for pinned tabs.The same placeholders like for title-format are defined.
 |<<tabs-title-alignment,title-alignment>>|Alignment of the text inside of tabs
 |<<tabs-mousewheel-tab-switching,mousewheel-tab-switching>>|Switch between tabs using the mouse wheel.
 |<<tabs-padding,padding>>|Padding for tabs (top, bottom, left, right).
@@ -1185,14 +1185,6 @@ Valid values:
 
 Default: +pass:[middle]+
 
-[[tabs-pinned-width]]
-=== pinned-width
-The width for pinned tabs with a horizontal tabbar, in px.
-
-See `:tab-pin` for more details.
-
-Default: +43+
-
 [[tabs-position]]
 === position
 The position of the tab bar.
@@ -1229,6 +1221,12 @@ The width of the tab bar if it's vertical, in px or as percentage of the window.
 
 Default: +pass:[20%]+
 
+[[tabs-pinned-width]]
+=== pinned-width
+The width for pinned tabs with a horizontal tabbar, in px.
+
+Default: +pass:[43]+
+
 [[tabs-indicator-width]]
 === indicator-width
 Width of the progress indicator (0 to disable).
@@ -1264,9 +1262,7 @@ Default: +pass:[{index}: {title}]+
 
 [[tabs-title-format-pinned]]
 === title-format-pinned
-The format to use for the tab title when it is pinned.
+The format to use for the tab title for pinned tabs.The same placeholders like for title-format are defined.
-
-The same syntax is used as `tabs->title-format`
 
 Default: +pass:[{index}]+
 

qutebrowser/browser/commands.py

@@ -259,7 +259,7 @@ class CommandDispatcher:
                        name='tab-pin')
     @cmdutils.argument('count', count=True)
     def tab_pin(self, count=None):
-        """Pin/Unpin the current tab.
+        """Pin/Unpin the current/[count]th tab.
 
         Args:
             count: The tab index to pin or unpin, or None

tests/end2end/features/conftest.py

@@ -549,7 +549,6 @@ def check_open_tabs(quteproc, request, tabs):
         assert line.startswith('- ')
         line = line[2:]  # remove "- " prefix
 
-        path = line
         active = False
         pinned = False