You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by bu...@apache.org on 2012/01/31 15:24:21 UTC

svn commit: r803649 [3/3] - in /websites/staging/lucene/trunk/content: ./ core/ openrelevance/ pylucene/ pylucene/jcc/ solr/

Modified: websites/staging/lucene/trunk/content/solr/tutorial.html
==============================================================================
--- websites/staging/lucene/trunk/content/solr/tutorial.html (original)
+++ websites/staging/lucene/trunk/content/solr/tutorial.html Tue Jan 31 14:24:19 2012
@@ -1,12 +1,7 @@
 <!-- solr-simple.html -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
 
 <head>
   <!--
-       solr.html
-
       Licensed to the Apache Software Foundation (ASF) under one or more
       contributor license agreements.  See the NOTICE file distributed with
       this work for additional information regarding copyright ownership.
@@ -22,7 +17,11 @@
       See the License for the specific language governing permissions and
       limitations under the License.
   -->
-  <link href="../css/solr.css" rel="stylesheet" type="text/css">
+
+  
+    <link href="../css/global.css" rel="stylesheet" type="text/css">
+    <link href="../css/solr.css" rel="stylesheet" type="text/css">
+
   <title>Apache Lucene - Solr Tutorial</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
@@ -31,20 +30,23 @@
   <meta name="keywords"
         content="apache, apache lucene, apache solr, solr, lucene
         search, information retrieval, spell checking, faceting, inverted index, open source"/>
-  <link rel="shortcut icon" type="image/x-icon" href="../images/favicon.ico"/>
-  <script type="text/javascript" src="../scripts/prototype.js"></script>
-  <script type="text/javascript" src="../scripts/effects.js"></script>
-  <script type="text/javascript" src="../scripts/search.js"></script>
-  <script type="text/javascript" src="../scripts/slides.js"></script>
-  <!--<script type="text/javascript" src="../scripts/jquery.js"></script>-->
+
+  <link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico"/>
+  <script type="text/javascript" src="scripts/prototype.js"></script>
+<script type="text/javascript" src="scripts/effects.js"></script>
+<script type="text/javascript" src="scripts/search.js"></script>
+<script type="text/javascript" src="scripts/slides.js"></script>
+<!--<script type="text/javascript" src="scripts/jquery.js"></script>-->
 </head>
 
+
 <body id="home">
 <div id="wrap">
   <div id="header">
     <div id="logo">
       
-  <a href="index.html"><img border="0" width="250" height="137" src="../images/solr.png" alt="Solr Logo"/></a>
+  <a href="index.html"><img border="0" width="250" height="137" src="../images/solr.png"
+                                              alt="Solr Logo"/></a>
 
     </div>
     <div id="search">
@@ -111,7 +113,7 @@
 </div>
     <div id="nav">
       
-<ul>
+  <ul>
   <li><a href="index.html">Solr</a></li>
   <li><a href="downloads.html">Download</a></li>
   <li><a href="documentation.html">Documentation</a></li>
@@ -121,71 +123,82 @@
   <li><a class="last" href="../">Lucene</a></li>
 </ul>
 
+
     </div>
     
+  
 <div id="slides">
-      <div class="slideshow" id="mantleSlides">
-        <div id="slide1" >
-          <div class="callout">
-            Ultra-fast Lucene-based Search Server<br/>
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr offers Lucene's capabilities in an easy to use,
-            fast search server with additional features like faceting, scalability and much more
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Solr" src="../images/mantle-solr.png"/>
-          </div>
+  <div class="slideshow" id="mantleSlides">
+    <div id="slide1">
+      <div class="callout">
+        Ultra-fast Lucene-based Search Server<br/>
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          Apache Solr offers Lucene's capabilities in an easy to use,
+          fast search server with additional features like faceting, scalability and much more
         </div>
-        <div id="slide2" style="display:none">
-          <div class="callout">
-            Proven search capabilities<br/>
-          </div>
-          <div class="descwrapper"><div class="description">
-            The Solr search server powers a wide range of applications such as Netflix, AOL, CNET, Zappos and many more
-          </div></div>
-          <div class="mantle">
-            <img alt="Solr Power" src="../images/mantle-power.png"/>
-          </div>
+      </div>
+      <div class="mantle">
+        <img alt="Apache Solr" src="../images/mantle-solr.png"/>
+      </div>
+    </div>
+    <div id="slide2" style="display:none">
+      <div class="callout">
+        Proven search capabilities<br/>
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          The Solr search server powers a wide range of applications such as Netflix, AOL, CNET, Zappos and many more
         </div>
