Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add the Sphinx notfound page extension #15669

Merged
merged 5 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/docsite/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,13 @@
'sphinx.ext.coverage',
'sphinx.ext.ifconfig',
'sphinx_ansible_theme',
'notfound.extension',
'swagger',
]

notfound_urls_prefix = "/en/latest/"
notfound_template = "404.rst"

html_theme = 'sphinx_ansible_theme'
html_theme_path = ["_static"]

Expand Down
3 changes: 2 additions & 1 deletion docs/docsite/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

sphinx # Tooling to build HTML from RST source.
sphinx-ansible-theme # Ansible community theme for Sphinx doc builds.
sphinx-notfound-page # Sphinx extension for custom 404 page.
docutils # Tooling for RST processing and the swagger extension.
Jinja2 # Requires investiation. Possibly inherited from previous repo with a custom theme.
Jinja2 # Requires investigation. Possibly inherited from previous repo with a custom theme.
PyYaml # Requires investigation. Possibly used as tooling for swagger API reference content.
58 changes: 28 additions & 30 deletions docs/docsite/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,71 +4,69 @@
#
# pip-compile --allow-unsafe --output-file=docs/docsite/requirements.txt --strip-extras docs/docsite/requirements.in
#
alabaster==0.7.13
alabaster==1.0.0
# via sphinx
ansible-pygments==0.1.1
# via sphinx-ansible-theme
babel==2.13.1
babel==2.16.0
# via sphinx
certifi==2023.7.22
certifi==2024.8.30
# via requests
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via requests
docutils==0.18.1
docutils==0.21.2
# via
# -r requirements.in
# -r docs/docsite/requirements.in
# sphinx
# sphinx-rtd-theme
idna==3.4
idna==3.10
# via requests
imagesize==1.4.1
# via sphinx
jinja2==3.1.4
# via
# -r requirements.in
# -r docs/docsite/requirements.in
# sphinx
markupsafe==2.1.3
markupsafe==3.0.2
# via jinja2
packaging==23.2
packaging==24.2
# via sphinx
pygments==2.16.1
pygments==2.18.0
# via
# ansible-pygments
# sphinx
pyyaml==6.0.1
# via -r requirements.in
requests==2.31.0
pyyaml==6.0.2
# via -r docs/docsite/requirements.in
requests==2.32.3
# via sphinx
snowballstemmer==2.2.0
# via sphinx
sphinx==7.2.6
sphinx==8.1.3
# via
# -r requirements.in
# -r docs/docsite/requirements.in
# sphinx-ansible-theme
# sphinx-notfound-page
# sphinx-rtd-theme
# sphinxcontrib-applehelp
# sphinxcontrib-devhelp
# sphinxcontrib-htmlhelp
# sphinxcontrib-jquery
# sphinxcontrib-qthelp
# sphinxcontrib-serializinghtml
sphinx-ansible-theme==0.10.2
# via -r requirements.in
sphinx-rtd-theme==1.3.0
sphinx-ansible-theme==0.10.3
# via -r docs/docsite/requirements.in
sphinx-notfound-page==1.0.4
# via -r docs/docsite/requirements.in
sphinx-rtd-theme==3.0.2
# via sphinx-ansible-theme
sphinxcontrib-applehelp==1.0.7
sphinxcontrib-applehelp==2.0.0
# via sphinx
sphinxcontrib-devhelp==1.0.5
sphinxcontrib-devhelp==2.0.0
# via sphinx
sphinxcontrib-htmlhelp==2.0.4
sphinxcontrib-htmlhelp==2.1.0
# via sphinx
sphinxcontrib-jquery==4.1
# via sphinx-rtd-theme
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.6
sphinxcontrib-qthelp==2.0.0
# via sphinx
sphinxcontrib-serializinghtml==1.1.9
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
urllib3==2.1.0
urllib3==2.2.3
# via requests
2 changes: 1 addition & 1 deletion docs/docsite/rst/404.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ Here is a link to the `AWX 24.6.1 <https://ansible.readthedocs.io/projects/awx/e
If you have more questions or still can't find the docs you're looking for, join the `Ansible Forum <https://forum.ansible.com>`_.
Here are some useful links for AWX users:

* `Get Help <https://forum.ansible.com/c/help/6>`_: get help or help others. Please add appropriate tags if you start new discussions, for example `awx`, `ee`, and `documentation`.
* `Get Help <https://forum.ansible.com/c/help/6>`_: get help or help others. Please add appropriate tags if you start new discussions, for example ``awx``, ``ee``, and ``documentation``.
* `Posts tagged with 'awx' <https://forum.ansible.com/tag/awx>`_: subscribe to participate in project/technology-related conversations. There are other related tags in the forum you can use.
Loading