harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r410699 - in /incubator/harmony/standard/site: docs/contribution_policy.html xdocs/contribution_policy.xml
Date Wed, 31 May 2006 23:15:49 GMT
Author: tellison
Date: Wed May 31 16:15:48 2006
New Revision: 410699

URL: http://svn.apache.org/viewvc?rev=410699&view=rev
Log:
Tidy up contribution policy words, fix tense, add further links, etc.

Modified:
    incubator/harmony/standard/site/docs/contribution_policy.html
    incubator/harmony/standard/site/xdocs/contribution_policy.xml

Modified: incubator/harmony/standard/site/docs/contribution_policy.html
URL: http://svn.apache.org/viewvc/incubator/harmony/standard/site/docs/contribution_policy.html?rev=410699&r1=410698&r2=410699&view=diff
==============================================================================
--- incubator/harmony/standard/site/docs/contribution_policy.html (original)
+++ incubator/harmony/standard/site/docs/contribution_policy.html Wed May 31 16:15:48 2006
@@ -202,7 +202,7 @@
         <blockquote>
                                     <p>
 Due to the oversight which we wish to provide for the Harmony community, the following 
-process will be used for committers, contributors and their contributions.
+process is used for committers, contributors and their contributions.
 </p>
                                                 <p>
 In summary : 
@@ -210,25 +210,26 @@
                                                 <ul>
 <li>
   We are working to ensure that we have broad participation from the community, 
-  at all experience levels and interests, but at the same time will work to 
-  minimize any risks to the the ASF, the project and our community  due to 
+  at all experience levels and interests, but at the same time we are working to 
+  minimize any risks to the ASF, the project and our community due to 
   inappropriate contributions of the intellectual property of others.
 </li>
 <li>
-   We will adhere to the standard Apache process and contribution agreements, but 
-   enhance to gather information about contributor's previous experience with
-   similar technology.  This information will be used to ensure that the work
+   We adhere to the standard Apache process and contribution agreements, and 
+   enhance them to gather information about contributor's previous experience with
+   similar technology.  This information is used to ensure that the work
    contributed to the project does not infringe the intellectual or other
    property rights of others. 
 </li>
 <li>
-   We will compartmentalize our SVN repository and use fine-grained access control
+   We have compartmentalized our repository and use fine-grained access control
    to ensure broad participation while still ensuring that inappropriate or 
    questionable contributions do no occur.
 </li>
 <li>
-  We will require every contributor to fill out a "Authorized Contributor Questionnaire",

-  while will be used to help limit the risks to our source base from inappropriate 
+  We require every contributor to fill out an
+  <a href="auth_cont_quest.html">Authorized Contributor Questionnaire</a>, 
+  which is used to help limit the risks to our source base from inappropriate 
   contributions.
 </li>
 </ul>
@@ -241,39 +242,47 @@
       <tr><td>
         <blockquote>
                                     <p>
-We shall divide our SVN repository into sections.  There will be two 
-main sections, the "standard" section, for which the standard Apache process 
-applies (namely, the standard Apache ICLA is all that is required)
-and the "enhanced" section, which requires any committer to also be 
-an Authorized Contributor.  Project code will be in the "enhanced" section, 
-and website, documentation and other miscellany will be in the "standard"
-section.  For the purposes of illustration :
+  We have divided our Subversion(SVN) repository into sections.  There are two 
+  main sections, the "standard" section, for which the standard Apache process 
+  applies (namely, the standard 
+  <a href="http://www.apache.org/licenses/icla.txt">Apache ICLA</a>
+  is all that is required) and the "enhanced" section, which requires any
+  committer to also be an Authorized Contributor.  Project code is in the
+  "enhanced" section, and website, documentation and other miscellany is in
+  the "standard" section.  For the purposes of illustration :
 </p>
                                                 <pre>
 
 enhanced/JVM
-          /VM
-          /JIT
-          /GC
-          /...
-          / vm/lib interface
+         /VM
+         /JIT
+         /GC
+         /...
+         /vm/lib interface
 enhanced/classlib
-            /applet
-            /awt
-            /beans
+            /tags
+            /branches
+            /trunk
+               /modules
+                  /applet
+                  /awt
+                  /beans
+                  /...
+               /...
             /...
 standard/website and Documentation
 standard/Legal and administrative
 
 </pre>
                                                 <p>
-and we limit access within the enhanced part of the SVN 
-using information provided by Authorized Contributor, as defined below.
-Access will be controlled with fine-grained access control lists.
+  and we limit access within the enhanced part of the SVN 
+  using information provided by Authorized Contributors, as defined below.
+  Access to different parts of the repository is controlled by fine-grained
+  access control lists.
 </p>
                                                 <p>
