regen master

2025-08-29 05:28:00 +00:00 · 2016-07-26 01:07:05 +00:00 · 2016-07-26 01:07:05 +00:00 · 7ba3e5dc9e
commit 7ba3e5dc9e
parent 3fdd1a3462
4 changed files with 172 additions and 48 deletions
--- a/bin/tools/dnstap-read.1
+++ b/bin/tools/dnstap-read.1
@ -1,31 +1,21 @@
-.\" Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC")
 .\" 
-.\" Permission to use, copy, modify, and/or distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-.\" PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id$
+.\" This Source Code Form is subject to the terms of the Mozilla Public
+.\" License, v. 2.0. If a copy of the MPL was not distributed with this
+.\" file, You can obtain one at http://mozilla.org/MPL/2.0/.
 .\"
 .hy 0
 .ad l
 '\" t
 .\"     Title: dnstap-read
-.\"    Author: [see the "AUTHOR" section]
+.\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: September 13, 2015
+.\"      Date: 2015-09-13
 .\"    Manual: BIND9
-.\"    Source: BIND9
+.\"    Source: ISC
 .\"  Language: English
 .\"
-.TH "DNSTAP\-READ" "1" "September 13, 2015" "BIND9" "BIND9"
+.TH "DNSTAP\-READ" "1" "2015\-09\-13" "ISC" "BIND9"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -48,7 +38,7 @@
 .SH "NAME"
 dnstap-read \- print dnstap data in human\-readable form
 .SH "SYNOPSIS"
-.HP 12
+.HP \w'\fBdnstap\-read\fR\ 'u
 \fBdnstap\-read\fR [\fB\-m\fR] [\fB\-p\fR] [\fB\-y\fR] {\fIfile\fR}
 .SH "DESCRIPTION"
 .PP
@ -90,8 +80,8 @@ data in a detailed YAML format\&. Implies
 BIND 9 Administrator Reference Manual\&.
 .SH "AUTHOR"
 .PP
-Internet Systems Consortium
+\fBInternet Systems Consortium, Inc\&.\fR
 .SH "COPYRIGHT"
 .br
