From bdd99041f4561adaffdd65ad36ade4c2a6b2a18b Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 3 Sep 2015 15:36:17 -0700 Subject: [PATCH] update docs to declare multi-org whitelist. Fixes #1184 --- doc/setup/github.md | 10 +++++----- doc/setup/gitlab.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/setup/github.md b/doc/setup/github.md index 9ca56d43..3e5b0e5e 100644 --- a/doc/setup/github.md +++ b/doc/setup/github.md @@ -26,11 +26,11 @@ The components of this string are: This section lists all connection options used in the connection string format. Connection options are pairs in the following form: `name=value`. The value is always case sensitive. Separate options with the ampersand (i.e. &) character: -* `client_id` oauth client id for registered application -* `client_secret` oauth client secret for registered application -* `open=false` allows users to self-register. Defaults to false for security reasons. -* `orgs=drone,docker` restricts access to these GitHub organizations. **Optional** -* `private_mode=false` indicates GitHub Enterprise is running in private mode +* `client_id` oauth client id for registered application. +* `client_secret` oauth client secret for registered application. +* `open=false` allows users to self-register. Defaults to false.. +* `orgs=drone&orgs=docker` restricts access to these GitHub organizations. **Optional** +* `private_mode=false` indicates GitHub Enterprise is running in private mode. * `skip_verify=false` skip ca verification if self-signed certificate. Defaults to false. ## GitHub registration diff --git a/doc/setup/gitlab.md b/doc/setup/gitlab.md index edcd2afa..a71b61b4 100644 --- a/doc/setup/gitlab.md +++ b/doc/setup/gitlab.md @@ -29,7 +29,7 @@ This section lists all connection options used in the connection string format. * `client_id` oauth client id for registered application * `client_secret` oauth client secret for registered application * `open=false` allows users to self-register. Defaults to false for security reasons. -* `orgs=drone,docker` restricts access to these GitLab organizations. **Optional** +* `orgs=drone&orgs=docker` restricts access to these GitLab organizations. **Optional** * `skip_verify=false` skip ca verification if self-signed certificate. Defaults to false for security reasons. * `clone_mode=token` a strategy for clone authorization, by default use repo token, but can be changed to `oauth` ( This is not secure, because your user token, with full access to your gitlab account will be written to .netrc, and it can be read by all who have access to project builds )