Merge lp:~themue/juju-core/docs-001-fix-contributing-typos-and-double-subsection into lp:juju-core/docs

[Frank Mueller]

Fixed typos and a double subsection in contributing.html.

[Nick Veitch (evilnick)]

thanks!

=== modified file 'htmldocs/contributing.html'
--- htmldocs/contributing.html	2013-08-22 15:08:13 +0000
+++ htmldocs/contributing.html	2013-08-30 13:29:27 +0000
@@ -101,32 +101,16 @@
               <p>If you find you need to add a page to the documentation, then you will also need to add it to the navigation, which means altering two additional files - navigation.html and navigation.json
               <p>For navigation.json, you will need to enter a key:value pair in the appropriate location, e.g.:</p>
               <pre><code>"Scaling Services": "charms-scaling.html",</code></pre>
-              <p>Not the quote marks, position of the colon, and the comma if required (i.e. if adding a page in the middle of a list). The same entry also needs to be included in the navigation.html page: </p>
+              <p>Note the quote marks, position of the colon, and the comma if required (i.e. if adding a page in the middle of a list). The same entry also needs to be included in the navigation.html page: </p>
               <pre><code>&LT;li class=" sub"&GT;&LT;a href="charms-scaling.html"&GT;Scaling Services&LT;/a&GT;&LT;/li&GT;</code></pre>
               again in the appropriate section. Please make sure you submit a merge proposal with a description of the new page and why it is needed!
     
               <h1>Testing or Deploying locally</h1>
-              <p>The documentation makes use of Javascript for some functionality, so in oreder to test the docs properly or serve them localy, you will need to have an http server set up.</p>
+              <p>The documentation makes use of Javascript for some functionality, so in order to test the docs properly or serve them localy, you will need to have an http server set up.</p>
               <p>On Ubuntu this is easy. Install (if you need to) and start the apache2 web server, then just copy the htmnldocs directory to a convenient location - </p>
               <pre><code>sudo cp -R htmldocs /var/www/htmldocs</code></pre>
-              <p>You can then point your web browser at your loca machine (127.0.0.1/htmldocs) to view the files.</p>
-
-              <h1>Submitting your work</h1>
-              <p>We love it when the community contributes to documentation, here's how to get the code, branch it, modify it, and submit it back. First off get the code:</p>
-              <pre>bzr branch lp:juju-core/docs</pre>
-              <p>Then go into the docs directory:</p>
-              <pre>cd docs/htmldocs</pre>
-              <p>In here you'll find the HTML files that you can edit in your text editor. After we make our changes we need to commit them and push them to your place on launchpad :</p>
-              
-              <pre>
-              bzr ci -m'Whatever your changelog will be'
-              bzr push lp:~jorge/juju-core/foo</pre>
-
-              <p>Replace "~jorge" with your launchpad username and "foo" with a name that describes a fix, so something like <code>bzr push lp:~jorge/juju-core/fix-typos-in-introduction</code> or something. Now there's one step left, and that's to propose it for inclusion:</p>  
-
-              <pre>bzr lp-propose lp:juju-core/docs</pre>
-
-              <p>And that's it! Someone from the Juju team will review your work and merge it in! Please don't forget to review the page before submission.</p>
+              <p>You can then point your web browser at your local machine (127.0.0.1/htmldocs) to view the files.</p>
+
               <h2>Submitting your work</h2>
               <p>We love it when the community contributes to documentation, here's how to get the code, branch it, modify it, and submit it back. First off get the code:</p>
               <pre>bzr branch lp:juju-core/docs</pre>