-        <div id="slide3" style="display:none">
-          <div class="callout">
-            Scalable
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr has been deployed successfully in both high query volume
-            situations and
-            large collection sizes
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Solr community" src="../images/mantle-scale.png"/>
-          </div>
+      </div>
+      <div class="mantle">
+        <img alt="Solr Power" src="../images/mantle-power.png"/>
+      </div>
+    </div>
+    <div id="slide3" style="display:none">
+      <div class="callout">
+        Scalable
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          Apache Solr has been deployed successfully in both high query volume
+          situations and
+          large collection sizes
         </div>
-        <div id="slide4" style="display:none">
-          <div class="callout">
-            Apache 2.0 licensed
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr is distributed under a commercially friendly Apache Software license
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Software Foundation" src="../images/mantle-asf.png"/>
-          </div>
+      </div>
+      <div class="mantle">
+        <img alt="Apache Solr community" src="../images/mantle-scale.png"/>
+      </div>
+    </div>
+    <div id="slide4" style="display:none">
+      <div class="callout">
+        Apache 2.0 licensed
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          Apache Solr is distributed under a commercially friendly Apache Software license
         </div>
       </div>
-      <div class="controls">
-        <a class="next" id="next" title="Next" href="#">Next</a>
-        <a class="previous" id="previous" title="Previous" href="#">Previous</a>
-        <a class="start" id="start" title="Start" href="#" style="display: none; ">Start</a>
-        <a class="stop" id="stop" title="Stop" href="#">Stop</a>
+      <div class="mantle">
+        <img alt="Apache Software Foundation" src="../images/mantle-asf.png"/>
       </div>
     </div>
-    <script type="text/javascript">
-      function StartSlides() {
-        new Slides('mantleSlides');
-      }
-      document.observe('dom:loaded', StartSlides);
-    </script>
+  </div>
+  <div class="controls">
+    <a class="next" id="next" title="Next" href="#">Next</a>
+    <a class="previous" id="previous" title="Previous" href="#">Previous</a>
+    <a class="start" id="start" title="Start" href="#" style="display: none; ">Start</a>
+    <a class="stop" id="stop" title="Stop" href="#">Stop</a>
+  </div>
+</div>
+<script type="text/javascript">
+  function StartSlides() {
+    new Slides('mantleSlides');
+  }
+  document.observe('dom:loaded', StartSlides);
+</script>
+
 
   </div>
   <div id="content-wrap" class="clearfix">
@@ -505,50 +518,15 @@ Explore the <a href="http://wiki.apache.
 more details about Solr's many
 <a href="features.html">features</a>.</p>
 <p>Have Fun, and we'll see you on the Solr mailing lists!</p></div>
