Merge lp:~mbruzek/juju-core/fixed-404-in-authors-charm-writing into lp:juju-core/docs

[Matt Bruzek]

Converted links to author-charm-contents.html to author-charm-components.html
I found four files that needed this update.

[Nick Veitch (evilnick)]

excellent work, thanks!

review: Approve

=== modified file 'htmldocs/authors-charm-hooks.html'
--- htmldocs/authors-charm-hooks.html	2013-10-10 01:00:24 +0000
+++ htmldocs/authors-charm-hooks.html	2013-11-08 17:26:09 +0000
@@ -143,7 +143,7 @@
 
 <p><code>upgrade-charm</code> runs immediately after any
 <a href="./authors-charm-upgrades.html">upgrade</a> operation that does <em>not</em>
-itself interrupt an existing <a href="./authors-hook-errors.html">error state.</a>. It
+itself interrupt an existing <a href="./authors-hook-errors.html">error state</a>. It
 should be used to reconcile local state written by some other version of the charm into
 whatever form it needs to take to be manipulated by the current version.</p>
 
@@ -290,7 +290,7 @@
     any context you can to the log before you do so.</li>
 
     <li>They write only <em>very</em> sparingly to the
-    <a href="./authors-charm-contents.html">charm directory</a>.</li>
+    <a href="./authors-charm-components.html">charm directory</a>.</li>
 </ul>
 
 <p>We recommend you also familiarize yourself with the

=== modified file 'htmldocs/authors-charm-policy.html'
--- htmldocs/authors-charm-policy.html	2013-10-10 01:00:24 +0000
+++ htmldocs/authors-charm-policy.html	2013-11-08 17:26:09 +0000
@@ -97,7 +97,7 @@
                 
                 <h2>metadata.yaml</h2>
                 
-                <p>This file is an <a href="authors-charm-contents.html">important component</a> of a charm.</p>
+                <p>This file is an <a href="authors-charm-components.html">important component</a> of a charm.</p>
                 <p>Check out the <a href="https://bazaar.launchpad.net/~charmers/charms/precise/mysql/trunk/view/head:/metadata.yaml">MySQL metadata.yaml</a> as an example.</p>
 
 

=== modified file 'htmldocs/authors-hook-errors.html'
--- htmldocs/authors-hook-errors.html	2013-10-10 01:00:24 +0000
+++ htmldocs/authors-hook-errors.html	2013-11-08 17:26:09 +0000
@@ -102,7 +102,7 @@
     this possibility and will therefore trust information from its
     <a href="./authors-hook-environment.html">environment</a> to be more recent and
     correct than anything it may have previously have recorded in the local
-    <a href="./authors-charm-contents.html">charm directory</a>.</li>
+    <a href="./authors-charm-components.html">charm directory</a>.</li>
 
     <li><code>juju resolved --retry</code> reverts the charm directory's contents
     to whatever they were at the start of the failed hook, and runs the hook again

=== modified file 'htmldocs/authors-hook-kinds.html'
--- htmldocs/authors-hook-kinds.html	2013-10-10 01:00:24 +0000
+++ htmldocs/authors-hook-kinds.html	2013-11-08 17:26:09 +0000
@@ -305,7 +305,7 @@
     any context you can to the log before you do so.</li>
 
     <li>They write only <em>very</em> sparingly to the
-    <a href="./authors-charm-contents.html">charm directory</a>.</li>
+    <a href="./authors-charm-components.html">charm directory</a>.</li>
 </ul>
 
 <p>We recommend you also familiarize yourself with the

=== modified file 'htmldocs/navigation.json'
--- htmldocs/navigation.json	2013-11-08 10:06:03 +0000
+++ htmldocs/navigation.json	2013-11-08 17:26:09 +0000
@@ -49,8 +49,8 @@
     "Getting started": {
      "link": "authors-intro.html"
     },
-    "Charm Contents": {
-      "link": "authors-charm-contents.html",
+    "Components of a charm": {
+      "link": "authors-charm-components.html",
       "children": {
     	"metadata.yaml": "authors-charm-metadata.html",
         "hooks": "authors-hook-kinds.html",