-We will be as liberal as possible - if your status as an Authorized Contributor doesn't prevent
it,
-access should be granted to any part of the SVN repository.
+  We will be as liberal as possible - if your status as an Authorized Contributor
+  doesn't prevent it, access should be granted to any part of the SVN repository.
 </p>
                             </blockquote>
       </td></tr>
@@ -291,7 +300,10 @@
 Committers can only commit contributions to the repositories 
 that they personally created <i>specifically for contribution to Apache Harmony.</i>
 This is the standard stream of fresh original work, small enhancements 
-and patches that are the normal flow of project life.  The purpose of 
+and patches that are the normal flow of project life.
+</p>
+                                                <p>
+The purpose of 
 this rule is to explicitly prohibit re-purposed "bulk" code 
 that the contributor believes is their original work from being
 added to the codebase without explicit oversight and acceptance. 
@@ -318,9 +330,10 @@
 This document is maintained and managed by the Secretary of the Apache Software Foundation.
 </p>
                                                 <p>
-In order for a committer to become an Authorized Contributor,  each committer is required
to complete the 
-<a href="auth_cont_quest.html">Authorized Contributor Questionnaire</a> and submit
to the 
-Harmony PMC.
+In order for a committer to become an Authorized Contributor to Harmony, each committer
+is also required to complete the 
+<a href="auth_cont_quest.html">Authorized Contributor Questionnaire</a> and submit
it to
+<a href="mailing.html">the Harmony PMC</a>.
 </p>
                                                 <p>
 We encourage every committer, if appropriate, to have their employer execute a 
@@ -354,11 +367,11 @@
 Any Bulk Contribution  :
 </p>
                                                 <ol>
-<li> Will be donated via the project JIRA as a contribution under the Apache License.</li>
+<li> Will be donated via the project bug tracking system (JIRA) as a contribution under
the Apache License.</li>
 <li> Will be accompanied by a Software Grant or CCLA which will be registered with
the Apache Incubator</li>
 <li> Will be registered in the Apache Harmony Bulk Contribution Repository
       via a <a href="bulk_contribution_checklist.html">Bulk Contribution Checklist</a></li>
-<li> Will be made by an Authorized Contributor </li>
+<li> Will be made by an Authorized Contributor to Harmony (defined above)</li>
 </ol>
                                                 <p>
 The Bulk Contribution Repository is a separate place in our administrative SVN in which each
contribution 
@@ -366,7 +379,7 @@
 ensure that we have a clear and unambiguous record of any repurposed software that was contributed
or
 brought into the project source tree. Along with the source or other contributed materials,
the 
 contribution will also include a description of the software and the name of the Authorized
Contributor
-that made the donation
+that made the donation.
 </p>
                                                 <p>
 We strongly urge any potential contributor to carefully examine their candidate for contribution

Modified: incubator/harmony/standard/site/xdocs/contribution_policy.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/standard/site/xdocs/contribution_policy.xml?rev=410699&r1=410698&r2=410699&view=diff
==============================================================================
--- incubator/harmony/standard/site/xdocs/contribution_policy.xml (original)
+++ incubator/harmony/standard/site/xdocs/contribution_policy.xml Wed May 31 16:15:48 2006
@@ -29,7 +29,7 @@
 
 <p>
 Due to the oversight which we wish to provide for the Harmony community, the following 
-process will be used for committers, contributors and their contributions.
+process is used for committers, contributors and their contributions.
 </p>
 
 <p>
@@ -39,55 +39,62 @@
 <ul>
 <li>
   We are working to ensure that we have broad participation from the community, 
-  at all experience levels and interests, but at the same time will work to 
-  minimize any risks to the the ASF, the project and our community  due to 
+  at all experience levels and interests, but at the same time we are working to 
+  minimize any risks to the ASF, the project and our community due to 
   inappropriate contributions of the intellectual property of others.
 </li>
 <li>
-   We will adhere to the standard Apache process and contribution agreements, but 
-   enhance to gather information about contributor's previous experience with
-   similar technology.  This information will be used to ensure that the work
+   We adhere to the standard Apache process and contribution agreements, and 
+   enhance them to gather information about contributor's previous experience with
+   similar technology.  This information is used to ensure that the work
    contributed to the project does not infringe the intellectual or other
    property rights of others. 
 </li>
 <li>
-   We will compartmentalize our SVN repository and use fine-grained access control
+   We have compartmentalized our repository and use fine-grained access control
    to ensure broad participation while still ensuring that inappropriate or 
    questionable contributions do no occur.
 </li>
 <li>
-  We will require every contributor to fill out a "Authorized Contributor Questionnaire",

