diff --git a/pages/common/iperf.md b/pages/common/iperf.md
index c38ca9ddc5..bac454c5ac 100644
--- a/pages/common/iperf.md
+++ b/pages/common/iperf.md
@@ -5,24 +5,24 @@
 
 - Run on server:
 
-`iperf -s`
+`iperf {{[-s|--server]}}`
 
 - Run on server using UDP mode and set server port to listen on 5001:
 
-`iperf -u -s -p {{5001}}`
+`iperf {{[-u|--udp]}} {{[-s|--server]}} {{[-p|--port]}} {{5001}}`
 
 - Run on client:
 
-`iperf -c {{server_address}}`
+`iperf {{[-c|--client]}} {{server_address}}`
 
 - Run on client every 2 seconds:
 
-`iperf -c {{server_address}} -i {{2}}`
+`iperf {{[-c|--client]}} {{server_address}} {{[-i|--interval]}} {{2}}`
 
 - Run on client with 5 parallel threads:
 
-`iperf -c {{server_address}} -P {{5}}`
+`iperf {{[-c|--client]}} {{server_address}} {{[-P|--parallel]}} {{5}}`
 
 - Run on client using UDP mode:
 
-`iperf -u -c {{server_address}} -p {{5001}}`
+`iperf {{[-u|--udp]}} {{[-c|--client]}} {{server_address}} {{[-p|--port]}} {{5001}}`
diff --git a/pages/common/iperf3.md b/pages/common/iperf3.md
index fd08fa98fd..2a4e21d4e8 100644
--- a/pages/common/iperf3.md
+++ b/pages/common/iperf3.md
@@ -5,20 +5,20 @@
 
 - Run iperf3 as a server:
 
-`iperf3 -s`
+`iperf3 {{[-s|--server]}}`
 
 - Run an iperf3 server on a specific port:
 
-`iperf3 -s -p {{port}}`
+`iperf3 {{[-s|--server]}} {{[-p|--port]}} {{port}}`
 
 - Start bandwidth test:
 
-`iperf3 -c {{server}}`
+`iperf3 {{[-c|--client]}} {{server}}`
 
 - Run iperf3 in multiple parallel streams:
 
-`iperf3 -c {{server}} -P {{streams}}`
+`iperf3 {{[-c|--client]}} {{server}} {{[-P|--parallel]}} {{streams}}`
 
 - Reverse direction of the test. Server sends data to the client:
 
-`iperf3 -c {{server}} -R`
+`iperf3 {{[-c|--client]}} {{server}} {{[-R|--reverse]}}`
diff --git a/pages/linux/avahi-browse.md b/pages/linux/avahi-browse.md
index dc156dac82..400bbbddc6 100644
--- a/pages/linux/avahi-browse.md
+++ b/pages/linux/avahi-browse.md
@@ -6,16 +6,16 @@
 
 - List services available on the local network along with their addresses and ports, ignoring ones on the local machine:
 
-`avahi-browse --all --resolve --ignore-local`
+`avahi-browse {{[-a|--all]}} {{[-r|--resolve]}} {{[-l|--ignore-local]}}`
 
 - Quickly list services in the local network in SSV format for scripts:
 
-`avahi-browse --all --terminate --parsable`
+`avahi-browse {{[-a|--all]}} {{[-t|--terminate]}} {{[-p|--parsable]}}`
 
 - List domains in the neighbourhood:
 
-`avahi-browse --browse-domains`
+`avahi-browse {{[-D|--browse-domains]}}`
 
 - Limit the search to a particular domain:
 
-`avahi-browse --all --domain={{domain}}`
+`avahi-browse {{[-a|--all]}} --domain={{domain}}`
diff --git a/pages/linux/avahi-resolve.md b/pages/linux/avahi-resolve.md
index 1eea3d4af4..fba22f7ec2 100644
--- a/pages/linux/avahi-resolve.md
+++ b/pages/linux/avahi-resolve.md
@@ -5,8 +5,8 @@
 
 - Resolve a local service to its IPv4:
 
-`avahi-resolve -4 --name {{service.local}}`
+`avahi-resolve -4 {{[-n|--name]}} {{service.local}}`
 
 - Resolve an IP to a hostname, verbosely:
 
-`avahi-resolve --verbose --address {{IP}}`
+`avahi-resolve {{[-v|--verbose]}} {{[-a|--address]}} {{IP}}`
diff --git a/pages/linux/chage.md b/pages/linux/chage.md
index 42036ca651..99c44befea 100644
--- a/pages/linux/chage.md
+++ b/pages/linux/chage.md
@@ -5,20 +5,24 @@
 
 - List password information for the user:
 
-`chage --list {{username}}`
+`chage {{[-l|--list]]} {{username}}`
 
 - Enable password expiration in 10 days:
 
-`sudo chage --maxdays {{10}} {{username}}`
+`sudo chage {{[-M|--maxdays]}} {{10}} {{username}}`
 
 - Disable password expiration:
 
-`sudo chage --maxdays {{-1}} {{username}}`
+`sudo chage {{[-M|--maxdays]}} {{-1}} {{username}}`
 
 - Set account expiration date:
 
-`sudo chage --expiredate {{YYYY-MM-DD}} {{username}}`
+`sudo chage {{[-E|--expiredate]}} {{YYYY-MM-DD}} {{username}}`
 
 - Force user to change password on next log in:
 
-`sudo chage --lastday {{0}} {{username}}`
+`sudo chage {{[-d|--lastday]}} {{0}} {{username}}`
+
+- Re-enable an account:
+
+`sudo chage {{[-E|--expiredate]}} -1 {{username}}`
diff --git a/pages/linux/lslogins.md b/pages/linux/lslogins.md
index 54f16a99db..130b8da1ba 100644
--- a/pages/linux/lslogins.md
+++ b/pages/linux/lslogins.md
@@ -9,20 +9,20 @@
 
 - Display users belonging to a specific group:
 
-`lslogins --groups={{groups}}`
+`lslogins {{[-g|--groups]}} {{groups}}`
 
 - Display user accounts:
 
-`lslogins --user-accs`
+`lslogins {{[-u|--user-accs]}}`
 
 - Display last logins:
 
-`lslogins --last`
+`lslogins {{[-L|--last]}}`
 
 - Display system accounts:
 
-`lslogins --system-accs`
+`lslogins {{[-s|--system-accs]}}`
 
 - Display supplementary groups:
 
-`lslogins --supp-groups`
+`lslogins {{[-G|--supp-groups]}}`