[proxy] Renaming flags: -H -> -D, -L -> -H

As per discussion in issue 875

prog/weaveproxy/main.go

@@ -29,8 +29,8 @@ func main() {
 	c.Version = version
 	getopt.BoolVarLong(&debug, "debug", 'd', "log debugging information")
 	getopt.BoolVarLong(&justVersion, "version", 0, "print version and exit")
-	getopt.StringVar(&c.ListenAddr, 'L', fmt.Sprintf("address on which to listen (default %s)", defaultListenAddr))
-	getopt.StringVar(&c.DockerAddr, 'H', fmt.Sprintf("docker daemon URL to proxy (default %s)", defaultDockerAddr))
+	getopt.StringVar(&c.ListenAddr, 'H', fmt.Sprintf("address on which to listen (default %s)", defaultListenAddr))
+	getopt.StringVar(&c.DockerAddr, 'D', fmt.Sprintf("docker daemon URL to proxy (default %s)", defaultDockerAddr))
 	getopt.StringVarLong(&c.TLSConfig.CACert, "tlscacert", 0, "Trust certs signed only by this CA")
 	getopt.StringVarLong(&c.TLSConfig.Cert, "tlscert", 0, "Path to TLS certificate file")
 	getopt.BoolVarLong(&c.TLSConfig.Enabled, "tls", 0, "Use TLS; implied by --tlsverify")

site/proxy.md

@@ -30,15 +30,15 @@ To start the proxy, run
     host1$ weave launch-proxy
 
 By default, the proxy will connect to docker at
-`unix:///var/run/docker.sock`. This can be adjusted with the `-H`
+`unix:///var/run/docker.sock`. This can be adjusted with the `-D`
 argument, e.g.
 
-    host1$ weave launch-proxy -H tcp://127.0.0.1:4243
+    host1$ weave launch-proxy -D tcp://127.0.0.1:4243
 
 By default, the proxy listens on port 12375, on all network
-interfaces. This can be adjusted with the `-L` argument, e.g.
+interfaces. This can be adjusted with the `-H` argument, e.g.
 
-    host1$ weave launch-proxy -L 127.0.0.1:9999
+    host1$ weave launch-proxy -H tcp://127.0.0.1:9999
 
 All docker commands can be run via the proxy, so it is safe to
 globally adjust your `DOCKER_HOST` to point at the proxy, e.g.

weave

@@ -28,7 +28,7 @@ usage() {
     echo "weave launch       [-password <password>] [-nickname <nickname>] [-nodiscovery]"
     echo "                       [-iprange <cidr>] <peer> ..."
     echo "weave launch-dns   <cidr>"
-    echo "weave launch-proxy [-H <docker_endpoint>] [-L <address>] [--with-dns] [--with-ipam]"
+    echo "weave launch-proxy [-D <docker_endpoint>] [-H <address>] [--with-dns] [--with-ipam]"
     echo "weave connect      [--replace] [<peer> ...]"
     echo "weave forget       <peer> ..."
     echo "weave run          [--with-dns] [<cidr> ...] <docker run args> ..."