diff --git a/changelog.d/2826.changed.md b/changelog.d/2826.changed.md new file mode 100644 index 0000000000..ea207c9410 --- /dev/null +++ b/changelog.d/2826.changed.md @@ -0,0 +1 @@ +Change sphinx version to 7.4.7 \ No newline at end of file diff --git a/doc/conf.py b/doc/conf.py index eead349e93..e4233dc0ab 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -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/', ), } diff --git a/doc/hacking/using-docker.rst b/doc/hacking/using-docker.rst index febae43ca8..2eb7192fab 100644 --- a/doc/hacking/using-docker.rst +++ b/doc/hacking/using-docker.rst @@ -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 diff --git a/doc/howto/commandline-utilities.rst b/doc/howto/commandline-utilities.rst index 629a8942d7..b485cd09f0 100644 --- a/doc/howto/commandline-utilities.rst +++ b/doc/howto/commandline-utilities.rst @@ -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 diff --git a/requirements/base.txt b/requirements/base.txt index 729925e483..e95e419e3d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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