Merge from upstream

book/src/configuration.md

@@ -219,11 +219,11 @@ Search specific options.
 Options for rendering whitespace with visible characters. Use
 `:set whitespace.render all` to temporarily enable visible whitespace.
 
-======= | Key | Description | Default | |-----|-------------|---------| |
+| Key | Description | Default | |-----|-------------|---------| | `render` |
-`render` | Whether to render whitespace. May either be `"all"` or `"none"`, or a
+Whether to render whitespace. May either be `"all"` or `"none"`, or a table with
-table with sub-keys `space`, `nbsp`, `tab`, and `newline`. | `"none"` | |
+sub-keys `space`, `nbsp`, `tab`, and `newline`. | `"none"` | | `characters` |
-`characters` | Literal characters to use when rendering whitespace. Sub-keys may
+Literal characters to use when rendering whitespace. Sub-keys may be any of
-be any of `tab`, `space`, `nbsp`, `newline` or `tabpad` | See example below |
+`tab`, `space`, `nbsp`, `newline` or `tabpad` | See example below |
 
 Example