Fix default file path substitution in the ARM and man pages

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 3f78c6053947900b5bf5a06483c5dac42f4882c7.

Related: !5815

diff --git a/doc/arm/conf.py b/doc/arm/conf.py
index 947138f535642d61b368bc0560fbfeff82d90da8..742626335b5091ad17aeb5f7b92588df31394bbe 100644 (file)
--- a/doc/arm/conf.py
+++ b/doc/arm/conf.py
@@ -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``
 """

diff --git a/doc/man/conf.py b/doc/man/conf.py
index dd472411ddb599355dc610edcb6eb99a2e393e8d..e4d4cdad63ba9712d2db649ebaac7380c581ad14 100644 (file)
--- a/doc/man/conf.py
+++ b/doc/man/conf.py
@@ -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):