ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7566 from TimeIncOSS/docs-aws-et-fixes 

LGTM - thanks @radeksimko!
This commit is contained in:
James Nugent 2016-07-09 11:15:46 +01:00 committed by GitHub
parent 4f16e71686 82d6d4a691
commit bb4b34468c
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
website/source/docs/providers/aws/r/elastic_transcoder_pipeline.html.markdown
View File

@ -1,7 +1,7 @@
---
layout: "aws"
page_title: "AWS: aws_elastictranscoder_pipeline"
sidebar_current: "docs-aws-resource-elastic-transcoder"
sidebar_current: "docs-aws-resource-elastic-transcoder-pipeline"
description: |-
Provides an Elastic Transcoder pipeline resource.
---
@ -12,8 +12,6 @@ Provides an Elastic Transcoder pipeline resource.
## Example Usage
### Elastic Transcoder Pipeline
```
resource "aws_elastictranscoder_pipeline" "bar" {
input_bucket = "${aws_s3_bucket.input_bucket.bucket}"
@ -34,7 +32,7 @@ resource "aws_elastictranscoder_pipeline" "bar" {
## Argument Reference
See ["Create Pipeline"](http://docs.aws.amazon.com/elastictranscoder/latest/developerguide/create-pipeline.html) in the AWS docs for reference.
See ["Create Pipeline"](http://docs.aws.amazon.com/elastictranscoder/latest/developerguide/create-pipeline.html) in the AWS docs for reference.
The following arguments are supported:
@ -54,7 +52,7 @@ which you want Elastic Transcoder to save transcoded files and playlists: which
bucket to use, and the storage class that you want to assign to the files. If
you specify values for `content_config`, you must also specify values for
`thumbnail_config`. If you specify values for `content_config` and
`thumbnail_config`, omit the `output_bucket` object.
`thumbnail_config`, omit the `output_bucket` object.
The `content_config` object supports the following:

4
website/source/docs/providers/aws/r/elastic_transcoder_preset.html.markdown
View File

@ -1,7 +1,7 @@
---
layout: "aws"
page_title: "AWS: aws_elastictranscoder_preset"
sidebar_current: "docs-aws-resource-elastic-transcoder"
sidebar_current: "docs-aws-resource-elastic-transcoder-preset"
description: |-
Provides an Elastic Transcoder preset resource.
---
@ -12,8 +12,6 @@ Provides an Elastic Transcoder preset resource.
## Example Usage
### Elastic Transcoder Preset
```
resource "aws_elastictranscoder_preset" "bar" {
container = "mp4"

4
website/source/layouts/aws.erb
View File

@ -376,11 +376,11 @@
<ul class="nav nav-visible">
<li<%= sidebar_current("docs-aws-resource-elastic-transcoder-pipeline") %>>
<a href="/docs/providers/aws/r/elastic_transcoder_pipeline.html">aws_elasticsearch_domain</a>
<a href="/docs/providers/aws/r/elastic_transcoder_pipeline.html">aws_elastictranscoder_pipeline</a>
</li>
<li<%= sidebar_current("docs-aws-resource-elastic-transcoder-preset") %>>
<a href="/docs/providers/aws/r/elastic_transcoder_preset.html">aws_elasticsearch_domain</a>
<a href="/docs/providers/aws/r/elastic_transcoder_preset.html">aws_elastictranscoder_preset</a>
</li>
</ul>