diff options
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.xml | 11 | ||||
| -rw-r--r-- | en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml | 10 |
2 files changed, 1 insertions, 20 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index 7ab54beff6..369af10b3c 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -5085,17 +5085,6 @@ Do you want to commit? (no = start a shell) [y/n]</screen> maintained by those groups.</para> </important> - <warning> - <para>Blanket approval does not apply to ports that are - maintained by teams like <email - role="nolink">autotools@FreeBSD.org</email>, <email - role="nolink">x11@FreeBSD.org</email>, <email - role="nolink">gnome@FreeBSD.org</email>, or <email - role="nolink">kde@FreeBSD.org</email>. These teams - use external repositories and can have work that would - conflict with changes that would normally fall under - blanket approval.</para> - </warning> </answer> </qandaentry> diff --git a/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml index 02fc4d21e4..84632b9268 100644 --- a/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml +++ b/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml @@ -4061,15 +4061,7 @@ PATCHFILES= patch1:test</programlisting> <para>Some types of fixes have <quote>blanket approval</quote> from the &a.portmgr;, allowing any committer to fix those categories of problems on any port. These fixes do not need - approval from the maintainer. Blanket approval does not apply - to ports that are maintained by teams like <email - role="nolink">autotools@FreeBSD.org</email>, <email - role="nolink">x11@FreeBSD.org</email>, <email - role="nolink">gnome@FreeBSD.org</email>, or <email - role="nolink">kde@FreeBSD.org</email>. These teams use - external repositories and can have work that would conflict - with changes that would normally fall under blanket - approval.</para> + approval from the maintainer.</para> <para>Blanket approval for most ports applies to fixes like infrastructure changes, or trivial and |