diff --git a/CHANGES b/CHANGES
index 10fa665a6b..01f2e3c83f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4475. [doc] Update named-checkconf documentation. [RT #43153]
+
4474. [bug] win32: call WSAStartup in fromtext_in_wks so that
getprotobyname and getservbyname work. [RT #43197]
diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index be05a35e7b..679cd88e37 100644
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -68,7 +68,7 @@ usage(void) ISC_PLATFORM_NORETURN_POST;
static void
usage(void) {
- fprintf(stderr, "usage: %s [-h] [-j] [-p] [-v] [-z] [-t directory] "
+ fprintf(stderr, "usage: %s [-hjvz] [-p [-x]] [-t directory] "
"[named.conf]\n", program);
exit(1);
}
diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook
index 87b68f365d..d84afdc01d 100644
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@@ -59,14 +59,12 @@
named-checkconf
-
-
-
+
+
+
+ filename
-
-
-
@@ -93,7 +91,6 @@
OPTIONS
-
-h
@@ -105,22 +102,10 @@
- -t directory
+ -j
- Chroot to directory so that include
- directives in the configuration file are processed as if
- run by a similarly chrooted named.
-
-
-
-
-
- -v
-
-
- Print the version of the named-checkconf
- program and exit.
+ When loading a zonefile read the journal if it exists.
@@ -131,6 +116,28 @@
Print out the named.conf and included files
in canonical form if no errors were detected.
+ See also the option.
+
+
+
+
+
+ -t directory
+
+
+ Chroot to directory so that include
+ directives in the configuration file are processed as if
+ run by a similarly chrooted named.
+
+
+
+
+
+ -v
+
+
+ Print the version of the named-checkconf
+ program and exit.
@@ -160,15 +167,6 @@
-
- -j
-
-
- When loading a zonefile read the journal if it exists.
-
-
-
-
filename