From: JINMEI Tatuya <jinmei@isc.org>
Date: Tue, 19 Jun 2012 01:07:40 +0000 (-0700)
Subject: [master] Merge branch 'trac2005' with fixing conflicts in bind10-guide.xml.
X-Git-Tag: trac2351_base~226^2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1d760f18c2c638fd08e106dfb834b904a4a8e6b;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2005' with fixing conflicts in bind10-guide.xml.
---

b1d760f18c2c638fd08e106dfb834b904a4a8e6b
diff --cc doc/guide/bind10-guide.xml
index e9dbecaa15,6851931908..3a736959e6
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@@ -127,13 -128,11 +128,13 @@@
        </para>
  
        <para>
-         The <command>b10-xfrin</command>, <command>b10-xfrout</command>,
-         and <command>b10-zonemgr</command> components require the
-         libpython3 library and the Python _sqlite3.so module
-         (which is included with Python).
+         The <command>b10-ddns</command>, <command>b10-xfrin</command>,
+         <command>b10-xfrout</command>, and <command>b10-zonemgr</command>
+         components require the libpython3 library and the Python
+         _sqlite3.so module (which is included with Python).
 -        The Python module needs to be built for the corresponding Python 3.
 +        The <command>b10-stats-httpd</command> component uses the
 +        Python pyexpat.so module.
 +        The Python modules need to be built for the corresponding Python 3.
        </para>
  <!-- TODO: this will change ... -->