From e4f5b707184352e7bc034f982f6a9af58093b430 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 8 Oct 2019 03:05:52 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/administration/merge_request_diffs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/administration/merge_request_diffs.md') diff --git a/doc/administration/merge_request_diffs.md b/doc/administration/merge_request_diffs.md index e09202e1d79..ca09171e5ff 100644 --- a/doc/administration/merge_request_diffs.md +++ b/doc/administration/merge_request_diffs.md @@ -96,7 +96,7 @@ The connection settings match those provided by [Fog](https://github.com/fog), a | `enable_signature_v4_streaming` | Set to true to enable HTTP chunked transfers with [AWS v4 signatures](https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-streaming.html). Oracle Cloud S3 needs this to be false | true | | `region` | AWS region | us-east-1 | | `host` | S3 compatible host for when not using AWS, e.g. `localhost` or `storage.example.com` | s3.amazonaws.com | -| `endpoint` | Can be used when configuring an S3 compatible service such as [MinIO](https://www.minio.io), by entering a URL such as `http://127.0.0.1:9000` | (optional) | +| `endpoint` | Can be used when configuring an S3 compatible service such as [MinIO](https://min.io), by entering a URL such as `http://127.0.0.1:9000` | (optional) | | `path_style` | Set to true to use `host/bucket_name/object` style paths instead of `bucket_name.host/object`. Leave as false for AWS S3 | false | | `use_iam_profile` | Set to true to use IAM profile instead of access keys | false -- cgit v1.2.1