Skip to content

Commit 09173ee

Browse files
authored
Merge branch '6.0' into chapter-deprecation
2 parents ad3b50e + f21d6d2 commit 09173ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+579
-127
lines changed

.github/pull_request_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Thank you for your contribution to the Plone Documentation.
1111
Before submitting this pull request, please make sure you follow our guides:
1212

1313
- [Contributing to Plone documentation](https://6.docs.plone.org/contributing/index.html)
14-
- [Building and checking the quality of documentation](https://6.docs.plone.org/contributing/setup-build.html)
15-
- [Authors guide](https://6.docs.plone.org/contributing/authors.html)
16-
- [MyST reference](https://6.docs.plone.org/contributing/myst-reference.html)
14+
- [Building and checking the quality of documentation](https://6.docs.plone.org/contributing/documentation/setup-build.html)
15+
- [Authors guide](https://6.docs.plone.org/contributing/documentation/authors.html)
16+
- [MyST reference](https://6.docs.plone.org/contributing/documentation/myst-reference.html)
1717

1818
## Issue number
1919

.github/workflows/build_deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
name: docs.plone.org
1616
url: https://docs.plone.org
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919
- name: Setup Graphviz
2020
uses: ts-graphviz/setup-graphviz@v2
2121
- name: Set up Python 3.12
22-
uses: actions/setup-python@v5
22+
uses: actions/setup-python@v6
2323
with:
2424
python-version: '3.12'
2525
cache: 'pip'
@@ -39,7 +39,7 @@ jobs:
3939
run: make deploy
4040

4141
- name: Use Node.js ${{ env.node-version }}
42-
uses: actions/setup-node@v4
42+
uses: actions/setup-node@v6
4343
with:
4444
node-version: ${{ env.node-version }}
4545

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v6
1010

1111
- name: Set up Python ${{ matrix.python-version }}
12-
uses: actions/setup-python@v5
12+
uses: actions/setup-python@v6
1313
with:
1414
python-version: "3.12"
1515

.github/workflows/update_submodule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
# Checkout
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v6
1313
with:
1414
ref: 6.0
1515
submodules: true

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ rtd-pr-preview: ## Build pull request preview on Read the Docs
250250

251251
.PHONY: storybook
252252
storybook:
253-
cd submodules/volto && pnpm i && pnpm build:registry && pnpm --filter @plone/volto build-storybook -o ../../../../_build/html/storybook
253+
cd submodules/volto && pnpm i && pnpm build:registry && pnpm build:components && pnpm --filter @plone/volto build-storybook -o ../../../../_build/html/storybook
254254

255255
.PHONY: all
256256
all: clean vale linkcheck html ## Clean docs build, then run vale and linkcheck, and build html
111 KB
Loading
260 KB
Loading
54.1 KB
Loading
243 KB
Loading

docs/backend/relations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ minions = RelationList(
6161
)
6262
```
6363

64-
We can see that the [code for the behavior `IRelatedItems`](https://github.com/plone/plone.app.relationfield/blob/master/plone/app/relationfield/behavior.py) does exactly the same thing.
64+
We can see that the [code for the behavior `IRelatedItems`](https://github.com/plone/plone.app.relationfield/blob/master/src/plone/app/relationfield/behavior.py) does exactly the same thing.
6565

6666

6767
(relations-controlling-relation-targets-label)=

0 commit comments

Comments
 (0)