Merge branch 'main' into kant-patch-3

Author: sebastiaanspeck

.github/workflows/codespell.yml

@@ -1,4 +1,6 @@
 name: Codespell
+permissions:
+  contents: read
 
 on: 
   pull_request:

MAINTAINERS.md

@@ -72,8 +72,6 @@ If you are an owner of the organization, you can see an automated list [here](ht
   [16 August 2024](https://github.com/tldr-pages/tldr/issues/13450) — present
 - **jxu ([@jxu](https://github.com/jxu))**:
   [18 August 2024](https://github.com/tldr-pages/tldr/issues/13451) — present
-- **Nelson Figueroa ([@nelsonfigueroa](https://github.com/nelsonfigueroa)):**
-  [21 September 2024](https://github.com/tldr-pages/tldr/issues/13781) — present
 - **Iván Hernández Cazorla ([@ivanhercaz](https://github.com/ivanhercaz))**:
   [24 December 2019](https://github.com/tldr-pages/tldr/issues/3690) — [5 January 2020](https://github.com/tldr-pages/tldr/issues/3736), [22 September 2024](https://github.com/tldr-pages/tldr/issues/5932) — present
 - **Yi Liu ([@LiLittleCat](https://github.com/LiLittleCat))**:
@@ -92,8 +90,8 @@ If you are an owner of the organization, you can see an automated list [here](ht
   [14 January 2025](https://github.com/tldr-pages/tldr/issues/15514) — present
 - **Amine LOUHICHI ([@aminelch](https://github.com/aminelch))**:
   [08 April 2025](https://github.com/tldr-pages/tldr/issues/16126) — present
-- **Dylan McGivern ([@dmmqz](https://github.com/dmmqz))**:
-  [30 May 2025](https://github.com/tldr-pages/tldr/issues/16671) — present
+- **Kristopher Sandoval ([@KristopherLeads](https://github.com/KristopherLeads))**:
+  [29 June 2025](https://github.com/tldr-pages/tldr/issues/17024) — present
 - Owen Voke ([@owenvoke](https://github.com/owenvoke))
   [11 January 2018](https://github.com/tldr-pages/tldr/issues/1885) — [26 August 2018](https://github.com/tldr-pages/tldr/issues/2258)
 - Marco Bonelli ([@mebeim](https://github.com/mebeim)):
@@ -152,6 +150,10 @@ If you are an owner of the organization, you can see an automated list [here](ht
   [03 October 2024](https://github.com/tldr-pages/tldr/issues/13946) — [23 October 2024](https://github.com/tldr-pages/tldr/issues/14343)
 - Machiavelli ([@MachiavelliII](https://github.com/MachiavelliII)):
   [21 January 2025](https://github.com/tldr-pages/tldr/issues/15564) — [27 Mar 2025](https://github.com/tldr-pages/tldr/issues/16036)
+- Nelson Figueroa ([@nelsonfigueroa](https://github.com/nelsonfigueroa)):
+  [21 September 2024](https://github.com/tldr-pages/tldr/issues/13781) — [29 June 2025](https://github.com/tldr-pages/tldr/issues/17025)
+- Dylan McGivern ([@dmmqz](https://github.com/dmmqz)):
+  [30 May 2025](https://github.com/tldr-pages/tldr/issues/16671) — [30 June 2025](https://github.com/tldr-pages/tldr/issues/17026)
 
 ## Organization members
 
@@ -178,14 +180,14 @@ An automated list can be found [here](https://github.com/orgs/tldr-pages/people)
   [3 May 2024](https://github.com/tldr-pages/tldr/issues/12717) — present
 - **Darío Hereñú ([@kant](https://github.com/kant))**:
   [3 May 2024](https://github.com/tldr-pages/tldr/issues/12718) — present
-- **Wiktor Perskawiec ([@spageektti](https://github.com/spageektti))**:
-  [1 June 2024](https://github.com/tldr-pages/tldr/issues/12869) — present
-- **Managor ([@Managor](https://github.com/Managor))**:
-  [3 October 2024](https://github.com/tldr-pages/tldr/issues/13956) — present
 - **Renie ([@renie](https://github.com/renie))**:
   [23 October 2024](https://github.com/tldr-pages/tldr/issues/14343) — present
 - **Machiavelli ([@MachiavelliII](https://github.com/MachiavelliII))**:
   [27 Mar 2025](https://github.com/tldr-pages/tldr/issues/16036) — present
+- **Nelson Figueroa ([@nelsonfigueroa](https://github.com/nelsonfigueroa))**:
+  [29 June 2025](https://github.com/tldr-pages/tldr/issues/17025) — present
+- **Dylan McGivern ([@dmmqz](https://github.com/dmmqz))**:
+  [30 June 2025](https://github.com/tldr-pages/tldr/issues/17026) — present
 - Owen Voke ([@owenvoke](https://github.com/owenvoke))
   [26 August 2018](https://github.com/tldr-pages/tldr/issues/2258) — [8 May 2019](https://github.com/tldr-pages/tldr/issues/2989)
 - Marco Bonelli ([@mebeim](https://github.com/mebeim)):
@@ -222,6 +224,10 @@ An automated list can be found [here](https://github.com/orgs/tldr-pages/people)
   [24 October 2023](https://github.com/tldr-pages/tldr/issues/11201) — [29 April 2024](https://github.com/tldr-pages/tldr/issues/12686)
 - Iván Hernández Cazorla ([@ivanhercaz](https://github.com/ivanhercaz)):
   [5 January 2020](https://github.com/tldr-pages/tldr/issues/3736) — [22 September 2024](https://github.com/tldr-pages/tldr/issues/5932)
+- Wiktor Perskawiec ([@spageektti](https://github.com/spageektti)):
+  [1 June 2024](https://github.com/tldr-pages/tldr/issues/12869) — [29 June 2025](https://github.com/tldr-pages/tldr/issues/17028)
+- Managor ([@Managor](https://github.com/Managor)):
+  [3 October 2024](https://github.com/tldr-pages/tldr/issues/13956) — [29 June 2025](https://github.com/tldr-pages/tldr/issues/17029)
 
 ## Organization owners
 
@@ -254,6 +260,10 @@ An automated list can be found [here](https://github.com/orgs/tldr-pages/people)
   [28 April 2024](https://github.com/tldr-pages/tldr/issues/12687) — present
 - **Juri ([@gutjuri](https://github.com/gutjuri))**:
   [29 April 2024](https://github.com/tldr-pages/tldr/issues/12686) — present
+- **Wiktor Perskawiec ([@spageektti](https://github.com/spageektti))**:
+  [29 June 2025](https://github.com/tldr-pages/tldr/issues/17028) — present
+- **Managor ([@Managor](https://github.com/Managor))**:
+  [29 June 2025](https://github.com/tldr-pages/tldr/issues/17029) — present
 - Igor Shubovych ([@igorshubovych](https://github.com/igorshubovych)):
   until [18 January 2018](https://github.com/tldr-pages/tldr/issues/1878#issuecomment-358610454)
 - Ruben Vereecken ([@rubenvereecken](https://github.com/rubenvereecken)):

contributing-guides/style-guide.md

@@ -424,12 +424,13 @@ For example, `[d]ownload` in English may be translated into `[d]escargar` in Spa
 ### Option syntax
 
 - For user-friendliness, prefer **GNU-style long options** (like `--help` rather than `-h`). Make sure that the options are cross-platform compatible (intended to work the same across multiple platforms) for pages in the `common` directory.
-- If a command only supports short options or the short option greatly differs from the long option, attempt to document what the letter is short for with a [mnemonic](#short-option-mnemonics).
 - For letting the client decide whether to show long or short options in commands, use an option placeholder i.e. `{{[-o|--output]}}`.
+- If a command only supports short options or the short option greatly differs from the long option, attempt to document what the letter is short for with a [mnemonic](#short-option-mnemonics).
 - Prefer grouping flag options together when the program supports it (i.e. `{{[-it|--interactive --tty]}}` instead of `{{[-i|--interactive]}} {{[-t|--tty]}}`).
 - Prefer not grouping options that take in arguments (i.e. `{{[-it|--interactive --tty]}} {{[-w|--workdir]}} {{path/to/directory}}` instead of `{{[-itw|--interactive --tty --workdir]}} {{path/to/directory}}`)
 - Prefer using a space instead of the equals sign (`=`) to separate options from their arguments (i.e. use `--opt arg` instead of `--opt=arg`), unless the program does not support it.
 - Likewise prefer separating shortform options from their arguments with a space (i.e. use `-o arg` instead of `-oarg`), unless the program does not support it.
+- If a command only supports `-oarg` and `--opt=arg` the option placeholder should be written like this `{{[-o|--opt=]}}arg`. Keep in mind how the command would look if a client were to display only short or only long options.
 
 ### Placeholder syntax
 

contributing-guides/translation-templates/common-arguments.md

@@ -17,7 +17,7 @@ Only the left-alignment of the header gets lost and has to be re-added again (`|
 | da    | sti/til/fil           | sti/til/mappe            | sti/til/fil_eller_mappe              | pakke         | brugernavn         |
 | de    | pfad/zu/datei         | pfad/zu/verzeichnis      | pfad/zu/datei_oder_verzeichnis       | paket         | benutzername       |
 | es    | ruta/al/archivo       | ruta/al/directorio       | ruta/al/archivo_o_directorio         | paquete       | usuario            |
-| fi    | polku/tiedostoon      | polku/hakemistoon        | polku/tiedostoon_vai_hakemistoon     | paketti       | tunnus             |
+| fi    | polku/tiedostoon      | polku/hakemistoon        | polku/tiedostoon_tai_hakemistoon     | paketti       | tunnus             |
 | fr    | chemin/vers/fichier   | chemin/vers/dossier      | chemin/vers/fichier_ou_dossier       | paquet        | nom_d_utilisateur  |
 | hi    | फ़ाइल/का/पथ           | निर्देशिका/का/पथ         | फ़ाइल_या_निर्देशिका/का/पथ            | पैकेज         | उपयोगकर्ता_नाम     |
 | id    | jalan/menuju/berkas   | jalan/menuju/direktori   | jalan/menuju/berkas_atau_direktori   | paket         | nama_pengguna      |

contributing-guides/translation-templates/more-info-link.md

@@ -129,7 +129,7 @@ The templates can be changed when necessary, but if so, it needs to be updated h
 ### fi
 
 ```markdown
-> Lisätietoja: <https://example.com>.
+> Lisätietoa: <https://example.com>.
 ```
 
 ---

contributing-guides/translation-templates/subcommand-mention.md

@@ -128,7 +128,7 @@ Algunos subcomandos, como `example command`, tienen su propia documentación de
 ### fi
 
 ```markdown
-Joillakin alakomennoilla, kuten `example command`, on omat käyttöoppaansa.
+Joillakin alikomennoilla, kuten `example command`, on omat käyttöoppaansa.
 ```
 
 ---