Skip to content

Commit a66723d

Browse files
owenvokesbrl
authored andcommitted
docs: update references to 'main' branch
1 parent d33da35 commit a66723d

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

CLIENT-SPECIFICATION.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ tldr --platform osx bash
7676

7777
This section documents the directory structure that contains the pages themselves.
7878

79-
The master version of every page is stored inside (but not directly) the `pages` directory. Inside this directory, there is a folder for each platform - for example `windows`, `linux`, and the special `common` platform:
79+
The main version of every page is stored inside (but not directly) the `pages` directory. Inside this directory, there is a folder for each platform - for example `windows`, `linux`, and the special `common` platform:
8080

8181
- `pages/`
8282
- `common/`
@@ -98,7 +98,7 @@ Command name | Mapped name | Filename
9898

9999
### Translations
100100

101-
Other directories sit alongside the main `pages` directory, and contain translations of the master versions of every page - though pages MAY NOT have a translation available for a given language yet. Furthermore, a given language MAY NOT have a folder yet either. The format of these directories is `pages.<locale>`, where `<locale>` is a [POSIX Locale Name](https://www.gnu.org/software/gettext/manual/html_node/Locale-Names.html#Locale-Names) in the form of `<language>_<country>`, where:
101+
Other directories sit alongside the main `pages` directory, and contain translations of the main versions of every page - though pages MAY NOT have a translation available for a given language yet. Furthermore, a given language MAY NOT have a folder yet either. The format of these directories is `pages.<locale>`, where `<locale>` is a [POSIX Locale Name](https://www.gnu.org/software/gettext/manual/html_node/Locale-Names.html#Locale-Names) in the form of `<language>_<country>`, where:
102102

103103
- `<language>` is the shortest [ISO 639](https://en.wikipedia.org/wiki/ISO_639) language code for the chosen language (see [here](https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes) for a complete list).
104104
- `<country>` is the two-letter [ISO 3166-1](https://en.wikipedia.org/wiki/ISO_3166-1) country code for the chosen region (see [here](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) for a complete list).
@@ -186,7 +186,7 @@ Examples:
186186
unset |`it:cz` | `en`
187187
unset |unset | `en`
188188

189-
Regardless of the language determined through the environment, clients MUST always attempt to fallback to English if the page does not exist in the user preferred language. Clients MAY notify the user when a page in their preferred language cannot be found (optionally including a link to the [translations section of the contributing guide](https://github.com/tldr-pages/tldr/blob/master/CONTRIBUTING.md#translations)).
189+
Regardless of the language determined through the environment, clients MUST always attempt to fallback to English if the page does not exist in the user preferred language. Clients MAY notify the user when a page in their preferred language cannot be found (optionally including a link to the [translations section of the contributing guide](https://github.com/tldr-pages/tldr/blob/main/CONTRIBUTING.md#translations)).
190190

191191
It is also RECOMMENDED to make the language configurable, as to not only rely on the environment. Clients SHOULD offer options to configure or override the language using configuration files or even command line options (like `-L, --language` as suggested in the [arguments section](#arguments) above). If such a command-line option is specified, a client must strictly adhere to its value, and MUST NOT show pages in a different language, failing with an appropriate error message instead.
192192

COMMUNITY-ROLES.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ using one of the template messages below as a base.
9494
```
9595
Hi, @username! You seem to be enjoying contributing to the tldr-pages project.
9696
You now have had five distinct pull requests merged (<!-- REPLACE THIS WITH LINKS TO THE RELEVANT PRs -->)!
97-
That qualifies you to become a collaborator in this repository, as explained in our [community roles documentation](https://github.com/tldr-pages/tldr/blob/master/COMMUNITY-ROLES.md).
97+
That qualifies you to become a collaborator in this repository, as explained in our [community roles documentation](https://github.com/tldr-pages/tldr/blob/main/COMMUNITY-ROLES.md).
9898
9999
As a collaborator, you will have commit access to the repository.
100100
That means you can merge pull requests, label and close issues, and perform various other maintenance tasks that are needed here and there.
101101
Of course, all of this is voluntary — you're welcome to contribute to the project in whatever ways suit your liking.
102102
103-
If you do decide to start performing maintenance tasks, though, we only ask you to get familiar with the [maintainer's guide](https://github.com/tldr-pages/tldr/blob/master/contributing-guides/maintainers-guide.md).
103+
If you do decide to start performing maintenance tasks, though, we only ask you to get familiar with the [maintainer's guide](https://github.com/tldr-pages/tldr/blob/main/contributing-guides/maintainers-guide.md).
104104
105105
So, what do you say? Can we add you as a collaborator?
106106
@@ -123,13 +123,13 @@ using one of the template messages below as a base.
123123
```
124124
Hi, @username! After joining as a collaborator in the repository, you have been regularly performing maintenance tasks (<!-- REPLACE THIS WITH LINKS TO THE RELEVANT ISSUES AND/OR PRs -->).
125125
Thank you for that!
126-
According to our [community roles documentation](https://github.com/tldr-pages/tldr/blob/master/COMMUNITY-ROLES.md), you've now met the thresholds to be effectively considered an active maintainer of the project.
126+
According to our [community roles documentation](https://github.com/tldr-pages/tldr/blob/main/COMMUNITY-ROLES.md), you've now met the thresholds to be effectively considered an active maintainer of the project.
127127
To publicly acknowledge that fact, we'd like to add you to the tldr-pages organization.
128128
129129
If you accept the invitation, we ask you to make your membership public, and (in case you don't already) start hanging out in our Gitter chat room.
130130
Additionally, consider subscribing to the notifications from the various repositories under the [tldr-pages organization](https://github.com/tldr-pages).
131131
As one of the public faces of the tldr-pages project, it's also especially important that you follow and encourage the [project
132-
governance principles](https://github.com/tldr-pages/tldr/blob/master/COMMUNITY-ROLES.md).
132+
governance principles](https://github.com/tldr-pages/tldr/blob/main/COMMUNITY-ROLES.md).
133133
134134
How does that sound? Are you up for it?
135135
```
@@ -150,10 +150,10 @@ using one of the template messages below as a base.
150150
```
151151
Hi, @username! You've been an active tldr-pages organization member for over 6 months.
152152
Thanks for sticking around this far and helping out!
153-
According to our [community roles documentation](https://github.com/tldr-pages/tldr/blob/master/COMMUNITY-ROLES.md), you're now eligible for becoming an owner in the organization.
153+
According to our [community roles documentation](https://github.com/tldr-pages/tldr/blob/main/COMMUNITY-ROLES.md), you're now eligible for becoming an owner in the organization.
154154
155155
That means you will, from now on, be part of the team responsible for performing role changes (like this one!) in the community.
156-
When performing such role transitions, make sure to follow the process described in the [COMMUNITY-ROLES.md](https://github.com/tldr-pages/tldr/blob/master/COMMUNITY-ROLES.md) document.
156+
When performing such role transitions, make sure to follow the process described in the [COMMUNITY-ROLES.md](https://github.com/tldr-pages/tldr/blob/main/COMMUNITY-ROLES.md) document.
157157
158158
Is that OK with you? Let us know!
159159
@@ -174,7 +174,7 @@ using one of the template messages below as a base.
174174
1. Open an issue with the following message template (edit it as appropriate):
175175

176176
```
177-
Hi, @username! As you know, our [community roles documentation](https://github.com/tldr-pages/tldr/blob/master/COMMUNITY-ROLES.md) defines processes for keeping the list of organization members in sync with the actual maintenance team.
177+
Hi, @username! As you know, our [community roles documentation](https://github.com/tldr-pages/tldr/blob/main/COMMUNITY-ROLES.md) defines processes for keeping the list of organization members in sync with the actual maintenance team.
178178
Since you haven't been active in the project for a while now, we'll be relieving you from the maintainer responsibilities.
179179
180180
In practice, not much will change on your side, since you'll remain a collaborator in the repos you have been active in.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[contributors-image]: https://img.shields.io/github/contributors/tldr-pages/tldr.svg
1515
[cla-assistant-url]: https://cla-assistant.io/tldr-pages/tldr
1616
[cla-assistant-image]: https://cla-assistant.io/readme/badge/tldr-pages/tldr
17-
[license-url]: https://github.com/tldr-pages/tldr/blob/master/LICENSE.md
17+
[license-url]: https://github.com/tldr-pages/tldr/blob/main/LICENSE.md
1818
[license-image]: https://img.shields.io/badge/license-CC_BY_4.0-blue.svg
1919

2020
Contributions to the tldr-pages project are [most welcome](GOVERNANCE.md)!

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ and [contributors](https://github.com/tldr-pages/tldr/graphs/contributors).
77

88
----
99

10-
The contents of the [scripts/](https://github.com/tldr-pages/tldr/tree/master/scripts) directory
10+
The contents of the [scripts/](https://github.com/tldr-pages/tldr/tree/main/scripts) directory
1111
are licensed under the MIT license:
1212

1313
> **The MIT License**

MAINTAINERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Note: only the people marked with **bold** are currently in the indicated role.
55
The other entries are kept for historical record.
66

77
There are three types of maintainers, as described in
8-
[COMMUNITY-ROLES.md](https://github.com/tldr-pages/tldr/blob/master/COMMUNITY-ROLES.md#when-to-change-roles):
8+
[COMMUNITY-ROLES.md](https://github.com/tldr-pages/tldr/blob/main/COMMUNITY-ROLES.md#when-to-change-roles):
99
repository collaborators, organization members, and organization owners
1010
— each having specific roles in maintaining the project, as outlined below.
1111

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
[prs-merged-image]: https://img.shields.io/github/issues-pr-closed-raw/tldr-pages/tldr.svg?label=merged+PRs&color=green
1616
[contributors-url]: https://github.com/tldr-pages/tldr/graphs/contributors
1717
[contributors-image]: https://img.shields.io/github/contributors/tldr-pages/tldr.svg
18-
[license-url]: https://github.com/tldr-pages/tldr/blob/master/LICENSE.md
18+
[license-url]: https://github.com/tldr-pages/tldr/blob/main/LICENSE.md
1919
[license-image]: https://img.shields.io/badge/license-CC_BY_4.0-blue.svg
2020
</div>
2121

contributing-guides/style-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ tldrl -f {{page.md}}
3232
```
3333

3434
For other ways to use `tldrl`, such as linting an entire directory, check out (what else!)
35-
[`tldr tldrl`](https://github.com/tldr-pages/tldr/blob/master/pages/common/tldrl.md)
35+
[`tldr tldrl`](https://github.com/tldr-pages/tldr/blob/main/pages/common/tldrl.md)
3636

3737
If you're using the Node.js client of tldr-pages, you can preview a page locally using the `-f` flag (aka `--render`):
3838

0 commit comments

Comments
 (0)