diff options
Diffstat (limited to 'doc/contribute.html')
| -rw-r--r-- | doc/contribute.html | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/doc/contribute.html b/doc/contribute.html index 03d02c9d75..f297477fe0 100644 --- a/doc/contribute.html +++ b/doc/contribute.html @@ -45,8 +45,8 @@ CLA (Contributor License Agreement). </li> <li> <b>Step 2</b>: Configure authentication credentials for the Go Git repository. -Visit <a href="https://go.googlesource.com/">go.googlesource.com</a>, click -on the gear icon (top right), then on "Obtain password", and follow the +Visit <a href="https://go.googlesource.com">go.googlesource.com</a>, click +"Generate Password" in the page's top right menu bar, and follow the instructions. </li> <li> @@ -806,10 +806,9 @@ tracker will automatically mark the issue as fixed. <p> 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. </p> <p> @@ -948,10 +947,18 @@ The Gerrit voting system involves an integer in the range -2 to +2: </li> </ul> +<p> +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. +</p> + <h3 id="submit">Submitting an approved change</h3> <p> -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". </p> |