Index: src/documentation/skins/lucene/css/screen.css
===================================================================
--- src/documentation/skins/lucene/css/screen.css	(revision 1032587)
+++ src/documentation/skins/lucene/css/screen.css	(working copy)
@@ -420,6 +420,13 @@
     margin: 0;
     width: 45%;
 }
+#footer .trademark {
+    position: relative; /* IE bugfix cont'd */
+    padding: 5px;
+    margin: 0;
+    width: 100%;
+}
+
 #footer .lastmodified {
     position: relative; /* IE bugfix cont'd */
     float: right;
Index: src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
===================================================================
--- src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl	(revision 1032587)
+++ src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl	(working copy)
@@ -223,7 +223,7 @@
                       </input>&#160; 
                     <input type="submit" value="Search" name="Search" i18n:attr="value"/>
                     </form>
-		    <div style="position: relative; top: -5px; left: -10px">Powered by <a style="color: #033268" href="http://www.lucidimagination.com">Lucid Imagination</a></div>
+		    <div style="position: relative; top: -5px; left: -10px">Search Powered by <a style="color: #033268" href="http://www.lucidimagination.com">Lucid Imagination</a></div>
                   </xsl:otherwise>
                 </xsl:choose>
 <!--div id="roundbottomsmall">
@@ -324,6 +324,11 @@
               </xsl:choose>
             </div>
           </xsl:if>
+          <xsl:if test="$config/trademark">
+			<div class="trademark">
+              <xsl:value-of select="$config/trademark"/>
+			</div>
+          </xsl:if>
           <xsl:if test="$filename = 'index.html'">
             <div id="logos" >
               <xsl:if test="$config/disable-compliance-links/@align">
Index: src/documentation/skinconf.xml
===================================================================
--- src/documentation/skinconf.xml	(revision 1032587)
+++ src/documentation/skinconf.xml	(working copy)
@@ -90,10 +90,10 @@
   <favicon-url>images/favicon.ico</favicon-url>
 
   <!-- The following are used to construct a copyright statement -->
-  <year>2009</year>
+  <year>2010</year>
   <vendor>The Apache Software Foundation.</vendor>
   <copyright-link>http://www.apache.org/licenses/</copyright-link>
-
+  <trademark>Apache Lucene, Apache Solr, Apache Lucene.NET, Apache PyLucene, Apache Open Relevance Project, Apache Lucy and Apache Droids and their respective logos are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</trademark>
   <!-- Some skins use this to form a 'breadcrumb trail' of links.
     Use location="alt" to move the trail to an alternate location
     (if the skin supports it).
@@ -346,6 +346,7 @@
       <width>88</width>
       <height>31</height>
     </credit>
+
     <!-- A credit with @role="pdf" will be used to compose a footer
      for each page in the PDF, using either "name" or "url" or both.
     -->
Index: src/documentation/content/xdocs/site.xml
===================================================================
--- src/documentation/content/xdocs/site.xml	(revision 1032587)
+++ src/documentation/content/xdocs/site.xml	(working copy)
@@ -20,10 +20,13 @@
   <project label="About">
     <news        label="Welcome"          href="index.html" />    
     <who         label="Who We Are"       href="who.html" />    
-    <mail        label="Mailing Lists"    href="mail.html" />    
+    <mail        label="Mailing Lists"    href="mail.html" /> 
+    <asf         label="ASF"          href="ext:asf"/>   
     <store       label="Buy Stuff"        href="ext:store" />    
+    <license     label="License"          href="ext:license"/>
     <sponsor     label="Sponsor Apache"     href="ext:sponsor" />    
-    <thanks      label="Sponsors of Apache" href="ext:thanks" />    
+    <security    label="Security"         href="ext:security"/>
+    <thanks      label="Thanks" href="ext:thanks" />    
   </project>
 
   <docs label="Sub-Projects">    
@@ -37,6 +40,9 @@
   </docs>
 
   <external-refs>
+	<asf href="http://www.apache.org"/>
+	<license href="http://www.apache.org/licenses"/>
+	<security href="http://www.apache.org/security"/>
     <java      href="http://lucene.apache.org/java/" />
     <lucy      href="http://incubator.apache.org/lucy/" />
     <orp      href="http://lucene.apache.org/openrelevance/" />
Index: src/documentation/content/xdocs/index.xml
===================================================================
--- src/documentation/content/xdocs/index.xml	(revision 1032587)
+++ src/documentation/content/xdocs/index.xml	(working copy)
@@ -6,46 +6,50 @@
 <document> 
 
   <header> 
