docs(i18n): correct the spam docs review findings

2 files changed, 11 insertions, 13 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 937c35d..6da8e2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -135,19 +135,17 @@ no longer knows the origin. Rename it once, per distinct folder, before you
 rely on either. The search term needs its OWN double quotes: the shell's
 quotes only glue the argument together, and notmuch then splits a bare
 `tag:deleted-from:My Folder` into a term and a stray word, matching nothing at
-all while looking like it worked. In a tag NAME a space is hex-encoded `%20`,
-which is how notmuch spells a space there:
+all while looking like it worked. The `+` and `-` tag arguments are a single
+token already, so the shell's quoting carries a space in the folder through to
+notmuch unchanged:
 
 ```bash
-notmuch tag +moved-from:'My%20Folder' -deleted-from:'My%20Folder' \
-  -- 'tag:"deleted-from:My Folder"'
+notmuch tag +moved-from:'<folder>' -deleted-from:'<folder>' \
+  -- 'tag:"deleted-from:<folder>"'
 ```
 
-Replace `My%20Folder` with the folder name, writing any space as `%20`, and
-`My Folder` in the quoted term with the same name keeping its spaces. A folder
-with no space needs neither `%20` nor the inner quotes, so `Inbox` is
-`+moved-from:'Inbox' ... -- 'tag:"deleted-from:Inbox"'`. Run it once per
-distinct folder.
+Run it once per distinct folder, with `<folder>` replaced everywhere by that
+folder's name.
 
 There is no compatibility branch on purpose: a reader accepting both prefixes
 would answer "first match wins" on a message holding one of each, which is the
diff --git a/README.md b/README.md
index 0c798f5..136076b 100644
--- a/README.md
+++ b/README.md
@@ -778,10 +778,10 @@ Defaults, all rebindable through `[keys]`:
 | `Ctrl+Q` | `quit` | Quit |
 
 Every action in this table carries a default binding, and every one appears in
-a menu. Some actions carry none, because a chord for them would be arbitrary:
-Find stranded deleted mail, Find stranded spam, Empty trash, Empty spam, Delete
-permanently and Save message. They are reachable from the menus, and the
-shortcut reference prints them as unbound.
+a menu. Six actions carry none, because a chord for them would be arbitrary:
+Find stranded spam, Empty trash, Delete permanently, Empty spam, Edit draft and
+Save message. They are reachable from the menus, and the shortcut reference
+prints them as unbound.
 **Help > Keyboard shortcuts** lists the current bindings, generated from the
 actions themselves, so it shows your overrides rather than these defaults.