diff --git a/configure.ac b/configure.ac index c9b0e147ed..85cbc436d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1078,7 +1078,7 @@ AC_CONFIG_FILES([Makefile src/bin/dhcp4/tests/Makefile src/bin/resolver/Makefile src/bin/resolver/tests/Makefile - src/bin/showtech/Makefile + src/bin/sysinfo/Makefile src/bin/sockcreator/Makefile src/bin/sockcreator/tests/Makefile src/bin/xfrin/Makefile @@ -1216,7 +1216,7 @@ AC_OUTPUT([doc/version.ent src/bin/zonemgr/zonemgr.spec.pre src/bin/zonemgr/tests/zonemgr_test src/bin/zonemgr/run_b10-zonemgr.sh - src/bin/showtech/showtech.py + src/bin/sysinfo/sysinfo.py src/bin/stats/stats.py src/bin/stats/stats_httpd.py src/bin/bind10/bind10_src.py diff --git a/doc/guide/bind10-messages.html b/doc/guide/bind10-messages.html index cfa27a660c..d603cc16c2 100644 --- a/doc/guide/bind10-messages.html +++ b/doc/guide/bind10-messages.html @@ -1,4 +1,4 @@ -BIND 10 Messages Manual

BIND 10 Messages Manual

This is the messages manual for BIND 10 version +BIND 10 Messages Manual

BIND 10 Messages Manual

This is the messages manual for BIND 10 version 20120712.

Copyright © 2011-2012 Internet Systems Consortium, Inc.

Abstract

BIND 10 is a Domain Name System (DNS) suite managed by Internet Systems Consortium (ISC). It includes DNS libraries and modular components for controlling authoritative and diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index c821b9f9d4..7af44f9b8f 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq host cmdctl auth xfrin \ xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 \ - dbutil showtech + dbutil sysinfo check-recursive: all-recursive diff --git a/src/bin/bindctl/bindctl.1 b/src/bin/bindctl/bindctl.1 index 6aee29c279..dc20e61ae3 100644 --- a/src/bin/bindctl/bindctl.1 +++ b/src/bin/bindctl/bindctl.1 @@ -9,6 +9,15 @@ .\" .TH "BINDCTL" "1" "June 20, 2012" "BIND10" "BIND10" .\" ----------------------------------------------------------------- +.\" * 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 @@ -54,7 +63,7 @@ The PEM formatted server certificate validation chain file\&. .PP \fB\-\-csv\-file\-dir\fR\fIfile\fR .RS 4 -The directory name in which the user/password CSV file is stored (see AUTHENTICATION)\&. By default this option doesn\'t have any value, in which case the "\&.bind10" directory under the user\'s home directory will be used\&. +The directory name in which the user/password CSV file is stored (see AUTHENTICATION)\&. By default this option doesn\*(Aqt have any value, in which case the "\&.bind10" directory under the user\*(Aqs home directory will be used\&. .RE .PP \fB\-h\fR, \fB\-\-help\fR @@ -105,17 +114,17 @@ prompt shows \fIparam1 = value1 , \fR\fI\fIparam2 = value2\fR\fR .PP -\fBbindctl\fR\'s interactive interface provides command\-line completion and hints\&. Press the Tab key to get a hint for the module, command, and/or parameters\&. +\fBbindctl\fR\*(Aqs interactive interface provides command\-line completion and hints\&. Press the Tab key to get a hint for the module, command, and/or parameters\&. The arrow keys and Emacs\-style editing keys may be used to edit and recall previous lines\&. .PP You can use the \fBhelp\fR -keyword to receive usage assistance for a module or a module\'s command\&. +keyword to receive usage assistance for a module or a module\*(Aqs command\&. .PP The \fBquit\fR command is used to exit -\fBbindctl\fR\&. (It doesn\'t stop the BIND 10 services\&.) +\fBbindctl\fR\&. (It doesn\*(Aqt stop the BIND 10 services\&.) .PP The following module is available by default: \fBconfig\fR diff --git a/src/bin/cmdctl/b10-cmdctl.8 b/src/bin/cmdctl/b10-cmdctl.8 index 0b478fea6f..ab3ec61494 100644 --- a/src/bin/cmdctl/b10-cmdctl.8 +++ b/src/bin/cmdctl/b10-cmdctl.8 @@ -9,6 +9,15 @@ .\" .TH "B10\-CMDCTL" "8" "February 28, 2012" "BIND10" "BIND10" .\" ----------------------------------------------------------------- +.\" * 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 diff --git a/src/bin/resolver/b10-resolver.8 b/src/bin/resolver/b10-resolver.8 index eed69b8547..34eb61015b 100644 --- a/src/bin/resolver/b10-resolver.8 +++ b/src/bin/resolver/b10-resolver.8 @@ -9,6 +9,15 @@ .\" .TH "B10\-RESOLVER" "8" "February 28, 2012" "BIND10" "BIND10" .\" ----------------------------------------------------------------- +.\" * 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 diff --git a/src/bin/showtech/.gitignore b/src/bin/showtech/.gitignore deleted file mode 100644 index f3d58736c9..0000000000 --- a/src/bin/showtech/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/b10-showtech -/showtech.py diff --git a/src/bin/sysinfo/.gitignore b/src/bin/sysinfo/.gitignore new file mode 100644 index 0000000000..7a91274249 --- /dev/null +++ b/src/bin/sysinfo/.gitignore @@ -0,0 +1,2 @@ +/isc-sysinfo +/sysinfo.py diff --git a/src/bin/showtech/Makefile.am b/src/bin/sysinfo/Makefile.am similarity index 70% rename from src/bin/showtech/Makefile.am rename to src/bin/sysinfo/Makefile.am index cc9923c884..8023f51543 100644 --- a/src/bin/showtech/Makefile.am +++ b/src/bin/sysinfo/Makefile.am @@ -1,14 +1,14 @@ -bin_SCRIPTS = b10-showtech +bin_SCRIPTS = isc-sysinfo -CLEANFILES = b10-showtech showtech.pyc +CLEANFILES = isc-sysinfo sysinfo.pyc # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix -b10-showtech: showtech.py - $(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" showtech.py >$@ +isc-sysinfo: sysinfo.py + $(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" sysinfo.py >$@ chmod a+x $@ MAN1_FILES = \ - b10-showtech.xml + isc-sysinfo.xml man_MANS = \ $(MAN1_FILES:.xml=.1) diff --git a/src/bin/showtech/b10-showtech.1 b/src/bin/sysinfo/isc-sysinfo.1 similarity index 100% rename from src/bin/showtech/b10-showtech.1 rename to src/bin/sysinfo/isc-sysinfo.1 diff --git a/src/bin/showtech/b10-showtech.xml b/src/bin/sysinfo/isc-sysinfo.xml similarity index 89% rename from src/bin/showtech/b10-showtech.xml rename to src/bin/sysinfo/isc-sysinfo.xml index fe11ed12f7..3f7884321a 100644 --- a/src/bin/showtech/b10-showtech.xml +++ b/src/bin/sysinfo/isc-sysinfo.xml @@ -24,13 +24,13 @@ - b10-showtech + b10-sysinfo 1 BIND10 - b10-showtech + b10-sysinfo BIND 10 system information display tool @@ -43,14 +43,14 @@ - b10-showtech + b10-sysinfo DESCRIPTION - The b10-showtech program collects and outputs a + The b10-sysinfo program collects and outputs a variety of information about the system that BIND 10 is running on. This information can be useful to people involved in debugging and technical support. @@ -73,7 +73,7 @@ -o output-file If an output file is specified, the output - of b10-showtech is written to this file. By + of b10-sysinfo is written to this file. By default, the output is written to standard output. @@ -95,7 +95,7 @@ HISTORY - The b10-showtech daemon was initially + The b10-sysinfo daemon was initially implemented by ISC staff in June, 2012. diff --git a/src/bin/showtech/showtech.py.in b/src/bin/sysinfo/sysinfo.py.in similarity index 100% rename from src/bin/showtech/showtech.py.in rename to src/bin/sysinfo/sysinfo.py.in diff --git a/src/bin/zonemgr/b10-zonemgr.8 b/src/bin/zonemgr/b10-zonemgr.8 index 1bce2afcea..99bd8ea982 100644 --- a/src/bin/zonemgr/b10-zonemgr.8 +++ b/src/bin/zonemgr/b10-zonemgr.8 @@ -9,6 +9,15 @@ .\" .TH "B10\-ZONEMGR" "8" "February 28, 2012" "BIND10" "BIND10" .\" ----------------------------------------------------------------- +.\" * 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 @@ -92,7 +101,7 @@ The configuration commands are: (sent by \fBb10-auth\fR(8)) tells \fBb10\-zonemgr\fR -the zone name and class, and the IP address for the master (source of the NOTIFY message)\&. This will set the zone\'s refresh time to now\&. +the zone name and class, and the IP address for the master (source of the NOTIFY message)\&. This will set the zone\*(Aqs refresh time to now\&. This is an internal command and not exposed to the administrator\&. .PP