Update some more references to old config options

FAQ.asciidoc

@@ -179,7 +179,7 @@ Configuration not saved after modifying config.::
 
 Unable to view flash content.::
     If you have flash installed for on your system, it's necessary to enable plugins
-    to use the flash plugin. Using the command `:set content allow-plugins true`
+    to use the flash plugin. Using the command `:set content.plugins true`
     in qutebrowser will enable plugins. Packages for flash should
     be provided for your platform or it can be obtained from
     http://get.adobe.com/flashplayer/[Adobe].

doc/help/commands.asciidoc

@@ -368,7 +368,7 @@ Start hinting.
  - `normal`: Open the link.
  - `current`: Open the link in the current tab.
  - `tab`: Open the link in a new tab (honoring the
- background-tabs setting).
+ `tabs.background_tabs` setting).
  - `tab-fg`: Open the link in a new foreground tab.
  - `tab-bg`: Open the link in a new background tab.
  - `window`: Open the link in a new window.
@@ -402,7 +402,7 @@ Start hinting.
 
 
 ==== optional arguments
-* +*-r*+, +*--rapid*+: Whether to do rapid hinting. This is only possible with targets `tab` (with background-tabs=true), `tab-bg`,
+* +*-r*+, +*--rapid*+: Whether to do rapid hinting. This is only possible with targets `tab` (with `tabs.background_tabs=true`), `tab-bg`,
  `window`, `run`, `hover`, `userscript` and `spawn`.
 
 * +*-m*+, +*--mode*+: The hinting mode to use. 

doc/help/settings.asciidoc

@@ -231,7 +231,7 @@
 |<<tabs.tabs_are_windows,tabs.tabs_are_windows>>|Open a new window for every tab.
 |<<tabs.title.alignment,tabs.title.alignment>>|Alignment of the text inside of tabs.
 |<<tabs.title.format,tabs.title.format>>|The format to use for the tab title.
-|<<tabs.title.format_pinned,tabs.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.format_pinned,tabs.title.format_pinned>>|The format to use for the tab title for pinned tabs. The same placeholders like for `tabs.title.format` are defined.
 |<<tabs.width.bar,tabs.width.bar>>|The width of the tab bar if it's vertical, in px or as percentage of the window.
 |<<tabs.width.indicator,tabs.width.indicator>>|Width of the progress indicator (0 to disable).
 |<<tabs.width.pinned,tabs.width.pinned>>|The width for pinned tabs with a horizontal tabbar, in px.
@@ -1688,7 +1688,7 @@ Default: empty
 [[downloads.location.prompt]]
 == downloads.location.prompt
 Prompt the user for the download location.
-If set to false, `download-directory` will be used.
+If set to false, `downloads.location.directory` will be used.
 
 Valid values:
 
@@ -2483,7 +2483,7 @@ Default: +pass:[{index}: {title}]+
 
 [[tabs.title.format_pinned]]
 == tabs.title.format_pinned
-The format to use for the tab title for pinned tabs. The same placeholders like for title-format are defined.
+The format to use for the tab title for pinned tabs. The same placeholders like for `tabs.title.format` are defined.
 
 Default: +pass:[{index}]+
 

misc/userscripts/dmenu_qutebrowser

@@ -23,7 +23,7 @@
 # If run from qutebrowser as a userscript, it runs :open on the URL
 # If not, it opens a new qutebrowser window at the URL
 #
-# Ideal for use with tabs-are-windows. Set a hotkey to launch this script, then:
+# Ideal for use with tabs_are_windows. Set a hotkey to launch this script, then:
 #	:bind o spawn --userscript dmenu_qutebrowser
 #
 # Use the hotkey to open in new tab/window, press 'o' to open URL in current tab/window

misc/userscripts/open_download

@@ -12,7 +12,7 @@
 #  - rofi (in a recent version)
 #  - xdg-open and xdg-mime
 #  - You should configure qutebrowser to download files to a single directory
-#  - It comes in handy if you enable remove-finished-downloads. If you want to
+#  - It comes in handy if you enable downloads.remove_finished. If you want to
 #    see the recent downloads, just press "sd".
 #
 # Thorsten Wißmann, 2015 (thorsten` on freenode)

misc/userscripts/openfeeds

@@ -21,7 +21,7 @@
 
 # Opens all links to feeds defined in the head of a site
 #
-# Ideal for use with tabs-are-windows. Set a hotkey to launch this script, then:
+# Ideal for use with tabs_are_windows. Set a hotkey to launch this script, then:
 #   :bind gF spawn --userscript openfeeds
 #
 # Use the hotkey to open the feeds in new tab/window, press 'gF' to open