-      <div><h1 id="solr_news">Solr News</h1>
-<h2 id="28_july_2011_-_warning_index_corruption_and_crashes_in_apache_lucene_core__apache_solr_with_java_7">28 July 2011 - WARNING: Index corruption and crashes in Apache Lucene Core / Apache Solr with Java 7</h2>
-<p>Oracle released <a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">Java 7</a> today.
-Unfortunately it contains hotspot compiler optimizations, which miscompile some loops.
-This can affect code of several Apache projects. Sometimes JVMs only crash, but in several cases,
-results calculated can be incorrect, leading to bugs in applications
-(see Hotspot bugs <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7070134">7070134</a>,
-<a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7044738">7044738</a>,
-<a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7068051">7068051</a>).
-<strong>Apache Lucene Core</strong> and <strong>Apache Solr</strong> are two Apache projects,
-which are affected by these bugs, namely all versions released until today.
-Solr users with the default configuration will have
-Java crashing with <code>SIGSEGV</code> as soon as they start to index documents, as one
-affected part is the well-known Porter stemmer
-(see <a href="https://issues.apache.org/jira/browse/LUCENE-3335">LUCENE-3335</a>).
-Other loops in Lucene may be miscompiled, too, leading to index corruption
-(especially on Lucene trunk with pulsing codec; other loops may be
-affected, too - <a href="https://issues.apache.org/jira/browse/LUCENE-3346">LUCENE-3346</a>).
-These problems were detected only 5 days before the official Java 7 release,
-so Oracle had no time to fix those bugs, affecting also many more applications.
-In response to our questions, they proposed to include the fixes into service
-release u2 (eventually into service release u1, see
-<a href="http://mail.openjdk.java.net/pipermail/hotspot-compiler-dev/2011-July/005971.html">this mail</a>).
-<strong>This means you cannot use Apache Lucene/Solr with Java 7 releases before Update 2!</strong>
-If you do, please don't open bug reports, it is not the committers' fault!
-At least disable loop optimizations using the <code>-XX:-UseLoopPredicate</code> JVM option
-to not risk index corruptions.
-<em>Please note:</em> Also Java 6 users are affected, if they use one of those
-JVM options, which are <strong>not</strong> enabled by default: <code>-XX:+OptimizeStringConcat</code>
-or <code>-XX:+AggressiveOpts</code>.
-It is strongly recommended not to use any hotspot optimization switches in any Java
-version without extensive testing!
-In case you upgrade to Java 7, remember that you may have to reindex, as the unicode
-version shipped with Java 7 changed and tokenization behaves differently
-(e.g. lowercasing). For more information, read <code>JRE_VERSION_MIGRATION.txt</code>
-in your distribution package!</p></div>
       
-      <div><h2 id="the_apache_software_foundation">The Apache Software Foundation</h2>
-<p>The <a href="http://www.apache.org">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 PyLucene, Apache Open Relevance Project 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></div>
+
+
       
     </div>
     
-    <div id="sidebar">
-      <span class="sidenav"><h1 id="resources">Resources</h1>
+    
+<div id="sidebar">
+  <span class="sidenav"><h1 id="resources">Resources</h1>
 <ul>
 <li><a href="./features.html">Features</a></li>
 <li><a href="./tutorial.html">Tutorial</a></li>
@@ -577,25 +555,35 @@ in your distribution package!</p></div>
 <li><a href="http://tika.apache.org">Apache Tika</a></li>
 <li><a href="http://zookeeper.apache.org">Apache Zookeeper</a></li>
 </ul>
-        <div class="status">
-          <div id="svn">
-            <h1>Latest SVN</h1>
-            <div class="status-item">
-            </div></div>
-          <div id="jira">
-            <h1>Latest JIRA</h1>
-            <div class="status-item"></div></div>
-          <div id="dev-mail">
-            <h1>Latest Dev</h1>
-            <div class="status-item"></div>
-          </div>
-          <div id="solr-user-mail">
-            <h1>Latest Solr User</h1>
-            <div class="status-item"></div>
-          </div>
+    <div class="status">
+      <div id="svn">
+        <h1>Latest SVN</h1>
+
+        <div class="status-item">
+          
+        </div>
+      </div>
+      <div id="jira">
+        <h1>Latest JIRA</h1>
+
+        <div class="status-item">
+        </div>
+      </div>
+      <div id="dev-mail">
+        <h1>Latest Dev</h1>
+
+        <div class="status-item">
+        </div>
+      </div>
+      <div id="solr-user-mail">
+        <h1>Latest Solr User</h1>
+
+        <div class="status-item">
         </div>
-      </span>
+      </div>
     </div>
+  </span>
+</div>
 
   </div>
   <div id="footer">
@@ -611,18 +599,5 @@ in your distribution package!</p></div>
   </div>
 </div>
 </div>
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-94576-12']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
 
-</script>
-</body>
-</html>
+</body>
\ No newline at end of file

Modified: websites/staging/lucene/trunk/content/solr/versioncontrol.html
==============================================================================
--- websites/staging/lucene/trunk/content/solr/versioncontrol.html (original)
+++ websites/staging/lucene/trunk/content/solr/versioncontrol.html Tue Jan 31 14:24:19 2012
@@ -1,12 +1,7 @@
 <!-- solr-simple.html -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
 
 <head>
   <!--
-       solr.html
-
       Licensed to the Apache Software Foundation (ASF) under one or more
       contributor license agreements.  See the NOTICE file distributed with
       this work for additional information regarding copyright ownership.
@@ -22,7 +17,11 @@
       See the License for the specific language governing permissions and
       limitations under the License.
   -->
-  <link href="../css/solr.css" rel="stylesheet" type="text/css">
+
+  
+    <link href="../css/global.css" rel="stylesheet" type="text/css">
+    <link href="../css/solr.css" rel="stylesheet" type="text/css">
+
   <title>Apache Lucene - </title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
@@ -31,20 +30,23 @@
   <meta name="keywords"
         content="apache, apache lucene, apache solr, solr, lucene
         search, information retrieval, spell checking, faceting, inverted index, open source"/>
-  <link rel="shortcut icon" type="image/x-icon" href="../images/favicon.ico"/>
-  <script type="text/javascript" src="../scripts/prototype.js"></script>
-  <script type="text/javascript" src="../scripts/effects.js"></script>
-  <script type="text/javascript" src="../scripts/search.js"></script>
-  <script type="text/javascript" src="../scripts/slides.js"></script>
-  <!--<script type="text/javascript" src="../scripts/jquery.js"></script>-->
+
+  <link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico"/>
+  <script type="text/javascript" src="scripts/prototype.js"></script>
+<script type="text/javascript" src="scripts/effects.js"></script>
+<script type="text/javascript" src="scripts/search.js"></script>
+<script type="text/javascript" src="scripts/slides.js"></script>
+<!--<script type="text/javascript" src="scripts/jquery.js"></script>-->
 </head>
 
+
 <body id="home">
 <div id="wrap">
   <div id="header">
     <div id="logo">
       
-  <a href="index.html"><img border="0" width="250" height="137" src="../images/solr.png" alt="Solr Logo"/></a>
+  <a href="index.html"><img border="0" width="250" height="137" src="../images/solr.png"
+                                              alt="Solr Logo"/></a>
 
     </div>
     <div id="search">
@@ -111,7 +113,7 @@
 </div>
     <div id="nav">
       
-<ul>
+  <ul>
   <li><a href="index.html">Solr</a></li>
   <li><a href="downloads.html">Download</a></li>
   <li><a href="documentation.html">Documentation</a></li>
@@ -121,71 +123,82 @@
   <li><a class="last" href="../">Lucene</a></li>
 </ul>
 
+
     </div>
     
+  
 <div id="slides">
-      <div class="slideshow" id="mantleSlides">
-        <div id="slide1" >
-          <div class="callout">
-            Ultra-fast Lucene-based Search Server<br/>
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr offers Lucene's capabilities in an easy to use,
-            fast search server with additional features like faceting, scalability and much more
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Solr" src="../images/mantle-solr.png"/>
-          </div>
+  <div class="slideshow" id="mantleSlides">
+    <div id="slide1">
+      <div class="callout">
+        Ultra-fast Lucene-based Search Server<br/>
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          Apache Solr offers Lucene's capabilities in an easy to use,
+          fast search server with additional features like faceting, scalability and much more
         </div>
-        <div id="slide2" style="display:none">
-          <div class="callout">
-            Proven search capabilities<br/>
-          </div>
-          <div class="descwrapper"><div class="description">
-            The Solr search server powers a wide range of applications such as Netflix, AOL, CNET, Zappos and many more
-          </div></div>
-          <div class="mantle">
-            <img alt="Solr Power" src="../images/mantle-power.png"/>
-          </div>
+      </div>
+      <div class="mantle">
+        <img alt="Apache Solr" src="../images/mantle-solr.png"/>
+      </div>
+    </div>
+    <div id="slide2" style="display:none">
+      <div class="callout">
+        Proven search capabilities<br/>
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          The Solr search server powers a wide range of applications such as Netflix, AOL, CNET, Zappos and many more
         </div>
-        <div id="slide3" style="display:none">
-          <div class="callout">
-            Scalable
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr has been deployed successfully in both high query volume
-            situations and
-            large collection sizes
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Solr community" src="../images/mantle-scale.png"/>
-          </div>
+      </div>
+      <div class="mantle">
+        <img alt="Solr Power" src="../images/mantle-power.png"/>
+      </div>
+    </div>
+    <div id="slide3" style="display:none">
+      <div class="callout">
+        Scalable
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          Apache Solr has been deployed successfully in both high query volume
+          situations and
+          large collection sizes
         </div>
-        <div id="slide4" style="display:none">
-          <div class="callout">
-            Apache 2.0 licensed
-          </div>
-          <div class="descwrapper"><div class="description">
-            Apache Solr is distributed under a commercially friendly Apache Software license
-          </div></div>
-          <div class="mantle">
-            <img alt="Apache Software Foundation" src="../images/mantle-asf.png"/>
-          </div>
+      </div>
+      <div class="mantle">
+        <img alt="Apache Solr community" src="../images/mantle-scale.png"/>
+      </div>
+    </div>
+    <div id="slide4" style="display:none">
+      <div class="callout">
+        Apache 2.0 licensed
+      </div>
+      <div class="descwrapper">
+        <div class="description">
+          Apache Solr is distributed under a commercially friendly Apache Software license
         </div>
       </div>
-      <div class="controls">
-        <a class="next" id="next" title="Next" href="#">Next</a>
-        <a class="previous" id="previous" title="Previous" href="#">Previous</a>
-        <a class="start" id="start" title="Start" href="#" style="display: none; ">Start</a>
-        <a class="stop" id="stop" title="Stop" href="#">Stop</a>
+      <div class="mantle">
+        <img alt="Apache Software Foundation" src="../images/mantle-asf.png"/>
       </div>
     </div>
-    <script type="text/javascript">
-      function StartSlides() {
-        new Slides('mantleSlides');
-      }
-      document.observe('dom:loaded', StartSlides);
-    </script>
+  </div>
+  <div class="controls">
+    <a class="next" id="next" title="Next" href="#">Next</a>
+    <a class="previous" id="previous" title="Previous" href="#">Previous</a>
+    <a class="start" id="start" title="Start" href="#" style="display: none; ">Start</a>
+    <a class="stop" id="stop" title="Stop" href="#">Stop</a>
+  </div>
+</div>
+<script type="text/javascript">
+  function StartSlides() {
+    new Slides('mantleSlides');
+  }
+  document.observe('dom:loaded', StartSlides);
+</script>
+
 
   </div>
   <div id="content-wrap" class="clearfix">
@@ -212,50 +225,15 @@
   <a href="https://svn.apache.org/repos/asf/lucene/dev/">https://svn.apache.org/repos/asf/lucene/dev/</a>.
   Instructions for committer SVN access are 
   <a href="http://www.apache.org/dev/version-control.html#https-svn">here</a>.</p></div>
-      <div><h1 id="solr_news">Solr News</h1>
-<h2 id="28_july_2011_-_warning_index_corruption_and_crashes_in_apache_lucene_core__apache_solr_with_java_7">28 July 2011 - WARNING: Index corruption and crashes in Apache Lucene Core / Apache Solr with Java 7</h2>
-<p>Oracle released <a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">Java 7</a> today.
-Unfortunately it contains hotspot compiler optimizations, which miscompile some loops.
-This can affect code of several Apache projects. Sometimes JVMs only crash, but in several cases,
-results calculated can be incorrect, leading to bugs in applications
-(see Hotspot bugs <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7070134">7070134</a>,
-<a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7044738">7044738</a>,
-<a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7068051">7068051</a>).
-<strong>Apache Lucene Core</strong> and <strong>Apache Solr</strong> are two Apache projects,
-which are affected by these bugs, namely all versions released until today.
-Solr users with the default configuration will have
-Java crashing with <code>SIGSEGV</code> as soon as they start to index documents, as one
-affected part is the well-known Porter stemmer
-(see <a href="https://issues.apache.org/jira/browse/LUCENE-3335">LUCENE-3335</a>).
-Other loops in Lucene may be miscompiled, too, leading to index corruption
-(especially on Lucene trunk with pulsing codec; other loops may be
-affected, too - <a href="https://issues.apache.org/jira/browse/LUCENE-3346">LUCENE-3346</a>).
-These problems were detected only 5 days before the official Java 7 release,
-so Oracle had no time to fix those bugs, affecting also many more applications.
-In response to our questions, they proposed to include the fixes into service
-release u2 (eventually into service release u1, see
-<a href="http://mail.openjdk.java.net/pipermail/hotspot-compiler-dev/2011-July/005971.html">this mail</a>).
-<strong>This means you cannot use Apache Lucene/Solr with Java 7 releases before Update 2!</strong>
-If you do, please don't open bug reports, it is not the committers' fault!
-At least disable loop optimizations using the <code>-XX:-UseLoopPredicate</code> JVM option
-to not risk index corruptions.
-<em>Please note:</em> Also Java 6 users are affected, if they use one of those
-JVM options, which are <strong>not</strong> enabled by default: <code>-XX:+OptimizeStringConcat</code>
-or <code>-XX:+AggressiveOpts</code>.
-It is strongly recommended not to use any hotspot optimization switches in any Java
-version without extensive testing!
-In case you upgrade to Java 7, remember that you may have to reindex, as the unicode
-version shipped with Java 7 changed and tokenization behaves differently
-(e.g. lowercasing). For more information, read <code>JRE_VERSION_MIGRATION.txt</code>
-in your distribution package!</p></div>
       
-      <div><h2 id="the_apache_software_foundation">The Apache Software Foundation</h2>
-<p>The <a href="http://www.apache.org">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 PyLucene, Apache Open Relevance Project 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></div>
+
+
       
     </div>
     
-    <div id="sidebar">
-      <span class="sidenav"><h1 id="resources">Resources</h1>
+    
+<div id="sidebar">
+  <span class="sidenav"><h1 id="resources">Resources</h1>
 <ul>
 <li><a href="./features.html">Features</a></li>
 <li><a href="./tutorial.html">Tutorial</a></li>
@@ -284,25 +262,35 @@ in your distribution package!</p></div>
 <li><a href="http://tika.apache.org">Apache Tika</a></li>
 <li><a href="http://zookeeper.apache.org">Apache Zookeeper</a></li>
 </ul>
-        <div class="status">
-          <div id="svn">
-            <h1>Latest SVN</h1>
-            <div class="status-item">
-            </div></div>
-          <div id="jira">
-            <h1>Latest JIRA</h1>
-            <div class="status-item"></div></div>
-          <div id="dev-mail">
-            <h1>Latest Dev</h1>
-            <div class="status-item"></div>
-          </div>
-          <div id="solr-user-mail">
-            <h1>Latest Solr User</h1>
-            <div class="status-item"></div>
-          </div>
+    <div class="status">
+      <div id="svn">
+        <h1>Latest SVN</h1>
+
+        <div class="status-item">
+          
+        </div>
+      </div>
+      <div id="jira">
+        <h1>Latest JIRA</h1>
+
+        <div class="status-item">
+        </div>
+      </div>
+      <div id="dev-mail">
+        <h1>Latest Dev</h1>
+
+        <div class="status-item">
+        </div>
+      </div>
+      <div id="solr-user-mail">
+        <h1>Latest Solr User</h1>
+
+        <div class="status-item">
         </div>
-      </span>
+      </div>
     </div>
+  </span>
+</div>
 
   </div>
   <div id="footer">
@@ -318,18 +306,5 @@ in your distribution package!</p></div>
   </div>
 </div>
 </div>
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-94576-12']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
 
-</script>
-</body>
-</html>
+</body>
\ No newline at end of file

Modified: websites/staging/lucene/trunk/content/whoweare.html
==============================================================================
--- websites/staging/lucene/trunk/content/whoweare.html (original)
+++ websites/staging/lucene/trunk/content/whoweare.html Tue Jan 31 14:24:19 2012
@@ -1,11 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-
-
 <head>
   <!--
-         main.html
-
       Licensed to the Apache Software Foundation (ASF) under one or more
       contributor license agreements.  See the NOTICE file distributed with
       this work for additional information regarding copyright ownership.
@@ -33,12 +29,13 @@
         search, information retrieval, spell checking, faceting, inverted index, open source"/>
   <link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico"/>
   <script type="text/javascript" src="scripts/prototype.js"></script>
-  <script type="text/javascript" src="scripts/effects.js"></script>
-  <script type="text/javascript" src="scripts/search.js"></script>
-  <script type="text/javascript" src="scripts/slides.js"></script>
-  <!--<script type="text/javascript" src="scripts/jquery.js"></script>-->
+<script type="text/javascript" src="scripts/effects.js"></script>
+<script type="text/javascript" src="scripts/search.js"></script>
+<script type="text/javascript" src="scripts/slides.js"></script>
+<!--<script type="text/javascript" src="scripts/jquery.js"></script>-->
 </head>
 
+
 <body id="home">
 <div id="wrap">
   <div id="header">
@@ -247,6 +244,7 @@
 <p>Note that the email addresses above end with @apache.org. </p></div>
       
 
+
       
 
     </div>
@@ -298,18 +296,6 @@
   </div>
 </div>
 </div>
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-94576-12']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
 
-</script>
 </body>
 </html>