(chore) rename master branch to main

highlightjs · Mar 18, 2021 · 23ae72c · 23ae72c
1 parent 13adf5c
commit 23ae72c
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,7 +6,7 @@ name: Lint
 on:
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   lint:

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -5,9 +5,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -72,7 +72,7 @@ jobs:
         # else (beta)
       - name: Beta Release
         if: env.RELEASING == 'beta'
-        run: echo "BRANCH_NAME=master" >> $GITHUB_ENV
+        run: echo "BRANCH_NAME=main" >> $GITHUB_ENV
       - name: Confirm release is either stable or beta
         if: ${{ !(env.RELEASING == 'stable' || env.RELEASING == 'beta') }}
         run: |

diff --git a/README.CDN.md b/README.CDN.md
@@ -22,7 +22,7 @@ markup, doesn’t depend on any framework, and has automatic language
 detection.
 
 If you'd like to read the full README:<br>
-<https://github.com/highlightjs/highlight.js/blob/master/README.md>
+<https://github.com/highlightjs/highlight.js/blob/main/README.md>
 
 ## License
 
@@ -41,5 +41,5 @@ Further in-depth documentation for the API and other topics is at
 A list of the Core Team and contributors can be found in the [CONTRIBUTORS.md][8] file.
 
 [1]: https://www.npmjs.com/package/highlight.js
