From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 5 Oct 2020 23:00:08 +0000 (-0700)
Subject: doc: mention Trust+1 in contribution guide
X-Git-Tag: go1.16beta1~442
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=87d59bcdc354b035e17a1dadbfc4883bbcac5bf8;p=gostls13.git

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 <iant@golang.org>
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
Reviewed-by: Russ Cox <rsc@golang.org>
---

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:
 	</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>