Conflicts:
doc/devel/mainpage.dox
src/bin/dhcp4/ctrl_dhcp4_srv.h
src/bin/dhcp4/dhcp4_srv.h
src/bin/dhcp6/dhcp6.dox
Also modified the following files during the
resolution of the merge issues:
src/bin/dhcp4/config_parser.cc
src/bin/dhcp4/ctrl_dhcp4_srv.cc
src/bin/dhcp4/dhcp4.dox
src/bin/dhcp6/config_parser.cc
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
src/lib/dhcp/option_custom.h
src/lib/dhcp/pkt4.h
src/lib/dhcpsrv/database_backends.dox
instead of separately configured keys;
with this change, the Xfrin/zones[X]/tsig_key value is not interpreted as a full key string, but as the name to look up in the /tsig_keys/keys list (like acls do)
some of the changes are unrelated to this branch, but they
were minor and I noticed while reviewing.
grammar improvements
remove unuseful shutdown examples
add some docbook formatting tags
commented out an empty TODO section.
Remove some references to experimental, development, prototype
Mention that bind10 doesn't start the DNS or DHCP servers by default.
Also reword a couple sentences so this is not implied.
This is for ticket #2451.
This was not reviewed. The changes are minor.
This split is done so the bindctl chapter comes before
the chapter on using bindctl to configure Boss/components.
Discussed via jabber and in ticket #2305.
Also added some brief content on how to stop bind10 and how to list
processes.
add some docbook formatting tags
minor formatting changes.
bindctl -a defaults to 127.0.0.1 not localhost
add a space between "BIND 10"
some rewording
a few punctuation changes
add a sentence to describe an example
Conflicts:
doc/devel/mainpage.dox
src/lib/dhcp/Makefile.am
src/lib/dhcp/lease_mgr.cc
src/lib/dhcp/lease_mgr.h
src/lib/dhcp/tests/Makefile.am
src/lib/dhcp/tests/lease_mgr_unittest.cc
A number of other files were modified to resolve incompatibilities
in the way lease managers were created, and to promote the dummy
"memfile" lease manager to a fully-fledged lease manager with
unit tests.
minor grammar or wording changes
use mdash xml entity instead of unicode character
fix typo for Trac
fix example out of the configuration name
use xref tag instead of link tag (so reference is not lost in non-hyperlink
document)
keyring to key ring
fix punctuation (mistake in original)
minor grammar (mistake also in original)
