Merge pull request #1 from apparentlymart/s3-object-content

Docs for aws_s3_bucket content argument
hashicorp · Sep 10, 2015 · d261117 · d261117
2 parents 5256a6d + 141c419
commit d261117
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/website/source/docs/providers/aws/r/s3_bucket_object.html.markdown b/website/source/docs/providers/aws/r/s3_bucket_object.html.markdown
@@ -28,7 +28,11 @@ The following arguments are supported:
 
 * `bucket` - (Required) The name of the bucket to put the file in.
 * `key` - (Required) The name of the object once it is in the bucket.
-* `source` - (Required) The path to the source file being uploaded to the bucket.
+* `source` - (Required unless `content` given) The path to the source file being uploaded to the bucket.
+* `content` - (Required unless `source` given) The literal content being uploaded to the bucket.
+
+Either `source` or `content` must be provided to specify the bucket content.
+These two arguments are mutually-exclusive.
 
 ## Attributes Reference