Skip to content

Commit 8c96128

Browse files
committed
Rename master to main.
1 parent d8ce4ae commit 8c96128

File tree

8 files changed

+16
-13
lines changed

8 files changed

+16
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<p align="center"><a href="https://tsdoc.org/">https://tsdoc.org/</a></p>
44
</td></tr></table>
55

6-
[![#tsdoc chat room](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://rushstack.zulipchat.com/#narrow/stream/266672-tsdoc) &nbsp; [![Build Status](https://dev.azure.com/RushStack/Gearbox%20GitHub%20Projects/_apis/build/status/tsdoc/TSDoc%20CI%20Build?branchName=master)](https://dev.azure.com/RushStack/Gearbox%20GitHub%20Projects/_build/latest?definitionId=5&branchName=master)
6+
[![#tsdoc chat room](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://rushstack.zulipchat.com/#narrow/stream/266672-tsdoc) &nbsp; [![Build Status](https://dev.azure.com/RushStack/Gearbox%20GitHub%20Projects/_apis/build/status/tsdoc/TSDoc%20CI%20Build?branchName=main)](https://dev.azure.com/RushStack/Gearbox%20GitHub%20Projects/_build/latest?definitionId=5&branchName=main)
77

88

99
## Documentation Links

common/config/rush/command-line.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
// *
9393
// * Thus, warnings do not interfere with local development, but they will cause a CI job to fail, because
9494
// * the Rush process itself returns a nonzero exit code if there are any warnings or errors. This is by design.
95-
// * In an active monorepo, we've found that if you allow any warnings in your master branch, it inadvertently
95+
// * In an active monorepo, we've found that if you allow any warnings in your main branch, it inadvertently
9696
// * teaches developers to ignore warnings, which quickly leads to a situation where so many "expected" warnings
9797
// * have accumulated that warnings no longer serve any useful purpose.
9898
// *

eslint-plugin/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"license": "MIT",
1616
"repository": {
1717
"type": "git",
18-
"url": "https://github.com/microsoft/tsdoc/tree/master/eslint-plugin"
18+
"url": "https://github.com/microsoft/tsdoc",
19+
"directory": "eslint-plugin"
1920
},
2021
"homepage": "https://tsdoc.org/",
2122
"main": "lib/index.js",

rush.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -275,24 +275,24 @@
275275
* The URL of this Git repository, used by "rush change" to determine the base branch for your PR.
276276
*
277277
* The "rush change" command needs to determine which files are affected by your PR diff.
278-
* If you merged or cherry-picked commits from the master branch into your PR branch, those commits
278+
* If you merged or cherry-picked commits from the main branch into your PR branch, those commits
279279
* should be excluded from this diff (since they belong to some other PR). In order to do that,
280280
* Rush needs to know where to find the base branch for your PR. This information cannot be
281281
* determined from Git alone, since the "pull request" feature is not a Git concept. Ideally
282282
* Rush would use a vendor-specific protocol to query the information from GitHub, Azure DevOps, etc.
283-
* But to keep things simple, "rush change" simply assumes that your PR is against the "master" branch
283+
* But to keep things simple, "rush change" simply assumes that your PR is against the "main" branch
284284
* of the Git remote indicated by the repository.url setting in rush.json. If you are working in
285285
* a GitHub "fork" of the real repo, this setting will be different from the repository URL of your
286286
* your PR branch, and in this situation "rush change" will also automatically invoke "git fetch"
287-
* to retrieve the latest activity for the remote master branch.
287+
* to retrieve the latest activity for the remote main branch.
288288
*/
289-
"url": "https://github.com/microsoft/tsdoc.git"
289+
"url": "https://github.com/microsoft/tsdoc.git",
290290

291291
/**
292292
* The default branch name. This tells "rush change" which remote branch to compare against.
293-
* The default value is "master"
293+
* The default value is "main"
294294
*/
295-
// "defaultBranch": "master",
295+
"defaultBranch": "main"
296296

297297
/**
298298
* The default remote. This tells "rush change" which remote to compare against if the remote URL is

tsdoc-config/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ until it finds a folder containing **tsconfig.json** or **package.json**, and th
2121
The **tsdoc.json** file conforms to the [tsdoc.schema.json](
2222
https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json) JSON schema. It defines tags using
2323
similar fields as the
24-
[TSDocTagDefinition](https://github.com/microsoft/tsdoc/blob/master/tsdoc/src/configuration/TSDocTagDefinition.ts)
24+
[TSDocTagDefinition](https://github.com/microsoft/tsdoc/blob/main/tsdoc/src/configuration/TSDocTagDefinition.ts)
2525
API used by `TSDocParser` from `@microsoft/tsdoc`.
2626

2727
Here's a simple example:

tsdoc-config/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
],
1414
"repository": {
1515
"type": "git",
16-
"url": "https://github.com/microsoft/tsdoc"
16+
"url": "https://github.com/microsoft/tsdoc",
17+
"directory": "tsdoc-config"
1718
},
1819
"homepage": "https://tsdoc.org/",
1920
"main": "lib/index.js",

tsdoc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Check out the [TSDoc Playground](https://tsdoc.org/play) for a cool live demo of
4242

4343
## API Usage
4444

45-
The [api-demo](https://github.com/microsoft/tsdoc/tree/master/api-demo) folder on GitHub illustrates how
45+
The [api-demo](https://github.com/microsoft/tsdoc/tree/main/api-demo) folder on GitHub illustrates how
4646
to invoke the TSDoc parser.
4747

4848
A separate NPM package [`@microsoft/tsdoc-config`](https://www.npmjs.com/package/@microsoft/tsdoc-config)

tsdoc/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
],
1414
"repository": {
1515
"type": "git",
16-
"url": "https://github.com/microsoft/tsdoc"
16+
"url": "https://github.com/microsoft/tsdoc",
17+
"directory": "tsdoc"
1718
},
1819
"homepage": "https://tsdoc.org/",
1920
"main": "lib-commonjs/index.js",

0 commit comments

Comments
 (0)