Skip to content

Commit

Permalink
Merge branch '6.0' of https://github.com/plone/documentation into 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stevepiercy committed Oct 9, 2024
2 parents d9b010a + 263c6a4 commit bbc3036
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/conceptual-guides/make-build-backend-walk-through.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ The command `make build-backend`:

- Returning to the target `build-dev`:

- This generates the `mxdev` files as described above in {ref}`manage-mxdev-usage-overview-label`.
- This generates the `mxdev` files as described above in {ref}`mxdev-usage-overview-label`.
- Installs Plone core packages and add-ons from the files generated by `mxdev`.

You can configure your Zope instance as described in the section {ref}`manage-common-management-tasks-label`.
You can configure your Zope instance as described in the section {ref}`manage-configuration-with-cookiecutter-zope-instance-label`.
3 changes: 1 addition & 2 deletions docs/contributing/documentation/admins.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ The following are example files that you can use to configure your project for p
- [Plone Sphinx Theme `Makefile`](https://github.com/plone/plone-sphinx-theme/blob/main/Makefile), specifically the `rtd-pr-preview` section.
This is the command to use to build documentation previews on Read the Docs.
- [Plone Sphinx Theme `requirements-initial.txt`](https://github.com/plone/plone-sphinx-theme/blob/main/requirements-initial.txt) specifies the initial Python packaging tool requirements to set up a virtual environment.
- [Plone Sphinx Theme `requirements-docs.txt`](https://github.com/plone/plone-sphinx-theme/blob/main/requirements-docs.txt) specifies the requirements to use Plone Sphinx Theme and build the docs.
- [Plone Sphinx Theme `requirements-dev.txt`](https://github.com/plone/plone-sphinx-theme/blob/main/requirements-docs.txt) specifies the requirements to use Plone Sphinx Theme and build the docs.
- [Plone Sphinx Theme `conf.py`](https://github.com/plone/plone-sphinx-theme/blob/main/docs/conf.py) the Sphinx configuration file to build the docs.
- [Plone Sphinx Theme `.readthedocs.yaml`](https://github.com/plone/plone-sphinx-theme/blob/main/.readthedocs.yaml) specifies the configuration and command to build the docs.
- [Plone Sphinx Theme `.github/workflows/rtd-pr-preview.yml`](https://github.com/plone/plone-sphinx-theme/blob/main/.github/workflows/rtd-pr-preview.yml) specifies when to build the docs, specifically only when a pull request is opened against the `main` branch and there are changes to documentation files.
Expand Down
2 changes: 1 addition & 1 deletion docs/i18n-l10n/use-an-external-translation-service.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class TranslateUsingMyService(BrowserView):
```

```{note}
Due to the way that the Google Translate integration is built in `plone.app.multilingual`, you will need to enter something in the {guilable}`Google Translate API Key` field in the {guilable}`Multilingual Settings`
Due to the way that the Google Translate integration is built in `plone.app.multilingual`, you will need to enter something in the {guilabel}`Google Translate API Key` field in the {guilabel}`Multilingual Settings`
control panel of your site.
It doesn't need to be a valid Google Translate API Key; it can be a random string.
```

0 comments on commit bbc3036

Please sign in to comment.