diff --git a/pages/common/doctl-account.md b/pages/common/doctl-account.md
index 93202d75c2..734f177dc2 100644
--- a/pages/common/doctl-account.md
+++ b/pages/common/doctl-account.md
@@ -13,4 +13,4 @@
- Display help:
-`doctl account --help`
+`doctl account {{[-h|--help]}}`
diff --git a/pages/common/doctl-auth.md b/pages/common/doctl-auth.md
index d2a894abbd..7911f0ebcc 100644
--- a/pages/common/doctl-auth.md
+++ b/pages/common/doctl-auth.md
@@ -21,4 +21,4 @@
- Show available commands:
-`doctl auth --help`
+`doctl auth {{[-h|--help]}}`
diff --git a/pages/common/doctl-balance.md b/pages/common/doctl-balance.md
index eb5087cccd..3e66119996 100644
--- a/pages/common/doctl-balance.md
+++ b/pages/common/doctl-balance.md
@@ -9,7 +9,7 @@
- Get the balance of an account associated with an access token:
-`doctl balance get --access-token {{access_token}}`
+`doctl balance get {{[-t|--access-token]}} {{access_token}}`
- Get the balance of an account associated with a specified context:
diff --git a/pages/common/doctl-databases-db.md b/pages/common/doctl-databases-db.md
index f3ae93f9e9..e0ebbaf42c 100644
--- a/pages/common/doctl-databases-db.md
+++ b/pages/common/doctl-databases-db.md
@@ -5,7 +5,7 @@
- Run a `doctl databases db` command with an access token:
-`doctl databases db {{command}} --access-token {{access_token}}`
+`doctl databases db {{command}} {{[-t|--access-token]}} {{access_token}}`
- Retrieve the name of the given database hosted in the given database cluster:
diff --git a/pages/common/doctl-databases-firewalls.md b/pages/common/doctl-databases-firewalls.md
index f13aef7830..4f590818c0 100644
--- a/pages/common/doctl-databases-firewalls.md
+++ b/pages/common/doctl-databases-firewalls.md
@@ -5,7 +5,7 @@
- Run a `doctl databases firewalls` command with an access token:
-`doctl databases firewalls {{command}} --access-token {{access_token}}`
+`doctl databases firewalls {{command}} {{[-t|--access-token]}} {{access_token}}`
- Retrieve a list of firewall rules for a given database:
diff --git a/pages/common/doctl-databases-maintenance-window.md b/pages/common/doctl-databases-maintenance-window.md
index 1fd1d9829e..6270ea4887 100644
--- a/pages/common/doctl-databases-maintenance-window.md
+++ b/pages/common/doctl-databases-maintenance-window.md
@@ -5,7 +5,7 @@
- Run a `doctl databases maintenance-window` command with an access token:
-`doctl databases maintenance-window {{command}} --access-token {{access_token}}`
+`doctl databases maintenance-window {{command}} {{[-t|--access-token]}} {{access_token}}`
- Retrieve details about a database cluster's maintenance windows:
diff --git a/pages/common/doctl-databases-options.md b/pages/common/doctl-databases-options.md
index 4873f4f99b..968fd705f0 100644
--- a/pages/common/doctl-databases-options.md
+++ b/pages/common/doctl-databases-options.md
@@ -5,7 +5,7 @@
- Run a `doctl databases options` command with an access token:
-`doctl databases options {{command}} --access-token {{access_token}}`
+`doctl databases options {{command}} {{[-t|--access-token]}} {{access_token}}`
- Retrieve a list of the available database engines:
diff --git a/pages/common/doctl-databases-pool.md b/pages/common/doctl-databases-pool.md
index 232b8eb9d3..422d363086 100644
--- a/pages/common/doctl-databases-pool.md
+++ b/pages/common/doctl-databases-pool.md
@@ -5,7 +5,7 @@
- Run a `doctl databases pool` command with an access token:
-`doctl databases pool {{command}} --access-token {{access_token}}`
+`doctl databases pool {{command}} {{[-t|--access-token]}} {{access_token}}`
- Retrieve information about a database connection pool:
diff --git a/pages/common/doctl-databases-replica.md b/pages/common/doctl-databases-replica.md
index b5e927f6e2..6df9ff913a 100644
--- a/pages/common/doctl-databases-replica.md
+++ b/pages/common/doctl-databases-replica.md
@@ -5,7 +5,7 @@
- Run a `doctl databases replica` command with an access token:
-`doctl databases pool {{command}} --access-token {{access_token}}`
+`doctl databases pool {{command}} {{[-t|--access-token]}} {{access_token}}`
- Retrieve information about a read-only database replica:
diff --git a/pages/common/doctl-databases-sql-mode.md b/pages/common/doctl-databases-sql-mode.md
index 1a81ecedf3..e6fdc15cde 100644
--- a/pages/common/doctl-databases-sql-mode.md
+++ b/pages/common/doctl-databases-sql-mode.md
@@ -5,7 +5,7 @@
- Run a `doctl databases sql-mode` command with an access token:
-`doctl databases sql-mode {{command}} --access-token {{access_token}}`
+`doctl databases sql-mode {{command}} {{[-t|--access-token]}} {{access_token}}`
- Get a MySQL database cluster's SQL modes:
diff --git a/pages/common/doctl-databases-user.md b/pages/common/doctl-databases-user.md
index ce6531ab0f..eddd9e04ed 100644
--- a/pages/common/doctl-databases-user.md
+++ b/pages/common/doctl-databases-user.md
@@ -5,7 +5,7 @@
- Run a `doctl databases user` command with an access token:
-`doctl databases user {{command}} --access-token {{access_token}}`
+`doctl databases user {{command}} {{[-t|--access-token]}} {{access_token}}`
- Retrieve details about a database user:
diff --git a/pages/common/doctl-databases.md b/pages/common/doctl-databases.md
index 5f7d5ef6a4..00f300c466 100644
--- a/pages/common/doctl-databases.md
+++ b/pages/common/doctl-databases.md
@@ -5,7 +5,7 @@
- Run a `doctl databases` command with an access token:
-`doctl databases {{command}} --access-token {{access_token}}`
+`doctl databases {{command}} {{[-t|--access-token]}} {{access_token}}`
- Get details for a database cluster:
diff --git a/pages/common/handbrakecli.md b/pages/common/handbrakecli.md
index 983500d7c1..c95be20480 100644
--- a/pages/common/handbrakecli.md
+++ b/pages/common/handbrakecli.md
@@ -1,28 +1,28 @@
# handbrakecli
> Command-line interface to the HandBrake video conversion and DVD ripping tool.
-> More information: .
+> More information: .
- Convert a video file to MKV (AAC 160kbit audio and x264 CRF20 video):
-`handbrakecli --input {{input.avi}} --output {{output.mkv}} --encoder x264 --quality 20 --ab 160`
+`handbrakecli {{[-i|--input]}} {{input.avi}} {{[-o|--output]}} {{output.mkv}} {{[-e|--encoder]}} x264 {{[-q|--quality]}} 20 {{[-B|--ab]}} 160`
- Resize a video file to 320x240:
-`handbrakecli --input {{input.mp4}} --output {{output.mp4}} --width 320 --height 240`
+`handbrakecli {{[-i|--input]}} {{input.mp4}} {{[-o|--output]}} {{output.mp4}} {{[-w|--width]}} 320 {{[-l|--height]}} 240`
- List available presets:
-`handbrakecli --preset-list`
+`handbrakecli {{[-z|--preset-list]}}`
- Convert an AVI video to MP4 using the Android preset:
-`handbrakecli --preset="Android" --input {{input.ext}} --output {{output.mp4}}`
+`handbrakecli {{[-Z|--preset]}} "Android" {{[-i|--input]}} {{input.ext}} {{[-o|--output]}} {{output.mp4}}`
- Print the content of a DVD, getting the CSS keys in the process:
-`handbrakecli --input {{/dev/sr0}} --title 0`
+`handbrakecli {{[-i|--input]}} {{/dev/sr0}} {{[-t|--title]}} 0`
- Rip the first track of a DVD in the specified device. Audiotracks and subtitle languages are specified as lists:
-`handbrakecli --input {{/dev/sr0}} --title 1 --output {{out.mkv}} --format av_mkv --encoder x264 --subtitle {{1,4,5}} --audio {{1,2}} --aencoder copy --quality {{23}}`
+`handbrakecli {{[-i|--input]}} {{/dev/sr0}} {{[-t|--title]}} 1 {{[-o|--output]}} {{out.mkv}} {{[-f|--format]}} av_mkv {{[-e|--encoder]}} x264 {{[-s|--subtitle]}} {{1,4,5}} {{[-a|--audio]}} {{1,2}} {{[-E|--aencoder]}} copy {{[-q|--quality]}} {{23}}`
diff --git a/pages/common/ipaggmanip.md b/pages/common/ipaggmanip.md
index 0c0edfde8e..d447781d21 100644
--- a/pages/common/ipaggmanip.md
+++ b/pages/common/ipaggmanip.md
@@ -5,7 +5,7 @@
- Combine labels equal in their high-order bits:
-`ipaggmanip --prefix {{16}} {{path/to/file}}`
+`ipaggmanip {{[-p|--prefix]}} {{16}} {{path/to/file}}`
- Remove labels with a count smaller than a given number of bytes and output a random sample of such labels:
@@ -13,4 +13,4 @@
- Replace each label's count with 1 if it is non-zero:
-`ipaggmanip --posterize {{path/to/file}}`
+`ipaggmanip {{[-P|--posterize]}} {{path/to/file}}`
diff --git a/pages/common/jadx.md b/pages/common/jadx.md
index 19a92fe465..2485107bdf 100644
--- a/pages/common/jadx.md
+++ b/pages/common/jadx.md
@@ -2,7 +2,7 @@
> Dex to Java decompiler.
> Produces Java source code from Android Dex and APK files.
-> More information: .
+> More information: .
- Decompile a Dex file into a directory:
@@ -10,4 +10,4 @@
- Decompile a Dex file into a specific directory:
-`jadx --output-dir {{path/to/directory}} {{path/to/file}}`
+`jadx {{[-d|--output-dir]}} {{path/to/directory}} {{path/to/file}}`
diff --git a/pages/common/mongodump.md b/pages/common/mongodump.md
index be7c5e3bc1..7ae3a96f68 100644
--- a/pages/common/mongodump.md
+++ b/pages/common/mongodump.md
@@ -9,23 +9,23 @@
- Specify an output location for the dump:
-`mongodump --out {{path/to/directory}}`
+`mongodump {{[-o|--out]}} {{path/to/directory}}`
- Create a dump of a given database:
-`mongodump --db {{database_name}}`
+`mongodump {{[-d|--db]}} {{database_name}}`
- Create a dump of a given collection within a given database:
-`mongodump --collection {{collection_name}} --db {{database_name}}`
+`mongodump {{[-c|--collection]}} {{collection_name}} {{[-d|--db]}} {{database_name}}`
- Connect to a given host running on a given port, and create a dump:
-`mongodump --host {{host}} --port {{port}}`
+`mongodump {{[-h|--host]}} {{host}} --port {{port}}`
- Create a dump of a given database with a given username; user will be prompted for password:
-`mongodump --username {{username}} {{database}} --password`
+`mongodump {{[-u|--username]}} {{username}} {{database}} {{[-p|--password]}}`
- Create a dump from a specific instance; host, user, password and database will be defined in the connection string: