diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2018-01-08 16:46:15 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2018-01-08 16:46:15 +0000 |
| commit | 7beb6244af3a8cd56428f41f068051e706fa6d85 (patch) | |
| tree | f09db7de10170ff771e6c9b7d52075cc15d35fc6 /en_US.ISO8859-1/articles/committers-guide | |
| parent | 5d3552e8185e99885a905051e5988d58e22fbae7 (diff) | |
Notes
Diffstat (limited to 'en_US.ISO8859-1/articles/committers-guide')
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.xml | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index c41ca06784..534f3d6861 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -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> @@ -4603,6 +4603,15 @@ Relnotes: yes</programlisting> 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> <important> |