Skip to content

Commit 3d0ceb8

Browse files
committed
Rename master to main for plone.api
1 parent 7002956 commit 3d0ceb8

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
[submodule "submodules/plone.api"]
1010
path = submodules/plone.api
1111
url = https://github.com/plone/plone.api.git
12-
branch = master
12+
branch = main

docs/contributing/documentation/admins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Only members of the Plone Documentation Team should update git submodules from t
226226
git pull
227227
# plone.api
228228
cd submodules/plone.api
229-
git checkout master
229+
git checkout main
230230
git pull
231231
# plone.restapi
232232
cd ../../submodules/plone.restapi

docs/contributing/documentation/index.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Plone documentation consists of several repositories.
7474
When you {doc}`setup and build <setup-build>` the documentation, it will automatically pull in the other repositories via git submodules.
7575

7676
```{important}
77-
We currently use the branches `plone/documentation@6.0`, `plone/plone.api@master`, `plone/plone.restapi@main`, and `plone/volto@main` as the default branches for developing Plone 6 Documentation.
77+
We currently use the branches `plone/documentation@6.0`, `plone/plone.api@main`, `plone/plone.restapi@main`, and `plone/volto@main` as the default branches for developing Plone 6 Documentation.
7878
```
7979

8080

@@ -208,10 +208,6 @@ You already imported the external repositories into the `plone/documentation` re
208208
You might need to resolve conflicts.
209209
210210
```shell
211-
# for plone.api
212-
git checkout master
213-
214-
# for plone.restapi or volto
215211
git checkout main
216212
217213
# pull in the latest changes

docs/contributing/first-time.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ _Plone git workflow_
201201

202202
Once you have your environment set up, then you can follow standard best practices for working with git.
203203

204-
In the following command examples, we will use `main` as the default branch, although `master` may still be in use for some repositories.
204+
In the following command examples, you should use `main` as the default branch, although `master` may still be in use for some repositories.
205205

206206
Always start by checking out the default branch then update the default branch.
207207

0 commit comments

Comments
 (0)