diff --git a/CHANGELOG.md b/CHANGELOG.md
index eea705a5c..c301e2e44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -140,7 +140,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 * New `subject(pattern)` revset function that matches first line of commit
   descriptions.
 
-* Conditional configuration now supports `--when.command` to change configuration
+* Conditional configuration now supports `--when.commands` to change configuration
   based on subcommand.
 
 ### Fixed bugs
diff --git a/docs/config.md b/docs/config.md
index 6438539fb..41d7c65ba 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -1458,12 +1458,12 @@ Condition keys:
   workspace`.
 
 
-* `--when.command`: List of subcommands to match.
+* `--when.commands`: List of subcommands to match.
 
   Subcommands are space-separated and matched by prefix.
 
   ```toml
-  --when.command = ["file"]        # matches `jj file show`, `jj file list`, etc
-  --when.command = ["file show"]   # matches `jj file show` but *NOT* `jj file list`
-  --when.command = ["file", "log"] # matches `jj file` *OR* `jj log` (or subcommand of either)
+  --when.commands = ["file"]        # matches `jj file show`, `jj file list`, etc
+  --when.commands = ["file show"]   # matches `jj file show` but *NOT* `jj file list`
+  --when.commands = ["file", "log"] # matches `jj file` *OR* `jj log` (or subcommand of either)
   ```