-[7]: https://github.com/highlightjs/highlight.js/blob/master/LICENSE
-[8]: https://github.com/highlightjs/highlight.js/blob/master/CONTRIBUTORS.md
+[7]: https://github.com/highlightjs/highlight.js/blob/main/LICENSE
+[8]: https://github.com/highlightjs/highlight.js/blob/main/CONTRIBUTORS.md
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![latest version](https://badgen.net/npm/v/highlight.js?label=latest)](https://www.npmjs.com/package/highlight.js)
 [![slack](https://badgen.net/badge/icon/slack?icon=slack&label&color=pink)](https://join.slack.com/t/highlightjs/shared_invite/zt-mj0utgqp-TNFf4VQICnDnPg4zMHChFw)
 [![discord](https://badgen.net/badge/icon/discord?icon=discord&label&color=pink)](https://discord.gg/M24EbU7ja9)
-[![license](https://badgen.net/github/license/highlightjs/highlight.js?color=cyan)](https://github.com/highlightjs/highlight.js/blob/master/LICENSE)
+[![license](https://badgen.net/github/license/highlightjs/highlight.js?color=cyan)](https://github.com/highlightjs/highlight.js/blob/main/LICENSE)
 [![install size](https://badgen.net/packagephobia/install/highlight.js?label=npm+install)](https://packagephobia.now.sh/result?p=highlight.js)
 ![minified](https://img.shields.io/github/size/highlightjs/cdn-release/build/highlight.min.js?label=minified)
 [![NPM downloads weekly](https://badgen.net/npm/dw/highlight.js?label=npm+downloads&color=purple)](https://www.npmjs.com/package/highlight.js)
@@ -18,7 +18,7 @@
 [![vulnerabilities](https://badgen.net/snyk/highlightjs/highlight.js)](https://snyk.io/test/github/highlightjs/highlight.js?targetFile=package.json)
 
 <!-- [![Build CI](https://img.shields.io/github/workflow/status/highlightjs/highlight.js/Node.js%20CI)](https://github.com/highlightjs/highlight.js/actions?query=workflow%3A%22Node.js+CI%22) -->
-<!-- [![commits since release](https://img.shields.io/github/commits-since/highlightjs/highlight.js/latest?label=commits+since)](https://github.com/highlightjs/highlight.js/commits/master) -->
+<!-- [![commits since release](https://img.shields.io/github/commits-since/highlightjs/highlight.js/latest?label=commits+since)](https://github.com/highlightjs/highlight.js/commits/main) -->
 <!-- [![](https://data.jsdelivr.com/v1/package/gh/highlightjs/cdn-release/badge?style=rounded)](https://www.jsdelivr.com/package/gh/highlightjs/cdn-release) -->
 <!-- [![Total Lines](https://img.shields.io/tokei/lines/github/highlightjs/highlight.js)]() -->
 <!-- [![npm bundle size (minified + gzip)](https://img.shields.io/bundlephobia/minzip/highlight.js.svg)](https://bundlephobia.com/result?p=highlight.js) -->
@@ -35,11 +35,11 @@ Version 10 is one of the biggest releases in quite some time.  If you're
 upgrading from version 9, there are some breaking changes and things you may
 want to double check first.
 
-Please read [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md) for  high-level summary of breaking changes and any actions you may need to take. See [VERSION_10_BREAKING_CHANGES.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_BREAKING_CHANGES.md) for a more detailed list and [CHANGES.md](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md) to learn what else is new.
+Please read [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/main/VERSION_10_UPGRADE.md) for  high-level summary of breaking changes and any actions you may need to take. See [VERSION_10_BREAKING_CHANGES.md](https://github.com/highlightjs/highlight.js/blob/main/VERSION_10_BREAKING_CHANGES.md) for a more detailed list and [CHANGES.md](https://github.com/highlightjs/highlight.js/blob/main/CHANGES.md) to learn what else is new.
 
 ##### Support for older versions
 
-Please see [SECURITY.md](https://github.com/highlightjs/highlight.js/blob/master/SECURITY.md) for support information.
+Please see [SECURITY.md](https://github.com/highlightjs/highlight.js/blob/main/SECURITY.md) for support information.
 
 ## Getting Started
 
@@ -266,7 +266,7 @@ r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js
 
 A prebuilt version of Highlight.js bundled with many common languages is hosted by several popular CDNs.
 When using Highlight.js via CDN you can use Subresource Integrity for additional security.  For details
-see [DIGESTS.md](https://github.com/highlightjs/cdn-release/blob/master/DIGESTS.md).
+see [DIGESTS.md](https://github.com/highlightjs/cdn-release/blob/main/DIGESTS.md).
 
 **cdnjs** ([link](https://cdnjs.com/libraries/highlight.js))
 
@@ -365,7 +365,7 @@ A list of the Core Team and contributors can be found in the [CONTRIBUTORS.md][8
 [4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options
 [5]: https://highlightjs.org/download/
 [6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html
-[7]: https://github.com/highlightjs/highlight.js/blob/master/LICENSE
-[8]: https://github.com/highlightjs/highlight.js/blob/master/CONTRIBUTORS.md
-[9]: https://github.com/highlightjs/highlight.js/blob/master/SUPPORTED_LANGUAGES.md
+[7]: https://github.com/highlightjs/highlight.js/blob/main/LICENSE
+[8]: https://github.com/highlightjs/highlight.js/blob/main/CONTRIBUTORS.md
+[9]: https://github.com/highlightjs/highlight.js/blob/main/SUPPORTED_LANGUAGES.md
 [10]: https://github.com/highlightjs/
diff --git a/SECURITY.md b/SECURITY.md
@@ -8,7 +8,7 @@ Due to both time and resource constrains the Highlight.js core team only fully s
 | :-----:  | :-: | :------ |
 | 10.6.0   | :white_check_mark: &nbsp; :closed_lock_with_key: |  The 10.x series recieves regular updates, new features & bug fixes. |
 | <= 10.4.0  | :x: | Known vulnerabities.  *Please upgrade to a more recent 10.x release.* |
-| 9.18.5   | :x: |  [EOL](https://github.com/highlightjs/highlight.js/issues/2877). No longer supported. See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_UPGRADE.md). |
+| 9.18.5   | :x: |  [EOL](https://github.com/highlightjs/highlight.js/issues/2877). No longer supported. See [VERSION_10_UPGRADE.md](https://github.com/highlightjs/highlight.js/blob/main/VERSION_10_UPGRADE.md). |
 | <= 9.18.3 | :x: | No longer supported.  Known vulnerabities. |
 | <= 8.x    | :x: | Obsolete. |
 

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
@@ -78,7 +78,7 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
 | GAUSS                   | gauss, gss             |         |
 | GDScript                | godot, gdscript        | [highlightjs-gdscript](https://github.com/highlightjs/highlightjs-gdscript) |
 | Gherkin                 | gherkin                |         |
-| GN for Ninja            | gn, gni                | [highlightjs-GN](https://github.com/highlightjs/highlightjs-GN/blob/master/gn.js) |
+| GN for Ninja            | gn, gni                | [highlightjs-GN](https://github.com/highlightjs/highlightjs-GN) |
 | Go                      | go, golang             |         |
 | Grammatical Framework   | gf                     | [highlightjs-gf](https://github.com/johnjcamilleri/highlightjs-gf) |
 | Golo                    | golo, gololang         |         |

diff --git a/VERSION_10_UPGRADE.md b/VERSION_10_UPGRADE.md
@@ -9,7 +9,7 @@ We tried to squeeze in as many as we could this time so that after 10.0 ships we
 
 *IE, if there it could possibly break things for anyone, it's typically a breaking change.*  The fact is a vast majority of users should upgrade and probably not notice any changes at all.
 
-See [VERSION_10_BREAKING_CHANGES.md](https://github.com/highlightjs/highlight.js/blob/master/VERSION_10_BREAKING_CHANGES.md) for a comprehensive list of breaking changes, but here is a summary... if you use:
+See [VERSION_10_BREAKING_CHANGES.md](https://github.com/highlightjs/highlight.js/blob/main/VERSION_10_BREAKING_CHANGES.md) for a comprehensive list of breaking changes, but here is a summary... if you use:
 
 ### Core highlight.js lib on the client (with no extra CDN languages)
 

diff --git a/docs/css-classes-reference.rst b/docs/css-classes-reference.rst
@@ -180,4 +180,4 @@ If you'd like to help out with the larger issue here:
 Language names and aliases
 --------------------------
 
-The language names and aliases table has moved to `SUPPORTED_LANGUAGES.md <https://github.com/highlightjs/highlight.js/blob/master/SUPPORTED_LANGUAGES.md>`_.
+The language names and aliases table has moved to `SUPPORTED_LANGUAGES.md <https://github.com/highlightjs/highlight.js/blob/main/SUPPORTED_LANGUAGES.md>`_.
diff --git a/docs/language-guide.rst b/docs/language-guide.rst
@@ -275,7 +275,7 @@ Illegal symbols are defined using a single regular expression:
 Pre-defined modes and regular expressions
 -----------------------------------------
 
-Many languages share common modes and regular expressions. These expressions are defined in `lib/modes.js <https://github.com/highlightjs/highlight.js/blob/master/src/lib/modes.js>`_ and should be used whenever possible.
+Many languages share common modes and regular expressions. These expressions are defined in `lib/modes.js <https://github.com/highlightjs/highlight.js/blob/main/src/lib/modes.js>`_ and should be used whenever possible.
 
 
 Regular Expression Features

diff --git a/docs/maintainers-guide.rst b/docs/maintainers-guide.rst
@@ -7,7 +7,7 @@ Commit policy
 
 * Pull requests from outside contributors require a review from a maintainer.
 
-* Maintainers should avoid working on a master branch directly and create branches for everything. A code review from another maintainer is recommended but not required, use your best judgment.
+* Maintainers should avoid working on a main branch directly and create branches for everything. A code review from another maintainer is recommended but not required, use your best judgment.
 
 
 
@@ -16,7 +16,7 @@ Release process
 
 Releases (minor) typically happen on a 6-week schedule.
 
-For major/minor releases you'll be releasing from ``master``.  For patch releases you'll be releasing from a stable branch, such as ``10-stable``.  This allows ongoing development of new features to continue in isolation (in master) without those changes leaking into patch releases (which should focus only on fixing breaking changes).
+For major/minor releases you'll be releasing from ``main``.  For patch releases you'll be releasing from a stable branch, such as ``10-stable``.  This allows ongoing development of new features to continue in isolation (in main) without those changes leaking into patch releases (which should focus only on fixing breaking changes).
 
 The goal being that minor version series always get more stable over time and that patch releases do not add features.
 

diff --git a/test/detect/shell/default.txt b/test/detect/shell/default.txt
@@ -1,8 +1,8 @@
 $ echo $EDITOR
 vim
-$ git checkout master
-Switched to branch 'master'
-Your branch is up-to-date with 'origin/master'.
+$ git checkout main
+Switched to branch 'main'
+Your branch is up-to-date with 'origin/main'.
 $ git push
 Everything up-to-date
 $ echo 'All