diff --git a/cli/src/connections.c b/cli/src/connections.c
index 71345a2b5..523676a1a 100644
--- a/cli/src/connections.c
+++ b/cli/src/connections.c
@@ -194,16 +194,15 @@ usage (void)
 	fprintf (stderr,
 	         _("Usage: nmcli connection { COMMAND | help }\n"
 	         "  COMMAND := { show | up | down | delete }\n\n"
-	         "  show configured [[id|uuid|path] <ID>]\n"
-	         "  show active [[id|uuid|path|apath] <ID>]\n"
+	         "  show configured [[ id | uuid | path ] <ID>]\n\n"
+	         "  show active     [[ id | uuid | path | apath ] <ID>]\n\n"
 #if WITH_WIMAX
-	         "  up [id|uuid|path] <ID> [iface <iface>] [ap <BSSID>] [nsp <name>] [--nowait] [--timeout <timeout>]\n"
+	         "  up [ id | uuid | path ] <ID> [iface <iface>] [ap <BSSID>] [nsp <name>] [--nowait] [--timeout <timeout>]\n\n"
 #else
-	         "  up [id|uuid|path] <ID> [iface <iface>] [ap <BSSID>] [--nowait] [--timeout <timeout>]\n"
+	         "  up [ id | uuid | path ] <ID> [iface <iface>] [ap <BSSID>] [--nowait] [--timeout <timeout>]\n\n"
 #endif
-	         "  down [id|uuid|path|apath] <ID>\n"
-	         "  delete [id|uuid|path] <ID>\n"
-	         "\n"
+	         "  down [ id | uuid | path | apath ] <ID>\n\n"
+	         "  delete [ id | uuid | path ] <ID>\n\n"
 	         ));
 }
 
diff --git a/cli/src/devices.c b/cli/src/devices.c
index 38a0e4a28..5383c0aec 100644
--- a/cli/src/devices.c
+++ b/cli/src/devices.c
@@ -261,17 +261,16 @@ usage (void)
 #else
 	         "  COMMAND := { status | show | disconnect | wifi }\n\n"
 #endif
-	         "  status\n"
-	         "  show [<iface>]\n"
-	         "  disconnect <iface> [--nowait] [--timeout <timeout>]\n"
-	         "  wifi [list [iface <iface>] [bssid <BSSID>]]\n"
-	         "  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [iface <iface>] [bssid <BSSID>] [name <name>]\n"
-	         "               [--private] [--nowait] [--timeout <timeout>]\n"
-	         "  wifi scan [[iface] <iface>]\n"
+	         "  status\n\n"
+	         "  show [<iface>]\n\n"
+	         "  disconnect <iface> [--nowait] [--timeout <timeout>]\n\n"
+	         "  wifi [list [iface <iface>] [bssid <BSSID>]]\n\n"
+	         "  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] [iface <iface>] [bssid <BSSID>] [name <name>]\n\n"
+	         "               [--private] [--nowait] [--timeout <timeout>]\n\n"
+	         "  wifi scan [[iface] <iface>]\n\n"
 #if WITH_WIMAX
-	         "  wimax [list [iface <iface>] [nsp <name>]]\n"
+	         "  wimax [list [iface <iface>] [nsp <name>]]\n\n"
 #endif
-	         "\n"
 	         ));
 }
 
diff --git a/cli/src/network-manager.c b/cli/src/network-manager.c
index 402685af3..3ed6b4cd5 100644
--- a/cli/src/network-manager.c
+++ b/cli/src/network-manager.c
@@ -118,10 +118,9 @@ usage_general (void)
 	fprintf (stderr,
 	         _("Usage: nmcli general { COMMAND | help }\n\n"
 	         "  COMMAND := { status | permissions | logging }\n\n"
-	         "  status\n"
-	         "  permissions\n"
-	         "  logging [level <log level>] [domains <log domains>]\n"
-	         "\n"
+	         "  status\n\n"
+	         "  permissions\n\n"
+	         "  logging [level <log level>] [domains <log domains>]\n\n"
 	         ));
 }
 
@@ -130,8 +129,7 @@ usage_networking (void)
 {
 	fprintf (stderr,
 	         _("Usage: nmcli networking { COMMAND | help }\n\n"
-	         "  COMMAND := { [on/off] }\n\n"
-	         "\n"
+	         "  COMMAND := { [ on | off ] }\n\n"
 	         ));
 }
 
@@ -142,12 +140,11 @@ usage_radio (void)
 	         _("Usage: nmcli radio { COMMAND | help }\n\n"
 #if WITH_WIMAX
 	         "  COMMAND := { all | wifi | wwan | wimax }\n\n"
-	         "  all|wifi|wwan|wimax [on/off]\n"
+	         "  all | wifi | wwan | wimax [ on | off ]\n\n"
 #else
 	         "  COMMAND := { all | wifi | wwan }\n\n"
-	         "  all|wifi|wwan [on/off]\n"
+	         "  all | wifi | wwan [ on | off ]\n\n"
 #endif
-	         "\n"
 	         ));
 }