New upstream version 1.3.0~rc5upstream/1.3.0_rc5

9 files changed, 34 insertions, 33 deletions

diff --git a/man/Makefile.in b/man/Makefile.in
index 67abfaa..6a193fb 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -59,10 +58,10 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_ext.m4 \
 	$(top_srcdir)/m4/ax_gcc_x86_cpuid.m4 \
-	$(top_srcdir)/m4/ax_recvmmsg.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -70,12 +69,18 @@ CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES = khost.1 knotc.8 knotd.8 kdig.1 knsupdate.1 \
 	knot.conf.5
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -441,6 +446,8 @@ TAGS:
 ctags: CTAGS
 CTAGS:
 
+cscope cscopelist:
+
 
 distdir: $(DISTFILES)
 	@list='$(MANS)'; if test -n "$$list"; then \
@@ -449,10 +456,10 @@ distdir: $(DISTFILES)
 	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
 	  if test -n "$$list" && \
 	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
 	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
 	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
 	    exit 1; \
 	  else :; fi; \
 	else :; fi
diff --git a/man/kdig.1 b/man/kdig.1
index 53b0779..840b350 100644
--- a/man/kdig.1
+++ b/man/kdig.1
@@ -1,4 +1,4 @@
-.TH "kdig" "1" "15 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc4"
+.TH "kdig" "1" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
 .SH NAME
 .TP 5
 .B kdig
diff --git a/man/khost.1 b/man/khost.1
index 9d4a2c4..a3d0728 100644
--- a/man/khost.1
+++ b/man/khost.1
@@ -1,4 +1,4 @@
-.TH "khost" "1" "15 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc4"
+.TH "khost" "1" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
 .SH NAME
 .TP 6
 .B khost
diff --git a/man/knot.conf.5 b/man/knot.conf.5
index de5ce64..02db6f3 100644
--- a/man/knot.conf.5
+++ b/man/knot.conf.5
@@ -1,4 +1,4 @@
-.TH "knot.conf" "5" "15 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc4"
+.TH "knot.conf" "5" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
 .SH "NAME"
 .LP
 .B knot.conf
@@ -34,12 +34,12 @@ serves as an example of the configuration for knotc(8) and knotd(8).
   # Or hexstring 0x01ab00
   nsid "myserver0";
 
-  # Working directory of the server
-  # Used to store compiled zones and PID file
-  # default: ${sharedstatedir}/knot, configured with --with-storage
+  # This is a default directory to place slave zone files, journals etc.
+  # default: ${localstatedir}/lib/knot, configured with --with-storage
   storage "/var/lib/knot";
 
   # Directory for storing run-time data
+  # e.g. PID file and control sockets
   # default: ${localstatedir}/run/knot, configured with --with-rundir
   rundir "/var/run/knot";
 
@@ -94,8 +94,8 @@ serves as an example of the configuration for knotc(8) and knotd(8).
   # Rate limit SLIP
   # Each Nth blocked response will be sent as truncated, this is a way to allow
   # legitimate requests to get a chance to reconnect using TCP
-  # Default: 2
-  rate-limit-slip 2;
+  # Default: 1
+  rate-limit-slip 1;
  }
 
  # Includes can be placed anywhere at any level in the configuration file. The
diff --git a/man/knot.conf.5.in b/man/knot.conf.5.in
index 2ccc767..7f85bba 100644
--- a/man/knot.conf.5.in
+++ b/man/knot.conf.5.in
@@ -34,12 +34,12 @@ serves as an example of the configuration for knotc(8) and knotd(8).
   # Or hexstring 0x01ab00
   nsid "myserver0";
 
-  # Working directory of the server
-  # Used to store compiled zones and PID file
-  # default: ${sharedstatedir}/knot, configured with --with-storage
+  # This is a default directory to place slave zone files, journals etc.
+  # default: ${localstatedir}/lib/knot, configured with --with-storage
   storage "/var/lib/knot";
 
   # Directory for storing run-time data
+  # e.g. PID file and control sockets
   # default: ${localstatedir}/run/knot, configured with --with-rundir
   rundir "/var/run/knot";
 
@@ -94,8 +94,8 @@ serves as an example of the configuration for knotc(8) and knotd(8).
   # Rate limit SLIP
   # Each Nth blocked response will be sent as truncated, this is a way to allow
   # legitimate requests to get a chance to reconnect using TCP
-  # Default: 2
-  rate-limit-slip 2;
+  # Default: 1
+  rate-limit-slip 1;
  }
 
  # Includes can be placed anywhere at any level in the configuration file. The
diff --git a/man/knotc.8 b/man/knotc.8
index 3d5c398..b50afbf 100644
--- a/man/knotc.8
+++ b/man/knotc.8
@@ -1,4 +1,4 @@
-.TH knotc "8" "15 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc4"
+.TH knotc "8" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
 .SH NAME
 .B knotc
 \- Knot DNS control utility
@@ -29,9 +29,6 @@ Verbose mode \- additional runtime information.
 \fB\-V\fR, \fB\-\-version\fR
 Print knot server version.
 .TP
-\fB\-w\fR, \fB\-\-wait\fR
-Wait for the server to finish stop operation.
-.TP
 \fB\-i\fR, \fB\-\-interactive\fR
 Interactive mode (do not daemonize).
 .TP
diff --git a/man/knotc.8.in b/man/knotc.8.in
index 343fd02..9717358 100644
--- a/man/knotc.8.in
+++ b/man/knotc.8.in
@@ -29,9 +29,6 @@ Verbose mode \- additional runtime information.
 \fB\-V\fR, \fB\-\-version\fR
 Print knot server version.
 .TP
-\fB\-w\fR, \fB\-\-wait\fR
-Wait for the server to finish stop operation.
-.TP
 \fB\-i\fR, \fB\-\-interactive\fR
 Interactive mode (do not daemonize).
 .TP
diff --git a/man/knotd.8 b/man/knotd.8
index 59ff8b5..105974a 100644
--- a/man/knotd.8
+++ b/man/knotd.8
@@ -1,4 +1,4 @@
-.TH "knotd" "8" "15 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc4"
+.TH "knotd" "8" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
 .SH NAME
 .B knotd
 \- Knot DNS daemon
diff --git a/man/knsupdate.1 b/man/knsupdate.1
index c402b31..1c90320 100644
--- a/man/knsupdate.1
+++ b/man/knsupdate.1
@@ -1,4 +1,4 @@
-.TH "knsupdate" "1" "15 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc4"
+.TH "knsupdate" "1" "29 July 2013" "CZ.NIC Labs" "Knot DNS, version 1.3.0-rc5"
 .SH NAME
 .TP 10
 .B knsupdate