Merge remote-tracking branch 'upstream/6.0' into plone_to_zope_name_change_#1751

Author: alizgirl

.github/boring-cyborg.yml

@@ -73,7 +73,7 @@ firstIssueWelcomeComment: >
   Also please follow the issue template, as it helps both you and other community members contribute more effectively.
   
   <br>If your issue is a feature request, others may raise its prominence through
-  [feature voting](https://6.docs.plone.org/contributing/documentation/index.html#github-menu).
+  [feature voting](https://github.com/plone/documentation/issues?q=is%3Aissue%20state%3Aopen%20sort%3Areactions-%2B1-desc%20).
 
   <br>Welcome to the Plone community! :tada:
 

.github/workflows/build_deploy.yml

@@ -45,7 +45,9 @@ jobs:
 
       - name: Enable corepack
         shell: bash
-        run: corepack enable
+        run: |
+          npm i -g corepack@latest
+          corepack enable
 
       - name: Get pnpm store directory
         shell: bash

.readthedocs.yaml

@@ -1,6 +1,6 @@
 # .readthedocs.yaml
 # Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+# See https://docs.readthedocs.com/platform/stable/config-file/v2.html for details
 
 # Required
 version: 2

Makefile

@@ -208,6 +208,9 @@ livehtml: deps  ## Rebuild Sphinx documentation on changes, with live-reload in
 	cd "$(DOCS_DIR)" && ${SPHINXAUTOBUILD} \
 		--ignore "*.swp" \
 		--port 8050 \
+		--watch volto \
+		--watch plone.api \
+		--watch plone.restapi \
 		-b html . "$(BUILDDIR)/html" $(SPHINXOPTS) $(O)
 
 .PHONY: rtd-pr-preview

docs/_inc/_install-browser-reqs-volto.md

@@ -0,0 +1,5 @@
+{
+  "[markdown]": {
+    "editor.formatOnSave": false
+  }
+}

docs/_static/settings.json

@@ -0,0 +1,113 @@
+---
+myst:
+  html_meta:
+    "description": "Export and import Plone site data with plone.exportimport"
+    "property=og:description": "Export and import Plone site data with plone.exportimport"
+    "property=og:title": "Export and import Plone site data with plone.exportimport"
+    "keywords": "Plone 6, plone.exportimport, export, import, site, data, Content, Principals, Relations, Translations, Discussions, Redirects"
+---
+
+(exportimport)=
+
+# Export and import site data
+
+The `plone.exportimport` package provides support to export and import all kinds of data from and to Plone sites using an intermediate JSON format.
+
+Most features use {doc}`plone.restapi <../plone.restapi/docs/source/index>` to serialize and deserialize data.
+
+
+## Command line utilities
+
+This package provides two command line utilities, `plone-exporter` and `plone-importer`.
+
+### `plone-exporter`
+
+Export content from a Plone site to a directory in the file system.
+You can call `plone-exporter` as shown.
+
+```shell
+plone-exporter [--include-revisions] <path-to-zopeconf> <site-id> <path-to-export-data>
+```
+
+The following command shows typical usage.
+
+```shell
+plone-exporter instance/etc/zope.conf Plone /tmp/plone_data/
+```
+
+By default, the revisions history (older versions of each content item) are not exported.
+If you do want them, add `--include-revisions` on the command line.
+
+
+### `plone-importer`
+
+Import content from a file system directory into an existing Plone site.
+
+You can call `plone-importer` as shown.
+
+```shell
+plone-importer <path-to-zopeconf> <site-id> <path-to-import-data>
+```
+
+The following command shows typical usage.
+
+```shell
+plone-importer instance/etc/zope.conf Plone /tmp/plone_data/
+```
+
+
+## Supported data
+
+-   Content (Dexterity content items)
+    -   Ordering
+    -   Local roles
+    -   Versions (when using the `--include-revisions` command line option)
+    -   Default pages
+-   Principals (members and groups)
+-   Relations (relationships between content items)
+-   Translations (translation groups)
+-   Discussions (content comments)
+-   Redirects (redirect information)
+
+
+## Exported data structure
+
+Some goals of the new data structure are to:
+
+-   support diff of exported data, and
+-   have blob files near the content item that uses it.
+
+After exporting content, at the top level directory, the following objects exist.
+
+| Name | Description |
+| --- | --- |
+| `content` | Directory containing content item information exported from the site |
+| `discussions.json` | JSON File with discussions (comments) exported from the site |
+| `principals.json` | JSON File with members and groups exported from the site |
+| `redirects.json` | JSON File with redirect information exported from the site |
+| `relations.json` |  JSON File with content relations exported from the site  |
+| `translations.json` | JSON File with translation groups exported from the site  |
+
+
+### Content directory structure
+
+The {file}`content` directory contains all content items exported from the site.
+Each content item has its own subdirectory, named with the UID of the content, including the serialized data and all blob files related to this content.
+
+One special case is the directory for the `Plone Site` object, which is named `plone_site_root`.
+
+| Name | Description |
+| --- | --- |
+| `content/__metadata__.json` | JSON File with metadata information about the exported content |
+| `content/<content uid>` | Directory with serialization for a content item |
+| `content/plone_site_root` | Directory with serialization for the Plone Site Root |
+
+
+#### Content item directory structure
+
+Consider a File content item with UID `3e0dd7c4b2714eafa1d6fc6a1493f953` and a PDF file named {file}`plone.pdf` (added in the `file` field), the exported directory will have the following structure.
+
+| Name | Description |
+| --- | --- |
+| `content/3e0dd7c4b2714eafa1d6fc6a1493f953/data.json` | JSON File with serialized representation of a content item |
+| `content/3e0dd7c4b2714eafa1d6fc6a1493f953/file/plone.pdf` | Blob file stored in the `file` field in the content item |

docs/admin-guide/export-import.md

@@ -30,8 +30,10 @@ install-pip
 
 run-plone
 add-site
+zope-manager-users
 configure-zope
 add-ons
+export-import
 override-core
 /upgrade/index
 ```

docs/admin-guide/index.md

@@ -31,14 +31,12 @@ For other installation options, see {ref}`get-started-install-label`.
 
 ## Prerequisites for installation
 
--   For Plone 6.0, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE60}}
-% TODO: These instructions install Plone 6.0.x. Uncomment next line and change the subsequent include when Plone 6.1 is released and "latest".
-% -   For Plone 6.1, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}
+-   For Plone 6.1, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}
 
 
 ### Python
 
-```{include} /_inc/_install-python-plone60.md
+```{include} /_inc/_install-python-plone61.md
 ```
 
 

docs/admin-guide/install-buildout.md

@@ -31,14 +31,12 @@ For other installation options, see {ref}`get-started-install-label`.
 
 ## Prerequisites for installation
 
--   For Plone 6.0, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE60}}
-% TODO: These instructions install Plone 6.0.x. Uncomment next line and change the subsequent include when Plone 6.1 is released and "latest".
-% -   For Plone 6.1, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}
+-   For Plone 6.1, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}
 
 
 ### Python
 
-```{include} /_inc/_install-python-plone60.md
+```{include} /_inc/_install-python-plone61.md
 ```
 
 
@@ -60,7 +58,7 @@ python3 -m venv venv
 Install Plone and a helper package, {term}`pipx`.
 
 ```shell
-venv/bin/pip install -c https://dist.plone.org/release/6.0-latest/constraints.txt Plone pipx
+venv/bin/pip install -c https://dist.plone.org/release/6-latest/constraints.txt Plone pipx
 ```