Skip to content

Commit 8efbd23

Browse files
committed
Merge branch '6.0' into first-time-contributor-update
2 parents 2ec39f3 + e011a6d commit 8efbd23

File tree

8 files changed

+25
-14
lines changed

8 files changed

+25
-14
lines changed

docs/conf.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,6 @@
204204
]
205205

206206

207-
# -- sphinx_copybutton -----------------------
208-
copybutton_prompt_text = r"^ {0,2}\d{1,3}"
209-
copybutton_prompt_is_regexp = True
210-
211-
212207
# -- sphinx-notfound-page configuration ----------------------------------
213208

214209
notfound_urls_prefix = ""

docs/contributing/index.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ To standarize the developer experience across packages, a configuration tool is
109109

110110
See the [tool documentation](https://github.com/plone/meta) for more information.
111111

112+
112113
(contributing-specific-contribution-policies-for-projects-label)=
113114

114115
## Specific contribution policies of projects
@@ -139,6 +140,17 @@ Volto
139140
See {doc}`../volto/contributing/index`.
140141

141142

143+
(contributing-releases-label)=
144+
145+
## Releases
146+
147+
The Plone [Release Team](https://plone.org/community/teams/release-team) manages the release of new versions of Plone.
148+
149+
We use [`zest.releaser`](https://zestreleaser.readthedocs.io/en/latest/) for releasing the Python packages used in Plone, including [Plone core (`Products.CMFPlone`)](https://github.com/plone/Products.CMFPlone/), {doc}`/classic-ui/index`, {doc}`/plone.restapi/docs/source/index`, {doc}`/plone.api/index`, and {doc}`/backend/index`.
150+
151+
We use [`release-it`](https://github.com/release-it/release-it) for releasing the Node.js packages used in Plone, including {doc}`Volto </volto/index>` and the [Classic UI mockup](https://github.com/plone/mockup).
152+
153+
142154
```{toctree}
143155
---
144156
caption: Contributing

docs/install/install-from-packages.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,18 @@ The hardware requirements below give a rough estimate of the minimum hardware se
3131
A single Plone installation is able to run many Plone sites.
3232
You may host multiple Plone sites on the same server.
3333

34-
- Minimum 256 MB RAM and 512 MB of swap space per Plone site is required.
34+
- Installation of the Plone backend and Classic UI frontend requires a minimum of 256 MB of RAM and 2GB of disk swap space.
35+
- Installation of the Volto frontend requires a minimum of 2GB of RAM.
36+
- After installation, running Plone requires a minimum of 256 MB RAM and 512 MB of disk swap space per Plone site.
3537
2 GB or more RAM per Plone site is recommended.
3638
- Minimum 512 MB hard disk space is required.
3739
40 GB or more hard disk space is recommended.
3840

41+
3942
````{warning}
40-
When you _build_ Plone, it will approximately double RAM requirements to _install_ Plone.
41-
{term}`Add-on` products and caching solutions may also increase RAM requirements.
43+
{term}`Add-on` products and caching solutions may also increase RAM and disk swap space requirements.
4244
43-
To avoid RAM limitations, we recommend either temporarily resizing your remote machine to accommodate the build, or build your images locally and upload them to an image store, such as [Docker Hub](https://hub.docker.com/) or [GitHub Packages](https://github.com/features/packages).
45+
To avoid RAM and disk swap limitations, we recommend either temporarily resizing your remote machine to accommodate the build, or build your images locally and upload them to an image store, such as [Docker Hub](https://hub.docker.com/) or [GitHub Packages](https://github.com/features/packages).
4446
4547
```{seealso}
4648
[How much RAM is required to build a Volto front end?](https://community.plone.org/t/how-much-ram-is-required-to-build-a-volto-front-end/17949) and [Dealing with heap exhaustion while building Volto 17 on limited-RAM host](https://community.plone.org/t/dealing-with-heap-exhaustion-while-building-volto-17-on-limited-ram-host/18078).

requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ sphinx-sitemap
1515
sphinx-togglebutton
1616
sphinxcontrib.httpdomain # plone.restapi
1717
sphinxcontrib.httpexample # plone.restapi
18+
sphinxcontrib-video
1819
sphinxext-opengraph
19-
sphinx-design
20-
sphinxcontrib-video

styles/Vocab/Plone/accept.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@ npm
1212
nvm
1313
Pastanaga
1414
Plone
15+
pluggab(le|ility)
16+
programatically
1517
portlet
1618
prerendered
1719
Razzle
1820
renderer
1921
RichText
2022
Sass
23+
transpile[dr]{0,1}
2124
unregister
2225
viewlet
2326
Volto

submodules/plone.api

submodules/volto

0 commit comments

Comments
 (0)