From b2f07642fd712c8fda81a116bcdde229ab291f33 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Thu, 14 Mar 2013 01:04:33 +0000 Subject: [PATCH] regen master --- FAQ | 2 +- FAQ.xml | 1 - bin/confgen/rndc-confgen.8 | 13 +- bin/confgen/rndc-confgen.docbook | 1 - bin/confgen/rndc-confgen.html | 23 ++- bin/rndc/rndc.8 | 6 +- bin/rndc/rndc.conf.5 | 14 +- bin/rndc/rndc.conf.docbook | 1 - bin/rndc/rndc.conf.html | 27 ++-- bin/rndc/rndc.docbook | 1 - bin/rndc/rndc.html | 26 ++-- doc/arm/Bv9ARM.ch03.html | 16 +- doc/arm/Bv9ARM.ch04.html | 172 ++++++++++----------- doc/arm/Bv9ARM.ch05.html | 4 +- doc/arm/Bv9ARM.ch06.html | 188 +++++++++++++---------- doc/arm/Bv9ARM.ch07.html | 12 +- doc/arm/Bv9ARM.ch08.html | 16 +- doc/arm/Bv9ARM.ch09.html | 218 +++++++++++++-------------- doc/arm/Bv9ARM.html | 164 ++++++++++---------- doc/arm/man.arpaname.html | 6 +- doc/arm/man.ddns-confgen.html | 8 +- doc/arm/man.dig.html | 18 +-- doc/arm/man.dnssec-dsfromkey.html | 14 +- doc/arm/man.dnssec-keyfromlabel.html | 12 +- doc/arm/man.dnssec-keygen.html | 14 +- doc/arm/man.dnssec-revoke.html | 8 +- doc/arm/man.dnssec-settime.html | 12 +- doc/arm/man.dnssec-signzone.html | 10 +- doc/arm/man.dnssec-verify.html | 8 +- doc/arm/man.genrandom.html | 8 +- doc/arm/man.host.html | 8 +- doc/arm/man.isc-hmac-fixup.html | 8 +- doc/arm/man.named-checkconf.html | 10 +- doc/arm/man.named-checkzone.html | 10 +- doc/arm/man.named-journalprint.html | 6 +- doc/arm/man.named.html | 14 +- doc/arm/man.nsec3hash.html | 8 +- doc/arm/man.nsupdate.html | 12 +- doc/arm/man.rndc-confgen.html | 21 ++- doc/arm/man.rndc.conf.html | 25 +-- doc/arm/man.rndc.html | 24 +-- 41 files changed, 612 insertions(+), 557 deletions(-) diff --git a/FAQ b/FAQ index ad31e544bd..5e86a082f5 100644 --- a/FAQ +++ b/FAQ @@ -1,6 +1,6 @@ Frequently Asked Questions about BIND 9 -Copyright © 2004-2010 Internet Systems Consortium, Inc. ("ISC") +Copyright © 2004-2010, 2013 Internet Systems Consortium, Inc. ("ISC") Copyright © 2000-2003 Internet Software Consortium. diff --git a/FAQ.xml b/FAQ.xml index e31fbaa1b1..4face9e920 100644 --- a/FAQ.xml +++ b/FAQ.xml @@ -30,7 +30,6 @@ 2008 2009 2010 - 2013 Internet Systems Consortium, Inc. ("ISC") diff --git a/bin/confgen/rndc-confgen.8 b/bin/confgen/rndc-confgen.8 index faffdac4b5..49468ed5b2 100644 --- a/bin/confgen/rndc-confgen.8 +++ b/bin/confgen/rndc-confgen.8 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (C) 2004, 2005, 2007, 2009, 2013 Internet Systems Consortium, Inc. ("ISC") .\" Copyright (C) 2001, 2003 Internet Software Consortium. .\" .\" Permission to use, copy, modify, and/or distribute this software for any @@ -33,7 +33,7 @@ rndc\-confgen \- rndc key generation tool .SH "SYNOPSIS" .HP 13 -\fBrndc\-confgen\fR [\fB\-a\fR] [\fB\-b\ \fR\fB\fIkeysize\fR\fR] [\fB\-c\ \fR\fB\fIkeyfile\fR\fR] [\fB\-h\fR] [\fB\-k\ \fR\fB\fIkeyname\fR\fR] [\fB\-p\ \fR\fB\fIport\fR\fR] [\fB\-r\ \fR\fB\fIrandomfile\fR\fR] [\fB\-s\ \fR\fB\fIaddress\fR\fR] [\fB\-t\ \fR\fB\fIchrootdir\fR\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] +\fBrndc\-confgen\fR [\fB\-a\fR] [\fB\-A\ \fR\fB\fIalgorithm\fR\fR] [\fB\-b\ \fR\fB\fIkeysize\fR\fR] [\fB\-c\ \fR\fB\fIkeyfile\fR\fR] [\fB\-h\fR] [\fB\-k\ \fR\fB\fIkeyname\fR\fR] [\fB\-p\ \fR\fB\fIport\fR\fR] [\fB\-r\ \fR\fB\fIrandomfile\fR\fR] [\fB\-s\ \fR\fB\fIaddress\fR\fR] [\fB\-t\ \fR\fB\fIchrootdir\fR\fR] [\fB\-u\ \fR\fB\fIuser\fR\fR] .SH "DESCRIPTION" .PP \fBrndc\-confgen\fR @@ -103,9 +103,14 @@ and as directed. .RE .PP +\-A \fIalgorithm\fR +.RS 4 +Specifies the algorithm to use for the TSIG key. Available choices are: hmac\-md5, hmac\-sha1, hmac\-sha224, hmac\-sha256, hmac\-sha384 and hmac\-sha512. The default is hmac\-md5. +.RE +.PP \-b \fIkeysize\fR .RS 4 -Specifies the size of the authentication key in bits. Must be between 1 and 512 bits; the default is 128. +Specifies the size of the authentication key in bits. Must be between 1 and 512 bits; the default is the hash size. .RE .PP \-c \fIkeyfile\fR @@ -205,7 +210,7 @@ BIND 9 Administrator Reference Manual. .PP Internet Systems Consortium .SH "COPYRIGHT" -Copyright \(co 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") +Copyright \(co 2004, 2005, 2007, 2009, 2013 Internet Systems Consortium, Inc. ("ISC") .br Copyright \(co 2001, 2003 Internet Software Consortium. .br diff --git a/bin/confgen/rndc-confgen.docbook b/bin/confgen/rndc-confgen.docbook index f367b94aae..fe8a0789dc 100644 --- a/bin/confgen/rndc-confgen.docbook +++ b/bin/confgen/rndc-confgen.docbook @@ -41,7 +41,6 @@ 2005 2007 2009 - 2013 Internet Systems Consortium, Inc. ("ISC") diff --git a/bin/confgen/rndc-confgen.html b/bin/confgen/rndc-confgen.html index 03ee5199a1..f75170481a 100644 --- a/bin/confgen/rndc-confgen.html +++ b/bin/confgen/rndc-confgen.html @@ -1,5 +1,5 @@