From owner-svn-doc-head@freebsd.org Mon Jul 20 18:27:35 2015 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BEE69A6230; Mon, 20 Jul 2015 18:27:35 +0000 (UTC) (envelope-from pkelsey@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 410E61D13; Mon, 20 Jul 2015 18:27:35 +0000 (UTC) (envelope-from pkelsey@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KIRZSi092924; Mon, 20 Jul 2015 18:27:35 GMT (envelope-from pkelsey@FreeBSD.org) Received: (from pkelsey@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KIRZN4092923; Mon, 20 Jul 2015 18:27:35 GMT (envelope-from pkelsey@FreeBSD.org) Message-Id: <201507201827.t6KIRZN4092923@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkelsey set sender to pkelsey@FreeBSD.org using -f From: Patrick Kelsey Date: Mon, 20 Jul 2015 18:27:35 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r47025 - head/en_US.ISO8859-1/articles/committers-guide X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jul 2015 18:27:35 -0000 Author: pkelsey (src committer) Date: Mon Jul 20 18:27:34 2015 New Revision: 47025 URL: https://svnweb.freebsd.org/changeset/doc/47025 Log: Remove trailing "@" from team approval example in Committer's Guide, plus incorporate additional content and formatting suggestions made by wblock. Differential Revision: https://reviews.freebsd.org/D3128 Reviewed by: wblock Approved by: doceng (wblock) Approved by: jmallett (mentor) Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Jul 20 18:14:54 2015 (r47024) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Jul 20 18:27:34 2015 (r47025) @@ -2489,16 +2489,17 @@ ControlPersist yes must be approved by the release engineering team. - If these are your first commits then you should have - passed them past your mentor first, and you should list - your mentor, as in - ``username-of-mentor - (mentor)''. + While under mentorship, get mentor approval before + the commit. Enter the mentor's username in this field, + and note that they are a mentor: + + Approved by: username-of-mentor (mentor) If a team approved these commits then include the team name followed by the username of the approver in - parentheses. For example: ``re@ - (username)`` + parentheses. For example: + + Approved by: re (username)