<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -108,11 +108,12 @@
       &lt;term&gt;maintainers&lt;/term&gt;
 
       &lt;listitem&gt;
-        &lt;para&gt;A port's maintainer is a person or persons who take
-        responsibility for keeping the port up-to-date, and the maintainer
-        keyword lists maintainer email addresses(s). However, many maintainers
-        wish to hide these addresses from spambots; to do so follow these
-        conventions:&lt;/para&gt;
+        &lt;para&gt;A port's maintainers are the people who have agreed to take
+        responsibility for keeping the port up-to-date. Most ports have only a
+        single maintainer, but some ports have two or more comaintainers. The
+        &lt;literal&gt;maintainers&lt;/literal&gt; keyword lists the maintainers' email
+        addresses, preferrably in the obfuscated form which hides them
+        from spambots:&lt;/para&gt;
 
         &lt;itemizedlist&gt;
           &lt;listitem&gt;
@@ -121,7 +122,7 @@
           &lt;/listitem&gt;
 
           &lt;listitem&gt;
-            &lt;para&gt;For addresses in other domains, say
+            &lt;para&gt;For addresses in other domains, e.g.
             &lt;email&gt;account@example.org&lt;/email&gt;, use the convention
             example.org:account to specify the address.&lt;/para&gt;
           &lt;/listitem&gt;
@@ -134,6 +135,15 @@
 
         &lt;programlisting&gt;maintainers         jdoe \
                     example.org:julesverne&lt;/programlisting&gt;
+
+        &lt;note&gt;
+          &lt;para&gt;The address &lt;email&gt;nomaintainer&lt;/email&gt; designates a port that
+          is not maintained by anybody and may be modified by any committer.
+          Feel free to claim maintainership of a nomaintainer port if desired.
+          The address &lt;email&gt;openmaintainer&lt;/email&gt; designates a port that has
+          a maintainer who allows minor changes to be committed without his or
+          her prior approval.&lt;/para&gt;
+        &lt;/note&gt;
       &lt;/listitem&gt;
     &lt;/varlistentry&gt;
 
@@ -182,4 +192,4 @@
       &lt;/listitem&gt;
     &lt;/varlistentry&gt;
   &lt;/variablelist&gt;
-&lt;/section&gt;
\ No newline at end of file
+&lt;/section&gt;</diff>
      <filename>doc-new/guide/xml/portfile-keywords.xml</filename>
    </modified>
    <modified>
      <diff>@@ -187,22 +187,18 @@
       &lt;listitem&gt;
         &lt;para&gt;Port maintainers&lt;/para&gt;
 
-        &lt;para&gt;A port's maintainer is a person or persons who take
-        responsibility for keeping the port up-to-date, and the maintainer
-        keyword lists maintainer email addresses(s). To hide these addresses
-        from spambots, see the more full explanation of the &lt;link
-        linkend=&quot;reference.keywords.maintainers&quot;&gt;maintainer keyword&lt;/link&gt; in
+        &lt;para&gt;A port's maintainers are the people who have agreed to take
+        responsibility for keeping the port up-to-date. The
+        &lt;literal&gt;maintainers&lt;/literal&gt; keyword lists the maintainers' email
+        addresses, preferrably in the obfuscated form which hides them
+        from spambots. For more, see the full explanation of the &lt;link
+        linkend=&quot;reference.keywords.maintainers&quot;&gt;maintainers keyword&lt;/link&gt; in
         the &lt;link linkend=&quot;reference.keywords&quot;&gt;Global Keywords&lt;/link&gt; section
         of the &lt;link linkend=&quot;reference&quot;&gt;Portfile Reference&lt;/link&gt;
         chapter.&lt;/para&gt;
 
-        &lt;programlisting&gt;maintainers         julesverne@example.org&lt;/programlisting&gt;
-
-        &lt;note&gt;
-          &lt;para&gt;The address &lt;email&gt;nomaintainer@macports.org&lt;/email&gt;, or in
-          hidden form &lt;email&gt;nomaintainer&lt;/email&gt;, designates a port that may
-          be modified by any committer.&lt;/para&gt;
-        &lt;/note&gt;
+        &lt;programlisting&gt;maintainers         jdoe \
+                    example.org:julesverne&lt;/programlisting&gt;
       &lt;/listitem&gt;
 
       &lt;listitem&gt;</diff>
      <filename>doc-new/guide/xml/portfiledev.xml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>5e5db48bcfc9b9b81b4a122a50f6bd51f38724a8</id>
    </parent>
  </parents>
  <author>
    <name>Ryan Schmidt</name>
    <email>ryandesign@macports.org</email>
  </author>
  <url>http://github.com/kballard/macports/commit/4fe5110c1176140c05db33c3b7aa0e579f07c894</url>
  <id>4fe5110c1176140c05db33c3b7aa0e579f07c894</id>
  <committed-date>2009-10-17T09:24:35-07:00</committed-date>
  <authored-date>2009-10-17T09:24:35-07:00</authored-date>
  <message>Update, clarify and correct some &quot;maintainers&quot; stuff.


git-svn-id: http://svn.macports.org/repository/macports/trunk@59594 d073be05-634f-4543-b044-5fe20cf6d1d6</message>
  <tree>3ef1d65d22d3004509df73e655c27853ef08817c</tree>
  <committer>
    <name>Ryan Schmidt</name>
    <email>ryandesign@macports.org</email>
  </committer>
</commit>
