diff --git a/docs/guide/dev/tips/images/failed-task-large.png b/docs/guide/dev/tips/images/failed-task-large.png
deleted file mode 100644
index 1c264c4..0000000
--- a/docs/guide/dev/tips/images/failed-task-large.png
+++ /dev/null
Binary files differ
diff --git a/docs/guide/dev/tips/images/jmx-sensors-large.png b/docs/guide/dev/tips/images/jmx-sensors-large.png
deleted file mode 100644
index d9322c6..0000000
--- a/docs/guide/dev/tips/images/jmx-sensors-large.png
+++ /dev/null
Binary files differ
diff --git a/docs/guide/ops/troubleshooting/deployment.md b/docs/guide/ops/troubleshooting/deployment.md
index c343762..6b1baea 100644
--- a/docs/guide/ops/troubleshooting/deployment.md
+++ b/docs/guide/ops/troubleshooting/deployment.md
@@ -84,5 +84,5 @@
 two minutes, and can be configured using the `start.timeout` config key; the timer begins after the 
 start tasks are completed).
 
-See the guide on [runtime errors](troubleshooting-runtime-errors.html) for where to find additional information, especially the section on
+See the [overview](overview.html) for where to find additional information, especially the section on
 "Entity's Error Status".
diff --git a/docs/guide/ops/troubleshooting/going-deep-in-java-and-logs.md b/docs/guide/ops/troubleshooting/going-deep-in-java-and-logs.md
index 613a15a..065eef2 100644
--- a/docs/guide/ops/troubleshooting/going-deep-in-java-and-logs.md
+++ b/docs/guide/ops/troubleshooting/going-deep-in-java-and-logs.md
@@ -111,7 +111,7 @@
 with `Shift-G`, then performing a reverse-lookup by typing `?Tomcat` and pressing `Enter`. If searching for the 
 blueprint type (in this case Tomcat) simply matches tasks unrelated to the exception, you can also search for 
 the text of the error message, in this case `? invalid result 127`. You can make the search case-insensitivity by
-typing `-i` before performing the search. To skip the current match and move to the next on (i.e. 'up' as we're
+typing `-i` before performing the search. To skip the current match and move to the next one (i.e. 'up' as we're
 performing a reverse-lookup), simply press `n`
 
 In this case, the `?Tomcat` search takes us directly to the full stack trace (Only the last part of the trace
@@ -230,8 +230,7 @@
 We can simulate this type of failure by launching Tomcat with an invalid configuration file. As seen in the previous
 examples, Brooklyn copies two xml configuration files to the server: `server.xml` and `web.xml`
 
-The first few non-comment lines of `server.xml` are as follows (you can see the full file [here]
-(https://github.com/apache/incubator-brooklyn/blob/master/software/webapp/src/main/resources/brooklyn/entity/webapp/tomcat/server.xml)):
+The first few non-comment lines of `server.xml` are as follows (you can see the full file [here](https://github.com/apache/incubator-brooklyn/blob/master/software/webapp/src/main/resources/brooklyn/entity/webapp/tomcat/server.xml)):
 
 {% highlight xml %}
 
@@ -426,7 +425,7 @@
 We know from previous steps that the installation and launch scripts completed, and we know the procecess is running,
 but we can see here that the server is not responding to JMX requests. A good thing to check here would be that the
 JMX port is not being blocked by iptables, firewalls or security groups
-(see the (troubleshooting connectivity guide)[troubleshooting-connectivity.html]). 
+(see the [troubleshooting connectivity guide](connectivity.html)). 
 Let's assume that we've checked that and they're all open. There is still one more thing that Brooklyn can tell us.
 
 
diff --git a/docs/guide/dev/tips/images/external-error-large.png b/docs/guide/ops/troubleshooting/images/external-error-large.png
similarity index 100%
rename from docs/guide/dev/tips/images/external-error-large.png
rename to docs/guide/ops/troubleshooting/images/external-error-large.png
Binary files differ
diff --git a/docs/guide/dev/tips/images/external-error.png b/docs/guide/ops/troubleshooting/images/external-error.png
similarity index 100%
rename from docs/guide/dev/tips/images/external-error.png
rename to docs/guide/ops/troubleshooting/images/external-error.png
Binary files differ
diff --git a/docs/guide/dev/tips/images/failed-task.png b/docs/guide/ops/troubleshooting/images/failed-task.png
similarity index 100%
rename from docs/guide/dev/tips/images/failed-task.png
rename to docs/guide/ops/troubleshooting/images/failed-task.png
Binary files differ
diff --git a/docs/guide/dev/tips/images/jmx-sensors-all-large.png b/docs/guide/ops/troubleshooting/images/jmx-sensors-all-large.png
similarity index 100%
rename from docs/guide/dev/tips/images/jmx-sensors-all-large.png
rename to docs/guide/ops/troubleshooting/images/jmx-sensors-all-large.png
Binary files differ
diff --git a/docs/guide/dev/tips/images/jmx-sensors-all.png b/docs/guide/ops/troubleshooting/images/jmx-sensors-all.png
similarity index 100%
rename from docs/guide/dev/tips/images/jmx-sensors-all.png
rename to docs/guide/ops/troubleshooting/images/jmx-sensors-all.png
Binary files differ
diff --git a/docs/guide/dev/tips/images/jmx-sensors.png b/docs/guide/ops/troubleshooting/images/jmx-sensors.png
similarity index 100%
rename from docs/guide/dev/tips/images/jmx-sensors.png
rename to docs/guide/ops/troubleshooting/images/jmx-sensors.png
Binary files differ
diff --git a/docs/guide/dev/tips/images/resource-exception-large.png b/docs/guide/ops/troubleshooting/images/resource-exception-large.png
similarity index 100%
rename from docs/guide/dev/tips/images/resource-exception-large.png
rename to docs/guide/ops/troubleshooting/images/resource-exception-large.png
Binary files differ
diff --git a/docs/guide/dev/tips/images/resource-exception.png b/docs/guide/ops/troubleshooting/images/resource-exception.png
similarity index 100%
rename from docs/guide/dev/tips/images/resource-exception.png
rename to docs/guide/ops/troubleshooting/images/resource-exception.png
Binary files differ
diff --git a/docs/guide/dev/tips/images/script-failure-large.png b/docs/guide/ops/troubleshooting/images/script-failure-large.png
similarity index 100%
rename from docs/guide/dev/tips/images/script-failure-large.png
rename to docs/guide/ops/troubleshooting/images/script-failure-large.png
Binary files differ
diff --git a/docs/guide/dev/tips/images/script-failure.png b/docs/guide/ops/troubleshooting/images/script-failure.png
similarity index 100%
rename from docs/guide/dev/tips/images/script-failure.png
rename to docs/guide/ops/troubleshooting/images/script-failure.png
Binary files differ