Merge branch 'main' into old2

2025-04-29 23:24:55 +02:00 · 2025-04-26 18:58:22 +03:00 · 2025-04-26 18:58:22 +03:00 · 007b03e538
commit 007b03e538
parent 2b41285236 298b72bce5
117 changed files with 154 additions and 141 deletions
--- a/pages.ca/common/i3.md
+++ b/pages.ca/common/i3.md
--- a/pages.es/common/i3.md
+++ b/pages.es/common/i3.md
--- a/pages.it/common/i3.md
+++ b/pages.it/common/i3.md
--- a/pages.ko/common/i3.md
+++ b/pages.ko/common/i3.md
--- a/pages.zh/common/i3.md
+++ b/pages.zh/common/i3.md
--- a/pages/common/i3.md
+++ b/pages/common/i3.md
@ -0,0 +1,32 @@
 # 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>`
--- a/pages/common/sway.md
+++ b/pages/common/sway.md
@ -0,0 +1,13 @@
 # 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`
--- a/pages/linux/i3.md
+++ b/pages/linux/i3.md
@ -1,32 +0,0 @@
 # i3
 > A dynamic tiling window manager.
 > 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>`
 - Create a new workspace:
 `<Super Shift {{Number}}>`
 - Switch to a workspace:
 `<Super {{Number}}>`
 - Open new window horizontally:
 `<Super h>`
 - Open new window vertically:
 `<Super v>`
 - Open application (type out application name after executing command):
 `<Super d>`
--- a/pages/osx/g[.md
+++ b/pages/osx/g[.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux [`
+`tldr [`
--- a/pages/osx/gb2sum.md
+++ b/pages/osx/gb2sum.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux b2sum`
+`tldr b2sum`
--- a/pages/osx/gbase32.md
+++ b/pages/osx/gbase32.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux base32`
+`tldr base32`
--- a/pages/osx/gbase64.md
+++ b/pages/osx/gbase64.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux base64`
+`tldr {{[-p|--platform]}} common base64`
--- a/pages/osx/gbasename.md
+++ b/pages/osx/gbasename.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux basename`
+`tldr basename`
--- a/pages/osx/gbasenc.md
+++ b/pages/osx/gbasenc.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux basenc`
+`tldr basenc`
--- a/pages/osx/gchgrp.md
+++ b/pages/osx/gchgrp.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux chgrp`
+`tldr chgrp`
--- a/pages/osx/gchmod.md
+++ b/pages/osx/gchmod.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux chmod`
+`tldr chmod`
--- a/pages/osx/gchown.md
+++ b/pages/osx/gchown.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux chown`
+`tldr chown`
--- a/pages/osx/gchroot.md
+++ b/pages/osx/gchroot.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux chroot`
+`tldr chroot`
--- a/pages/osx/gcksum.md
+++ b/pages/osx/gcksum.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux cksum`
+`tldr cksum`
--- a/pages/osx/gcomm.md
+++ b/pages/osx/gcomm.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux comm`
+`tldr comm`
--- a/pages/osx/gcp.md
+++ b/pages/osx/gcp.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux cp`
+`tldr cp`
--- a/pages/osx/gcut.md
+++ b/pages/osx/gcut.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux cut`
+`tldr {{[-p|--platform]}} common cut`
--- a/pages/osx/gdate.md
+++ b/pages/osx/gdate.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux date`
+`tldr {{[-p|--platform]}} common date`
--- a/pages/osx/gdircolors.md
+++ b/pages/osx/gdircolors.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux dircolors`
+`tldr dircolors`
--- a/pages/osx/gdirname.md
+++ b/pages/osx/gdirname.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux dirname`
+`tldr dirname`
--- a/pages/osx/gecho.md
+++ b/pages/osx/gecho.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux echo`
+`tldr echo`
--- a/pages/osx/ged.md
+++ b/pages/osx/ged.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux ed`
+`tldr ed`
--- a/pages/osx/gegrep.md
+++ b/pages/osx/gegrep.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux egrep`
+`tldr egrep`
--- a/pages/osx/genv.md
+++ b/pages/osx/genv.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux env`
+`tldr env`
--- a/pages/osx/gexpand.md
+++ b/pages/osx/gexpand.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux expand`
+`tldr expand`
--- a/pages/osx/gexpr.md
+++ b/pages/osx/gexpr.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux expr`
+`tldr expr`
--- a/pages/osx/gfactor.md
+++ b/pages/osx/gfactor.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux factor`
+`tldr factor`
--- a/pages/osx/gfalse.md
+++ b/pages/osx/gfalse.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux false`
+`tldr false`
--- a/pages/osx/gfgrep.md
+++ b/pages/osx/gfgrep.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux fgrep`
+`tldr fgrep`
--- a/pages/osx/gfind.md
+++ b/pages/osx/gfind.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux find`
+`tldr find`
--- a/pages/osx/gfmt.md
+++ b/pages/osx/gfmt.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux fmt`
+`tldr fmt`
--- a/pages/osx/gftp.md
+++ b/pages/osx/gftp.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux ftp`
+`tldr ftp`
--- a/pages/osx/ggrep.md
+++ b/pages/osx/ggrep.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux grep`
+`tldr grep`
--- a/pages/osx/ggroups.md
+++ b/pages/osx/ggroups.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux groups`
+`tldr groups`
--- a/pages/osx/ghostid.md
+++ b/pages/osx/ghostid.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux hostid`
+`tldr hostid`
--- a/pages/osx/ghostname.md
+++ b/pages/osx/ghostname.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux hostname`
+`tldr hostname`
--- a/pages/osx/gid.md
+++ b/pages/osx/gid.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux id`
+`tldr id`
--- a/pages/osx/gifconfig.md
+++ b/pages/osx/gifconfig.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux ifconfig`
+`tldr ifconfig`
--- a/pages/osx/gindent.md
+++ b/pages/osx/gindent.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux indent`
+`tldr {{[-p|--platform]}} common indent`
--- a/pages/osx/ginstall.md
+++ b/pages/osx/ginstall.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux install`
+`tldr install`
--- a/pages/osx/gjoin.md
+++ b/pages/osx/gjoin.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux join`
+`tldr join`
--- a/pages/osx/glink.md
+++ b/pages/osx/glink.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux link`
+`tldr link`
--- a/pages/osx/gln.md
+++ b/pages/osx/gln.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux ln`
+`tldr ln`
--- a/pages/osx/glogname.md
+++ b/pages/osx/glogname.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux logname`
+`tldr logname`
--- a/pages/osx/gls.md
+++ b/pages/osx/gls.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux ls`
+`tldr ls`
--- a/pages/osx/gmake.md
+++ b/pages/osx/gmake.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux make`
+`tldr make`
--- a/pages/osx/gmd5sum.md
+++ b/pages/osx/gmd5sum.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux md5sum`
+`tldr md5sum`
--- a/pages/osx/gmkdir.md
+++ b/pages/osx/gmkdir.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux mkdir`
+`tldr mkdir`
--- a/pages/osx/gmkfifo.md
+++ b/pages/osx/gmkfifo.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux mkfifo`
+`tldr mkfifo`
--- a/pages/osx/gmv.md
+++ b/pages/osx/gmv.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux mv`
+`tldr mv`
--- a/pages/osx/gnice.md
+++ b/pages/osx/gnice.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux nice`
+`tldr nice`
--- a/pages/osx/gnohup.md
+++ b/pages/osx/gnohup.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux nohup`
+`tldr nohup`
--- a/pages/osx/gnproc.md
+++ b/pages/osx/gnproc.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux nproc`
+`tldr nproc`
--- a/pages/osx/god.md
+++ b/pages/osx/god.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux od`
+`tldr od`
--- a/pages/osx/gpaste.md
+++ b/pages/osx/gpaste.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux paste`
+`tldr paste`
--- a/pages/osx/gpathchk.md
+++ b/pages/osx/gpathchk.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux pathchk`
+`tldr pathchk`
--- a/pages/osx/gping.md
+++ b/pages/osx/gping.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux ping`
+`tldr {{[-p|--platform]}} common ping`
--- a/pages/osx/gping6.md
+++ b/pages/osx/gping6.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux ping6`
+`tldr ping6`
--- a/pages/osx/gpinky.md
+++ b/pages/osx/gpinky.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux pinky`
+`tldr pinky`
--- a/pages/osx/gpr.md
+++ b/pages/osx/gpr.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux pr`
+`tldr pr`
--- a/pages/osx/gprintenv.md
+++ b/pages/osx/gprintenv.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux printenv`
+`tldr printenv`
--- a/pages/osx/gprintf.md
+++ b/pages/osx/gprintf.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux printf`
+`tldr printf`
--- a/pages/osx/gpwd.md
+++ b/pages/osx/gpwd.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux pwd`
+`tldr pwd`
--- a/pages/osx/greadlink.md
+++ b/pages/osx/greadlink.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux readlink`
+`tldr readlink`
--- a/pages/osx/grealpath.md
+++ b/pages/osx/grealpath.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux realpath`
+`tldr realpath`
--- a/pages/osx/grm.md
+++ b/pages/osx/grm.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux rm`
+`tldr rm`
--- a/pages/osx/grmdir.md
+++ b/pages/osx/grmdir.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux rmdir`
+`tldr rmdir`
--- a/pages/osx/gseq.md
+++ b/pages/osx/gseq.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux seq`
+`tldr seq`
--- a/pages/osx/gsha1sum.md
+++ b/pages/osx/gsha1sum.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux sha1sum`
+`tldr sha1sum`
--- a/pages/osx/gsha224sum.md
+++ b/pages/osx/gsha224sum.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux sha224sum`
+`tldr sha224sum`
--- a/pages/osx/gsha256sum.md
+++ b/pages/osx/gsha256sum.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux sha256sum`
+`tldr sha256sum`
--- a/pages/osx/gsha384sum.md
+++ b/pages/osx/gsha384sum.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux sha384sum`
+`tldr sha384sum`
--- a/pages/osx/gsha512sum.md
+++ b/pages/osx/gsha512sum.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux sha512sum`
+`tldr sha512sum`
--- a/pages/osx/gshred.md
+++ b/pages/osx/gshred.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux shred`
+`tldr shred`
--- a/pages/osx/gshuf.md
+++ b/pages/osx/gshuf.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux shuf`
+`tldr {{[-p|--platform]}} coomon shuf`
--- a/pages/osx/gsort.md
+++ b/pages/osx/gsort.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux sort`
+`tldr sort`
--- a/pages/osx/gsplit.md
+++ b/pages/osx/gsplit.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux split`
+`tldr {{[-p|--platform]}} common split`
--- a/pages/osx/gstat.md
+++ b/pages/osx/gstat.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux stat`
+`tldr {{[-p|--platform]}} common stat`
--- a/pages/osx/gstdbuf.md
+++ b/pages/osx/gstdbuf.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux stdbuf`
+`tldr stdbuf`
--- a/pages/osx/gstty.md
+++ b/pages/osx/gstty.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux stty`
+`tldr stty`
--- a/pages/osx/gsum.md
+++ b/pages/osx/gsum.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux sum`
+`tldr sum`
--- a/pages/osx/gsync.md
+++ b/pages/osx/gsync.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux sync`
+`tldr sync`
--- a/pages/osx/gtac.md
+++ b/pages/osx/gtac.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux tac`
+`tldr tac`
--- a/pages/osx/gtail.md
+++ b/pages/osx/gtail.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux tail`
+`tldr {{[-p|--platform]}} common tail`
--- a/pages/osx/gtar.md
+++ b/pages/osx/gtar.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux tar`
+`tldr tar`
--- a/pages/osx/gtee.md
+++ b/pages/osx/gtee.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux tee`
+`tldr tee`
--- a/pages/osx/gtelnet.md
+++ b/pages/osx/gtelnet.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux telnet`
+`tldr telnet`
--- a/pages/osx/gtest.md
+++ b/pages/osx/gtest.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux test`
+`tldr test`
--- a/pages/osx/gtime.md
+++ b/pages/osx/gtime.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux time`
+`tldr time`
--- a/pages/osx/gtimeout.md
+++ b/pages/osx/gtimeout.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux timeout`
+`tldr timeout`
--- a/pages/osx/gtouch.md
+++ b/pages/osx/gtouch.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux touch`
+`tldr touch`
--- a/pages/osx/gtr.md
+++ b/pages/osx/gtr.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux tr`
+`tldr tr`
--- a/pages/osx/gtraceroute.md
+++ b/pages/osx/gtraceroute.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux traceroute`
+`tldr traceroute`
--- a/pages/osx/gtrue.md
+++ b/pages/osx/gtrue.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux true`
+`tldr true`
--- a/pages/osx/gtruncate.md
+++ b/pages/osx/gtruncate.md
@ -4,4 +4,4 @@
 - View documentation for the original command:
-`tldr {{[-p|--platform]}} linux truncate`
+`tldr truncate`
--- a/Show more
+++ b/Show more
`@ -4,4 +4,4 @@`

	`- View documentation for the original command:`	`- View documentation for the original command:`

	`tldr {{[-p\|--platform]}} linux [`	`tldr [`