diff --git a/pages/common/bcomps.md b/pages/common/bcomps.md
index b6c33d37df..6c42fc53c0 100644
--- a/pages/common/bcomps.md
+++ b/pages/common/bcomps.md
@@ -6,11 +6,11 @@
 
 - Decompose one or more graphs into their biconnected components:
 
-`bcomps {{path/to/input1.gv}} {{path/to/input2.gv ...}} > {{path/to/output.gv}}`
+`bcomps {{path/to/input1.gv path/to/input2.gv ...}} > {{path/to/output.gv}}`
 
 - Print the number of blocks and cutvertices in one or more graphs:
 
-`bcomps -v -s {{path/to/input1.gv}} {{path/to/input2.gv ...}}`
+`bcomps -v -s {{path/to/input1.gv path/to/input2.gv ...}}`
 
 - Write each block and block-cutvertex tree to multiple numbered filenames based on `output.gv`:
 
diff --git a/pages/common/ccomps.md b/pages/common/ccomps.md
index de2afd7309..0a1acc7623 100644
--- a/pages/common/ccomps.md
+++ b/pages/common/ccomps.md
@@ -6,15 +6,15 @@
 
 - Decompose one or more graphs into their connected components:
 
-`ccomps {{path/to/input1.gv}} {{path/to/input2.gv ...}} > {{path/to/output.gv}}`
+`ccomps {{path/to/input1.gv path/to/input2.gv ...}} > {{path/to/output.gv}}`
 
 - Print the number of nodes, edges, and connected components in one or more graphs:
 
-`ccomps -v -s {{path/to/input1.gv}} {{path/to/input2.gv ...}}`
+`ccomps -v -s {{path/to/input1.gv path/to/input2.gv ...}}`
 
 - Write each connected component to numbered filenames based on `output.gv`:
 
-`ccomps -x -o {{path/to/output.gv}} {{path/to/input1.gv}} {{path/to/input2.gv ...}}`
+`ccomps -x -o {{path/to/output.gv}} {{path/to/input1.gv path/to/input2.gv ...}}`
 
 - Display help:
 
diff --git a/pages/common/clementine.md b/pages/common/clementine.md
index efe5acd189..e7650fedbe 100644
--- a/pages/common/clementine.md
+++ b/pages/common/clementine.md
@@ -2,7 +2,7 @@
 
 > A modern music player and library organizer.
 > See also: `audacious`, `qmmp`, `cmus`, `mpv`.
-> More information: <https://github.com/clementine-player/Clementine/wiki>.
+> More information: <https://manned.org/clementine>.
 
 - Start the GUI or bring it to front:
 
@@ -14,11 +14,11 @@
 
 - Toggle between pausing and playing:
 
-`clementine --play-pause`
+`clementine {{[-t|--play-pause]}}`
 
 - Stop playback:
 
-`clementine --stop`
+`clementine {{[-s|--stop]}}`
 
 - Skip to the next or previous track:
 
@@ -26,12 +26,12 @@
 
 - Create a new playlist with one or more music files or URLs:
 
-`clementine --create {{url1 url2 ... | path/to/music1.ext path/to/music2.ext ...}}`
+`clementine {{[-c|--create]}} {{url1 url2 ...|path/to/music1.ext path/to/music2.ext ...}}`
 
 - Load a playlist file:
 
-`clementine --load {{path/to/playlist.ext}}`
+`clementine {{[-l|--load]}} {{path/to/playlist.ext}}`
 
 - Play a specific track in the currently loaded playlist:
 
-`clementine --play-track {{5}}`
+`clementine {{[-k|--play-track]}} {{5}}`
diff --git a/pages/common/combine.md b/pages/common/combine.md
index af4813c885..34e28ca6ac 100644
--- a/pages/common/combine.md
+++ b/pages/common/combine.md
@@ -3,7 +3,7 @@
 > Perform set operations on lines of two files.
 > The order of the output lines is determined by the order of the lines in the first file.
 > See also: `diff`.
-> More information: <https://joeyh.name/code/moreutils/>.
+> More information: <https://manned.org/combine>.
 
 - Output lines that are in both specified files:
 
diff --git a/pages/common/edgepaint.md b/pages/common/edgepaint.md
index 8eb598ee92..9e306eef24 100644
--- a/pages/common/edgepaint.md
+++ b/pages/common/edgepaint.md
@@ -6,7 +6,7 @@
 
 - Colorize edges of one or more graph layouts (that already have layout information) to clarify crossing edges:
 
