ovn-nbctl: Sync code and docs for --db option.

The usage() output said the option was --db.  The code and man page
said --database.  Switch everything over to --db to be consistent with
the option name used in ovs-vsctl.

Signed-off-by: Russell Bryant <rbryant@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/ovn/ovn-nbctl.8.xml b/ovn/ovn-nbctl.8.xml
index 54f962000676c5aa100833c93d6b8dfdc4bbd1d5..03c8e13f7206a4e0f85e8c03b7095c55ee768a0c 100644 (file)
--- a/ovn/ovn-nbctl.8.xml
+++ b/ovn/ovn-nbctl.8.xml
@@ -26,7 +26,7 @@
     <p><code>lport-get-macs</code> <var>lport</var></p>
 
     <h1>Options</h1>
-    <p><code>-d</code> <var>database</var> | <code>--database</code> <var>database</var></p>
+    <p><code>-d</code> <var>database</var> | <code>--db</code> <var>database</var></p>
     <p><code>-h</code> | <code>--help</code></p>
     <p><code>-o</code> | <code>--options</code></p>
     <p><code>-V</code> | <code>--version</code></p>

diff --git a/ovn/ovn-nbctl.c b/ovn/ovn-nbctl.c
index 38373413004a63481af0786d15a75157ab2dd48e..06cfa2f74d2aa6dcbb6f6d14edad316b047d3c59 100644 (file)
--- a/ovn/ovn-nbctl.c
+++ b/ovn/ovn-nbctl.c
@@ -416,7 +416,7 @@ parse_options(int argc, char *argv[])
         VLOG_OPTION_ENUMS,
     };
     static const struct option long_options[] = {
-        {"database", required_argument, NULL, 'd'},
+        {"db", required_argument, NULL, 'd'},
         {"help", no_argument, NULL, 'h'},
         {"options", no_argument, NULL, 'o'},
         {"version", no_argument, NULL, 'V'},