Commit 1202e2c1 authored by JINMEI Tatuya's avatar JINMEI Tatuya

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

parents fa862e7d ea85b4ab
......@@ -62,7 +62,7 @@ bind10-devel-20120301 released on March 1, 2012
382. [func] jelte
b10-auth now also experimentally supports statistics counters of
the rcode reponses it sends. The counters can be shown as
the rcode responses it sends. The counters can be shown as
rcode.<code name>, where code name is the lowercase textual
representation of the rcode (e.g. "noerror", "formerr", etc.).
Same note applies as for opcodes, see changelog entry 364.
......
......@@ -1019,7 +1019,7 @@ Unix domain sockets
<!-- TODO -->
<note>
<para>
The development prototype release only provides the
The development prototype release only provides
<command>bindctl</command> as a user interface to
<command>b10-cmdctl</command>.
Upcoming releases will provide another interactive command-line
......@@ -1210,7 +1210,7 @@ or accounts database -->
The port can be set by using the <option>--port</option> command line option.
The address to listen on can be set using the <option>--address</option> command
line argument.
Each HTTPS connection is stateless and timesout in 1200 seconds
Each HTTPS connection is stateless and times out in 1200 seconds
by default. This can be
redefined by using the <option>--idle-timeout</option> command line argument.
</para>
......@@ -2371,7 +2371,7 @@ eth0 fe80::21e:8cff:fe9b:7349
In the Logging module, you can specify the configuration
for zero or more loggers; any that are not specified will
take appropriate default values..
take appropriate default values.
</para>
......
......@@ -10,6 +10,8 @@ duplicateExpression:src/lib/dns/tests/name_unittest.cc:569
duplicateExpression:src/lib/dns/tests/name_unittest.cc:580
duplicateExpression:src/lib/dns/tests/rrttl_unittest.cc:164
duplicateExpression:src/lib/dns/tests/rrttl_unittest.cc:175
duplicateExpression:src/lib/dns/tests/name_unittest.cc:568
duplicateExpression:src/lib/dns/tests/name_unittest.cc:579
// Intentional self-comparisons
uselessCallsCompare:src/lib/dns/tests/rdata_dhcid_unittest.cc:96
......@@ -17,3 +19,4 @@ uselessCallsCompare:src/lib/dns/tests/rdata_in_a_unittest.cc:98
uselessCallsCompare:src/lib/dns/tests/rdata_in_aaaa_unittest.cc:94
uselessCallsCompare:src/lib/dns/tests/rdata_mx_unittest.cc:104
uselessCallsCompare:src/lib/dns/tests/rdata_unittest.cc:254
uselessCallsCompare:src/lib/dns/tests/rdata_unittest.cc:253
......@@ -73,6 +73,7 @@ StaticDataSrcImpl::StaticDataSrcImpl() :
authors->addRdata(generic::TXT("Dmitriy Volodin"));
authors->addRdata(generic::TXT("Evan Hunt"));
authors->addRdata(generic::TXT("Haidong Wang")); // Ocean
authors->addRdata(generic::TXT("Haikuo Zhang"));
authors->addRdata(generic::TXT("Han Feng"));
authors->addRdata(generic::TXT("Jelte Jansen"));
authors->addRdata(generic::TXT("Jeremy C. Reed"));
......
......@@ -56,6 +56,7 @@ protected:
authors_data.push_back("Dmitriy Volodin");
authors_data.push_back("Evan Hunt");
authors_data.push_back("Haidong Wang");
authors_data.push_back("Haikuo Zhang");
authors_data.push_back("Han Feng");
authors_data.push_back("Jelte Jansen");
authors_data.push_back("Jeremy C. Reed");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment