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

diff --git a/CHANGES b/CHANGES
index aeacb4f99aab2bf70c6ad4bea6a6b9552790bbac..b8a602cff37c8681eeda0be04c522864c35bacbb 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 787e152525cf6462273bb3d1dd5b63ea0bb73892..135790d1120fc59a306fb41905cb28eb6abb0614 100644 (file)
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -101,63 +101,29 @@ 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\
-  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\
-  sync [-clean]        Dump changes to all dynamic zones to disk, and optionally\n\
-               remove their journal files.\n\
-  sync [-clean] zone [class [view]]\n\
-               Dump a single zone's changes to disk, and optionally\n\
-               remove its journal file.\n\
-  notify zone [class [view]]\n\
-               Resend NOTIFY messages for the zone.\n\
-  reconfig     Reload configuration file and new zones only.\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\
-  zonestatus zone [class [view]]\n\
-               Display the current status of a zone.\n\
-  stats                Write server statistics to the statistics file.\n\
-  querylog newstate\n\
-               Enable / disable query logging.\n\
+  addzone zone [class [view]] { zone-options }\n\
+               Add zone to given view. Requires new-zone-file option.\n\
+  delzone [-clean] 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\
-  secroots [view ...]\n\
-               Write security roots to the secroots file.\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\
-  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\
   flushtree name [view]\n\
                Flush all names under 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\
-  validation newstate [view]\n\
-               Enable / disable DNSSEC validation.\n\
+  freeze       Suspend updates to all dynamic zones.\n\
+  freeze zone [class [view]]\n\
+               Suspend updates to a dynamic zone.\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\
   nta [-lifetime duration] [-force] domain [view]\n\
                Set a negative trust anchor, disabling DNSSEC validation\n\
                for the given domain.\n\
@@ -170,28 +136,60 @@ command is one of the following:\n\
                for the given domain.\n\
   nta -dump\n\
                List all negative trust anchors.\n\
-  addzone zone [class [view]] { zone-options }\n\
-               Add zone to given view. Requires new-zone-file option.\n\
-  delzone [-clean] zone [class [view]]\n\
-               Removes zone from given view. Requires new-zone-file option.\n\
+  querylog newstate\n\
+               Enable / disable 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\
   scan         Scan available network interfaces for changes.\n\
-  signing -list zone [class [view]]\n\
-               List the private records showing the state of DNSSEC\n\
-               signing in the given zone.\n\
-  signing -clear <keyid>/<algorithm> zone [class [view]]\n\
-               Remove the private record that indicating the given key\n\
-               has finished signing the given zone.\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\
   signing -clear all zone [class [view]]\n\
                Remove the private records for all keys that have\n\
                finished signing the given zone.\n\
-  signing -nsec3param none zone [class [view]]\n\
-               Remove NSEC3 chains from zone.\n\
+  signing -clear <keyid>/<algorithm> zone [class [view]]\n\
+               Remove the private record that indicating the given key\n\
+               has finished signing the given zone.\n\
+  signing -list zone [class [view]]\n\
+               List the private records showing the state of DNSSEC\n\
+               signing in the given zone.\n\
   signing -nsec3param hash flags iterations salt zone [class [view]]\n\
                Add NSEC3 chain to zone if already signed.\n\
                Prime zone with NSEC3 chain if not yet signed.\n\
-  *restart     Restart the server.\n\
+  signing -nsec3param none zone [class [view]]\n\
+               Remove NSEC3 chains from zone.\n\
+  stats                Write server statistics to the statistics 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\
+  sync [-clean]        Dump changes to all dynamic zones to disk, and optionally\n\
+               remove their journal files.\n\
+  sync [-clean] zone [class [view]]\n\
+               Dump a single zone's changes to disk, and optionally\n\
+               remove its journal file.\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\
+  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\
+  zonestatus zone [class [view]]\n\
+               Display the current status of a zone.\n\
 \n\
-* == not yet implemented\n\
 Version: %s\n",
                progname, version);