upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix default file path substitution in the ARM and man pages

Browse source 
Default paths were not substituted correctly when Python-only build was
used, i.e. it affected only ReadTheDocs. The incorrect rst_epilog was
overriden by Makefile for all "ordinary" builds.

This error was introduced by 3f78c60539.

Related: !5815
(cherry picked from commit cd31391294)
This commit is contained in:
Petr Špaček 2022-04-26 18:23:38 +02:00
parent c28ee3521a
commit 005a535bf6
No known key found for this signature in database
GPG key ID: ABD587CDF06581AE
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/arm/conf.py
View file

@ -186,10 +186,10 @@ latex_logo = "isc-logo.pdf"
# sphinx-build is run by hand.
#
rst_epilog = """
.. |rndc_conf| replace: ``/etc/rndc.conf``
.. |rndc_key| replace: ``/etc/rndc.key``
.. |named_conf| replace: ``/etc/named.conf``
.. |bind_keys| replace: ``/etc/bind.keys``
.. |named_pid| replace: ``/run/named.pid``
.. |session_key| replace: ``/run/session.key``
.. |rndc_conf| replace:: ``/etc/rndc.conf``
.. |rndc_key| replace:: ``/etc/rndc.key``
.. |named_conf| replace:: ``/etc/named.conf``
.. |bind_keys| replace:: ``/etc/bind.keys``
.. |named_pid| replace:: ``/run/named.pid``
.. |session_key| replace:: ``/run/session.key``
"""

12
doc/man/conf.py
View file

@ -109,12 +109,12 @@ man_pages = [
# sphinx-build is run by hand.
#
rst_epilog = """
.. |rndc_conf| replace: ``@sysconfdir@/rndc.conf``
.. |rndc_key| replace: ``@sysconfdir@/rndc.key``
.. |named_conf| replace: ``@sysconfdir@/named.conf``
.. |bind_keys| replace: ``@sysconfdir@/bind.keys``
.. |named_pid| replace: ``@runstatedir@/named.pid``
.. |session_key| replace: ``@runstatedir@/session.key``
.. |rndc_conf| replace:: ``@sysconfdir@/rndc.conf``
.. |rndc_key| replace:: ``@sysconfdir@/rndc.key``
.. |named_conf| replace:: ``@sysconfdir@/named.conf``
.. |bind_keys| replace:: ``@sysconfdir@/bind.keys``
.. |named_pid| replace:: ``@runstatedir@/named.pid``
.. |session_key| replace:: ``@runstatedir@/session.key``
"""
def setup(app):