Skip to content

Commit 23ae72c

Browse files
committed
(chore) rename master branch to main
1 parent 13adf5c commit 23ae72c

12 files changed

+25
-25
lines changed

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Lint
66
on:
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
lint:

.github/workflows/node.js.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Node.js CI
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ master ]
10+
branches: [ main ]
1111

1212
jobs:
1313
build:

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
# else (beta)
7373
- name: Beta Release
7474
if: env.RELEASING == 'beta'
75-
run: echo "BRANCH_NAME=master" >> $GITHUB_ENV
75+
run: echo "BRANCH_NAME=main" >> $GITHUB_ENV
7676
- name: Confirm release is either stable or beta
7777
if: ${{ !(env.RELEASING == 'stable' || env.RELEASING == 'beta') }}
7878
run: |

README.CDN.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ markup, doesn’t depend on any framework, and has automatic language
2222
detection.
2323

2424
If you'd like to read the full README:<br>
25-
<https://github.com/highlightjs/highlight.js/blob/master/README.md>
25+
<https://github.com/highlightjs/highlight.js/blob/main/README.md>
2626

2727
## License
2828

@@ -41,5 +41,5 @@ Further in-depth documentation for the API and other topics is at
4141
A list of the Core Team and contributors can be found in the [CONTRIBUTORS.md][8] file.
4242