-`edgepaint {{path/to/layout1.gv}} {{path/to/layout2.gv ...}} > {{path/to/output.gv}}`
+`edgepaint {{path/to/layout1.gv path/to/layout2.gv ...}} > {{path/to/output.gv}}`
 
 - Colorize edges using a color scheme. (See <https://graphviz.org/doc/info/colors.html#brewer>):
 
diff --git a/pages/common/errno.md b/pages/common/errno.md
index 4867400886..3e319eb98c 100644
--- a/pages/common/errno.md
+++ b/pages/common/errno.md
@@ -9,12 +9,12 @@
 
 - List all errno names, codes, and descriptions:
 
-`errno --list`
+`errno {{[-l|--list]}}`
 
 - Search for code whose description contains all of the given text:
 
-`errno --search {{text}}`
+`errno {{[-s|--search]}} {{text}}`
 
 - Search for code whose description contains all of the given text (all locales):
 
-`errno --search-all-locales {{text}}`
+`errno {{[-S|--search-all-locales]}} {{text}}`
diff --git a/pages/common/git-show-branch.md b/pages/common/git-show-branch.md
index fb4c547a40..dc6c3967fa 100644
--- a/pages/common/git-show-branch.md
+++ b/pages/common/git-show-branch.md
@@ -13,15 +13,15 @@
 
 - Compare all remote tracking branches:
 
-`git show-branch --remotes`
+`git show-branch {{[-r|--remotes]}}`
 
 - Compare both local and remote tracking branches:
 
-`git show-branch --all`
+`git show-branch {{[-a|--all]}}`
 
 - List the latest commits in all branches:
 
-`git show-branch --all --list`
+`git show-branch {{[-a|--all]}} --list`
 
 - Compare a given branch with the current branch:
 
@@ -33,4 +33,4 @@
 
 - Keep going a given number of commits past the common ancestor:
 
-`git show-branch --more {{5}} {{commit|branch_name|ref}} {{commit|branch_name|ref}} {{...}}`
+`git show-branch --more {{5}} {{branch_name1|ref1|commit1 branch_name2|ref2|commit2 ...}}`
diff --git a/pages/common/gvcolor.md b/pages/common/gvcolor.md
index d98795985e..63aa1c7835 100644
--- a/pages/common/gvcolor.md
+++ b/pages/common/gvcolor.md
@@ -6,7 +6,7 @@
 
 - Colorize one or more ranked digraph (that were already processed by `dot`):
 
-`gvcolor {{path/to/layout1.gv}} {{path/to/layout2.gv ...}} > {{path/to/output.gv}}`
+`gvcolor {{path/to/layout1.gv path/to/layout2.gv ...}} > {{path/to/output.gv}}`
 
 - Lay out a graph and colorize it, then convert to a PNG image:
 
diff --git a/pages/common/gvpack.md b/pages/common/gvpack.md
index b4eaf64617..d08104211c 100644
--- a/pages/common/gvpack.md
+++ b/pages/common/gvpack.md
@@ -6,19 +6,19 @@
 
 - Combine several graph layouts (that already have layout information):
 
-`gvpack {{path/to/layout1.gv}} {{path/to/layout2.gv ...}} > {{path/to/output.gv}}`
+`gvpack {{path/to/layout1.gv path/to/layout2.gv ...}} > {{path/to/output.gv}}`
 
 - Combine several graph layouts at the graph level, keeping graphs separate:
 
-`gvpack -g {{path/to/layout1.gv}} {{path/to/layout2.gv ...}} > {{path/to/output.gv}}`
+`gvpack -g {{path/to/layout1.gv path/to/layout2.gv ...}} > {{path/to/output.gv}}`
 
 - Combine several graph layouts at the node level, ignoring clusters:
 
-`gvpack -n {{path/to/layout1.gv}} {{path/to/layout2.gv ...}} > {{path/to/output.gv}}`
+`gvpack -n {{path/to/layout1.gv path/to/layout2.gv ...}} > {{path/to/output.gv}}`
 
 - Combine several graph layouts without packing:
 
-`gvpack -u {{path/to/layout1.gv}} {{path/to/layout2.gv ...}} > {{path/to/output.gv}}`
+`gvpack -u {{path/to/layout1.gv path/to/layout2.gv ...}} > {{path/to/output.gv}}`
 
 - Display help:
 
diff --git a/pages/common/host.md b/pages/common/host.md
index 39fa4c1af5..44ff93e9c1 100644
--- a/pages/common/host.md
+++ b/pages/common/host.md
@@ -7,7 +7,7 @@
 
 `host {{domain}}`
 
-- Lookup a field (CNAME, TXT,...) of a domain:
+- Lookup a field (CNAME, TXT, ...) of a domain:
 
 `host -t {{field}} {{domain}}`
 
diff --git a/pages/common/ifne.md b/pages/common/ifne.md
index 441d71a39a..5ce3b42162 100644
--- a/pages/common/ifne.md
+++ b/pages/common/ifne.md
@@ -1,7 +1,7 @@
 # ifne
 
 > Run a command depending on the emptyness of `stdin`.
-> More information: <https://joeyh.name/code/moreutils/>.
+> More information: <https://manned.org/ifne>.
 
 - Run the specified command if and only if `stdin` is not empty:
 
diff --git a/pages/common/isutf8.md b/pages/common/isutf8.md
index 644a19d97b..906aacc7b6 100644
--- a/pages/common/isutf8.md
+++ b/pages/common/isutf8.md
@@ -1,7 +1,7 @@
 # isutf8
 
 > Check whether text files contain valid UTF-8.
-> More information: <https://joeyh.name/code/moreutils/>.
+> More information: <https://manned.org/isutf8>.
 
 - Check whether the specified files contain valid UTF-8:
 
@@ -9,16 +9,16 @@
 
 - Print errors using multiple lines:
 
-`isutf8 --verbose {{path/to/file1 path/to/file2 ...}}`
+`isutf8 {{[-v|--verbose]}} {{path/to/file1 path/to/file2 ...}}`
 
 - Do not print anything to `stdout`, indicate the result merely with the exit code:
 
-`isutf8 --quiet {{path/to/file1 path/to/file2 ...}}`
+`isutf8 {{[-q|--quiet]}} {{path/to/file1 path/to/file2 ...}}`
 
 - Only print the names of the files containing invalid UTF-8:
 
-`isutf8 --list {{path/to/file1 path/to/file2 ...}}`
+`isutf8 {{[-l|--list]}} {{path/to/file1 path/to/file2 ...}}`
 
 - Same as `--list` but inverted, i.e., only print the names of the files containing valid UTF-8:
 
-`isutf8 --invert {{path/to/file1 path/to/file2 ...}}`
+`isutf8 {{[-i|--invert]}} {{path/to/file1 path/to/file2 ...}}`
diff --git a/pages/common/laravel.md b/pages/common/laravel.md
index 4701be09bb..1e93e2ab73 100644
--- a/pages/common/laravel.md
+++ b/pages/common/laravel.md
@@ -1,7 +1,7 @@
 # laravel
 
 > A command-line installer for the Laravel framework.
-> More information: <https://laravel.com>.
+> More information: <https://laravel.com/docs/installation>.
 
 - Create a new Laravel application:
 
diff --git a/pages/common/lckdo.md b/pages/common/lckdo.md
index f7cce33a68..17692e57d0 100644
--- a/pages/common/lckdo.md
+++ b/pages/common/lckdo.md
@@ -1,7 +1,7 @@
 # lckdo
 
 > This command is deprecated and has been superseded by `flock`.
-> More information: <https://joeyh.name/code/moreutils/>.
+> More information: <https://manned.org/lckdo>.
 
 - View documentation for the recommended replacement:
 
diff --git a/pages/common/lpass.md b/pages/common/lpass.md
index 3c163160c9..a2ebff2905 100644
--- a/pages/common/lpass.md
+++ b/pages/common/lpass.md
@@ -1,7 +1,7 @@
 # lpass
 
 > Command-line interface for the LastPass password manager.
-> More information: <https://github.com/lastpass/lastpass-cli>.
+> More information: <https://lastpass.github.io/lastpass-cli/lpass.1.html>.
 
 - Log in to your LastPass account, by entering your master password when prompted:
 
diff --git a/pages/common/mingle.md b/pages/common/mingle.md
index 996aa2efeb..bac4c09641 100644
--- a/pages/common/mingle.md
+++ b/pages/common/mingle.md
@@ -6,7 +6,7 @@
 
 - Bundle the edges of one or more graph layouts (that already have layout information):
 
-`mingle {{path/to/layout1.gv}} {{path/to/layout2.gv ...}} > {{path/to/output.gv}}`
+`mingle {{path/to/layout1.gv path/to/layout2.gv ...}} > {{path/to/output.gv}}`
 
 - Perform layout, bundling, and output to a picture with one command:
 
diff --git a/pages/common/mispipe.md b/pages/common/mispipe.md
index 1d29e51b8b..645cf9132d 100644
--- a/pages/common/mispipe.md
+++ b/pages/common/mispipe.md
@@ -1,7 +1,7 @@
 # mispipe
 
 > Pipe two commands and return the exit status of the first command.
-> More information: <https://joeyh.name/code/moreutils/>.
+> More information: <https://manned.org/mispipe>.
 
 - Pipe two commands and return the exit status of the first command:
 
diff --git a/pages/common/nop.md b/pages/common/nop.md
index 291b8a5e6c..22ad103593 100644
--- a/pages/common/nop.md
+++ b/pages/common/nop.md
@@ -6,11 +6,11 @@
 
 - Pretty-print one or more graphs in canonical format:
 
-`nop {{path/to/input1.gv}} {{path/to/input2.gv ...}} > {{path/to/output.gv}}`
+`nop {{path/to/input1.gv path/to/input2.gv ...}} > {{path/to/output.gv}}`
 
 - Check one or more graphs for validity, producing no output graph:
 
-`nop -p {{path/to/input1.gv}} {{path/to/input2.gv ...}}`
+`nop -p {{path/to/input1.gv path/to/input2.gv ...}}`
 
 - Display help:
 
diff --git a/pages/common/pee.md b/pages/common/pee.md
index ec01d3410b..2be4cf6335 100644
--- a/pages/common/pee.md
+++ b/pages/common/pee.md
@@ -2,7 +2,7 @@
 
 > Tee `stdin` to pipes.
 > See also: `tee`.
-> More information: <https://joeyh.name/code/moreutils/>.
+> More information: <https://manned.org/pee>.
 
 - Run each command, providing each one with a distinct copy of `stdin`:
 
diff --git a/pages/common/sccmap.md b/pages/common/sccmap.md
index 9d1ff9a9c0..48c93a77f1 100644
--- a/pages/common/sccmap.md
+++ b/pages/common/sccmap.md
@@ -6,11 +6,11 @@
 
 - Extract strongly connected components of one or more directed graphs:
 
-`sccmap -S {{path/to/input1.gv}} {{path/to/input2.gv ...}} > {{path/to/output.gv}}`
+`sccmap -S {{path/to/input1.gv path/to/input2.gv ...}} > {{path/to/output.gv}}`
 
 - Print statistics about a graph, producing no output graph:
 
-`sccmap -v -s {{path/to/input1.gv}} {{path/to/input2.gv ...}}`
+`sccmap -v -s {{path/to/input1.gv path/to/input2.gv ...}}`
 
 - Display help:
 
diff --git a/pages/common/tred.md b/pages/common/tred.md
index b1248b7330..401c6ea9a6 100644
--- a/pages/common/tred.md
+++ b/pages/common/tred.md
@@ -6,7 +6,7 @@
 
 - Construct the transitive reduction graph of one or more directed graphs:
 
-`tred {{path/to/input1.gv}} {{path/to/input2.gv ...}} > {{path/to/output.gv}}`
+`tred {{path/to/input1.gv path/to/input2.gv ...}} > {{path/to/output.gv}}`
 
 - Display help:
 
diff --git a/pages/common/unflatten.md b/pages/common/unflatten.md
index 2d4abba3e6..50d296d699 100644
--- a/pages/common/unflatten.md
+++ b/pages/common/unflatten.md
@@ -6,7 +6,7 @@
 
 - Adjust one or more directed graphs to improve the layout aspect ratio:
 
-`unflatten {{path/to/input1.gv}} {{path/to/input2.gv ...}} > {{path/to/output.gv}}`
+`unflatten {{path/to/input1.gv path/to/input2.gv ...}} > {{path/to/output.gv}}`
 
 - Use `unflatten` as a preprocessor for `dot` layout to improve aspect ratio:
 
diff --git a/pages/common/vidir.md b/pages/common/vidir.md
index e3f13cd18e..24d03c394e 100644
--- a/pages/common/vidir.md
+++ b/pages/common/vidir.md
@@ -1,7 +1,7 @@
 # vidir
 
 > Edit directories in a text editor.
-> More information: <https://joeyh.name/code/moreutils/>.
+> More information: <https://manned.org/vidir>.
 
 - Edit the contents of the specified directories:
 
@@ -9,7 +9,7 @@
 
 - Display each action taken by the program:
 
-`vidir --verbose {{path/to/directory1 path/to/directory2 ...}}`
+`vidir {{[-v|--verbose]}} {{path/to/directory1 path/to/directory2 ...}}`
 
 - Edit the contents of current directory:
 
diff --git a/pages/common/vipe.md b/pages/common/vipe.md
index 86e5c50133..4cec08725b 100644
--- a/pages/common/vipe.md
+++ b/pages/common/vipe.md
@@ -1,7 +1,7 @@
 # vipe
 
 > Run a text editor in the middle of a UNIX pipeline.
-> More information: <https://joeyh.name/code/moreutils/>.
+> More information: <https://manned.org/vipe>.
 
 - Edit the output of `command1` before piping it into `command2`:
 
diff --git a/pages/common/zrun.md b/pages/common/zrun.md
index 569afb5c2c..fbaab39785 100644
--- a/pages/common/zrun.md
+++ b/pages/common/zrun.md
@@ -1,8 +1,8 @@
 # zrun
 
 > Transparently uncompress argument files to a command.
-> More information: <https://joeyh.name/code/moreutils/>.
+> More information: <https://manned.org/zrun>.
 
 - Run the specified command with uncompressed versions of the compressed argument files:
 
-`zrun {{cat path/to/file1.gz path/to/file2.bz2 ...}}`
+`zrun {{cat}} {{path/to/file1.gz path/to/file2.bz2 ...}}`