From cd31391294f38b311ddc9accc2ef384c6f7bf67c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= <pspacek@isc.org>
Date: Tue, 26 Apr 2022 18:23:38 +0200
Subject: [PATCH] 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
---
 doc/arm/conf.py | 12 ++++++------
 doc/man/conf.py | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/arm/conf.py b/doc/arm/conf.py
index 947138f535..742626335b 100644
--- 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 dd472411dd..e4d4cdad63 100644
--- 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):