From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 13 Feb 2017 19:06:45 +0000 (+0100)
Subject: [master] Merge branch 'trac5112' (Developer's Guide page for parsers)
X-Git-Tag: trac4070_base~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44139d821c1f4e43dbff22d49101a0854e4f9f5b;p=thirdparty%2Fkea.git

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

44139d821c1f4e43dbff22d49101a0854e4f9f5b
diff --cc doc/Makefile.am
index f67b2bc9ba,c00f981175..71c38ddcab
--- a/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