Merge lp:~evilnick/juju-core/docs-bug1261418 into lp:juju-core/docs

[Nick Veitch]

fixes .htaccess redirects

=== modified file 'htmldocs/.htaccess'
--- htmldocs/.htaccess	2013-07-16 19:50:06 +0000
+++ htmldocs/.htaccess	2013-12-16 15:20:14 +0000
@@ -13,7 +13,7 @@
 RewriteRule ^provider-configuration-openstack.html$ config-openstack.html [R=301,L]
 RewriteRule ^user-tutorial.html$ getting-started.html#test [R=301,NE,L]
 RewriteRule ^write-charm.html$ authors-charm-writing.html [R=301,L]
-RewriteRule ^charm.html$ authors-charm-anatomy.html [R=301,L]
+RewriteRule ^charm.html$ authors-charm-components.html [R=301,L]
 RewriteRule ^service-config.html$ charms-config.html [R=301,L]
 RewriteRule ^charm-store.html$ authors-charm-store.html [R=301,L]
 RewriteRule ^charm-quality.html$ authors-charm-quality.html [R=301,L]