[master] Merge branch 'trac5212' (config comments # -> //)

# Conflicts:
#	doc/examples/kea4/reservations.json
#	doc/examples/kea6/reservations.json

diff --cc doc/examples/kea4/reservations.json
index c61ac5c57325ffb0e9e7a73f2ab580e5814fb6ae,27e667da5324a155563c50be52d60797883d8918..6fb60898b7c3a1f0ae1bfd8e243eaa7110080583
--- 1/doc/examples/kea4/reservations.json
--- 2/doc/examples/kea4/reservations.json
+++ b/doc/examples/kea4/reservations.json
@@@ -9,10 -9,10 +9,10 @@@
      "interfaces": [ "ethX" ]
    },
  
--// We need to specify the the database used to store leases. As of
--// September 2016, four database backends are supported: MySQL,
--// PostgreSQL, Cassandra, and the in-memory database, Memfile.
--// We'll use memfile  because it doesn't require any prior set up.
++// We need to specify the the database used to store leases. As of September
++// 2016, four database backends are supported: MySQL, PostgreSQL, Cassandra, and
++// the in-memory database, Memfile.  We'll use memfile because it doesn't
++// require any prior set up.
    "lease-database": {
        "type": "memfile",
        "lfc-interval": 3600
@@@ -28,15 -28,15 +28,15 @@@
  //  "renew-timer": 1000,
  //  "rebind-timer": 2000,
  
--
 -// Kea supports reservations by several different types of
 -// identifiers: hw-address (hardware/MAC address of the client), duid
 -// (DUID inserted by the client), client-id (client identifier inserted
 -// by the client) and circuit-id (circuit identifier inserted by the
 -// relay agent). When told to do so, Kea can check for all of those
 -// identifier types, but it takes a costly database lookup to do so. It
 -// is therefore useful from a performance perspective to use only the
 -// reservation types that are actually used in a given network.
 +// Kea supports reservations by several different types of identifiers:
 +// hw-address (hardware/MAC address of the client), duid (DUID inserted by the
 +// client), client-id (client identifier inserted by the client), circuit-id
- // (circuit identifier inserted by the relay agent) and flex-id (flexible identifier
- // available when flex_id hook library is loaded). When told to do so, Kea can
- // check for all of those identifier types, but it takes a costly database lookup
- // to do so. It is therefore useful from a performance perspective to use only
- // the reservation types that are actually used in a given network.
++// (circuit identifier inserted by the relay agent) and flex-id (flexible
++// identifier available when flex_id hook library is loaded). When told to do
++// so, Kea can check for all of those identifier types, but it takes a costly
++// database lookup to do so. It is therefore useful from a performance
++// perspective to use only the reservation types that are actually used in a
++// given network.
  
  // The example below is not optimal from a performance perspective, but it
  // nicely showcases the host reservation capabilities. Please use the minimum

diff --cc doc/examples/kea6/reservations.json
index 770e9dfa4d057036df4979c048c37429524471f8,a879056c95dabaab2775bfce54f8132fb0bbad46..83663d6da775356a6987bbb3394d74df12f69d9f
--- 1/doc/examples/kea6/reservations.json
--- 2/doc/examples/kea6/reservations.json
+++ b/doc/examples/kea6/reservations.json
@@@ -27,13 -27,13 +27,14 @@@
    "renew-timer": 1000,
    "rebind-timer": 2000,
  
- // Kea supports three types of identifiers in DHCPv6: hw-address (hardware/MAC address
- // of the client), duid (DUID inserted by the client) and flex-id (flexible identifier
- // available when flex_id hook library is loaded) When told to do so, Kea can
- // check for each of these identifier types, but it takes a costly database lookup
- // to do so. It is therefore useful from a performance perspective to use only
- // the reservation types that are actually used in a given network.
 -// Kea supports two types of identifiers in DHCPv6: hw-address
 -// (hardware/MAC address of the client) and duid (DUID inserted by the
 -// client). When told to do so, Kea can check for each of these
 -// identifier types, but it takes a costly database lookup to do so. It
 -// is therefore useful from a performance perspective to use only the
 -// reservation types that are actually used in a given network.
 -    "host-reservation-identifiers": [ "duid", "hw-address" ],
++// Kea supports three types of identifiers in DHCPv6: hw-address (hardware/MAC
++// address of the client), duid (DUID inserted by the client) and flex-id
++// (flexible identifier available when flex_id hook library is loaded) When told
++// to do so, Kea can check for each of these identifier types, but it takes a
++// costly database lookup to do so. It is therefore useful from a performance
++// perspective to use only the reservation types that are actually used in a
++// given network.
 +    "host-reservation-identifiers": [ "duid", "hw-address", "flex-id" ],
  
  // The following list defines subnets. Subnet, pools and interface definitions
  // are the same as in the regular scenario, without host reservations.