diff --git a/doc_src/cmds/abbr.rst b/doc_src/cmds/abbr.rst
index 9678e39c2..ea4e9e0a6 100644
--- a/doc_src/cmds/abbr.rst
+++ b/doc_src/cmds/abbr.rst
@@ -38,7 +38,7 @@ The following options are available:
 **-l** or **--list**
     Lists all abbreviated words
 
-**-e** *WORD* or **--erase** *WORD*...
+**-e** *WORD* or **--erase** *WORD* ...
     Erase the given abbreviations
 
 **-q** or **--query**
diff --git a/doc_src/cmds/argparse.rst b/doc_src/cmds/argparse.rst
index dff27444c..bd87f247b 100644
--- a/doc_src/cmds/argparse.rst
+++ b/doc_src/cmds/argparse.rst
@@ -6,7 +6,7 @@ argparse - parse options passed to a fish script or function
 Synopsis
 --------
 
-``argparse`` [*OPTIONS*] *OPTION_SPEC*... -- [*ARG*...]
+``argparse`` [*OPTIONS*] *OPTION_SPEC* ... -- [*ARG* ...]
 
 
 Description
diff --git a/doc_src/cmds/case.rst b/doc_src/cmds/case.rst
index 1b8ef0b59..6f33d3dc9 100644
--- a/doc_src/cmds/case.rst
+++ b/doc_src/cmds/case.rst
@@ -7,7 +7,7 @@ Synopsis
 --------
 
 | **switch** *VALUE*
