From a641dde9de657c8c58344fb8052eddb764c58f52 Mon Sep 17 00:00:00 2001 From: Winny Date: Sun, 18 Nov 2018 01:50:03 -0600 Subject: [PATCH 1/4] Change phrases to sound more definite/concrete --- doc/help/configuring.asciidoc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc index 57e5528c0..280a9921a 100644 --- a/doc/help/configuring.asciidoc +++ b/doc/help/configuring.asciidoc @@ -19,10 +19,10 @@ hand, you can simply use those - see <> for details. For more advanced configuration, you can write a `config.py` file - see -<>. As soon as a `config.py` +<>. When `config.py` exists, the `autoconfig.yml` file **is not read anymore** by default. You need -to <> if you want settings done via -`:set`/`:bind` to still persist. +to <> if you want settings changed via +`:set`/`:bind` to persist between restarts. [[autoconfig]] Configuring qutebrowser via the user interface @@ -229,18 +229,18 @@ Loading `autoconfig.yml` ~~~~~~~~~~~~~~~~~~~~~~~~ All customization done via the UI (`:set`, `:bind` and `:unbind`) is -stored in the `autoconfig.yml` file, which is not loaded automatically as soon -as a `config.py` exists. If you want those settings to be loaded, you'll need to -explicitly load the `autoconfig.yml` file in your `config.py` by doing: +stored in file `autoconfig.yml`. When file `config.py` exists, `autoconfig.yml` +is not loaded automatically. To load `autoconfig.yml` automatically, add the +following snippet to `config.py`: -.config.py: [source,python] ---- config.load_autoconfig() ---- -If you do so at the top of your file, your `config.py` settings will take -precedence as they overwrite the settings done in `autoconfig.yml`. +You can configure which file overrides the other by the location of the above code snippet. +Place the snippet at the top to allow `config.py` override `autoconfig.yml` settings. +Place the snippet at the bottom to for the opposite effect. Importing other modules ~~~~~~~~~~~~~~~~~~~~~~~ From de166f71dcd9f2b4b3c72d4203eb755f548419b4 Mon Sep 17 00:00:00 2001 From: Winny Date: Sun, 18 Nov 2018 01:53:45 -0600 Subject: [PATCH 2/4] Fixup --- doc/help/configuring.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc index 280a9921a..9e6f2a3c7 100644 --- a/doc/help/configuring.asciidoc +++ b/doc/help/configuring.asciidoc @@ -239,8 +239,8 @@ config.load_autoconfig() ---- You can configure which file overrides the other by the location of the above code snippet. -Place the snippet at the top to allow `config.py` override `autoconfig.yml` settings. -Place the snippet at the bottom to for the opposite effect. +Place the snippet at the top to allow `config.py` to override `autoconfig.yml`. +Place the snippet at the bottom for the opposite effect. Importing other modules ~~~~~~~~~~~~~~~~~~~~~~~ From a7a1cc7c137c3bcafee53332ea8a70e5ac4bed1d Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 29 Nov 2018 00:49:22 -0600 Subject: [PATCH 3/4] Update doc/help/configuring.asciidoc Co-Authored-By: winny- --- doc/help/configuring.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc index 9e6f2a3c7..9023d1dc3 100644 --- a/doc/help/configuring.asciidoc +++ b/doc/help/configuring.asciidoc @@ -229,7 +229,7 @@ Loading `autoconfig.yml` ~~~~~~~~~~~~~~~~~~~~~~~~ All customization done via the UI (`:set`, `:bind` and `:unbind`) is -stored in file `autoconfig.yml`. When file `config.py` exists, `autoconfig.yml` +stored in the `autoconfig.yml` file. When a `config.py` file exists, `autoconfig.yml` is not loaded automatically. To load `autoconfig.yml` automatically, add the following snippet to `config.py`: From 13532aca18534023b77975b1fcbed56f89ae39be Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 29 Nov 2018 00:49:32 -0600 Subject: [PATCH 4/4] Update doc/help/configuring.asciidoc Co-Authored-By: winny- --- doc/help/configuring.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc index 9023d1dc3..33711b755 100644 --- a/doc/help/configuring.asciidoc +++ b/doc/help/configuring.asciidoc @@ -19,7 +19,7 @@ hand, you can simply use those - see <> for details. For more advanced configuration, you can write a `config.py` file - see -<>. When `config.py` +<>. When a `config.py` exists, the `autoconfig.yml` file **is not read anymore** by default. You need to <> if you want settings changed via `:set`/`:bind` to persist between restarts.