-Copyright \(co 2015 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2015, 2016 Internet Systems Consortium, Inc. ("ISC")
 .br
--- a/bin/tools/dnstap-read.html
+++ b/bin/tools/dnstap-read.html
@ -1,20 +1,10 @@
 <!--
- - Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC")
 - 
- - Permission to use, copy, modify, and/or distribute this software for any
- - purpose with or without fee is hereby granted, provided that the above
- - copyright notice and this permission notice appear in all copies.
- -
- - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- - AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- - PERFORMANCE OF THIS SOFTWARE.
+ - This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
-
-<!-- $Id$ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@ -31,8 +21,8 @@
 <h2>Synopsis</h2>
 <div class="cmdsynopsis"><p><code class="command">dnstap-read</code>  [<code class="option">-m</code>] [<code class="option">-p</code>] [<code class="option">-y</code>] {<em class="replaceable"><code>file</code></em>}</p></div>
 </div>
-<div class="refsect1">
-<a name="idp53505312"></a><h2>DESCRIPTION</h2>
+<div class="refsection">
+<a name="id-1.7"></a><h2>DESCRIPTION</h2>
 <p>
      <span class="command"><strong>dnstap-read</strong></span>
      reads <span class="command"><strong>dnstap</strong></span> data from a specified file
@ -42,8 +32,8 @@
      then a longer and more detailed YAML format is used instead.
    </p>
 </div>
-<div class="refsect1">
-<a name="idp53508000"></a><h2>OPTIONS</h2>
+<div class="refsection">
+<a name="id-1.8"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl class="variablelist">
 <dt><span class="term">-m</span></dt>
 <dd><p>
@ -62,18 +52,13 @@
          </p></dd>
 </dl></div>
 </div>
-<div class="refsect1">
-<a name="idp53515296"></a><h2>SEE ALSO</h2>
+<div class="refsection">
+<a name="id-1.9"></a><h2>SEE ALSO</h2>
 <p>
      <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
      <span class="citerefentry"><span class="refentrytitle">nsupdate</span>(8)</span>,
      <em class="citetitle">BIND 9 Administrator Reference Manual</em>.
    </p>
 </div>
-<div class="refsect1">
-<a name="idp53518880"></a><h2>AUTHOR</h2>
-<p><span class="corpauthor">Internet Systems Consortium</span>
-    </p>
-</div>
 </div></body>
 </html>
--- a/bin/tools/named-nzd2nzf.8
+++ b/bin/tools/named-nzd2nzf.8
@ -0,0 +1,66 @@
+.\" 
+.\" This Source Code Form is subject to the terms of the Mozilla Public
+.\" License, v. 2.0. If a copy of the MPL was not distributed with this
+.\" file, You can obtain one at http://mozilla.org/MPL/2.0/.
+.\"
+.hy 0
+.ad l
+'\" t
+.\"     Title: named-nzd2nzf
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: May 5, 2016
+.\"    Manual: BIND9
+.\"    Source: BIND9
+.\"  Language: English
+.\"
+.TH "NAMED\-NZD2NZF" "8" "May 5, 2016" "BIND9" "BIND9"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+named-nzd2nzf \- Convert an NZD database to NZF text format
+.SH "SYNOPSIS"
+.HP \w'\fBnamed\-nzd2nzf\fR\ 'u
+\fBnamed\-nzd2nzf\fR {filename}
+.SH "DESCRIPTION"
+.PP
+\fBnamed\-nzd2nzf\fR
+converts an NZD database to NZF format and prints it to standard output\&. This can be used to review the configuration of zones that were added to
+\fBnamed\fR
+via
+\fBrndc addzone\fR\&. It can also be used to restore the old file format when rolling back from a newer version of BIND to an older version\&.
+.SH "ARGUMENTS"
+.PP
+filename
+.RS 4
+The name of the
+\&.nzd
+file whose contents should be printed\&.
+.RE
+.SH "SEE ALSO"
+.PP
+BIND 9 Administrator Reference Manual,
+.SH "AUTHOR"
+.PP
+Internet Systems Consortium
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2016 Internet Systems Consortium, Inc. ("ISC")
+.br
--- a/bin/tools/named-nzd2nzf.html
+++ b/bin/tools/named-nzd2nzf.html
@ -0,0 +1,83 @@
+<!--
+ - 
+ - This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>named-nzd2nzf</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry">
+<a name="man.named-nzd2nzf"></a><div class="titlepage"></div>
+  
+
+  
+
+  <div class="refnamediv">
+<h2>Name</h2>
+<p>
+    <span class="application">named-nzd2nzf</span>
+     &#8212; 
+      Convert an NZD database to NZF text format
+    
+  </p>
+</div>
+
+  
+
+  <div class="refsynopsisdiv">
+<h2>Synopsis</h2>
+    <div class="cmdsynopsis"><p>
+      <code class="command">named-nzd2nzf</code> 
+       {filename}
+    </p></div>
+  </div>
+
+  <div class="refsect1">
+<a name="id-1.6"></a><h2>DESCRIPTION</h2>
+    
+    <p>
+      <span class="command"><strong>named-nzd2nzf</strong></span> converts an NZD database to NZF
+      format and prints it to standard output.  This can be used to
+      review the configuration of zones that were added to
+      <span class="command"><strong>named</strong></span> via <span class="command"><strong>rndc addzone</strong></span>.
+      It can also be used to restore the old file format
+      when rolling back from a newer version
+      of BIND to an older version.
+    </p>
+  </div>
+
+  <div class="refsect1">
+<a name="id-1.7"></a><h2>ARGUMENTS</h2>
+    
+    <div class="variablelist"><dl class="variablelist">
+<dt><span class="term">filename</span></dt>
+<dd>
+          <p>
+            The name of the <code class="filename">.nzd</code> file whose contents
+            should be printed.
+          </p>
+        </dd>
+</dl></div>
+  </div>
+
+  <div class="refsect1">
+<a name="id-1.8"></a><h2>SEE ALSO</h2>
+    
+    <p>
+      <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
+    </p>
+  </div>
+
+  <div class="refsect1">
+<a name="id-1.9"></a><h2>AUTHOR</h2>
+    
+    <p><span class="corpauthor">Internet Systems Consortium</span>
+    </p>
+  </div>
+
+</div></body>
+</html>