Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade sphinx version to 7.3.7 #2906

Merged
merged 3 commits into from
Sep 2, 2024
Merged

Upgrade sphinx version to 7.3.7 #2906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22d7421
Upgrade sphinx version to 7.4.7
johannaengland May 10, 2024
d085b0e
Update intersphinx_mapping format
johannaengland May 10, 2024
022c07b
Fix typo/formatting in kbd role in documentation
johannaengland May 10, 2024
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
1 change: 1 addition & 0 deletions changelog.d/2826.changed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Change sphinx version to 7.4.7
4 changes: 2 additions & 2 deletions doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@
intersphinx_mapping = {
'python': ('https://docs.python.org/3', None),
'django': (
'https://docs.djangoproject.com/en/3.2',
'https://docs.djangoproject.com/en/3.2/_objects',
'https://docs.djangoproject.com/en/3.2/',
'https://docs.djangoproject.com/en/3.2/_objects/',
),
}

Expand Down
2 changes: 1 addition & 1 deletion doc/hacking/using-docker.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ A complete rebuild of the NAV code can be initiated by::
Rebuilding the containers
~~~~~~~~~~~~~~~~~~~~~~~~~

Running :kdb:`docker compose up` will normally build the container images,
Running :kbd:`docker compose up` will normally build the container images,
before starting them, if they don't exist already. However, if the image
definitions have changed (e.g. when you are switching between development
branches or changed the :file:`Dockerfile` definitions, or any of the files
Expand Down
4 changes: 2 additions & 2 deletions doc/howto/commandline-utilities.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ processes and cron jobs, regardless of whether you are running under SysV init
system, systemd or other process control systems.

If NAV doesn't appear to be doing anything, the first order of business is
checking the state of its background processes with the command :kbd:`nav
status`
checking the state of its background processes with the command
:kbd:`nav status`


Usage
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ pyaml
twisted>=23.8.0

networkx==2.6.3
# Cannot be removed as long as qrcode is included
# Cannot be removed as long as qrcode is included
Pillow>3.3.2
qrcode>7.4
pyrad==2.1
sphinx==5.3.0
sphinx==7.4.7
sphinxcontrib-programoutput==0.17
sphinxcontrib-django
# Needed for autogenerated docs
Expand Down
Loading