Skip to content

Commit 434390d

Browse files
authored
Merge branch '6.0' into linkcheck-news-volto
2 parents d710491 + 100555c commit 434390d

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

docs/contributing/documentation/index.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ We use `git submodules` to manage multiple repositories.
209209
We imported the external repositories the `plone/documentation` repository as described in {doc}`setup-build`.
210210
211211
```{important}
212-
We currently use the branches `plone/[email protected]`, `plone/plone.api@master`, `plone/plone.restapi@master`, and `plone/volto@master` as the main branches for developing Plone 6 Documentation.
212+
We currently use the branches `plone/[email protected]`, `plone/plone.api@master`, `plone/plone.restapi@main`, and `plone/volto@main` as the main branches for developing Plone 6 Documentation.
213213
```
214214

215215
1. From the project root directory, sync your local `6.0` branch with its remote.
@@ -238,11 +238,8 @@ We currently use the branches `plone/[email protected]`, `plone/plone.api@master
238238
# for plone.api
239239
git checkout master
240240
241-
# for plone.restapi
242-
git checkout master
243-
244-
# for volto
245-
git checkout master
241+
# for plone.restapi or volto
242+
git checkout main
246243
247244
git pull
248245
```

docs/install/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Choose a version.
2727

2828
- [Plone 6 with Volto frontend](https://demo.plone.org/)
2929
- [Plone 6 Classic UI (nightly build)](https://classic.demo.plone.org/login?came_from=/en)
30-
- [Plone 5.2.x (stable) with Barceloneta frontend](https://52.demo.plone.org/)
30+
- [Plone 5.2.x (stable) with Barceloneta frontend](https://52.demo.plone.org/en/)
3131
:::
3232

3333
:::{grid-item-card} {octicon}`download;1.5em;sd-mr-1` Install

0 commit comments

Comments
 (0)