From ae48ed676b886450eaf336506c78443f1b0a4dbe Mon Sep 17 00:00:00 2001 From: Orta Date: Mon, 2 Aug 2021 17:04:39 +0100 Subject: [PATCH] Master -> main --- .github/workflows/sync.yml | 2 +- Contributing-to-TypeScript.md | 2 +- JavaScript-Language-Service-in-Visual-Studio.md | 2 +- Nightly-drops.md | 2 +- Node-Target-Mapping.md | 2 +- README.md | 2 +- Release-Activities.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 7f1381e..a63c617 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -4,7 +4,7 @@ name: Sync Two Wiki Repos on: - push: {branches: [master]} + push: {branches: [main]} schedule: [{cron: "7 0 * * 1,3"}] # https://crontab.guru/#7_0_*_*_1,3 workflow_dispatch: # on request diff --git a/Contributing-to-TypeScript.md b/Contributing-to-TypeScript.md index 1241b75..b3efe4f 100644 --- a/Contributing-to-TypeScript.md +++ b/Contributing-to-TypeScript.md @@ -6,7 +6,7 @@ To log a bug, just use the GitHub issue tracker. Confirmed bugs will be labelled ### Pull Requests -Before we can accept a pull request from you, you'll need to sign the Contributor License Agreement (CLA). See the "Legal" section of the [CONTRIBUTING.md guide](https://github.com/Microsoft/TypeScript/blob/master/CONTRIBUTING.md). That document also outlines the technical nuts and bolts of submitting a pull request. Be sure to follow our [[Coding Guidelines|coding-guidelines]]. +Before we can accept a pull request from you, you'll need to sign the Contributor License Agreement (CLA). See the "Legal" section of the [CONTRIBUTING.md guide](https://github.com/Microsoft/TypeScript/blob/main/CONTRIBUTING.md). That document also outlines the technical nuts and bolts of submitting a pull request. Be sure to follow our [[Coding Guidelines|coding-guidelines]]. ### Suggestions diff --git a/JavaScript-Language-Service-in-Visual-Studio.md b/JavaScript-Language-Service-in-Visual-Studio.md index 74652d9..f0fa341 100644 --- a/JavaScript-Language-Service-in-Visual-Studio.md +++ b/JavaScript-Language-Service-in-Visual-Studio.md @@ -81,7 +81,7 @@ function Foo(param1) { } ``` -See [this doc](https://github.com/microsoft/TypeScript-wiki/blob/master/JSDoc-support-in-JavaScript.md) for the JsDoc annotations currently supported. +See [this doc](https://github.com/microsoft/TypeScript-wiki/blob/main/JSDoc-support-in-JavaScript.md) for the JsDoc annotations currently supported. #### IntelliSense based on TypeScript Declaration Files diff --git a/Nightly-drops.md b/Nightly-drops.md index d05a194..923ef43 100644 --- a/Nightly-drops.md +++ b/Nightly-drops.md @@ -1,4 +1,4 @@ -A nightly build from the [master](https://github.com/Microsoft/TypeScript/tree/master) branch is published nightly to NPM and NuGet. Here is how you can get it and use it with your tools. +A nightly build from the [main](https://github.com/Microsoft/TypeScript/tree/main) branch is published nightly to NPM and NuGet. Here is how you can get it and use it with your tools. ## Using npm diff --git a/Node-Target-Mapping.md b/Node-Target-Mapping.md index 5495519..e9b9fff 100644 --- a/Node-Target-Mapping.md +++ b/Node-Target-Mapping.md @@ -3,7 +3,7 @@ You can let TypeScript compile as little as possible by knowing what the baseline support for ECMAScript features are available in your node version. -To update this file, you can use [node.green](https://node.green) to map to the different options in [microsoft/typescript@src/lib](https://github.com/Microsoft/TypeScript/tree/master/src/lib) +To update this file, you can use [node.green](https://node.green) to map to the different options in [microsoft/typescript@src/lib](https://github.com/Microsoft/TypeScript/tree/main/src/lib) #### Node 14 diff --git a/README.md b/README.md index 16b6df8..19d8b43 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ > This repo is a mirror of [the TypeScript wiki](https://github.com/Microsoft/TypeScript/wiki). > Changes on either the wiki or this repo are immediately mirrored to the other side. -> This is done in a GitHub Action [here](.github/workflows/sync.yml), and [another](https://github.com/microsoft/TypeScript/blob/master/.github/workflows/sync-wiki.yml) in the TS repo, and the main work is done by a [`sync` script](.github/workflows/sync). +> This is done in a GitHub Action [here](.github/workflows/sync.yml), and [another](https://github.com/microsoft/TypeScript/blob/main/.github/workflows/sync-wiki.yml) in the TS repo, and the main work is done by a [`sync` script](.github/workflows/sync). The wiki root is [Home.md](./Home.md). diff --git a/Release-Activities.md b/Release-Activities.md index a4a8906..3c41286 100644 --- a/Release-Activities.md +++ b/Release-Activities.md @@ -23,7 +23,7 @@ Once `master`'s version is updated, the @definitelytyped packages must be aware ### Release * [ ] [Tag](https://github.com/Microsoft/TypeScript/tags) release branch -* [ ] Update [AUTHORS.md](https://github.com/Microsoft/TypeScript/blob/master/AUTHORS.md) for the release ([script](https://github.com/Microsoft/TypeScript/blob/master/scripts/authors.ts)) +* [ ] Update [AUTHORS.md](https://github.com/Microsoft/TypeScript/blob/main/AUTHORS.md) for the release ([script](https://github.com/Microsoft/TypeScript/blob/main/scripts/authors.ts)) * [ ] Draft and publish new [release](https://github.com/Microsoft/TypeScript/releases) * [ ] Close milestone corresponding to the release