svn commit: r52611 - in head/en_US.ISO8859-1: articles/committers-guide books/porters-handbook/makefiles

[Mathieu Arnold]

Author: mat
Date: Thu Dec  6 16:04:59 2018
New Revision: 52611
URL: https://svnweb.freebsd.org/changeset/doc/52611

Log:
  Move portmgr's blanket approval definition to the Committer's Guide, and
  shuffle a few things around.
  
  Reviewed by:	bcr, adamw
  Differential Revision:	https://reviews.freebsd.org/D18308

Modified:
  head/en_US.ISO8859-1/articles/committers-guide/article.xml
  head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Dec  6 16:04:56 2018	(r52610)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Thu Dec  6 16:04:59 2018	(r52611)
@@ -4804,6 +4804,53 @@ Do you want to commit? (no = start a shell) [y/n]</scr
       <qandadiv xml:id="ports-qa-misc-questions">
 	<title>Miscellaneous Questions</title>
 
+	<qandaentry xml:id="ports-qa-misc-blanket-approval">
+	  <question>
+	    <para>Are there changes that can be committed without
+	      asking the maintainer for approval?</para>
+	  </question>
+
+	  <answer>
+	    <para>Blanket approval for most ports applies to these
+	      types of fixes:</para>
+
+	    <itemizedlist>
+	      <listitem>
+		<para>Most infrastructure changes to a port (that is,
+		  modernizing, but not changing the functionality).
+		  For example, the blanket covers converting to new
+		  <varname>USES</varname> macros, enabling verbose
+		  builds, and switching to new ports system
+		  syntaxes.</para>
+	      </listitem>
+
+	      <listitem>
+		<para>Trivial and <emphasis>tested</emphasis> build
+		  and runtime fixes.</para>
+	      </listitem>
+	    </itemizedlist>
+
+	    <important>
+	      <para>Exceptions to this are anything maintained by the
+		&a.portmgr;, or the &a.security-officer;.  No
+		unauthorized commits may ever be made to ports
+		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 at FreeBSD.org</email>, <email
+		  role="nolink">x11 at FreeBSD.org</email>, <email
+		  role="nolink">gnome at FreeBSD.org</email>, or <email
+		  role="nolink">kde at 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>
+
 	<qandaentry xml:id="ports-qa-misc-correctly-building">
 	  <question>
 	    <para>How do I know if my port is building correctly or

Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Thu Dec  6 16:04:56 2018	(r52610)
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Thu Dec  6 16:04:59 2018	(r52611)
@@ -4050,24 +4050,12 @@ PATCHFILES=	patch1:test</programlisting>
 	with changes that would normally fall under blanket
 	approval.</para>
 
-      <para>Blanket approval for most ports applies to these types of
-	fixes:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>Most infrastructure changes to a port (that is,
-	    modernizing, but not changing the functionality).  For
-	    example, converting to staging, enabling verbose builds,
-	    <varname>USE_GMAKE</varname> to
-	    <literal>USES=gmake</literal>, the new
-	    <varname>LIB_DEPENDS</varname> format...</para>
-	</listitem>
-
-	<listitem>
-	  <para>Trivial and <emphasis>tested</emphasis> build and
-	    runtime fixes.</para>
-	</listitem>
-      </itemizedlist>
+      <para>Blanket approval for most ports applies to fixes like
+	infrastructure changes, or trivial and
+	<emphasis>tested</emphasis> build and runtime fixes.  The
+	current list is available in <link
+	  xlink:href="&url.articles.committers-guide;/ports.html#ports-qa-misc-blanket-approval">Ports
+	  section of the Committer's Guide</link>.</para>
     </note>
 
     <para>Other changes to the port will be sent to the maintainer