Repository: camel Updated Branches: refs/heads/master 5d8a1777c -> be868f701
Fixed doc Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/be868f70 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/be868f70 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/be868f70 Branch: refs/heads/master Commit: be868f7011a49d9de8f4bcaa16efd0656ba50744 Parents: 5d8a177 Author: Claus Ibsen <[email protected]> Authored: Thu May 5 14:52:35 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Thu May 5 14:52:35 2016 +0200 ---------------------------------------------------------------------- components/camel-aws/src/main/docs/aws-s3.adoc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/be868f70/components/camel-aws/src/main/docs/aws-s3.adoc ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/main/docs/aws-s3.adoc b/components/camel-aws/src/main/docs/aws-s3.adoc index ba508d8..5f0d4a6 100644 --- a/components/camel-aws/src/main/docs/aws-s3.adoc +++ b/components/camel-aws/src/main/docs/aws-s3.adoc @@ -90,10 +90,6 @@ The AWS S3 Storage Service component supports 38 endpoint options which are list - - -|======================================================================= - Required S3 component options You have to provide the amazonS3Client in the @@ -149,7 +145,7 @@ see `com.amazonaws.services.s3.model.AccessControlList` for more details |`CamelAwsS3Headers` |`Map<String,String>` |*Camel 2.15.0*: support to get or set custom objectMetadata headers. -|CamelAwsS3ServerSideEncryption |String |*Camel 2.16:* Sets the server-side encryption algorithm when encrypting +|`CamelAwsS3ServerSideEncryption` |String |*Camel 2.16:* Sets the server-side encryption algorithm when encrypting the object using AWS-managed keys. For example use AES256. |======================================================================= @@ -213,7 +209,7 @@ object to be saved as. |`CamelAwsS3ContentControl` |`String` |The *optional* Cache-Control HTTP header which allows the user to specify caching behavior along the HTTP request/reply chain. -|CamelAwsS3ServerSideEncryption |String |*Camel 2.16:* The server-side encryption algorithm when encrypting the +|`CamelAwsS3ServerSideEncryption` |String |*Camel 2.16:* The server-side encryption algorithm when encrypting the object using AWS-managed keys. |=======================================================================