4343
[1]: https://www.npmjs.com/package/highlight.js
44-
[7]: https://github.com/highlightjs/highlight.js/blob/master/LICENSE
45-
[8]: https://github.com/highlightjs/highlight.js/blob/master/CONTRIBUTORS.md
44+
[7]: https://github.com/highlightjs/highlight.js/blob/main/LICENSE
45+
[8]: https://github.com/highlightjs/highlight.js/blob/main/CONTRIBUTORS.md

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![latest version](https://badgen.net/npm/v/highlight.js?label=latest)](https://www.npmjs.com/package/highlight.js)
44
[![slack](https://badgen.net/badge/icon/slack?icon=slack&label&color=pink)](https://join.slack.com/t/highlightjs/shared_invite/zt-mj0utgqp-TNFf4VQICnDnPg4zMHChFw)
55
[![discord](https://badgen.net/badge/icon/discord?icon=discord&label&color=pink)](https://discord.gg/M24EbU7ja9)
6-
[![license](https://badgen.net/github/license/highlightjs/highlight.js?color=cyan)](https://github.com/highlightjs/highlight.js/blob/master/LICENSE)
6+
[![license](https://badgen.net/github/license/highlightjs/highlight.js?color=cyan)](https://github.com/highlightjs/highlight.js/blob/main/LICENSE)
77
[![install size](https://badgen.net/packagephobia/install/highlight.js?label=npm+install)](https://packagephobia.now.sh/result?p=highlight.js)
88
![minified](https://img.shields.io/github/size/highlightjs/cdn-release/build/highlight.min.js?label=minified)
99
[![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 @@
1818
[![vulnerabilities](https://badgen.net/snyk/highlightjs/highlight.js)](https://snyk.io/test/github/highlightjs/highlight.js?targetFile=package.json)
1919

2020
<!-- [![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) -->
21-
<!-- [![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) -->
21+
<!-- [![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) -->
2222
<!-- [![](https://data.jsdelivr.com/v1/package/gh/highlightjs/cdn-release/badge?style=rounded)](https://www.jsdelivr.com/package/gh/highlightjs/cdn-release) -->
2323
<!-- [![Total Lines](https://img.shields.io/tokei/lines/github/highlightjs/highlight.js)]() -->
2424
<!-- [![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
3535
upgrading from version 9, there are some breaking changes and things you may
3636
want to double check first.
3737

38-
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.
38+
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.
3939

4040
##### Support for older versions
4141

42-
Please see [SECURITY.md](https://github.com/highlightjs/highlight.js/blob/master/SECURITY.md) for support information.
42+
Please see [SECURITY.md](https://github.com/highlightjs/highlight.js/blob/main/SECURITY.md) for support information.
4343

4444
## Getting Started
4545

@@ -266,7 +266,7 @@ r.js -o name=hljs paths.hljs=/path/to/highlight out=highlight.js
266266

267267
A prebuilt version of Highlight.js bundled with many common languages is hosted by several popular CDNs.
268268
When using Highlight.js via CDN you can use Subresource Integrity for additional security. For details
269-
see [DIGESTS.md](https://github.com/highlightjs/cdn-release/blob/master/DIGESTS.md).
269+
see [DIGESTS.md](https://github.com/highlightjs/cdn-release/blob/main/DIGESTS.md).
270270

271271
**cdnjs** ([link](https://cdnjs.com/libraries/highlight.js))
272272

@@ -365,7 +365,7 @@ A list of the Core Team and contributors can be found in the [CONTRIBUTORS.md][8
365365
[4]: http://highlightjs.readthedocs.io/en/latest/api.html#configure-options
366366
[5]: https://highlightjs.org/download/
367367
[6]: http://highlightjs.readthedocs.io/en/latest/building-testing.html
368-
[7]: https://github.com/highlightjs/highlight.js/blob/master/LICENSE
369-
[8]: https://github.com/highlightjs/highlight.js/blob/master/CONTRIBUTORS.md
370-
[9]: https://github.com/highlightjs/highlight.js/blob/master/SUPPORTED_LANGUAGES.md
368+
[7]: https://github.com/highlightjs/highlight.js/blob/main/LICENSE
369+
[8]: https://github.com/highlightjs/highlight.js/blob/main/CONTRIBUTORS.md
370+
[9]: https://github.com/highlightjs/highlight.js/blob/main/SUPPORTED_LANGUAGES.md
371371
[10]: https://github.com/highlightjs/

SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Due to both time and resource constrains the Highlight.js core team only fully s
88
| :-----: | :-: | :------ |
99
| 10.6.0 | :white_check_mark: &nbsp; :closed_lock_with_key: | The 10.x series recieves regular updates, new features & bug fixes. |
1010
| <= 10.4.0 | :x: | Known vulnerabities. *Please upgrade to a more recent 10.x release.* |
11-
| 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). |
11+
| 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). |
1212
| <= 9.18.3 | :x: | No longer supported. Known vulnerabities. |
1313
| <= 8.x | :x: | Obsolete. |
1414

SUPPORTED_LANGUAGES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Languages that listed a **Package** below are 3rd party languages and are not bu
7878
| GAUSS | gauss, gss | |
7979
| GDScript | godot, gdscript | [highlightjs-gdscript](https://github.com/highlightjs/highlightjs-gdscript) |
8080
| Gherkin | gherkin | |
81-
| GN for Ninja | gn, gni | [highlightjs-GN](https://github.com/highlightjs/highlightjs-GN/blob/master/gn.js) |
81+
| GN for Ninja | gn, gni | [highlightjs-GN](https://github.com/highlightjs/highlightjs-GN) |
8282
| Go | go, golang | |
8383
| Grammatical Framework | gf | [highlightjs-gf](https://github.com/johnjcamilleri/highlightjs-gf) |
8484
| Golo | golo, gololang | |

VERSION_10_UPGRADE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ We tried to squeeze in as many as we could this time so that after 10.0 ships we
99

1010
*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.
1111

12-
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:
12+
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:
1313

1414
### Core highlight.js lib on the client (with no extra CDN languages)
1515

docs/css-classes-reference.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,4 @@ If you'd like to help out with the larger issue here:
180180
Language names and aliases
181181
--------------------------
182182

183-
The language names and aliases table has moved to `SUPPORTED_LANGUAGES.md <https://github.com/highlightjs/highlight.js/blob/master/SUPPORTED_LANGUAGES.md>`_.
183+
The language names and aliases table has moved to `SUPPORTED_LANGUAGES.md <https://github.com/highlightjs/highlight.js/blob/main/SUPPORTED_LANGUAGES.md>`_.

docs/language-guide.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ Illegal symbols are defined using a single regular expression:
275275
Pre-defined modes and regular expressions
276276
-----------------------------------------
277277

278-
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.
278+
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.
279279

280280

281281
Regular Expression Features

docs/maintainers-guide.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Commit policy
77

88
* Pull requests from outside contributors require a review from a maintainer.
99

10-
* 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.
10+
* 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.
1111

1212

1313

@@ -16,7 +16,7 @@ Release process
1616

1717
Releases (minor) typically happen on a 6-week schedule.
1818

19-
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).
19+
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).
2020

2121
The goal being that minor version series always get more stable over time and that patch releases do not add features.
2222

test/detect/shell/default.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
$ echo $EDITOR
22
vim
3-
$ git checkout master
4-
Switched to branch 'master'
5-
Your branch is up-to-date with 'origin/master'.
3+
$ git checkout main
4+
Switched to branch 'main'
5+
Your branch is up-to-date with 'origin/main'.
66
$ git push
77
Everything up-to-date
88
$ echo 'All

0 commit comments

Comments
 (0)