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

diff --cc doc/guide/bind10-guide.xml
index e9dbecaa15a8370a54865672da77e996a7607a62,6851931908db2d2820928a47d793e5c50e420d5b..3a736959e63d15d05afe7c6af330d4b1d97b58fe
--- 1/doc/guide/bind10-guide.xml
--- 2/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 ... -->
  

diff --cc src/bin/ddns/ddns_messages.mes
Simple merge