diff --git a/tldr/autojump b/tldr/autojump
index e0a94781..75d3c73b 100644
--- a/tldr/autojump
+++ b/tldr/autojump
@@ -7,8 +7,13 @@ source: https://github.com/tldr-pages/tldr.git
 
 > Quickly jump among the directories you visit the most.
 > Aliases like j or jc are provided for even less typing.
+> See also: `bashmarks`.
 > More information: <https://github.com/wting/autojump>.
 
+- Add the autojump aliases to your shell:
+
+`source /usr/share/autojump/autojump.{{bash|fish|zsh}}`
+
 - Jump to a directory that contains the given pattern:
 
 `j {{pattern}}`
diff --git a/tldr/bashmarks b/tldr/bashmarks
index fe787abe..45d2fceb 100644
--- a/tldr/bashmarks
+++ b/tldr/bashmarks
@@ -6,6 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # bashmarks
 
 > Save and jump to commonly used directories using 1 character commands.
+> See also: `autojump`.
 > More information: <https://github.com/huyng/bashmarks>.
 
 - Add the bashmark aliases to your shell:
diff --git a/tldr/chars b/tldr/chars
index 4b1a7994..9fb1b827 100644
--- a/tldr/chars
+++ b/tldr/chars
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # chars
 
 > Display names and codes for various ASCII and Unicode characters and code points.
-> More information: <https://github.com/antifuchs/chars>.
+> More information: <https://github.com/boinkor-net/chars#running>.
 
 - Look up a character by its value:
 
diff --git a/tldr/drupal-check b/tldr/drupal-check
index c3536e5f..475b17a4 100644
--- a/tldr/drupal-check
+++ b/tldr/drupal-check
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # drupal-check
 
 > Check Drupal PHP code for deprecations.
-> More information: <https://github.com/mglaman/drupal-check>.
+> More information: <https://github.com/mglaman/drupal-check#usage>.
 
 - Check the code in a specific directory for deprecations:
 
@@ -14,7 +14,7 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Check the code excluding a comma-separated list of directories:
 
-`drupal-check --exclude-dir {{path/to/excluded_directory}},{{path/to/excluded_files/*.php}} {{path/to/directory}}`
+`drupal-check {{[-e|--exclude-dir]}} {{path/to/excluded_directory}},{{path/to/excluded_files/*.php}} {{path/to/directory}}`
 
 - Don't show a progress bar:
 
@@ -22,4 +22,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Perform static analysis to detect bad coding practices:
 
-`drupal-check --analysis {{path/to/directory}}`
+`drupal-check {{[-a|--analysis]}} {{path/to/directory}}`
diff --git a/tldr/drush b/tldr/drush
index e5daa849..a84ffa14 100644
--- a/tldr/drush
+++ b/tldr/drush
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # drush
 
 > A command-line shell and scripting interface for Drupal.
-> More information: <https://www.drush.org>.
+> More information: <https://www.drush.org/latest/usage/>.
 
 - Enable module "foo":
 
diff --git a/tldr/grumphp b/tldr/grumphp
index 1dd4bdc8..c32166d0 100644
--- a/tldr/grumphp
+++ b/tldr/grumphp
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # grumphp
 
 > A PHP Composer plugin that enables source code quality checks.
-> More information: <https://github.com/phpro/grumphp>.
+> More information: <https://github.com/phpro/grumphp#commands>.
 
 - Register the Git hooks:
 
diff --git a/tldr/guacd b/tldr/guacd
index f84dfe20..5b37b781 100644
--- a/tldr/guacd
+++ b/tldr/guacd
@@ -7,7 +7,7 @@ source: https://github.com/tldr-pages/tldr.git
 
 > Apache Guacamole proxy daemon.
 > Support loader for client plugins to interface between the Guacamole protocol and any arbitrary remote desktop protocol (e.g. RDP, VNC, Other).
-> More information: <https://guacamole.apache.org/>.
+> More information: <https://manned.org/guacd>.
 
 - Bind to a specific port on localhost:
 
diff --git a/tldr/i3 b/tldr/i3
new file mode 100644
index 00000000..3d727070
--- /dev/null
+++ b/tldr/i3
@@ -0,0 +1,37 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# i3
+
+> A tiling window manager for X11.
+> More information: <https://i3wm.org/docs/userguide.html>.
+
+- Start `i3` (Note that a pre-existing window manager must not be open when this command is run):
+
+`i3`
+
+- Open a new terminal window:
+
+`<Super Enter>`
+
+- Move the focused window to a workspace:
+
+`<Super Shift {{Number}}>`
+
+- Switch to a workspace:
+
+`<Super {{Number}}>`
+
+- Split the next window horizontally:
+
+`<Super h>`
+
+- Split the next window vertically:
+
+`<Super v>`
+
+- Open an application launcher:
+
+`<Super d>`
diff --git a/tldr/impacket-mqtt_check b/tldr/impacket-mqtt_check
new file mode 100644
index 00000000..98317f33
--- /dev/null
+++ b/tldr/impacket-mqtt_check
@@ -0,0 +1,12 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# impacket-mqtt_check
+
+> This command is an alias of `mqtt_check.py`.
+
+- View documentation for the original command:
+
+`tldr mqtt_check.py`
diff --git a/tldr/info b/tldr/info
index d8fa2548..3314c4bb 100644
--- a/tldr/info
+++ b/tldr/info
@@ -5,8 +5,8 @@ source: https://github.com/tldr-pages/tldr.git
 ---
 # info
 
