3907. [cleanup] Alphabetise rndc help. [RT#36683]

diff --git a/CHANGES b/CHANGES
index 3409b0596b9ea0adbbb38e018824a73ae82ad618..acc877f60fa6221764298660f1bdda3d563e94b1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3907.  [cleanup]       Alphabetise rndc help. [RT#36683]
+
 3906.  [protocol]      Update URI record format to comply with
                        draft-faltstrom-uri-08. [RT #36642]
 

diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 3503e6ec30bf81da879fe9d03fe17f4ddf54a32a..5a1a2c88e2c024bc50b134f6a1e74ff02a1cd034 100644 (file)
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -101,60 +101,58 @@ Usage: %s [-b address] [-c config] [-s server] [-p port]\n\
 \n\
 command is one of the following:\n\
 \n\
-  reload       Reload configuration file and zones.\n\
-  reload zone [class [view]]\n\
-               Reload a single zone.\n\
-  refresh zone [class [view]]\n\
-               Schedule immediate maintenance for a zone.\n\
-  retransfer zone [class [view]]\n\
-               Retransfer a single zone without checking serial number.\n\
+  addzone zone [class [view]] { zone-options }\n\
+               Add zone to given view. Requires new-zone-file option.\n\
+  delzone zone [class [view]]\n\
+               Removes zone from given view. Requires new-zone-file option.\n\
+  dumpdb [-all|-cache|-zones] [view ...]\n\
+               Dump cache(s) to the dump file (named_dump.db).\n\
+  flush        Flushes all of the server's caches.\n\
+  flush [view] Flushes the server's cache for a view.\n\
+  flushname name [view]\n\
+               Flush the given name from the server's cache(s)\n\
   freeze       Suspend updates to all dynamic zones.\n\
   freeze zone [class [view]]\n\
                Suspend updates to a dynamic zone.\n\
-  thaw         Enable updates to all dynamic zones and reload them.\n\
-  thaw zone [class [view]]\n\
-               Enable updates to a frozen dynamic zone and reload it.\n\
+  halt         Stop the server without saving pending updates.\n\
+  halt -p      Stop the server without saving pending updates reporting\n\
+               process id.\n\
+  loadkeys zone [class [view]]\n\
+               Update keys without signing immediately.\n\
   notify zone [class [view]]\n\
                Resend NOTIFY messages for the zone.\n\
+  notrace      Set debugging level to 0.\n\
+  querylog     Toggle query logging.\n\
   reconfig     Reload configuration file and new zones only.\n\
+  recursing    Dump the queries that are currently recursing (named.recursing)\n\
+  refresh zone [class [view]]\n\
+               Schedule immediate maintenance for a zone.\n\
+  reload       Reload configuration file and zones.\n\
+  reload zone [class [view]]\n\
+               Reload a single zone.\n\
+  retransfer zone [class [view]]\n\
+               Retransfer a single zone without checking serial number.\n\
+  secroots [view ...]\n\
+               Write security roots to the secroots file.\n\
   sign zone [class [view]]\n\
                Update zone keys, and sign as needed.\n\
-  loadkeys zone [class [view]]\n\
-               Update keys without signing immediately.\n\
   stats                Write server statistics to the statistics file.\n\
-  querylog     Toggle query logging.\n\
-  dumpdb [-all|-cache|-zones] [view ...]\n\
-               Dump cache(s) to the dump file (named_dump.db).\n\
-  secroots [view ...]\n\
-               Write security roots to the secroots file.\n\
+  status       Display status of the server.\n\
   stop         Save pending updates to master files and stop the server.\n\
   stop -p      Save pending updates to master files and stop the server\n\
                reporting process id.\n\
-  halt         Stop the server without saving pending updates.\n\
-  halt -p      Stop the server without saving pending updates reporting\n\
-               process id.\n\
+  thaw         Enable updates to all dynamic zones and reload them.\n\
+  thaw zone [class [view]]\n\
+               Enable updates to a frozen dynamic zone and reload it.\n\
   trace                Increment debugging level by one.\n\
   trace level  Change the debugging level.\n\
-  notrace      Set debugging level to 0.\n\
-  flush        Flushes all of the server's caches.\n\
-  flush [view] Flushes the server's cache for a view.\n\
-  flushname name [view]\n\
-               Flush the given name from the server's cache(s)\n\
-  status       Display status of the server.\n\
-  recursing    Dump the queries that are currently recursing (named.recursing)\n\
-  tsig-list    List all currently active TSIG keys, including both statically\n\
-               configured and TKEY-negotiated keys.\n\
   tsig-delete keyname [view]\n\
                Delete a TKEY-negotiated TSIG key.\n\
+  tsig-list    List all currently active TSIG keys, including both statically\n\
+               configured and TKEY-negotiated keys.\n\
   validation newstate [view]\n\
                Enable / disable DNSSEC validation.\n\
-  addzone zone [class [view]] { zone-options }\n\
-               Add zone to given view. Requires new-zone-file option.\n\
-  delzone zone [class [view]]\n\
-               Removes zone from given view. Requires new-zone-file option.\n\
-  *restart     Restart the server.\n\
 \n\
-* == not yet implemented\n\
 Version: %s\n",
                progname, version);