From e9e2c5645f869f0671c29f14bf99793787c0272c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
Date: Tue, 13 Nov 2012 14:43:14 +0100
Subject: [PATCH] cli: replace 'dev' and 'con' OBJECTs by 'device', resp.
 'connection'

Shorter forms work as previously. Thus, all of these commands are valid:
nmcli device, nmcli devic, nmcli devi, nmcli dev, nmcli de, nmcli d
nmcli connection, nmcli connectio, ..., nmcli conn, nmcli con, ..., nmcli c
---
 cli/src/connections.c |  4 ++--
 cli/src/devices.c     |  2 +-
 cli/src/nmcli.c       | 19 +++++++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/cli/src/connections.c b/cli/src/connections.c
index 409bf2ba6..7dd7d7a32 100644
--- a/cli/src/connections.c
+++ b/cli/src/connections.c
@@ -187,7 +187,7 @@ static void
 usage (void)
 {
 	fprintf (stderr,
-	         _("Usage: nmcli con { COMMAND | help }\n"
+	         _("Usage: nmcli connection { COMMAND | help }\n"
 	         "  COMMAND := { list | status | up | down | delete }\n\n"
 	         "  list [id <id> | uuid <id>]\n"
 	         "  status [id <id> | uuid <id> | path <path>]\n"
@@ -2028,7 +2028,7 @@ get_connections_cb (NMRemoteSettings *settings, gpointer user_data)
 		quit ();
 }
 
-/* Entry point function for connections-related commands: 'nmcli con' */
+/* Entry point function for connections-related commands: 'nmcli connection' */
 NMCResultCode
 do_connections (NmCli *nmc, int argc, char **argv)
 {
diff --git a/cli/src/devices.c b/cli/src/devices.c
index 23ed1bfc7..f8113ac96 100644
--- a/cli/src/devices.c
+++ b/cli/src/devices.c
@@ -240,7 +240,7 @@ static void
 usage (void)
 {
 	fprintf (stderr,
-	         _("Usage: nmcli dev { COMMAND | help }\n\n"
+	         _("Usage: nmcli device { COMMAND | help }\n\n"
 #if WITH_WIMAX
 	         "  COMMAND := { status | list | disconnect | wifi | wimax }\n\n"
 #else
diff --git a/cli/src/nmcli.c b/cli/src/nmcli.c
index a7888aaa0..757ff92ba 100644
--- a/cli/src/nmcli.c
+++ b/cli/src/nmcli.c
@@ -16,7 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * (C) Copyright 2010 - 2011 Red Hat, Inc.
+ * (C) Copyright 2010 - 2012 Red Hat, Inc.
  */
 
 /* Generated configuration file */
@@ -73,7 +73,8 @@ static void
 usage (const char *prog_name)
 {
 	fprintf (stderr,
-	         _("Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n\n"
+	         _("Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+	         "\n"
 	         "OPTIONS\n"
 	         "  -t[erse]                                   terse output\n"
 	         "  -p[retty]                                  pretty output\n"
@@ -82,11 +83,13 @@ usage (const char *prog_name)
 	         "  -e[scape] yes|no                           escape columns separators in values\n"
 	         "  -n[ocheck]                                 don't check nmcli and NetworkManager versions\n"
 	         "  -v[ersion]                                 show program version\n"
-	         "  -h[elp]                                    print this help\n\n"
+	         "  -h[elp]                                    print this help\n"
+	         "\n"
 	         "OBJECT\n"
-	         "  nm          NetworkManager status\n"
-	         "  con         NetworkManager connections\n"
-	         "  dev         devices managed by NetworkManager\n\n"),
+	         "  nm              NetworkManager's status\n"
+	         "  c[onnection]    NetworkManager's connections\n"
+	         "  d[evice]        devices managed by NetworkManager\n"
+	         "\n"),
 	          prog_name);
 }
 
@@ -102,8 +105,8 @@ static const struct cmd {
 	NMCResultCode (*func) (NmCli *nmc, int argc, char **argv);
 } nmcli_cmds[] = {
 	{ "nm",         do_network_manager },
-	{ "con",        do_connections },
-	{ "dev",        do_devices },
+	{ "connection", do_connections },
+	{ "device",     do_devices },
 	{ "help",       do_help },
 	{ 0 }
 };