From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 10 Jul 2017 12:59:17 +0000 (+0200)
Subject: [5108] Removed notes about kea-ca.conf from the User's Guide.
X-Git-Tag: trac5333_base~2^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a379bdae3801c435e21a39bbe3190cee28a7613e;p=thirdparty%2Fkea.git

[5108] Removed notes about kea-ca.conf from the User's Guide.
---

diff --git a/doc/guide/agent.xml b/doc/guide/agent.xml
index d14dbe3faa..3ce04ae7f7 100644
--- a/doc/guide/agent.xml
+++ b/doc/guide/agent.xml
@@ -93,17 +93,6 @@
 }</screen>
     </para>
 
-    <warning>
-      <simpara>
-        In the Kea 1.2 release the Control Agent configuration can't be
-        specified within the same configuration file as DHCPv4, DHCPv6 and D2
-        configuration. The default configuration file for the CA is installed
-        in the <filename>etc/kea/kea-ca.conf</filename>. In the Kea 1.2 final
-        release the CA configuration will be merged into the default
-        <filename>etc/kea/kea.conf.</filename>
-      </simpara>
-    </warning>
-
     <para>
       The <command>http-host</command> and <command>http-port</command>
       specify an IP address and port to which HTTP service will be bound.
@@ -284,16 +273,8 @@ http {
     <title>Control Agent Limitations</title>
     <para>
       Control Agent is a new component, first released in Kea 1.2. In
-      this release it comes with two notable limitations:
+      this release it comes with one notable limitation:
       <itemizedlist>
-        <listitem>
-          <simpara>
-            CA configuration must be specified in a separate configuration file
-            from the configurations of other components. The default confirguation
-            file for CA is located in <filename>etc/kea/kea-ca.conf</filename>.
-          </simpara>
-        </listitem>
-
         <listitem>
           <simpara>
             keactrl hasn't been updated to manage the Control Agent (start, stop
@@ -311,7 +292,7 @@ http {
       The CA is started by running its binary and specifying the configuration file
       it should use. For example:
 <screen>
-$ ./kea-ctrl-agent -c /usr/local/etc/kea/kea-ca.conf
+$ ./kea-ctrl-agent -c /usr/local/etc/kea/kea.conf
 </screen>
     </para>
   </section>