From 6af879887fdfee58e579b105bb023f35023f0513 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 26 Sep 2017 20:12:21 +0200
Subject: [PATCH] Drop --relaxed-config

---
 doc/changelog.asciidoc     | 2 +-
 doc/qutebrowser.1.asciidoc | 3 ---
 qutebrowser/qutebrowser.py | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3b4f2182a..0c2751b79 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -39,7 +39,7 @@ Breaking changes
   v0.9.0) is now not supported anymore.
 - Upgrading qutebrowser with a version older than v0.4.0 still running now won't
   work properly anymore.
-- The `--harfbuzz` commandline argument got dropped.
+- The `--harfbuzz` and `--relaxed-config` commandline arguments got dropped.
 
 Major changes
 ~~~~~~~~~~~~~
diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc
index fc70427f6..726511624 100644
--- a/doc/qutebrowser.1.asciidoc
+++ b/doc/qutebrowser.1.asciidoc
@@ -84,9 +84,6 @@ show it.
 *--force-color*::
     Force colored logging
 
-*--relaxed-config*::
-    Silently remove unknown config options.
-
 *--nowindow*::
     Don't show the main window.
 
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index 1ae4ce192..a2066acd3 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -95,8 +95,6 @@ def get_argparser():
                        action='store_false', dest='color')
     debug.add_argument('--force-color', help="Force colored logging",
                        action='store_true')
-    debug.add_argument('--relaxed-config', action='store_true',
-                       help="Silently remove unknown config options.")
     debug.add_argument('--nowindow', action='store_true', help="Don't show "
                        "the main window.")
     debug.add_argument('--temp-basedir', action='store_true', help="Use a "