Minor changes to get ready to import some new text: add link to

contributing-ports; correctly use example tags; no longer recommend
the advocacy category; remove some text that will become duplicated.

en_US.ISO8859-1/articles/problem-reports/article.sgml

@@ -128,7 +128,11 @@
     
 	<para>In either case, following the process described in <ulink
 	  url="&url.books.porters-handbook;/port-upgrading.html">Porter's
-	  Handbook</ulink> will yield the best results.</para>
+	  Handbook</ulink> will yield the best results.  (You might
+	  also wish to read <ulink
+	  url="&url.articles.contributing-ports;/article.html">
+	  Contributing to the FreeBSD Ports Collection</ulink>.)
+	</para>
       </listitem>
     </itemizedlist>
 
@@ -733,16 +737,24 @@
 	      filed as <literal>kern</literal> or <literal>bin</literal>;
 	      see discussion of those categories below.</para>
 
-	    <para>Example: you have a common PC-based machine, and think
+	      <example>
+		<title>Correct use of arch-specific category</title>
+
+	    <para>You have a common PC-based machine, and think
 	      you have encountered a problem specific to a particular
 	      chipset or a particular motherboard: <literal>i386</literal>
 	      is the right category.</para>
+	      </example>
 
-	    <para>Example: You are having a problem with an add-in
+	      <example>
+		<title>Incorrect use of arch-specific category</title>
+
+	    <para>You are having a problem with an add-in
 	      peripheral card on a commonly seen bus, or a problem with
 	      a particular type of hard disk drive: in this case, it
 	      probably applies to more than one architecture, and
 	      <literal>kern</literal> is the right category.</para>
+	      </example>
 	  </note>
 
 	  <para>Here is the current list of categories (taken from
@@ -751,7 +763,7 @@
 	  <itemizedlist>
 	    <listitem>
 	      <para><literal>advocacy:</literal> problems relating to
-		&os;'s public image.  Rarely used.</para>
+		&os;'s public image.  Obsolete.</para>
 	    </listitem>
 
 	    <listitem>
@@ -766,18 +778,12 @@
 
 	    <listitem>
 	      <para><literal>bin:</literal> problems with userland
-		programs in the base system.  If running &man.whereis.1;
+		programs in the base system.</para>
-		shows <literal>/bin</literal>, <literal>/usr/sbin</literal>,
-		or something similar, then this is probably the right
-		category.  (A few contributed programs might instead
-		need to be in <literal>gnu</literal>; see below.)</para>
 	    </listitem>
 
 	    <listitem>
 	      <para><literal>conf:</literal> problems with
-		configuration files, default values, and so forth.
+		configuration files, default values, and so forth.</para>
-		Things that affect <literal>/usr/share</literal>
-		or <literal>/etc/rc*</literal> belong here.</para>
 	    </listitem>
 
 	    <listitem>
@@ -802,8 +808,7 @@
 
 	    <listitem>
 	      <para><literal>java:</literal> problems related to the &java;
-		Virtual Machine.  (Ports that merely depend on &java; to
+		Virtual Machine.
-		run should be filed under <literal>ports</literal>.)
 	      </para>
 	    </listitem>
 
@@ -826,7 +831,7 @@
 
 	    <listitem>
 	      <para><literal>ports:</literal> problems relating to the
-		ports tree.</para>
+		Ports Collection.</para>
 	    </listitem>
 
 	    <listitem>
@@ -856,10 +861,7 @@
 
 	     <listitem>
 	       <para><literal>www:</literal> Changes or enhancements to
-	       the &os; website.
+	       the &os; website.</para>
-	       Problems with code found in <literal>/usr/ports/www</literal>
-	       do <emphasis>not</emphasis> belong here, they belong in
-	       <literal>ports</literal> instead.</para>
 	     </listitem>
 	  </itemizedlist>
 	</listitem>