You are viewing a plain text version of this content. The canonical link for it is here.
Posted to legal-discuss@apache.org by ba...@apache.org on 2010/05/26 06:35:50 UTC

svn commit: r948313 - in /infrastructure/site/trunk/docs: legal/ legal/drafts/ licenses/ licenses/exports/ licenses/proposed/

Author: bayard
Date: Wed May 26 04:35:43 2010
New Revision: 948313

URL: http://svn.apache.org/viewvc?rev=948313&view=rev
Log:
Moving Incubator + Labs over to Foundation Projects. I've pondered it for a few days and I think they're a better fit here than lost inside the Projects. The primary reason being that neither of the projects have a goal of developing software. 

Modified:
    infrastructure/site/trunk/docs/legal/3party.html
    infrastructure/site/trunk/docs/legal/drafts/process-draft.html
    infrastructure/site/trunk/docs/legal/index.html
    infrastructure/site/trunk/docs/legal/ramblings.html
    infrastructure/site/trunk/docs/legal/reports.html
    infrastructure/site/trunk/docs/legal/resolved.html
    infrastructure/site/trunk/docs/legal/src-headers.html
    infrastructure/site/trunk/docs/licenses/GPL-compatibility.html
    infrastructure/site/trunk/docs/licenses/LICENSE-2.0.html
    infrastructure/site/trunk/docs/licenses/exports/index.html
    infrastructure/site/trunk/docs/licenses/index.html
    infrastructure/site/trunk/docs/licenses/proposed/index.html

Modified: infrastructure/site/trunk/docs/legal/3party.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/3party.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/3party.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/3party.html [utf-8] Wed May 26 04:35:43 2010
@@ -741,11 +741,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -812,8 +810,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/legal/drafts/process-draft.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/drafts/process-draft.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/drafts/process-draft.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/drafts/process-draft.html [utf-8] Wed May 26 04:35:43 2010
@@ -183,11 +183,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -254,8 +252,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/legal/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/index.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/index.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/index.html [utf-8] Wed May 26 04:35:43 2010
@@ -183,11 +183,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -254,8 +252,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/legal/ramblings.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/ramblings.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/ramblings.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/ramblings.html [utf-8] Wed May 26 04:35:43 2010
@@ -168,11 +168,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -239,8 +237,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/legal/reports.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/reports.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/reports.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/reports.html [utf-8] Wed May 26 04:35:43 2010
@@ -2626,11 +2626,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -2697,8 +2695,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/legal/resolved.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/resolved.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/resolved.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/resolved.html [utf-8] Wed May 26 04:35:43 2010
@@ -533,11 +533,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -604,8 +602,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/legal/src-headers.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/src-headers.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/src-headers.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/src-headers.html [utf-8] Wed May 26 04:35:43 2010
@@ -375,11 +375,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -446,8 +444,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/licenses/GPL-compatibility.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/GPL-compatibility.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/GPL-compatibility.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/licenses/GPL-compatibility.html [utf-8] Wed May 26 04:35:43 2010
@@ -168,11 +168,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -239,8 +237,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/licenses/LICENSE-2.0.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/LICENSE-2.0.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/LICENSE-2.0.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/licenses/LICENSE-2.0.html [utf-8] Wed May 26 04:35:43 2010
@@ -340,11 +340,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -411,8 +409,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/licenses/exports/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/exports/index.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/exports/index.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/licenses/exports/index.html [utf-8] Wed May 26 04:35:43 2010
@@ -1095,11 +1095,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -1166,8 +1164,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/licenses/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/index.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/index.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/licenses/index.html [utf-8] Wed May 26 04:35:43 2010
@@ -267,11 +267,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -338,8 +336,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 

Modified: infrastructure/site/trunk/docs/licenses/proposed/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/proposed/index.html?rev=948313&r1=948312&r2=948313&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/proposed/index.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/licenses/proposed/index.html [utf-8] Wed May 26 04:35:43 2010
@@ -311,11 +311,9 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
           <li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li> 
           <li><a href="http://ibatis.apache.org/" title="SQL Data Mapper for Java and .NET">iBATIS</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
           <li><a href="http://jakarta.apache.org/" title="Server-side Java">Jakarta</a></li> 
           <li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li> 
           <li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li> 
           <li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li> 
@@ -382,8 +380,10 @@ href="/foundation/">Foundation</a></h6>
   <ul>
           <li><a href="http://attic.apache.org/" title="Inactive project repository">Attic</a></li> 
           <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
           <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
           <li><a href="/jcp/" title="Apache and the Java Community Process">JCP</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
           <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
           <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
           <li><a href="/security/" title="Security">Security</a></li> 



---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org