Skip to content

Commit 5d8b4c6

Browse files
committed
Merge branch '6-dev' into installation-from-source-review
# Conflicts: # docs/glossary.md # docs/install/installation-backend-from-packages-step-by-step.md
2 parents 93bf8a4 + 5b9868d commit 5d8b4c6

File tree

91 files changed

+2661
-463
lines changed

Some content is hidden

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

91 files changed

+2661
-463
lines changed

.github/workflows/build_deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
run: |
2121
python -m pip install --upgrade pip
2222
pip install -q -r requirements.txt
23+
pip freeze
2324
2425
# - name: Run spellcheck
2526
# run: make spellcheck

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ deploy: clean html
221221
livehtml: deps ## Rebuild Sphinx documentation on changes, with live-reload in the browser
222222
cd "$(DOCS_DIR)" && ${SPHINXAUTOBUILD} \
223223
--ignore "*.swp" \
224+
--port 8050 \
224225
-b html . "$(BUILDDIR)/html" $(SPHINXOPTS) $(O)
225226

226227
.PHONY: netlify

README.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ Browse the Plone 5.2 Documentation at https://docs.plone.org/.
1919
Development on the Plone 5.2 Documentation takes place on the branch [`5.2`](https://github.com/plone/documentation/tree/5.2).
2020

2121

22-
## Overview
23-
24-
The community is writing guides, installation instructions, and everything you need to know to enjoy working with Plone 6.
25-
26-
2722
## Contribute
2823

2924
- [Contributing to Plone 6 Documentation](https://6.dev-docs.plone.org/contributing/index.html)
@@ -32,9 +27,24 @@ The community is writing guides, installation instructions, and everything you n
3227
- [Source Code](https://github.com/plone/documentation/tree/6-dev)
3328

3429

30+
### Contributing to frontend (Volto), `plone.api`, and `plone.restapi` documentation
31+
32+
Plone documentation consists of this repository, `plone/documentation`, and it includes external packages' documentation through git submodules.
33+
Those packages include:
34+
35+
- [`volto`](https://github.com/plone/volto)
36+
- [`plone.api`](https://github.com/plone/plone.api)
37+
- [`plone.restapi`](https://github.com/plone/plone.restapi)
38+
39+
To contribute documentation, please open a pull request in the appropriate repository.
40+
For details, see [Editing external package documentation](https://6.dev-docs.plone.org/contributing/index.html#contributing-editing-external-package-documentation-label).
41+
42+
3543
## Support
3644

37-
If you have issues, please open an issue in our [Issue Tracker](https://github.com/plone/documentation/issues) or ask a question on our [Community Forum, Documentation category](https://community.plone.org/c/documentation/13).
45+
For technical support for **Plone documentation only**, please ask a question on our [Community Forum, Documentation category](https://community.plone.org/c/documentation/13).
46+
47+
For technical support for **Plone in general**, please ask a question on our [Community Forum](https://community.plone.org/) in the appropriate category.
3848

3949

4050
## Training
114 KB
Loading
117 KB
Loading

docs/_static/inspect-relations.png

127 KB
Loading

docs/_static/relation_select.png

63.5 KB
Loading
96.1 KB
Loading
54.8 KB
Loading
17.2 KB
Loading

0 commit comments

Comments
 (0)