[v1_1_0] fixes in documentation

diff --git a/doc/devel/contribute.dox b/doc/devel/contribute.dox
index 62331ef0fd744b3853b52c67572310bc955b5217..b213afa973c5acedd3c3e6c0e10ada31dce268c8 100644 (file)
--- a/doc/devel/contribute.dox
+++ b/doc/devel/contribute.dox
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-201666666 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index c4179a3b1e10e94dd36c7721c378f9269c71c1a5..dd14d8af7c9c288fe01372b3957eb2821c8f6dcc 100644 (file)
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -3669,16 +3669,6 @@ src/lib/dhcpsrv/cfg_host_operations.cc -->
       are implications of the design choices made. Those are clearly
       marked as such.</para>
       <itemizedlist>
-          <listitem> <!-- see tickets #3234, #3281 -->
-            <simpara>
-              Removal of a subnet during server reconfiguration may cause renumbering
-              of auto-generated subnet identifiers, as described in section
-              <xref linkend="ipv4-subnet-id"/>.
-            </simpara>
-          </listitem>
-          <listitem>
-            <simpara>Host reservation (static addresses) is not supported yet.</simpara>
-          </listitem>
           <listitem>
             <simpara>
               BOOTP (<ulink url="http://tools.ietf.org/html/rfc951">RFC 951</ulink>)

diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index 0e6b319f42e1245905103192e4401493fb155600..96300c8801e76cd6b6acf77e34c09904ecad3f7b 100644 (file)
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -3821,22 +3821,6 @@ should include options from the isc option space:
       development and should be treated as <quote>not implemented
       yet</quote>, rather than actual limitations.</para>
       <itemizedlist>
-          <listitem> <!-- see tickets #3234, #3281 -->
-            <para>
-              On-line configuration has some limitations. Adding new subnets or
-              modifying existing ones work, as is removing the last subnet from
-              the list. However, removing non-last (e.g. removing subnet 1,2 or 3 if
-              there are 4 subnets configured) will cause issues. The problem is
-              caused by simplistic subnet-id assignment. The subnets are always
-              numbered, starting from 1. That subnet-id is then used in leases
-              that are stored in the lease database. Removing non-last subnet will
-              cause the configuration information to mismatch data in the lease
-              database. It is possible to manually update subnet-id fields in
-              MySQL, PostgreSQL or CQL database, but it is awkward and
-              error prone process. A better reconfiguration support is planned.
-            </para>
-          </listitem>
-
         <listitem>
           <simpara>
             The server will allocate, renew or rebind a maximum of one lease