-  while will be used to help limit the risks to our source base from inappropriate 
+  We require every contributor to fill out an
+  <a href="auth_cont_quest.html">Authorized Contributor Questionnaire</a>, 
+  which is used to help limit the risks to our source base from inappropriate 
   contributions.
 </li>
 </ul>
 
-      
 
 <subsection name="Division of Repository">
 
 <p>
-We shall divide our SVN repository into sections.  There will be two 
-main sections, the "standard" section, for which the standard Apache process 
-applies (namely, the standard Apache ICLA is all that is required)
-and the "enhanced" section, which requires any committer to also be 
-an Authorized Contributor.  Project code will be in the "enhanced" section, 
-and website, documentation and other miscellany will be in the "standard"
-section.  For the purposes of illustration :
+  We have divided our Subversion(SVN) repository into sections.  There are two 
+  main sections, the "standard" section, for which the standard Apache process 
+  applies (namely, the standard 
+  <a href="http://www.apache.org/licenses/icla.txt">Apache ICLA</a>
+  is all that is required) and the "enhanced" section, which requires any
+  committer to also be an Authorized Contributor.  Project code is in the
+  "enhanced" section, and website, documentation and other miscellany is in
+  the "standard" section.  For the purposes of illustration :
 </p>
 
 <pre>
 
 enhanced/JVM
-          /VM
-          /JIT
-          /GC
-          /...
-          / vm/lib interface
+         /VM
+         /JIT
+         /GC
+         /...
+         /vm/lib interface
 enhanced/classlib
-            /applet
-            /awt
-            /beans
+            /tags
+            /branches
+            /trunk
+               /modules
+                  /applet
+                  /awt
+                  /beans
+                  /...
+               /...
             /...
 standard/website and Documentation
 standard/Legal and administrative
@@ -95,14 +102,15 @@
 </pre>
 
 <p>
-and we limit access within the enhanced part of the SVN 
-using information provided by Authorized Contributor, as defined below.
-Access will be controlled with fine-grained access control lists.
+  and we limit access within the enhanced part of the SVN 
+  using information provided by Authorized Contributors, as defined below.
+  Access to different parts of the repository is controlled by fine-grained
+  access control lists.
 </p>
 
 <p>
-We will be as liberal as possible - if your status as an Authorized Contributor doesn't prevent
it,
-access should be granted to any part of the SVN repository.
+  We will be as liberal as possible - if your status as an Authorized Contributor
+  doesn't prevent it, access should be granted to any part of the SVN repository.
 </p>
 
 </subsection>
@@ -113,7 +121,11 @@
 Committers can only commit contributions to the repositories 
 that they personally created <i>specifically for contribution to Apache Harmony.</i>
 This is the standard stream of fresh original work, small enhancements 
-and patches that are the normal flow of project life.  The purpose of 
+and patches that are the normal flow of project life.
+</p>
+
+<p>
+The purpose of 
 this rule is to explicitly prohibit re-purposed "bulk" code 
 that the contributor believes is their original work from being
 added to the codebase without explicit oversight and acceptance. 
@@ -136,9 +148,10 @@
 </p>
 
 <p>
-In order for a committer to become an Authorized Contributor,  each committer is required
to complete the 
-<a href="auth_cont_quest.html">Authorized Contributor Questionnaire</a> and submit
to the 
-Harmony PMC.
+In order for a committer to become an Authorized Contributor to Harmony, each committer
+is also required to complete the 
+<a href="auth_cont_quest.html">Authorized Contributor Questionnaire</a> and submit
it to
+<a href="mailing.html">the Harmony PMC</a>.
 </p>
 
 <p>
@@ -169,11 +182,11 @@
 </p>
 
 <ol>
-<li> Will be donated via the project JIRA as a contribution under the Apache License.</li>
+<li> Will be donated via the project bug tracking system (JIRA) as a contribution under
the Apache License.</li>
 <li> Will be accompanied by a Software Grant or CCLA which will be registered with
the Apache Incubator</li>
 <li> Will be registered in the Apache Harmony Bulk Contribution Repository
       via a <a href="bulk_contribution_checklist.html">Bulk Contribution Checklist</a></li>
-<li> Will be made by an Authorized Contributor </li>
+<li> Will be made by an Authorized Contributor to Harmony (defined above)</li>
 </ol>
 
 <p>
@@ -182,7 +195,7 @@
 ensure that we have a clear and unambiguous record of any repurposed software that was contributed
or
 brought into the project source tree. Along with the source or other contributed materials,
the 
 contribution will also include a description of the software and the name of the Authorized
Contributor
-that made the donation
+that made the donation.
 </p>
 
 <p>



Mime
View raw message