-> Reads documentation stored in the info format.
-> More information: <https://en.wikipedia.org/wiki/Info_(Unix)>.
+> Read documentation stored in the info format.
+> More information: <https://manned.org/man/info>.
 
 - Start reading top-level directory menu:
 
diff --git a/tldr/j b/tldr/j
new file mode 100644
index 00000000..9c2c7092
--- /dev/null
+++ b/tldr/j
@@ -0,0 +1,12 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# j
+
+> This command is an alias of `autojump`.
+
+- View documentation for the original command:
+
+`tldr autojump`
diff --git a/tldr/jc b/tldr/jc
index 51a25377..464f9959 100644
--- a/tldr/jc
+++ b/tldr/jc
@@ -5,21 +5,12 @@ source: https://github.com/tldr-pages/tldr.git
 ---
 # jc
 
-> Convert the output of multiple commands to JSON.
-> More information: <https://github.com/kellyjonbrazil/jc>.
+> `jc` can refer to multiple commands with the same name.
 
-- Convert command output to JSON via pipe:
+- View documentation for the `JSON` serializer:
 
-`{{ifconfig}} | jc {{--ifconfig}}`
+`tldr jc.json`
 
-- Convert command output to JSON via magic syntax:
+- View documentation for the `autojump` alias:
 
-`jc {{ifconfig}}`
-
-- Output pretty JSON via pipe:
-
-`{{ifconfig}} | jc {{--ifconfig}} {{[-p|--pretty]}}`
-
-- Output pretty JSON via magic syntax:
-
-`jc {{[-p|--pretty]}} {{ifconfig}}`
+`tldr autojump`
diff --git a/tldr/jc.json b/tldr/jc.json
new file mode 100644
index 00000000..51a25377
--- /dev/null
+++ b/tldr/jc.json
@@ -0,0 +1,25 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# jc
+
+> Convert the output of multiple commands to JSON.
+> More information: <https://github.com/kellyjonbrazil/jc>.
+
+- Convert command output to JSON via pipe:
+
+`{{ifconfig}} | jc {{--ifconfig}}`
+
+- Convert command output to JSON via magic syntax:
+
+`jc {{ifconfig}}`
+
+- Output pretty JSON via pipe:
+
+`{{ifconfig}} | jc {{--ifconfig}} {{[-p|--pretty]}}`
+
+- Output pretty JSON via magic syntax:
+
+`jc {{[-p|--pretty]}} {{ifconfig}}`
diff --git a/tldr/jco b/tldr/jco
new file mode 100644
index 00000000..c2833778
--- /dev/null
+++ b/tldr/jco
@@ -0,0 +1,12 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# jco
+
+> This command is an alias of `autojump`.
+
+- View documentation for the original command:
+
+`tldr autojump`
diff --git a/tldr/jo b/tldr/jo
new file mode 100644
index 00000000..d29710c4
--- /dev/null
+++ b/tldr/jo
@@ -0,0 +1,12 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# jo
+
+> This command is an alias of `autojump`.
+
+- View documentation for the original command:
+
+`tldr autojump`
diff --git a/tldr/jp2a b/tldr/jp2a
index 2ed28eb8..173c6ee9 100644
--- a/tldr/jp2a
+++ b/tldr/jp2a
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # jp2a
 
 > Convert JPEG images to ASCII.
-> More information: <https://csl.name/jp2a/>.
+> More information: <https://manned.org/jp2a>.
 
 - Read JPEG image from a file and print in ASCII:
 
