Merge branch 'master' into qt6-v2

Just a few conflicts around CI and dependencies.

4 files changed, 32 insertions, 4 deletions

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 991673d11..6d740fe3f 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -119,6 +119,9 @@ Fixed
   shown, qutebrowser used to only show one message. This is now only done when the
   two messages are completely equivalent (text, level, etc.) instead of doing so
   when only the text matches.
+- The `progress` and `backforward` statusbar widgets now stay removed if you
+  choose to remove them. Previously they would appear again on navigation.
+- Rare crash when running userscripts with crashed renderer processes.
 
 [[v2.5.3]]
 v2.5.3 (unreleased)
@@ -138,6 +141,9 @@ Fixed
 - Wrong type handling when using `:config-{dict,list}-*` commands with a config
   option with non-string values. The only affected option is `bindings.commands`,
   which is probably rarely used with those commands.
+- The `readability` userscript now correctly passes the source URL to
+  Breadability, to make relative links work.
+- Update `dictcli.py` to use the `main` branch, fixing a 404 error.
 - Minor documentation fixes
 
 [[v2.5.2]]
diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc
index 4b3596285..bcbd0d29a 100644
--- a/doc/faq.asciidoc
+++ b/doc/faq.asciidoc
@@ -158,7 +158,7 @@ It also works nicely with rapid hints:
 :bind ;M hint --rapid links spawn umpv {hint-url}
 ----
 
-How do I use qutebrowser with mutt?::
+How do I use qutebrowser with mutt/neomutt or other mail clients?::
     For security reasons, local files without `.html` extensions aren't
     rendered as HTML, see
     https://bugs.chromium.org/p/chromium/issues/detail?id=777737[this Chromium issue]
@@ -166,8 +166,29 @@ How do I use qutebrowser with mutt?::
     extension:
 +
 ----
-    text/html; qutebrowser %s; needsterminal; nametemplate=%s.html
+text/html; qutebrowser %s; needsterminal; nametemplate=%s.html
 ----
++
+Note that you might want to add additional options to qutebrowser, so that it
+runs as a seperate instance configured to disable JavaScript and avoid network
+requests, in order to avoid privacy leaks when reading mails. The easiest way
+to do so is by specifying a non-existent proxy server, e.g.:
++
+----
+qutebrowser --temp-basedir -s content.proxy http://localhost:666 -s content.dns_prefetch false -s content.javascript.enabled false %s
+----
++
+With Qt 6, using something like:
++
+----
+qutebrowser --temp-basedir -s content.dns_prefetch false -s content.javascript.enabled false %s
+----
++
+should lead to a similar result, due to a more restrictive implementation of
+the `content.local_content_can_access_remote_urls` setting (`false` by default
+already). However, it's advised to use a page like
+https://www.emailprivacytester.com/[Email Privacy Tester] to verify your
+configuration.
 
 What is the difference between bookmarks and quickmarks?::
     Bookmarks will always use the title of the website as their name, but with quickmarks
diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc
index 3ecef8ecf..cab3df59a 100644
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -449,6 +449,7 @@ Various emacs/conkeror-like keybinding configs exist:
 - https://gitlab.com/Kaligule/qutebrowser-emacs-config/blob/master/config.py[Kaligule]
 - https://web.archive.org/web/20210512185023/https://me0w.net/pit/1540882719[nm0i]
 - https://www.reddit.com/r/qutebrowser/comments/eh10i7/config_share_qute_with_emacs_keybindings/[jasonsun0310]
+- https://git.sr.ht/~willvaughn/dots/tree/mjolnir/item/.config/qutebrowser/qutemacs.py[willvaughn]
 
 It's also mostly possible to get rid of modal keybindings by setting
 `input.insert_mode.auto_enter` to `false`, and `input.forward_unbound_keys` to
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 033261df8..32656d461 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -218,7 +218,7 @@
 |<<editor.encoding,editor.encoding>>|Encoding to use for the editor.
 |<<editor.remove_file,editor.remove_file>>|Delete the temporary file upon closing the editor.
 |<<fileselect.folder.command,fileselect.folder.command>>|Command (and arguments) to use for selecting a single folder in forms. The command should write the selected folder path to the specified file or stdout.
-|<<fileselect.handler,fileselect.handler>>|Handler for selecting file(s) in forms. If `external`, then the commands specified by `fileselect.single_file.command` and `fileselect.multiple_files.command` are used to select one or multiple files respectively.
+|<<fileselect.handler,fileselect.handler>>|Handler for selecting file(s) in forms. If `external`, then the commands specified by `fileselect.single_file.command`, `fileselect.multiple_files.command` and `fileselect.folder.command` are used to select one file, multiple files, and folders, respectively.
 |<<fileselect.multiple_files.command,fileselect.multiple_files.command>>|Command (and arguments) to use for selecting multiple files in forms. The command should write the selected file paths to the specified file or to stdout, separated by newlines.
 |<<fileselect.single_file.command,fileselect.single_file.command>>|Command (and arguments) to use for selecting a single file in forms. The command should write the selected file path to the specified file or stdout.
 |<<fonts.completion.category,fonts.completion.category>>|Font used in the completion categories.
@@ -3011,7 +3011,7 @@ Default:
 
 [[fileselect.handler]]
 === fileselect.handler
-Handler for selecting file(s) in forms. If `external`, then the commands specified by `fileselect.single_file.command` and `fileselect.multiple_files.command` are used to select one or multiple files respectively.
+Handler for selecting file(s) in forms. If `external`, then the commands specified by `fileselect.single_file.command`, `fileselect.multiple_files.command` and `fileselect.folder.command` are used to select one file, multiple files, and folders, respectively.
 
 Type: <<types,String>>