Skip to content

Commit ba5599e

Browse files
authored
Merge pull request #1605 from maykinmedia/restore-setup-configuration-docs
Restore setup configuration docs
2 parents 13a3663 + 93b881a commit ba5599e

22 files changed

+54
-2331
lines changed

.github/workflows/ci.yml

-22
Original file line numberDiff line numberDiff line change
@@ -208,28 +208,6 @@ jobs:
208208
pytest check_sphinx.py -v --tb=auto
209209
working-directory: docs
210210

211-
setup-config-docs:
212-
name: Check that documentation for configuration steps is up-to-date
213-
runs-on: ubuntu-latest
214-
215-
# Disabled while we complete the upgrade to the latest setup-configuration
216-
if: false
217-
218-
steps:
219-
- uses: actions/checkout@v3
220-
with:
221-
submodules: 'true'
222-
- name: Set up backend environment
223-
uses: maykinmedia/setup-django-backend@v1
224-
with:
225-
apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext libgdal-dev gdal-bin graphviz'
226-
python-version: '3.11'
227-
setup-node: 'no'
228-
229-
- name: Build docs for django-setup-configuration steps
230-
run: |
231-
python src/manage.py generate_config_docs --dry-run
232-
233211
#
234212
# Docker
235213
#

docs/conf.py

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
"sphinx_tabs.tabs",
4444
"recommonmark",
4545
# "sphinx_markdown_tables",
46+
"django_setup_configuration.documentation.setup_config_example",
47+
"django_setup_configuration.documentation.setup_config_usage",
4648
]
4749

4850
# Add any paths that contain templates here, relative to this directory.

docs/configuration/admin_oidc.rst

-190
This file was deleted.

docs/configuration/cms_cases.rst

-54
This file was deleted.

docs/configuration/cms_collaborate.rst

-54
This file was deleted.

docs/configuration/cms_inbox.rst

-54
This file was deleted.

0 commit comments

Comments
 (0)