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/06/10 07:02:52 UTC

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

Author: bayard
Date: Thu Jun 10 05:02:45 2010
New Revision: 953217

URL: http://svn.apache.org/viewvc?rev=953217&view=rev
Log:
Removing the Related Sites section. Moving ApacheCon to an ad; moving PlanetApache and FeatherCast into the Community section and also moving the Project Blogs link from the top bar (valuable real estate) down to the Community section

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=953217&r1=953216&r2=953217&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/3party.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/3party.html [utf-8] Thu Jun 10 05:02:45 2010
@@ -44,7 +44,6 @@
 			<li><a href="../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -739,6 +738,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -850,13 +850,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

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=953217&r1=953216&r2=953217&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] Thu Jun 10 05:02:45 2010
@@ -44,7 +44,6 @@
 			<li><a href="../../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -181,6 +180,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -292,13 +292,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

Modified: infrastructure/site/trunk/docs/legal/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/index.html?rev=953217&r1=953216&r2=953217&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/index.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/index.html [utf-8] Thu Jun 10 05:02:45 2010
@@ -44,7 +44,6 @@
 			<li><a href="../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -181,6 +180,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -292,13 +292,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

Modified: infrastructure/site/trunk/docs/legal/ramblings.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/ramblings.html?rev=953217&r1=953216&r2=953217&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/ramblings.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/ramblings.html [utf-8] Thu Jun 10 05:02:45 2010
@@ -44,7 +44,6 @@
 			<li><a href="../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -166,6 +165,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -277,13 +277,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

Modified: infrastructure/site/trunk/docs/legal/reports.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/reports.html?rev=953217&r1=953216&r2=953217&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/reports.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/reports.html [utf-8] Thu Jun 10 05:02:45 2010
@@ -44,7 +44,6 @@
 			<li><a href="../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -2624,6 +2623,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -2735,13 +2735,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

Modified: infrastructure/site/trunk/docs/legal/resolved.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/resolved.html?rev=953217&r1=953216&r2=953217&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/resolved.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/resolved.html [utf-8] Thu Jun 10 05:02:45 2010
@@ -44,7 +44,6 @@
 			<li><a href="../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -531,6 +530,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -642,13 +642,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

Modified: infrastructure/site/trunk/docs/legal/src-headers.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/src-headers.html?rev=953217&r1=953216&r2=953217&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/src-headers.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/legal/src-headers.html [utf-8] Thu Jun 10 05:02:45 2010
@@ -44,7 +44,6 @@
 			<li><a href="../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -373,6 +372,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -484,13 +484,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

Modified: infrastructure/site/trunk/docs/licenses/GPL-compatibility.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/GPL-compatibility.html?rev=953217&r1=953216&r2=953217&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/GPL-compatibility.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/licenses/GPL-compatibility.html [utf-8] Thu Jun 10 05:02:45 2010
@@ -44,7 +44,6 @@
 			<li><a href="../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -166,6 +165,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -277,13 +277,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

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=953217&r1=953216&r2=953217&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] Thu Jun 10 05:02:45 2010
@@ -44,7 +44,6 @@
 			<li><a href="../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -338,6 +337,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -449,13 +449,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

Modified: infrastructure/site/trunk/docs/licenses/exports/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/exports/index.html?rev=953217&r1=953216&r2=953217&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/exports/index.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/licenses/exports/index.html [utf-8] Thu Jun 10 05:02:45 2010
@@ -43,7 +43,6 @@
 			<li><a href="../../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -1093,6 +1092,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -1204,13 +1204,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

Modified: infrastructure/site/trunk/docs/licenses/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/index.html?rev=953217&r1=953216&r2=953217&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/index.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/licenses/index.html [utf-8] Thu Jun 10 05:02:45 2010
@@ -44,7 +44,6 @@
 			<li><a href="../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -265,6 +264,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -376,13 +376,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>

Modified: infrastructure/site/trunk/docs/licenses/proposed/index.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/licenses/proposed/index.html?rev=953217&r1=953216&r2=953217&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/licenses/proposed/index.html [utf-8] (original)
+++ infrastructure/site/trunk/docs/licenses/proposed/index.html [utf-8] Thu Jun 10 05:02:45 2010
@@ -43,7 +43,6 @@
 			<li><a href="../../foundation/support-apache.html" title="Support the mission of Apache">Support Apache</a></li>			
 			<li class="dlink"><a href="../../dyn/closer.cgi" title="Download Apache projects">Download</a></li>
 			<li><a href="http://blogs.apache.org/foundation/" title="Foundation Blog">ASF Blog</a></li>
-			<li><a href="http://blogs.apache.org" title="Project Blogs">Project Blogs</a></li>
 		</ul>
 	</div>
 	<div class="container">
@@ -309,6 +308,7 @@ href="http://projects.apache.org/">Apach
           <li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li> 
           <li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li> 
           <li><a href="http://harmony.apache.org/" title="Open source implementation of Java SE">Harmony</a></li> 
+          <li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</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://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li> 
@@ -420,13 +420,14 @@ href="/foundation/getinvolved.html">Get 
   <ul>
           <li><a href="http://people.apache.org/">People</a></li> 
           <li><a href="/memorials/">Memorials</a></li> 
-      </ul>
-      <h6>Related Sites</h6>
-  <ul>
-          <li><a href="http://apachecon.com/" title="Official Apache Conference">ApacheCon</a></li> 
           <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
           <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
       </ul>
+      <h6></h6>
+  <ul>
+          <li style="margin-left: -1em;list-style-type: none"><a href="http://www.apachecon.com/" alt="ApacheCon" title="Official Apache Conference"><img src="http://www.apache.org/events/current-event-125x125.png" /></a></li> 
+      </ul>
         </div>
       </div>
     </div>



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