Merge pull request juju#3327 from pmatulis/rename-remainder-help-pages

Rename remaining help-* pages to clouds-* and other improvements

Author: Peter Matulis

redirects.map

@@ -26,3 +26,24 @@
 
 # Redirect help-aws to clouds-aws
 "~^/(?<version>[0-9-\._]+|devel)/en/help-aws/?$" /${version}/en/clouds-aws;
+
+# Redirect help-joyent to clouds-joyent
+"~^/(?<version>[0-9-\._]+|devel)/en/help-joyent/?$" /${version}/en/clouds-joyent;
+
+# Redirect help-rackspace to clouds-rackspace
+"~^/(?<version>[0-9-\._]+|devel)/en/help-rackspace/?$" /${version}/en/clouds-rackspace;
+
+# Redirect help-vmware to clouds-vsphere
+"~^/(?<version>[0-9-\._]+|devel)/en/help-vmware/?$" /${version}/en/clouds-vsphere;
+
+# Redirect help-openstack to clouds-openstack
+"~^/(?<version>[0-9-\._]+|devel)/en/help-openstack/?$" /${version}/en/clouds-openstack;
+
+# Redirect help-azure to clouds-azure
+"~^/(?<version>[0-9-\._]+|devel)/en/help-azure/?$" /${version}/en/clouds-azure;
+
+# Redirect help-azure-advanced to clouds-azure-advanced 
+"~^/(?<version>[0-9-\._]+|devel)/en/help-azure-advanced/?$" /${version}/en/clouds-azure-advanced;
+
+# Redirect clouds-LXD to clouds-lxd
+"~^/(?<version>[0-9-\._]+|devel)/en/clouds-LXD/?$" /${version}/en/clouds-lxd;

src/en/charms-fan.md

@@ -155,7 +155,7 @@ default, when creating regular EC2 instances.
 
 Whether you created a secondary VPC out of necessity or preference you will
 need to inform Juju about it. See