-    <title>Welcome to Lucene!</title> 
+    <title>Welcome to Apache Lucene!</title> 
   </header> 
 
   <body> 
 
     <section>
-      <title>What Is Lucene?</title>
+      <title>What Is Apache Lucene?</title>
 
       <p>
-      The Apache Lucene project develops open-source search software,
+      The Apache Lucene(TM) project develops open-source search software,
       including:
       </p>
 
       <ul>
-      <li><a href="ext:java"><strong>Lucene Java</strong></a>, our
-      flagship sub-project, provides Java-based indexing and search
-      technology, as well as spellchecking, hit highlighting and advanced analysis/tokenization capabilities.</li>
-      <li><a href="ext:solr"><strong>Solr</strong></a> is our
+      <li><a href="ext:java"><strong>Apache Lucene Java</strong></a>(TM), our
+      flagship sub-project, provides a Java-based indexing and search
+/bin/bash: flagship: command not found
+      implementation, as well as spellchecking, hit highlighting and advanced analysis/tokenization capabilities.</li>
+      <li><a href="ext:solr"><strong>Apache Solr</strong></a>(TM) is our
 	high performance enterprise search server, with XML/HTTP and JSON/Python/Ruby
-	APIs, hit highlighting, faceted search, caching, replication, database integration, 
+	APIs, hit highlighting, faceted search, caching, replication, distributed search, database integration, 
   web admin and search interfaces.</li>
-  <li><a href="ext:lucene.net"><strong>Lucene.Net</strong></a> 
+  <li><a href="ext:lucene.net"><strong>Apache Lucene.Net</strong></a>(TM)
 	    is a source code, class-per-class, API-per-API and algorithmatic 
         port of the <a href="ext:java"><strong>Lucene Java</strong></a> 
         search engine to the C# and .NET platform utilizing Microsoft .NET 
         Framework. Lucene.Net is currently under incubation.
       </li>
-     <li><a href="ext:pylucene"><strong>PyLucene</strong></a> is a Python port of the
+     <li><a href="ext:pylucene"><strong>Apache PyLucene</strong></a>(TM) is a Python port of the
 the <a href="ext:java">Lucene Java</a> project.</li>
-   	<li><a href="ext:orp"><strong>Open Relevance Project</strong></a> is a subproject with the aim of collecting and distributing free materials for
+   	<li><a href="ext:orp"><strong>Apache Open Relevance Project</strong></a>(TM) is a subproject with the aim of collecting and distributing free materials for
 	relevance testing and performance.</li>
  
-      <li><a href="ext:lucy"><strong>Lucy</strong></a> is a loose C 
+      <li><a href="ext:lucy"><strong>Apache Lucy</strong></a>(TM) is a loose C 
       port of <a href="ext:java">Lucene Java</a>, with Perl and Ruby 
       bindings, currently in incubation.</li>
 
-    	<li><a href="ext:droids"><strong>Droids</strong></a> is an intelligent robot crawling framework currently in incubation.</li>
+    	<li><a href="ext:droids"><strong>Apache Droids</strong></a>(TM) is an intelligent robot crawling framework currently in incubation.</li>
       </ul>
 
     </section>
+    <section><title>The Apache Software Foundation</title>
+		<p>The <a href="ext:asf">Apache Software Foundation</a> provides support for the Apache community of open-source software projects.  The Apache projects are defined by collaborative consensus based processes, an open, pragmatic software license and a desire to create high quality software that leads the way in its field.  Apache Lucene, Apache Solr, Apache Lucene.NET, Apache PyLucene, Apache Open Relevance Project, Apache Lucy and Apache Droids and their respective logos are trademarks of The Apache Software Foundation.  All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+	</section>
 
     <section>
       <title>News</title>
@@ -414,139 +418,7 @@
 	            Maven artifacts are available 
 	            <a href="http://repo1.maven.org/maven2/org/apache/lucene/">here</a>.
 	          </p>
