Merge branch '1.4'

weaveworks · Mar 29, 2016 · bd6359d · bd6359d
2 parents 2298927 + cc75b08
commit bd6359d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/site/weave-docker-api/troubleshooting-proxy.md b/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)