Merge lp:~arosales/juju-core/provider-navigation-naming into lp:juju-core/docs

[Antonio Rosales]

Drop Configuration suffix from providers in Getting Started and properly brand clouds.

=== modified file 'htmldocs/navigation.html'
--- htmldocs/navigation.html	2013-12-09 18:11:30 +0000
+++ htmldocs/navigation.html	2013-12-10 06:43:33 +0000
@@ -1,12 +1,12 @@
             <h1>User Guide</h1>
             <ul class="no-margin">
               <li class=""><a href="getting-started.html">Getting Started</a></li>
-              <li class=" sub"><a href="config-aws.html">AWS Configuration</a></li>
-              <li class=" sub"><a href="config-azure.html">Azure Configuration</a></li>
-              <li class=" sub"><a href="config-hpcloud.html">HP Cloud Configuration</a></li>
-              <li class=" sub"><a href="config-openstack.html">OpenStack Configuration</a></li>
-              <li class=" sub"><a href="config-maas.html">Bare metal Configuration</a></li>
-              <li class=" sub"><a href="config-local.html">Local Configuration</a></li>
+              <li class=" sub"><a href="config-aws.html">Amazon Web Service</a></li>
+              <li class=" sub"><a href="config-azure.html">Windows Azure</a></li>
+              <li class=" sub"><a href="config-hpcloud.html">HP Public Cloud</a></li>
+              <li class=" sub"><a href="config-openstack.html">OpenStack</a></li>
+              <li class=" sub"><a href="config-maas.html">MAAS (bare metal)</a></li>
+              <li class=" sub"><a href="config-local.html">Local</a></li>
               <li class=" sub"><a href="config-manual.html">Manual Provisioning</a></li>
               <li class=" sub"><a href="getting-started.html#test">Testing your setup</a></li>
               <li class=""><a href="charms.html">Using Charms</a></li>

=== modified file 'htmldocs/navigation.json'
--- htmldocs/navigation.json	2013-12-09 18:11:30 +0000
+++ htmldocs/navigation.json	2013-12-10 06:43:33 +0000
@@ -3,12 +3,12 @@
     "Getting Started": {
       "link": "getting-started.html",
       "children": {
-        "AWS Configuration": "config-aws.html",
-        "Azure Configuration": "config-azure.html",
-        "HP Cloud Configuration": "config-hpcloud.html",
-        "OpenStack Configuration": "config-openstack.html",
-        "Bare metal Configuration": "config-maas.html",
-        "Local Configuration": "config-local.html",
+        "Amazon Web Services": "config-aws.html",
+        "Windows Azure": "config-azure.html",
+        "HP Public Cloud": "config-hpcloud.html",
+        "OpenStack": "config-openstack.html",
+        "MAAS (bare metal)": "config-maas.html",
+        "Local": "config-local.html",
         "Manual Provisioning": "config-manual.html",
         "Testing your setup": "getting-started.html#test"
       }