From 9955de3e9b5351fb015539a98dac5ac4c10c21fa Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Thu, 11 Jun 2015 09:23:58 +0100
Subject: [PATCH] cosmetic: shorten usage info

---
 weave | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/weave b/weave
index 8f3153fb..0383ac6b 100755
--- a/weave
+++ b/weave
@@ -30,17 +30,17 @@ usage() {
     echo "weave launch       [-password <password>] [-nickname <nickname>] [-nodiscovery]"
     echo "                       [-iprange <cidr> [-ipsubnet <cidr>]] <peer> ..."
     echo "weave launch-dns   <cidr>"
-    echo "weave launch-proxy [-D <docker_endpoint>] [-H <address>] [--with-dns] [--with-ipam]"
+    echo "weave launch-proxy [-D <endpoint>] [-H <endpoint>] [--with-dns] [--with-ipam]"
     echo "weave connect      [--replace] [<peer> ...]"
     echo "weave forget       <peer> ..."
-    echo "weave run          [--with-dns] [<address_spec> ...] <docker run args> ..."
-    echo "weave start        [<address_spec> ...] <container_id>"
-    echo "weave attach       [<address_spec> ...] <container_id>"
-    echo "weave detach       [<address_spec> ...] <container_id>"
+    echo "weave run          [--with-dns] [<addr> ...] <docker run args> ..."
+    echo "weave start        [<addr> ...] <container_id>"
+    echo "weave attach       [<addr> ...] <container_id>"
+    echo "weave detach       [<addr> ...] <container_id>"
     echo "weave dns-add      <ip_address> [<ip_address> ...] <container_id> [-h <fqdn>]"
     echo "weave dns-remove   <ip_address> [<ip_address> ...] <container_id> [-h <fqdn>]"
-    echo "weave expose       [<address_spec> ...] [-h <fqdn>]"
-    echo "weave hide         [<address_spec> ...]"
+    echo "weave expose       [<addr> ...] [-h <fqdn>]"
+    echo "weave hide         [<addr> ...]"
     echo "weave ps           [<container_id> ...]"
     echo "weave status"
     echo "weave proxy-env"
@@ -52,11 +52,11 @@ usage() {
     echo "weave reset"
     echo "weave rmpeer       <peer_id>"
     echo
-    echo "where <peer>         = <ip_address_or_fqdn>[:<port>]"
-    echo "      <cidr>         = <ip_address>/<routing_prefix_length>"
-    echo "      <peer_id>      = <nickname> or weave internal peer ID"
-    echo "      <address_spec> = [ip:]<cidr> | net:<cidr> | net:default"
-    echo "      <address> = [tcp://][<ip_address>]:<port>"
+    echo "where <peer>     = <ip_address_or_fqdn>[:<port>]"
+    echo "      <cidr>     = <ip_address>/<routing_prefix_length>"
+    echo "      <addr>     = [ip:]<cidr> | net:<cidr> | net:default"
+    echo "      <endpoint> = [tcp://][<ip_address>]:<port>"
+    echo "      <peer_id>  = <nickname> or weave internal peer ID"
     exit 1
 }