From: Francis Dupont <fdupont@isc.org>
Date: Wed, 11 Apr 2018 14:54:26 +0000 (+0200)
Subject: [master] Fixed merge error
X-Git-Tag: trac5458a_base~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac985a805acf929633f3c61b8675d247a25f8eec;p=thirdparty%2Fkea.git

[master] Fixed merge error
---

diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index 9199ad5009..a7bd2902d6 100644
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -2223,6 +2223,8 @@ should include options from the isc option space:
       users from playing with their cable modems. For details on how to set up
       class restrictions on subnets, see <xref linkend="classification-subnets"/>.
       </para>
+
+      <para>
       When subnets belong to a shared network the classification applies
       to subnet selection but not to pools, e.g., a pool in a subnet
       limited to a particular class can still be used by clients which do not