- Fix some staleness.

- Recommend portmaster.

 - Clarify the maintainer-timeout process.

en_US.ISO8859-1/articles/contributing-ports/article.sgml

@@ -130,7 +130,7 @@
       <para>You can find out whether or not a port has dependencies
 	or slave ports by looking at a master index of ports called
 	<filename>INDEX</filename>.  (The name of the file varies
-	by release of &os;; for instance, <filename>INDEX-6</filename>.)
+	by release of &os;; for instance, <filename>INDEX-8</filename>.)
 	Some ports have conditional dependencies that are not
 	included in a default <filename>INDEX</filename> build.  We
 	expect you to be able to recognize such ports by looking through
@@ -356,7 +356,8 @@
 		  case, at the very least, the dependent ports will
 		  need to get a <makevar>PORTREVISION</makevar> bump
 		  so that they will automatically be upgraded by
-		  automated tools such as &man.portupgrade.1;.</para>
+		  automated tools such as <application>portmaster</application>
+		  or &man.portupgrade.1;.</para>
 	      </listitem>
 	    </itemizedlist>
 	  </step>
@@ -418,8 +419,8 @@
 
 	<para>&os; only guarantees that the Ports Collection works on
 	  the <literal>-STABLE</literal> branches.  You should be
-	  running <literal>5-STABLE</literal> or
-	  <literal>6-STABLE</literal>, preferably the latter.  In
+	  running <literal>7-STABLE</literal> or
+	  <literal>8-STABLE</literal>, preferably the latter.  In
 	  theory, you should be able to get by with running the latest
 	  release of each stable branch (since the ABIs are not
 	  supposed to change) but if you can run the branch, that is
@@ -428,17 +429,16 @@
 	<para>Since the majority of &os; installations run on
 	  PC-compatible machines (what is termed the <literal>i386</literal>
 	  architecture), we expect you to keep the port working on that
-	  architecture.  However, as more and more people start using
-	  the <literal>amd64</literal> architecture running native, it is
-	  going to be more and more important to make sure that ports run
-	  there as well.  It is completely fair to ask for help if you
+	  architecture.  We prefer that ports also work on the
+	  the <literal>amd64</literal> architecture running native.
+	  It is completely fair to ask for help if you
 	  do not have one of these machines.</para>
 
 	<note>
 	  <para>The usual failure modes for non-<literal>i386</literal>
 	    machines are that the original programmers assumed that, for
-	    instance, pointers are <literal>int</literal>s, or that the
-	    relatively lax <application>gcc</application>&nbsp;2.95 compiler
+	    instance, pointers are <literal>int</literal>s, or that a
+	    relatively lax older <application>gcc</application> compiler
 	    was being used.  More and more, application authors are
 	    reworking their code to remove these assumptions &mdash;
 	    but if the author is not actively maintaining their code,
@@ -568,6 +568,10 @@
 	      14 days, but please try not to take that long.  Try to respond
 	      as soon as possible, even if it is just to say you need some
 	      more time before you can work on the PR.</para>
+
+	    <para>If you have not responded after 14 days, any committer may
+	      commit from a PR that you have not responded to via a
+	      <literal>maintainer-timeout</literal>.</para>
 	  </step>
 
 	  <step>
@@ -685,7 +689,7 @@
 	</itemizedlist>
 
 	<para>In these cases your main obligation is to respond in a
-	  timely manner.  The timeout for non-responsive maintainers is
+	  timely manner.  Again, the timeout for non-responsive maintainers is
 	  14 days.  After this period changes may be committed
 	  unapproved.  They have taken the trouble to do this for you;
 	  so please try to at least respond promptly.  Then review,