Skip to content

Commit 45abccd

Browse files
committed
✨ Default branch is now main
1 parent 4dc6728 commit 45abccd

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

CHANGELOG.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
:source-highlighter: highlight.js
55

66
This document provides a high-level view of the changes introduced in Asciidoctor.js by release.
7-
For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
7+
For a detailed view of what has changed, refer to the {uri-repo}/commits/main[commit history] on GitHub.
88

99
== Unreleased
1010

@@ -84,7 +84,7 @@ Infrastructure::
8484
** Bump `chai` from 4.1.2 to 4.2.0 (#869)
8585
** Bump `acorn` from 5.7.3 to 5.7.4 in /packages/core (#860)
8686
** Bump `acorn` from 6.1.1 to 6.4.1 (#859)
87-
** Bump `ejs` from 3.0.1 to 3.0.2 in /packages/core (#922)
87+
** Bump `ejs` from 3.0.1 to 3.0.2 in /packages/core (#922)
8888
** Bump `pkg` from 4.4.7 to 4.4.8 in /packages/asciidoctor (#948)
8989
* Add an explicit failure if the regular expression does not match in tests (#890)
9090
* Replace a Ruby example with a JavaScript example in the JSDoc (#856)

CONTRIBUTING-CODE.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ You'll see this script in action when you run the examples, described next.
7373

7474
==== Building against a release
7575

76-
By default Asciidoctor.js will build against the master branch of Asciidoctor (Ruby).
76+
By default Asciidoctor.js will build against the main branch of Asciidoctor (Ruby).
7777
If you want to build against a release of Asciidoctor, you will need to define the `ASCIIDOCTOR_CORE_VERSION` environment variable.
7878

7979
For instance to build against Asciidoctor (Ruby) v2.0.10 use:

CONTRIBUTING.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Here are just a few of the ways you can contribute to the project:
3030
* Writing, editing or maintaining the documentation
3131
* Organizing the content (information architecture & content strategy)
3232
* Using or extending the software in a creative way
33-
* Testing a prerelease, a pull request or master
33+
* Testing a prerelease, a pull request or main
3434
* Reviewing or providing feedback on pull requests
3535
* Writing code (_No patch is too small!_)
3636
** Fixing typos

README.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ ifndef::uri-rel-file-base[:uri-rel-file-base: link:]
1010
:uri-contribute: {uri-rel-file-base}CONTRIBUTING.adoc
1111
:uri-contribute-code: {uri-rel-file-base}CONTRIBUTING-CODE.adoc
1212
:uri-user-manual: https://docs.asciidoctor.org/asciidoctor.js/latest/
13-
:license: {uri-repo}/blob/master/LICENSE
13+
:license: {uri-repo}/blob/main/LICENSE
1414
:experimental:
1515
:endash:
1616

1717
ifdef::env-github[]
1818
image:https://github.com/asciidoctor/asciidoctor.js/workflows/Build/badge.svg[GitHub Actions Status, link=https://github.com/asciidoctor/asciidoctor.js/actions]
1919
image:https://img.shields.io/npm/v/asciidoctor.svg[npm version, link=https://www.npmjs.org/package/asciidoctor]
2020
image:https://img.shields.io/npm/dm/asciidoctor[npm stats, link=https://www.npmjs.org/package/asciidoctor]
21-
image:https://img.shields.io/badge/jsdoc-master-blue.svg[JSDoc, link=https://asciidoctor.github.io/asciidoctor.js/master]
21+
image:https://img.shields.io/badge/jsdoc-main-blue.svg[JSDoc, link=https://asciidoctor.github.io/asciidoctor.js/main]
2222
image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,link=https://asciidoctor.zulipchat.com/]
2323
endif::[]
2424

@@ -89,4 +89,4 @@ See the {license}[LICENSE] file for details.
8989

9090
== Changelog
9191

92-
Refer to the https://github.com/asciidoctor/asciidoctor.js/blob/master/CHANGELOG.adoc[CHANGELOG] for a complete list of changes.
92+
Refer to the https://github.com/asciidoctor/asciidoctor.js/blob/main/CHANGELOG.adoc[CHANGELOG] for a complete list of changes.

docs/antora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Asciidoctor.js
33
version: '3.0'
44
asciidoc:
55
attributes:
6-
url-jsdoc-latest: 'http://asciidoctor.github.io/asciidoctor.js/master'
6+
url-jsdoc-latest: 'http://asciidoctor.github.io/asciidoctor.js/main'
77
nav:
88
- modules/setup/nav.adoc
99
- modules/processor/nav.adoc

packages/asciidoctor/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ In the spirit of [free software](https://www.gnu.org/philosophy/free-sw.html), _
4747
If you discover errors or omissions in the source code, documentation, or website content, please don't hesitate to submit an issue or open a pull request with a fix.
4848
New contributors are always welcome!
4949

50-
The [Contributing](https://github.com/asciidoctor/asciidoctor.js/blob/master/CONTRIBUTING.adoc) guide provides information on how to contribute.
50+
The [Contributing](https://github.com/asciidoctor/asciidoctor.js/blob/main/CONTRIBUTING.adoc) guide provides information on how to contribute.
5151

52-
If you want to write code, the [Contributing Code](https://github.com/asciidoctor/asciidoctor.js/blob/master/CONTRIBUTING-CODE.adoc) guide will help you to get started quickly.
52+
If you want to write code, the [Contributing Code](https://github.com/asciidoctor/asciidoctor.js/blob/main/CONTRIBUTING-CODE.adoc) guide will help you to get started quickly.
5353

5454
## Copyright
5555

5656
Copyright (C) 2019 Dan Allen, Guillaume Grossetie, Anthonny Quérouil and the Asciidoctor Project.
5757
Free use of this software is granted under the terms of the MIT License.
5858

59-
See the [LICENSE](https://github.com/asciidoctor/asciidoctor.js/blob/master/LICENSE) file for details.
59+
See the [LICENSE](https://github.com/asciidoctor/asciidoctor.js/blob/main/LICENSE) file for details.

packages/core/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ If you want to know more about Asciidoctor.js, please read the [User Manual](htt
4444

4545
## Changelog
4646

47-
Refer to the [CHANGELOG](https://github.com/asciidoctor/asciidoctor.js/blob/master/CHANGELOG.adoc) for a complete list of changes.
47+
Refer to the [CHANGELOG](https://github.com/asciidoctor/asciidoctor.js/blob/main/CHANGELOG.adoc) for a complete list of changes.

packages/core/spec/test-include-directive-mri.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
BASE_DIR=`pwd`
4-
REMOTE_BASE_DIR="https://raw.githubusercontent.com/asciidoctor/asciidoctor.js/master/spec"
4+
REMOTE_BASE_DIR="https://raw.githubusercontent.com/asciidoctor/asciidoctor.js/main/spec"
55

66
RELATIVE_PATH="fixtures/include.adoc"
77
RELATIVE_PATH_UNRESOLVED="fixtures/../fixtures/include.adoc"

spec/build/builder.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('Build', function () {
3131

3232
const result = releaseModule.pushRelease()
3333
expect(result).to.be.true()
34-
expect(execSyncStub.getCall(0).args[0]).to.equal('git push upstream master')
34+
expect(execSyncStub.getCall(0).args[0]).to.equal('git push upstream main')
3535
expect(execSyncStub.getCall(1).args[0]).to.equal('git push upstream --tags')
3636
execSyncStub.restore()
3737
})

tasks/module/release.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ const prepareRelease = (releaseVersion) => {
2020
process.exit(1)
2121
}
2222
const branchName = childProcess.execSync('git symbolic-ref --short HEAD', { cwd: projectRootDirectory }).toString('utf-8').trim()
23-
if (branchName !== 'master') {
24-
log.error('Release must be performed on master branch')
23+
if (branchName !== 'main') {
24+
log.error('Release must be performed on main branch')
2525
process.exit(1)
2626
}
2727
// update asciidoctor package version and dependencies
@@ -61,7 +61,7 @@ const pushRelease = () => {
6161
.reduce((a, b) => a + b, '')
6262

6363
if (remoteName) {
64-
execModule.execSync(`git push ${remoteName} master`)
64+
execModule.execSync(`git push ${remoteName} main`)
6565
execModule.execSync(`git push ${remoteName} --tags`)
6666
return true
6767
}
@@ -73,7 +73,7 @@ const completeRelease = (releasePushed, releaseVersion) => {
7373
log.info('')
7474
log.info('To complete the release, you need to:')
7575
if (!releasePushed) {
76-
log.info('[ ] push changes upstream: `git push origin master && git push origin --tags`')
76+
log.info('[ ] push changes upstream: `git push origin main && git push origin --tags`')
7777
}
7878
log.info(`[ ] edit the release page on GitHub: https://github.com/asciidoctor/asciidoctor.js/releases/tag/v${releaseVersion}`)
7979
}

0 commit comments

Comments
 (0)