qutebrowser/browser/browsertab.py

@@ -703,7 +703,7 @@ class AbstractTab(QWidget):
         self.load_started.emit()
 
     def _handle_auto_insert_mode(self, ok):
-        """Handle auto-insert-mode after loading finished."""
+        """Handle `input.insert_mode.auto_load` after loading finished."""
         if not config.val.input.insert_mode.auto_load or not ok:
             return
 

qutebrowser/browser/commands.py

@@ -200,7 +200,7 @@ class CommandDispatcher:
                     "-o is not supported with 'tabs.select_on_remove' set to "
                     "'last-used'!")
             else:  # pragma: no cover
-                raise ValueError("Invalid select-on-remove value "
+                raise ValueError("Invalid select_on_remove value "
                                  "{!r}!".format(conf_selection))
         return None
 
@@ -495,7 +495,7 @@ class CommandDispatcher:
             raise cmdexc.CommandError(e)
 
         # The new tab could be in a new tabbed_browser (e.g. because of
-        # tabs-are-windows being set)
+        # tabs.tabs_are_windows being set)
         if window:
             new_tabbed_browser = self._new_tabbed_browser(
                 private=self._tabbed_browser.private)

qutebrowser/browser/downloads.py

@@ -549,7 +549,7 @@ class AbstractDownloadItem(QObject):
         Args:
             cmdline: The command to use as string. A `{}` is expanded to the
                      filename. None means to use the system's default
-                     application or `default-open-dispatcher` if set. If no
+                     application or `downloads.open_dispatcher` if set. If no
                      `{}` is found, the filename is appended to the cmdline.
         """
         assert self.successful

qutebrowser/browser/hints.py

@@ -603,7 +603,7 @@ class HintManager(QObject):
         modeman.enter(self._win_id, usertypes.KeyMode.hint,
                       'HintManager.start')
 
-        # to make auto-follow == 'always' work
+        # to make auto_follow == 'always' work
         self._handle_auto_follow()
 
     @cmdutils.register(instance='hintmanager', scope='tab', name='hint',
@@ -615,7 +615,7 @@ class HintManager(QObject):
 
         Args:
             rapid: Whether to do rapid hinting. This is only possible with
-                   targets `tab` (with background-tabs=true), `tab-bg`,
+                   targets `tab` (with `tabs.background_tabs=true`), `tab-bg`,
                    `window`, `run`, `hover`, `userscript` and `spawn`.
             add_history: Whether to add the spawned or yanked link to the
                          browsing history.
@@ -631,7 +631,7 @@ class HintManager(QObject):
                 - `normal`: Open the link.
                 - `current`: Open the link in the current tab.
                 - `tab`: Open the link in a new tab (honoring the
-                         background-tabs setting).
+                         `tabs.background_tabs` setting).
                 - `tab-fg`: Open the link in a new foreground tab.
                 - `tab-bg`: Open the link in a new background tab.
                 - `window`: Open the link in a new window.
@@ -719,7 +719,7 @@ class HintManager(QObject):
         return self._context.hint_mode
 
     def _handle_auto_follow(self, keystr="", filterstr="", visible=None):
-        """Handle the auto-follow option."""
+        """Handle the auto_follow option."""
         if visible is None:
             visible = {string: label
                        for string, label in self._context.labels.items()
@@ -745,7 +745,7 @@ class HintManager(QObject):
             self._context.to_follow = list(visible.keys())[0]
 
         if follow:
-            # apply auto-follow-timeout
+            # apply auto_follow_timeout
             timeout = config.val.hints.auto_follow_timeout
             keyparsers = objreg.get('keyparsers', scope='window',
                                     window=self._win_id)
@@ -770,7 +770,7 @@ class HintManager(QObject):
                     label.show()
                 else:
                     # element doesn't match anymore -> hide it, unless in rapid
-                    # mode and hide-unmatched-rapid-hints is false (see #1799)
+                    # mode and hide_unmatched_rapid_hints is false (see #1799)
                     if (not self._context.rapid or
                             config.val.hints.hide_unmatched_rapid_hints):
                         label.hide()

qutebrowser/browser/shared.py

@@ -155,7 +155,7 @@ def ignore_certificate_errors(url, errors, abort_on):
             ignore = False
         return ignore
     elif ssl_strict is False:
-        log.webview.debug("ssl-strict is False, only warning about errors")
+        log.webview.debug("ssl_strict is False, only warning about errors")
         for err in errors:
             # FIXME we might want to use warn here (non-fatal error)
             # https://github.com/qutebrowser/qutebrowser/issues/114

qutebrowser/browser/webengine/webengineelem.py

@@ -162,7 +162,7 @@ class WebEngineElement(webelem.AbstractWebElement):
             top = rect['top']
             if width > 1 and height > 1:
                 # Fix coordinates according to zoom level
-                # We're not checking for zoom-text-only here as that doesn't
+                # We're not checking for zoom.text_only here as that doesn't
                 # exist for QtWebEngine.
                 zoom = self._tab.zoom.factor()
                 rect = QRect(left * zoom, top * zoom,

qutebrowser/browser/webkit/cookies.py

@@ -107,7 +107,7 @@ class CookieJar(RAMCookieJar):
 
     @config.change_filter('content.cookies.store')
     def _on_cookies_store_changed(self):
-        """Delete stored cookies if cookies-store changed."""
+        """Delete stored cookies if cookies.store changed."""
         if not config.val.content.cookies.store:
             self._lineparser.data = []
             self._lineparser.save()

qutebrowser/browser/webkit/webkitinspector.py

@@ -38,7 +38,7 @@ class WebKitInspector(inspector.AbstractWebInspector):
     def inspect(self, page):
         if not config.val.content.developer_extras:
             raise inspector.WebInspectorError(
-                "Please enable developer-extras before using the "
+                "Please enable content.developer_extras before using the "
                 "webinspector!")
         self._widget.setPage(page)
         self.show()

qutebrowser/config/configdata.yml

@@ -608,7 +608,7 @@ downloads.location.prompt:
   desc: >-
     Prompt the user for the download location.
 
-    If set to false, `download-directory` will be used.
+    If set to false, `downloads.location.directory` will be used.
 
 downloads.location.remember:
   default: true
@@ -1115,7 +1115,7 @@ tabs.title.format_pinned:
       - private
     none_ok: true
   desc: The format to use for the tab title for pinned tabs. The same placeholders
-    like for title-format are defined.
+    like for `tabs.title.format` are defined.
 
 tabs.width.bar:
   default: 20%

qutebrowser/keyinput/modeman.py

@@ -183,7 +183,7 @@ class ModeManager(QObject):
 
         if curmode != usertypes.KeyMode.insert:
             focus_widget = QApplication.instance().focusWidget()
-            log.modes.debug("handled: {}, forward-unbound-keys: {}, "
+            log.modes.debug("handled: {}, forward_unbound_keys: {}, "
                             "passthrough: {}, is_non_alnum: {} --> "
                             "filter: {} (focused: {!r})".format(
                                 handled, forward_unbound_keys,

qutebrowser/mainwindow/mainwindow.py

@@ -51,7 +51,7 @@ def get_window(via_ipc, force_window=False, force_tab=False,
         via_ipc: Whether the request was made via IPC.
         force_window: Whether to force opening in a window.
         force_tab: Whether to force opening in a tab.
-        force_target: Override the new-instance-open-target config
+        force_target: Override the new_instance_open_target config
     """
     if force_window and force_tab:
         raise ValueError("force_window and force_tab are mutually exclusive!")

qutebrowser/mainwindow/tabbedbrowser.py

@@ -395,7 +395,7 @@ class TabbedBrowser(tabwidget.TabWidget):
         Args:
             url: The URL to open as QUrl or None for an empty tab.
             background: Whether to open the tab in the background.
-                        if None, the background-tabs setting decides.
+                        if None, the `tabs.background_tabs`` setting decides.
             related: Whether the tab was opened from another existing tab.
                      If this is set, the new position might be different. With
                      the default settings we handle it like Chromium does:
@@ -405,7 +405,7 @@ class TabbedBrowser(tabwidget.TabWidget):
                            (related=False)
             idx: The index where the new tab should be opened.
             ignore_tabs_are_windows: If given, never open a new window, even
-                                     with tabs-are-windows set.
+                                     with tabs.tabs_are_windows set.
 
         Return:
             The opened WebView instance.
@@ -486,8 +486,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         elif pos == 'last':
             idx = -1
         else:
-            raise ValueError("Invalid new-tab-position '{}'.".format(pos))
+            raise ValueError("Invalid tabs.new_position '{}'.".format(pos))
-        log.webview.debug("new-tab-position {} -> opening new tab at {}, "
+        log.webview.debug("tabs.new_position {} -> opening new tab at {}, "
                           "next left: {} / right: {}".format(
                               pos, idx, self._tab_insert_idx_left,
                               self._tab_insert_idx_right))

qutebrowser/utils/utils.py

@@ -830,8 +830,8 @@ def open_file(filename, cmdline=None):
         filename: The filename to open.
         cmdline: The command to use as string. A `{}` is expanded to the
                  filename. None means to use the system's default application
-                 or `default-open-dispatcher` if set. If no `{}` is found, the
+                 or `downloads.open_dispatcher` if set. If no `{}` is found,
-                 filename is appended to the cmdline.
+                 the filename is appended to the cmdline.
     """
     # Import late to avoid circular imports:
     # utils -> config -> configdata -> configtypes -> cmdutils -> command ->
@@ -842,7 +842,7 @@ def open_file(filename, cmdline=None):
     # if we want to use the default
     override = config.val.downloads.open_dispatcher
 
-    # precedence order: cmdline > default-open-dispatcher > openUrl
+    # precedence order: cmdline > downloads.open_dispatcher > openUrl
 
     if cmdline is None and not override:
         log.misc.debug("Opening {} with the system application"

tests/end2end/features/conftest.py

@@ -181,7 +181,7 @@ def open_path(quteproc, httpbin, path):
       tab.
     - With "... in a new window", it's opened in a new window.
     - With "... in a private window" it's opened in a new private window.
-    - With "... as a URL", it's opened according to new-instance-open-target.
+    - With "... as a URL", it's opened according to new_instance_open_target.
     """
     path = path.replace('(port)', str(httpbin.port))
 

tests/end2end/features/downloads.feature

@@ -86,7 +86,7 @@ Feature: Downloading things from a website.
         And I run :prompt-accept
         Then the error "Download error: SSL handshake failed" should be shown
 
-    Scenario: Closing window with remove-finished-downloads timeout (issue 1242)
+    Scenario: Closing window with downloads.remove_finished timeout (issue 1242)
         When I set downloads.remove_finished to 500
         And I open data/downloads/download.bin in a new window without waiting
         And I wait until the download is finished
@@ -94,7 +94,7 @@ Feature: Downloading things from a website.
         And I wait 0.5s
         Then no crash should happen
 
-    Scenario: Quitting with finished downloads and confirm-quit=downloads (issue 846)
+    Scenario: Quitting with finished downloads and confirm_quit=downloads (issue 846)
         Given I have a fresh instance
         When I set downloads.location.prompt to false
         And I set confirm_quit to [downloads]
@@ -399,14 +399,14 @@ Feature: Downloading things from a website.
         And I open the download with a placeholder
         Then "Opening *download.bin* with [*python*]" should be logged
 
-    Scenario: Opening a download with default-open-dispatcher set
+    Scenario: Opening a download with open_dispatcher set
-        When I set a test python default-open-dispatcher
+        When I set a test python open_dispatcher
         And I open data/downloads/download.bin without waiting
         And I wait until the download is finished
         And I run :download-open
         Then "Opening *download.bin* with [*python*]" should be logged
 
-    Scenario: Opening a download with default-open-dispatcher set and override
+    Scenario: Opening a download with open_dispatcher set and override
         When I set downloads.open_dispatcher to cat
         And I open data/downloads/download.bin without waiting
         And I wait until the download is finished

tests/end2end/features/hints.feature

@@ -241,7 +241,7 @@ Feature: Using hints
         And I hint with args "all current" and follow a
         Then no crash should happen
 
-    ### hints.auto_follow-timeout
+    ### hints.auto_follow.timeout
 
     @not_osx
     Scenario: Ignoring key presses after auto-following hints
@@ -257,7 +257,7 @@ Feature: Using hints
         And I wait for "Releasing inhibition state of normal mode." in the log
         Then "Ignoring key ',', because the normal mode is currently inhibited." should be logged
 
-    Scenario: Turning off auto-follow-timeout
+    Scenario: Turning off auto_follow_timeout
         When I set hints.auto_follow_timeout to 0
         And I set hints.mode to number
         And I run :bind --force , message-info "Keypress worked!"
@@ -365,7 +365,7 @@ Feature: Using hints
         And I run :follow-hint 1
         Then data/numbers/7.txt should be loaded
 
-    ### auto-follow option
+    ### hints.auto_follow option
 
     Scenario: Using hints.auto_follow = 'always' in letter mode
         When I open data/hints/html/simple.html

tests/end2end/features/invoke.feature

@@ -6,7 +6,7 @@ Feature: Invoking a new process
     Background:
         Given I clean up open tabs
 
-    Scenario: Using new-instance-open-target = tab
+    Scenario: Using new_instance_open_target = tab
         When I set new_instance_open_target to tab
         And I open data/title.html
         And I open data/search.html as a URL
@@ -14,7 +14,7 @@ Feature: Invoking a new process
             - data/title.html
             - data/search.html (active)
 
-    Scenario: Using new-instance-open-target = tab-bg
+    Scenario: Using new_instance_open_target = tab-bg
         When I set new_instance_open_target to tab-bg
         And I open data/title.html
         And I open data/search.html as a URL
@@ -22,7 +22,7 @@ Feature: Invoking a new process
             - data/title.html (active)
             - data/search.html
 
-    Scenario: Using new-instance-open-target = window
+    Scenario: Using new_instance_open_target = window
         When I set new_instance_open_target to window
         And I open data/title.html
         And I open data/search.html as a URL
@@ -36,7 +36,7 @@ Feature: Invoking a new process
               - history:
                 - url: http://localhost:*/data/search.html
 
-    Scenario: Using new-instance-open-target_window = last-opened
+    Scenario: Using new_instance_open_target_window = last-opened
         When I set new_instance_open_target to tab
         And I set new_instance_open_target_window to last-opened
         And I open data/title.html
@@ -54,7 +54,7 @@ Feature: Invoking a new process
               - history:
                 - url: http://localhost:*/data/hello.txt
 
-    Scenario: Using new-instance-open-target_window = first-opened
+    Scenario: Using new_instance_open_target_window = first-opened
         When I set new_instance_open_target to tab
         And I set new_instance_open_target_window to first-opened
         And I open data/title.html

tests/end2end/features/javascript.feature

@@ -55,14 +55,14 @@ Feature: Javascript stuff
         And I wait for "Focus object changed: *" in the log
         Then no crash should happen
 
-    Scenario: Opening window without user interaction with javascript-can-open-tabs-automatically set to true
+    Scenario: Opening window without user interaction with content.javascript.can_open_tabs_automatically set to true
         When I open data/hello.txt
         And I set content.javascript.can_open_tabs_automatically to true
         And I run :tab-only
         And I run :jseval if (window.open('about:blank')) { console.log('window opened'); } else { console.log('error while opening window'); }
         Then the javascript message "window opened" should be logged
 
-    Scenario: Opening window without user interaction with javascript-can-open-tabs-automatically set to false
+    Scenario: Opening window without user interaction with javascript.can_open_tabs_automatically set to false
         When I open data/hello.txt
         And I set content.javascript.can_open_tabs_automatically to false
         And I run :tab-only

tests/end2end/features/misc.feature

@@ -152,7 +152,7 @@ Feature: Various utility commands.
     Scenario: Inspector without developer extras
         When I set content.developer_extras to false
         And I run :inspector
-        Then the error "Please enable developer-extras before using the webinspector!" should be shown
+        Then the error "Please enable content.developer_extras before using the webinspector!" should be shown
 
     @qtwebkit_skip
     Scenario: Inspector without --enable-webengine-inspector
@@ -173,7 +173,7 @@ Feature: Various utility commands.
     Scenario: Inspector without developer extras (after smoke)
         When I set content.developer_extras to false
         And I run :inspector
-        Then the error "Please enable developer-extras before using the webinspector!" should be shown
+        Then the error "Please enable content.developer_extras before using the webinspector!" should be shown
 
     # Different code path as an inspector got created now
     @no_xvfb @posix @qtwebengine_skip

tests/end2end/features/prompts.feature

@@ -169,7 +169,7 @@ Feature: Prompts
 
     # SSL
 
-    Scenario: SSL error with ssl-strict = false
+    Scenario: SSL error with content.ssl_strict = false
         When I clear SSL errors
         And I set content.ssl_strict to false
         And I load an SSL page
@@ -178,13 +178,13 @@ Feature: Prompts
         And the page should contain the plaintext "Hello World via SSL!"
 
     @issue2478
-    Scenario: SSL error with ssl-strict = true
+    Scenario: SSL error with content.ssl_strict = true
         When I clear SSL errors
         And I set content.ssl_strict to true
         And I load an SSL page
         Then a SSL error page should be shown
 
-    Scenario: SSL error with ssl-strict = ask -> yes
+    Scenario: SSL error with content.ssl_strict = ask -> yes
         When I clear SSL errors
         And I set content.ssl_strict to ask
         And I load an SSL page
@@ -194,7 +194,7 @@ Feature: Prompts
         Then the page should contain the plaintext "Hello World via SSL!"
 
     @issue2478
-    Scenario: SSL error with ssl-strict = ask -> no
+    Scenario: SSL error with content.ssl_strict = ask -> no
         When I clear SSL errors
         And I set content.ssl_strict to ask
         And I load an SSL page
@@ -203,7 +203,7 @@ Feature: Prompts
         Then a SSL error page should be shown
 
     @issue2478
-    Scenario: SSL error with ssl-strict = ask -> abort
+    Scenario: SSL error with content.ssl_strict = ask -> abort
         When I clear SSL errors
         And I set content.ssl_strict to ask
         And I load an SSL page

tests/end2end/features/search.feature

@@ -52,27 +52,27 @@ Feature: Searching on a page
         And I wait for "search didn't find blub" in the log
         Then the warning "Text 'blub' not found on page!" should be shown
 
-    ## ignore-case
+    ## ignore_case
 
-    Scenario: Searching text with ignore-case = always
+    Scenario: Searching text with ignore_case = always
         When I set ignore_case to always
         And I run :search bar
         And I wait for "search found bar" in the log
         Then "Bar" should be found
 
-    Scenario: Searching text with ignore-case = never
+    Scenario: Searching text with ignore_case = never
         When I set ignore_case to never
         And I run :search bar
         And I wait for "search found bar with flags FindCaseSensitively" in the log
         Then "bar" should be found
 
-    Scenario: Searching text with ignore-case = smart (lower-case)
+    Scenario: Searching text with ignore_case = smart (lower-case)
         When I set ignore_case to smart
         And I run :search bar
         And I wait for "search found bar" in the log
         Then "Bar" should be found
 
-    Scenario: Searching text with ignore-case = smart (upper-case)
+    Scenario: Searching text with ignore_case = smart (upper-case)
         When I set ignore_case to smart
         And I run :search Foo
         And I wait for "search found Foo with flags FindCaseSensitively" in the log

tests/end2end/features/tabs.feature

@@ -37,7 +37,7 @@ Feature: Tab management
             - data/numbers/2.txt
             - data/numbers/3.txt (active)
 
-    Scenario: :tab-close with select-on-remove = next
+    Scenario: :tab-close with tabs.select_on_remove = next
         When I set tabs.select_on_remove to next
         And I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab
@@ -48,7 +48,7 @@ Feature: Tab management
             - data/numbers/1.txt
             - data/numbers/3.txt (active)
 
-    Scenario: :tab-close with select-on-remove = prev
+    Scenario: :tab-close with tabs.select_on_remove = prev
         When I set tabs.select_on_remove to prev
         And I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab
@@ -59,7 +59,7 @@ Feature: Tab management
             - data/numbers/1.txt (active)
             - data/numbers/3.txt
 
-    Scenario: :tab-close with select-on-remove = last-used
+    Scenario: :tab-close with tabs.select_on_remove = last-used
         When I set tabs.select_on_remove to last-used
         And I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab
@@ -72,7 +72,7 @@ Feature: Tab management
             - data/numbers/3.txt
             - data/numbers/4.txt (active)
 
-    Scenario: :tab-close with select-on-remove = prev and --next
+    Scenario: :tab-close with tabs.select_on_remove = prev and --next
         When I set tabs.select_on_remove to prev
         And I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab
@@ -83,7 +83,7 @@ Feature: Tab management
             - data/numbers/1.txt
             - data/numbers/3.txt (active)
 
-    Scenario: :tab-close with select-on-remove = next and --prev
+    Scenario: :tab-close with tabs.select_on_remove = next and --prev
         When I set tabs.select_on_remove to next
         And I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab
@@ -94,7 +94,7 @@ Feature: Tab management
             - data/numbers/1.txt (active)
             - data/numbers/3.txt
 
-    Scenario: :tab-close with select-on-remove = prev and --opposite
+    Scenario: :tab-close with tabs.select_on_remove = prev and --opposite
         When I set tabs.select_on_remove to prev
         And I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab
@@ -105,7 +105,7 @@ Feature: Tab management
             - data/numbers/1.txt
             - data/numbers/3.txt (active)
 
-    Scenario: :tab-close with select-on-remove = next and --opposite
+    Scenario: :tab-close with tabs.select_on_remove = next and --opposite
         When I set tabs.select_on_remove to next
         And I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab
@@ -116,7 +116,7 @@ Feature: Tab management
             - data/numbers/1.txt (active)
             - data/numbers/3.txt
 
-    Scenario: :tab-close with select-on-remove = last-used and --opposite
+    Scenario: :tab-close with tabs.select_on_remove = last-used and --opposite
         When I set tabs.select_on_remove to last-used
         And I run :tab-close --opposite
         Then the error "-o is not supported with 'tabs.select_on_remove' set to 'last-used'!" should be shown
@@ -598,7 +598,7 @@ Feature: Tab management
                 - url: http://localhost:*/data/title.html
                   title: Test title
 
-    Scenario: Cloning with tabs-are-windows = true
+    Scenario: Cloning with tabs_are_windows = true
         When I open data/title.html
         And I set tabs.tabs_are_windows to true
         And I run :tab-clone
@@ -735,7 +735,7 @@ Feature: Tab management
         Then the following tabs should be open:
             - data/hello.txt (active)
 
-    Scenario: Double-undo with single tab on last-close default page
+    Scenario: Double-undo with single tab on tabs.last_close default page
         Given I have a fresh instance
         When I open about:blank
         And I set tabs.last_close to default-page
@@ -793,11 +793,11 @@ Feature: Tab management
             - data/numbers/2.txt
             - data/numbers/3.txt
 
-    # last-close
+    # tabs.last_close
 
     # FIXME:qtwebengine
     @qtwebengine_skip: Waits for an earlier about:blank and fails
-    Scenario: last-close = blank
+    Scenario: tabs.last_close = blank
         When I open data/hello.txt
         And I set tabs.last_close to blank
         And I run :tab-only
@@ -806,7 +806,7 @@ Feature: Tab management
         Then the following tabs should be open:
             - about:blank (active)
 
-    Scenario: last-close = startpage
+    Scenario: tabs.last_close = startpage
         When I set url.start_pages to ["http://localhost:(port)/data/numbers/7.txt", "http://localhost:(port)/data/numbers/8.txt"]
         And I set tabs.last_close to startpage
         And I open data/hello.txt
@@ -818,7 +818,7 @@ Feature: Tab management
             - data/numbers/7.txt
             - data/numbers/8.txt (active)
 
-    Scenario: last-close = default-page
+    Scenario: tabs.last_close = default-page
         When I set url.default_page to http://localhost:(port)/data/numbers/9.txt
         And I set tabs.last_close to default-page
         And I open data/hello.txt
@@ -828,7 +828,7 @@ Feature: Tab management
         Then the following tabs should be open:
             - data/numbers/9.txt (active)
 
-    Scenario: last-close = close
+    Scenario: tabs.last_close = close
         When I open data/hello.txt
         And I set tabs.last_close to close
         And I run :tab-only
@@ -1026,7 +1026,7 @@ Feature: Tab management
         Then qutebrowser should quit
         And no crash should happen
 
-    Scenario: Opening link with tabs-are-windows set (#2162)
+    Scenario: Opening link with tabs_are_windows set (#2162)
         When I set tabs.tabs_are_windows to true
         And I open data/hints/html/simple.html
         And I hint with args "all tab-fg" and follow a

tests/end2end/features/test_downloads_bdd.py

@@ -112,7 +112,7 @@ def download_prompt(tmpdir, quteproc, path):
     quteproc.send_cmd(':leave-mode')
 
 
-@bdd.when("I set a test python default-open-dispatcher")
+@bdd.when("I set a test python open_dispatcher")
 def default_open_dispatcher_python(quteproc, tmpdir):
     cmd = '{} -c "import sys; print(sys.argv[1])"'.format(
         shlex.quote(sys.executable))

tests/end2end/test_hints_html.py

@@ -86,7 +86,7 @@ def _parse_file(test_name):
 def test_hints(test_name, zoom_text_only, zoom_level, find_implementation,
                quteproc, request):
     if zoom_text_only and request.config.webengine:
-        pytest.skip("QtWebEngine doesn't have zoom-text-only")
+        pytest.skip("QtWebEngine doesn't have zoom.text_only")
     if find_implementation == 'python' and request.config.webengine:
         pytest.skip("QtWebEngine doesn't have a python find implementation")
 

tests/manual/mouse.html

@@ -7,7 +7,7 @@
     <body>
       <ul>
         <li>Middle- or Ctrl-click on a <a href="https://www.qutebrowser.org">link</a> should open it in a new tab (fg/bg according to <code>tabs.background</code>)</li>
-        <li>When clicking the link with shift, <code>background-tabs</code> should be reversed accordingly.</li>
+        <li>When clicking the link with shift, <code>tabs.background_tabs</code> should be reversed accordingly.</li>
         <li>Ctrl + Mousewheel should zoom in/out</li>
         <li>Back/forward keys on mouse should navigate back/forward</li>
         <li>With <code>input.rocker_gestures</code> set, no context menu should be shown, but pressing left+right/right+left buttons should navigate back/forward</li>

tests/unit/browser/test_adblock.py

@@ -259,7 +259,7 @@ def test_no_blocklist_update(config_stub, download_stub,
 
 def test_successful_update(config_stub, basedir, download_stub,
                            data_tmpdir, tmpdir, win_registry, caplog):
-    """Ensure hosts from host-block-lists are blocked after an update."""
+    """Ensure hosts from host_blocking.lists are blocked after an update."""
     config_stub.val.content.host_blocking.lists = generic_blocklists(tmpdir)
     config_stub.val.content.host_blocking.enabled = True
     config_stub.val.content.host_blocking.whitelist = None
@@ -363,7 +363,7 @@ def test_invalid_utf8_compiled(config_stub, config_tmpdir, data_tmpdir,
 
 def test_blocking_with_whitelist(config_stub, basedir, download_stub,
                                  data_tmpdir, tmpdir):
-    """Ensure hosts in host-blocking-whitelist are never blocked."""
+    """Ensure hosts in content.host_blocking.whitelist are never blocked."""
     # Simulate adblock_update has already been run
     # by creating a file named blocked-hosts,
     # Exclude localhost from it, since localhost is in HostBlocker.WHITELISTED
@@ -383,10 +383,11 @@ def test_blocking_with_whitelist(config_stub, basedir, download_stub,
 
 def test_config_change_initial(config_stub, basedir, download_stub,
                                data_tmpdir, tmpdir):
-    """Test emptying host-block-lists on restart with existing blocked_hosts.
+    """Test emptying host_blocking.lists with existing blocked_hosts.
 
-    - A blocklist is present in host-block-lists and blocked_hosts is populated
+    - A blocklist is present in host_blocking.lists and blocked_hosts is
-    - User quits qutebrowser, empties host-block-lists from his config
+      populated
+    - User quits qutebrowser, empties host_blocking.lists from his config
     - User restarts qutebrowser, does adblock-update
     """
     create_blocklist(tmpdir, blocked_hosts=BLOCKLIST_HOSTS,

tests/unit/browser/webkit/test_webkitelem.py

@@ -48,7 +48,7 @@ def get_webelem(geometry=None, frame=None, *, null=False, style=None,
         js_rect_return: If None, what evaluateJavaScript returns is based on
                         geometry. If set, the return value of
                         evaluateJavaScript.
-        zoom_text_only: Whether zoom-text-only is set in the config
+        zoom_text_only: Whether zoom.text_only is set in the config
     """
     # pylint: disable=too-many-locals,too-many-branches
     elem = mock.Mock()

tests/unit/completion/test_completionwidget.py

@@ -165,7 +165,7 @@ def test_completion_show(show, rows, quick_complete, completionview,
     Args:
         show: The completion show config setting.
         rows: Each entry represents a completion category with only one item.
-        quick_complete: The completion quick-complete config setting.
+        quick_complete: The `completion.quick` config setting.
     """
     config_stub.val.completion.show = show
     config_stub.val.completion.quick = quick_complete

tests/unit/utils/test_urlutils.py

@@ -342,13 +342,13 @@ def test_is_url(config_stub, fake_dns,
     """Test is_url().
 
     Args:
-        is_url: Whether the given string is a URL with auto-search dns/naive.
+        is_url: Whether the given string is a URL with auto_search dns/naive.
         is_url_no_autosearch: Whether the given string is a URL with
-                              auto-search false.
+                              auto_search false.
         uses_dns: Whether the given string should fire a DNS request for the
                   given URL.
         url: The URL to test, as a string.
-        auto_search: With which auto-search setting to test
+        auto_search: With which auto_search setting to test
     """
     if (url == '31c3' and
             auto_search == 'dns' and
@@ -379,7 +379,7 @@ def test_is_url(config_stub, fake_dns,
         assert urlutils.is_url(url) == is_url_no_autosearch
         assert not fake_dns.used
     else:
-        raise ValueError("Invalid value {!r} for auto-search!".format(
+        raise ValueError("Invalid value {!r} for auto_search!".format(
             auto_search))