-
-
-
-
+
+
+
+
+
Paul Hinze is the Project Lead of Terraform. He helps organize the team
of HashiCorp employees and community members that work on Terraform
day-to-day. He works on Terraform's core and providers.
-
+
-
-
-
-
Clint Shryock (@catsby)
-
+
+
+
+
Clint Shryock (@catsby)
+
Clint Shryock is a HashiCorp Engineer working on Terraform. He is the
primary maintainer of the AWS provider, and works across all providers.
Clint is also the primary author of the Fastly provider.
-
-
-
-
-
-
-
-
-
- Jake Champlin is a HashiCorp Engineer working on Terraform. His primary
- focus will be the Terraform Provider Ecosystem.
-
-
+
+
-
-
-
-
+
+
+
+
+ Jake Champlin is a HashiCorp Engineer working on Terraform. His primary
+ focus will be the Terraform Provider Ecosystem.
+
+
+
+
+
+
+
+
+
Radek Simko is a HashiCorp Engineer working on Terraform. His primary
focus is the Terraform Provider Ecosystem, but you can find him working
on some core features from time to time as well.
-
-
+
+
-
-
-
-
+
+
+
+
Matthew Frahry is a HashiCorp Engineer working on Terraform with an emphasis on
the Terraform Provider Ecosystem.
-
-
+
+
@@ -131,7 +125,7 @@ disappear from this list as contributors come and go.
Martin Atkins is a community contributor turned HashiCorp Engineer working
- on Terraform with a focus on the core.
+ on Terraform with a focus on the core.
diff --git a/website/source/docs/backends/config.html.md b/website/source/docs/backends/config.html.md
index 36ae09cb1..5a723d083 100644
--- a/website/source/docs/backends/config.html.md
+++ b/website/source/docs/backends/config.html.md
@@ -14,7 +14,7 @@ section. After configuring a backend, it has to be
Below, we show a complete example configuring the "consul" backend:
-```
+```hcl
terraform {
backend "consul" {
address = "demo.consul.io"
@@ -78,7 +78,7 @@ basic encryption on disk so that values are at least not plaintext.
When using partial configuration, Terraform requires at a minimum that
an empty backend configuration is in the Terraform files. For example:
-```
+```hcl
terraform {
backend "consul" {}
}
diff --git a/website/source/docs/backends/types/artifactory.html.md b/website/source/docs/backends/types/artifactory.html.md
index 66e4812af..e96344431 100644
--- a/website/source/docs/backends/types/artifactory.html.md
+++ b/website/source/docs/backends/types/artifactory.html.md
@@ -21,7 +21,7 @@ It will likely end in `/artifactory`.
## Example Configuration
-```
+```hcl
terraform {
backend "artifactory" {
username = "SheldonCooper"
@@ -35,16 +35,16 @@ terraform {
## Example Referencing
-```
+```hcl
data "terraform_remote_state" "foo" {
- backend = "artifactory"
- config {
- username = "SheldonCooper"
- password = "AmyFarrahFowler"
- url = "https://custom.artifactoryonline.com/artifactory"
- repo = "foo"
- subpath = "terraform-bar"
- }
+ backend = "artifactory"
+ config {
+ username = "SheldonCooper"
+ password = "AmyFarrahFowler"
+ url = "https://custom.artifactoryonline.com/artifactory"
+ repo = "foo"
+ subpath = "terraform-bar"
+ }
}
```
diff --git a/website/source/docs/backends/types/atlas.html.md b/website/source/docs/backends/types/atlas.html.md
index f9658425c..08d6124d2 100644
--- a/website/source/docs/backends/types/atlas.html.md
+++ b/website/source/docs/backends/types/atlas.html.md
@@ -19,7 +19,7 @@ and generate new token in the
## Example Configuration
-```
+```hcl
terraform {
backend "atlas" {
name = "bigbang/example"
@@ -33,13 +33,13 @@ Note that for the access token we recommend using a
## Example Referencing
-```
+```hcl
data "terraform_remote_state" "foo" {
- backend = "atlas"
- config {
- name = "bigbang/example"
- access_token = "X2iTFefU5aWOjg.atlasv1.YaDa"
- }
+ backend = "atlas"
+ config {
+ name = "bigbang/example"
+ access_token = "X2iTFefU5aWOjg.atlasv1.YaDa"
+ }
}
```
diff --git a/website/source/docs/backends/types/azure.html.md b/website/source/docs/backends/types/azure.html.md
index 07b650cdc..972a6dfb4 100644
--- a/website/source/docs/backends/types/azure.html.md
+++ b/website/source/docs/backends/types/azure.html.md
@@ -30,7 +30,6 @@ Note that for the access credentials we recommend using a
## Example Referencing
```hcl
-# setup remote state data source
data "terraform_remote_state" "foo" {
backend = "azure"
config {
diff --git a/website/source/docs/backends/types/consul.html.md b/website/source/docs/backends/types/consul.html.md
index f03e6dcc0..0b3789762 100644
--- a/website/source/docs/backends/types/consul.html.md
+++ b/website/source/docs/backends/types/consul.html.md
@@ -16,7 +16,7 @@ This backend supports [state locking](/docs/state/locking.html).
## Example Configuration
-```
+```hcl
terraform {
backend "consul" {
address = "demo.consul.io"
@@ -30,12 +30,12 @@ Note that for the access credentials we recommend using a
## Example Referencing
-```
+```hcl
data "terraform_remote_state" "foo" {
- backend = "consul"
- config {
- path = "full/path"
- }
+ backend = "consul"
+ config {
+ path = "full/path"
+ }
}
```
diff --git a/website/source/docs/backends/types/etcd.html.md b/website/source/docs/backends/types/etcd.html.md
index d95a402db..588a968bd 100644
--- a/website/source/docs/backends/types/etcd.html.md
+++ b/website/source/docs/backends/types/etcd.html.md
@@ -14,10 +14,10 @@ Stores the state in [etcd](https://coreos.com/etcd/) at a given path.
## Example Configuration
-```
+```hcl
terraform {
backend "etcd" {
- path = "path/to/terraform.tfstate"
+ path = "path/to/terraform.tfstate"
endpoints = "http://one:4001 http://two:4001"
}
}
@@ -25,13 +25,13 @@ terraform {
## Example Referencing
-```
+```hcl
data "terraform_remote_state" "foo" {
- backend = "etcd"
- config {
- path = "path/to/terraform.tfstate"
- endpoints = "http://one:4001 http://two:4001"
- }
+ backend = "etcd"
+ config {
+ path = "path/to/terraform.tfstate"
+ endpoints = "http://one:4001 http://two:4001"
+ }
}
```
diff --git a/website/source/docs/backends/types/gcs.html.md b/website/source/docs/backends/types/gcs.html.md
index 6e11d0890..15c5dc383 100644
--- a/website/source/docs/backends/types/gcs.html.md
+++ b/website/source/docs/backends/types/gcs.html.md
@@ -14,11 +14,11 @@ Stores the state as a given key in a given bucket on [Google Cloud Storage](http
## Example Configuration
-```
+```hcl
terraform {
backend "gcs" {
- bucket = "tf-state-prod"
- path = "path/terraform.tfstate"
+ bucket = "tf-state-prod"
+ path = "path/terraform.tfstate"
project = "myproject"
}
}
@@ -27,17 +27,15 @@ terraform {
## Example Referencing
```hcl
-# setup remote state data source
data "terraform_remote_state" "foo" {
- backend = "gcs"
- config {
- bucket = "terraform-state-prod"
- path = "network/terraform.tfstate"
- project = "goopro"
- }
+ backend = "gcs"
+ config {
+ bucket = "terraform-state-prod"
+ path = "network/terraform.tfstate"
+ project = "goopro"
+ }
}
-# read value from data source
resource "template_file" "bar" {
template = "${greeting}"
diff --git a/website/source/docs/backends/types/http.html.md b/website/source/docs/backends/types/http.html.md
index f888cff64..49432117b 100644
--- a/website/source/docs/backends/types/http.html.md
+++ b/website/source/docs/backends/types/http.html.md
@@ -16,7 +16,7 @@ State will be fetched via GET, updated via POST, and purged with DELETE.
## Example Usage
-```
+```hcl
terraform {
backend "http" {
address = "http://myrest.api.com"
@@ -26,12 +26,12 @@ terraform {
## Example Referencing
-```
+```hcl
data "terraform_remote_state" "foo" {
- backend = "http"
- config {
- address = "http://my.rest.api.com"
- }
+ backend = "http"
+ config {
+ address = "http://my.rest.api.com"
+ }
}
```
diff --git a/website/source/docs/backends/types/local.html.md b/website/source/docs/backends/types/local.html.md
index 7a4134628..280f4118c 100644
--- a/website/source/docs/backends/types/local.html.md
+++ b/website/source/docs/backends/types/local.html.md
@@ -15,7 +15,7 @@ state using system APIs, and performs operations locally.
## Example Configuration
-```
+```hcl
terraform {
backend "local" {
path = "relative/path/to/terraform.tfstate"
@@ -25,13 +25,13 @@ terraform {
## Example Reference
-```
+```hcl
data "terraform_remote_state" "foo" {
- backend = "local"
+ backend = "local"
- config {
- path = "${path.module}/../../terraform.tfstate"
- }
+ config {
+ path = "${path.module}/../../terraform.tfstate"
+ }
}
```
diff --git a/website/source/docs/backends/types/manta.html.md b/website/source/docs/backends/types/manta.html.md
index 1d1eb426d..9a696f0d6 100644
--- a/website/source/docs/backends/types/manta.html.md
+++ b/website/source/docs/backends/types/manta.html.md
@@ -14,10 +14,10 @@ Stores the state as an artifact in [Manta](https://www.joyent.com/manta).
## Example Configuration
-```
+```hcl
terraform {
backend "manta" {
- path = "random/path"
+ path = "random/path"
objectName = "terraform.tfstate"
}
}
@@ -28,13 +28,13 @@ Note that for the access credentials we recommend using a
## Example Referencing
-```
+```hcl
data "terraform_remote_state" "foo" {
- backend = "manta"
- config {
- path = "random/path"
- objectName = "terraform.tfstate"
- }
+ backend = "manta"
+ config {
+ path = "random/path"
+ objectName = "terraform.tfstate"
+ }
}
```
diff --git a/website/source/docs/backends/types/s3.html.md b/website/source/docs/backends/types/s3.html.md
index 5297538f0..db777c22a 100644
--- a/website/source/docs/backends/types/s3.html.md
+++ b/website/source/docs/backends/types/s3.html.md
@@ -21,7 +21,7 @@ on the S3 bucket to allow for state recovery in the case of accidental deletions
## Example Configuration
-```
+```hcl
terraform {
backend "s3" {
bucket = "mybucket"
@@ -43,14 +43,14 @@ To make use of the S3 remote state we can use the
[`terraform_remote_state` data
source](/docs/providers/terraform/d/remote_state.html).
-```
+```hcl
data "terraform_remote_state" "foo" {
- backend = "s3"
- config {
- bucket = "terraform-state-prod"
- key = "network/terraform.tfstate"
- region = "us-east-1"
- }
+ backend = "s3"
+ config {
+ bucket = "terraform-state-prod"
+ key = "network/terraform.tfstate"
+ region = "us-east-1"
+ }
}
```
diff --git a/website/source/docs/backends/types/swift.html.md b/website/source/docs/backends/types/swift.html.md
index 7b883d76e..626f8f864 100644
--- a/website/source/docs/backends/types/swift.html.md
+++ b/website/source/docs/backends/types/swift.html.md
@@ -14,7 +14,7 @@ Stores the state as an artifact in [Swift](http://docs.openstack.org/developer/s
## Example Configuration
-```
+```hcl
terraform {
backend "swift" {
path = "terraform-state"
@@ -27,7 +27,7 @@ Note that for the access credentials we recommend using a
## Example Referencing
-```
+```hcl
data "terraform_remote_state" "foo" {
backend = "swift"
config {
diff --git a/website/source/docs/commands/console.html.markdown b/website/source/docs/commands/console.html.markdown
index 62d8a5025..e6af2e780 100644
--- a/website/source/docs/commands/console.html.markdown
+++ b/website/source/docs/commands/console.html.markdown
@@ -45,7 +45,7 @@ final command is outputted unless an error occurs earlier.
An example is shown below:
-```
+```shell
$ echo "1 + 5" | terraform console
6
```
diff --git a/website/source/docs/commands/graph.html.markdown b/website/source/docs/commands/graph.html.markdown
index 3098c5139..ce7d3928f 100644
--- a/website/source/docs/commands/graph.html.markdown
+++ b/website/source/docs/commands/graph.html.markdown
@@ -46,10 +46,9 @@ The output of `terraform graph` is in the DOT format, which can
easily be converted to an image by making use of `dot` provided
by GraphViz:
-```
+```shell
$ terraform graph | dot -Tpng > graph.png
```
Here is an example graph output:
-
-
+
diff --git a/website/source/docs/commands/import.html.md b/website/source/docs/commands/import.html.md
index b894b58aa..6e2d02d07 100644
--- a/website/source/docs/commands/import.html.md
+++ b/website/source/docs/commands/import.html.md
@@ -89,7 +89,7 @@ As a working example, if you're importing AWS resources and you have a
configuration file with the contents below, then Terraform will configure
the AWS provider with this file.
-```
+```hcl
variable "access_key" {}
variable "secret_key" {}
@@ -108,7 +108,7 @@ may not be valid.
This example will import an AWS instance:
-```
+```shell
$ terraform import aws_instance.foo i-abcd1234
```
@@ -116,6 +116,6 @@ $ terraform import aws_instance.foo i-abcd1234
The example below will import an AWS instance into a module:
-```
+```shell
$ terraform import module.foo.aws_instance.bar i-abcd1234
```
diff --git a/website/source/docs/commands/init.html.markdown b/website/source/docs/commands/init.html.markdown
index d28316395..aed3a97cb 100644
--- a/website/source/docs/commands/init.html.markdown
+++ b/website/source/docs/commands/init.html.markdown
@@ -87,7 +87,7 @@ If the value contains an equal sign (`=`), it is parsed as a `key=value` pair.
The format of this flag is identical to the `-var` flag for plan, apply,
etc. but applies to configuration keys for backends. For example:
-```
+```shell
$ terraform init \
-backend-config 'address=demo.consul.io' \
-backend-config 'path=newpath'
diff --git a/website/source/docs/commands/output.html.markdown b/website/source/docs/commands/output.html.markdown
index 9e6a60252..8969dca1e 100644
--- a/website/source/docs/commands/output.html.markdown
+++ b/website/source/docs/commands/output.html.markdown
@@ -36,7 +36,7 @@ The command-line flags are all optional. The list of available flags are:
These examples assume the following Terraform output snippet.
-```ruby
+```hcl
output "lb_address" {
value = "${aws_alb.web.public_dns}"
}
@@ -48,20 +48,20 @@ output "instance_ips" {
To list all outputs:
-```text
+```shell
$ terraform output
```
To query for the DNS address of the load balancer:
-```text
+```shell
$ terraform output lb_address
my-app-alb-1657023003.us-east-1.elb.amazonaws.com
```
To query for all instance IP addresses:
-```text
+```shell
$ terraform output instance_ips
test = [
54.43.114.12,
@@ -74,6 +74,6 @@ To query for a particular value in a list, use `-json` and a JSON
command-line parser such as [jq](https://stedolan.github.io/jq/).
For example, to query for the first instance's IP address:
-```text
+```shell
$ terraform output -json instance_ips | jq '.value[0]'
```
diff --git a/website/source/docs/commands/push.html.markdown b/website/source/docs/commands/push.html.markdown
index 8fc5ed3c7..c1406585f 100644
--- a/website/source/docs/commands/push.html.markdown
+++ b/website/source/docs/commands/push.html.markdown
@@ -105,9 +105,8 @@ The variable values can be updated using the `-overwrite` flag or via
the [Atlas website](https://atlas.hashicorp.com). An example of updating
just a single variable `foo` is shown below:
-```
+```shell
$ terraform push -var 'foo=bar' -overwrite foo
-...
```
Both the `-var` and `-overwrite` flag are required. The `-var` flag
diff --git a/website/source/docs/configuration/atlas.html.md b/website/source/docs/configuration/atlas.html.md
index e975c88ba..f6c3dda6a 100644
--- a/website/source/docs/configuration/atlas.html.md
+++ b/website/source/docs/configuration/atlas.html.md
@@ -26,9 +26,9 @@ already.
Atlas configuration looks like the following:
-```
+```hcl
atlas {
- name = "mitchellh/production-example"
+ name = "mitchellh/production-example"
}
```
@@ -51,8 +51,8 @@ set defaults, then use the command-line flags of the
The full syntax is:
-```
+```text
atlas {
- name = VALUE
+ name = VALUE
}
```
diff --git a/website/source/docs/configuration/data-sources.html.md b/website/source/docs/configuration/data-sources.html.md
index 003459a9d..144e41dea 100644
--- a/website/source/docs/configuration/data-sources.html.md
+++ b/website/source/docs/configuration/data-sources.html.md
@@ -36,17 +36,19 @@ already.
A data source configuration looks like the following:
-```
-// Find the latest available AMI that is tagged with Component = web
+```hcl
+# Find the latest available AMI that is tagged with Component = web
data "aws_ami" "web" {
filter {
- name = "state"
+ name = "state"
values = ["available"]
}
+
filter {
- name = "tag:Component"
+ name = "tag:Component"
values = ["web"]
}
+
most_recent = true
}
```
@@ -65,10 +67,10 @@ Each data instance will export one or more attributes, which can be
interpolated into other resources using variables of the form
`data.TYPE.NAME.ATTR`. For example:
-```
+```hcl
resource "aws_instance" "web" {
- ami = "${data.aws_ami.web.id}"
- instance_type = "t1.micro"
+ ami = "${data.aws_ami.web.id}"
+ instance_type = "t1.micro"
}
```
@@ -78,13 +80,12 @@ Similarly to [resources](/docs/configuration/resources.html), the
`provider` meta-parameter can be used where a configuration has
multiple aliased instances of the same provider:
-```
+```hcl
data "aws_ami" "web" {
provider = "aws.west"
- // etc...
+ # ...
}
-
```
See the "Multiple Provider Instances" documentation for resources
diff --git a/website/source/docs/configuration/environment-variables.html.md b/website/source/docs/configuration/environment-variables.html.md
index e33954520..1c15a02bf 100644
--- a/website/source/docs/configuration/environment-variables.html.md
+++ b/website/source/docs/configuration/environment-variables.html.md
@@ -12,13 +12,13 @@ description: |-
If set to any value, enables detailed logs to appear on stderr which is useful for debugging. For example:
-```
+```shell
export TF_LOG=TRACE
```
To disable, either unset it or set it to empty. When unset, logging will default to stderr. For example:
-```
+```shell
export TF_LOG=
```
@@ -28,7 +28,7 @@ For more on debugging Terraform, check out the section on [Debugging](/docs/inte
This specifies where the log should persist its output to. Note that even when `TF_LOG_PATH` is set, `TF_LOG` must be set in order for any logging to be enabled. For example, to always write the log to the directory you're currently running terraform from:
-```
+```shell
export TF_LOG_PATH=./terraform.log
```
@@ -38,7 +38,7 @@ For more on debugging Terraform, check out the section on [Debugging](/docs/inte
If set to "false" or "0", causes terraform commands to behave as if the `-input=false` flag was specified. This is used when you want to disable prompts for variables that haven't had their values specified. For example:
-```
+```shell
export TF_INPUT=0
```
@@ -46,7 +46,7 @@ export TF_INPUT=0
When given a value, causes terraform commands to behave as if the `-module-depth=VALUE` flag was specified. By setting this to 0, for example, you enable commands such as [plan](/docs/commands/plan.html) and [graph](/docs/commands/graph.html) to display more compressed information.
-```
+```shell
export TF_MODULE_DEPTH=0
```
@@ -56,7 +56,7 @@ For more information regarding modules, check out the section on [Using Modules]
Environment variables can be used to set variables. The environment variables must be in the format `TF_VAR_name` and this will be checked last for a value. For example:
-```
+```shell
export TF_VAR_region=us-west-1
export TF_VAR_ami=ami-049d8641
export TF_VAR_alist='[1,2,3]'
@@ -95,7 +95,7 @@ requiring remote network connectivity. The unit tests make an attempt to
automatically detect when connectivity is unavailable and skip the relevant
tests, but by setting this variable you can force these tests to be skipped.
-```
+```shell
export TF_SKIP_REMOTE_TESTS=1
make test
```
diff --git a/website/source/docs/configuration/interpolation.html.md b/website/source/docs/configuration/interpolation.html.md
index 709261585..896fdbee6 100644
--- a/website/source/docs/configuration/interpolation.html.md
+++ b/website/source/docs/configuration/interpolation.html.md
@@ -74,8 +74,6 @@ interpolate the current index in a multi-count resource. For more
information on `count`, see the [resource configuration
page](/docs/configuration/resources.html).
-
-
#### Path information
The syntax is `path.TYPE`. TYPE can be `cwd`, `module`, or `root`.
@@ -90,12 +88,11 @@ The syntax is `terraform.FIELD`. This variable type contains metadata about
the currently executing Terraform run. FIELD can currently only be `env` to
reference the currently active [state environment](/docs/state/environments.html).
-
## Conditionals
Interpolations may contain conditionals to branch on the final value.
-```
+```hcl
resource "aws_instance" "web" {
subnet = "${var.env == "production" ? var.prod_subnet : var.dev_subnet}"
}
@@ -103,7 +100,9 @@ resource "aws_instance" "web" {
The conditional syntax is the well-known ternary operation:
- CONDITION ? TRUEVAL : FALSEVAL
+```text
+CONDITION ? TRUEVAL : FALSEVAL
+```
The condition can be any valid interpolation syntax, such as variable
access, a function call, or even another conditional. The true and false
@@ -119,7 +118,7 @@ The support operators are:
A common use case for conditionals is to enable/disable a resource by
conditionally setting the count:
-```
+```hcl
resource "aws_instance" "vpn" {
count = "${var.something ? 1 : 0}"
}
@@ -129,7 +128,6 @@ In the example above, the "vpn" resource will only be included if
"var.something" evaluates to true. Otherwise, the VPN resource will
not be created at all.
-
## Built-in Functions
Terraform ships with built-in functions. Functions are called with the
@@ -347,7 +345,6 @@ The supported built-in functions are:
of the key used to encrypt their initial password, you might use:
`zipmap(aws_iam_user.users.*.name, aws_iam_user_login_profile.users.*.key_fingerprint)`.
-
## Templates
Long strings can be managed using templates.
@@ -358,7 +355,7 @@ computed `rendered` attribute containing the result.
A template data source looks like:
-```
+```hcl
data "template_file" "example" {
template = "$${hello} $${world}!"
vars {
@@ -383,7 +380,7 @@ details on template usage, please see the
Here is an example that combines the capabilities of templates with the interpolation
from `count` to give us a parameterized template, unique to each resource instance:
-```
+```hcl
variable "count" {
default = 2
}
@@ -396,41 +393,42 @@ variable "hostnames" {
}
data "template_file" "web_init" {
- // here we expand multiple template_files - the same number as we have instances
+ # Expand multiple template files - the same number as we have instances
count = "${var.count}"
template = "${file("templates/web_init.tpl")}"
vars {
- // that gives us access to use count.index to do the lookup
+ # that gives us access to use count.index to do the lookup
hostname = "${lookup(var.hostnames, count.index)}"
}
}
resource "aws_instance" "web" {
- // ...
+ # ...
count = "${var.count}"
- // here we link each web instance to the proper template_file
+
+ # Link each web instance to the proper template_file
user_data = "${element(data.template_file.web_init.*.rendered, count.index)}"
}
```
-With this, we will build a list of `template_file.web_init` data sources which we can
-use in combination with our list of `aws_instance.web` resources.
+With this, we will build a list of `template_file.web_init` data sources which
+we can use in combination with our list of `aws_instance.web` resources.
-
## Math
Simple math can be performed in interpolations:
-```
+```hcl
variable "count" {
default = 2
}
resource "aws_instance" "web" {
- // ...
+ # ...
+
count = "${var.count}"
- // tag the instance with a counter starting at 1, ie. web-001
+ # Tag the instance with a counter starting at 1, ie. web-001
tags {
Name = "${format("web-%03d", count.index + 1)}"
}
@@ -446,7 +444,7 @@ Operator precedences is the standard mathematical order of operations:
*Multiply* (`*`), *Divide* (`/`), and *Modulo* (`%`) have precedence over
*Add* (`+`) and *Subtract* (`-`). Parenthesis can be used to force ordering.
-```
+```text
"${2 * 4 + 3 * 3}" # computes to 17
"${3 * 3 + 2 * 4}" # computes to 17
"${2 * (4 + 3) * 3}" # computes to 42
diff --git a/website/source/docs/configuration/modules.html.md b/website/source/docs/configuration/modules.html.md
index 3d94b41d0..18d513a49 100644
--- a/website/source/docs/configuration/modules.html.md
+++ b/website/source/docs/configuration/modules.html.md
@@ -21,10 +21,10 @@ already.
Module configuration looks like the following:
-```
+```hcl
module "consul" {
- source = "github.com/hashicorp/consul/terraform/aws"
- servers = 5
+ source = "github.com/hashicorp/consul/terraform/aws"
+ servers = 5
}
```
@@ -54,16 +54,16 @@ lists and maps.
The full syntax is:
-```
+```text
module NAME {
- source = SOURCE_URL
+ source = SOURCE_URL
- CONFIG ...
+ CONFIG ...
}
```
where `CONFIG` is:
-```
+```text
KEY = VALUE
```
diff --git a/website/source/docs/configuration/outputs.html.md b/website/source/docs/configuration/outputs.html.md
index 20b637fd0..a4a4b4a17 100644
--- a/website/source/docs/configuration/outputs.html.md
+++ b/website/source/docs/configuration/outputs.html.md
@@ -27,7 +27,7 @@ already.
A simple output configuration looks like the following:
-```ruby
+```hcl
output "address" {
value = "${aws_instance.db.public_dns}"
}
@@ -38,7 +38,7 @@ DNS address of the Terraform-defined AWS instance named "db". It
is possible to export complex data types like maps and strings as
well:
-```ruby
+```hcl
output "addresses" {
value = ["${aws_instance.web.*.public_dns}"]
}
@@ -54,22 +54,21 @@ the output variable.
Within the block (the `{ }`) is configuration for the output.
These are the parameters that can be set:
- * `value` (required) - The value of the output. This can be a string, list,
- or map. This usually includes an interpolation since outputs that are
- static aren't usually useful.
+- `value` (required) - The value of the output. This can be a string, list, or
+ map. This usually includes an interpolation since outputs that are static
+ aren't usually useful.
- * `depends_on` (list of strings) - Explicit dependencies that this
- output has. These dependencies will be created before this
- output value is processed. The dependencies are in the format of
- `TYPE.NAME`, for example `aws_instance.web`.
+- `depends_on` (list of strings) - Explicit dependencies that this output has.
+ These dependencies will be created before this output value is processed. The
+ dependencies are in the format of `TYPE.NAME`, for example `aws_instance.web`.
- * `sensitive` (optional, boolean) - See below.
+- `sensitive` (optional, boolean) - See below.
## Syntax
The full syntax is:
-```ruby
+```text
output NAME {
value = VALUE
}
@@ -80,7 +79,7 @@ output NAME {
Outputs can be marked as containing sensitive material by setting the
`sensitive` attribute to `true`, like this:
-```ruby
+```hcl
output "sensitive" {
sensitive = true
value = VALUE
@@ -93,8 +92,9 @@ displayed in place of their value.
### Limitations of Sensitive Outputs
-* The values of sensitive outputs are still stored in the Terraform
- state, and available using the `terraform output` command, so cannot be
- relied on as a sole means of protecting values.
-* Sensitivity is not tracked internally, so if the output is interpolated in
+- The values of sensitive outputs are still stored in the Terraform state, and
+ available using the `terraform output` command, so cannot be relied on as a
+ sole means of protecting values.
+
+- Sensitivity is not tracked internally, so if the output is interpolated in
another module into a resource, the value will be displayed.
diff --git a/website/source/docs/configuration/override.html.md b/website/source/docs/configuration/override.html.md
index b3dbb1dbc..0d497f6e1 100644
--- a/website/source/docs/configuration/override.html.md
+++ b/website/source/docs/configuration/override.html.md
@@ -35,17 +35,17 @@ Terraform configurations.
If you have a Terraform configuration `example.tf` with the contents:
-```
+```hcl
resource "aws_instance" "web" {
- ami = "ami-408c7f28"
+ ami = "ami-408c7f28"
}
```
And you created a file `override.tf` with the contents:
-```
+```hcl
resource "aws_instance" "web" {
- ami = "foo"
+ ami = "foo"
}
```
diff --git a/website/source/docs/configuration/providers.html.md b/website/source/docs/configuration/providers.html.md
index 55b5e0ddc..af1737ddd 100644
--- a/website/source/docs/configuration/providers.html.md
+++ b/website/source/docs/configuration/providers.html.md
@@ -29,11 +29,11 @@ already.
A provider configuration looks like the following:
-```
+```hcl
provider "aws" {
- access_key = "foo"
- secret_key = "bar"
- region = "us-east-1"
+ access_key = "foo"
+ secret_key = "bar"
+ region = "us-east-1"
}
```
@@ -45,13 +45,11 @@ Multiple provider blocks can be used to configure multiple providers.
Terraform matches providers to resources by matching two criteria.
Both criteria must be matched for a provider to manage a resource:
- * They must share a common prefix. Longest matching prefixes are
- tried first. For example, `aws_instance` would choose the
- `aws` provider.
+- They must share a common prefix. Longest matching prefixes are tried first.
+ For example, `aws_instance` would choose the `aws` provider.
- * The provider must report that it supports the given resource
- type. Providers internally tell Terraform the list of resources
- they support.
+- The provider must report that it supports the given resource type. Providers
+ internally tell Terraform the list of resources they support.
Within the block (the `{ }`) is configuration for the resource.
The configuration is dependent on the type, and is documented
@@ -68,28 +66,27 @@ To define multiple provider instances, repeat the provider configuration
multiple times, but set the `alias` field and name the provider. For
example:
-```
+```hcl
# The default provider
provider "aws" {
- # ...
+ # ...
}
# West coast region
provider "aws" {
- alias = "west"
-
- region = "us-west-2"
+ alias = "west"
+ region = "us-west-2"
}
```
After naming a provider, you reference it in resources with the `provider`
field:
-```
+```hcl
resource "aws_instance" "foo" {
- provider = "aws.west"
+ provider = "aws.west"
- # ...
+ # ...
}
```
@@ -101,20 +98,20 @@ is used (the provider configuration with no `alias` set). The value of the
The full syntax is:
-```
+```text
provider NAME {
- CONFIG ...
- [alias = ALIAS]
+ CONFIG ...
+ [alias = ALIAS]
}
```
where `CONFIG` is:
-```
+```text
KEY = VALUE
KEY {
- CONFIG
+ CONFIG
}
```
diff --git a/website/source/docs/configuration/resources.html.md b/website/source/docs/configuration/resources.html.md
index 1cc79bda4..63bfd30af 100644
--- a/website/source/docs/configuration/resources.html.md
+++ b/website/source/docs/configuration/resources.html.md
@@ -23,10 +23,10 @@ already.
A resource configuration looks like the following:
-```
+```hcl
resource "aws_instance" "web" {
- ami = "ami-408c7f28"
- instance_type = "t1.micro"
+ ami = "ami-408c7f28"
+ instance_type = "t1.micro"
}
```
@@ -41,86 +41,79 @@ configuration is dependent on the type, and is documented for each
resource type in the
[providers section](/docs/providers/index.html).
-
### Meta-parameters
There are **meta-parameters** available to all resources:
- * `count` (int) - The number of identical resources to create.
- This doesn't apply to all resources. For details on using variables in
- conjunction with count, see [Using Variables with
- `count`](#using-variables-with-count) below.
+- `count` (int) - The number of identical resources to create. This doesn't
+ apply to all resources. For details on using variables in conjunction with
+ count, see [Using Variables with `count`](#using-variables-with-count) below.
-~> **NOTE:** Modules don't currently support the `count` parameter.
+ -> Modules don't currently support the `count` parameter.
- * `depends_on` (list of strings) - Explicit dependencies that this
- resource has. These dependencies will be created before this
- resource. For syntax and other details, see the section below on
- [explicit dependencies](#explicit-dependencies).
+- `depends_on` (list of strings) - Explicit dependencies that this resource has.
+ These dependencies will be created before this resource. For syntax and other
+ details, see the section below on [explicit
+ dependencies](#explicit-dependencies).
- * `provider` (string) - The name of a specific provider to use for
- this resource. The name is in the format of `TYPE.ALIAS`, for example,
- `aws.west`. Where `west` is set using the `alias` attribute in a
- provider. See [multiple provider instances](#multi-provider-instances).
+- `provider` (string) - The name of a specific provider to use for this
+ resource. The name is in the format of `TYPE.ALIAS`, for example, `aws.west`.
+ Where `west` is set using the `alias` attribute in a provider. See [multiple
+ provider instances](#multi-provider-instances).
- * `lifecycle` (configuration block) - Customizes the lifecycle
- behavior of the resource. The specific options are documented
- below.
+- `lifecycle` (configuration block) - Customizes the lifecycle behavior of the
+ resource. The specific options are documented below.
-The `lifecycle` block allows the following keys to be set:
+ The `lifecycle` block allows the following keys to be set:
- * `create_before_destroy` (bool) - This flag is used to ensure
- the replacement of a resource is created before the original
- instance is destroyed. As an example, this can be used to
- create an new DNS record before removing an old record.
+ - `create_before_destroy` (bool) - This flag is used to ensure the replacement
+ of a resource is created before the original instance is destroyed. As an
+ example, this can be used to create an new DNS record before removing an old
+ record.
- * `prevent_destroy` (bool) - This flag provides extra protection against the
- destruction of a given resource. When this is set to `true`, any plan
- that includes a destroy of this resource will return an error message.
+ ~> Resources that utilize the `create_before_destroy` key can only
+ depend on other resources that also include `create_before_destroy`.
+ Referencing a resource that does not include `create_before_destroy`
+ will result in a dependency graph cycle.
-
+ - `prevent_destroy` (bool) - This flag provides extra protection against the
+ destruction of a given resource. When this is set to `true`, any plan that
+ includes a destroy of this resource will return an error message.
- * `ignore_changes` (list of strings) - Customizes how diffs are evaluated for
- resources, allowing individual attributes to be ignored through changes.
- As an example, this can be used to ignore dynamic changes to the
- resource from external resources. Other meta-parameters cannot be ignored.
+ - `ignore_changes` (list of strings) - Customizes how diffs are evaluated for
+ resources, allowing individual attributes to be ignored through changes. As
+ an example, this can be used to ignore dynamic changes to the resource from
+ external resources. Other meta-parameters cannot be ignored.
-~> **NOTE on create\_before\_destroy and dependencies:** Resources that utilize
-the `create_before_destroy` key can only depend on other resources that also
-include `create_before_destroy`. Referencing a resource that does not include
-`create_before_destroy` will result in a dependency graph cycle.
-
-~> **NOTE on ignore\_changes:** Ignored attribute names can be matched by their
-name, not state ID. For example, if an `aws_route_table` has two routes defined
-and the `ignore_changes` list contains "route", both routes will be ignored.
-Additionally you can also use a single entry with a wildcard (e.g. `"*"`)
-which will match all attribute names. Using a partial string together with a
-wildcard (e.g. `"rout*"`) is **not** supported.
-
-
-
+ ~> Ignored attribute names can be matched by their name, not state ID.
+ For example, if an `aws_route_table` has two routes defined and the
+ `ignore_changes` list contains "route", both routes will be ignored.
+ Additionally you can also use a single entry with a wildcard (e.g. `"*"`)
+ which will match all attribute names. Using a partial string together
+ with a wildcard (e.g. `"rout*"`) is **not** supported.
### Timeouts
Individual Resources may provide a `timeouts` block to enable users to configure the
amount of time a specific operation is allowed to take before being considered
-an error. For example, the
-[aws_db_instance](/docs/providers/aws/r/db_instance.html#timeouts)
-resource provides configurable timeouts for the
+an error. For example, the
+[aws_db_instance](/docs/providers/aws/r/db_instance.html#timeouts)
+resource provides configurable timeouts for the
`create`, `update`, and `delete` operations. Any Resource that provies Timeouts
will document the default values for that operation, and users can overwrite
-them in their configuration.
+them in their configuration.
Example overwriting the `create` and `delete` timeouts:
-```
+```hcl
resource "aws_db_instance" "timeout_example" {
- allocated_storage = 10
- engine = "mysql"
- engine_version = "5.6.17"
- instance_class = "db.t1.micro"
- name = "mydb"
- [...]
+ allocated_storage = 10
+ engine = "mysql"
+ engine_version = "5.6.17"
+ instance_class = "db.t1.micro"
+ name = "mydb"
+
+ # ...
timeouts {
create = "60m"
@@ -134,8 +127,6 @@ attempting to configure the timeout for a Resource that does not support
Timeouts, or overwriting a specific action that the Resource does not specify as
an option, will result in an error. Valid units of time are `s`, `m`, `h`.
-
-
### Explicit Dependencies
Terraform ensures that dependencies are successfully created before a
@@ -158,8 +149,8 @@ be allowed to determine dependencies automatically.
The syntax of `depends_on` is a list of resources and modules:
- * Resources are `TYPE.NAME`, such as `aws_instance.web`.
- * Modules are `module.NAME`, such as `module.foo`.
+- Resources are `TYPE.NAME`, such as `aws_instance.web`.
+- Modules are `module.NAME`, such as `module.foo`.
When a resource depends on a module, _everything_ in that module must be
created before the resource is created.
@@ -167,7 +158,7 @@ created before the resource is created.
An example of a resource depending on both a module and resource is shown
below. Note that `depends_on` can contain any number of dependencies:
-```
+```hcl
resource "aws_instance" "web" {
depends_on = ["aws_instance.leader", "module.vpc"]
}
@@ -179,8 +170,6 @@ scenario by having your resources depend only on what they explicitly use.
Please think carefully before you use `depends_on` to determine if Terraform
could automatically do this a better way.
-
-
### Connection block
Within a resource, you can optionally have a **connection block**.
@@ -196,8 +185,6 @@ but other data must be specified by the user.
The full list of settings that can be specified are listed on
the [provisioner connection page](/docs/provisioners/connection.html).
-
-
### Provisioners
Within a resource, you can specify zero or more **provisioner
@@ -213,8 +200,6 @@ provide more specific connection info for a specific provisioner.
An example use case might be to use a different user to log in
for a single provisioner.
-
-
## Using Variables With `count`
When declaring multiple instances of a resource using [`count`](#count), it is
@@ -228,7 +213,7 @@ For example, here's how you could create three [AWS
Instances](/docs/providers/aws/r/instance.html) each with their own
static IP address:
-```
+```hcl
variable "instance_ips" {
default = {
"0" = "10.11.12.100"
@@ -244,8 +229,6 @@ resource "aws_instance" "app" {
}
```
-
-
## Multiple Provider Instances
By default, a resource targets the provider based on its type. For example
@@ -257,7 +240,7 @@ a provider that is configured multiple times to support multiple regions, etc.
To target another provider, set the `provider` field:
-```
+```hcl
resource "aws_instance" "foo" {
provider = "aws.west"
@@ -269,7 +252,7 @@ The value of the field should be `TYPE` or `TYPE.ALIAS`. The `ALIAS` value
comes from the `alias` field value when configuring the
[provider](/docs/configuration/providers.html).
-```
+```hcl
provider "aws" {
alias = "west"
@@ -283,7 +266,7 @@ If no `provider` field is specified, the default provider is used.
The full syntax is:
-```
+```text
resource TYPE NAME {
CONFIG ...
[count = COUNT]
@@ -299,7 +282,7 @@ resource TYPE NAME {
where `CONFIG` is:
-```
+```text
KEY = VALUE
KEY {
@@ -309,7 +292,7 @@ KEY {
where `LIFECYCLE` is:
-```
+```text
lifecycle {
[create_before_destroy = true|false]
[prevent_destroy = true|false]
@@ -319,7 +302,7 @@ lifecycle {
where `CONNECTION` is:
-```
+```text
connection {
KEY = VALUE
...
@@ -328,7 +311,7 @@ connection {
where `PROVISIONER` is:
-```
+```text
provisioner NAME {
CONFIG ...
diff --git a/website/source/docs/configuration/syntax.html.md b/website/source/docs/configuration/syntax.html.md
index f65e1cbf6..56ffe511d 100644
--- a/website/source/docs/configuration/syntax.html.md
+++ b/website/source/docs/configuration/syntax.html.md
@@ -3,13 +3,15 @@ layout: "docs"
page_title: "Configuration Syntax"
sidebar_current: "docs-config-syntax"
description: |-
- The syntax of Terraform configurations is custom. It is meant to strike a balance between human readable and editable as well as being machine-friendly. For machine-friendliness, Terraform can also read JSON configurations. For general Terraform configurations, however, we recommend using the Terraform syntax.
+ The syntax of Terraform configurations is custom. It is meant to strike a
+ balance between human readable and editable as well as being machine-friendly.
+ For machine-friendliness, Terraform can also read JSON configurations. For
+ general Terraform configurations, however, we recommend using the Terraform
+ syntax.
---
# Configuration Syntax
-
-
The syntax of Terraform configurations is called [HashiCorp Configuration
Language (HCL)](https://github.com/hashicorp/hcl). It is meant to strike a
balance between human readable and editable as well as being machine-friendly.
@@ -21,7 +23,7 @@ syntax.
Here is an example of Terraform's HCL syntax:
-```
+```hcl
# An AMI
variable "ami" {
description = "the AMI to use"
@@ -80,13 +82,15 @@ such as the "resource" and "variable" in the example above. These
sections are similar to maps, but visually look better. For example,
these are nearly equivalent:
-```
+```hcl
variable "ami" {
description = "the AMI to use"
}
+```
-# is equal to:
+is equal to:
+```hcl
variable = [{
"ami": {
"description": "the AMI to use",
@@ -105,25 +109,25 @@ The above example converted to JSON:
```json
{
- "variable": {
- "ami": {
- "description": "the AMI to use"
- }
- },
+ "variable": {
+ "ami": {
+ "description": "the AMI to use"
+ }
+ },
- "resource": {
- "aws_instance": {
- "web": {
- "ami": "${var.ami}",
- "count": 2,
- "source_dest_check": false,
+ "resource": {
+ "aws_instance": {
+ "web": {
+ "ami": "${var.ami}",
+ "count": 2,
+ "source_dest_check": false,
- "connection": {
- "user": "root"
- }
- }
- }
- }
+ "connection": {
+ "user": "root"
+ }
+ }
+ }
+ }
}
```
diff --git a/website/source/docs/configuration/terraform.html.md b/website/source/docs/configuration/terraform.html.md
index fcdf4a559..7fdcc91e6 100644
--- a/website/source/docs/configuration/terraform.html.md
+++ b/website/source/docs/configuration/terraform.html.md
@@ -19,9 +19,9 @@ already.
Terraform configuration looks like the following:
-```
+```hcl
terraform {
- required_version = "> 0.7.0"
+ required_version = "> 0.7.0"
}
```
@@ -55,12 +55,15 @@ The value of this configuration is a comma-separated list of constraints.
A constraint is an operator followed by a version, such as `> 0.7.0`.
Constraints support the following operations:
- * `=` (or no operator): exact version equality
- * `!=`: version not equal
- * `>`, `>=`, `<`, `<=`: version comparison, where "greater than" is
- a larger version number.
- * `~>`: pessimistic constraint operator. Example: for `~> 0.9`, this means
- `>= 0.9, < 1.0`. Example: for `~> 0.8.4`, this means `>= 0.8.4, < 0.9`
+- `=` (or no operator): exact version equality
+
+- `!=`: version not equal
+
+- `>`, `>=`, `<`, `<=`: version comparison, where "greater than" is a larger
+ version number
+
+- `~>`: pessimistic constraint operator. Example: for `~> 0.9`, this means
+ `>= 0.9, < 1.0`. Example: for `~> 0.8.4`, this means `>= 0.8.4, < 0.9`
For modules, a minimum version is recommended, such as `> 0.8.0`. This
minimum version ensures that a module operates as expected, but gives
@@ -70,8 +73,8 @@ the consumer flexibility to use newer versions.
The full syntax is:
-```
+```text
terraform {
- required_version = VALUE
+ required_version = VALUE
}
```
diff --git a/website/source/docs/configuration/variables.html.md b/website/source/docs/configuration/variables.html.md
index c98b0bfaa..4bddb1122 100644
--- a/website/source/docs/configuration/variables.html.md
+++ b/website/source/docs/configuration/variables.html.md
@@ -22,7 +22,7 @@ already.
A variable configuration looks like the following:
-```
+```hcl
variable "key" {
type = "string"
}
@@ -54,23 +54,20 @@ throughout the Terraform configuration.
Within the block (the `{ }`) is configuration for the variable.
These are the parameters that can be set:
- * `type` (optional) - If set this defines the type of the variable.
- Valid values are `string`, `list`, and `map`. If this field is omitted, the
- variable type will be inferred based on the `default`. If no `default` is
- provided, the type is assumed to be `string`.
+- `type` (optional) - If set this defines the type of the variable. Valid values
+ are `string`, `list`, and `map`. If this field is omitted, the variable type
+ will be inferred based on the `default`. If no `default` is provided, the type
+ is assumed to be `string`.
- * `default` (optional) - This sets a default value for the variable.
- If no default is provided, the variable is considered required and
- Terraform will error if it is not set. The default value can be any of the
- data types Terraform supports. This is covered in more detail below.
+- `default` (optional) - This sets a default value for the variable. If no
+ default is provided, the variable is considered required and Terraform will
+ error if it is not set. The default value can be any of the data types
+ Terraform supports. This is covered in more detail below.
- * `description` (optional) - A human-friendly description for
- the variable. This is primarily for documentation for users
- using your Terraform configuration. A future version of Terraform
- will expose these descriptions as part of some Terraform CLI
- command.
-
-------
+- `description` (optional) - A human-friendly description for the variable. This
+ is primarily for documentation for users using your Terraform configuration. A
+ future version of Terraform will expose these descriptions as part of some
+ Terraform CLI command.
-> **Note**: Default values can be strings, lists, or maps. If a default is
specified, it must match the declared type of the variable.
@@ -80,7 +77,7 @@ specified, it must match the declared type of the variable.
String values are simple and represent a basic key to value
mapping where the key is the variable name. An example is:
-```
+```hcl
variable "key" {
type = "string"
default = "value"
@@ -89,7 +86,7 @@ variable "key" {
A multi-line string value can be provided using heredoc syntax.
-```
+```hcl
variable "long_key" {
type = "string"
default = <
-
Variables can be collected in files and passed all at once using the
`-var-file=foo.tfvars` flag.
@@ -271,13 +265,15 @@ Variables files use HCL or JSON to define variable values. Strings, lists or
maps may be set in the same manner as the default value in a `variable` block
in Terraform configuration. For example:
-```
+```hcl
foo = "bar"
xyz = "abc"
+
somelist = [
"one",
"two",
]
+
somemap = {
foo = "bar"
bax = "qux"
@@ -286,13 +282,13 @@ somemap = {
The `-var-file` flag can be used multiple times per command invocation:
-```
-terraform apply -var-file=foo.tfvars -var-file=bar.tfvars
+```shell
+$ terraform apply -var-file=foo.tfvars -var-file=bar.tfvars
```
--> **Note**: Variable files are evaluated in the order in which they are specified
-on the command line. If a variable is defined in more than one variable file,
-the last value specified is effective.
+-> **Note**: Variable files are evaluated in the order in which they are
+specified on the command line. If a variable is defined in more than one
+variable file, the last value specified is effective.
### Variable Merging
@@ -301,21 +297,21 @@ overridden. Map values are always merged.
For example, if you set a variable twice on the command line:
-```
-terraform apply -var foo=bar -var foo=baz
+```shell
+$ terraform apply -var foo=bar -var foo=baz
```
Then the value of `foo` will be `baz` since it was the last value seen.
However, for maps, the values are merged:
-```
-terraform apply -var 'foo={foo="bar"}' -var 'foo={bar="baz"}'
+```shell
+$ terraform apply -var 'foo={foo="bar"}' -var 'foo={bar="baz"}'
```
The resulting value of `foo` will be:
-```
+```shell
{
foo = "bar"
bar = "baz"
@@ -332,20 +328,20 @@ Both these files have the variable `baz` defined:
_foo.tfvars_
-```
+```hcl
baz = "foo"
```
_bar.tfvars_
-```
+```hcl
baz = "bar"
```
When they are passed in the following order:
-```
-terraform apply -var-file=foo.tfvars -var-file=bar.tfvars
+```shell
+$ terraform apply -var-file=foo.tfvars -var-file=bar.tfvars
```
The result will be that `baz` will contain the value `bar` because `bar.tfvars`
diff --git a/website/source/docs/import/usage.html.md b/website/source/docs/import/usage.html.md
index 9ca563022..9207e36c4 100644
--- a/website/source/docs/import/usage.html.md
+++ b/website/source/docs/import/usage.html.md
@@ -17,9 +17,8 @@ be able to do this.
Using `terraform import` is simple. An example is shown below:
-```
+```shell
$ terraform import aws_instance.bar i-abcd1234
-...
```
The above command imports an AWS instance with the given ID to the
diff --git a/website/source/docs/internals/debugging.html.md b/website/source/docs/internals/debugging.html.md
index f6ea583c4..01c964741 100644
--- a/website/source/docs/internals/debugging.html.md
+++ b/website/source/docs/internals/debugging.html.md
@@ -16,8 +16,6 @@ To persist logged output you can set `TF_LOG_PATH` in order to force the log to
If you find a bug with Terraform, please include the detailed log by using a service such as gist.
-
-
## Interpreting a Crash Log
If Terraform ever crashes (a "panic" in the Go runtime), it saves a log file
@@ -35,7 +33,7 @@ backtrace immediately following. So the first thing to do is to search the file
for `panic: `, which should jump you right to this message. It will look
something like this:
-```
+```text
panic: runtime error: invalid memory address or nil pointer dereference
goroutine 123 [running]:
@@ -61,7 +59,7 @@ created by net/rpc.(*Server).ServeCodec
The key part of this message is the first two lines that involve `hashicorp/terraform`. In this example:
-```
+```text
github.com/hashicorp/terraform/builtin/providers/aws.resourceAwsSomeResourceCreate(...)
/opt/gopath/src/github.com/hashicorp/terraform/builtin/providers/aws/resource_aws_some_resource.go:123 +0x123
```
diff --git a/website/source/docs/internals/internal-plugins.html.md b/website/source/docs/internals/internal-plugins.html.md
index dc3c96428..5ed5ae8df 100644
--- a/website/source/docs/internals/internal-plugins.html.md
+++ b/website/source/docs/internals/internal-plugins.html.md
@@ -20,7 +20,7 @@ However, when you upgrade you will need to manually delete old plugins from disk
If you don't do this you will see an error message like the following:
-```
+```text
[WARN] /usr/local/bin/terraform-provisioner-file overrides an internal plugin for file-provisioner.
If you did not expect to see this message you will need to remove the old plugin.
See https://www.terraform.io/docs/internals/plugins.html
diff --git a/website/source/docs/modules/create.html.markdown b/website/source/docs/modules/create.html.markdown
index 8320268d2..860c56564 100644
--- a/website/source/docs/modules/create.html.markdown
+++ b/website/source/docs/modules/create.html.markdown
@@ -18,7 +18,7 @@ Therefore, you can enter the source of any module, satisfy any required variable
Within a folder containing Terraform configurations, create a subfolder called `child`. In this subfolder, make one empty `main.tf` file. Then, back in the root folder containing the `child` folder, add this to one of your Terraform configuration files:
-```
+```hcl
module "child" {
source = "./child"
}
@@ -37,7 +37,7 @@ Inputs of a module are [variables](/docs/configuration/variables.html) and outpu
Let's add a variable and an output to our `child` module.
-```
+```hcl
variable "memory" {}
output "received" {
@@ -49,7 +49,7 @@ This will create a required variable, `memory`, and then an output, `received`,
You can then configure the module and use the output like so:
-```
+```hcl
module "child" {
source = "./child"
@@ -69,7 +69,7 @@ It is sometimes useful to embed files within the module that aren't Terraform co
In these cases, you can't use a relative path, since paths in Terraform are generally relative to the working directory from which Terraform was executed. Instead, you want to use a module-relative path. To do this, you should use the [path interpolated variables](/docs/configuration/interpolation.html).
-```
+```hcl
resource "aws_instance" "server" {
# ...
diff --git a/website/source/docs/modules/sources.html.markdown b/website/source/docs/modules/sources.html.markdown
index 67162347f..96d62a1fc 100644
--- a/website/source/docs/modules/sources.html.markdown
+++ b/website/source/docs/modules/sources.html.markdown
@@ -31,7 +31,7 @@ Each is documented further below.
The easiest source is the local file path. For maximum portability, this should be a relative file path into a subdirectory. This allows you to organize your Terraform configuration into modules within one repository, for example:
-```
+```hcl
module "consul" {
source = "./consul"
}
@@ -43,7 +43,7 @@ Updates for file paths are automatic: when "downloading" the module using the [g
Terraform will automatically recognize GitHub URLs and turn them into a link to the specific Git repository. The syntax is simple:
-```
+```hcl
module "consul" {
source = "github.com/hashicorp/example"
}
@@ -51,7 +51,7 @@ module "consul" {
Subdirectories within the repository can also be referenced:
-```
+```hcl
module "consul" {
source = "github.com/hashicorp/example//subdir"
}
@@ -59,7 +59,7 @@ module "consul" {
These will fetch the modules using HTTPS. If you want to use SSH instead:
-```
+```hcl
module "consul" {
source = "git@github.com:hashicorp/example.git//subdir"
}
@@ -77,7 +77,7 @@ If you need Terraform to be able to fetch modules from private GitHub repos on a
First, create a [machine user](https://developer.github.com/guides/managing-deploy-keys/#machine-users) on GitHub with read access to the private repo in question, then embed this user's credentials into the `source` parameter:
-```
+```hcl
module "private-infra" {
source = "git::https://MACHINE-USER:MACHINE-PASS@github.com/org/privatemodules//modules/foo"
}
@@ -89,7 +89,7 @@ module "private-infra" {
Terraform will automatically recognize BitBucket URLs and turn them into a link to the specific Git or Mercurial repository, for example:
-```
+```hcl
module "consul" {
source = "bitbucket.org/hashicorp/consul"
}
@@ -97,7 +97,7 @@ module "consul" {
Subdirectories within the repository can also be referenced:
-```
+```hcl
module "consul" {
source = "bitbucket.org/hashicorp/consul//subdir"
}
@@ -111,7 +111,7 @@ BitBucket URLs will require that Git or Mercurial is installed on your system, d
Generic Git repositories are also supported. The value of `source` in this case should be a complete Git-compatible URL. Using generic Git repositories requires that Git is installed on your system.
-```
+```hcl
module "consul" {
source = "git://hashicorp.com/consul.git"
}
@@ -119,7 +119,7 @@ module "consul" {
You can also use protocols such as HTTP or SSH to reference a module, but you'll have specify to Terraform that it is a Git module, by prefixing the URL with `git::` like so:
-```
+```hcl
module "consul" {
source = "git::https://hashicorp.com/consul.git"
}
@@ -135,7 +135,7 @@ The URLs for Git repositories support the following query parameters:
* `ref` - The ref to checkout. This can be a branch, tag, commit, etc.
-```
+```hcl
module "consul" {
source = "git::https://hashicorp.com/consul.git?ref=master"
}
@@ -145,7 +145,7 @@ module "consul" {
Generic Mercurial repositories are supported. The value of `source` in this case should be a complete Mercurial-compatible URL. Using generic Mercurial repositories requires that Mercurial is installed on your system. You must tell Terraform that your `source` is a Mercurial repository by prefixing it with `hg::`.
-```
+```hcl
module "consul" {
source = "hg::http://hashicorp.com/consul.hg"
}
@@ -155,7 +155,7 @@ URLs for Mercurial repositories support the following query parameters:
* `rev` - The rev to checkout. This can be a branch, tag, commit, etc.
-```
+```hcl
module "consul" {
source = "hg::http://hashicorp.com/consul.hg?rev=default"
}
@@ -172,8 +172,8 @@ Terraform then looks for the resulting module URL in the following order:
2. Terraform will look for a `` tag with the name of `terraform-get`, for example:
-```
-
+```html
+
```
### S3 Bucket
@@ -189,7 +189,7 @@ Here are a couple of examples.
Using the `s3` protocol.
-```
+```hcl
module "consul" {
source = "s3::https://s3-eu-west-1.amazonaws.com/consulbucket/consul.zip"
}
@@ -197,7 +197,7 @@ module "consul" {
Or directly using the bucket's URL.
-```
+```hcl
module "consul" {
source = "consulbucket.s3-eu-west-1.amazonaws.com/consul.zip"
}
@@ -215,4 +215,3 @@ archive formats:
* zip
* gz
* bz2
-
diff --git a/website/source/docs/modules/usage.html.markdown b/website/source/docs/modules/usage.html.markdown
index 50673b802..17147a492 100644
--- a/website/source/docs/modules/usage.html.markdown
+++ b/website/source/docs/modules/usage.html.markdown
@@ -9,7 +9,7 @@ description: Using modules in Terraform is very similar to defining resources.
Using modules in Terraform is very similar to defining resources:
-```
+```shell
module "consul" {
source = "github.com/hashicorp/consul/terraform/aws"
servers = 3
@@ -26,8 +26,9 @@ The existence of the above configuration will tell Terraform to create the resou
You can instantiate a module multiple times.
-```
+```hcl
# my_buckets.tf
+
module "assets_bucket" {
source = "./publish_bucket"
name = "assets"
@@ -38,7 +39,8 @@ module "media_bucket" {
name = "media"
}
```
-```
+
+```hcl
# publish_bucket/bucket-and-cloudfront.tf
variable "name" {} # this is the input parameter of the module
@@ -65,9 +67,8 @@ are documented in the [Module sources documentation](/docs/modules/sources.html)
Prior to running any Terraform command with a configuration that uses modules, you'll have to [get](/docs/commands/get.html) the modules. This is done using the [get command](/docs/commands/get.html).
-```
+```shell
$ terraform get
-...
```
This command will download the modules if they haven't been already.
@@ -85,7 +86,7 @@ Additionally, because these map directly to variables, module configuration can
Modules can also specify their own [outputs](/docs/configuration/outputs.html). These outputs can be referenced in other places in your configuration, for example:
-```
+```hcl
resource "aws_instance" "client" {
ami = "ami-408c7f28"
instance_type = "t1.micro"
@@ -99,8 +100,8 @@ Just like resources, this will create a dependency from the `aws_instance.client
To use module outputs via command line you have to specify the module name before the variable, for example:
-```
-terraform output -module=consul server_availability_zone
+```shell
+$ terraform output -module=consul server_availability_zone
```
## Plans and Graphs
@@ -109,15 +110,11 @@ Commands such as the [plan command](/docs/commands/plan.html) and [graph command
For example, with a configuration similar to what we've built above, here is what the graph output looks like by default:
-
-
If instead we set `-module-depth=0`, the graph will look like this:
-
-
Other commands work similarly with modules. Note that the `-module-depth` flag is purely a formatting flag; it doesn't affect what modules are created or not.
@@ -125,8 +122,8 @@ Other commands work similarly with modules. Note that the `-module-depth` flag i
The [taint command](/docs/commands/taint.html) can be used to _taint_ specific resources within a module:
-```
-terraform taint -module=salt_master aws_instance.salt_master
+```shell
+$ terraform taint -module=salt_master aws_instance.salt_master
```
It is currently not possible to taint an entire module.
diff --git a/website/source/docs/plugins/basics.html.md b/website/source/docs/plugins/basics.html.md
index ba18c2d1e..99a642610 100644
--- a/website/source/docs/plugins/basics.html.md
+++ b/website/source/docs/plugins/basics.html.md
@@ -24,7 +24,7 @@ exposes an implementation for a specific service, such as AWS, or provisioner,
such as bash. Plugins are executed as a separate process and communicate with
the main Terraform binary over an RPC interface.
-More details are available in
+More details are available in
[Internal Docs](/docs/internals/internal-plugins.html).
The code within the binaries must adhere to certain interfaces.
@@ -41,9 +41,9 @@ are defined is `~/.terraformrc` for Unix-like systems and
An example that configures a new provider is shown below:
-```
+```hcl
providers {
- privatecloud = "/path/to/privatecloud"
+ privatecloud = "/path/to/privatecloud"
}
```
@@ -74,7 +74,7 @@ the road.
With the directory made, create a `main.go` file. This project will
be a binary so the package is "main":
-```
+```golang
package main
import (
diff --git a/website/source/docs/plugins/provider.html.md b/website/source/docs/plugins/provider.html.md
index 163173f92..3e51fddac 100644
--- a/website/source/docs/plugins/provider.html.md
+++ b/website/source/docs/plugins/provider.html.md
@@ -70,7 +70,7 @@ This structure implements the `ResourceProvider` interface. We
recommend creating this structure in a function to make testing easier
later. Example:
-```
+```golang
func Provider() *schema.Provider {
return &schema.Provider{
...
@@ -100,7 +100,7 @@ As part of the unit tests, you should call `InternalValidate`. This is used
to verify the structure of the provider and all of the resources, and reports
an error if it is invalid. An example test is shown below:
-```
+```golang
func TestProvider(t *testing.T) {
if err := Provider().(*schema.Provider).InternalValidate(); err != nil {
t.Fatalf("err: %s", err)
@@ -118,7 +118,7 @@ These resources are put into the `ResourcesMap` field of the provider
structure. Again, we recommend creating functions to instantiate these.
An example is shown below.
-```
+```golang
func resourceComputeAddress() *schema.Resource {
return &schema.Resource {
...
@@ -211,7 +211,7 @@ subsequent `terraform apply` fixes this resource.
Most of the time, partial state is not required. When it is, it must be
specifically enabled. An example is shown below:
-```
+```golang
func resourceUpdate(d *schema.ResourceData, meta interface{}) error {
// Enable partial state mode
d.Partial(true)
diff --git a/website/source/docs/providers/alicloud/d/images.html.markdown b/website/source/docs/providers/alicloud/d/images.html.markdown
index 3ef88796c..cdd6478f1 100644
--- a/website/source/docs/providers/alicloud/d/images.html.markdown
+++ b/website/source/docs/providers/alicloud/d/images.html.markdown
@@ -6,13 +6,13 @@ description: |-
Provides a list of images available to the user.
---
-# alicloud\_images
+# alicloud_images
The Images data source list image resource list contains private images of the user and images of system resources provided by Alicloud, as well as other public images and those available on the image market.
## Example Usage
-```
+```hcl
data "alicloud_images" "multi_image" {
owners = "system"
name_regex = "^centos_6"
diff --git a/website/source/docs/providers/alicloud/d/instance_types.html.markdown b/website/source/docs/providers/alicloud/d/instance_types.html.markdown
index 233265259..e95ccf6cd 100644
--- a/website/source/docs/providers/alicloud/d/instance_types.html.markdown
+++ b/website/source/docs/providers/alicloud/d/instance_types.html.markdown
@@ -6,13 +6,13 @@ description: |-
Provides a list of Ecs Instance Types for use in alicloud_instance resource.
---
-# alicloud\_instance\_types
+# alicloud_instance_types
The Instance Types data source list the ecs_instance_types of Alicloud.
## Example Usage
-```
+```hcl
# Declare the data source
data "alicloud_instance_types" "1c2g" {
cpu_core_count = 1
@@ -20,11 +20,10 @@ data "alicloud_instance_types" "1c2g" {
}
# Create ecs instance with the first matched instance_type
-
resource "alicloud_instance" "instance" {
instance_type = "${data.alicloud_instance_types.1c2g.instance_types.0.id}"
- # Other properties...
+ # ...
}
```
diff --git a/website/source/docs/providers/alicloud/d/regions.html.markdown b/website/source/docs/providers/alicloud/d/regions.html.markdown
index 6eb38deaa..2ab9f22db 100644
--- a/website/source/docs/providers/alicloud/d/regions.html.markdown
+++ b/website/source/docs/providers/alicloud/d/regions.html.markdown
@@ -6,13 +6,13 @@ description: |-
Provides a list of Availability Regions which can be used by an Alicloud account.
---
-# alicloud\_regions
+# alicloud_regions
The Regions data source allows access to the list of Alicloud Regions.
## Example Usage
-```
+```hcl
data "alicloud_regions" "current" {
current = true
}
diff --git a/website/source/docs/providers/alicloud/d/zones.html.markdown b/website/source/docs/providers/alicloud/d/zones.html.markdown
index 0cf29765a..2b208bb0d 100644
--- a/website/source/docs/providers/alicloud/d/zones.html.markdown
+++ b/website/source/docs/providers/alicloud/d/zones.html.markdown
@@ -6,13 +6,13 @@ description: |-
Provides a list of Availability Zones which can be used by an Alicloud account.
---
-# alicloud\_zones
+# alicloud_zones
The Zones data source allows access to the list of Alicloud Zones which can be accessed by an Alicloud account within the region configured in the provider.
## Example Usage
-```
+```hcl
# Declare the data source
data "alicloud_zones" "default" {
"available_instance_type" = "ecs.s2.large"
@@ -24,7 +24,7 @@ data "alicloud_zones" "default" {
resource "alicloud_instance" "instance" {
availability_zone = "${data.alicloud_zones.default.zones.0.id}"
- # Other properties...
+ # ...
}
```
diff --git a/website/source/docs/providers/alicloud/index.html.markdown b/website/source/docs/providers/alicloud/index.html.markdown
index a7ac4409c..3da317e76 100644
--- a/website/source/docs/providers/alicloud/index.html.markdown
+++ b/website/source/docs/providers/alicloud/index.html.markdown
@@ -16,7 +16,7 @@ Use the navigation to the left to read about the available resources.
## Example Usage
-```
+```hcl
# Configure the Alicloud Provider
provider "alicloud" {
access_key = "${var.access_key}"
@@ -64,7 +64,7 @@ alicloud provider block:
Usage:
-```
+```hcl
provider "alicloud" {
access_key = "${var.access_key}"
secret_key = "${var.secret_key}"
@@ -79,13 +79,13 @@ You can provide your credentials via `ALICLOUD_ACCESS_KEY` and `ALICLOUD_SECRET_
environment variables, representing your Alicloud Access Key and Secret Key, respectively.
`ALICLOUD_REGION` is also used, if applicable:
-```
+```hcl
provider "alicloud" {}
```
Usage:
-```
+```shell
$ export ALICLOUD_ACCESS_KEY="anaccesskey"
$ export ALICLOUD_SECRET_KEY="asecretkey"
$ export ALICLOUD_REGION="cn-beijing"
@@ -110,4 +110,3 @@ The following arguments are supported:
## Testing
Credentials must be provided via the `ALICLOUD_ACCESS_KEY`, and `ALICLOUD_SECRET_KEY` environment variables in order to run acceptance tests.
-
diff --git a/website/source/docs/providers/alicloud/r/db_instance.html.markdown b/website/source/docs/providers/alicloud/r/db_instance.html.markdown
index 7580f61e6..ee3a78071 100644
--- a/website/source/docs/providers/alicloud/r/db_instance.html.markdown
+++ b/website/source/docs/providers/alicloud/r/db_instance.html.markdown
@@ -6,7 +6,7 @@ description: |-
Provides an RDS instance resource.
---
-# alicloud\_db\_instance
+# alicloud_db_instance
Provides an RDS instance resource. A DB instance is an isolated database
environment in the cloud. A DB instance can contain multiple user-created
@@ -14,14 +14,16 @@ databases.
## Example Usage
-```
+```hcl
resource "alicloud_db_instance" "default" {
- commodity_code = "rds"
- engine = "MySQL"
- engine_version = "5.6"
- db_instance_class = "rds.mysql.t1.small"
- db_instance_storage = "10"
- db_instance_net_type = "Intranet"
+ commodity_code = "rds"
+
+ engine = "MySQL"
+ engine_version = "5.6"
+
+ db_instance_class = "rds.mysql.t1.small"
+ db_instance_storage = "10"
+ db_instance_net_type = "Intranet"
}
```
@@ -30,13 +32,13 @@ resource "alicloud_db_instance" "default" {
The following arguments are supported:
* `engine` - (Required) Database type. Value options: MySQL, SQLServer, PostgreSQL, and PPAS.
-* `engine_version` - (Required) Database version. Value options:
+* `engine_version` - (Required) Database version. Value options:
- 5.5/5.6/5.7 for MySQL
- 2008r2/2012 for SQLServer
- 9.4 for PostgreSQL
- 9.3 for PPAS
* `db_instance_class` - (Required) Instance type. For details, see [Instance type table](https://intl.aliyun.com/help/doc-detail/26312.htm?spm=a3c0i.o26228en.a3.2.bRUHF3).
-* `db_instance_storage` - (Required) User-defined storage space. Value range:
+* `db_instance_storage` - (Required) User-defined storage space. Value range:
- [5, 2000] for MySQL/PostgreSQL/PPAS HA dual node edition;
- [20,1000] for MySQL 5.7 basic single node edition;
- [10, 2000] for SQL Server 2008R2;
@@ -63,7 +65,7 @@ The following arguments are supported:
The database mapping supports the following:
-* `db_name` - (Required) Name of the database requiring a uniqueness check. It may consist of lower case letters, numbers and underlines, and must start with a letter and have no more than 64 characters.
+* `db_name` - (Required) Name of the database requiring a uniqueness check. It may consist of lower case letters, numbers and underlines, and must start with a letter and have no more than 64 characters.
* `character_set_name` - (Required) Character set. The value range is limited to the following:
- MySQL type:
+ utf8
@@ -76,7 +78,7 @@ The database mapping supports the following:
+ SQL_Latin1_General_CP1_CI_AS
+ SQL_Latin1_General_CP1_CS_AS
+ Chinese_PRC_BIN
-* `db_description` - (Optional) Database description, which cannot exceed 256 characters. NOTE: It cannot begin with https://.
+* `db_description` - (Optional) Database description, which cannot exceed 256 characters. NOTE: It cannot begin with https://.
~> **NOTE:** We neither support modify any of database attribute, nor insert/remove item at the same time.
@@ -103,4 +105,3 @@ The following attributes are exported:
* `backup_retention_period` - Retention days of the backup.
* `security_ips` - Security ips of instance whitelist.
* `connections` - Views all the connection information of a specified instance.
-
diff --git a/website/source/docs/providers/alicloud/r/disk.html.markdown b/website/source/docs/providers/alicloud/r/disk.html.markdown
index 82814b732..1b4098a31 100644
--- a/website/source/docs/providers/alicloud/r/disk.html.markdown
+++ b/website/source/docs/providers/alicloud/r/disk.html.markdown
@@ -1,12 +1,12 @@
---
layout: "alicloud"
page_title: "Alicloud: alicloud_disk"
-sidebar_current: "docs-alicloud-resource-disk"
+sidebar_current: "docs-alicloud-resource-disk."
description: |-
Provides a ECS Disk resource.
---
-# alicloud\_disk
+# alicloud_disk
Provides a ECS disk resource.
@@ -14,10 +14,8 @@ Provides a ECS disk resource.
## Example Usage
-```
-# Create a new ECS disk.
+```hcl
resource "alicloud_disk" "ecs_disk" {
- # cn-beijing
availability_zone = "cn-beijing-b"
name = "New-disk"
description = "Hello ecs disk."
@@ -34,7 +32,7 @@ resource "alicloud_disk" "ecs_disk" {
The following arguments are supported:
* `availability_zone` - (Required, Forces new resource) The Zone to create the disk in.
-* `name` - (Optional) Name of the ECS disk. This name can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","_", and must not begin or end with a hyphen, and must not begin with http:// or https://. Default value is null.
+* `name` - (Optional) Name of the ECS disk. This name can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","\_", and must not begin or end with a hyphen, and must not begin with http:// or https://. Default value is null.
* `description` - (Optional) Description of the disk. This description can have a string of 2 to 256 characters, It cannot begin with http:// or https://. Default value is null.
* `category` - (Optional, Forces new resource) Category of the disk. Valid values are `cloud`, `cloud_efficiency` and `cloud_ssd`. Default is `cloud`.
* `size` - (Required) The size of the disk in GiBs, and its value depends on `Category`. `cloud` disk value range: 5GB ~ 2000GB and other category disk value range: 20 ~ 32768.
@@ -53,4 +51,4 @@ The following attributes are exported:
* `category` - The disk category.
* `size` - The disk size.
* `snapshot_id` - The disk snapshot ID.
-* `tags` - The disk tags.
\ No newline at end of file
+* `tags` - The disk tags.
diff --git a/website/source/docs/providers/alicloud/r/disk_attachment.html.markdown b/website/source/docs/providers/alicloud/r/disk_attachment.html.markdown
index d39e85a4c..4e500650f 100644
--- a/website/source/docs/providers/alicloud/r/disk_attachment.html.markdown
+++ b/website/source/docs/providers/alicloud/r/disk_attachment.html.markdown
@@ -6,7 +6,7 @@ description: |-
Provides a ECS Disk Attachment resource.
---
-# alicloud\_disk\_attachment
+# alicloud_disk_attachment
Provides an Alicloud ECS Disk Attachment as a resource, to attach and detach disks from ECS Instances.
@@ -14,9 +14,7 @@ Provides an Alicloud ECS Disk Attachment as a resource, to attach and detach dis
Basic usage
-```
-# Create a new ECS disk-attachment and use it attach one disk to a new instance.
-
+```hcl
resource "alicloud_security_group" "ecs_sg" {
name = "terraform-test-group"
description = "New security group"
@@ -65,4 +63,4 @@ The following attributes are exported:
* `instance_id` - ID of the Instance.
* `disk_id` - ID of the Disk.
-* `device_name` - The device name exposed to the instance.
\ No newline at end of file
+* `device_name` - The device name exposed to the instance.
diff --git a/website/source/docs/providers/alicloud/r/eip.html.markdown b/website/source/docs/providers/alicloud/r/eip.html.markdown
index ddb1b7689..e602d50c1 100644
--- a/website/source/docs/providers/alicloud/r/eip.html.markdown
+++ b/website/source/docs/providers/alicloud/r/eip.html.markdown
@@ -1,18 +1,18 @@
---
layout: "alicloud"
page_title: "Alicloud: alicloud_eip"
-sidebar_current: "docs-alicloud-resource-eip"
+sidebar_current: "docs-alicloud-resource-eip."
description: |-
Provides a ECS EIP resource.
---
-# alicloud\_eip
+# alicloud_eip
Provides a ECS EIP resource.
## Example Usage
-```
+```hcl
# Create a new EIP.
resource "alicloud_eip" "example" {
bandwidth = "10"
diff --git a/website/source/docs/providers/alicloud/r/eip_association.html.markdown b/website/source/docs/providers/alicloud/r/eip_association.html.markdown
index 6c0d7059a..2e3f996be 100644
--- a/website/source/docs/providers/alicloud/r/eip_association.html.markdown
+++ b/website/source/docs/providers/alicloud/r/eip_association.html.markdown
@@ -6,7 +6,7 @@ description: |-
Provides a ECS EIP Association resource.
---
-# alicloud\_eip\_association
+# alicloud_eip_association
Provides an Alicloud EIP Association resource, to associate and disassociate Elastic IPs from ECS Instances.
@@ -16,9 +16,7 @@ Provides an Alicloud EIP Association resource, to associate and disassociate Ela
## Example Usage
-```
-# Create a new EIP association and use it to associate a EIP form a instance.
-
+```hcl
resource "alicloud_vpc" "vpc" {
cidr_block = "10.1.0.0/21"
}
@@ -73,4 +71,4 @@ The following arguments are supported:
The following attributes are exported:
* `allocation_id` - As above.
-* `instance_id` - As above.
\ No newline at end of file
+* `instance_id` - As above.
diff --git a/website/source/docs/providers/alicloud/r/instance.html.markdown b/website/source/docs/providers/alicloud/r/instance.html.markdown
index f01b42964..201beab3d 100644
--- a/website/source/docs/providers/alicloud/r/instance.html.markdown
+++ b/website/source/docs/providers/alicloud/r/instance.html.markdown
@@ -6,13 +6,13 @@ description: |-
Provides a ECS instance resource.
---
-# alicloud\_ecs
+# alicloud_ecs
Provides a ECS instance resource.
## Example Usage
-```
+```hcl
# Create a new ECS instance for classic
resource "alicloud_security_group" "classic" {
name = "tf_test_foo"
@@ -36,11 +36,11 @@ resource "alicloud_instance" "classic" {
# Create a new ECS instance for VPC
resource "alicloud_vpc" "default" {
- # Other parameters...
+ # ...
}
resource "alicloud_vswitch" "default" {
- # Other parameters...
+ # ...
}
resource "alicloud_slb" "vpc" {
@@ -59,18 +59,18 @@ The following arguments are supported:
* `io_optimized` - (Required) Valid values are `none`, `optimized`, If `optimized`, the launched ECS instance will be I/O optimized.
* `security_group_ids` - (Optional) A list of security group ids to associate with.
* `availability_zone` - (Optional) The Zone to start the instance in.
-* `instance_name` - (Optional) The name of the ECS. This instance_name can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","_", and must not begin or end with a hyphen, and must not begin with http:// or https://. If not specified,
+* `instance_name` - (Optional) The name of the ECS. This instance_name can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","\_", and must not begin or end with a hyphen, and must not begin with http:// or https://. If not specified,
Terraform will autogenerate a default name is `ECS-Instance`.
* `allocate_public_ip` - (Optional) Associate a public ip address with an instance in a VPC or Classic. Boolean value, Default is false.
-* `system_disk_category` - (Optional) Valid values are `cloud`, `cloud_efficiency`, `cloud_ssd`, For I/O optimized instance type, `cloud_ssd` and `cloud_efficiency` disks are supported. For non I/O Optimized instance type, `cloud` disk are supported.
+* `system_disk_category` - (Optional) Valid values are `cloud`, `cloud_efficiency`, `cloud_ssd`, For I/O optimized instance type, `cloud_ssd` and `cloud_efficiency` disks are supported. For non I/O Optimized instance type, `cloud` disk are supported.
* `system_disk_size` - (Optional) Size of the system disk, value range: 40GB ~ 500GB. Default is 40GB.
* `description` - (Optional) Description of the instance, This description can have a string of 2 to 256 characters, It cannot begin with http:// or https://. Default value is null.
* `internet_charge_type` - (Optional) Internet charge type of the instance, Valid values are `PayByBandwidth`, `PayByTraffic`. Default is `PayByBandwidth`.
* `internet_max_bandwidth_in` - (Optional) Maximum incoming bandwidth from the public network, measured in Mbps (Mega bit per second). Value range: [1, 200]. If this value is not specified, then automatically sets it to 200 Mbps.
-* `internet_max_bandwidth_out` - (Optional) Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bit per second). Value range:
+* `internet_max_bandwidth_out` - (Optional) Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bit per second). Value range:
`internet_charge_type` is `PayByBandwidth`: this value range [0, 100], If this value is not specified, then automatically sets it to 0 Mbps; If `internet_charge_type` is `PayByTraffic`: this value range [1, 100]. this value must be set value, such as 5.
-* `host_name` - (Optional) Host name of the ECS, which is a string of at least two characters. “hostname” cannot start or end with “.” or “-“. In addition, two or more consecutive “.” or “-“ symbols are not allowed. On Windows, the host name can contain a maximum of 15 characters, which can be a combination of uppercase/lowercase letters, numerals, and “-“. The host name cannot contain dots (“.”) or contain only numeric characters.
-On other OSs such as Linux, the host name can contain a maximum of 30 characters, which can be segments separated by dots (“.”), where each segment can contain uppercase/lowercase letters, numerals, or “_“.
+* `host_name` - (Optional) Host name of the ECS, which is a string of at least two characters. "hostname” cannot start or end with ".” or "-". In addition, two or more consecutive ".” or "-" symbols are not allowed. On Windows, the host name can contain a maximum of 15 characters, which can be a combination of uppercase/lowercase letters, numerals, and "-". The host name cannot contain dots (".”) or contain only numeric characters.
+On other OSs such as Linux, the host name can contain a maximum of 30 characters, which can be segments separated by dots (".”), where each segment can contain uppercase/lowercase letters, numerals, or "\_".
* `password` - (Optional) Password to an instance is a string of 8 to 30 characters. It must contain uppercase/lowercase letters and numerals, but cannot contain special symbols.
* `vswitch_id` - (Optional) The virtual switch ID to launch in VPC. If you want to create instances in VPC network, this parameter must be set.
* `instance_charge_type` - (Optional) Valid values are `PrePaid`, `PostPaid`, The default is `PostPaid`.
@@ -94,4 +94,4 @@ The following attributes are exported:
* `private_ip` - The instance private ip.
* `public_ip` - The instance public ip.
* `vswitch_id` - If the instance created in VPC, then this value is virtual switch ID.
-* `tags` - The instance tags, use jsonencode(item) to display the value.
\ No newline at end of file
+* `tags` - The instance tags, use jsonencode(item) to display the value.
diff --git a/website/source/docs/providers/alicloud/r/nat_gateway.html.markdown b/website/source/docs/providers/alicloud/r/nat_gateway.html.markdown
index 4af7b88b5..659bd7d1f 100644
--- a/website/source/docs/providers/alicloud/r/nat_gateway.html.markdown
+++ b/website/source/docs/providers/alicloud/r/nat_gateway.html.markdown
@@ -6,7 +6,7 @@ description: |-
Provides a resource to create a VPC NAT Gateway.
---
-# alicloud\_nat\_gateway
+# alicloud_nat_gateway
Provides a resource to create a VPC NAT Gateway.
@@ -14,7 +14,7 @@ Provides a resource to create a VPC NAT Gateway.
Basic usage
-```
+```hcl
resource "alicloud_vpc" "vpc" {
name = "tf_test_foo"
cidr_block = "172.16.0.0/12"
@@ -31,11 +31,12 @@ resource "alicloud_nat_gateway" "nat_gateway" {
spec = "Small"
name = "test_foo"
- bandwidth_packages = [{
- ip_count = 1
- bandwidth = 5
- zone = "cn-beijing-b"
- },
+ bandwidth_packages = [
+ {
+ ip_count = 1
+ bandwidth = 5
+ zone = "cn-beijing-b"
+ },
{
ip_count = 2
bandwidth = 10
@@ -55,7 +56,7 @@ The following arguments are supported:
* `vpc_id` - (Required, Forces New Resorce) The VPC ID.
* `spec` - (Required, Forces New Resorce) The specification of the nat gateway. Valid values are `Small`, `Middle` and `Large`. Details refer to [Nat Gateway Specification](https://help.aliyun.com/document_detail/42757.html?spm=5176.doc32322.6.559.kFNBzv)
-* `name` - (Optional) Name of the nat gateway. The value can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","_", and must not begin or end with a hyphen, and must not begin with http:// or https://. Defaults to null.
+* `name` - (Optional) Name of the nat gateway. The value can have a string of 2 to 128 characters, must contain only alphanumeric characters or hyphens, such as "-",".","\_", and must not begin or end with a hyphen, and must not begin with http:// or https://. Defaults to null.
* `description` - (Optional) Description of the nat gateway, This description can have a string of 2 to 256 characters, It cannot begin with http:// or https://. Defaults to null.
* `bandwidth_packages` - (Required) A list of bandwidth packages for the nat gatway.
diff --git a/website/source/docs/providers/alicloud/r/security_group.html.markdown b/website/source/docs/providers/alicloud/r/security_group.html.markdown
index c25dbe808..7825d37ae 100644
--- a/website/source/docs/providers/alicloud/r/security_group.html.markdown
+++ b/website/source/docs/providers/alicloud/r/security_group.html.markdown
@@ -1,12 +1,12 @@
---
layout: "alicloud"
page_title: "Alicloud: alicloud_security_group"
-sidebar_current: "docs-alicloud-resource-security-group"
+sidebar_current: "docs-alicloud-resource-security-group."
description: |-
Provides a Alicloud Security Group resource.
---
-# alicloud\_security\_group
+# alicloud_security_group
Provides a security group resource.
@@ -16,15 +16,16 @@ Provides a security group resource.
Basic Usage
-```
+```hcl
resource "alicloud_security_group" "group" {
name = "terraform-test-group"
description = "New security group"
}
```
+
Basic usage for vpc
-```
+```hcl
resource "alicloud_security_group" "group" {
name = "new-group"
vpc_id = "${alicloud_vpc.vpc.id}"
@@ -50,4 +51,4 @@ The following attributes are exported:
* `id` - The ID of the security group
* `vpc_id` - The VPC ID.
* `name` - The name of the security group
-* `description` - The description of the security group
\ No newline at end of file
+* `description` - The description of the security group
diff --git a/website/source/docs/providers/alicloud/r/security_group_rule.html.markdown b/website/source/docs/providers/alicloud/r/security_group_rule.html.markdown
index 1b3db7af2..2b58aa50f 100644
--- a/website/source/docs/providers/alicloud/r/security_group_rule.html.markdown
+++ b/website/source/docs/providers/alicloud/r/security_group_rule.html.markdown
@@ -6,7 +6,7 @@ description: |-
Provides a Alicloud Security Group Rule resource.
---
-# alicloud\_security\_group\_rule
+# alicloud_security_group_rule
Provides a security group rule resource.
Represents a single `ingress` or `egress` group rule, which can be added to external Security Groups.
@@ -18,7 +18,7 @@ Represents a single `ingress` or `egress` group rule, which can be added to exte
Basic Usage
-```
+```hcl
resource "alicloud_security_group" "default" {
name = "default"
}
diff --git a/website/source/docs/providers/alicloud/r/slb.html.markdown b/website/source/docs/providers/alicloud/r/slb.html.markdown
index 81a8cbfe4..b227bc75b 100644
--- a/website/source/docs/providers/alicloud/r/slb.html.markdown
+++ b/website/source/docs/providers/alicloud/r/slb.html.markdown
@@ -1,18 +1,18 @@
---
layout: "alicloud"
page_title: "Alicloud: alicloud_slb"
-sidebar_current: "docs-alicloud-resource-slb"
+sidebar_current: "docs-alicloud-resource-slb."
description: |-
Provides an Application Load Banlancer resource.
---
-# alicloud\_slb
+# alicloud_slb
Provides an Application Load Balancer resource.
## Example Usage
-```
+```hcl
# Create a new load balancer for classic
resource "alicloud_slb" "classic" {
name = "test-slb-tf"
@@ -44,11 +44,11 @@ resource "alicloud_slb" "classic" {
# Create a new load balancer for VPC
resource "alicloud_vpc" "default" {
- # Other parameters...
+ # ...
}
resource "alicloud_vswitch" "default" {
- # Other parameters...
+ # ...
}
resource "alicloud_slb" "vpc" {
@@ -62,7 +62,7 @@ resource "alicloud_slb" "vpc" {
The following arguments are supported:
* `name` - (Optional) The name of the SLB. This name must be unique within your AliCloud account, can have a maximum of 80 characters,
-must contain only alphanumeric characters or hyphens, such as "-","/",".","_", and must not begin or end with a hyphen. If not specified,
+must contain only alphanumeric characters or hyphens, such as "-","/",".","\_", and must not begin or end with a hyphen. If not specified,
Terraform will autogenerate a name beginning with `tf-lb`.
* `internet` - (Optional, Forces New Resource) If true, the SLB addressType will be internet, false will be intranet, Default is false. If load balancer launched in VPC, this value must be "false".
* `internet_charge_type` - (Optional, Forces New Resource) Valid
@@ -91,4 +91,4 @@ The following attributes are exported:
* `internet_charge_type` - The internet_charge_type of the load balancer.
* `bandwidth` - The bandwidth of the load balancer.
* `vswitch_id` - The VSwitch ID of the load balancer. Only available on SLB launched in a VPC.
-* `address` - The IP address of the load balancer.
\ No newline at end of file
+* `address` - The IP address of the load balancer.
diff --git a/website/source/docs/providers/alicloud/r/slb_attachment.html.markdown b/website/source/docs/providers/alicloud/r/slb_attachment.html.markdown
index ce3d7ac39..6ae4c1c58 100644
--- a/website/source/docs/providers/alicloud/r/slb_attachment.html.markdown
+++ b/website/source/docs/providers/alicloud/r/slb_attachment.html.markdown
@@ -6,20 +6,20 @@ description: |-
Provides an Application Load Banlancer Attachment resource.
---
-# alicloud\_slb\_attachment
+# alicloud_slb_attachment
Provides an Application Load Balancer Attachment resource.
## Example Usage
-```
+```hcl
# Create a new load balancer attachment for classic
resource "alicloud_slb" "default" {
- # Other parameters...
+ # ...
}
resource "alicloud_instance" "default" {
- # Other parameters...
+ # ...
}
resource "alicloud_slb_attachment" "default" {
diff --git a/website/source/docs/providers/alicloud/r/vpc.html.markdown b/website/source/docs/providers/alicloud/r/vpc.html.markdown
index f464326d8..b7dbc644b 100644
--- a/website/source/docs/providers/alicloud/r/vpc.html.markdown
+++ b/website/source/docs/providers/alicloud/r/vpc.html.markdown
@@ -16,12 +16,13 @@ Provides a VPC resource.
Basic Usage
-```
+```hcl
resource "alicloud_vpc" "vpc" {
name = "tf_test_foo"
cidr_block = "172.16.0.0/12"
}
```
+
## Argument Reference
The following arguments are supported:
diff --git a/website/source/docs/providers/alicloud/r/vroute_entry.html.markdown b/website/source/docs/providers/alicloud/r/vroute_entry.html.markdown
index adca830be..a684d1781 100644
--- a/website/source/docs/providers/alicloud/r/vroute_entry.html.markdown
+++ b/website/source/docs/providers/alicloud/r/vroute_entry.html.markdown
@@ -14,7 +14,7 @@ Provides a route entry resource.
Basic Usage
-```
+```hcl
resource "alicloud_vpc" "vpc" {
name = "tf_test_foo"
cidr_block = "172.16.0.0/12"
@@ -29,7 +29,7 @@ resource "alicloud_route_entry" "default" {
}
resource "alicloud_instance" "snat" {
- // ...
+ # ...
}
```
## Argument Reference
diff --git a/website/source/docs/providers/alicloud/r/vswitch.html.markdown b/website/source/docs/providers/alicloud/r/vswitch.html.markdown
index 8f6bbdb2f..335f5162b 100644
--- a/website/source/docs/providers/alicloud/r/vswitch.html.markdown
+++ b/website/source/docs/providers/alicloud/r/vswitch.html.markdown
@@ -6,7 +6,7 @@ description: |-
Provides a Alicloud VPC switch resource.
---
-# alicloud\_vswitch
+# alicloud_vswitch
Provides a VPC switch resource.
@@ -14,7 +14,7 @@ Provides a VPC switch resource.
Basic Usage
-```
+```hcl
resource "alicloud_vpc" "vpc" {
name = "tf_test_foo"
cidr_block = "172.16.0.0/12"
diff --git a/website/source/docs/providers/archive/d/archive_file.md b/website/source/docs/providers/archive/d/archive_file.md
index 2f8c8292c..51e833493 100644
--- a/website/source/docs/providers/archive/d/archive_file.md
+++ b/website/source/docs/providers/archive/d/archive_file.md
@@ -6,17 +6,17 @@ description: |-
Generates an archive from content, a file, or directory of files.
---
-# archive\_file
+# archive_file
Generates an archive from content, a file, or directory of files.
## Example Usage
-```
+```hcl
data "archive_file" "init" {
- type = "zip"
- source_file = "${path.module}/init.tpl"
- output_path = "${path.module}/files/init.zip"
+ type = "zip"
+ source_file = "${path.module}/init.tpl"
+ output_path = "${path.module}/files/init.zip"
}
```
diff --git a/website/source/docs/providers/archive/index.html.markdown b/website/source/docs/providers/archive/index.html.markdown
index 71b98011a..b9787f6b6 100644
--- a/website/source/docs/providers/archive/index.html.markdown
+++ b/website/source/docs/providers/archive/index.html.markdown
@@ -14,6 +14,6 @@ Use the navigation to the left to read about the available resources.
## Example Usage
-```
+```hcl
provider "archive" {}
```
diff --git a/website/source/docs/providers/arukas/index.html.markdown b/website/source/docs/providers/arukas/index.html.markdown
index b6719f272..08aa8bf82 100644
--- a/website/source/docs/providers/arukas/index.html.markdown
+++ b/website/source/docs/providers/arukas/index.html.markdown
@@ -55,7 +55,7 @@ so that Terraform can connect. If you don't want to put
credentials in your configuration file, you can leave them
out:
-```
+```hcl
provider "arukas" {}
```
@@ -81,4 +81,4 @@ The following arguments are supported:
environment variable if provided.
* `timeout` - (Optional) Override Arukas API timeout seconds. Also taken from the `ARUKAS_TIMEOUT`
- environment variable if provided.
\ No newline at end of file
+ environment variable if provided.
diff --git a/website/source/docs/providers/arukas/r/container.html.markdown b/website/source/docs/providers/arukas/r/container.html.markdown
index ec2fc00b0..81bdf1c28 100644
--- a/website/source/docs/providers/arukas/r/container.html.markdown
+++ b/website/source/docs/providers/arukas/r/container.html.markdown
@@ -6,7 +6,7 @@ description: |-
Manages Arukas Containers
---
-# arukas container
+# arukas_container
Provides container resource. This allows container to be created, updated and deleted.
diff --git a/website/source/docs/providers/atlas/d/artifact.html.markdown b/website/source/docs/providers/atlas/d/artifact.html.markdown
index 3e46d5706..3a8a4817f 100644
--- a/website/source/docs/providers/atlas/d/artifact.html.markdown
+++ b/website/source/docs/providers/atlas/d/artifact.html.markdown
@@ -8,7 +8,7 @@ description: |-
of resources.
---
-# atlas\_artifact
+# atlas_artifact
Provides a [Data Source](/docs/configuration/data-sources.html) to access to deployment
artifacts managed by Atlas. This can be used to dynamically configure instantiation
@@ -20,7 +20,7 @@ An artifact can be created that has metadata representing
an AMI in AWS. This AMI can be used to configure an instance. Any changes
to this artifact will trigger a change to that instance.
-```
+```hcl
# Read the AMI
data "atlas_artifact" "web" {
name = "hashicorp/web"
diff --git a/website/source/docs/providers/atlas/index.html.markdown b/website/source/docs/providers/atlas/index.html.markdown
index 9a22108de..6f3a008aa 100644
--- a/website/source/docs/providers/atlas/index.html.markdown
+++ b/website/source/docs/providers/atlas/index.html.markdown
@@ -18,7 +18,7 @@ Use the navigation to the left to read about the available resources.
## Example Usage
-```
+```hcl
# Configure the Atlas provider
provider "atlas" {
token = "${var.atlas_token}"
@@ -40,4 +40,3 @@ The following arguments are supported:
* `token` - (Required) API token. This can also be specified with the
`ATLAS_TOKEN` shell environment variable.
-
diff --git a/website/source/docs/providers/atlas/r/artifact.html.markdown b/website/source/docs/providers/atlas/r/artifact.html.markdown
index c0c1ac7db..250d3a6c3 100644
--- a/website/source/docs/providers/atlas/r/artifact.html.markdown
+++ b/website/source/docs/providers/atlas/r/artifact.html.markdown
@@ -8,14 +8,14 @@ description: |-
of resources.
---
-# atlas\_artifact
+# atlas_artifact
Provides access to deployment artifacts managed by Atlas. This can
be used to dynamically configure instantiation and provisioning
of resources.
-~> **NOTE: This resource is deprecated.**
-Please use the [Atlas Artifact Data Source](/docs/providers/atlas/d/artifact.html)
+!> **This resource is deprecated!** Use the
+[Atlas Artifact Data Source](/docs/providers/atlas/d/artifact.html)
## Example Usage
@@ -23,7 +23,7 @@ An artifact can be created that has metadata representing
an AMI in AWS. This AMI can be used to configure an instance. Any changes
to this artifact will trigger a change to that instance.
-```
+```hcl
# Read the AMI
resource "atlas_artifact" "web" {
name = "hashicorp/web"
diff --git a/website/source/docs/providers/aws/d/availability_zones.html.markdown b/website/source/docs/providers/aws/d/availability_zones.html.markdown
index 9fd885f10..99241ad61 100644
--- a/website/source/docs/providers/aws/d/availability_zones.html.markdown
+++ b/website/source/docs/providers/aws/d/availability_zones.html.markdown
@@ -26,13 +26,13 @@ data "aws_availability_zones" "available" {}
resource "aws_subnet" "primary" {
availability_zone = "${data.aws_availability_zones.available.names[0]}"
- # Other properties...
+ # ...
}
resource "aws_subnet" "secondary" {
availability_zone = "${data.aws_availability_zones.available.names[1]}"
- # Other properties...
+ # ...
}
```
diff --git a/website/source/docs/providers/aws/r/alb_listener.html.markdown b/website/source/docs/providers/aws/r/alb_listener.html.markdown
index 96a827cbc..479393c77 100644
--- a/website/source/docs/providers/aws/r/alb_listener.html.markdown
+++ b/website/source/docs/providers/aws/r/alb_listener.html.markdown
@@ -15,11 +15,11 @@ Provides an Application Load Balancer Listener resource.
```
# Create a new load balancer
resource "aws_alb" "front_end" {
- # Other parameters...
+ # ...
}
resource "aws_alb_target_group" "front_end" {
- # Other parameters...
+ # ...
}
resource "aws_alb_listener" "front_end" {
diff --git a/website/source/docs/providers/aws/r/alb_listener_rule.html.markdown b/website/source/docs/providers/aws/r/alb_listener_rule.html.markdown
index c2393e671..1d8598414 100644
--- a/website/source/docs/providers/aws/r/alb_listener_rule.html.markdown
+++ b/website/source/docs/providers/aws/r/alb_listener_rule.html.markdown
@@ -15,7 +15,7 @@ Provides an Application Load Balancer Listener Rule resource.
```
# Create a new load balancer
resource "aws_alb" "front_end" {
- # Other parameters...
+ # ...
}
resource "aws_alb_listener" "front_end" {
diff --git a/website/source/docs/providers/azurerm/r/dns_mx_record.html.markdown b/website/source/docs/providers/azurerm/r/dns_mx_record.html.markdown
index 0cc818a11..20981ea98 100644
--- a/website/source/docs/providers/azurerm/r/dns_mx_record.html.markdown
+++ b/website/source/docs/providers/azurerm/r/dns_mx_record.html.markdown
@@ -62,7 +62,7 @@ The following arguments are supported:
The `record` block supports:
-* `preference` - (Required) String representing the “preference” value of the MX records. Records with lower preference value take priority.
+* `preference` - (Required) String representing the "preference” value of the MX records. Records with lower preference value take priority.
* `exchange` - (Required) The mail server responsible for the domain covered by the MX record.
diff --git a/website/source/docs/providers/azurerm/r/loadbalancer_rule.html.markdown b/website/source/docs/providers/azurerm/r/loadbalancer_rule.html.markdown
index 7a3db81b5..ee7e2b9ae 100644
--- a/website/source/docs/providers/azurerm/r/loadbalancer_rule.html.markdown
+++ b/website/source/docs/providers/azurerm/r/loadbalancer_rule.html.markdown
@@ -62,7 +62,7 @@ The following arguments are supported:
* `backend_port` - (Required) The port used for internal connections on the endpoint. Possible values range between 1 and 65535, inclusive.
* `backend_address_pool_id` - (Optional) A reference to a Backend Address Pool over which this Load Balancing Rule operates.
* `probe_id` - (Optional) A reference to a Probe used by this Load Balancing Rule.
-* `enable_floating_ip` - (Optional) Floating IP is pertinent to failover scenarios: a “floating” IP is reassigned to a secondary server in case the primary server fails. Floating IP is required for SQL AlwaysOn.
+* `enable_floating_ip` - (Optional) Floating IP is pertinent to failover scenarios: a "floating” IP is reassigned to a secondary server in case the primary server fails. Floating IP is required for SQL AlwaysOn.
* `idle_timeout_in_minutes` - (Optional) Specifies the timeout for the Tcp idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This element is only used when the protocol is set to Tcp.
* `load_distribution` - (Optional) Specifies the load balancing distribution type to be used by the Load Balancer. Possible values are: Default – The load balancer is configured to use a 5 tuple hash to map traffic to available servers. SourceIP – The load balancer is configured to use a 2 tuple hash to map traffic to available servers. SourceIPProtocol – The load balancer is configured to use a 3 tuple hash to map traffic to available servers.
diff --git a/website/source/docs/providers/azurerm/r/managed_disk.html.markdown b/website/source/docs/providers/azurerm/r/managed_disk.html.markdown
new file mode 100644
index 000000000..e0058df77
--- /dev/null
+++ b/website/source/docs/providers/azurerm/r/managed_disk.html.markdown
@@ -0,0 +1,110 @@
+---
+layout: "azurerm"
+page_title: "Azure Resource Manager: azurerm_managed_disk"
+sidebar_current: "docs-azurerm-resource-managed-disk"
+description: |-
+ Create a Managed Disk.
+---
+
+# azurerm\_managed\_disk
+
+Create a managed disk.
+
+## Example Usage with Create Empty
+
+```
+resource "azurerm_resource_group" "test" {
+ name = "acctestrg"
+ location = "West US 2"
+}
+
+resource "azurerm_managed_disk" "test" {
+ name = "acctestmd"
+ location = "West US 2"
+ resource_group_name = "${azurerm_resource_group.test.name}"
+ storage_account_type = "Standard_LRS"
+ create_option = "Empty"
+ disk_size_gb = "1"
+
+ tags {
+ environment = "staging"
+ }
+}
+```
+
+## Example Usage with Create Copy
+
+```
+resource "azurerm_resource_group" "test" {
+ name = "acctestrg"
+ location = "West US 2"
+}
+
+resource "azurerm_managed_disk" "source" {
+ name = "acctestmd1"
+ location = "West US 2"
+ resource_group_name = "${azurerm_resource_group.test.name}"
+ storage_account_type = "Standard_LRS"
+ create_option = "Empty"
+ disk_size_gb = "1"
+
+ tags {
+ environment = "staging"
+ }
+}
+
+resource "azurerm_managed_disk" "copy" {
+ name = "acctestmd2"
+ location = "West US 2"
+ resource_group_name = "${azurerm_resource_group.test.name}"
+ storage_account_type = "Standard_LRS"
+ create_option = "Copy"
+ source_resource_id = "${azurerm_managed_disk.source.id}"
+ disk_size_gb = "1"
+
+ tags {
+ environment = "staging"
+ }
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Required) Specifies the name of the managed disk. Changing this forces a
+ new resource to be created.
+* `resource_group_name` - (Required) The name of the resource group in which to create
+ the managed disk.
+* `location` - (Required) Specified the supported Azure location where the resource exists.
+ Changing this forces a new resource to be created.
+* `storage_account_type` - (Required) The type of storage to use for the managed disk.
+ Allowable values are `Standard_LRS` or `Premium_LRS`.
+* `create_option` - (Required) The method to use when creating the managed disk.
+ * `Import` - Import a VHD file in to the managed disk (VHD specified with `source_uri`).
+ * `Empty` - Create an empty managed disk.
+ * `Copy` - Copy an existing managed disk or snapshot (specified with `source_resource_id`).
+* `source_uri` - (Optional) URI to a valid VHD file to be used when `create_option` is `Import`.
+* `source_resource_id` - (Optional) ID of an existing managed disk to copy when `create_option` is `Copy`.
+* `os_type` - (Optional) Specify a value when the source of an `Import` or `Copy`
+ operation targets a source that contains an operating system. Valid values are `Linux` or `Windows`
+* `disk_size_gb` - (Required) Specifies the size of the managed disk to create in gigabytes.
+ If `create_option` is `Copy`, then the value must be equal to or greater than the source's size.
+* `tags` - (Optional) A mapping of tags to assign to the resource.
+
+For more information on managed disks, such as sizing options and pricing, please check out the
+[azure documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview).
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `id` - The managed disk ID.
+
+## Import
+
+Managed Disks can be imported using the `resource id`, e.g.
+
+```
+terraform import azurerm_managed_disk.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/microsoft.compute/disks/manageddisk1
+```
diff --git a/website/source/docs/providers/azurerm/r/network_security_group.html.markdown b/website/source/docs/providers/azurerm/r/network_security_group.html.markdown
index 4d94ff0f8..54c20b709 100644
--- a/website/source/docs/providers/azurerm/r/network_security_group.html.markdown
+++ b/website/source/docs/providers/azurerm/r/network_security_group.html.markdown
@@ -75,11 +75,11 @@ The `security_rule` block supports:
* `destination_address_prefix` - (Required) CIDR or destination IP range or * to match any IP. Tags such as ‘VirtualNetwork’, ‘AzureLoadBalancer’ and ‘Internet’ can also be used.
-* `access` - (Required) Specifies whether network traffic is allowed or denied. Possible values are “Allow” and “Deny”.
+* `access` - (Required) Specifies whether network traffic is allowed or denied. Possible values are "Allow” and "Deny”.
* `priority` - (Required) Specifies the priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule.
-* `direction` - (Required) The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values are “Inbound” and “Outbound”.
+* `direction` - (Required) The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values are "Inbound” and "Outbound”.
## Attributes Reference
diff --git a/website/source/docs/providers/azurerm/r/network_security_rule.html.markdown b/website/source/docs/providers/azurerm/r/network_security_rule.html.markdown
index 6fe1f04ad..5ceb39943 100644
--- a/website/source/docs/providers/azurerm/r/network_security_rule.html.markdown
+++ b/website/source/docs/providers/azurerm/r/network_security_rule.html.markdown
@@ -62,11 +62,11 @@ The following arguments are supported:
* `destination_address_prefix` - (Required) CIDR or destination IP range or * to match any IP. Tags such as ‘VirtualNetwork’, ‘AzureLoadBalancer’ and ‘Internet’ can also be used.
-* `access` - (Required) Specifies whether network traffic is allowed or denied. Possible values are “Allow” and “Deny”.
+* `access` - (Required) Specifies whether network traffic is allowed or denied. Possible values are "Allow” and "Deny”.
* `priority` - (Required) Specifies the priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule.
-* `direction` - (Required) The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values are “Inbound” and “Outbound”.
+* `direction` - (Required) The direction specifies if rule will be evaluated on incoming or outgoing traffic. Possible values are "Inbound” and "Outbound”.
## Attributes Reference
diff --git a/website/source/docs/providers/azurerm/r/virtual_machine.html.markdown b/website/source/docs/providers/azurerm/r/virtual_machine.html.markdown
index 9bfbff12e..3beb03727 100644
--- a/website/source/docs/providers/azurerm/r/virtual_machine.html.markdown
+++ b/website/source/docs/providers/azurerm/r/virtual_machine.html.markdown
@@ -196,6 +196,102 @@ resource "azurerm_virtual_machine" "test" {
}
```
+## Example Usage with Managed Disks
+
+```
+resource "azurerm_resource_group" "test" {
+ name = "acctestrg"
+ location = "West US 2"
+}
+
+resource "azurerm_virtual_network" "test" {
+ name = "acctvn"
+ address_space = ["10.0.0.0/16"]
+ location = "West US 2"
+ resource_group_name = "${azurerm_resource_group.test.name}"
+}
+
+resource "azurerm_subnet" "test" {
+ name = "acctsub"
+ resource_group_name = "${azurerm_resource_group.test.name}"
+ virtual_network_name = "${azurerm_virtual_network.test.name}"
+ address_prefix = "10.0.2.0/24"
+}
+
+resource "azurerm_network_interface" "test" {
+ name = "acctni"
+ location = "West US 2"
+ resource_group_name = "${azurerm_resource_group.test.name}"
+
+ ip_configuration {
+ name = "testconfiguration1"
+ subnet_id = "${azurerm_subnet.test.id}"
+ private_ip_address_allocation = "dynamic"
+ }
+}
+
+resource "azurerm_managed_disk" "test" {
+ name = "datadisk_existing"
+ location = "West US 2"
+ resource_group_name = "${azurerm_resource_group.test.name}"
+ storage_account_type = "Standard_LRS"
+ create_option = "Empty"
+ disk_size_gb = "1023"
+}
+
+resource "azurerm_virtual_machine" "test" {
+ name = "acctvm"
+ location = "West US 2"
+ resource_group_name = "${azurerm_resource_group.test.name}"
+ network_interface_ids = ["${azurerm_network_interface.test.id}"]
+ vm_size = "Standard_DS1_v2"
+
+ storage_image_reference {
+ publisher = "Canonical"
+ offer = "UbuntuServer"
+ sku = "14.04.2-LTS"
+ version = "latest"
+ }
+
+ storage_os_disk {
+ name = "myosdisk1"
+ caching = "ReadWrite"
+ create_option = "FromImage"
+ managed_disk_type = "Standard_LRS"
+ }
+
+ storage_data_disk {
+ name = "datadisk_new"
+ managed_disk_type = "Standard_LRS"
+ create_option = "Empty"
+ lun = 0
+ disk_size_gb = "1023"
+ }
+
+ storage_data_disk {
+ name = "${azurerm_managed_disk.test.name}"
+ managed_disk_id = "${azurerm_managed_disk.test.id}"
+ create_option = "Attach"
+ lun = 1
+ disk_size_gb = "${azurerm_managed_disk.test.disk_size_gb}"
+ }
+
+ os_profile {
+ computer_name = "hostname"
+ admin_username = "testadmin"
+ admin_password = "Password1234!"
+ }
+
+ os_profile_linux_config {
+ disable_password_authentication = false
+ }
+
+ tags {
+ environment = "staging"
+ }
+}
+```
+
## Argument Reference
The following arguments are supported:
@@ -246,7 +342,9 @@ For more information on the different example configurations, please check out t
`storage_os_disk` supports the following:
* `name` - (Required) Specifies the disk name.
-* `vhd_uri` - (Required) Specifies the vhd uri. Changing this forces a new resource to be created.
+* `vhd_uri` - (Optional) Specifies the vhd uri. Changing this forces a new resource to be created. Cannot be used with managed disks.
+* `managed_disk_type` - (Optional) Specifies the type of managed disk to create. Value you must be either `Standard_LRS` or `Premium_LRS`. Cannot be used when `vhd_uri` is specified.
+* `managed_disk_id` - (Optional) Specifies an existing managed disk to use by id. Can only be used when `create_option` is `Attach`. Cannot be used when `vhd_uri` is specified.
* `create_option` - (Required) Specifies how the virtual machine should be created. Possible values are `attach` and `FromImage`.
* `caching` - (Optional) Specifies the caching requirements.
* `image_uri` - (Optional) Specifies the image_uri in the form publisherName:offer:skus:version. `image_uri` can also specify the [VHD uri](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-cli-deploy-templates/#create-a-custom-vm-image) of a custom VM image to clone. When cloning a custom disk image the `os_type` documented below becomes required.
@@ -256,7 +354,9 @@ For more information on the different example configurations, please check out t
`storage_data_disk` supports the following:
* `name` - (Required) Specifies the name of the data disk.
-* `vhd_uri` - (Required) Specifies the uri of the location in storage where the vhd for the virtual machine should be placed.
+* `vhd_uri` - (Optional) Specifies the uri of the location in storage where the vhd for the virtual machine should be placed. Cannot be used with managed disks.
+* `managed_disk_type` - (Optional) Specifies the type of managed disk to create. Value you must be either `Standard_LRS` or `Premium_LRS`. Cannot be used when `vhd_uri` is specified.
+* `managed_disk_id` - (Optional) Specifies an existing managed disk to use by id. Can only be used when `create_option` is `Attach`. Cannot be used when `vhd_uri` is specified.
* `create_option` - (Required) Specifies how the data disk should be created.
* `disk_size_gb` - (Required) Specifies the size of the data disk in gigabytes.
* `caching` - (Optional) Specifies the caching requirements.
diff --git a/website/source/docs/providers/google/index.html.markdown b/website/source/docs/providers/google/index.html.markdown
index e503887e9..256a1c940 100644
--- a/website/source/docs/providers/google/index.html.markdown
+++ b/website/source/docs/providers/google/index.html.markdown
@@ -26,7 +26,7 @@ provider "google" {
// Create a new instance
resource "google_compute_instance" "default" {
- // ...
+ # ...
}
```
diff --git a/website/source/docs/provisioners/chef.html.markdown b/website/source/docs/provisioners/chef.html.markdown
index 61cbc7b7f..8b9557f81 100644
--- a/website/source/docs/provisioners/chef.html.markdown
+++ b/website/source/docs/provisioners/chef.html.markdown
@@ -8,38 +8,39 @@ description: |-
# Chef Provisioner
-The `chef` provisioner installs, configures and runs the Chef Client on a remote resource. The `chef` provisioner supports both `ssh`
-and `winrm` type [connections](/docs/provisioners/connection.html).
+The `chef` provisioner installs, configures and runs the Chef Client on a remote
+resource. The `chef` provisioner supports both `ssh` and `winrm` type
+[connections](/docs/provisioners/connection.html).
## Requirements
The `chef` provisioner has some prerequisites for specific connection types:
-* For `ssh` type connections, `cURL` must be available on the remote host.
-* For `winrm` connections, `PowerShell 2.0` must be available on the remote host.
+- For `ssh` type connections, `cURL` must be available on the remote host.
+- For `winrm` connections, `PowerShell 2.0` must be available on the remote host.
Without these prerequisites, your provisioning execution will fail.
## Example usage
-```
-# Start a initial chef run on a resource
+```hcl
resource "aws_instance" "web" {
# ...
+
provisioner "chef" {
attributes_json = <<-EOF
- {
- "key": "value",
- "app": {
- "cluster1": {
- "nodes": [
- "webserver1",
- "webserver2"
- ]
- }
- }
+ {
+ "key": "value",
+ "app": {
+ "cluster1": {
+ "nodes": [
+ "webserver1",
+ "webserver2"
+ ]
+ }
}
- EOF
+ }
+ EOF
environment = "_default"
run_list = ["cookbook::recipe"]
diff --git a/website/source/docs/provisioners/connection.html.markdown b/website/source/docs/provisioners/connection.html.markdown
index 8a16c1cfe..cd04ffefb 100644
--- a/website/source/docs/provisioners/connection.html.markdown
+++ b/website/source/docs/provisioners/connection.html.markdown
@@ -11,16 +11,17 @@ description: |-
Many provisioners require access to the remote resource. For example,
a provisioner may need to use SSH or WinRM to connect to the resource.
-Terraform uses a number of defaults when connecting to a resource, but these
-can be overridden using a `connection` block in either a `resource` or `provisioner`.
-Any `connection` information provided in a `resource` will apply to all the
-provisioners, but it can be scoped to a single provisioner as well. One use case
-is to have an initial provisioner connect as the `root` user to setup user accounts, and have
-subsequent provisioners connect as a user with more limited permissions.
+Terraform uses a number of defaults when connecting to a resource, but these can
+be overridden using a `connection` block in either a `resource` or
+`provisioner`. Any `connection` information provided in a `resource` will apply
+to all the provisioners, but it can be scoped to a single provisioner as well.
+One use case is to have an initial provisioner connect as the `root` user to
+setup user accounts, and have subsequent provisioners connect as a user with
+more limited permissions.
## Example usage
-```
+```hcl
# Copies the file as the root user using SSH
provisioner "file" {
source = "conf/myapp.conf"
diff --git a/website/source/docs/provisioners/file.html.markdown b/website/source/docs/provisioners/file.html.markdown
index c5faebe19..1da7bd4e6 100644
--- a/website/source/docs/provisioners/file.html.markdown
+++ b/website/source/docs/provisioners/file.html.markdown
@@ -14,7 +14,7 @@ supports both `ssh` and `winrm` type [connections](/docs/provisioners/connection
## Example usage
-```
+```hcl
resource "aws_instance" "web" {
# ...
diff --git a/website/source/docs/provisioners/index.html.markdown b/website/source/docs/provisioners/index.html.markdown
index 227e8b771..35629a0c1 100644
--- a/website/source/docs/provisioners/index.html.markdown
+++ b/website/source/docs/provisioners/index.html.markdown
@@ -14,7 +14,7 @@ bootstrap a resource, cleanup before destroy, run configuration management, etc.
Provisioners are added directly to any resource:
-```
+```hcl
resource "aws_instance" "web" {
# ...
@@ -82,7 +82,7 @@ file.
Example of multiple provisioners:
-```
+```hcl
resource "aws_instance" "web" {
# ...
@@ -102,14 +102,14 @@ By default, provisioners that fail will also cause the Terraform apply
itself to error. The `on_failure` setting can be used to change this. The
allowed values are:
- * `"continue"` - Ignore the error and continue with creation or destruction.
+- `"continue"` - Ignore the error and continue with creation or destruction.
- * `"fail"` - Error (the default behavior). If this is a creation provisioner,
+- `"fail"` - Error (the default behavior). If this is a creation provisioner,
taint the resource.
Example:
-```
+```hcl
resource "aws_instance" "web" {
# ...
diff --git a/website/source/docs/provisioners/local-exec.html.markdown b/website/source/docs/provisioners/local-exec.html.markdown
index 3e60d66b5..7e5673a26 100644
--- a/website/source/docs/provisioners/local-exec.html.markdown
+++ b/website/source/docs/provisioners/local-exec.html.markdown
@@ -8,21 +8,22 @@ description: |-
# local-exec Provisioner
-The `local-exec` provisioner invokes a local executable after a resource
-is created. This invokes a process on the machine running Terraform, not on
-the resource. See the `remote-exec` [provisioner](/docs/provisioners/remote-exec.html)
-to run commands on the resource.
+The `local-exec` provisioner invokes a local executable after a resource is
+created. This invokes a process on the machine running Terraform, not on the
+resource. See the `remote-exec`
+[provisioner](/docs/provisioners/remote-exec.html) to run commands on the
+resource.
-Note that even though the resource will be fully created when the provisioner is run,
-there is no guarantee that it will be in an operable state - for example system services
-such as `sshd` may not be started yet on compute resources.
+Note that even though the resource will be fully created when the provisioner is
+run, there is no guarantee that it will be in an operable state - for example
+system services such as `sshd` may not be started yet on compute resources.
## Example usage
-```
-# Join the newly created machine to our Consul cluster
+```hcl
resource "aws_instance" "web" {
# ...
+
provisioner "local-exec" {
command = "echo ${aws_instance.web.private_ip} >> private_ips.txt"
}
@@ -37,4 +38,3 @@ The following arguments are supported:
as a relative path to the current working directory or as an absolute path.
It is evaluated in a shell, and can use environment variables or Terraform
variables.
-
diff --git a/website/source/docs/provisioners/null_resource.html.markdown b/website/source/docs/provisioners/null_resource.html.markdown
index 8cd5fe880..cbb7d7510 100644
--- a/website/source/docs/provisioners/null_resource.html.markdown
+++ b/website/source/docs/provisioners/null_resource.html.markdown
@@ -22,12 +22,11 @@ graph.
## Example usage
-```
-# Bootstrap a cluster after all its instances are up
+```hcl
resource "aws_instance" "cluster" {
count = 3
- // ...
+ # ...
}
resource "null_resource" "cluster" {
@@ -58,4 +57,3 @@ In addition to all the resource configuration available, `null_resource` support
* `triggers` - A mapping of values which should trigger a rerun of this set of
provisioners. Values are meant to be interpolated references to variables or
attributes of other resources.
-
diff --git a/website/source/docs/provisioners/remote-exec.html.markdown b/website/source/docs/provisioners/remote-exec.html.markdown
index 959bdafd8..87b45ebe8 100644
--- a/website/source/docs/provisioners/remote-exec.html.markdown
+++ b/website/source/docs/provisioners/remote-exec.html.markdown
@@ -17,10 +17,10 @@ provisioner supports both `ssh` and `winrm` type [connections](/docs/provisioner
## Example usage
-```
-# Run puppet and join our Consul cluster
+```hcl
resource "aws_instance" "web" {
# ...
+
provisioner "remote-exec" {
inline = [
"puppet apply",
@@ -53,7 +53,7 @@ upload the script with the
[file provisioner](/docs/provisioners/file.html)
and then use `inline` to call it. Example:
-```
+```hcl
resource "aws_instance" "web" {
# ...
diff --git a/website/source/docs/state/environments.html.md b/website/source/docs/state/environments.html.md
index e4a502609..e6fa12a9a 100644
--- a/website/source/docs/state/environments.html.md
+++ b/website/source/docs/state/environments.html.md
@@ -38,7 +38,7 @@ to switch environments you can use `terraform env select`, etc.
For example, creating an environment:
-```
+```text
$ terraform env new bar
Created and switched to environment "bar"!
@@ -62,7 +62,7 @@ Referencing the current environment is useful for changing behavior based
on the environment. For example, for non-default environments, it may be useful
to spin up smaller cluster sizes. You can do this:
-```
+```hcl
resource "aws_instance" "example" {
count = "${terraform.env == "default" ? 5 : 1}"
@@ -73,7 +73,7 @@ resource "aws_instance" "example" {
Another popular use case is using the environment as part of naming or
tagging behavior:
-```
+```hcl
resource "aws_instance" "example" {
tags { Name = "web - ${terraform.env}" }
diff --git a/website/source/docs/state/remote.html.md b/website/source/docs/state/remote.html.md
index 246462c7f..f2257f4e4 100644
--- a/website/source/docs/state/remote.html.md
+++ b/website/source/docs/state/remote.html.md
@@ -44,7 +44,7 @@ For example usage see the
## Locking and Teamwork
-Terraform will automatic lock state depending on the
+Terraform will automatically lock state depending on the
[backend](/docs/backends) used. Please see the full page dedicated
to [state locking](/docs/state/locking.html).
diff --git a/website/source/downloads.html.erb b/website/source/downloads.html.erb
index ab8862274..86e2900af 100644
--- a/website/source/downloads.html.erb
+++ b/website/source/downloads.html.erb
@@ -25,14 +25,11 @@ description: |-
verify the checksums signature file
- which has been signed using HashiCorp's GPG key.
+ which has been signed using HashiCorp's GPG key.
You can also download older versions of Terraform from the releases service.
- Checkout the v<%= latest_version %> CHANGELOG for information on the latest release.
-
-
- Note: if you are upgrading to 0.9 please see the upgrade guide.
+ Check out the v<%= latest_version %> CHANGELOG for information on the latest release.