[#309,ssh bikeshed.isc.org] removed static kea versions from xml files

diff --git a/doc/guide/ctrl-channel.xml b/doc/guide/ctrl-channel.xml
index 7407c5d31334ffa262fe093670dd606fea9dbbdc..0fdf8e83408b178ccd9aa56359f047b6fddbcaec 100644 (file)
--- a/doc/guide/ctrl-channel.xml
+++ b/doc/guide/ctrl-channel.xml
@@ -24,9 +24,7 @@
     on-line reconfiguration without requiring server shutdown.
     Both servers can be instructed to open control sockets, which
     is a communication channel. The server is able to receive
-    commands on that channel, act on them and report back status.
-    While the set of commands in Kea 1.2.0 is limited,
-    the number is expected to grow over time.</para>
+    commands on that channel, act on them and report back status.</para>
 
     <para>The DHCPv4 and DHCPv6 servers receive commands over the
     unix domain sockets. The details how to configure these sockets,

diff --git a/doc/guide/hooks-radius.xml b/doc/guide/hooks-radius.xml
index edd2e261b8b916120a7b92767566dba385efbc7c..adc379fdce64a829ae37630f1e84c19759934d8b 100644 (file)
--- a/doc/guide/hooks-radius.xml
+++ b/doc/guide/hooks-radius.xml
@@ -8,7 +8,11 @@
  - This license applies to the documentation itself, not the software.
 -->
 
-
+<!-- need this include to make the &keaversion; macro work -->
+<!DOCTYPE book [
+<!ENTITY % keaversion SYSTEM "version.ent">
+%keaversion;
+]>
 
 <section xml:id="hooks-radius">
   <title>radius: RADIUS server support</title>
@@ -153,7 +157,7 @@ $ sudo ./b2 install
 $ git clone https://github.com/isc-projects/kea
 
 # Get a tarball and extract it
-$ tar zxvf kea-1.4.0.tar.gz
+$ tar zxvf kea-%keaversion;.tar.gz
 </screen>
 
 The next step is to extract premium Kea package that contains Radius repository
@@ -162,7 +166,7 @@ a premium/ subdirectory.
 
 <screen>
   $ cd kea
-  $ tar zxvf ../kea-premium-radius-1.4.0.tar.gz
+  $ tar zxvf ../kea-premium-radius-%keaversion;.tar.gz
 </screen>
 
 Once this is done, make sure the kea sources look similar to this:
@@ -222,8 +226,8 @@ should look as follows:</para>
 
 Package:
   Name:              kea
-  Version:           1.4.0-git
-  Extended version:  1.4.0-git (git ab3cb8afbb7a4cdaa9cbb279fd783aa126a7912a)
+  Version:           %keaversion;
+  Extended version:  %keaversion; (tarball)
   OS Family:         Linux
 
   Hooks directory:   /usr/local/lib/hooks

diff --git a/doc/guide/hooks.xml b/doc/guide/hooks.xml
index 48f3c8d151dae3d6f1af5159e3f4a492ae1ca714..995659aba72554e16f53f4deea598823a5831c0c 100644 (file)
--- a/doc/guide/hooks.xml
+++ b/doc/guide/hooks.xml
@@ -6,6 +6,12 @@
  - file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
+<!-- need this include to make the &keaversion; macro work -->
+<!DOCTYPE book [
+<!ENTITY % keaversion SYSTEM "version.ent">
+%keaversion;
+]>
+
 <!-- Converted by db4-upgrade version 1.1 -->
 <chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="hooks-libraries">
 
@@ -85,7 +91,7 @@
       <para>
         1. Download the package. You will receive detailed instructions how to
         get it separately. This will be a file with a name similar to
-        kea-premium-1.4.0.tar.gz. Your name may differ depending on which
+        kea-premium-%keaversion;.tar.gz. Your name may differ depending on which
         package you got.
       </para>
 
@@ -94,26 +100,26 @@
         open-source Kea package still on your system (from when you installed
         Kea), skip this step.  Otherwise extract the Kea source from the
         original tarball you downloaded.  For example, if you downloaded Kea
-        1.4.0., you should have a tarball called kea-1.4.0.tar.gz on your
+        %keaversion;., you should have a tarball called kea-%keaversion;.tar.gz on your
         system. Unpack this tarball:
 
 <screen>
-$ <userinput>tar zxvf kea-1.5.0.tar.gz</userinput>
+$ <userinput>tar zxvf kea-%keaversion;.tar.gz</userinput>
 </screen>
 
-        This will unpack the tarball into the kea-1.5.0 subdirectory of your
+        This will unpack the tarball into the kea-%keaversion; subdirectory of your
         current working directory.
       </para>
 
       <para>
         3. Unpack the Kea premium tarball into the directory into which Kea was
         unpacked. For example, assuming that you followed step 2 and that Kea
-        1.5.0 has been unpacked into a kea-1.5.0 subdirectory and that the Kea
-        premium tarball is in your current directory, the following steps will
+        %keaversion; has been unpacked into a kea-%keaversion; subdirectory and that
+        the Kea premium tarball is in your current directory, the following steps will
         unpack the premium tarball into the correct location:
 <screen>
-  $ <userinput>cd kea-1.5.0</userinput>
-  $ <userinput>tar xvf ../kea-premium-1.5.0.tar.gz</userinput>
+  $ <userinput>cd kea-%keaversion;</userinput>
+  $ <userinput>tar xvf ../kea-premium-%keaversion;.tar.gz</userinput>
 </screen>
         Note that unpacking the Kea premium package will put the files into a
         directory named premium. Regardless of the name of your package, the
@@ -137,8 +143,8 @@ $ <userinput>tar zxvf kea-1.5.0.tar.gz</userinput>
 <screen>
 Package:
   Name:            kea
-  Version:         1.5.0
-  Extended version:1.5.0 (tarball)
+  Version:         %keaversion;
+  Extended version:%keaversion; (tarball)
   OS Family:       Linux
   Using GNU sed:   yes
   Premium package: yes
@@ -237,7 +243,7 @@ $ <userinput>ls -l /usr/local/lib/hooks/*.so</userinput>
 
         <note>
           <para>
-          The library reloading behavior has changed in Kea 1.1. Libraries are
+          The library reloading behavior has changed in Kea 1.1.0. Libraries are
           reloaded, even if their list hasn't changed. Kea does that, because
           the parameters specified for the library (or the files those
           parameters point to) may have changed.

diff --git a/doc/guide/intro.xml b/doc/guide/intro.xml
index fa279ee53cfb479bf4f370bd3b355ae68b897931..b078df0d1eaf74d8e00d03abe0aef3d0e93c0b43 100644 (file)
--- a/doc/guide/intro.xml
+++ b/doc/guide/intro.xml
@@ -35,7 +35,7 @@
       <title>Supported Platforms</title>
       <para>
         Kea is officially supported on CentOS, Fedora, Ubuntu, Debian and FreeBSD systems.
-        It is also likely to work on many other platforms. Kea 1.5.0 builds have been tested on:
+        It is also likely to work on many other platforms. Kea-%keaversion; builds have been tested on:
         <itemizedlist>
           <listitem>CentOS Linux — 7.1804 (aka 7.5)</listitem>
           <listitem>Fedora — 27, 28</listitem>