From bc320fc1f5bc5d6019e3d8d62aa32eac3417bb7f Mon Sep 17 00:00:00 2001 From: Katie Hockman Date: Wed, 23 Sep 2020 12:52:27 -0400 Subject: doc: update overview for authentication The instructions have already been updated in greater detail in "Step 2: Configure git authentication", but the overview needs updated to reflect the new workflow. Change-Id: I6f411a3dc500a9058036a4a828403c0153e4220a Reviewed-on: https://go-review.googlesource.com/c/go/+/256857 Trust: Katie Hockman Run-TryBot: Katie Hockman Reviewed-by: Dmitri Shuralyov TryBot-Result: Go Bot --- doc/contribute.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/contribute.html') diff --git a/doc/contribute.html b/doc/contribute.html index 03d02c9d75..3fb617b863 100644 --- a/doc/contribute.html +++ b/doc/contribute.html @@ -45,8 +45,8 @@ CLA (Contributor License Agreement).
  • Step 2: Configure authentication credentials for the Go Git repository. -Visit go.googlesource.com, click -on the gear icon (top right), then on "Obtain password", and follow the +Visit go.googlesource.com, click +"Generate Password" in the page's top right menu bar, and follow the instructions.
  • -- cgit v1.3 From 8e203884dcd5c525208ffb137fed76fd2d09ffc4 Mon Sep 17 00:00:00 2001 From: Alberto Donizetti Date: Thu, 1 Oct 2020 14:00:48 +0200 Subject: doc: fix typo in contribute.html Change-Id: Ica27c4a9e4c364d94250aebfc4c2b59cff7f4a8f Reviewed-on: https://go-review.googlesource.com/c/go/+/258679 Trust: Alberto Donizetti Reviewed-by: Dmitri Shuralyov --- doc/contribute.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'doc/contribute.html') diff --git a/doc/contribute.html b/doc/contribute.html index 3fb617b863..09d43313ff 100644 --- a/doc/contribute.html +++ b/doc/contribute.html @@ -806,10 +806,9 @@ tracker will automatically mark the issue as fixed.

    If the change is a partial step towards the resolution of the issue, -uses the notation "Updates #12345". -This will leave a comment in the issue -linking back to the change in Gerrit, but it will not close the issue -when the change is applied. +write "Updates #12345" instead. +This will leave a comment in the issue linking back to the change in +Gerrit, but it will not close the issue when the change is applied.

    -- cgit v1.3 From 87d59bcdc354b035e17a1dadbfc4883bbcac5bf8 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 5 Oct 2020 16:00:08 -0700 Subject: doc: mention Trust+1 in contribution guide For #40699 Change-Id: If753a073488880433ae3319dcf2a2dfaa887fd0e Reviewed-on: https://go-review.googlesource.com/c/go/+/259737 Trust: Ian Lance Taylor Trust: Tobias Klauser Reviewed-by: Emmanuel Odeke Reviewed-by: Russ Cox --- doc/contribute.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'doc/contribute.html') diff --git a/doc/contribute.html b/doc/contribute.html index 09d43313ff..f297477fe0 100644 --- a/doc/contribute.html +++ b/doc/contribute.html @@ -947,10 +947,18 @@ The Gerrit voting system involves an integer in the range -2 to +2:

    • +

    +At least two maintainers must approve of the change, and at least one +of those maintainers must +2 the change. +The second maintainer may cast a vote of Trust+1, meaning that the +change looks basically OK, but that the maintainer hasn't done the +detailed review required for a +2 vote. +

    +

    Submitting an approved change

    -After the code has been +2'ed, an approver will +After the code has been +2'ed and Trust+1'ed, an approver will apply it to the master branch using the Gerrit user interface. This is called "submitting the change".

    -- cgit v1.3