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

[th...@apache.org]

Author: therabi
Date: Sun Jun 26 02:00:12 2011
New Revision: 791588

Log:
Publishing merge to openofficeorg site by therabi

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

Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 26 02:00:12 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-791518
+/websites/staging/openofficeorg/trunk:791146-791587

Modified: websites/production/openofficeorg/content/openofficeorg/developer-faqs.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/developer-faqs.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/developer-faqs.html Sun Jun 26 02:00:12 2011
@@ -73,7 +73,7 @@
 <p>The pages on this website are written in <a href="http://www.simpleeditions.com/59001/markdown-an-introduction">markdown syntax</a> and stored in SVN at 
 <a href="https://svn.apache.org/repos/asf/incubator/ooo/site">https://svn.apache.org/repos/asf/incubator/ooo/site</a></p>
 <p>Via integration with the Apache CMS, it is possible to edit, stage and publish 
-wesite updates from the command line, or by using a web-based interface.</p>
+website updates from the command line, or by using a web-based interface.</p>
 <p>Detailed information can be found in the <a href="http://incubator.apache.org/openofficeorg/docs/edit-cms.html">How to edit the OpenOffice.org website</a> page.</p>
   </div>
 

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 02:00:12 2011
@@ -85,21 +85,21 @@ away.</p>
 <ol>
 <li>You have send 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
-    improvent the non-code part of the project.</li>
+    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
     brought us forward.</li>
 <li>You are well known to the established members, who you are and what you have
     done in the past. Regarding this project, a former-one or another project.</li>
 </ol>
 <p>If 1 of the 4 statements above are true, then you can be voted in as committer.</p>
-<p>When the vote resut is positive, you will be asked for some information to setup
+<p>When the vote result is positive, you will be asked for some information to setup
 your committer status.
 <br> (<a href="http://incubator.apache.org/guides/participation.html">see here for more information</a>)</p>
 <h3 id="i_was_invitedvoted_as_committer_so_whats_next">I was invited/voted as committer, so whats next?</h3>
 <p>The following is a brief summary of what to expect as committer:</p>
 <ol>
 <li>
-<p>After your (Invividual Contributor Lisence 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
@@ -109,9 +109,9 @@ following communications with you.</p>
 </li>
 <li>
 <p>Choose one or more User Names that would be acceptable to you. These are short
-    names or abbriviations that will be used for a Unix account login.</p>
+    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 cound be "johnd" or "jdoe". <a href="http://people.apache.org/committer-index.html">Here you can see
+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
 if the ID is still free</a> or already given to another committer.</p>
 <p>Supply all other information that is requested. Return the ID requests as
 instructed.</p>