-            </section>
-      
-		<section>
-			<title>14 August 2009 - Lucene at US ApacheCon</title>
-			<p>
-	         <a title="ApacheCon US 2009" href="http://www.us.apachecon.com/c/acus2009/"><img src="http://www.apache.org/events/current-event-125x125.png" class="float-right" alt="ApacheCon Logo" /></a>
-
-	         ApacheCon US is once again in the Bay Area and Lucene is coming along for the ride!  The Lucene community has planned two full days of talks, plus a meetup and the usual bevy of training.  With a well-balanced mix of first time and veteran ApacheCon speakers, the <a href="http://www.us.apachecon.com/c/acus2009/schedule#lucene">Lucene track</a> at ApacheCon US promises to have something for everyone.  Be sure not to miss:
-	        </p>
-<p>	Training:</p>
-	        <ul>
-	         <li><a href="http://www.us.apachecon.com/c/acus2009/sessions/437">Lucene Boot Camp</a> - A two day training session, Nov. 2nd &amp; 3rd</li>
-	         <li><a href="http://www.us.apachecon.com/c/acus2009/sessions/375">Solr Day</a> - A one day training session, Nov. 2nd</li>
-			</ul>
-			<p>Thursday, Nov. 5th</p>
-			<ul>
-	         <li><a href="http://www.us.apachecon.com/c/acus2009/sessions/428">Introduction to the Lucene Ecosystem</a> - Grant Ingersoll @ 9:00</li>
-	         <li><a href="http://www.us.apachecon.com/c/acus2009/sessions/461">Lucene Basics and New Features</a> - Michael Busch @ 10:00</li>
-			 <li><a href="http://www.us.apachecon.com/c/acus2009/sessions/331">Apache Solr: Out of the Box</a> - Chris Hostetter @ 14:00</li>
-			<li><a href="http://www.us.apachecon.com/c/acus2009/sessions/427">Introduction to Nutch</a> - Andrzej Bialecki @ 15:00</li>
-			<li><a href="http://www.us.apachecon.com/c/acus2009/sessions/430">Lucene and Solr Performance Tuning</a> - Mark Miller @ 16:30</li>
-	        </ul>
-			<p>Friday, Nov. 6th</p>
-			<ul>
-				<li><a href="http://www.us.apachecon.com/c/acus2009/sessions/332">Implementing an Information Retrieval Framework for an Organizational Repository</a> - Sithu D Sudarsan @ 9:00</li>
-				<li><a href="http://www.us.apachecon.com/c/acus2009/sessions/333">Apache Mahout - Going from raw data to Information</a> - Isabel Drost @ 10:00</li>
-				<li><a href="http://www.us.apachecon.com/c/acus2009/sessions/334">MIME Magic with Apache Tika</a> - Jukka Zitting @ 11:30</li>
-				<li><a href="http://www.us.apachecon.com/c/acus2009/sessions/335">Building Intelligent Search Applications with the Lucene Ecosystem</a> - Ted Dunning @ 14:00</li>
-				<li><a href="http://www.us.apachecon.com/c/acus2009/sessions/462">Realtime Search</a> - Jason Rutherglen @ 15:00</li>
-			</ul>
-		</section>
-		<section>
-			<title>25 June 2009 - Apache Open Relevance Kickoff</title>
-			<p>The Apache Lucene PMC has officially voted to add the Open Relevance Project (ORP) as a Lucene subproject.  ORP's main goal is to build out collections, judgments and queries in an open environment to make it easier for Lucene developers and users to do relevance testing, much like one would get if using <a href="http://trec.nist.gov">TREC</a> or
-			other evaluation conferences.</p>
-			<p>See <a href="http://lucene.apache.org/openrelevance">http://lucene.apache.org/openrelevance</a> for more info</p>
-		</section>
-		<section>
-			<title>07 April 2009 - Apache Mahout 0.1 released</title>
-			<p>The Apache Lucene project is pleased to announce the release of Apache Mahout 0.1.
-			Apache Mahout is a subproject of Apache Lucene with the goal of delivering scalable
-			machine learning algorithm implementations under the Apache license.  The first public
-			release includes implementations for clustering, classification,
-			collaborative filtering and evolutionary programming.
-		</p><p>
-			Highlights include:
-			</p>
-			<ul>
-			<li>Taste Collaborative Filtering</li>
-			<li>Several distributed clustering implementations: k-Means, Fuzzy k-Means, Dirchlet, Mean-Shift and Canopy</li>
-			<li>Distributed Naive Bayes and Complementary Naive Bayes classification implementations</li>
-			<li>Distributed fitness function implementation for the Watchmaker evolutionary programming library</li>
-			<li>Most implementations are built on top of Apache Hadoop (http://hadoop.apache.org) for scalability</li>
-			</ul>
-			<p>More info is available on the Mahout <a href="http://lucene.apache.org/mahout">website</a>.</p>
-		</section>
-        <section>
-          <title>9 March 2009 - Lucene Java 2.4.1 available</title>
-              <p>
-                This release contains fixes for bugs found in 2.4.0,
-                including one data loss bug
-                (<a href="https://issues.apache.org/jira/browse/LUCENE-1452">LUCENE-1452</a>)
-                where in certain situations binary fields would be
-                truncated to 0 bytes.
-              </p>
-              <p>
-                See <a href="http://lucene.apache.org/java/2_4_1/changes/Changes.html">CHANGES</a> for details.
-              </p>
-              <p>
-                2.4.1 does not contain any new features, API or file format changes,
-                which makes it fully compatible with 2.4.0.
-              </p>
-              <p>
-                Binary and source distributions are available
-                <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">here</a>.
-              </p>
-              <p>
-                Maven artifacts are available 
-                <a href="http://repo1.maven.org/maven2/org/apache/lucene/">here</a>.
-              </p>
-            </section>
-
-		<section>
-		  <title>09 February 2009 - Lucene at ApacheCon Europe 2009 in Amsterdam</title>
-			<p>
-	         <a title="ApacheCon EU 2009" href="http://www.eu.apachecon.com/c/aceu2009/"><img src="http://www.eu.apachecon.com/page_attachments/0000/0115/125x125_basic.gif" class="float-right" alt="ApacheCon EU 2009 Logo" /></a>
-
-	         Lucene will be extremely well represented at 
-	         <a href="http://us.apachecon.com/c/acus2008/">ApacheCon EU 2009</a> 
-	         in Amsterdam, Netherlands this March 23-27, 2009:  
-	        </p>
-	        <ul>
-	         <li><a href="http://eu.apachecon.com/c/aceu2009/sessions/197">Lucene Boot Camp</a> - A two day training session, March 23 &amp; 24th</li>
-	         <li><a href="http://eu.apachecon.com/c/aceu2009/sessions/201">Solr Boot Camp</a> - A one day training session, March 24th</li>
-	         <li><a href="http://eu.apachecon.com/c/aceu2009/sessions/136">Introducing Apache Mahout</a> - Grant Ingersoll. March 25th @ 10:30</li>
-	         <li><a href="http://eu.apachecon.com/c/aceu2009/sessions/137">Lucene/Solr Case Studies</a> - Erik Hatcher. March 25th @ 11:30</li>
-	         <li><a href="http://eu.apachecon.com/c/aceu2009/sessions/138">Advanced Indexing Techniques with Apache Lucene</a> - Michael Busch. March 25th @ 14:00</li>	
-		    <li><a href="http://eu.apachecon.com/c/aceu2009/sessions/251">Apache Solr - A Case Study</a> - Uri Boness. March 26th @ 17:30</li>
-    	    <li><a href="http://eu.apachecon.com/c/aceu2009/sessions/250">Best of breed - httpd, forrest, solr and droids</a> - Thorsten Scherler. March 27th @ 17:30</li>
-    	    <li><a href="http://eu.apachecon.com/c/aceu2009/sessions/165">Apache Droids - an intelligent standalone robot framework</a> - Thorsten Scherler. March 26th @ 15:00</li>
-
-	        </ul>
-	
-		</section>
-		
-		<section>
-		  <title>19 January 2009 - PyLucene joins the Lucene TLP</title>
-			<p><a href="http://lucene.apache.org/pylucene">PyLucene</a>, the Python based port of Lucene is now an official Lucene subproject.</p>
-		</section>
-        <section>
-          <title>8 October 2008 - Lucene Java 2.4.0 available</title>
-          <p>
-            Lucene 2.4.0 is available for public download.  This version contains many enhancements and bug fixes.  See
-            <a href="http://lucene.apache.org/java/2_4_0/changes/Changes.html">CHANGES</a> for details.
-          </p>
-          <p>
-            Binary and source distributions are available
-            <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">here</a>.
-          </p>
-          <p>
-            Maven artifacts are available 
-            <a href="http://repo1.maven.org/maven2/org/apache/lucene/">here</a>.
-          </p>
-        </section>
-
-		<section><title>15 September 2008 - Solr 1.3.0 Available</title>
-			<p>Solr 1.3.0 is available for public download.  This version contains many enhancements and bug fixes, including distributed search capabilities,
-				Lucene 2.3.x performance improvements and many others.
-			</p>
-			<p>See the <a href="http://svn.apache.org/repos/asf/lucene/solr/tags/release-1.3.0/CHANGES.txt">release notes</a> for more details.  Download is
-	    available from a <a href="http://www.apache.org/dyn/closer.cgi/lucene/solr/">Apache Mirror</a>.</p>
-	    </section>
-      
+            </section>      
     </section>
 
   </body>