diff --git a/tldr/mqtt_check.py b/tldr/mqtt_check.py
new file mode 100644
index 00000000..a578a2b7
--- /dev/null
+++ b/tldr/mqtt_check.py
@@ -0,0 +1,34 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# mqtt_check.py
+
+> Simple utility for testing and validating MQTT login credentials.
+> Part of the Impacket suite.
+> More information: <https://github.com/fortra/impacket>.
+
+- Check MQTT login credentials for a target (MQTT broker's hostname):
+
+`mqtt_check.py {{domain}}/{{username}}:{{password}}@{{targetName}}`
+
+- Specify a custom client ID for authentication:
+
+`mqtt_check.py -client-id {{client_id}} {{domain}}/{{username}}:{{password}}@{{targetName}}`
+
+- Enable SSL for the connection:
+
+`mqtt_check.py -ssl {{domain}}/{{username}}:{{password}}@{{targetName}}`
+
+- Connect to a specific port (default is 1883):
+
+`mqtt_check.py -port {{port}} {{domain}}/{{username}}:{{password}}@{{targetName}}`
+
+- Enable debug output:
+
+`mqtt_check.py -debug {{domain}}/{{username}}:{{password}}@{{targetName}}`
+
+- Display help message:
+
+`mqtt_check.py --help`
diff --git a/tldr/osx/g[ b/tldr/osx/g[
index d30af753..a57e087b 100644
--- a/tldr/osx/g[
+++ b/tldr/osx/g[
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux [`
+`tldr [`
diff --git a/tldr/osx/gb2sum b/tldr/osx/gb2sum
index c70575ba..33e1e3a7 100644
--- a/tldr/osx/gb2sum
+++ b/tldr/osx/gb2sum
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux b2sum`
+`tldr b2sum`
diff --git a/tldr/osx/gbase32 b/tldr/osx/gbase32
index 8e33ca6e..dc397f1b 100644
--- a/tldr/osx/gbase32
+++ b/tldr/osx/gbase32
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux base32`
+`tldr base32`
diff --git a/tldr/osx/gbase64 b/tldr/osx/gbase64
index e82fffee..6da96183 100644
--- a/tldr/osx/gbase64
+++ b/tldr/osx/gbase64
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux base64`
+`tldr {{[-p|--platform]}} common base64`
diff --git a/tldr/osx/gbasename b/tldr/osx/gbasename
index 2fa50278..163c01bb 100644
--- a/tldr/osx/gbasename
+++ b/tldr/osx/gbasename
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux basename`
+`tldr basename`
diff --git a/tldr/osx/gbasenc b/tldr/osx/gbasenc
index 9e796055..0945106c 100644
--- a/tldr/osx/gbasenc
+++ b/tldr/osx/gbasenc
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux basenc`
+`tldr basenc`
diff --git a/tldr/osx/gchgrp b/tldr/osx/gchgrp
index 5ffc5817..4a335cc3 100644
--- a/tldr/osx/gchgrp
+++ b/tldr/osx/gchgrp
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux chgrp`
+`tldr chgrp`
diff --git a/tldr/osx/gchmod b/tldr/osx/gchmod
index 57b4814a..ccf1184d 100644
--- a/tldr/osx/gchmod
+++ b/tldr/osx/gchmod
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux chmod`
+`tldr chmod`
diff --git a/tldr/osx/gchown b/tldr/osx/gchown
index 93981e54..77c74dd8 100644
--- a/tldr/osx/gchown
+++ b/tldr/osx/gchown
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux chown`
+`tldr chown`
diff --git a/tldr/osx/gchroot b/tldr/osx/gchroot
index 4a3479e8..65e3f4c9 100644
--- a/tldr/osx/gchroot
+++ b/tldr/osx/gchroot
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux chroot`
+`tldr chroot`
diff --git a/tldr/osx/gcksum b/tldr/osx/gcksum
index e0831d50..01adcb23 100644
--- a/tldr/osx/gcksum
+++ b/tldr/osx/gcksum
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux cksum`
+`tldr cksum`
diff --git a/tldr/osx/gcomm b/tldr/osx/gcomm
index 96664e17..8035e605 100644
--- a/tldr/osx/gcomm
+++ b/tldr/osx/gcomm
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux comm`
+`tldr comm`
diff --git a/tldr/osx/gcp b/tldr/osx/gcp
index 33066bb9..4659c72b 100644
--- a/tldr/osx/gcp
+++ b/tldr/osx/gcp
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux cp`
+`tldr cp`
diff --git a/tldr/osx/gcut b/tldr/osx/gcut
index 6e767b00..7494465f 100644
--- a/tldr/osx/gcut
+++ b/tldr/osx/gcut
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux cut`
+`tldr {{[-p|--platform]}} common cut`
diff --git a/tldr/osx/gdate b/tldr/osx/gdate
index baa4f4ef..c574e1fb 100644
--- a/tldr/osx/gdate
+++ b/tldr/osx/gdate
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux date`
+`tldr {{[-p|--platform]}} common date`
diff --git a/tldr/osx/gdircolors b/tldr/osx/gdircolors
index f8bcce51..4f04be15 100644
--- a/tldr/osx/gdircolors
+++ b/tldr/osx/gdircolors
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux dircolors`
+`tldr dircolors`
diff --git a/tldr/osx/gdirname b/tldr/osx/gdirname
index c8bb73cc..c1d99695 100644
--- a/tldr/osx/gdirname
+++ b/tldr/osx/gdirname
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux dirname`
+`tldr dirname`
diff --git a/tldr/osx/gecho b/tldr/osx/gecho
index ae1eb190..bba0235d 100644
--- a/tldr/osx/gecho
+++ b/tldr/osx/gecho
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux echo`
+`tldr echo`
diff --git a/tldr/osx/ged b/tldr/osx/ged
index 5e0e77c9..36187fa5 100644
--- a/tldr/osx/ged
+++ b/tldr/osx/ged
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux ed`
+`tldr ed`
diff --git a/tldr/osx/gegrep b/tldr/osx/gegrep
index 0eecd8f0..5e40a3d4 100644
--- a/tldr/osx/gegrep
+++ b/tldr/osx/gegrep
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux egrep`
+`tldr egrep`
diff --git a/tldr/osx/genv b/tldr/osx/genv
index d42f08d8..380bc6cb 100644
--- a/tldr/osx/genv
+++ b/tldr/osx/genv
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux env`
+`tldr env`
diff --git a/tldr/osx/gexpand b/tldr/osx/gexpand
index afe007c3..b2007515 100644
--- a/tldr/osx/gexpand
+++ b/tldr/osx/gexpand
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux expand`
+`tldr expand`
diff --git a/tldr/osx/gexpr b/tldr/osx/gexpr
index 2d81bddc..3c291b63 100644
--- a/tldr/osx/gexpr
+++ b/tldr/osx/gexpr
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux expr`
+`tldr expr`
diff --git a/tldr/osx/gfactor b/tldr/osx/gfactor
index 0c83c911..a807a413 100644
--- a/tldr/osx/gfactor
+++ b/tldr/osx/gfactor
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux factor`
+`tldr factor`
diff --git a/tldr/osx/gfalse b/tldr/osx/gfalse
index bbc1e2a5..f4fade2b 100644
--- a/tldr/osx/gfalse
+++ b/tldr/osx/gfalse
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux false`
+`tldr false`
diff --git a/tldr/osx/gfgrep b/tldr/osx/gfgrep
index f2b9512c..5d1954c1 100644
--- a/tldr/osx/gfgrep
+++ b/tldr/osx/gfgrep
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux fgrep`
+`tldr fgrep`
diff --git a/tldr/osx/gfind b/tldr/osx/gfind
index c4533bfd..b57c1992 100644
--- a/tldr/osx/gfind
+++ b/tldr/osx/gfind
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux find`
+`tldr find`
diff --git a/tldr/osx/gfmt b/tldr/osx/gfmt
index 1eab5e62..383a78a1 100644
--- a/tldr/osx/gfmt
+++ b/tldr/osx/gfmt
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux fmt`
+`tldr fmt`
diff --git a/tldr/osx/gftp b/tldr/osx/gftp
index 308ebfd2..4f949d38 100644
--- a/tldr/osx/gftp
+++ b/tldr/osx/gftp
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux ftp`
+`tldr ftp`
diff --git a/tldr/osx/ggrep b/tldr/osx/ggrep
index 5c5bd287..3020b4a7 100644
--- a/tldr/osx/ggrep
+++ b/tldr/osx/ggrep
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux grep`
+`tldr grep`
diff --git a/tldr/osx/ggroups b/tldr/osx/ggroups
index 1713a5dc..c907f6a7 100644
--- a/tldr/osx/ggroups
+++ b/tldr/osx/ggroups
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux groups`
+`tldr groups`
diff --git a/tldr/osx/ghostid b/tldr/osx/ghostid
index 9f152903..6e27354a 100644
--- a/tldr/osx/ghostid
+++ b/tldr/osx/ghostid
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux hostid`
+`tldr hostid`
diff --git a/tldr/osx/ghostname b/tldr/osx/ghostname
index d83ff235..b8d3e002 100644
--- a/tldr/osx/ghostname
+++ b/tldr/osx/ghostname
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux hostname`
+`tldr hostname`
diff --git a/tldr/osx/gid b/tldr/osx/gid
index c8f112b0..f1421372 100644
--- a/tldr/osx/gid
+++ b/tldr/osx/gid
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux id`
+`tldr id`
diff --git a/tldr/osx/gifconfig b/tldr/osx/gifconfig
index 98312267..15d08b4a 100644
--- a/tldr/osx/gifconfig
+++ b/tldr/osx/gifconfig
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux ifconfig`
+`tldr ifconfig`
diff --git a/tldr/osx/gindent b/tldr/osx/gindent
index fdb33238..6c1f8576 100644
--- a/tldr/osx/gindent
+++ b/tldr/osx/gindent
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux indent`
+`tldr {{[-p|--platform]}} common indent`
diff --git a/tldr/osx/ginstall b/tldr/osx/ginstall
index c6b01f14..79427709 100644
--- a/tldr/osx/ginstall
+++ b/tldr/osx/ginstall
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux install`
+`tldr install`
diff --git a/tldr/osx/gjoin b/tldr/osx/gjoin
index e0c70a44..486f5676 100644
--- a/tldr/osx/gjoin
+++ b/tldr/osx/gjoin
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux join`
+`tldr join`
diff --git a/tldr/osx/glink b/tldr/osx/glink
index 2b72ee01..ba25305d 100644
--- a/tldr/osx/glink
+++ b/tldr/osx/glink
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux link`
+`tldr link`
diff --git a/tldr/osx/gln b/tldr/osx/gln
index a9b5ffa4..1865851a 100644
--- a/tldr/osx/gln
+++ b/tldr/osx/gln
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux ln`
+`tldr ln`
diff --git a/tldr/osx/glogname b/tldr/osx/glogname
index 190c7dea..300b88fc 100644
--- a/tldr/osx/glogname
+++ b/tldr/osx/glogname
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux logname`
+`tldr logname`
diff --git a/tldr/osx/gls b/tldr/osx/gls
index ce5ea8b3..0b1591b5 100644
--- a/tldr/osx/gls
+++ b/tldr/osx/gls
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux ls`
+`tldr ls`
diff --git a/tldr/osx/gmake b/tldr/osx/gmake
index af040733..da571952 100644
--- a/tldr/osx/gmake
+++ b/tldr/osx/gmake
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux make`
+`tldr make`
diff --git a/tldr/osx/gmd5sum b/tldr/osx/gmd5sum
index 8e2cf182..a6f83514 100644
--- a/tldr/osx/gmd5sum
+++ b/tldr/osx/gmd5sum
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux md5sum`
+`tldr md5sum`
diff --git a/tldr/osx/gmkdir b/tldr/osx/gmkdir
index d788b01f..ba238049 100644
--- a/tldr/osx/gmkdir
+++ b/tldr/osx/gmkdir
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux mkdir`
+`tldr mkdir`
diff --git a/tldr/osx/gmkfifo b/tldr/osx/gmkfifo
index c8a0d74e..2765a915 100644
--- a/tldr/osx/gmkfifo
+++ b/tldr/osx/gmkfifo
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux mkfifo`
+`tldr mkfifo`
diff --git a/tldr/osx/gmv b/tldr/osx/gmv
index c416f8b7..97877548 100644
--- a/tldr/osx/gmv
+++ b/tldr/osx/gmv
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux mv`
+`tldr mv`
diff --git a/tldr/osx/gnice b/tldr/osx/gnice
index dfad871f..ad8fe5f9 100644
--- a/tldr/osx/gnice
+++ b/tldr/osx/gnice
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux nice`
+`tldr nice`
diff --git a/tldr/osx/gnohup b/tldr/osx/gnohup
index 1eb7addc..a6ffd1ef 100644
--- a/tldr/osx/gnohup
+++ b/tldr/osx/gnohup
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux nohup`
+`tldr nohup`
diff --git a/tldr/osx/gnproc b/tldr/osx/gnproc
index 4caa6a3d..d0a3275b 100644
--- a/tldr/osx/gnproc
+++ b/tldr/osx/gnproc
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux nproc`
+`tldr nproc`
diff --git a/tldr/osx/god b/tldr/osx/god
index c9e5b008..b523f273 100644
--- a/tldr/osx/god
+++ b/tldr/osx/god
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux od`
+`tldr od`
diff --git a/tldr/osx/gpaste b/tldr/osx/gpaste
index 2e863422..14af851e 100644
--- a/tldr/osx/gpaste
+++ b/tldr/osx/gpaste
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux paste`
+`tldr paste`
diff --git a/tldr/osx/gpathchk b/tldr/osx/gpathchk
index 2f3a1593..01350d28 100644
--- a/tldr/osx/gpathchk
+++ b/tldr/osx/gpathchk
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux pathchk`
+`tldr pathchk`
diff --git a/tldr/osx/gping b/tldr/osx/gping
index d2236e56..f5ec2a8d 100644
--- a/tldr/osx/gping
+++ b/tldr/osx/gping
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux ping`
+`tldr {{[-p|--platform]}} common ping`
diff --git a/tldr/osx/gping6 b/tldr/osx/gping6
index 24873701..d91a7fc3 100644
--- a/tldr/osx/gping6
+++ b/tldr/osx/gping6
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux ping6`
+`tldr ping6`
diff --git a/tldr/osx/gpinky b/tldr/osx/gpinky
index 81446c24..a04cb211 100644
--- a/tldr/osx/gpinky
+++ b/tldr/osx/gpinky
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux pinky`
+`tldr pinky`
diff --git a/tldr/osx/gpr b/tldr/osx/gpr
index 2bebb0bc..dceeb978 100644
--- a/tldr/osx/gpr
+++ b/tldr/osx/gpr
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux pr`
+`tldr pr`
diff --git a/tldr/osx/gprintenv b/tldr/osx/gprintenv
index ec9842ba..2ce393b5 100644
--- a/tldr/osx/gprintenv
+++ b/tldr/osx/gprintenv
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux printenv`
+`tldr printenv`
diff --git a/tldr/osx/gprintf b/tldr/osx/gprintf
index 94095fea..a05d1eda 100644
--- a/tldr/osx/gprintf
+++ b/tldr/osx/gprintf
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux printf`
+`tldr printf`
diff --git a/tldr/osx/gpwd b/tldr/osx/gpwd
index 101e37b8..83ba4aba 100644
--- a/tldr/osx/gpwd
+++ b/tldr/osx/gpwd
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux pwd`
+`tldr pwd`
diff --git a/tldr/osx/greadlink b/tldr/osx/greadlink
index b3f5b3c5..32828555 100644
--- a/tldr/osx/greadlink
+++ b/tldr/osx/greadlink
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux readlink`
+`tldr readlink`
diff --git a/tldr/osx/grealpath b/tldr/osx/grealpath
index 7a57e9eb..7a0354eb 100644
--- a/tldr/osx/grealpath
+++ b/tldr/osx/grealpath
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux realpath`
+`tldr realpath`
diff --git a/tldr/osx/grm b/tldr/osx/grm
index 482cf74a..0b796ca1 100644
--- a/tldr/osx/grm
+++ b/tldr/osx/grm
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux rm`
+`tldr rm`
diff --git a/tldr/osx/grmdir b/tldr/osx/grmdir
index 3fd8851a..31c8a623 100644
--- a/tldr/osx/grmdir
+++ b/tldr/osx/grmdir
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux rmdir`
+`tldr rmdir`
diff --git a/tldr/osx/gseq b/tldr/osx/gseq
index 4c9dd28c..20512059 100644
--- a/tldr/osx/gseq
+++ b/tldr/osx/gseq
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux seq`
+`tldr seq`
diff --git a/tldr/osx/gsha1sum b/tldr/osx/gsha1sum
index 9db15be5..bd78e1e2 100644
--- a/tldr/osx/gsha1sum
+++ b/tldr/osx/gsha1sum
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux sha1sum`
+`tldr sha1sum`
diff --git a/tldr/osx/gsha224sum b/tldr/osx/gsha224sum
index 7b59a534..c95fe2ed 100644
--- a/tldr/osx/gsha224sum
+++ b/tldr/osx/gsha224sum
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux sha224sum`
+`tldr sha224sum`
diff --git a/tldr/osx/gsha256sum b/tldr/osx/gsha256sum
index 494f847b..762983ef 100644
--- a/tldr/osx/gsha256sum
+++ b/tldr/osx/gsha256sum
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux sha256sum`
+`tldr sha256sum`
diff --git a/tldr/osx/gsha384sum b/tldr/osx/gsha384sum
index 0615a762..57927bc1 100644
--- a/tldr/osx/gsha384sum
+++ b/tldr/osx/gsha384sum
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux sha384sum`
+`tldr sha384sum`
diff --git a/tldr/osx/gsha512sum b/tldr/osx/gsha512sum
index 3fce85cb..338c911b 100644
--- a/tldr/osx/gsha512sum
+++ b/tldr/osx/gsha512sum
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux sha512sum`
+`tldr sha512sum`
diff --git a/tldr/osx/gshred b/tldr/osx/gshred
index e1a6d666..12a81924 100644
--- a/tldr/osx/gshred
+++ b/tldr/osx/gshred
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux shred`
+`tldr shred`
diff --git a/tldr/osx/gshuf b/tldr/osx/gshuf
index c60a1904..e58d5ae5 100644
--- a/tldr/osx/gshuf
+++ b/tldr/osx/gshuf
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux shuf`
+`tldr {{[-p|--platform]}} coomon shuf`
diff --git a/tldr/osx/gsort b/tldr/osx/gsort
index 6fa873ae..a21f4ce0 100644
--- a/tldr/osx/gsort
+++ b/tldr/osx/gsort
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux sort`
+`tldr sort`
diff --git a/tldr/osx/gsplit b/tldr/osx/gsplit
index dd2931e2..37217340 100644
--- a/tldr/osx/gsplit
+++ b/tldr/osx/gsplit
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux split`
+`tldr {{[-p|--platform]}} common split`
diff --git a/tldr/osx/gstat b/tldr/osx/gstat
index e3cf6346..87cedc2a 100644
--- a/tldr/osx/gstat
+++ b/tldr/osx/gstat
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux stat`
+`tldr {{[-p|--platform]}} common stat`
diff --git a/tldr/osx/gstdbuf b/tldr/osx/gstdbuf
index a338e8fc..7becc7d3 100644
--- a/tldr/osx/gstdbuf
+++ b/tldr/osx/gstdbuf
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux stdbuf`
+`tldr stdbuf`
diff --git a/tldr/osx/gstty b/tldr/osx/gstty
index e56224f6..def8803f 100644
--- a/tldr/osx/gstty
+++ b/tldr/osx/gstty
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux stty`
+`tldr stty`
diff --git a/tldr/osx/gsum b/tldr/osx/gsum
index c8f6f8b6..a5f98fb0 100644
--- a/tldr/osx/gsum
+++ b/tldr/osx/gsum
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux sum`
+`tldr sum`
diff --git a/tldr/osx/gsync b/tldr/osx/gsync
index 127abf20..1a14f37d 100644
--- a/tldr/osx/gsync
+++ b/tldr/osx/gsync
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux sync`
+`tldr sync`
diff --git a/tldr/osx/gtac b/tldr/osx/gtac
index 61016adc..6353d685 100644
--- a/tldr/osx/gtac
+++ b/tldr/osx/gtac
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux tac`
+`tldr tac`
diff --git a/tldr/osx/gtail b/tldr/osx/gtail
index 1abc0b16..393af0e3 100644
--- a/tldr/osx/gtail
+++ b/tldr/osx/gtail
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux tail`
+`tldr {{[-p|--platform]}} common tail`
diff --git a/tldr/osx/gtar b/tldr/osx/gtar
index 37eb7e55..23e13183 100644
--- a/tldr/osx/gtar
+++ b/tldr/osx/gtar
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux tar`
+`tldr tar`
diff --git a/tldr/osx/gtee b/tldr/osx/gtee
index ce8751e2..c8bb912e 100644
--- a/tldr/osx/gtee
+++ b/tldr/osx/gtee
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux tee`
+`tldr tee`
diff --git a/tldr/osx/gtelnet b/tldr/osx/gtelnet
index 05fd939b..a68210f6 100644
--- a/tldr/osx/gtelnet
+++ b/tldr/osx/gtelnet
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux telnet`
+`tldr telnet`
diff --git a/tldr/osx/gtest b/tldr/osx/gtest
index 533f2cb3..8825265a 100644
--- a/tldr/osx/gtest
+++ b/tldr/osx/gtest
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux test`
+`tldr test`
diff --git a/tldr/osx/gtime b/tldr/osx/gtime
index b7771645..ba49ef4f 100644
--- a/tldr/osx/gtime
+++ b/tldr/osx/gtime
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux time`
+`tldr time`
diff --git a/tldr/osx/gtimeout b/tldr/osx/gtimeout
index cf831ad9..cc86f46e 100644
--- a/tldr/osx/gtimeout
+++ b/tldr/osx/gtimeout
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux timeout`
+`tldr timeout`
diff --git a/tldr/osx/gtouch b/tldr/osx/gtouch
index 392396d2..1c78bea8 100644
--- a/tldr/osx/gtouch
+++ b/tldr/osx/gtouch
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux touch`
+`tldr touch`
diff --git a/tldr/osx/gtr b/tldr/osx/gtr
index c6d70c46..75b3647a 100644
--- a/tldr/osx/gtr
+++ b/tldr/osx/gtr
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux tr`
+`tldr tr`
diff --git a/tldr/osx/gtraceroute b/tldr/osx/gtraceroute
index ae2fd649..5203cc21 100644
--- a/tldr/osx/gtraceroute
+++ b/tldr/osx/gtraceroute
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux traceroute`
+`tldr traceroute`
diff --git a/tldr/osx/gtrue b/tldr/osx/gtrue
index a80065ab..5a8450a9 100644
--- a/tldr/osx/gtrue
+++ b/tldr/osx/gtrue
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux true`
+`tldr true`
diff --git a/tldr/osx/gtruncate b/tldr/osx/gtruncate
index 4650c3ee..1911d72e 100644
--- a/tldr/osx/gtruncate
+++ b/tldr/osx/gtruncate
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux truncate`
+`tldr truncate`
diff --git a/tldr/osx/gtsort b/tldr/osx/gtsort
index 9534576d..d007e3df 100644
--- a/tldr/osx/gtsort
+++ b/tldr/osx/gtsort
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux tsort`
+`tldr tsort`
diff --git a/tldr/osx/gtty b/tldr/osx/gtty
index f12bbccd..eaf8711d 100644
--- a/tldr/osx/gtty
+++ b/tldr/osx/gtty
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux tty`
+`tldr tty`
diff --git a/tldr/osx/guname b/tldr/osx/guname
index 8fcfecc3..fbbe8496 100644
--- a/tldr/osx/guname
+++ b/tldr/osx/guname
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux uname`
+`tldr {{[-p|--platform]}} common uname`
diff --git a/tldr/osx/gunexpand b/tldr/osx/gunexpand
index 448f17b5..dfdee858 100644
--- a/tldr/osx/gunexpand
+++ b/tldr/osx/gunexpand
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux unexpand`
+`tldr unexpand`
diff --git a/tldr/osx/guniq b/tldr/osx/guniq
index fa0bf1db..ebba8db8 100644
--- a/tldr/osx/guniq
+++ b/tldr/osx/guniq
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux uniq`
+`tldr uniq`
diff --git a/tldr/osx/gunits b/tldr/osx/gunits
index d1e96601..d9cffae6 100644
--- a/tldr/osx/gunits
+++ b/tldr/osx/gunits
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux units`
+`tldr units`
diff --git a/tldr/osx/gunlink b/tldr/osx/gunlink
index ad1cc616..47c1fde4 100644
--- a/tldr/osx/gunlink
+++ b/tldr/osx/gunlink
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux unlink`
+`tldr unlink`
diff --git a/tldr/osx/guptime b/tldr/osx/guptime
index 84a04b1c..1af21ca8 100644
--- a/tldr/osx/guptime
+++ b/tldr/osx/guptime
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux uptime`
+`tldr {{[-p|--platform]}} common uptime`
diff --git a/tldr/osx/gusers b/tldr/osx/gusers
index beb52894..19fb8d33 100644
--- a/tldr/osx/gusers
+++ b/tldr/osx/gusers
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux users`
+`tldr users`
diff --git a/tldr/osx/gvdir b/tldr/osx/gvdir
index ecd00511..01f50b62 100644
--- a/tldr/osx/gvdir
+++ b/tldr/osx/gvdir
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux vdir`
+`tldr vdir`
diff --git a/tldr/osx/gwc b/tldr/osx/gwc
index 57f03b89..4400f174 100644
--- a/tldr/osx/gwc
+++ b/tldr/osx/gwc
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux wc`
+`tldr {{[-p|--platform]}} common wc`
diff --git a/tldr/osx/gwhich b/tldr/osx/gwhich
index 8c099607..4ca33ec8 100644
--- a/tldr/osx/gwhich
+++ b/tldr/osx/gwhich
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux which`
+`tldr which`
diff --git a/tldr/osx/gwho b/tldr/osx/gwho
index ad1dc7a9..346e51af 100644
--- a/tldr/osx/gwho
+++ b/tldr/osx/gwho
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux who`
+`tldr who`
diff --git a/tldr/osx/gwhoami b/tldr/osx/gwhoami
index 26bdd9f3..f5de481b 100644
--- a/tldr/osx/gwhoami
+++ b/tldr/osx/gwhoami
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux whoami`
+`tldr whoami`
diff --git a/tldr/osx/gwhois b/tldr/osx/gwhois
index 3626073f..5d5b40a9 100644
--- a/tldr/osx/gwhois
+++ b/tldr/osx/gwhois
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux whois`
+`tldr whois`
diff --git a/tldr/osx/gxargs b/tldr/osx/gxargs
index fd12ae92..a5321e16 100644
--- a/tldr/osx/gxargs
+++ b/tldr/osx/gxargs
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux xargs`
+`tldr xargs`
diff --git a/tldr/osx/gyes b/tldr/osx/gyes
index a97c9ebf..c3ed26e5 100644
--- a/tldr/osx/gyes
+++ b/tldr/osx/gyes
@@ -9,4 +9,4 @@ source: https://github.com/tldr-pages/tldr.git
 
 - View documentation for the original command:
 
-`tldr {{[-p|--platform]}} linux yes`
+`tldr yes`
diff --git a/tldr/pageres b/tldr/pageres
index b5a0e395..9d0ec7bf 100644
--- a/tldr/pageres
+++ b/tldr/pageres
@@ -14,7 +14,7 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Provide specific options for a URL, overriding global options:
 
-`pageres [{{https://example.com/}} {{1366x768}} --no-crop] [{{https://example2.com/}} {{1024x768}}] --crop`
+`pageres [{{https://example.com/}} {{1366x768}} --no-crop] [{{https://example2.com/}} {{1024x768}}] {{[-c|--crop]}}`
 
 - Provide a custom filename template:
 
diff --git a/tldr/qr b/tldr/qr
index dbd47dfa..59fbe831 100644
--- a/tldr/qr
+++ b/tldr/qr
@@ -10,8 +10,16 @@ source: https://github.com/tldr-pages/tldr.git
 
 - Generate a QR code:
 
-`echo "{{data}}" | qr`
+`qr "{{data}}"`
 
-- Specify the error correction level (defaults to M):
+- Specify the error correction level (defaults to `M`):
 
-`echo "{{data}}" | qr --error-correction={{L|M|Q|H}}`
+`qr --error-correction {{L|M|Q|H}} "{{data}}"`
+
+- Generate a QR code from the output of another command:
+
+`{{command}} | qr`
+
+- Save the QR code as a PNG image:
+
+`qr "{{data}}" > {{path/to/file.png}}`
diff --git a/tldr/robo b/tldr/robo
index 98f870cb..4556f4c3 100644
--- a/tldr/robo
+++ b/tldr/robo
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # robo
 
 > PHP task runner.
-> More information: <https://robo.li/>.
+> More information: <https://robo.li/getting-started.html>.
 
 - List available commands:
 
diff --git a/tldr/shiori b/tldr/shiori
index 6c1d937a..dd5e749e 100644
--- a/tldr/shiori
+++ b/tldr/shiori
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # shiori
 
 > Simple bookmark manager built with Go.
-> More information: <https://github.com/go-shiori/shiori>.
+> More information: <https://github.com/go-shiori/shiori/blob/master/docs/Usage.md>.
 
 - Import bookmarks from HTML Netscape bookmark format file:
 
diff --git a/tldr/stty b/tldr/stty
index f22d025d..1bf49489 100644
--- a/tldr/stty
+++ b/tldr/stty
@@ -8,6 +8,10 @@ source: https://github.com/tldr-pages/tldr.git
 > Set options for a terminal device interface.
 > More information: <https://www.gnu.org/software/coreutils/manual/html_node/stty-invocation.html>.
 
+- Display current terminal size:
+
+`stty size`
+
 - Display all settings for the current terminal:
 
 `stty {{[-a|--all]}}`
diff --git a/tldr/sway b/tldr/sway
new file mode 100644
index 00000000..e5cbae30
--- /dev/null
+++ b/tldr/sway
@@ -0,0 +1,18 @@
+---
+syntax: markdown
+tags: [tldr, common]
+source: https://github.com/tldr-pages/tldr.git
+---
+# sway
+
+> A tiling Wayland compositor.
+> It uses the same config format as `i3`, with some Wayland-specific additions.
+> More information: <https://github.com/swaywm/sway/wiki>.
+
+- Start `sway`:
+
+`sway`
+
+- View documentation for `i3` (`sway` uses the same default keybindings):
+
+`tldr i3`
diff --git a/tldr/vue b/tldr/vue
index 361eac6e..5386946a 100644
--- a/tldr/vue
+++ b/tldr/vue
@@ -7,7 +7,7 @@ source: https://github.com/tldr-pages/tldr.git
 
 > Multi-purpose CLI for Vue.js.
 > Some subcommands such as `build` have their own usage documentation.
-> More information: <https://cli.vuejs.org>.
+> More information: <https://cli.vuejs.org/guide/>.
 
 - Create a new Vue project interactively:
 
diff --git a/tldr/vue-build b/tldr/vue-build
index 626ad622..1a28cd96 100644
--- a/tldr/vue-build
+++ b/tldr/vue-build
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # vue build
 
 > A subcommand provided by `@vue/cli` and `@vue/cli-service-global` that enables quick prototyping.
-> More information: <https://cli.vuejs.org/guide/prototyping.html>.
+> More information: <https://cli.vuejs.org/guide/cli-service.html#vue-cli-service-serve>.
 
 - Build a `.js` or `.vue` file in production mode with zero config:
 
diff --git a/tldr/vue-serve b/tldr/vue-serve
index 61635c57..e9c6b725 100644
--- a/tldr/vue-serve
+++ b/tldr/vue-serve
@@ -6,7 +6,7 @@ source: https://github.com/tldr-pages/tldr.git
 # vue serve
 
 > A subcommand provided by `@vue/cli` and `@vue/cli-service-global` that enables quick prototyping.
-> More information: <https://cli.vuejs.org/guide/prototyping.html>.
+> More information: <https://cli.vuejs.org/guide/cli-service.html#vue-cli-service-serve>.
 
 - Serve a `.js` or `.vue` file in development mode with zero config:
 
diff --git a/tldr/{ b/tldr/{
index 60ed4f86..104d6048 100644
--- a/tldr/{
+++ b/tldr/{
@@ -36,6 +36,6 @@ source: https://github.com/tldr-pages/tldr.git
 
 `echo ${!variable}`
 
-- Capitalize all the characters:
+- Group command output together:
 
-`echo ${variable^^}`
+`{ {{command1; command2; ...}} } | {{another_command}}`