[master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.59])
-AC_INIT(bind10, 20121219, bind10-dev@isc.org)
+AC_INIT(bind10, 20130205, bind10-dev@isc.org)
 AC_CONFIG_SRCDIR(README)
 # serial-tests is not available in automake version before 1.13. In
 # automake 1.13 and higher, AM_PROG_INSTALL is undefined, so we'll check

src/bin/bind10/b10-init.xml

@@ -20,7 +20,7 @@
 <refentry>
 
   <refentryinfo>
-    <date>April 12, 2012</date>
+    <date>February 5, 2013</date>
   </refentryinfo>
 
   <refmeta>
@@ -36,7 +36,7 @@
 
   <docinfo>
     <copyright>
-      <year>2010-2012</year>
+      <year>2010-2013</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>
@@ -493,7 +493,10 @@ xfrin
 
   <refsect1 id='history'><title>HISTORY</title>
     <para>The development of <command>b10-init</command>
-    was started in October 2009.</para>
+      was started in October 2009.
+      It was renamed and its configuration identifier changed
+      in February 2013.
+    </para>
   </refsect1>
 
   <refsect1>

src/bin/bind10/bind10.xml

@@ -20,7 +20,7 @@
 <refentry>
 
   <refentryinfo>
-    <date>April 12, 2012</date>
+    <date>February 5, 2013</date>
   </refentryinfo>
 
   <refmeta>
@@ -52,7 +52,7 @@
     <title>DESCRIPTION</title>
 
     <para>The <command>bind10</command> script is a simple wrapper that
-    starts BIND10 by running the <command>b10-init</command> daemon. All
+    starts BIND 10 by running the <command>b10-init</command> daemon. All
     options passed to <command>bind10</command> are directly passed on to
     <command>b10-init</command>.</para>
 
@@ -62,14 +62,14 @@
     <title>SEE ALSO</title>
     <para>
       <citerefentry>
-        <refentrytitle>b10-init</refentrytitle><manvolnum>1</manvolnum>
+        <refentrytitle>b10-init</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citetitle>BIND 10 Guide</citetitle>.
     </para>
   </refsect1>
 
   <refsect1 id='history'><title>HISTORY</title>
-    <para>The <command>bind10</command> script was added in Januari 2013
+    <para>The <command>bind10</command> script was added in February 2013.
     </para>
   </refsect1>