Merge branch '1.4'

site/weave-docker-api/troubleshooting-proxy.md

@@ -13,7 +13,8 @@ reports on the current status of various Weave Net components, including
 the proxy, if it is running:
 
 ~~~bash
-weave proxy is running
+        Service: proxy
+        Address: tcp://127.0.0.1:12375
 ~~~
 
 Information on the operation of the proxy can be obtained from the
@@ -25,4 +26,4 @@ weaveproxy container logs using:
 
 **See Also**
 
- * [Troubleshooting Weave](/site/troubleshooting.md)
+ * [Troubleshooting Weave](/site/troubleshooting.md)