Index: adffaces.xml
===================================================================
--- adffaces.xml	(revision 414465)
+++ adffaces.xml	(working copy)
@@ -22,127 +22,164 @@
     <section id="News">
       <title>News</title>
       <ul>
-        <li>none yet</li>
+        <li>A new name has been voted by the community. We created a ticket
+            inside of Jira and asked the community to pick a new name. The 
+            result of the vote was Trinidad.</li>
       </ul>
     </section>
-    <section id="Project+info">
+
+
+
+    <section id="Project+Info">
       <title>Project Info</title>
-      <ul>
-        <li>Link to the <a href="http://myfaces.apache.org/">main project website</a></li>
-        <li>Link to the page(s) that tell how to participate (Website,Mailing
-            lists,Bug tracking,Source code) - FIXME</li>
-        <li>Link to the project status file (Committers,non-incubation action
-            items,project resources, etc) - FIXME</li>
-      </ul>
-      <p>If the project website and code repository are not yet setup, use the
-         following table:</p>
-      <table>
-        <tr>
-          <th>item</th>
-          <th>type</th>
-          <th>reference</th>
-        </tr>
-        <tr>
-          <td>Website</td>
-          <td>www</td>
-          <td><a href="http://myfaces.apache.org">http://myfaces.apache.org/</a>
-              (Using MyFaces Website)</td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>wiki</td>
-          <td><a href="http://wiki.apache.org/myfaces/">http://wiki.apache.org/myfaces/</a>
-              (Using MyFaces Wiki)</td>
-        </tr>
-        <tr>
-          <td>Mailing list</td>
-          <td>dev</td>
-          <td>adffaces-dev@incubator.apache.org
-            [<a href="mailto:adffaces-dev-subscribe@incubator.apache.org">Subscribe</a>]
-            [<a href="mailto:adffaces-dev-unsubscribe@incubator.apache.org">Unsubscribe</a>]
-          </td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>user</td>
-          <td>adffaces-user@incubator.apache.org
-            [<a href="mailto:adffaces-user-subscribe@incubator.apache.org">Subscribe</a>]
-            [<a href="mailto:adffaces-user-unsubscribe@incubator.apache.org">Unsubscribe</a>]
-          </td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>issues</td>
-          <td>adffaces-issues@incubator.apache.org
-            [<a href="mailto:adffaces-issues-subscribe@incubator.apache.org">Subscribe</a>]
-            [<a href="mailto:adffaces-issues-unsubscribe@incubator.apache.org">Unsubscribe</a>]
-          </td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>svn</td>
-          <td>adffaces-commits@incubator.apache.org
-            [<a href="mailto:adffaces-commits-subscribe@incubator.apache.org">Subscribe</a>]
-            [<a href="mailto:adffaces-commis-unsubscribe@incubator.apache.org">Unsubscribe</a>]
-          </td>
-        </tr>
-        <tr>
-          <td>Bug tracking</td>
-          <td>jira</td>
-          <td><a href="https://issues.apache.org/jira/browse/ADFFACES">
-              https://issues.apache.org/jira/browse/ADFFACES</a></td>
-        </tr>
-        <tr>
-          <td>Source code</td>
-          <td>SVN</td>
-          <td>adffaces</td>
-        </tr>
-        <tr>
-          <td>Mentors</td>
-          <td>craigmcc</td>
-          <td>Craig McClanahan</td>
-        </tr>
-        <tr>
-          <td>Committers</td>
-          <td>baranda</td>
-          <td>Bruno Aranda</td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>TBD</td>
-          <td>John Fallows</td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>TBD</td>
-          <td>Jonas Jacobi</td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>mmarinschek</td>
-          <td>Martin Marinschek</td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>craigmcc</td>
-          <td>Craig McClanahan</td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>TBD</td>
-          <td>Omar Tazi</td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>matzew</td>
-          <td>Matthias Wessendorf</td>
-        </tr>
-        <tr>
-          <td>.</td>
-          <td>TBD</td>
-          <td>Adam Winer</td>
-        </tr>
-      </table>
+      <div class="section">
+        <table>
+          <tr>
+            <th>item</th>
+            <th>id</th>
+            <th>reference</th>
+          </tr>
+          <tr>
+            <td>Web site</td>
+            <td>www</td>
+            <td>
+              <a href="http://people.apache.org/~matzew/trinidad_doc/">
+                ADF Faces Apache API</a>
+            </td>
+          </tr>
+          <tr>
+            <td/>
+            <td>wiki</td>
+            <td><a href="http://wiki.apache.org/myfaces/ADF_Faces">Using a subset of the MyFaces Wiki</a></td>
+          </tr>
+          <tr>
+            <td>Mailing lists</td>
+            <td>dev</td>
+            <td>
+              <a href="mailto:adffaces-dev@incubator.apache.org">adffaces-dev@incubator.apache.org</a>
+            </td>
+          </tr>
+          <tr>
+            <td/>
+            <td>user</td>
+            <td>
+              <a href="mailto:adffaces-user@incubator.apache.org">
+                adffaces-user@incubator.apache.org</a>
+            </td>
+          </tr>
+          <tr>
+            <td/>
+            <td>svn</td>
+            <td>
+              <a href="mailto:adffaces-commits@incubator.apache.org">
+                adffaces-commits@incubator.apache.org</a>
+            </td>
+          </tr>
+          <tr>
+            <td/>
+            <td>issues</td>
+            <td>
+              <a href="mailto:issues-ppmc@incubator.apache.org">
+                issues-ppmc@incubator.apache.org</a>
+            </td>
+          </tr>
+          <tr>
+            <td>Moderators</td>
+            <td>matzew</td>
+            <td>
+              <a href="mailto:matzew_at_apache.org">Matthias Wessendorf</a>
+            </td>
+          </tr>
+          <tr>
+            <td>Bug tracking</td>
+            <td>jira</td>
+            <td>
+              <a href="http://issues.apache.org/jira/browse/adffaces">
+                http://issues.apache.org/jira/browse/adffaces</a>
+            </td>
+          </tr>
+          <tr>
+            <td>Source code</td>
+            <td>svn</td>
+            <td>
+              <a href="http://svn.apache.org/repos/asf/incubator/adffaces/">
+                http://svn.apache.org/viewvc/incubator/adffaces/</a>
+            </td>
+          </tr>
+          <tr>
+            <td>Sponsor</td>
+            <td/>
+            <td>
+              <a href="mailto:pmc_at_myfaces.apache.org">
+                Apache MyFaces PMC</a>
+            </td>
+          </tr>
+          <tr>
+            <td>Mentor</td>
+            <td>craigmcc</td>
+            <td>
+              <a href="mailto:craigmcc_at_apache.org">
+                Craig McClanahan</a>
+            </td>
+          </tr>
+          <tr>
+            <td id="committers">Committers</td>
+            <td>awiner</td>
+            <td>
+              <a href="mailto:awiner_at_apache.org">
+                Adam Winer</a>
+            </td>
+          </tr>
+          <tr>
+            <td/>
+            <td>baranda</td>
+            <td>
+              <a href="mailto:baranda_at_apache.org">
+                B Aranda</a>
+            </td>
+          </tr>
+          <tr>
+            <td/>
+            <td>craigmcc</td>
+            <td>
+              <a href="mailto:craigmcc_at_apache.org">
+                Craig McClanahan</a>
+            </td>
+          </tr>
+          <tr>
+            <td/>
+            <td>jfallows</td>
+            <td>
+              <a href="mailto:jfallows_at_apache.org">
+                John Fallows</a>
+            </td>
+          </tr>
+          <tr>
+            <td/>
+            <td>matzew</td>
+            <td>
+              <a href="mailto:matzew_at_apache.org">
+                Matthias Wessendorf</a>
+            </td>
+          </tr>
+          <tr>
+            <td/>
+            <td>mmarinschek</td>
+            <td>
+              <a href="mailto:mmarinschek_at_apache.org">
+                Martin Marinschek</a>
+            </td>
+          </tr>
+          <tr>
+            <td/>
+            <td>TBD</td>
+            <td>
+              <a href="mailto:notyet_at_apache.org">
+                Jonas Jacobi</a>
+            </td>
+          </tr>
+        </table>
+      </div>
     </section>
     <section id="Incubation+status+reports">
       <title>Incubation status reports</title>