[PATCH 4/7] docs: Move 'tlscerts' page to 'kbase/'

[Peter Krempa]

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 docs/daemons.rst              | 2 +-
 docs/docs.html.in             | 3 ---
 docs/kbase/index.rst          | 3 +++
 docs/kbase/meson.build        | 1 +
 docs/{ => kbase}/tlscerts.rst | 0
 docs/meson.build              | 1 -
 docs/remote.html.in           | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename docs/{ => kbase}/tlscerts.rst (100%)

diff --git a/docs/daemons.rst b/docs/daemons.rst
index 383f0f64ff..2918b3d4ce 100644
--- a/docs/daemons.rst
+++ b/docs/daemons.rst
@@ -100,7 +100,7 @@ optionally, one or two TCP sockets:
   with full read-write privileges. A connection to this socket gives the
   client privileges that are equivalent to having a root shell. Access control
   can be enforced either through validation of `x509 certificates
-  <tlscerts.html>`__, and/or by enabling an `authentication mechanism
+  <kbase/tlscerts.html>`__, and/or by enabling an `authentication mechanism
   <auth.html>`__.

 NB, some distros will use ``/run`` instead of ``/var/run``.
diff --git a/docs/docs.html.in b/docs/docs.html.in
index 225827b693..ff7a95fae7 100644
--- a/docs/docs.html.in
+++ b/docs/docs.html.in
@@ -28,9 +28,6 @@
         <dt><a href="remote.html">Remote access</a></dt>
         <dd>Enable remote access over TCP</dd>

-        <dt><a href="tlscerts.html">TLS certs</a></dt>
-        <dd>Generate and deploy x509 certificates for TLS</dd>
-
         <dt><a href="auth.html">Authentication</a></dt>
         <dd>Configure authentication for the libvirt daemon</dd>

diff --git a/docs/kbase/index.rst b/docs/kbase/index.rst
index 860bfde71f..9c4e921f1f 100644
--- a/docs/kbase/index.rst
+++ b/docs/kbase/index.rst
@@ -19,6 +19,9 @@ Usage
    Examination of the security protections used for QEMU and how they need
    configuring to allow use of QEMU passthrough with host files/devices.

+`TLS certificates <tlscerts.html>`__
+   Generate and deploy x509 certificates for TLS.
+
 `RPM deployment <rpm-deployment.html>`__
    Explanation of the different RPM packages and illustration of which to
    pick for installation
diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build
index d632f9bda1..4114fc81d1 100644
--- a/docs/kbase/meson.build
+++ b/docs/kbase/meson.build
@@ -20,6 +20,7 @@ docs_kbase_files = [
   'secureusage',
   'snapshots',
   'systemtap',
+  'tlscerts',
   'virtiofs',
 ]

diff --git a/docs/tlscerts.rst b/docs/kbase/tlscerts.rst
similarity index 100%
rename from docs/tlscerts.rst
rename to docs/kbase/tlscerts.rst
diff --git a/docs/meson.build b/docs/meson.build
index 8b174fe41e..d738da85f2 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -109,7 +109,6 @@ docs_rst_files = [
   'testapi',
   'testsuites',
   'testtck',
-  'tlscerts',
 ]

 # list of web targets to build for docs/web rule
diff --git a/docs/remote.html.in b/docs/remote.html.in
index 47fb2d4df3..3a5258a0d5 100644
--- a/docs/remote.html.in
+++ b/docs/remote.html.in
@@ -61,7 +61,7 @@ Remote libvirt supports a range of transports:
       <dd><a href="https://en.wikipedia.org/wiki/Transport_Layer_Security" title="Transport Layer Security">TLS</a>
  1.0 (SSL 3.1) authenticated and encrypted TCP/IP socket, usually
  listening on a public port number.  To use this you will need to
- <a href="tlscerts.html" title="Generating TLS certificates">generate client and
+ <a href="kbase/tlscerts.html" title="Generating TLS certificates">generate client and
  server certificates</a>.
  The standard port is 16514.
  </dd>
-- 
2.35.1