-|    [**case** [*GLOB*...]
+|    [**case** [*GLOB* ...]
 |        [*COMMAND* ...]]
 | **end**
 
diff --git a/doc_src/cmds/continue.rst b/doc_src/cmds/continue.rst
index b245057c5..208f37ff1 100644
--- a/doc_src/cmds/continue.rst
+++ b/doc_src/cmds/continue.rst
@@ -6,7 +6,7 @@ continue - skip the remainder of the current iteration of the current inner loop
 Synopsis
 --------
 
-**LOOP_CONSTRUCT**; [*COMMANDS*...;] **continue**; [*COMMANDS*...;] **end**
+**LOOP_CONSTRUCT**; [*COMMANDS* ...;] **continue**; [*COMMANDS* ...;] **end**
 
 Description
 -----------
diff --git a/doc_src/cmds/count.rst b/doc_src/cmds/count.rst
index b6257399a..2ebd5859f 100644
--- a/doc_src/cmds/count.rst
+++ b/doc_src/cmds/count.rst
@@ -6,7 +6,7 @@ count - count the number of elements of a list
 Synopsis
 --------
 
-| ``count`` string1 string2...
+| ``count`` string1 string2 ...
 | *command* | ``count``
 | ``count`` [...] < *FILE*
 
diff --git a/doc_src/cmds/else.rst b/doc_src/cmds/else.rst
index 93edfbce8..2d93270b1 100644
--- a/doc_src/cmds/else.rst
+++ b/doc_src/cmds/else.rst
@@ -6,7 +6,7 @@ else - execute command if a condition is not met
 Synopsis
 --------
 
-**if** *CONDITION*; *COMMANDS_TRUE*...; [**else**; *COMMANDS_FALSE*...;] **end**
+**if** *CONDITION*; *COMMANDS_TRUE* ...; [**else**; *COMMANDS_FALSE* ...;] **end**
 
 Description
 -----------
diff --git a/doc_src/cmds/emit.rst b/doc_src/cmds/emit.rst
index 5eaf0ae2f..b4696b08d 100644
--- a/doc_src/cmds/emit.rst
+++ b/doc_src/cmds/emit.rst
@@ -6,7 +6,7 @@ emit - emit a generic event
 Synopsis
 --------
 
-``emit`` *EVENT_NAME* [*ARGUMENTS*...]
+``emit`` *EVENT_NAME* [*ARGUMENTS* ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/end.rst b/doc_src/cmds/end.rst
index f2d5c40f5..4300a7cd8 100644
--- a/doc_src/cmds/end.rst
+++ b/doc_src/cmds/end.rst
@@ -7,14 +7,14 @@ Synopsis
 --------
 
 | **begin**
-|     [*COMMANDS*...] 
+|     [*COMMANDS* ...] 
 | **end**
 
-| **function** *NAME* [*OPTIONS*]; *COMMANDS*...; **end**
-| **if** *CONDITION*; *COMMANDS_TRUE*...; [**else**; *COMMANDS_FALSE*...;] **end**
-| **switch** *VALUE*; [**case** [*WILDCARD*...]; [*COMMANDS*...]; ...] **end**
-| **while** *CONDITION*; *COMMANDS*...; **end**
-| **for** *VARNAME* in [*VALUES*...]; **COMMANDS**...; **end**
+| **function** *NAME* [*OPTIONS*]; *COMMANDS* ...; **end**
+| **if** *CONDITION*; *COMMANDS_TRUE* ...; [**else**; *COMMANDS_FALSE* ...;] **end**
+| **switch** *VALUE*; [**case** [*WILDCARD* ...]; [*COMMANDS* ...]; ...] **end**
+| **while** *CONDITION*; *COMMANDS* ...; **end**
+| **for** *VARNAME* in [*VALUES* ...]; **COMMANDS** ...; **end**
 
 Description
 -----------
diff --git a/doc_src/cmds/eval.rst b/doc_src/cmds/eval.rst
index 8434298db..867158c2f 100644
--- a/doc_src/cmds/eval.rst
+++ b/doc_src/cmds/eval.rst
@@ -6,7 +6,7 @@ eval - evaluate the specified commands
 Synopsis
 --------
 
-**eval** [*COMMANDS*...]
+**eval** [*COMMANDS* ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/fish_add_path.rst b/doc_src/cmds/fish_add_path.rst
index e81e5ee20..d397e0ff8 100644
--- a/doc_src/cmds/fish_add_path.rst
+++ b/doc_src/cmds/fish_add_path.rst
@@ -7,8 +7,8 @@ fish_add_path - add to the path
 Synopsis
 --------
 
-| ``fish_add_path`` *path*...
-| ``fish_add_path`` [(*-g* | *--global*) | (*-U* | *--universal*) | (*-P* | *--path*)] [(*-m* | *--move*)] [(*-a* | *--append*) | (*-p* | *--prepend*)] [(*-v* | *--verbose*) | (*-n* | *--dry-run*)] *paths*...
+| ``fish_add_path`` *path* ...
+| ``fish_add_path`` [(*-g* | *--global*) | (*-U* | *--universal*) | (*-P* | *--path*)] [(*-m* | *--move*)] [(*-a* | *--append*) | (*-p* | *--prepend*)] [(*-v* | *--verbose*) | (*-n* | *--dry-run*)] *paths* ...
 
 
 Description
diff --git a/doc_src/cmds/fish_indent.rst b/doc_src/cmds/fish_indent.rst
index e7ec1650c..855def6f4 100644
--- a/doc_src/cmds/fish_indent.rst
+++ b/doc_src/cmds/fish_indent.rst
@@ -7,7 +7,7 @@ fish_indent - indenter and prettifier
 Synopsis
 --------
 
-**fish_indent** [*OPTIONS*] [*FILE*...]
+**fish_indent** [*OPTIONS*] [*FILE* ...]
 
 
 Description
diff --git a/doc_src/cmds/for.rst b/doc_src/cmds/for.rst
index 99369b7d0..36e15ddce 100644
--- a/doc_src/cmds/for.rst
+++ b/doc_src/cmds/for.rst
@@ -6,7 +6,7 @@ for - perform a set of commands multiple times
 Synopsis
 --------
 
-**for** *VARNAME* in [*VALUES*...]; *COMMANDS*...; **end**
+**for** *VARNAME* in [*VALUES* ...]; *COMMANDS* ...; **end**
 
 Description
 -----------
diff --git a/doc_src/cmds/functions.rst b/doc_src/cmds/functions.rst
index 293c4ab43..81cff7738 100644
--- a/doc_src/cmds/functions.rst
+++ b/doc_src/cmds/functions.rst
@@ -10,7 +10,7 @@ Synopsis
 | **functions** [ **-D** | **--details** ] [ **-v** ] *FUNCTION*
 | **functions** **-c** *OLDNAME* *NEWNAME*
 | **functions** **-d** *DESCRIPTION* *FUNCTION*
-| **functions** [ **-e** | **-q** ] *FUNCTION...*
+| **functions** [ **-e** | **-q** ] *FUNCTION ...*
 
 Description
 -----------
diff --git a/doc_src/cmds/history.rst b/doc_src/cmds/history.rst
index 5d21de7ab..b8d5f5648 100644
--- a/doc_src/cmds/history.rst
+++ b/doc_src/cmds/history.rst
@@ -8,9 +8,9 @@ Synopsis
 
 | ``history`` [**search**] [**--show-time**] [**--case-sensitive**]
 	\	\   [**--exact** | **--prefix** | **--contains**] [**--max** *n*] [**--null**] [**--reverse**]
-	\	\   [ *SEARCH_STRING...* ]
+	\	\   [ *SEARCH_STRING ...* ]
 | ``history`` **delete** [**--case-sensitive**]
-	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING...*
+	\	\   [**--exact** | **--prefix** | **--contains**] *SEARCH_STRING ...*
 | ``history`` **merge**
 | ``history`` **save**
 | ``history`` **clear**
diff --git a/doc_src/cmds/if.rst b/doc_src/cmds/if.rst
index 0fd9defb3..2f6aa65ce 100644
--- a/doc_src/cmds/if.rst
+++ b/doc_src/cmds/if.rst
@@ -6,9 +6,9 @@ if - conditionally execute a command
 Synopsis
 --------
 
-| **if** *CONDITION*; *COMMANDS_TRUE*...;
-| [**else** **if** *CONDITION2*; *COMMANDS_TRUE2*...;]
-| [**else**; *COMMANDS_FALSE*...;]
+| **if** *CONDITION*; *COMMANDS_TRUE* ...;
+| [**else** **if** *CONDITION2*; *COMMANDS_TRUE2* ...;]
+| [**else**; *COMMANDS_FALSE* ...;]
 | **end**
 
 Description
diff --git a/doc_src/cmds/math.rst b/doc_src/cmds/math.rst
index e0bc7856e..914c94005 100644
--- a/doc_src/cmds/math.rst
+++ b/doc_src/cmds/math.rst
@@ -6,7 +6,7 @@ math - perform mathematics calculations
 Synopsis
 --------
 
-``math`` [(**-s** | **--scale**) *N*] [(**-b** | **--base**) *BASE*] *EXPRESSION...*
+``math`` [(**-s** | **--scale**) *N*] [(**-b** | **--base**) *BASE*] *EXPRESSION ...*
 
 
 Description
diff --git a/doc_src/cmds/not.rst b/doc_src/cmds/not.rst
index a6dfe2fa4..3168f1956 100644
--- a/doc_src/cmds/not.rst
+++ b/doc_src/cmds/not.rst
@@ -6,7 +6,7 @@ not - negate the exit status of a job
 Synopsis
 --------
 
-**not** *COMMAND* [*options*...]
+**not** *COMMAND* [*options* ...]
 
 
 Description
diff --git a/doc_src/cmds/open.rst b/doc_src/cmds/open.rst
index b04f15efc..3bff34c4e 100644
--- a/doc_src/cmds/open.rst
+++ b/doc_src/cmds/open.rst
@@ -6,7 +6,7 @@ open - open file in its default application
 Synopsis
 --------
 
-``open`` *FILES*...
+``open`` *FILES* ...
 
 
 Description
diff --git a/doc_src/cmds/random.rst b/doc_src/cmds/random.rst
index 93696b04a..6f77da8d1 100644
--- a/doc_src/cmds/random.rst
+++ b/doc_src/cmds/random.rst
@@ -10,7 +10,7 @@ Synopsis
 | ``random`` *SEED*
 | ``random`` *START* *END*
 | ``random`` *START* *STEP* *END*
-| ``random`` choice [*ITEMS*...]
+| ``random`` choice [*ITEMS* ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/set.rst b/doc_src/cmds/set.rst
index eec73aa49..4be28cfe4 100644
--- a/doc_src/cmds/set.rst
+++ b/doc_src/cmds/set.rst
@@ -7,12 +7,12 @@ Synopsis
 --------
 
 | ``set`` [*scope options*]
-| ``set`` [*options*] *VARIABLE* *VALUES*...
-| ``set`` [*options*] *VARIABLE*\[*INDICES*] *VALUES*...
+| ``set`` [*options*] *VARIABLE* *VALUES* ...
+| ``set`` [*options*] *VARIABLE*\[*INDICES*] *VALUES* ...
 | ``set`` ( **-q** | **--query** ) [*scope options*] *VARIABLE* ...
 | ``set`` ( **-e** | **--erase** ) [*scope options*] *VARIABLE* ...
 | ``set`` ( **-e** | **--erase** ) [*scope options*] *VARIABLE*\[*INDICES*] ...
-| ``set`` ( **-S** | **--show** ) *VARIABLE*...
+| ``set`` ( **-S** | **--show** ) *VARIABLE* ...
 
 Description
 -----------
diff --git a/doc_src/cmds/source.rst b/doc_src/cmds/source.rst
index faf2845c8..7baf42e15 100644
--- a/doc_src/cmds/source.rst
+++ b/doc_src/cmds/source.rst
@@ -6,7 +6,7 @@ source - evaluate contents of file
 Synopsis
 --------
 
-| **source** *FILE* [*arguments*...]
+| **source** *FILE* [*arguments* ...]
 | ``somecommand`` | **source**
 
 
diff --git a/doc_src/cmds/string-collect.rst b/doc_src/cmds/string-collect.rst
index 0374e046d..2851c09d2 100644
--- a/doc_src/cmds/string-collect.rst
+++ b/doc_src/cmds/string-collect.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` collect [**-N** | **--no-trim-newlines**] [*STRING*...]
+``string`` collect [**-N** | **--no-trim-newlines**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-escape.rst b/doc_src/cmds/string-escape.rst
index 81599b371..4fffcae9b 100644
--- a/doc_src/cmds/string-escape.rst
+++ b/doc_src/cmds/string-escape.rst
@@ -6,8 +6,8 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-| ``string`` escape [**-n** | **--no-quoted**] [**--style=**] [*STRING*...]
-| ``string`` unescape [**--style=**] [*STRING*...]
+| ``string`` escape [**-n** | **--no-quoted**] [**--style=**] [*STRING* ...]
+| ``string`` unescape [**--style=**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-join.rst b/doc_src/cmds/string-join.rst
index a6c6caaac..658077b55 100644
--- a/doc_src/cmds/string-join.rst
+++ b/doc_src/cmds/string-join.rst
@@ -6,8 +6,8 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-| ``string`` join [**-q** | **--quiet**] SEP [*STRING*...]
-| ``string`` join0 [**-q** | **--quiet**] [*STRING*...]
+| ``string`` join [**-q** | **--quiet**] SEP [*STRING* ...]
+| ``string`` join0 [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-length.rst b/doc_src/cmds/string-length.rst
index 096b2363f..03728116c 100644
--- a/doc_src/cmds/string-length.rst
+++ b/doc_src/cmds/string-length.rst
@@ -8,7 +8,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` length [**-q** | **--quiet**] [*STRING*...]
+``string`` length [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-lower.rst b/doc_src/cmds/string-lower.rst
index 25dbe6bf0..a265bd049 100644
--- a/doc_src/cmds/string-lower.rst
+++ b/doc_src/cmds/string-lower.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` lower [**-q** | **--quiet**] [*STRING*...]
+``string`` lower [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-match.rst b/doc_src/cmds/string-match.rst
index dd1f879d2..61249facc 100644
--- a/doc_src/cmds/string-match.rst
+++ b/doc_src/cmds/string-match.rst
@@ -8,7 +8,7 @@ Synopsis
 
 ``string`` match [**-a** | **--all**] [**-e** | **--entire**] [**-i** | **--ignore-case**]
     \   \    [**-r** | **--regex**] [**-n** | **--index**] [**-q** | **--quiet**] [**-v** | **--invert**]
-    \    \   *PATTERN* [*STRING*...]
+    \    \   *PATTERN* [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-pad.rst b/doc_src/cmds/string-pad.rst
index 5680e9f88..032138b63 100644
--- a/doc_src/cmds/string-pad.rst
+++ b/doc_src/cmds/string-pad.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` pad [**-r** | **--right**] [(**-c** | **--char**) *CHAR*] [(**-w** | **--width**) *INTEGER*]
-    \   \      [*STRING*...]
+    \   \      [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-repeat.rst b/doc_src/cmds/string-repeat.rst
index 6f64070b0..dd6a188a2 100644
--- a/doc_src/cmds/string-repeat.rst
+++ b/doc_src/cmds/string-repeat.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` repeat [(**-n** | **--count**) *COUNT*] [(**-m** | **--max**) *MAX*] [**-N** | **--no-newline**]
-    \   \     [**-q** | **--quiet**] [*STRING*...]
+    \   \     [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-replace.rst b/doc_src/cmds/string-replace.rst
index cbe398777..96fc6087b 100644
--- a/doc_src/cmds/string-replace.rst
+++ b/doc_src/cmds/string-replace.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` replace [**-a** | **--all**] [**-f** | **--filter**] [**-i** | **--ignore-case**]
-    \   \      [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING*...]
+    \   \      [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-split.rst b/doc_src/cmds/string-split.rst
index ca24edd91..4e2ccd53b 100644
--- a/doc_src/cmds/string-split.rst
+++ b/doc_src/cmds/string-split.rst
@@ -7,9 +7,9 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 | ``string`` split [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-    \   \    [**-r** | **--right**] *SEP* [*STRING*...]
+    \   \    [**-r** | **--right**] *SEP* [*STRING* ...]
 | ``string`` split0 [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-    \   \     [**-r** | **--right**] [*STRING*...]
+    \   \     [**-r** | **--right**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-sub.rst b/doc_src/cmds/string-sub.rst
index a3bdbc01e..1a0301111 100644
--- a/doc_src/cmds/string-sub.rst
+++ b/doc_src/cmds/string-sub.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` sub [(**-s** | **--start**) *START*] [(**-l** | **--length**) *LENGTH*]
-    \        [**-q** | **--quiet**] [*STRING*...]
+    \        [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-trim.rst b/doc_src/cmds/string-trim.rst
index a8ac42570..d1cc677a2 100644
--- a/doc_src/cmds/string-trim.rst
+++ b/doc_src/cmds/string-trim.rst
@@ -7,7 +7,7 @@ Synopsis
 .. BEGIN SYNOPSIS
 
 ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [(**-c** | **--chars**) *CHARS*]
-    \   \   [**-q** | **--quiet**] [*STRING*...]
+    \   \   [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string-upper.rst b/doc_src/cmds/string-upper.rst
index 5f5661bff..e8c7fe441 100644
--- a/doc_src/cmds/string-upper.rst
+++ b/doc_src/cmds/string-upper.rst
@@ -6,7 +6,7 @@ Synopsis
 
 .. BEGIN SYNOPSIS
 
-``string`` upper [**-q** | **--quiet**] [*STRING*...]
+``string`` upper [**-q** | **--quiet**] [*STRING* ...]
 
 .. END SYNOPSIS
 
diff --git a/doc_src/cmds/string.rst b/doc_src/cmds/string.rst
index 50dc2f96a..7a363e6e6 100644
--- a/doc_src/cmds/string.rst
+++ b/doc_src/cmds/string.rst
@@ -6,31 +6,31 @@ string - manipulate strings
 Synopsis
 --------
 
-| ``string`` collect [**-N** | **--no-trim-newlines**] [*STRING*...]
-| ``string`` escape [**-n** | **--no-quoted**] [**--style=**] [*STRING*...]
-| ``string`` join [**-q** | **--quiet**] SEP [*STRING*...]
-| ``string`` join0 [**-q** | **--quiet**] [*STRING*...]
-| ``string`` length [**-q** | **--quiet**] [*STRING*...]
-| ``string`` lower [**-q** | **--quiet**] [*STRING*...]
+| ``string`` collect [**-N** | **--no-trim-newlines**] [*STRING* ...]
+| ``string`` escape [**-n** | **--no-quoted**] [**--style=**] [*STRING* ...]
+| ``string`` join [**-q** | **--quiet**] SEP [*STRING* ...]
+| ``string`` join0 [**-q** | **--quiet**] [*STRING* ...]
+| ``string`` length [**-q** | **--quiet**] [*STRING* ...]
+| ``string`` lower [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` match [**-a** | **--all**] [**-e** | **--entire**] [**-i** | **--ignore-case**]
 	\	\	 [**-r** | **--regex**] [**-n** | **--index**] [**-q** | **--quiet**] [**-v** | **--invert**]
-	\	 \	 *PATTERN* [*STRING*...]
+	\	 \	 *PATTERN* [*STRING* ...]
 | ``string`` pad [**-r** | **--right**] [**-c** | **--char** *CHAR*] [**-w** | **--width** *INTEGER*]
-	\	\      [*STRING*...]
+	\	\      [*STRING* ...]
 | ``string`` repeat [(**-n** | **--count**) *COUNT*] [(**-m** | **--max**) *MAX*] [**-N** | **--no-newline**]
-	\	\	  [**-q** | **--quiet**] [*STRING*...]
+	\	\	  [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` replace [**-a** | **--all**] [**-f** | **--filter**] [**-i** | **--ignore-case**]
-	\	\	   [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING*...]
+	\	\	   [**-r** | **--regex**] [**-q** | **--quiet**] *PATTERN* *REPLACE* [*STRING* ...]
 | ``string`` split [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-	\	\	 [**-r** | **--right**] *SEP* [*STRING*...]
+	\	\	 [**-r** | **--right**] *SEP* [*STRING* ...]
 | ``string`` split0 [(**-m** | **--max**) *MAX*] [**-n** | **--no-empty**] [**-q** | **--quiet**]
-	\	\	  [**-r** | **--right**] [*STRING*...]
+	\	\	  [**-r** | **--right**] [*STRING* ...]
 | ``string`` sub [(**-s** | **--start**) *START*] [(**-l** | **--length**) *LENGTH*]
-	\	     [**-q** | **--quiet**] [*STRING*...]
+	\	     [**-q** | **--quiet**] [*STRING* ...]
 | ``string`` trim [**-l** | **--left**] [**-r** | **--right**] [(**-c** | **--chars**) *CHARS*]
-	\	\	[**-q** | **--quiet**] [*STRING*...]
-| ``string`` unescape [**--style=**] [*STRING*...]
-| ``string`` upper [**-q** | **--quiet**] [*STRING*...]
+	\	\	[**-q** | **--quiet**] [*STRING* ...]
+| ``string`` unescape [**--style=**] [*STRING* ...]
+| ``string`` upper [**-q** | **--quiet**] [*STRING* ...]
 
 Description
 -----------
diff --git a/doc_src/cmds/switch.rst b/doc_src/cmds/switch.rst
index 8105c0453..735b6ba40 100644
--- a/doc_src/cmds/switch.rst
+++ b/doc_src/cmds/switch.rst
@@ -6,7 +6,7 @@ switch - conditionally execute a block of commands
 Synopsis
 --------
 
-**switch** *VALUE*; [**case** [*GLOB*...]; [*COMMANDS*...]; ...] **end**
+**switch** *VALUE*; [**case** [*GLOB* ...]; [*COMMANDS* ...]; ...] **end**
 
 Description
 -----------
diff --git a/doc_src/language.rst b/doc_src/language.rst
index ff4cfe6d6..1b6e97f28 100644
--- a/doc_src/language.rst
+++ b/doc_src/language.rst
@@ -1207,7 +1207,7 @@ A more robust approach to argument handling is :ref:`argparse <cmd-argparse>`, w
 
       # If -h or --help is given, we print a little help text and return
       if set -q _flag_help
-          echo "mybetterfunction [-h|--help] [-s|--second] [ARGUMENT...]"
+          echo "mybetterfunction [-h|--help] [-s|--second] [ARGUMENT ...]"
           return 0
       end