From 84862e96c1fcff6e7c1ca31884e2fad921afa4f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 3 Feb 2021 11:44:02 +0100
Subject: [PATCH] Address a Sphinx duplicate label warning

Both doc/man/ddns-confgen.rst and doc/man/tsig-keygen.rst include
bin/confgen/tsig-keygen.rst, which defines a "man_tsig-keygen" label.
This triggers the following warning when running sphinx-build with the
-W command line switch in the doc/man/ directory:

    ../../bin/confgen/tsig-keygen.rst:27: WARNING: duplicate label man_tsig-keygen, other instance in /tmp/bind9/doc/man/ddns-confgen.rst

Move the offending label from bin/confgen/tsig-keygen.rst to the proper
spot in doc/arm/manpages.rst to avoid effectively defining it twice in
different source documents while still allowing the relevant man page to
be referenced in the ARM.  Also rename that label so that it more
closely matches the content it points to.  As the label no longer
immediately precedes a section title in its new location, use
:ref:`Title <label>` syntax for the only reference to the
tsig-keygen/ddns-confgen man page in the ARM.
---
 bin/confgen/tsig-keygen.rst | 2 --
 doc/arm/advanced.rst        | 3 ++-
 doc/arm/manpages.rst        | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/confgen/tsig-keygen.rst b/bin/confgen/tsig-keygen.rst
index 2819d09d85..0d709b4122 100644
--- a/bin/confgen/tsig-keygen.rst
+++ b/bin/confgen/tsig-keygen.rst
@@ -21,8 +21,6 @@
 
 .. highlight: console
 
-.. _man_tsig-keygen:
-
 tsig-keygen, ddns-confgen - TSIG key generation tool
 ----------------------------------------------------
 
diff --git a/doc/arm/advanced.rst b/doc/arm/advanced.rst
index 82106e6804..b82887aa27 100644
--- a/doc/arm/advanced.rst
+++ b/doc/arm/advanced.rst
@@ -416,7 +416,8 @@ email, etc.)
 
 ``tsig-keygen`` can also be run as ``ddns-confgen``, in which case its
 output includes additional configuration text for setting up dynamic DNS
-in ``named``. See :ref:`man_tsig-keygen` for details.
+in ``named``. See :ref:`tsig-keygen, ddns-confgen - TSIG key generation
+tool <man_tsig-keygen_ddns-confgen>` for details.
 
 Loading a New Key
 ~~~~~~~~~~~~~~~~~
diff --git a/doc/arm/manpages.rst b/doc/arm/manpages.rst
index 30996a16ab..01f610beb4 100644
--- a/doc/arm/manpages.rst
+++ b/doc/arm/manpages.rst
@@ -46,4 +46,5 @@ Manual Pages
 .. include:: ../../bin/confgen/rndc-confgen.rst
 .. include:: ../../bin/rndc/rndc.conf.rst
 .. include:: ../../bin/rndc/rndc.rst
+.. _man_tsig-keygen_ddns-confgen:
 .. include:: ../../bin/confgen/tsig-keygen.rst