From 16ffafb7696b6e9d45a43a72801790f80c3dc140 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 31 Mar 2015 22:14:35 +0200
Subject: [PATCH] Regenerate docs.

---
 doc/help/commands.asciidoc | 14 ++++++++++++--
 doc/help/settings.asciidoc | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 3c45c56ff..70c707def 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -874,7 +874,8 @@ These commands are mainly intended for debugging. They are hidden if qutebrowser
 |<<debug-cache-stats,debug-cache-stats>>|Print LRU cache stats.
 |<<debug-console,debug-console>>|Show the debugging console.
 |<<debug-crash,debug-crash>>|Crash for debugging purposes.
-|<<debug-pyeval,debug-pyeval>>|Evaluate a python string and display the results as a webpage.
+|<<debug-pyeval,debug-pyeval>>|Evaluate a python string and display the results as a web page.
+|<<debug-trace,debug-trace>>|Trace executed code via hunter.
 |==============
 [[debug-all-objects]]
 === debug-all-objects
@@ -901,8 +902,17 @@ Crash for debugging purposes.
 === debug-pyeval
 Syntax: +:debug-pyeval 's'+
 
-Evaluate a python string and display the results as a webpage.
+Evaluate a python string and display the results as a web page.
 
 ==== positional arguments
 * +'s'+: The string to evaluate.
 
+[[debug-trace]]
+=== debug-trace
+Syntax: +:debug-trace ['expr']+
+
+Trace executed code via hunter.
+
+==== positional arguments
+* +'expr'+: What to trace, passed to hunter.
+
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 393738868..02d9bb5dc 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -95,8 +95,8 @@
 |<<tabs-new-tab-position,new-tab-position>>|How new tabs are positioned.
 |<<tabs-new-tab-position-explicit,new-tab-position-explicit>>|How new tabs opened explicitly are positioned.
 |<<tabs-last-close,last-close>>|Behaviour when the last tab is closed.
-|<<tabs-hide-auto,hide-auto>>|Hide the tabbar if only one tab is open.
-|<<tabs-hide-always,hide-always>>|Always hide the tabbar.
+|<<tabs-hide-auto,hide-auto>>|Hide the tab bar if only one tab is open.
+|<<tabs-hide-always,hide-always>>|Always hide the tab bar.
 |<<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.
@@ -196,7 +196,7 @@
 |<<colors-tabs.bg.odd,tabs.bg.odd>>|Background color of unselected odd tabs.
 |<<colors-tabs.bg.even,tabs.bg.even>>|Background color of unselected even tabs.
 |<<colors-tabs.bg.selected,tabs.bg.selected>>|Background color of selected tabs.
-|<<colors-tabs.bg.bar,tabs.bg.bar>>|Background color of the tabbar.
+|<<colors-tabs.bg.bar,tabs.bg.bar>>|Background color of the tab bar.
 |<<colors-tabs.indicator.start,tabs.indicator.start>>|Color gradient start for the tab indicator.
 |<<colors-tabs.indicator.stop,tabs.indicator.stop>>|Color gradient end for the tab indicator.
 |<<colors-tabs.indicator.error,tabs.indicator.error>>|Color for the tab indicator on errors..
@@ -218,7 +218,7 @@
 |Setting|Description
 |<<fonts-_monospace,_monospace>>|Default monospace fonts.
 |<<fonts-completion,completion>>|Font used in the completion widget.
-|<<fonts-tabbar,tabbar>>|Font used in the tabbar.
+|<<fonts-tabbar,tabbar>>|Font used in the tab bar.
 |<<fonts-statusbar,statusbar>>|Font used in the statusbar.
 |<<fonts-downloads,downloads>>|Font used for the downloadbar.
 |<<fonts-hints,hints>>|Font used for the hints.
@@ -537,7 +537,7 @@ The format to use for the window title. The following placeholders are defined:
 
 * `{perc}`: The percentage as a string like `[10%]`.
 * `{perc_raw}`: The raw percentage, e.g. `10`
-* `{title}`: The title of the current webpage
+* `{title}`: The title of the current web page
 * `{title_sep}`: The string ` - ` if a title is set, empty otherwise.
 * `{id}`: The internal window ID of this window.
 
@@ -859,7 +859,7 @@ Default: +pass:[ignore]+
 
 [[tabs-hide-auto]]
 === hide-auto
-Hide the tabbar if only one tab is open.
+Hide the tab bar if only one tab is open.
 
 Valid values:
 
@@ -870,7 +870,7 @@ Default: +pass:[false]+
 
 [[tabs-hide-always]]
 === hide-always
-Always hide the tabbar.
+Always hide the tab bar.
 
 Valid values:
 
@@ -972,7 +972,7 @@ The format to use for the tab title. The following placeholders are defined:
 
 * `{perc}`: The percentage as a string like `[10%]`.
 * `{perc_raw}`: The raw percentage, e.g. `10`
-* `{title}`: The title of the current webpage
+* `{title}`: The title of the current web page
 * `{title_sep}`: The string ` - ` if a title is set, empty otherwise.
 * `{index}`: The index of this tab.
 * `{id}`: The internal tab ID of this tab.
@@ -1535,7 +1535,7 @@ Default: +pass:[black]+
 
 [[colors-tabs.bg.bar]]
 === tabs.bg.bar
-Background color of the tabbar.
+Background color of the tab bar.
 
 Default: +pass:[#555555]+
 
@@ -1650,7 +1650,7 @@ Default: +pass:[8pt ${_monospace}]+
 
 [[fonts-tabbar]]
 === tabbar
-Font used in the tabbar.
+Font used in the tab bar.
 
 Default: +pass:[8pt ${_monospace}]+