-[AWS specific features][anchor__aws-specific-features] for how to do this.
+[AWS specific features][#aws-specific-features] for how to do this.
 
 Here, Fan networking will be leveraged by deploying and relating applications
 that are running in different LXD containers, where the containers are housed
@@ -204,4 +204,4 @@ Connection to 252.0.169.174 80 port [tcp/http] succeeded!
 [fan-fanctl-man-page]: http://manpages.ubuntu.com/cgi-bin/search.py?q=fanctl
 [fan-aws-vpc]: ./charms-fan-aws-vpc.html
 [models-config]: ./models-config.html
-[anchor__aws-specific-features]: ./help-aws.html#aws-specific-features
+[#aws-specific-features]: ./clouds-aws.html#aws-specific-features

src/en/charms-ha.md

@@ -87,8 +87,8 @@ not all units in the set will become unavailable at the same time.
 
 <!-- LINKS -->
 
-[controller-ha]: ./controllers-ha.html
+[controller-ha]: ./controllers-ha.md
 [maaszones]: https://docs.ubuntu.com/maas/en/manage-zones
-[jujuclouds]: ./clouds.html
+[jujuclouds]: ./clouds.md
 [azure-sla]: https://azure.microsoft.com/en-gb/support/legal/sla/
-[clouds-azure]: ./help-azure.html
+[clouds-azure]: ./clouds-azure.md

src/en/charms-storage.md

@@ -141,7 +141,7 @@ tmpfs    tmpfs
     The name given to a default storage pool will often be the same as the
     name of the storage provider upon which it is based.
 
-Depending on the storage provider (see [below][anchor__storage-providers]),
+Depending on the storage provider (see [below][#storage-providers]),
 custom storage pools can be created. In the case of AWS, the 'ebs' storage
 provider supports several configuration attributes:
 
@@ -316,7 +316,7 @@ dependent upon cloud type. Above, it is given by the backing LXD pool and the
 volume name (obtained with `lxc storage volume list <lxd-pool>`), all separated
 by a `:`. A provider ID from another cloud may look entirely different. The LXD
 storage provider and associated LXD pools are described in detail
-[below][anchor__storage-providers-lxd].
+[below][#storage-providers-lxd].
 
 ### Cross-model storage
 
@@ -343,7 +343,7 @@ juju upgrade-charm postgresql --storage pgdata=10G
 
 If such a constraint was not provided, 'rootfs' would be used (as described in
 the section on deploying with
-[storage constraints][anchor__storage-constraints-juju-deploy]).
+[storage constraints][#storage-constraints-juju-deploy]).
 
 !!! Warning:
     Specifying new constraints may be necessary when upgrading to a revision of
@@ -372,7 +372,7 @@ to all types of models:
     a mounted file system but is stored in volatile memory.
 
 Loop devices require extra configuration to be used within LXD. For that,
-please refer to [Loop devices and LXD][anchor__loop-devices-and-lxd] (below).
+please refer to [Loop devices and LXD][#loop-devices-and-lxd] (below).
 
 ### AWS/EBS (ebs)
 
@@ -642,24 +642,24 @@ For guidance on how to create a charm that uses these storage features see
 [commands-remove-storage]: ./commands.html#remove-storage
 [commands-upgrade-charm]: ./commands.html#upgrade-charm
 
-[clouds-lxd]: ./clouds-LXD.md
-[charms-storage-ceph]: ./charms-storage-ceph.html
+[clouds-lxd]: ./clouds-lxd.md
+[charms-storage-ceph]: ./charms-storage-ceph.md
 [charms-storage-k8]: ./charms-storage-k8s.md
 [generic-storage-loop]: https://en.wikipedia.org/wiki/Loop_device
 [generic-storage-rootfs]: https://www.kernel.org/doc/Documentation/filesystems/ramfs-rootfs-initramfs.txt
 [generic-storage-tmpfs]: https://en.wikipedia.org/wiki/Tmpfs
 [charm-store-postgresql]: https://jujucharms.com/postgresql
 [charm-store-ceph-osd]: https://jujucharms.com/ceph-osd
 [ceph-charm]: https://jujucharms.com/ceph-osd
-[developer-storage]: ./developer-storage.html
+[developer-storage]: ./developer-storage.md
 [aws-iops-ssd-volumes]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html#EBSVolumeTypes_piops
 [aws-ebs-volume-types]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html
 [wikipedia-iops]: https://en.wikipedia.org/wiki/IOPS
 [ppa-lxd]: https://launchpad.net/~ubuntu-lxc/+archive/ubuntu/lxd-stable
 [upstream-lxd-storage-configuration]: https://github.com/lxc/lxd/blob/master/doc/storage.md
 [microsoft-managed-disks]: https://docs.microsoft.com/en-us/azure/virtual-machines/windows/managed-disks-overview
 
-[anchor__loop-devices-and-lxd]: #loop-devices-and-lxd
-[anchor__storage-constraints-juju-deploy]: #juju-deploy
-[anchor__storage-providers]: #storage-providers
-[anchor__storage-providers-lxd]: #lxd-(lxd)
+[#loop-devices-and-lxd]: #loop-devices-and-lxd
+[#storage-constraints-juju-deploy]: #juju-deploy
+[#storage-providers]: #storage-providers
+[#storage-providers-lxd]: #lxd-(lxd)

src/en/help-azure-advanced.md renamed to src/en/clouds-azure-advanced.md

@@ -172,9 +172,9 @@ controller-creation step.
 
 <!-- LINKS -->
 
-[clouds-azure]: ./help-azure.html
-[clouds-azure-controller]: ./help-azure.html#create-the-juju-controller
-[clouds-azure-cli-install]: ./help-azure.html#install-the-cli-tool
-[clouds-azure-cli-login]: ./help-azure.html#log-in-to-azure
+[clouds-azure]: ./clouds-azure.md
+[clouds-azure-controller]: ./clouds-azure.md#create-the-juju-controller
+[clouds-azure-cli-install]: ./clouds-azure.md#install-the-cli-tool
+[clouds-azure-cli-login]: ./clouds-azure.md#log-in-to-azure
 [azurecli-rbac]: https://docs.microsoft.com/en-us/azure/role-based-access-control/role-assignments-cli
 [azurecli-az-ad-sp]: https://docs.microsoft.com/en-us/cli/azure/ad/sp?view=azure-cli-latest#az-ad-sp-create-for-rbac

src/en/help-azure.md renamed to src/en/clouds-azure.md

@@ -24,7 +24,7 @@ juju update-clouds
 
 ## Adding credentials
 
-The [Cloud credentials][credentials] page offers a full treatment of credential
+The [Credentials][credentials] page offers a full treatment of credential
 management.
 
 Several steps are required to add Azure credentials to Juju:
@@ -201,7 +201,7 @@ See these pages for ideas on what to do next:
 [azureportal]: http://portal.azure.com
 [azurecli]: https://docs.microsoft.com/en-us/cli/azure/overview 
 [azuretwoinstall]: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli
-[manually-adding-azure-credentials]: ./help-azure-advanced.md#manually-adding-azure-credentials
+[manually-adding-azure-credentials]: ./clouds-azure-advanced.md#manually-adding-azure-credentials
 [azure-availability-sets]: ./charms-ha.md#azure-availability-sets
 [controllers-creating]: ./controllers-creating.md
 [models]: ./models.md

src/en/help-joyent.md renamed to src/en/clouds-joyent.md

@@ -27,7 +27,7 @@ juju update-clouds
 
 ## Adding credentials
 
-The [Cloud credentials][credentials] page offers a full treatment of credential
+The [Credentials][credentials] page offers a full treatment of credential
 management.
 
 In order to authenticate itself to the Joyent cloud, Juju will need the 

src/en/clouds-lxd-advanced.md

@@ -270,12 +270,12 @@ See the LXD documentation to learn about the valid
 <!-- LINKS -->
 
 [yaml]: http://www.yaml.org/spec/1.2/spec.html
-[clouds-lxd]: ./clouds-LXD.md
+[clouds-lxd]: ./clouds-lxd.md
 [#clouds-lxd-remote-add-manual]: #manually-adding-a-remote-lxd-cloud
 [controllers-creating]: ./controllers-creating.md
 [clouds-adding-manually]: ./clouds.md#adding-clouds-manually
 [credentials]: ./credentials.md
-[clouds-lxd-creating-a-controller]: ./clouds-LXD.md#creating-a-controller
+[clouds-lxd-creating-a-controller]: ./clouds-lxd.md#creating-a-controller
 [lxd-upstream-clustering]: https://lxd.readthedocs.io/en/latest/clustering/
 [lxd-upstream-profile-options]: https://lxd.readthedocs.io/en/latest/containers/
 [deploying-to-specific-machines]: ./charms-deploying-advanced.md#deploying-to-specific-machines

src/en/clouds-lxd-resources.md

@@ -77,8 +77,7 @@ on that user's system, the credential can be added:
 juju add-credential localhost -f localhost-credentials.yaml
 ```
 
-See [Cloud credentials][credentials] for more details on how credentials are
-used. 
+See [Credentials][credentials] for more details on how credentials are used. 
 
 ## Useful LXD client commands
 
@@ -168,7 +167,7 @@ assistance with the daemon. See upstream documentation for
 
 <!-- LINKS -->
 
-[clouds-lxd]: ./clouds-LXD.md
+[clouds-lxd]: ./clouds-lxd.md
 [lxd-upstream]: https://lxd.readthedocs.io/en/latest/configuration/
 [logs]: ./troubleshooting-logs.md
 [credentials]: ./credentials.md