[master] Merge branch 'trac5112' (Developer's Guide page for parsers)

diff --cc doc/Makefile.am
index f67b2bc9bafe3e6f3c78832e3d1f51133f1d659f,c00f981175c40ae5243fde0a43df9c36fe78f315..71c38ddcab5eb83c98d40c997a9b28cac0c86849
--- 1/doc/Makefile.am
--- 2/doc/Makefile.am
+++ b/doc/Makefile.am
@@@ -4,10 -5,10 +5,11 @@@ EXTRA_DIST += devel/bison.do
  EXTRA_DIST += devel/config-backend.dox
  EXTRA_DIST += devel/contribute.dox
  EXTRA_DIST += devel/mainpage.dox
+ EXTRA_DIST += devel/terminology.dox
  EXTRA_DIST += devel/unit-tests.dox
  
 -nobase_dist_doc_DATA  = examples/ddns/sample1.json
 +nobase_dist_doc_DATA  = examples/agent/simple.json
 +nobase_dist_doc_DATA += examples/ddns/sample1.json
  nobase_dist_doc_DATA += examples/ddns/template.json
  nobase_dist_doc_DATA += examples/kea4/advanced.json
  nobase_dist_doc_DATA += examples/kea4/backends.json

diff --cc src/bin/dhcp6/dhcp6.dox
Simple merge