diff --git a/website/source/docs/providers/azure/index.html.markdown b/website/source/docs/providers/azure/index.html.markdown index d7e6dcda43..6e054b442b 100644 --- a/website/source/docs/providers/azure/index.html.markdown +++ b/website/source/docs/providers/azure/index.html.markdown @@ -1,14 +1,16 @@ --- layout: "azure" -page_title: "Provider: Azure" +page_title: "Provider: Azure Service Management" sidebar_current: "docs-azure-index" description: |- The Azure provider is used to interact with the many resources supported by Azure. The provider needs to be configured with a publish settings file and optionally a subscription ID before it can be used. --- -# Azure Provider +# Azure Service Management Provider -The Azure provider is used to interact with the many resources supported +[arm]: /docs/providers/azurerm/index.html + +The Azure Service Management Provider is used to interact with the many resources supported by Azure. The provider needs to be configured with a [publish settings file](https://manage.windowsazure.com/publishsettings) and optionally a subscription ID before it can be used. diff --git a/website/source/docs/providers/azurerm/index.html.markdown b/website/source/docs/providers/azurerm/index.html.markdown index d669d1b80a..ddd54f0ca7 100644 --- a/website/source/docs/providers/azurerm/index.html.markdown +++ b/website/source/docs/providers/azurerm/index.html.markdown @@ -6,19 +6,22 @@ description: |- The Azure Resource Manager provider is used to interact with the many resources supported by Azure, via the ARM API. This supercedes the Azure provider, which interacts with Azure using the Service Management API. The provider needs to be configured with a credentials file, or credentials needed to generate OAuth tokens for the ARM API. --- -# Azure Resource Manager Provider +# Microsoft Azure Provider -The Azure Resource Manager provider is used to interact with the many resources -supported by Azure, via the ARM API. This supercedes the Azure provider, which -interacts with Azure using the Service Management API. The provider needs to be -configured with the credentials needed to generate OAuth tokens for the ARM API. +The Microsoft Azure Provider provider is used to interact with the many +resources supported by Azure, via the ARM API. This supercedes the [legacy Azure +provider][asm], which interacts with Azure using the Service Management API. The +provider needs to be configured with the credentials needed to generate OAuth +tokens for the ARM API. + +[asm]: /docs/providers/azure/index.html Use the navigation to the left to read about the available resources. ## Example Usage ``` -# Configure the Azure Resource Manager Provider +# Configure the Microsoft Azure Provider provider "azurerm" { subscription_id = "..." client_id = "..." diff --git a/website/source/layouts/azure.erb b/website/source/layouts/azure.erb index 47356cba41..30db8c6852 100644 --- a/website/source/layouts/azure.erb +++ b/website/source/layouts/azure.erb @@ -7,7 +7,7 @@ > - Azure Provider + Azure Service Management Provider > @@ -78,9 +78,21 @@ + +
  • + Microsoft Azure Provider » +
    • <% end %> + + <%= yield %> <% end %> diff --git a/website/source/layouts/azurerm.erb b/website/source/layouts/azurerm.erb index 9d0f781e44..089fb3dd1e 100644 --- a/website/source/layouts/azurerm.erb +++ b/website/source/layouts/azurerm.erb @@ -8,7 +8,7 @@ > - Azure Resource Manager Provider + Microsoft Azure Provider > @@ -198,6 +198,9 @@ +
  • + Azure Service Management Provider » +
    • <% end %> diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 287ff03509..20b0b578cf 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -170,14 +170,6 @@ AWS - > - Azure (Service Management) - - - > - Azure (Resource Manager) - - > Chef @@ -262,6 +254,14 @@ Mailgun + > + Microsoft Azure + + + > + Microsoft Azure (Legacy ASM) + + > MySQL