2014-03-04 12:39:34 +00:00
|
|
|
# Contributing
|
|
|
|
|
2016-10-02 11:08:44 +01:00
|
|
|
[![Gitter chat][gitter-image]][gitter-url]
|
|
|
|
[![Merged PRs][prs-merged-image]][prs-merged-url]
|
|
|
|
[![Issue stats][issuestats-image]][issuestats-url]
|
|
|
|
[![GitHub contributors][contributors-image]][contributors-url]
|
|
|
|
[![CLA assistant][cla-assistant-image]][cla-assistant-url]
|
|
|
|
[![license][license-image]][license-url]
|
|
|
|
|
|
|
|
[gitter-url]: https://gitter.im/tldr-pages/tldr
|
|
|
|
[gitter-image]: https://badges.gitter.im/tldr-pages/tldr.svg
|
|
|
|
[prs-merged-url]: https://github.com/tldr-pages/tldr/pulls?q=is:pr+is:merged
|
|
|
|
[prs-merged-image]: https://img.shields.io/github/issues-pr-closed-raw/tldr-pages/tldr.svg?label=merged+PRs
|
|
|
|
[issuestats-url]: http://isitmaintained.com/project/tldr-pages/tldr
|
|
|
|
[issuestats-image]: http://isitmaintained.com/badge/resolution/tldr-pages/tldr.svg
|
|
|
|
[contributors-url]: https://github.com/tldr-pages/tldr/graphs/contributors
|
|
|
|
[contributors-image]: https://img.shields.io/github/contributors/tldr-pages/tldr.svg
|
|
|
|
[cla-assistant-url]: https://cla-assistant.io/tldr-pages/tldr
|
|
|
|
[cla-assistant-image]: https://cla-assistant.io/readme/badge/tldr-pages/tldr
|
|
|
|
[license-url]: https://github.com/tldr-pages/tldr/blob/master/LICENSE.md
|
|
|
|
[license-image]: https://img.shields.io/github/license/tldr-pages/tldr.svg
|
|
|
|
|
2016-07-26 10:32:22 +01:00
|
|
|
Contributions are most welcome! All `tldr` pages are stored in Markdown right here on GitHub.
|
|
|
|
Just open an issue or send a pull request and we'll incorporate it as soon as possible.
|
2016-09-24 18:03:50 +01:00
|
|
|
To get started, sign the [Contributor License Agreement](https://cla-assistant.io/tldr-pages/tldr).
|
2014-03-04 12:39:34 +00:00
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
*Note*: when submitting a new command, don't forget to check if there's already a pull request in progress for it.
|
2015-04-12 20:54:27 +01:00
|
|
|
|
2014-03-04 12:39:34 +00:00
|
|
|
## Guidelines
|
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
The basic format of a `tldr` page is a set of concrete usage examples.
|
2016-01-07 19:53:19 +00:00
|
|
|
Here are a few guidelines to get started:
|
2014-03-04 12:39:34 +00:00
|
|
|
|
2016-11-19 17:16:19 +00:00
|
|
|
1. Try to keep pages at around 5 examples. Pages can be longer if needed, but don't exceed 8 examples.
|
|
|
|
Remember, it's OK if the page doesn't cover everything; that's what `man` is for.
|
2016-10-14 19:19:37 +01:00
|
|
|
2. When in doubt, keep new command-line users in mind. Err on the side of clarity rather than terseness.
|
|
|
|
For example, commands that require `sudo` should include it directly in the examples.
|
2016-07-26 10:32:22 +01:00
|
|
|
3. Try to incorporate the spelled-out version of single-letter options in the example's description.
|
|
|
|
The goal is to allow people to *understand* the syntax of the commands, not just *memorize* it.
|
2016-10-02 11:03:37 +01:00
|
|
|
4. Introduce options gradually, starting with the simplest command invocations,
|
|
|
|
and using more complex examples progressively.
|
2016-11-20 11:35:49 +00:00
|
|
|
5. Focus on details specific to the command, and avoid explaining general UNIX concepts that could apply to any command
|
2016-07-26 10:32:22 +01:00
|
|
|
(ex: relative/absolute paths, glob patterns/wildcards, special character escaping...).
|
2014-03-04 12:39:34 +00:00
|
|
|
|
2016-01-07 19:53:19 +00:00
|
|
|
The best way to be consistent is to have a look at a few existing pages :).
|
2014-03-04 12:39:34 +00:00
|
|
|
|
|
|
|
## Markdown format
|
|
|
|
|
2015-08-25 04:07:19 +01:00
|
|
|
The format of each page should match the following:
|
2014-03-04 12:39:34 +00:00
|
|
|
|
|
|
|
```
|
|
|
|
# command-name
|
|
|
|
|
2016-01-07 19:53:19 +00:00
|
|
|
> Short, snappy description.
|
2016-01-08 02:01:59 +00:00
|
|
|
> Preferably one line; two are acceptable if necessary.
|
2014-03-04 12:39:34 +00:00
|
|
|
|
2016-01-07 19:53:19 +00:00
|
|
|
- Example description:
|
2014-03-04 12:39:34 +00:00
|
|
|
|
2015-08-25 01:16:26 +01:00
|
|
|
`command -opt1 -opt2 -arg1 {{arg_value}}`
|
2014-03-04 12:39:34 +00:00
|
|
|
|
2016-01-07 19:53:19 +00:00
|
|
|
- Example description:
|
2014-03-04 12:39:34 +00:00
|
|
|
|
2015-08-25 01:16:26 +01:00
|
|
|
`command -opt1 -opt2`
|
2014-03-04 12:39:34 +00:00
|
|
|
```
|
|
|
|
|
2016-10-02 11:03:37 +01:00
|
|
|
There actually is a linter/formatter that enforces the format above.
|
2016-07-24 08:05:21 +01:00
|
|
|
It is run automatically on every pull request,
|
|
|
|
but you may install it to test your contributions locally before submitting them:
|
2016-01-21 23:35:37 +00:00
|
|
|
|
|
|
|
```
|
2016-07-24 08:05:21 +01:00
|
|
|
npm install tldr-lint
|
|
|
|
tldrl -f {{page.md}}
|
2016-01-21 23:35:37 +00:00
|
|
|
```
|
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
For other ways to use `tldrl`, such as linting an entire directory, check out (what else!)
|
|
|
|
[`tldr tldrl`](https://github.com/tldr-pages/tldr/blob/master/pages/common/tldrl.md)
|
|
|
|
|
|
|
|
### Token syntax
|
2016-10-02 11:03:37 +01:00
|
|
|
|
|
|
|
User-provided values should use the `{{token}}` syntax in order to allow `tldr` clients to highlight them.
|
|
|
|
Use [`snake_case`](https://en.wikipedia.org/wiki/Snake_case) for multi-word tokens.
|
2015-08-25 01:16:26 +01:00
|
|
|
|
2016-08-12 08:45:35 +01:00
|
|
|
Keep the following guidelines in mind when choosing token names:
|
|
|
|
|
2016-11-20 11:35:49 +00:00
|
|
|
1. Use short but descriptive values for the tokens,
|
|
|
|
ex. `{{source_file}}` or `{{wallet.txt}}`.
|
|
|
|
|
|
|
|
2. If the example is clearer with an actual value rather than a generic placeholder, use the actual value.
|
|
|
|
For example, use `iostat {{2}}` rather than `iostat {{interval_in_secs}}`.
|
|
|
|
|
|
|
|
3. For any reference to paths to files or folders, use the format `{{path/to/<placeholder>}}`.
|
|
|
|
For example, `ln -s {{path/to/file}} {{path/to/symlink}}`.
|
|
|
|
In case of a possible reference both to a file or a folder, use `{{path/to/file_or_folder}}`
|
|
|
|
|
|
|
|
4. Follow the `{{path/to/<placeholder>}}` convention when there is a path-related command,
|
|
|
|
except when the file location is implicit.
|
2016-08-12 08:45:35 +01:00
|
|
|
|
2016-11-20 11:35:49 +00:00
|
|
|
5. If a command expects the file to have a particular extension, use it.
|
|
|
|
For example, `unrar x {{compressed.rar}}`.
|
|
|
|
In case a generic extension is needed, use `{{.ext}}`, but **only** if an extension is required.
|
|
|
|
For instance, in find.md's example "Find files by extension" (`find {{root_path}} -name '{{*.ext}}'`)
|
|
|
|
using `{{*.ext}}` explains the command without being unnecessarily specific;
|
|
|
|
But in a command like `wc -l {{file}}`, using `{{file}}` (without extension) is sufficient.
|
2016-08-12 08:45:35 +01:00
|
|
|
|
2016-01-07 19:53:19 +00:00
|
|
|
|
2016-11-20 11:35:49 +00:00
|
|
|
These are all guidelines, not strict rules.
|
|
|
|
In general, tokens should make it as intuitive as possible
|
|
|
|
to figure out how to use the command and fill it in with values.
|
|
|
|
Use proper judgement, keeping simplicity and user-friendliness as the top priority.
|
2016-07-26 10:32:22 +01:00
|
|
|
|
2015-12-29 00:36:49 +00:00
|
|
|
## Submitting a pull request
|
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
For submitting changes, you can use whatever workflow you're more comfortable with.
|
2016-07-26 10:32:22 +01:00
|
|
|
|
|
|
|
### Using Github's web interface
|
|
|
|
|
|
|
|
The easiest way to submit a change is to just edit the page directly on the Github interface.
|
2016-07-24 08:05:21 +01:00
|
|
|
Check out the step-by-step instructions (with screenshots) on
|
|
|
|
[Github Help](https://help.github.com/articles/editing-files-in-another-user-s-repository/).
|
2015-12-29 00:36:49 +00:00
|
|
|
|
2016-07-26 10:32:22 +01:00
|
|
|
### Using the command line
|
2015-12-29 00:36:49 +00:00
|
|
|
|
2016-07-26 10:32:22 +01:00
|
|
|
Alternatively, you can do most of the process using the command line:
|
2015-12-29 00:36:49 +00:00
|
|
|
|
2016-07-26 10:32:22 +01:00
|
|
|
- fork the repository on the github web interface
|
2015-12-29 00:36:49 +00:00
|
|
|
|
2016-07-26 10:32:22 +01:00
|
|
|
- clone your fork locally:
|
|
|
|
`git clone https://github.com/{{your_username}}/tldr.git && cd tldr`
|
2015-12-29 00:36:49 +00:00
|
|
|
|
2016-07-26 10:32:22 +01:00
|
|
|
- create a feature branch, e.g. named after the command you plan to edit:
|
|
|
|
`git checkout -b {{branch_name}}`
|
2015-12-29 00:36:49 +00:00
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
- make your changes (edit existing files or create a new one)
|
2016-01-19 13:28:43 +00:00
|
|
|
|
2016-07-26 10:32:22 +01:00
|
|
|
- commit the changes:
|
|
|
|
`git commit --all -m "{{commit_message}}"`
|
2016-08-12 08:45:35 +01:00
|
|
|
|
2016-07-26 10:32:22 +01:00
|
|
|
- push to your fork:
|
|
|
|
`git push`
|
2016-08-12 08:45:35 +01:00
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
- go to the github page for your fork and click the green pull request button.
|
2015-12-29 00:36:49 +00:00
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
Please send only related changes in the same pull request.
|
|
|
|
Typically a pull request will include changes in a single file.
|
2016-01-24 22:37:37 +00:00
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
### Commit message
|
2015-12-29 00:36:49 +00:00
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
For the commit message, use the following format:
|
2016-01-03 10:01:16 +00:00
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
<command>: type of change
|
2015-12-29 00:36:49 +00:00
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
Examples:
|
|
|
|
- `ls: add page`
|
|
|
|
- `cat: fix typo`
|
|
|
|
- `git-push: add --force example`
|
2015-12-29 00:36:49 +00:00
|
|
|
|
|
|
|
## Licensing
|
|
|
|
|
2016-07-24 08:05:21 +01:00
|
|
|
`tldr` is licensed under the [MIT license](https://github.com/tldr-pages/tldr/blob/master/LICENSE.md).
|
2014-03-04 12:39:34 +00:00
|
|
|
|
2016-10-02 11:03:37 +01:00
|
|
|
Any contributions to this project are governed by the
|
|
|
|
[Contributor License Agreement](https://cla-assistant.io/tldr-pages/tldr).
|