svn commit: r791633 - in /websites/production/openofficeorg: ./ content/openofficeorg/ppmc-faqs.html

[ma...@apache.org]

Author: marcus
Date: Sun Jun 26 19:48:59 2011
New Revision: 791633

Log:
Publishing merge to openofficeorg site by marcus

Modified:
    websites/production/openofficeorg/   (props changed)
    websites/production/openofficeorg/content/openofficeorg/ppmc-faqs.html

Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 26 19:48:59 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-791619
+/websites/staging/openofficeorg/trunk:791146-791632

Modified: websites/production/openofficeorg/content/openofficeorg/ppmc-faqs.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/ppmc-faqs.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/ppmc-faqs.html Sun Jun 26 19:48:59 2011
@@ -83,7 +83,7 @@ user. If you want to improve parts of th
 away.</p>
 <p>The following are conditions to become a committer:</p>
 <ol>
-<li>You have send in patches that were well-respected to improve the software.</li>
+<li>You have sent in patches that were well-respected to improve the software.</li>
 <li>You have added documentation to the Wiki or website that were well-respected to
     improve the non-code part of the project.</li>
 <li>You have shown that you can discuss in the mailing lists and that this has
@@ -99,16 +99,17 @@ your committer status.
 <p>The following is a brief summary of what to expect as committer:</p>
 <ol>
 <li>
-<p>After your (Individual Contributor License Agreement (<a href="http://www.apache.org/licenses/icla.txt">iCLA</a>) has been
+<p>After your (individual Contributor License Agreement (<a href="http://www.apache.org/licenses/icla.txt">iCLA</a>) has been
     received and registered, you will be invited to specify one or more preferred
     Apache user names.</p>
-<p><strong>Important</strong>: The e-mail address you provide in your iCLA will be used for the
-following communications with you.</p>
-<p>Please note that there is also a <a href="http://www.apache.org/licenses/cla-corporate.txt">Corporate Contributor Lisence Agreement
+<p><strong>Important</strong>: <br>
+The e-mail address you provide in your iCLA will be used for the following
+communications with you.</p>
+<p>Please note that there is also a <a href="http://www.apache.org/licenses/cla-corporate.txt">Corporate Contributor License Agreement
 (CCLA)</a> if you want/have to commit in the name of a company or organization.</p>
 </li>
 <li>
-<p>Choose one or more User Names that would be acceptable to you. These are short
+<p>Choose one or more user name(s) that would be acceptable to you. These are short
     names or abbreviation that will be used for a Unix account login.</p>
 <p><strong>Example:</strong> <br>
 Your name is "John Doe", so an ID could be "johnd" or "jdoe". <a href="http://people.apache.org/committer-index.html">Here you can see
@@ -130,9 +131,9 @@ instructed.</p>
 <li>
 <p>The ID will also be your Apache e-mail address. Note that the account will be
     set up to forward all received mails to the e-mail address you supplied on your
-    ICLA. It is not a normal mail account but just for forwarding. After you have
+    iCLA. It is not a normal mail account but just for forwarding. After you have
     the account there is also a way to associate your Apache e-mail address with
-    additional e-mail addresses that you have. (ToDo: Add a link to a how-to)</p>
+    additional e-mail addresses that you have. (<strong>ToDo</strong>: Add a link to a how-to)</p>
 </li>
 <li>
 <p>The ID and password will allow you to check in changes and new additions on the