Merge lp:~adam-stokes/juju-core/docs-fix-broken-links into lp:juju-core/docs

[Adam Stokes]

[William Reade (fwereade)]

Needs a </p> after the "A service can take a while..." para. Otherwise LGTM.

review: Approve

=== modified file 'htmldocs/authors-testing.html'
--- htmldocs/authors-testing.html	2013-09-27 14:53:30 +0000
+++ htmldocs/authors-testing.html	2013-09-30 04:50:51 +0000
@@ -83,7 +83,7 @@
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if state == started, PASS</pre>
             
             <p>Other generic tests may be identified, so a collection of generic tests should be the focus of an implementation.</p>
-            <p>Note that this requirement is already satisfied by Mark Mims' jenkins tester: <a class="reference external" href="http://charmtests.markmims.com/">http://charmtests.markmims.com/</a></p>
+            <p>Note that this requirement is already satisfied by Mark Mims' jenkins tester: <a class="reference external" href="https://github.com/mmm/charmtester/">https://github.com/mmm/charmtester/</a></p>
             
             <h2>Phase 2 - Charm Specific tests</h2>
             <p>Charm authors will have the best insight into whether or not a charm is working properly.</p>
@@ -357,4 +357,4 @@
 <!--End-Scripts-->
 
 
-</body></html>
\ No newline at end of file
+</body></html>

=== modified file 'htmldocs/charms-destroy.html'
--- htmldocs/charms-destroy.html	2013-09-27 14:53:30 +0000
+++ htmldocs/charms-destroy.html	2013-09-30 04:50:51 +0000
@@ -74,7 +74,7 @@
               <p>Once a service is no longer required it can be removed with a simple command.</p>
               <pre class="prettyprint">juju destroy-service &LT;service-name&GT;</pre>
               <p class="warning"><strong>Warning!:</strong> Destroying a service which has active relations with another running service will break that relation. This can cause errors in both services, as such review and potentially destroy any relationships first if.</p>
-              <p>A service can take a while to "die", but if running a juju status reveals that the service is listed as dying, but also reports an error state, then the zombied service will still be hanging around. See <a href="troubleshooting.html#die">"Why won't it just die?" in the troubleshooting section.</a>
+              <p>A service can take a while to "die", but if running a juju status reveals that the service is listed as dying, but also reports an error state, then the zombied service will still be hanging around.
               <p class="note"><strong>Note:</strong> Destroying a service removes that service, but not any nodes which may have been created for it to run on. This is juju's way of preserving data to the best it's ability. See <a href="#destroy-machines">Destroying Machines</a> for additional details.</p>
             </section>
             <section id="destroy-units">

=== modified file 'htmldocs/getting-started.html'
--- htmldocs/getting-started.html	2013-09-27 18:13:55 +0000
+++ htmldocs/getting-started.html	2013-09-30 04:50:51 +0000
@@ -151,7 +151,7 @@
             
             <pre class="prettyprint">juju bootstrap</pre>
             
-            <p class="note"><strong>Note:</strong> If you have multiple environments configured, you can choose which one to address with a particular command by adding the <code>-e</code> switch followed by the environment name, E.g. <code>-e hpcloud</code>. Read more about <a href="config-environments.html">environment switching</a></p>
+            <p class="note"><strong>Note:</strong> If you have multiple environments configured, you can choose which one to address with a particular command by adding the <code>-e</code> switch followed by the environment name, E.g. <code>-e hpcloud</code>.</p>
             
             <p>You may have to wait a few moments for this command to return, as it needs to perform various tasks and contact your cloud provider. </p>
             <p>Assuming it returns successfully (otherwise see <a href="#errors">common error messages and what to do about them</a>), we can now deploy some services and explore the basic operations of Juju.</p>

=== modified file 'htmldocs/howto.html'
--- htmldocs/howto.html	2013-09-27 14:53:30 +0000
+++ htmldocs/howto.html	2013-09-30 04:50:51 +0000
@@ -72,9 +72,9 @@
               <p>Juju is not all about marvelling about how great service orchestration is, it's actually about getting things done. While the documentation provides you with instructions on how Juju works, this section is all about putting those commands together to do something useful. Prepare to get things done! </p>
               <ul>
                 <li><a href="howto-node.html">Deploying a Node.js application</a></li>
-                <li><a href="howto-node.html">Deploying with the Rails framework</a></li>
+                <li><a href="howto-rails.html">Deploying with the Rails framework</a></li>
               </ul>
-              <p>Got an idea for something to add to add here? Check out <a href="contributing.html">how to contribute to the docs</a></p>
+              <p>Got an idea for something to add here? Check out <a href="contributing.html">how to contribute to the docs</a></p>
 
 
             </section>