Skip to content

Commit

Permalink
Merge branch 'main' into add-sslstrip
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmychang851129 committed Apr 29, 2024
2 parents 1576f53 + dfc47a0 commit 5c50299
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 5 deletions.
6 changes: 4 additions & 2 deletions MAINTAINERS.md
Expand Up @@ -142,8 +142,6 @@ An automated list can be found [here](https://github.com/orgs/tldr-pages/people)
[21 June 2021](https://github.com/tldr-pages/tldr/issues/6149) — present
- **Juri ([@gutjuri](https://github.com/gutjuri))**:
[24 October 2023](https://github.com/tldr-pages/tldr/issues/11201) — present
- **Sebastiaan Speck ([@sebastiaanspeck](https://github.com/sebastiaanspeck))**:
[24 October 2023](https://github.com/tldr-pages/tldr/issues/11202) — present
- **Isaac Vicente ([@isaacvicente](https://github.com/isaacvicente))**:
[29 December 2023](https://github.com/tldr-pages/tldr/issues/11918) — present
- **Vitor Henrique ([@vitorhcl](https://github.com/vitorhcl))**:
Expand Down Expand Up @@ -182,6 +180,8 @@ An automated list can be found [here](https://github.com/orgs/tldr-pages/people)
[18 March 2021](https://github.com/tldr-pages/tldr/issues/5473)[15 November 2023](https://github.com/tldr-pages/tldr/issues/11509)
- Lena ([@acuteenvy](https://github.com/acuteenvy)):
[21 June 2023](https://github.com/tldr-pages/tldr/issues/10406)[27 December 2023](https://github.com/tldr-pages/tldr/issues/11839)
- Sebastiaan Speck ([@sebastiaanspeck](https://github.com/sebastiaanspeck)):
[24 October 2023](https://github.com/tldr-pages/tldr/issues/11202)[28 April 2024](https://github.com/tldr-pages/tldr/issues/12687)

## Organization owners

Expand Down Expand Up @@ -212,6 +212,8 @@ An automated list can be found [here](https://github.com/orgs/tldr-pages/people)
[7 July 2023](https://github.com/tldr-pages/tldr/issues/10054) — present
- **Lena ([@acuteenvy](https://github.com/acuteenvy))**:
[27 December 2023](https://github.com/tldr-pages/tldr/issues/11839) — present
- **Sebastiaan Speck ([@sebastiaanspeck](https://github.com/sebastiaanspeck))**:
[28 April 2024](https://github.com/tldr-pages/tldr/issues/12687) - 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)):
Expand Down
10 changes: 10 additions & 0 deletions contributing-guides/style-guide.md
Expand Up @@ -602,3 +602,13 @@ For example, use `Lista os arquivos` instead of `Listar os arquivos`, `Listando
```md
- Crea un archivo en un directorio:
```

- Preferably, use the word `identificador` instead of `id` in the placeholders of command examples. For example:

```md
{{identificador_de_usuario}}
```

*Writing prepositions is optional*

However, if the line of a command example exceeds the [maximum length](https://github.com/tldr-pages/tldr/blob/main/.markdownlint.json#L5), choose the word `identificador` or `id` and use it across all placeholders in the page.
29 changes: 29 additions & 0 deletions pages.es/windows/ospp.vbs.md
@@ -0,0 +1,29 @@
# ospp.vbs

> Instala, activa y administra versiones con licencia por volumen de productos Microsoft Office.
> Nota: este comando puede anular, desactivar y/o eliminar tu volumen actual de versiones de productos Office con licencia, así que procede con cautela.
> Más información: <https://learn.microsoft.com/deployoffice/vlactivation/tools-to-manage-volume-activation-of-office>.
- Instala una clave de producto (Nota: sustituye a la clave existente):

`cscript ospp.vbs /inpkey:{{clave_producto}}`

- Desinstala una clave de producto instalada con los cinco últimos dígitos de la clave de producto:

`cscript ospp.vbs /unpkey:{{clave_producto}}`

- Establece un nombre de host KMS:

`cscript ospp.vbs /sethst:{{ip|nombre_host}}`

- Establece un puerto KMS:

`cscript ospp.vbs /setprt:{{puerto}}`

- Activa las claves de producto de Office instaladas:

`cscript ospp.vbs /act`

- Muestra la información de licencia de las claves de producto instaladas:

`cscript ospp.vbs /dstatus`
4 changes: 4 additions & 0 deletions pages/common/du.md
Expand Up @@ -26,3 +26,7 @@
- List the human-readable size of all `.jpg` files in subdirectories of the current directory, and show a cumulative total at the end:

`du -ch {{*/*.jpg}}`

- List all files and directories (including hidden ones) above a certain [t]hreshold size (useful for investigating what is actually taking up the space):

`du --all --human-readable --threshold {{1G|1024M|1048576K}} .[^.]* *`
9 changes: 7 additions & 2 deletions pages/common/type.md
@@ -1,16 +1,21 @@
# type

> Display the type of command the shell will execute.
> Note: all examples are not POSIX compliant.
> More information: <https://manned.org/type>.
- Display the type of a command:

`type {{command}}`

- Display all locations containing the specified executable:
- Display all locations containing the specified executable (works only in Bash/fish/Zsh shells):

`type -a {{command}}`

- Display the name of the disk file that would be executed:
- Display the name of the disk file that would be executed (works only in Bash/fish/Zsh shells):

`type -p {{command}}`

- Display the type of a specific command, alias/keyword/function/builtin/file (works only in Bash/fish shells):

`type -t {{command}}`
2 changes: 1 addition & 1 deletion pages/linux/id3v2.md
Expand Up @@ -9,7 +9,7 @@

- List all tags of specific files:

`id3v2 --list-tags {{path/to/file1 path/to/file2 ...}}`
`id3v2 --list {{path/to/file1 path/to/file2 ...}}`

- Delete all `id3v2` or `id3v1` tags of specific files:

Expand Down
16 changes: 16 additions & 0 deletions pages/linux/ntpd.md
@@ -0,0 +1,16 @@
# ntpd

> The official NTP (Network Time Protocol) daemon to synchronize the system clock to remote time servers or local reference clocks.
> More information: <https://manned.org/ntpd>.
- Start the daemon:

`sudo ntpd`

- Synchronize system time with remote servers a single time (quit after synchronizing):

`sudo ntpd --quit`

- Synchronize a single time allowing "Big" adjustments:

`sudo ntpd --panicgate --quit`

0 comments on commit 5c50299

Please sign in to comment.