From owner-svn-doc-all@freebsd.org  Mon Jan  8 16:46:17 2018
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@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 2ABA0E76D4A;
 Mon,  8 Jan 2018 16:46:17 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 05BF1D1B;
 Mon,  8 Jan 2018 16:46:17 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AB912409;
 Mon,  8 Jan 2018 16:46:16 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w08GkGNx080083;
 Mon, 8 Jan 2018 16:46:16 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w08GkGUw080082;
 Mon, 8 Jan 2018 16:46:16 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201801081646.w08GkGUw080082@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 8 Jan 2018 16:46:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r51373 - head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Group: doc-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: head/en_US.ISO8859-1/articles/committers-guide
X-SVN-Commit-Revision: 51373
X-SVN-Commit-Repository: doc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jan 2018 16:46:17 -0000

Author: mat
Date: Mon Jan  8 16:46:15 2018
New Revision: 51373
URL: https://svnweb.freebsd.org/changeset/doc/51373

Log:
  Catch up on the wiki's blanket's definition.
  
  Reported by:	swills
  Sponsored by:	Absolight

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 Jan  8 14:13:10 2018	(r51372)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Mon Jan  8 16:46:15 2018	(r51373)
@@ -4559,6 +4559,11 @@ Relnotes:           yes</programlisting>
 	  <answer>
 	    <para>The following blanket approvals are in effect:</para>
 
+	    <important>
+	      <para>These fixes <emphasis>must</emphasis> be
+		tested on the quarterly branch.</para>
+	    </important>
+
 	    <itemizedlist>
 
 	      <listitem>
@@ -4577,11 +4582,6 @@ Relnotes:           yes</programlisting>
 	      <listitem>
 		<para>Build, runtime or packaging fixes, if the
 		  quarterly branch version is currently broken.</para>
-
-		<important>
-		  <para>These fixes <emphasis>must</emphasis> be
-		    tested on the quarterly branch.</para>
-		</important>
 	      </listitem>
 
 	      <listitem>
@@ -4602,6 +4602,15 @@ Relnotes:           yes</programlisting>
 		  only result in <varname>PORTREVISION</varname> bumps
 		  and no changes to enabled features.  for example,
 		  adding a patch fixing a buffer overflow.</para>
+	      </listitem>
+
+	      <listitem>
+		<para>Adding/fixing <varname>CONFLICTS</varname>.</para>
+	      </listitem>
+
+	      <listitem>
+		<para>Web Browsers, browser plugins, and their required
+		  dependencies.</para>
 	      </listitem>
 	    </itemizedlist>