Merge branch 'alexgear-fix-azure-docs'

stack72 · stack72 · commit 35cac855790a · 2016-02-12T11:40:15.000Z
diff --git a/website/source/docs/providers/azure/index.html.markdown b/website/source/docs/providers/azure/index.html.markdown
@@ -20,7 +20,7 @@ Use the navigation to the left to read about the available resources.
 ```
 # Configure the Azure Provider
 provider "azure" {
-  settings_file = "${file("credentials.publishsettings")}"
+  publish_settings = "${file("credentials.publishsettings")}"
 }
 
 # Create a web server
diff --git a/website/source/docs/providers/azure/r/dns_server.html.markdown b/website/source/docs/providers/azure/r/dns_server.html.markdown
@@ -17,7 +17,6 @@ resource "azure_dns_server" "google-dns" {
     name = "google"
     dns_address = "8.8.8.8"
 }
-`
 ```
 
 ## Argument Reference

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ Use the navigation to the left to read about the available resources.`
`20`	`20`	```
`21`	`21`	`# Configure the Azure Provider`
`22`	`22`	`provider "azure" {`
`23`		`- settings_file = "${file("credentials.publishsettings")}"`
	`23`	`+ publish_settings = "${file("credentials.publishsettings")}"`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`# Create a web server`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ resource "azure_dns_server" "google-dns" {`
`17`	`17`	`name = "google"`
`18`	`18`	`dns_address = "8.8.8.8"`
`19`	`19`	`}`
`20`		-`
`21`	`20`	```
`22`	`21`
`23`	`22`	`## Argument Reference`