svn commit: r51373 - head/en_US.ISO8859-1/articles/committers-guide

Mathieu Arnold <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]>
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>
 
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.