diff --git a/docs/benchmarks.html b/docs/benchmarks.html
index 967a654094c..9f021920fba 100644
--- a/docs/benchmarks.html
+++ b/docs/benchmarks.html
@@ -62,11 +62,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -100,25 +106,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
+<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
-<div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menupage">
 <div class="menupagetitle">Benchmarks</div>
@@ -144,86 +201,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
diff --git a/docs/contributions.html b/docs/contributions.html
index 71ca6e54682..a4f463d7b34 100644
--- a/docs/contributions.html
+++ b/docs/contributions.html
@@ -64,11 +64,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -102,25 +108,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
+<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
-<div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -146,86 +203,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
diff --git a/docs/demo.html b/docs/demo.html
index 11f1b7455b6..66b34290390 100644
--- a/docs/demo.html
+++ b/docs/demo.html
@@ -64,11 +64,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -102,25 +108,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">Documentation</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -146,86 +203,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
diff --git a/docs/demo2.html b/docs/demo2.html
index 67e0c6e78e1..225abdb4e41 100644
--- a/docs/demo2.html
+++ b/docs/demo2.html
@@ -64,11 +64,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -102,25 +108,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">Documentation</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -146,86 +203,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
diff --git a/docs/demo3.html b/docs/demo3.html
index 017499eaa97..57e0ccd52f0 100644
--- a/docs/demo3.html
+++ b/docs/demo3.html
@@ -64,11 +64,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -102,25 +108,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">Documentation</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -146,86 +203,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
diff --git a/docs/demo4.html b/docs/demo4.html
index afbab572b5d..afb48ed67e9 100644
--- a/docs/demo4.html
+++ b/docs/demo4.html
@@ -64,11 +64,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -102,25 +108,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">Documentation</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -146,86 +203,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
@@ -419,7 +398,7 @@ In time some of these things may be added to Lucene as features (if you've got a
 to hear it!), but for now: this is where you begin and the search engine/indexer ends.  Lastly, one
 would assume you'd want to follow the above advice and customize the application to look a little
 more fancy than black on white with "Lucene Template" at the top.  We'll see you on the Lucene
-Users' or Developers' <a href="mailinglists.html">mailing lists</a>!
+Users' or Developers' <a href="http://lucene.apache.org/java/docs/mailinglists.html">mailing lists</a>!
 </p>
 </div>
 
@@ -429,7 +408,7 @@ Users' or Developers' <a href="mailinglists.html">mailing lists</a>!
 <div class="section">
 <p>
 Please resist the urge to contact the authors of this document (without bribes of fame and fortune
-attached).  First contact the <a href="mailinglists.html">mailing lists</a>, taking care to <a href="http://www.catb.org/~esr/faqs/smart-questions.html">Ask Questions The Smart Way</a>.
+attached).  First contact the <a href="http://lucene.apache.org/java/docs/mailinglists.html">mailing lists</a>, taking care to <a href="http://www.catb.org/~esr/faqs/smart-questions.html">Ask Questions The Smart Way</a>.
 Certainly you'll get the most help that way as well.  That being said, feedback, and modifications
 to this document and samples are ever so greatly appreciated.  They are just best sent to the lists
 or <a href="http://wiki.apache.org/lucene-java/HowToContribute">posted as patches</a>, so that
diff --git a/docs/developer-resources.html b/docs/developer-resources.html
deleted file mode 100644
index 2245f27b72c..00000000000
--- a/docs/developer-resources.html
+++ /dev/null
@@ -1,454 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
-<meta name="Forrest-skin-name" content="pelt">
-<title>Apache Lucene - Developer Resources</title>
-<link type="text/css" href="skin/basic.css" rel="stylesheet">
-<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
-<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
-<link type="text/css" href="skin/profile.css" rel="stylesheet">
-<script src="skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="images/favicon.ico">
-</head>
-<body onload="init()">
-<script type="text/javascript">ndeSetTextSize();</script>
-<div id="top">
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
-</div>
-<!--+
-    |header
-    +-->
-<div class="header">
-<!--+
-    |start group logo
-    +-->
-<div class="grouplogo">
-<a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="http://www.apache.org/images/asf_logo_simple.png" title="Apache Lucene"></a>
-</div>
-<!--+
-    |end group logo
-    +-->
-<!--+
-    |start Project Logo
-    +-->
-<div class="projectlogo">
-<a href="http://lucene.apache.org/java/"><img class="logoImage" alt="Lucene" src="http://lucene.apache.org/images/lucene_green_300.gif" title="Apache Lucene is a high-performance, full-featured text search engine library written entirely in
-      Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform."></a>
-</div>
-<!--+
-    |end Project Logo
-    +-->
-<!--+
-    |start Search
-    +-->
-<div class="searchbox">
-<form action="http://www.google.com/search" method="get" class="roundtopsmall">
-<input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input name="Search" value="Search" type="submit">
-</form>
-</div>
-<!--+
-    |end search
-    +-->
-<!--+
-    |start Tabs
-    +-->
-<ul id="tabs">
-<li class="current">
-<a class="selected" href="index.html">Main</a>
-</li>
-<li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
-</li>
-</ul>
-<!--+
-    |end Tabs
-    +-->
-</div>
-</div>
-<div id="main">
-<div id="publishedStrip">
-<!--+
-    |start Subtabs
-    +-->
-<div id="level2tabs"></div>
-<!--+
-    |end Endtabs
-    +-->
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-
-             &nbsp;
-           </div>
-<!--+
-    |start Menu, mainarea
-    +-->
-<!--+
-    |start Menu
-    +-->
-<div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
-<div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
-</div>
-<div class="menuitem">
-<a href="features.html">Features</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
-</div>
-<div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
-<div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
-</div>
-<div class="menuitem">
-<a href="benchmarks.html">Benchmarks</a>
-</div>
-<div class="menuitem">
-<a href="contributions.html">Contributions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/LuceneFAQ">FAQ</a>
-</div>
-<div class="menuitem">
-<a href="fileformats.html">File Formats</a>
-</div>
-<div class="menuitem">
-<a href="gettingstarted.html">Getting Started</a>
-</div>
-<div class="menuitem">
-<a href="lucene-sandbox/index.html">Lucene Sandbox</a>
-</div>
-<div class="menuitem">
-<a href="queryparsersyntax.html">Query Syntax</a>
-</div>
-<div class="menuitem">
-<a href="scoring.html">Scoring</a>
-</div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.3', 'skin/')" id="menu_selected_1.3Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Resources</div>
-<div id="menu_selected_1.3" class="selectedmenuitemgroup" style="display: block;">
-<div class="menupage">
-<div class="menupagetitle">Developers</div>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
-</div>
-</div>
-<div id="credit"></div>
-<div id="roundbottom">
-<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
-<!--+
-  |alternative credits
-  +-->
-<div id="credit2"></div>
-</div>
-<!--+
-    |end Menu
-    +-->
-<!--+
-    |start content
-    +-->
-<div id="content">
-<div title="Portable Document Format" class="pdflink">
-<a class="dida" href="developer-resources.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
-        PDF</a>
-</div>
-<h1>Apache Lucene - Developer Resources</h1>
-<div id="minitoc-area">
-<ul class="minitoc">
-<li>
-<a href="#Making a Contribution">Making a Contribution</a>
-</li>
-<li>
-<a href="#Javadocs">Nightly Build Javadocs</a>
-</li>
-<li>
-<a href="#Downloads">Downloads</a>
-<ul class="minitoc">
-<li>
-<a href="#Clover">Clover Test Coverage Reports</a>
-</li>
-<li>
-<a href="#Hudson">Hudson</a>
-</li>
-<li>
-<a href="#Nightly">Nightly Build Download</a>
-</li>
-<li>
-<a href="#source">Source Code</a>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-
-<a name="N10011"></a><a name="Making a Contribution"></a>
-<h2 class="boxed">Making a Contribution</h2>
-<div class="section">
-<p>Lucene Java is always looking for contributions, especially in the areas of documentation.  See the <a href="http://wiki.apache.org/lucene-java">Wiki</a> for details on contributing. </p>
-</div>
-    <!-- <section id="Code Coverage"><title>Code Coverage</title>
-       <p>Code Coverage reports are available <a
-       href="">here</a></p>
-   </section> -->
-  
-<a name="N10020"></a><a name="Javadocs"></a>
-<h2 class="boxed">Nightly Build Javadocs</h2>
-<div class="section">
-<p>Unofficial Javadocs from the nightly build are available at:
-      <ul>
-        
-<li>
-<a href="api/index.html">All</a>
-</li>
-        
-<li>
-<a href="api/core/index.html">Core</a>
-</li>
-        
-<li>
-<a href="api/demo/index.html">Demo</a>
-</li>
-        
-<li>
-<ul>
-<li>
-<a href="api/contrib-analyzers/index.html">Analyzers</a>
-</li>
-        
-<li>
-<a href="api/contrib-ant/index.html">ANT</a>
-</li>
-        
-<li>
-<a href="api/contrib-bdb/index.html">BDB</a>
-</li>
-        
-<li>
-<a href="api/contrib-bdb-je/index.html">BDB-JE</a>
-</li>
-        
-<li>
-<a href="api/contrib-benchmark/index.html">Benchmark</a>
-</li>
-        
-<li>
-<a href="api/contrib-highlighter/index.html">Highlighter</a>
-</li>
-        
-<li>
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</li>
-        
-<li>
-<a href="api/contrib-memory/index.html">Memory</a>
-</li>
-        
-<li>
-<a href="api/contrib-misc/index.html">Misc.</a>
-</li>
-        
-<li>
-<a href="api/contrib-queries/index.html">Queries</a>
-</li>
-        
-<li>
-<a href="api/contrib-regex/index.html">Regex</a>
-</li>
-        
-<li>
-<a href="api/contrib-similarity/index.html">Similarity</a>
-</li>
-        
-<li>
-<a href="api/contrib-snowball/index.html">Snowball</a>
-</li>
-        
-<li>
-<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
-</li>
-        
-<li>
-<a href="api/contrib-surround/index.html">Surround</a>
-</li>
-        
-<li>
-<a href="api/contrib-swing/index.html">Swing</a>
-</li>
-          
-<li>
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</li>
-        
-<li>
-<a href="api/contrib-wordnet/index.html">Wordnet</a>
-</li>
-        
-<li>
-<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
-</li>
-</ul>
-</li>
-      
-</ul>
-    
-</p>
-</div>
-
-<a name="N1009C"></a><a name="Downloads"></a>
-<h2 class="boxed">Downloads</h2>
-<div class="section">
-<p>System Requirements are detailed <a href="systemrequirements.html">here</a>.</p>
-<a name="N100A8"></a><a name="Clover"></a>
-<h3 class="boxed">Clover Test Coverage Reports</h3>
-<p>
-            
-<a href="http://www.cenqua.com/clover/">Clover</a>
-            test coverage results are available
-            <a href="http://lucene.zones.apache.org:8080/hudson/job/Lucene-Nightly/lastSuccessfulBuild/artifact/trunk/build/test/clover/reports/index.html">here</a>
-            for the nightly build.
-        </p>
-<a name="N100B9"></a><a name="Hudson"></a>
-<h3 class="boxed">Hudson</h3>
-<p>
-      
-<a href="http://hudson.dev.java.net/">Hudson</a> is providing continuous integration capabilities to the Lucene
-      project.   It is responsible for running nightly builds, code coverage reports as well as building the nightly version
-      of the website.
-      </p>
-<a name="N100C6"></a><a name="Nightly"></a>
-<h3 class="boxed">Nightly Build Download</h3>
-<p>Nightly builds are based on the trunk version of the code checked into
-            <a href="https://svn.apache.org/repos/asf/lucene/java/trunk">SVN</a>
-        
-</p>
-<a href="http://lucene.zones.apache.org:8080/hudson/job/Lucene-Nightly/">Download via Hudson</a><a name="N100D8"></a><a name="source"></a>
-<h3 class="boxed">Source Code</h3>
-<p>The source files are now stored using Subversion (see http://subversion.tigris.org/ and http://svnbook.red-bean.com/)
-        </p>
-<p>
-            
-<span class="codefrag">svn checkout http://svn.apache.org/repos/asf/lucene/java/trunk lucene/java/trunk</span>
-        
-</p>
-</div>
-
-
-
-</div>
-<!--+
-    |end content
-    +-->
-<div class="clearboth">&nbsp;</div>
-</div>
-<div id="footer">
-<!--+
-    |start bottomstrip
-    +-->
-<div class="lastmodified">
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<div class="copyright">
-        Copyright &copy;
-         2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
-<!--+
-    |end bottomstrip
-    +-->
-</div>
-</body>
-</html>
diff --git a/docs/developer-resources.pdf b/docs/developer-resources.pdf
deleted file mode 100644
index b5a8492dfc3..00000000000
--- a/docs/developer-resources.pdf
+++ /dev/null
@@ -1,345 +0,0 @@
-%PDF-1.3
-%ª«¬­
-4 0 obj
-<< /Type /Info
-/Producer (FOP 0.20.5) >>
-endobj
-5 0 obj
-<< /Length 680 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gaua=c#T:-&:j43KoYjMWr@QZm5/Z9D.f;V97'K#-;5k/"ZV^T07n`8N#UP>.6^iaQJML?]95'DnE,T0_B8p%/jT+`%1pS_$rH]9+LZ?C+\5$)P+UZMol`";#IOaP,`K<YX&!T4.Smct_b5,KV;<`_VJ]A8>Ec(5%DIJU\oWo5-A21?T00t%7r7\jhT2^:7Qsk`1:8aXa[c[k4(Uff.&[uA,kA\9j5fpa9(1OpeQ&BE`Wa<^7`Y3VZ;GW\_DiP%@:/m8!q&;I[6MhV7?os$dLE[VG>m;+9qeUFkbm>o:D\YCPhHADa?2YH@JC7!k4(V%01GlePYVd8dhZNW`+sX[R83':q(4dirW40MaIe%I4MI_AW?80=bA:=qe&[3(o8mgmZ%t_-,/[JTSl!LhoXCY\%)"m,EMDa<YPR[`be9%L;1!/KJ".^pk'Z)O0*-Yl4=/q9U)t$+l$mBQHKgap"#Igs1BGO]H^^@ZC#A3AF.V(6T54)(':-atoo$\lgs7)jdBmI^aQCT-rS.<Zo*[ZZs)7:AS[5<@8+Ljqn>ee2qr894W<kYB5$e?u#=a8Mn28kNHNBOTKO@27`k?-gjrDBmK:#D<gfEm9N*UgT:4FK.4,G(*S<WemLmN=C>J4enV=A0#FB`>)Srh=rbh`=hU%_i>ZDs0MW!k`Zh]eWG%f~>
-endstream
-endobj
-6 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 5 0 R
-/Annots 7 0 R
->>
-endobj
-7 0 obj
-[
-8 0 R
-10 0 R
-12 0 R
-14 0 R
-16 0 R
-18 0 R
-20 0 R
-]
-endobj
-8 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 546.166 220.004 534.166 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 9 0 R
-/H /I
->>
-endobj
-10 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 527.966 222.668 515.966 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 11 0 R
-/H /I
->>
-endobj
-12 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 509.766 164.66 497.766 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 13 0 R
-/H /I
->>
-endobj
-14 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 491.566 269.144 479.566 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 15 0 R
-/H /I
->>
-endobj
-16 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 473.366 160.832 461.366 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 17 0 R
-/H /I
->>
-endobj
-18 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 455.166 242.84 443.166 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 19 0 R
-/H /I
->>
-endobj
-20 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 436.966 185.156 424.966 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 21 0 R
-/H /I
->>
-endobj
-22 0 obj
-<< /Length 1260 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gatm;9on$e&A@sBn<a2Y7O1ENoG6n-'.gFTZ?D?3D%Ep7[Y:PHLQ_&9^V1pcZ7(JZ[V0'af#W0-2fFG@d<%Qt5G*=q">i]65`k+eA?>Tl6(/?of#7UOdg%X"!ud7lLA2e3k5'g(b!\c/ON$;HA3-?q]oNJ8*gj,X!Ei3;"oL(&6:6<b7qB=[^V=7M27_]/AR7N3cUGAcltj2EeR`TT`P*sHq3q4Qjpu;Cm(E+KNfs`_&k+r6[)SU]@D(\Yk//&Gj-IugI1@P3INPkJ`M0:^EpB$_/6cgOB"uc+0QN)$ok(]EeIM-o;sIn=.>R58A!+kAA<oa!)QoDfhf#3iZc3%5'H0IZ,a<LMc2]sZ^(ntJ-\Neq=eT[3V(99#:$i)^cSC\U6GjtCs&s*2E+L$<.,\sTga]VU`HkJ;E_lF`>)kD!C0'1@P>Or+i0PqRJjqCB1FXVEqm-70e>lTsADZGDU;,)[:SQ"t0G`\&YZ<=8J=4Rrb.^mUii3V/EZ4Zts57-+K!?*^:+7QDVc7sb\%89l^p")%FCX`HX.>Wn3]=,pf1a@]Sc/gl?*2"`&)a.HUdH?/Oe:fS9H8>#RGLZoQq2IU6-RTkHT)A*n7a\41>cn(oB\r(fW3@hX;BF:$lCo=bLe0L*f?t:UKHH>jUq)t:/70IA$7YK7?q4%?l^^']u#0QK.4U,D\4e//5NL)^YC4THNffP>MN#OW'0*nTi[L^WK2u(LRloq"nV"7gOW8u#4cD&"pIZ4o$$gIk^C!`!s@f<B6HE31^Ao9bc=Og7<Ymd1,gs`]^gI!Am%If`^S=Vc>Sc9L9n!2#4#gtP*tU0g!=>(>R1ags7`D/3QD.HBd40i;nCGu;X&#^mlDF)PfTTjM-D-fi[&Gs#E85f&^F-O%9?,IK(&TR5VkE"T&.l'IBZnu"q:FR*mYHg`=Q4Jgf8#9Vf7=/E+9:,X(b@m[n7aXRU,&Peb1\RIqEK#FkCD,qpf>(P`&B3'QIOA0@?AFfP/40AU)J!*c]>Pi+/M7.rST2/\T8aB6JX<kg3u7m6)gVF4mgS<7$^u&n;[on%s@ZbOTgVS@$^(ikub,0=Pggef>_ql!:@,jmEd]H>dg@aks`gZl0-'NI0ahb%2gqWY_74F-XgD,_Die.M-f'^N@%n4E;rQ(:8q9]&YTCG^*A"c+k)dJpWLIY0:eVmUR77cKceDllk%inK<VlCYgL^2Cuhmp.V[TA!b^=c@'b'pETS>VUT"DI92^DGdJK!C$irj!3?kVBE~>
-endstream
-endobj
-23 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 22 0 R
->>
-endobj
-24 0 obj
-<< /Length 1033 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GatU29lo&3&A@sBE(jj^";9pn[jJ*'Ful0Pnat9%+PGBo;1o=uT)AJ[0=-Q':-'8RD&*9CmI&^tQa=fSg#UJ4U6YW49JV2+MW<@f1>[sC6:Pt91Sb1(-9iiDr<@l&/0tmCrY_QW5:9TkOC"X0MmkXDLZ$BD:cIMK5R=4nU6/ZK/LR?*7bicnDC^Wa7RK"Z6GLei*9)$0Z9@F<;nXlb3_-s4m)q,u,*"IF%'V;!nHb@()Kqc`^bE]sdgg>I(a,[Fj,I)D\WG@a:X)mNAQ>cL4=2R/<][]&Shn\OGp,gpV#ZQ["ib?:NN`"[<+6"/+QaHXij0YhCh#6oMe"dcr6iGu<+TT;JlA".HUHCb2=dl4X0jOOrBsN+EadfjmhZ%/>G:X'R*fB<Zj$Hk@([.aH$lI-),V9jB$]eiAY-l.%PBh$As<D*4E9@U'Ll8WTsENW!'H*XjL+d/&fA7=MR0;&?N(O-q6u[s\SM?/c"j_f8sM&)('s(P%Pp#)MAT)p;]qU8`nug)!JsPd+Hm^3[`FF.$t2%`)6ckaO5>84l<[##/`r**d+'<gZ+HXcqUbpLHG\8f_-tdhl2u@kk#u4LpVpW'HE1^-`SBY>5=@lo7M66+@6cYnWn)5&U8p1[-Nq;l#]iH?!ca+Hf*I&+"B3<%p_cbdH%E\oV)Y<:9'sD`X#*L\D+4unXtC2@Edq[(3,WU#k'[f.rKGmVQ'MV)]a=anC2p>=0NX"^i6lSo[ORMf`/`J=+n>udePgF:^6_fB,!(\CA2q`&iNQhOjf3(]B06fM(PZ.4ff"9."M%Y>AU?'5&,A*oqO0F]4`V@m!-i6K0F^m:f`BjG$&jUes7t#^BGI/t/;Z`=1[V(m7b5!"MGe;E*mNQ!:'tT4/l$aF-m]0pGV;/<qHp#/je+Y\P\B3J;UY17hHr?k\-R=N8cPZ=e$-rHJ)?pS]eIAEV9HL*h\oR2o;nE&kNi%0jO@BW+gJM&[<Df\=5)3]ddDF@G;E/t=,Ze&!/#.E7G&J0[K3fj6>sgE>Y]bL-t,tW~>
-endstream
-endobj
-25 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 24 0 R
->>
-endobj
-27 0 obj
-<<
- /Title (\376\377\0\61\0\40\0\115\0\141\0\153\0\151\0\156\0\147\0\40\0\141\0\40\0\103\0\157\0\156\0\164\0\162\0\151\0\142\0\165\0\164\0\151\0\157\0\156)
- /Parent 26 0 R
- /Next 28 0 R
- /A 9 0 R
->> endobj
-28 0 obj
-<<
- /Title (\376\377\0\62\0\40\0\116\0\151\0\147\0\150\0\164\0\154\0\171\0\40\0\102\0\165\0\151\0\154\0\144\0\40\0\112\0\141\0\166\0\141\0\144\0\157\0\143\0\163)
- /Parent 26 0 R
- /Prev 27 0 R
- /Next 29 0 R
- /A 11 0 R
->> endobj
-29 0 obj
-<<
- /Title (\376\377\0\63\0\40\0\104\0\157\0\167\0\156\0\154\0\157\0\141\0\144\0\163)
- /Parent 26 0 R
- /First 30 0 R
- /Last 33 0 R
- /Prev 28 0 R
- /Count -4
- /A 13 0 R
->> endobj
-30 0 obj
-<<
- /Title (\376\377\0\63\0\56\0\61\0\40\0\103\0\154\0\157\0\166\0\145\0\162\0\40\0\124\0\145\0\163\0\164\0\40\0\103\0\157\0\166\0\145\0\162\0\141\0\147\0\145\0\40\0\122\0\145\0\160\0\157\0\162\0\164\0\163)
- /Parent 29 0 R
- /Next 31 0 R
- /A 15 0 R
->> endobj
-31 0 obj
-<<
- /Title (\376\377\0\63\0\56\0\62\0\40\0\110\0\165\0\144\0\163\0\157\0\156)
- /Parent 29 0 R
- /Prev 30 0 R
- /Next 32 0 R
- /A 17 0 R
->> endobj
-32 0 obj
-<<
- /Title (\376\377\0\63\0\56\0\63\0\40\0\116\0\151\0\147\0\150\0\164\0\154\0\171\0\40\0\102\0\165\0\151\0\154\0\144\0\40\0\104\0\157\0\167\0\156\0\154\0\157\0\141\0\144)
- /Parent 29 0 R
- /Prev 31 0 R
- /Next 33 0 R
- /A 19 0 R
->> endobj
-33 0 obj
-<<
- /Title (\376\377\0\63\0\56\0\64\0\40\0\123\0\157\0\165\0\162\0\143\0\145\0\40\0\103\0\157\0\144\0\145)
- /Parent 29 0 R
- /Prev 32 0 R
- /A 21 0 R
->> endobj
-34 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-35 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F5
-/BaseFont /Times-Roman
-/Encoding /WinAnsiEncoding >>
-endobj
-36 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding >>
-endobj
-37 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
-/Encoding /WinAnsiEncoding >>
-endobj
-38 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
-/Encoding /WinAnsiEncoding >>
-endobj
-39 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F7
-/BaseFont /Times-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-1 0 obj
-<< /Type /Pages
-/Count 3
-/Kids [6 0 R 23 0 R 25 0 R ] >>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 1 0 R
- /Outlines 26 0 R
- /PageMode /UseOutlines
- >>
-endobj
-3 0 obj
-<< 
-/Font << /F3 34 0 R /F5 35 0 R /F1 36 0 R /F9 37 0 R /F2 38 0 R /F7 39 0 R >> 
-/ProcSet [ /PDF /ImageC /Text ] >> 
-endobj
-9 0 obj
-<<
-/S /GoTo
-/D [23 0 R /XYZ 85.0 659.0 null]
->>
-endobj
-11 0 obj
-<<
-/S /GoTo
-/D [23 0 R /XYZ 85.0 593.466 null]
->>
-endobj
-13 0 obj
-<<
-/S /GoTo
-/D [23 0 R /XYZ 85.0 238.732 null]
->>
-endobj
-15 0 obj
-<<
-/S /GoTo
-/D [23 0 R /XYZ 85.0 186.398 null]
->>
-endobj
-17 0 obj
-<<
-/S /GoTo
-/D [25 0 R /XYZ 85.0 659.0 null]
->>
-endobj
-19 0 obj
-<<
-/S /GoTo
-/D [25 0 R /XYZ 85.0 581.347 null]
->>
-endobj
-21 0 obj
-<<
-/S /GoTo
-/D [25 0 R /XYZ 85.0 516.594 null]
->>
-endobj
-26 0 obj
-<<
- /First 27 0 R
- /Last 29 0 R
->> endobj
-xref
-0 40
-0000000000 65535 f 
-0000006810 00000 n 
-0000006882 00000 n 
-0000006974 00000 n 
-0000000015 00000 n 
-0000000071 00000 n 
-0000000842 00000 n 
-0000000962 00000 n 
-0000001029 00000 n 
-0000007108 00000 n 
-0000001164 00000 n 
-0000007171 00000 n 
-0000001301 00000 n 
-0000007237 00000 n 
-0000001437 00000 n 
-0000007303 00000 n 
-0000001574 00000 n 
-0000007369 00000 n 
-0000001711 00000 n 
-0000007433 00000 n 
-0000001847 00000 n 
-0000007499 00000 n 
-0000001984 00000 n 
-0000003337 00000 n 
-0000003445 00000 n 
-0000004571 00000 n 
-0000007565 00000 n 
-0000004679 00000 n 
-0000004894 00000 n 
-0000005130 00000 n 
-0000005316 00000 n 
-0000005583 00000 n 
-0000005735 00000 n 
-0000005981 00000 n 
-0000006148 00000 n 
-0000006261 00000 n 
-0000006371 00000 n 
-0000006479 00000 n 
-0000006585 00000 n 
-0000006701 00000 n 
-trailer
-<<
-/Size 40
-/Root 2 0 R
-/Info 4 0 R
->>
-startxref
-7616
-%%EOF
diff --git a/docs/features.html b/docs/features.html
deleted file mode 100644
index efdd7d7eb0c..00000000000
--- a/docs/features.html
+++ /dev/null
@@ -1,358 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
-<meta name="Forrest-skin-name" content="pelt">
-<title>Apache Lucene - Features</title>
-<link type="text/css" href="skin/basic.css" rel="stylesheet">
-<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
-<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
-<link type="text/css" href="skin/profile.css" rel="stylesheet">
-<script src="skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="images/favicon.ico">
-</head>
-<body onload="init()">
-<script type="text/javascript">ndeSetTextSize();</script>
-<div id="top">
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
-</div>
-<!--+
-    |header
-    +-->
-<div class="header">
-<!--+
-    |start group logo
-    +-->
-<div class="grouplogo">
-<a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="http://www.apache.org/images/asf_logo_simple.png" title="Apache Lucene"></a>
-</div>
-<!--+
-    |end group logo
-    +-->
-<!--+
-    |start Project Logo
-    +-->
-<div class="projectlogo">
-<a href="http://lucene.apache.org/java/"><img class="logoImage" alt="Lucene" src="http://lucene.apache.org/images/lucene_green_300.gif" title="Apache Lucene is a high-performance, full-featured text search engine library written entirely in
-      Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform."></a>
-</div>
-<!--+
-    |end Project Logo
-    +-->
-<!--+
-    |start Search
-    +-->
-<div class="searchbox">
-<form action="http://www.google.com/search" method="get" class="roundtopsmall">
-<input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input name="Search" value="Search" type="submit">
-</form>
-</div>
-<!--+
-    |end search
-    +-->
-<!--+
-    |start Tabs
-    +-->
-<ul id="tabs">
-<li class="current">
-<a class="selected" href="index.html">Main</a>
-</li>
-<li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
-</li>
-</ul>
-<!--+
-    |end Tabs
-    +-->
-</div>
-</div>
-<div id="main">
-<div id="publishedStrip">
-<!--+
-    |start Subtabs
-    +-->
-<div id="level2tabs"></div>
-<!--+
-    |end Endtabs
-    +-->
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-
-             &nbsp;
-           </div>
-<!--+
-    |start Menu, mainarea
-    +-->
-<!--+
-    |start Menu
-    +-->
-<div id="menu">
-<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">About</div>
-<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
-<div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
-</div>
-<div class="menupage">
-<div class="menupagetitle">Features</div>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
-</div>
-<div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
-<div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
-</div>
-<div class="menuitem">
-<a href="benchmarks.html">Benchmarks</a>
-</div>
-<div class="menuitem">
-<a href="contributions.html">Contributions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/LuceneFAQ">FAQ</a>
-</div>
-<div class="menuitem">
-<a href="fileformats.html">File Formats</a>
-</div>
-<div class="menuitem">
-<a href="gettingstarted.html">Getting Started</a>
-</div>
-<div class="menuitem">
-<a href="lucene-sandbox/index.html">Lucene Sandbox</a>
-</div>
-<div class="menuitem">
-<a href="queryparsersyntax.html">Query Syntax</a>
-</div>
-<div class="menuitem">
-<a href="scoring.html">Scoring</a>
-</div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
-</div>
-</div>
-<div id="credit"></div>
-<div id="roundbottom">
-<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
-<!--+
-  |alternative credits
-  +-->
-<div id="credit2"></div>
-</div>
-<!--+
-    |end Menu
-    +-->
-<!--+
-    |start content
-    +-->
-<div id="content">
-<div title="Portable Document Format" class="pdflink">
-<a class="dida" href="features.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
-        PDF</a>
-</div>
-<h1>Apache Lucene - Features</h1>
-<div id="minitoc-area">
-<ul class="minitoc">
-<li>
-<a href="#Features">Features</a>
-</li>
-<li>
-<a href="#Scalable, High-Performance Indexing">Scalable, High-Performance Indexing</a>
-</li>
-<li>
-<a href="#Powerful, Accurate and Efficient Search Algorithms">Powerful, Accurate and Efficient Search Algorithms</a>
-</li>
-<li>
-<a href="#Cross-Platform Solution">Cross-Platform Solution</a>
-</li>
-</ul>
-</div>
-
-
-<a name="N1000C"></a><a name="Features"></a>
-<h2 class="boxed">Features</h2>
-<div class="section">
-<p>Lucene offers powerful features through a simple API:</p>
-</div>
-
-
-<a name="N10015"></a><a name="Scalable, High-Performance Indexing"></a>
-<h2 class="boxed">Scalable, High-Performance Indexing</h2>
-<div class="section">
-<ul>
-
-<li>over 20MB/minute on Pentium M 1.5GHz<br>
-</li>
-
-<li>small RAM requirements -- only 1MB heap</li>
-
-<li>incremental indexing as fast as batch indexing</li>
-
-<li>index size roughly 20-30% the size of text indexed</li>
-
-</ul>
-</div>
-
-
-<a name="N1002B"></a><a name="Powerful, Accurate and Efficient Search Algorithms"></a>
-<h2 class="boxed">Powerful, Accurate and Efficient Search Algorithms</h2>
-<div class="section">
-<ul>
-
-<li>ranked searching -- best results returned first</li>
-
-<li>many powerful query types: phrase queries, wildcard queries, proximity
-	queries, range queries and more</li>
-
-<li>fielded searching (e.g., title, author, contents)</li>
-
-<li>date-range searching</li>
-
-<li>sorting by any field</li>
-
-<li>multiple-index searching with merged results</li>
-
-<li>allows simultaneous update and searching</li>
-
-</ul>
-</div>
-
-
-<a name="N10049"></a><a name="Cross-Platform Solution"></a>
-<h2 class="boxed">Cross-Platform Solution</h2>
-<div class="section">
-<ul>
-
-<li>Available as Open Source software under the
-	<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License</a>
-	which lets you use Lucene in both commercial and Open Source programs</li>
-
-<li>100%-pure Java</li>
-
-<li>Implementations <a href="http://wiki.apache.org/lucene-java/LuceneImplementations">in other
-	programming languages available</a> that are index-compatible</li>
-
-</ul>
-</div>
-
-
-</div>
-<!--+
-    |end content
-    +-->
-<div class="clearboth">&nbsp;</div>
-</div>
-<div id="footer">
-<!--+
-    |start bottomstrip
-    +-->
-<div class="lastmodified">
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<div class="copyright">
-        Copyright &copy;
-         2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
-<!--+
-    |end bottomstrip
-    +-->
-</div>
-</body>
-</html>
diff --git a/docs/features.pdf b/docs/features.pdf
deleted file mode 100644
index f2f361c6a81..00000000000
--- a/docs/features.pdf
+++ /dev/null
@@ -1,235 +0,0 @@
-%PDF-1.3
-%ª«¬­
-4 0 obj
-<< /Type /Info
-/Producer (FOP 0.20.5) >>
-endobj
-5 0 obj
-<< /Length 552 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gaua;4`B(/&;GE-$B>TmZi$&h0e$S=5mJ4WQ?HYLaqc+`.7H,]^Fq#di?aBa"AP^Y4S&7gTB#1=Rc<@r,:5*19j<_Od02i5Jg(h7MX!$"$A*Q66Hp+u/hZUX5*u_bACW04/\[8!=C<fRE,APk]brHL&(KCQ:_f^GW+Yt4P*kh2Uu/,_IZfn/C#Rc.f$4J06e7HWP37.UYTtVG(=c!;6>uS7HeJtCo9#r,pqK"TSFRTip^"67kHR%fC^+>2Z%;XMX$5YD6Vd@<DLYc+N,P7O.]^CNI'Gd)]<hBaPG874fEBH+"\g9i1Bp&S%D4Xf+l\JEJA0NZoI9iCATuh;DVIp1Yls[JegR^45b['shhAu<XX+Z-q4%Z_RQQD;`2f;"SBV0.roDlh/2t6Ll)k&Ulc7@4qk!gSMI)mQ6-3Im`QtM8:$mOq$<Ijsl')<,M7c,knZB;nm>O3iLYroJKEU+i8r;k3U7,Tf#k.3]pfQf)\#o*mdVLX)b%rr>ot>0q>M"T7jh]0pNHV3t&i&%ipXtpC&&:)Un\<9XBCrrrKf?=~>
-endstream
-endobj
-6 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 5 0 R
-/Annots 7 0 R
->>
-endobj
-7 0 obj
-[
-8 0 R
-10 0 R
-12 0 R
-14 0 R
-]
-endobj
-8 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 559.666 150.656 547.666 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 9 0 R
-/H /I
->>
-endobj
-10 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 541.466 291.62 529.466 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 11 0 R
-/H /I
->>
-endobj
-12 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 523.266 361.94 511.266 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 13 0 R
-/H /I
->>
-endobj
-14 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 505.066 227.012 493.066 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 15 0 R
-/H /I
->>
-endobj
-16 0 obj
-<< /Length 1530 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gatm<8T3?C'YaHGkY`N(`iM^n>'b7I-;Dm\T%:Bm*,(bGM:(<Z;B5G_cdQJh-!mU>,(M8nI!X]EG33Bkq6ZMO9l/eo^?o%Q2lF%Z(3\V?Q<@FiJ,Fb.9`gg:Q7FqBE`"tqW?B^LQ;Q4Ro&o(G0mS97=gU5oLaKR<T"l<'O'7MkGMouH/J@BQ.nZtH.B?fsFfT%M)O4Z6Ip7ga%89quhmH&s:41[\e1sYK5cLt9CQo;D_EmTIqS&8h8l`&NM]ua'I_F!Lb!]grmmIC[h+k40=h3D])mXt;Fg@"Sqe,Nt&"(]C27lS>gKWU;i<M7PnEJ]/0`j^3rt3CU/n=QE^\(a52q'dS+Z"sK6cA+N?)\X2Y"s@7pl#K6FngVcquJj)gdAqg`1q0?4>J6e"ijk?D82B%6'OM_dt;3)_p/'HVe(GXSG(9MPnpr)qMg:0OV2[.q<('B.D-iI@N8^9#WfVD,%D<qhe*4F;,=#H.KPJVjJGjL-/Kl^%laGrUZD+mG4#uU*-RG53p\m:)fu]Id"f+jU]^`@ah0V4b>K,7k1FH%:iO5Gj!]G2kUD$#S?b@VT[]s#%F"1<A&#q7Y>32O&NZdqMHA$Ol8M`F5q+dIrJ+!Q_ol<"0nk60_7V@JW"R=kYV[!UO\AjTi_pQU:dZe,Eh]AG/tKuIbiiN"S?D->J=6Mo3[R,9rKX+nU"4HP)\E8/G6mMlTTSJ'$B`GGjF\Sp=gq?iLnPoT0htQ?TLksSI??FQ`;)sd/ejIg*'B>K3'_aYOnuM14dF0_"3#_inde9!@q;`sa0j&e!:4g?$Dgmr40pftMb\B!5BdC7]iH_q=+l7]GG\F17(ah6;&:ff9c)h@$5.4]+OV`G>mQA/.n/"lOXkN.BV;X^2OQiM@?q[/6%?P]#bODT(^Js'$1HfU+BbVEXcG0GTUWN&'8h*a6KOUa#'O2<Yoi^"28I9LdFcase?Cr*%EM<SUY,3][=@Mg*RlGNABLun!$"o84Br+TSPa>H4HdNGOR5m"_]/tdAZE$Km?ZMWl"^.McbH6u33H$Y<1ABJb;_3P<C^hF*-I[1-Hl#F4I/Dn?D>H%`FYaD1$qAuE-MA2MiSl1*=e^s+6+0!i*Cu*4\K),a2\FPDd/K9%].#%Eh5_=:)^K<685-2FYHJ4[PGeeY8XPn\304<)Rn:"i<H[88u)ZLF]Y.Z[F\iK^E$=6Qn1%`&n.(k<eMBPI"Td-D['kdCEo%d.7Bj@O)n;9HQ@QMg[D#o&tAcVI$PSV_E>cWBuLb8I<FGJkM[n:O[H?5_4'$DX[/+9'oJ]"QZ>6&IW'kBfLS+tA$U6NRt@iP!2UHGGqdDh*7Ni9&t:W!"+sMf[#oeC5L1R*k;!ENQ4I3K_<T[4]t3[aL8D=K4ON;l9phm-2<rZ`'ds)j*8e"&\DqofVR]qBeMBUNg5U0h)9h+BrL8?F5lt+i4pQD@H.BrO]/O]6Xf^d^FWY7Jp+'b0DSKA^VXTA/frT[r]P_n11W\oD!XKES/pY^9et&SDb*@6Q/(32??_jM-Xo~>
-endstream
-endobj
-17 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 16 0 R
->>
-endobj
-19 0 obj
-<<
- /Title (\376\377\0\61\0\40\0\106\0\145\0\141\0\164\0\165\0\162\0\145\0\163)
- /Parent 18 0 R
- /Next 20 0 R
- /A 9 0 R
->> endobj
-20 0 obj
-<<
- /Title (\376\377\0\62\0\40\0\123\0\143\0\141\0\154\0\141\0\142\0\154\0\145\0\54\0\40\0\110\0\151\0\147\0\150\0\55\0\120\0\145\0\162\0\146\0\157\0\162\0\155\0\141\0\156\0\143\0\145\0\40\0\111\0\156\0\144\0\145\0\170\0\151\0\156\0\147)
- /Parent 18 0 R
- /Prev 19 0 R
- /Next 21 0 R
- /A 11 0 R
->> endobj
-21 0 obj
-<<
- /Title (\376\377\0\63\0\40\0\120\0\157\0\167\0\145\0\162\0\146\0\165\0\154\0\54\0\40\0\101\0\143\0\143\0\165\0\162\0\141\0\164\0\145\0\40\0\141\0\156\0\144\0\40\0\105\0\146\0\146\0\151\0\143\0\151\0\145\0\156\0\164\0\40\0\123\0\145\0\141\0\162\0\143\0\150\0\40\0\101\0\154\0\147\0\157\0\162\0\151\0\164\0\150\0\155\0\163)
- /Parent 18 0 R
- /Prev 20 0 R
- /Next 22 0 R
- /A 13 0 R
->> endobj
-22 0 obj
-<<
- /Title (\376\377\0\64\0\40\0\103\0\162\0\157\0\163\0\163\0\55\0\120\0\154\0\141\0\164\0\146\0\157\0\162\0\155\0\40\0\123\0\157\0\154\0\165\0\164\0\151\0\157\0\156)
- /Parent 18 0 R
- /Prev 21 0 R
- /A 15 0 R
->> endobj
-23 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-24 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F5
-/BaseFont /Times-Roman
-/Encoding /WinAnsiEncoding >>
-endobj
-25 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding >>
-endobj
-26 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
-/Encoding /WinAnsiEncoding >>
-endobj
-27 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F7
-/BaseFont /Times-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-1 0 obj
-<< /Type /Pages
-/Count 2
-/Kids [6 0 R 17 0 R ] >>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 1 0 R
- /Outlines 18 0 R
- /PageMode /UseOutlines
- >>
-endobj
-3 0 obj
-<< 
-/Font << /F3 23 0 R /F5 24 0 R /F1 25 0 R /F2 26 0 R /F7 27 0 R >> 
-/ProcSet [ /PDF /ImageC /Text ] >> 
-endobj
-9 0 obj
-<<
-/S /GoTo
-/D [17 0 R /XYZ 85.0 659.0 null]
->>
-endobj
-11 0 obj
-<<
-/S /GoTo
-/D [17 0 R /XYZ 85.0 606.666 null]
->>
-endobj
-13 0 obj
-<<
-/S /GoTo
-/D [17 0 R /XYZ 85.0 516.732 null]
->>
-endobj
-15 0 obj
-<<
-/S /GoTo
-/D [17 0 R /XYZ 85.0 373.998 null]
->>
-endobj
-18 0 obj
-<<
- /First 19 0 R
- /Last 22 0 R
->> endobj
-xref
-0 28
-0000000000 65535 f 
-0000004790 00000 n 
-0000004855 00000 n 
-0000004947 00000 n 
-0000000015 00000 n 
-0000000071 00000 n 
-0000000714 00000 n 
-0000000834 00000 n 
-0000000880 00000 n 
-0000005070 00000 n 
-0000001015 00000 n 
-0000005133 00000 n 
-0000001151 00000 n 
-0000005199 00000 n 
-0000001287 00000 n 
-0000005265 00000 n 
-0000001424 00000 n 
-0000003047 00000 n 
-0000005331 00000 n 
-0000003155 00000 n 
-0000003294 00000 n 
-0000003606 00000 n 
-0000004006 00000 n 
-0000004234 00000 n 
-0000004347 00000 n 
-0000004457 00000 n 
-0000004565 00000 n 
-0000004681 00000 n 
-trailer
-<<
-/Size 28
-/Root 2 0 R
-/Info 4 0 R
->>
-startxref
-5382
-%%EOF
diff --git a/docs/fileformats.html b/docs/fileformats.html
index 87eb89e6592..48287f19408 100644
--- a/docs/fileformats.html
+++ b/docs/fileformats.html
@@ -64,11 +64,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -102,25 +108,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
+<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
-<div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -146,86 +203,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
diff --git a/docs/gettingstarted.html b/docs/gettingstarted.html
index 595a1d1e0e3..44dc057c3d9 100644
--- a/docs/gettingstarted.html
+++ b/docs/gettingstarted.html
@@ -64,11 +64,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -102,25 +108,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
+<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
-<div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -146,86 +203,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
diff --git a/docs/index.html b/docs/index.html
index 2b87b057ef9..b76dfe389eb 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,9 +5,7 @@
 <meta content="Apache Forrest" name="Generator">
 <meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
-<title>
-	Apache Lucene - Overview
-		</title>
+<title>Lucene Java Documentation</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
 <link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
 <link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@@ -64,11 +62,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -102,25 +106,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">About</div>
+<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
 <div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menupage">
 <div class="menupagetitle">Overview</div>
 </div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/demo/index.html">Demo</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-ant/index.html">Ant</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -146,86 +201,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit">
@@ -250,178 +227,17 @@ document.write("Last Published: " + document.lastModified);
 <a class="dida" href="index.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
         PDF</a>
 </div>
-<h1>
-	Apache Lucene - Overview
-		</h1>
-<div id="minitoc-area">
-<ul class="minitoc">
-<li>
-<a href="#Apache Lucene">Apache Lucene</a>
-</li>
-<li>
-<a href="#Lucene News">Lucene News</a>
-<ul class="minitoc">
-<li>
-<a href="#24+December+2007+-+Nightly+Snapshots+available+in+the+Apache+Maven+Snapshot+Repository">24 December 2007 - Nightly Snapshots available in the Apache Maven Snapshot Repository</a>
-</li>
-<li>
-<a href="#26+August+2007+-+Lucene+at+ApacheCon+Atlanta">26 August 2007 - Lucene at ApacheCon Atlanta</a>
-</li>
-<li>
-<a href="#19+June+2007+-+Release+2.2+available">19 June 2007 - Release 2.2 available</a>
-</li>
-<li>
-<a href="#18+February+2007+-+Lucene+at+ApacheCon+Europe">18 February 2007 - Lucene at ApacheCon Europe</a>
-</li>
-<li>
-<a href="#17+February+2007+-+Release+2.1+available">17 February 2007 - Release 2.1 available</a>
-</li>
-<li>
-<a href="#3+January+2007+-+Nightly+Source+builds+available">3 January 2007 - Nightly Source builds available</a>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-        
-<a name="N1000C"></a><a name="Apache Lucene"></a>
-<h2 class="boxed">Apache Lucene</h2>
-<div class="section">
-<p>
-                Apache Lucene is a high-performance, full-featured text search engine
-                library written entirely in Java.  It is a technology suitable for nearly any
-                application that requires full-text search, especially cross-platform.
-            </p>
-<p>
-                Apache Lucene is an open source project available for
-                <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">free download</a>.
-                Please use the links on the left to access Lucene.
-            </p>
-</div>
-
-        
-<a name="N1001D"></a><a name="Lucene News"></a>
-<h2 class="boxed">Lucene News</h2>
-<div class="section">
-<a name="N10027"></a><a name="24+December+2007+-+Nightly+Snapshots+available+in+the+Apache+Maven+Snapshot+Repository"></a>
-<h3 class="boxed">24 December 2007 - Nightly Snapshots available in the Apache Maven Snapshot Repository</h3>
-<p>
-			  We are now publishing nightly artifacts to the <a href="http://people.apache.org/maven-snapshot-repository/org/apache/lucene/">Maven Snapshot Repository</a>. The current version is '2.3-SNAPSHOT'.
-			</p>
-<p>
-			  The artifacts include:
-			  <ul>
-                
-<li>Binary jars</li>			  
-                
-<li>Sources</li>			  				
-                
-<li>Javadocs</li>			  				
-              
-</ul>
-              You can find separate artifacts for the core, demo, and the different contrib modules.
-			</p>
-<p>
-			  Merry Christmas!
-			</p>
-<a name="N10047"></a><a name="26+August+2007+-+Lucene+at+ApacheCon+Atlanta"></a>
-<h3 class="boxed">26 August 2007 - Lucene at ApacheCon Atlanta</h3>
-<p>
-<a href="http://www.us.apachecon.com"><img alt="ApacheCon US logo" class="float-right" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png"></a>
-              Lucene will once again be well represented at ApacheCon USA in Atlanta this November 12-16, 2007.  
-            </p>
-<p>The following talks and trainings are scheduled for this year's conference:
-              <ul>
-                
-<li>November 12: <a href="http://us.apachecon.com/us2007/program/talk/1859">Lucene Boot Camp</a> by Grant Ingersoll.  An all-day training focusing on getting started with Lucene.</li>
-                
-<li>November 16, 9:00 am: <a href="http://us.apachecon.com/us2007/program/talk/1992">Apache Solr out of the Box</a> by Chris Hostetter. Introduction to Solr.</li>
-                
-<li>November 16, 10:00 am: <a href="http://us.apachecon.com/us2007/program/talk/1943">Building a Vertical Search Site using Apache Software</a> by Ken Krugler. Will cover many Lucene-based projects.</li>
-                
-<li>November 16, 3:00 pm: <a href="http://us.apachecon.com/us2007/program/talk/1953">Apache Lucene Performance</a> by Grant Ingersoll. Tips and techniques for improving Lucene performance.</li>
-                
-<li>November 16, 4:00 pm: <a href="http://us.apachecon.com/us2007/program/talk/2017"> Advanced Indexing Techniques with Apache Lucene</a> by Michael Busch. Information on payloads and advanced indexing techniques.</li>
-              
-</ul>
-            
-</p>
-<a name="N10080"></a><a name="19+June+2007+-+Release+2.2+available"></a>
-<h3 class="boxed">19 June 2007 - Release 2.2 available</h3>
-<p>This release has many improvements since release 2.1. New major features:
-			<ul>
-			  
-<li> 
-<a href="http://lucene.apache.org/java/2_2_0/api/org/apache/lucene/index/IndexWriter.html">"Point-in-time" searching over NFS</a>
-</li>
-			  
-<li> 
-<a href="http://lucene.apache.org/java/2_2_0/api/org/apache/lucene/search/payloads/package-summary.html">Payloads</a>
-</li>
-			  
-<li> 
-<a href="http://lucene.apache.org/java/2_2_0/api/org/apache/lucene/search/function/package-summary.html">Function queries</a>
-</li>
-			  
-<li> 
-<a href="http://lucene.apache.org/java/2_2_0/api/org/apache/lucene/document/Field.html">New API for pre-analyzed fields</a>
-</li>
-			
-</ul>
-			In addition Lucene 2.2 has many performance
-              improvements, bug fixes, etc. See
-              <a href="http://svn.apache.org/repos/asf/lucene/java/tags/lucene_2_2_0/CHANGES.txt">CHANGES.txt</a>
-              for details.
-            </p>
-<p>Lucene 2.2 includes index format changes that are not readable
-              by older versions of Lucene.  Lucene 2.2 can both read and update
-              older Lucene indexes.  Adding to an index with an older format
-              will cause it to be converted to the newer format.
-            </p>
-<p>Binary and source distributions are
-              available
-              <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">here</a>.
-            </p>
-<a name="N100B3"></a><a name="18+February+2007+-+Lucene+at+ApacheCon+Europe"></a>
-<h3 class="boxed">18 February 2007 - Lucene at ApacheCon Europe</h3>
-<p>
-              
-<a href="http://www.eu.apachecon.com"><img alt="ApacheCon Europe logo" class="float-right" src="http://www.apache.org/ads/ApacheCon/2007-europe-125x125.png"></a>
-              Lucene Java and related <a href="http://lucene.apache.org/">Lucene</a> projects will have extensive representation at <a href="http://www.eu.apachecon.com">ApacheCon Europe</a> in Amsterdam this year. For the 2007 session,
-              Yonik Seeley will be giving the <a href="http://www.eu.apachecon.com/program/talk/11">Full-Text Search with Lucene</a> talk at 10:30 am on May 2nd.  Immediately following, Grant Ingersoll
-              will be presenting <a href="http://www.eu.apachecon.com/program/talk/12">Advanced Lucene</a> at 11:30.  Grant will also be leading a full day tutorial session on May 1st titled
-              <a href="http://www.eu.apachecon.com/program/talk/127">Lucene Boot Camp</a>.
-            </p>
-<p>Lucene related talks include Solr committer Bertrand Delacr&eacute;taz's talk titled <a href="http://www.eu.apachecon.com/program/talk/34">Beyond full-text searches with Solr and Lucene</a> and
-              Hadoop committer Owen O'Malley's <a href="http://www.eu.apachecon.com/program/talk/36">Introduction to Hadoop</a>.
-            </p>
-<p>Registration is now open on the ApacheCon website.</p>
-<a name="N100E6"></a><a name="17+February+2007+-+Release+2.1+available"></a>
-<h3 class="boxed">17 February 2007 - Release 2.1 available</h3>
-<p>This release has many improvements since release
-              2.0, including new features, performance
-              improvements, bug fixes, etc. See
-              <a href="http://svn.apache.org/repos/asf/lucene/java/tags/lucene_2_1_0/CHANGES.txt">CHANGES.txt</a>
-              for details.
-            </p>
-<p>Lucene 2.1 includes index format changes that are not readable
-              by older versions of Lucene.  Lucene 2.1 can both read and update
-              older Lucene indexes.  Adding to an index with an older format
-              will cause it to be converted to the newer format.
-            </p>
-<p>Binary and source distributions are
-              available
-              <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">here</a>.
-            </p>
-<a name="N100FE"></a><a name="3+January+2007+-+Nightly+Source+builds+available"></a>
-<h3 class="boxed">3 January 2007 - Nightly Source builds available</h3>
-<p>Nightly source builds of the current development version of Lucene
-                    are now available at
-                    <a href="http://people.apache.org/builds/lucene/java/nightly/">http://people.apache.org/builds/lucene/java/nightly/</a>.  Files are named lucene-DATE-src.tar.gz where DATE is the date of the build.
-                </p>
-</div>
-
+<h1>Lucene Java Documentation</h1>
     
+<p>
+    This is the official documentation for Lucene Java 2.4-dev <BR>
+	Please use the menu on the left to access the Javadocs and different documents.
+    </p>
+	
+<p>
+	Additional documentation is available in the <a href="http://wiki.apache.org/lucene-java">Wiki</a>.
+	</p>
+  
 </div>
 <!--+
     |end content
diff --git a/docs/index.pdf b/docs/index.pdf
index e5620fecc29..420ca9d53a6 100644
--- a/docs/index.pdf
+++ b/docs/index.pdf
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 810 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 460 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gaua=9lo#B&;KZQ'fqK[W[-oJ4sju'AD2-opt#-]Mu_0`2Y@:`s1XXJ/<R<,2G%BgB\0:"n$=O<X!IHo$NZq4JRfW@o9BLcX9&flra69V+/]C!49EVLpbo\<aE4O:^m'XG^RKUc;cS)9e.'0/<OL*$mK3:dafSlA!,Ru_b0L3C395Me7*bBV*AalGjjK.;Z=m4be3cD(0KRL7&MXS0L/dg@YTHT27!I,YBW&"?nt<-Ai;\<!0*sL`o+3T!j3#7N'!$_F/,,cD*IHmlC0/0BmTqpfk=N]2`k$X:Ae6!$_iod%0r0UHc_,SQg,8*TUIs(s>ZK':&/*9W]&?r'=uZ963?AO<WRmt\dt:;2AX;)b[]Z]Nj(@\l(cp$tTB0)gca-hq_`m(WS-[$RWju3#ZHeoEg:qD8O/g;_O=,D-S/X9l+WnjOZAV9[fl9,u*IQPCg:D:4/YTSLcSt[9QJSFO*7nc\\XHb=NI3H^SIm*Y\bTB93#`>W!lK"3?9F7=JD8XVqaW43.T`qL,>Bls8?Sjt^V:0qhNOX@&rr0L_B!ubNg'"mETBO4e@]Omfe]hf1cK8ODI1E,:l/;8jX_nXP]Q"2)lM]7A+<>oIa^+JNI/[@&*(EtU>=3^Ko]1&i^7Vtal5u@mN9;,*m1o`4\#$$b89gj@+$J-*Y+P>R[YStfj40[b83VL$E^U<)F;5*V8+k])I/]R+W2D;#XhMOh$pVQcst?dX=7:9fB$UO)7f/Jpmj,*/.IFt/+G9U:G8"Ejg*R]b4Ej"[TLTt.gtQ8bB%<<CY,/[C4-7c$g=Dd!]ql)WW~>
+Gasak4\rsL&Dcq.DJY(Ha0ChOCk3'2",KJV^gIeeYt3o<O!=Qd:."$BTG#D/]K?#I]9fuuK<&hlN"ZPt%VYmb!XefI"R;Qi<dcR^PXP$SdK;VXm^c(lC(:W;/7!2&P:,VBNQo%eW`n'o>Ku+Ad[d-E&@.GXCp$;A&lV!>9afGBF%"oRiU=3O*a#O=An:-Vq)RP9f!b:fM]VC6H:3_]7BTD"E*k*JT]7$sB6"u3LW!1/Ng35GW+CIK3Hl_1KMQL,/5se>%smndCXeYMNXRXGX4fT)gS9N$ail!H-K]HBS)28:=H%`mP@R;]<[*soOrI3Zh+U.Qe)4_,gn5pg#tY9hi>a.;5cm9V&&G,=.WbP;WCrOrJV"dI5ut7@<CB51DK9TT?a\Q'XcMWQ';7pTdb(>%5cJ'3AVT`Mea999;.XOT.N]'BkZV,80Q8rVX%(VeQ(umE!=&)H49~>
 endstream
 endobj
 6 0 obj
@@ -17,378 +17,70 @@ endobj
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
 /Contents 5 0 R
-/Annots 7 0 R
 >>
 endobj
 7 0 obj
-[
-8 0 R
-10 0 R
-12 0 R
-14 0 R
-15 0 R
-17 0 R
-19 0 R
-21 0 R
-23 0 R
-]
-endobj
-8 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 559.666 184.964 547.666 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 9 0 R
-/H /I
->>
-endobj
-10 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 541.466 175.64 529.466 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 11 0 R
-/H /I
->>
-endobj
-12 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 111.936 523.266 516.38 511.266 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 13 0 R
-/H /I
->>
-endobj
-14 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 96.0 510.066 148.668 498.066 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 13 0 R
-/H /I
->>
-endobj
-15 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 491.866 355.124 479.866 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 16 0 R
-/H /I
->>
-endobj
-17 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 473.666 299.132 461.666 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 18 0 R
-/H /I
->>
-endobj
-19 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 455.466 363.104 443.466 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 20 0 R
-/H /I
->>
-endobj
-21 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 437.266 320.456 425.266 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 22 0 R
-/H /I
->>
-endobj
-23 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 419.066 358.472 407.066 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 24 0 R
-/H /I
->>
-endobj
-25 0 obj
-<< /Length 1922 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gatm<gQL;L%"7kOW)#ut@Rd0]H/%.5pWGI<S*@;.TI&<(,)Zdsg"F+nAB?>uQ?L_oAnSK&/<IXJDuf0D3W!qZq`8diSA_Sn2#htrS,\&/`/^TOcLd/>?T>C1-*@mc5$\&Z\Y%?$:sX?mE)s=&As^]oe)ui\RhqCVRHn[$YQF`"VcECQGWg/746NffPl0mlfl<G#(F;kdU6jcgW@1%2a'$,oNMab(??@N=5)I2HA44Z"MG4?rb$#JFm274!eF#N.j%5P:J'\#HXk[aUV9j"SGJ$JcPQ%J&S`fUPi25'LlQ7)9c1Fm[\5'NH/;fG*gZEOQ\\@;M*4.Ol'HImr4)R_okDgsLe07D?ZKUaao0#TW^G>Q[BgfNa<3A,m`N#5YYB"/*T[4&M\:tIN"W#69QROjk+g]CY,>5E=>([@9!7;RsF74`,+E$@jM^jU<W(N1ESn!+FXf?,Bk1hf0,GT$D*f1u%+NQ!3$7&WOeg]#s[JDFPj>B=pk'*K0ecPf7WC)duStTOukCQe!Po:$BCZSUe"W=F3P:?iD&p=i=g1$&c2@@!VVP:)F8.f+?s-%I)ho58;-gB:?G]7e.lOG/gd<mSWeKirR^`/EV:>:+e6G+F,qu73Lh#qZ5@RAmikbC)rUCZL?^45\cdjjtdqd2`@Ft8,AMn*`T9614?OIX.`ZRC'$D3_*gbZe4D,i5bihXUP(U\SmpJqUS8S2Td-5)N6<d\qmB-UQob&IDU4.:,9VmqE5[kS**d)h12OEfG`=*De'6X'A\0=_uFm6f>I4Em7Mk*3L8;K$"Yr1&"P$Q["@oef$Tc.'s"$DWfqakfP)Yb[lhPn`Gc((Y=S3+-qsWC!pW#M7^0srC>Y.7@MhrGW*,C%8#3So/C.[BMmK`?-:$!K:f]W7[J'Wif>at3)]4DQ3UJLY19o%9Vpca;30\.W^aMY#-aBsCB'PI\`W$lO=\D\Os3mEcPW)&.3rrHPGOVfoie`5cnAB9/Q_n'S]^5&<21W1r'&'fKZ9^qg1jcY*NsqgJIM!)7#gIIa?8t+L]'?(OMm&Qm"[TmKnt?G9jJnr-Fn'I)"<4,o%4\[S-tPP_XL,\ngGeUjPBYI-f;s7/;Zq0Fa\LJdm<+Vmc/Q-i#@]%G_OZN<n!dr@1+gn&$,GLqtoA^SF1<(k`ZU"b'UPbHI$l61#RHJj=+Y])EtFD1n($FpmRe]/.Pja4BDcGQ4;0T<)Zel!AA[:s,K+S!XtMQam]ddb0_.F6m!QiC@52Ykr8]%D^?ba#"6sNG$9j1B@D-PWGnoJik#gL!NOumRU]6?<G\<G!+bjYL&q`-oK;.mkBLDpd^l`US5#:`:+G2((QmqBm7%q&.9-S.&]9!XAioX/4;XCBf?4%?iquE?\LqoGLB&A*/IRi=<E+rC<9ji+^/X"0UN#;@?@8_%"*b*2%r&i15g\cRaJ?hL"e)tRU;kVYTI>m/I2Gf1SOVnMQ?d)]&eVr%!npr&&b.CV8)T(Xf($^_kr];gF0Guc_trM3XDHjhZ/=0d)dRB&$gLM'T;I,AJmi;_A(ri1YMdKU;RJU:NOMdm;a^12e3+33nuhU)o"fJKNT.cBYa"722TNTB:ocX+2iqB^0f@e.*ItQ,@QZIfI9mcre41P>^B*WW!GJo[G0DWcRJ:As\fC7cVQ'I0Jg9b[VHY\DEDSgLQg/,k?-&ap,<e"Ai;8\p1g^QdH6,:l<M$bT#P&R]VpCbE'-E8b^)+YN8=^#U1Wkm>LD)Y*,uM`;$Fc)YQLk2MDD/uFRODU)C?#aZ5SS;b'FaCq1I/'<!u)ao'nA"[bcZduii'3JRW%Q[)01VGm/R>h.?"*(IC,e95a!g?J3GCINhogW][=tan$l[;/',PWp(GS#@4uc08LkosiZXf!:S+VuaGuB/8?J_d<]KMQ+W6"o]b_R_hXW>s[O>b~>
-endstream
-endobj
-26 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 25 0 R
->>
-endobj
-27 0 obj
-<< /Length 1818 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb!Sl968iG&AII3E,nN2;]u;=cHUMaa-e8o@pM,i&!.&g84Z&j6-79Qmo#t"Kab!,1t,2U*_QY+g?84tl>eqsSrUODW3_0WRo//Xf*T>+55h."*X=5??B@.CE+Ym&7[JV:_2")8`@d"2f_(csgS_FS%br=QS9!j&:O]fn]&WMiGK3WA5Od#/0.2lL4d_Zj7daS4(]LA^DY4X*;!(GmkDpF<GiU5bbk;:TTLo1]VCk8$@]g[CUN->/6"GRKGU6esJ8_sApah'n5Fq$XS"2Z6&jJFW&d<q+RKO+3XX9n\1aYLR>:l^&=nS,IV]r6&Ra$,_lUN^;QYIac;/!>6P/U[r3KOi1XS,D*naW5NfaemNlade\X3L^B%W28deEQIbYlOJpg2;:]VduLAZ5@AFMe>R=_9;XH(<c[l."JIJ2n?D'(*k$q^h%_;QRSM,epUChP(A%F\sR94MZ30"[4%lU*u"o))E>eliPjV)1*F$f\eJX\n8.i!UhGT!fmrF<fE]MM&sK5m1^3oeSr7&+N6_XR>*L-R]Yac&U[%%AorMJ/W?287'RGdKl<Xas6Cue!bgl$;G;n.J6pKl9H_j%rr`-m_'LhP2<dRAlXA23<hk]8J\23;=LA?]C9>"T7n2)fG9nbniV;Q'G(.XQ3;l_IgE=P9AJIBj_C2rN7X6+k_,5SD'F,hGTVY&"F'rb0*6+p%((5$Y"hRGMAW0$U(+?FLkCP?[FFMh-g!V+$%!fJL:P`r"_gr_1c[\tn`8o9o5L=XRK!D_'&=7K2%_Jp^,fLW+qG5$]>T@B45i8njl&XB@hS<g.UF=Ck12T*Oj8&SNMlkeb<OM1sDqn>iM7![tJgXP$M8I0H/a4rjjm^Rb<Lfmk"<Z,H:doaQV^KC+'8mGed]WOo8*p.L8Kd9@i?84q/Vf90Wg+k@E2'Lk-7gAl!]ZcB!3o(/lr(5*eZ^W\_iZ#7.4D7SkEapdf:eh0Jc:t_aY`gA8?2-O\Ftd9q^Z^opd\9E\Nq3?S2*9`EjR<JqGpAMHB31gB:_FAbn#DJA%Aq7cDTG.(SX4A,_U?TL;-k5#.F>(WWO$D''pt]_pBAbPCn8.6oB`g>maQ[H\S)=Q%_M!Xa,*WgaG.0L/lE!!PbBB2Q"=\<MB\8?Pe>@D>pBk(5!BYt9;!Pabr9I_0!5V8?DO'fN]7^!LAhnZ-]`qf?d5ol!2Q<q2;&1FgS2]#Ul?ZP2@*UJ+)ITcX\-^_XtB^Hi#Gp/:6@S!B8K98$\p7(YH;?o6*i?Q/W]Cr#r\R&fbZh#FB+($DQ`P8C5lrn''QJT0^9Ia@pXV;U.t6_cR\Ui@<F6B:>o\$:Q4s1O"<m)mN+Zkm14l$GrWW6*=Q'm72qhGbu:IiB=36((!*lQT>0J*5RUWh[a:jCl]\3>.1.V0!EU7\UqPUL@[>A)#="#U6h2UDNH)=%W7:l-*f*Jl;CtkX'sgNtmogO3Lc0>3?5KgW2S.k@/dQE%J>hBFl2jU[:TZM&5UF2IO2O4FWoA>#lfslK=Q0Sc<EJW5b\r^&5fNkLWJAb?D)$?&9;&SHY_-uRWC8oNi'6K1R0s"8OR-sW6r0rUj7Ip[!K_Sik!+5H8>Cik#?1OrH9iIf4^S'@^#7'?F5Zmb+;OuK;qA?j/TilT6kN"bOC>%/?]C&mHa)!h2IM0I"lQdgfo;Y9muZ'G/80!FEPPRhPpl/o*-D>=nYLN?LX`#8$d(_0/-<HW5982q+A!D0Yn+DdIXk>^>q),@^&+S7Z-PoUd!c,q')&)7B8=!pe:)eK(4+_<^O7n8Fcl*KS=j_9(q,(qh%^hq8R64%MFdOrp[t6-~>
-endstream
-endobj
-28 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 27 0 R
->>
-endobj
-29 0 obj
-<< /Length 675 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gasal9okbt&A@ZcI,#b[Ch$u(gMXW+BiXhi>MFdo3/!.h23;MKlYAZsRl4-ELbNbOBBHmqH,tTX/GL(oPhY@M824M:,`2J4I'>s]+Q5%1)QeWf_8CXAK1mSOdI:b$$u_/)M3,j,m>mm3d%#YCQ[r7cOWdm76t6$BgBDgQ%,2jido@/N8gqglkj'7C"C@d`Ne-V-B0NAr=6@I^.)s,td$a?\I,C4GaY.dT2VR,4?^0<r@<GO<WRdn/nf;;ffCXt]UeI<S0rs5a*CkcXm$>jD"jY6.m'!_KJ!<t%SDESGK:C^7?$4GteONorc!fQnC=<r@FZnTnI\SDHUbX!ilI/aQ0!9(-C.T2=&>.)4]<6E"7?+I>;M/`6B!7mdGr1YBat\D<_a]]e8XRTbql2&eH`K2Mcs$aQ8E&>#lnN>$#!-<<s)kG/SgH_J"ePGA%m!s>W+^)t^K$j(Ns:Rh@BLbW;'^_g_nk=8A5&)h4$dO@<HLH_1^(&kRYldp?+RP_"o;VrHn=p3+5C;>7_T!5&:C'P%$V8I]/u')q6MJeMhu#(;?g%C218I"1-P5"&Nh^'81GJNes^Qi/dY%2=aIF4DsHK(%%SI"a[)eBPS8i=4sphOZP4YRUlj+mn%-t1'U*00pQ]TUSTjS+Q)+Rmmaf:e[G'k<S#geJ!Kq=\^]~>
-endstream
-endobj
-30 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 29 0 R
->>
-endobj
-32 0 obj
-<<
- /Title (\376\377\0\61\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\40\0\114\0\165\0\143\0\145\0\156\0\145)
- /Parent 31 0 R
- /Next 33 0 R
- /A 9 0 R
->> endobj
-33 0 obj
-<<
- /Title (\376\377\0\62\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\116\0\145\0\167\0\163)
- /Parent 31 0 R
- /First 34 0 R
- /Last 39 0 R
- /Prev 32 0 R
- /Count -6
- /A 11 0 R
->> endobj
-34 0 obj
-<<
- /Title (\376\377\0\62\0\56\0\61\0\40\0\62\0\64\0\40\0\104\0\145\0\143\0\145\0\155\0\142\0\145\0\162\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\116\0\151\0\147\0\150\0\164\0\154\0\171\0\40\0\123\0\156\0\141\0\160\0\163\0\150\0\157\0\164\0\163\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145\0\40\0\151\0\156\0\40\0\164\0\150\0\145\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\40\0\115\0\141\0\166\0\145\0\156\0\40\0\123\0\156\0\141\0\160\0\163\0\150\0\157\0\164\0\40\0\122\0\145\0\160\0\157\0\163\0\151\0\164\0\157\0\162\0\171)
- /Parent 33 0 R
- /Next 35 0 R
- /A 13 0 R
->> endobj
-35 0 obj
-<<
- /Title (\376\377\0\62\0\56\0\62\0\40\0\62\0\66\0\40\0\101\0\165\0\147\0\165\0\163\0\164\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\141\0\164\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\103\0\157\0\156\0\40\0\101\0\164\0\154\0\141\0\156\0\164\0\141)
- /Parent 33 0 R
- /Prev 34 0 R
- /Next 36 0 R
- /A 16 0 R
->> endobj
-36 0 obj
-<<
- /Title (\376\377\0\62\0\56\0\63\0\40\0\61\0\71\0\40\0\112\0\165\0\156\0\145\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\122\0\145\0\154\0\145\0\141\0\163\0\145\0\40\0\62\0\56\0\62\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145)
- /Parent 33 0 R
- /Prev 35 0 R
- /Next 37 0 R
- /A 18 0 R
->> endobj
-37 0 obj
-<<
- /Title (\376\377\0\62\0\56\0\64\0\40\0\61\0\70\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\141\0\164\0\40\0\101\0\160\0\141\0\143\0\150\0\145\0\103\0\157\0\156\0\40\0\105\0\165\0\162\0\157\0\160\0\145)
- /Parent 33 0 R
- /Prev 36 0 R
- /Next 38 0 R
- /A 20 0 R
->> endobj
-38 0 obj
-<<
- /Title (\376\377\0\62\0\56\0\65\0\40\0\61\0\67\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\122\0\145\0\154\0\145\0\141\0\163\0\145\0\40\0\62\0\56\0\61\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145)
- /Parent 33 0 R
- /Prev 37 0 R
- /Next 39 0 R
- /A 22 0 R
->> endobj
-39 0 obj
-<<
- /Title (\376\377\0\62\0\56\0\66\0\40\0\63\0\40\0\112\0\141\0\156\0\165\0\141\0\162\0\171\0\40\0\62\0\60\0\60\0\67\0\40\0\55\0\40\0\116\0\151\0\147\0\150\0\164\0\154\0\171\0\40\0\123\0\157\0\165\0\162\0\143\0\145\0\40\0\142\0\165\0\151\0\154\0\144\0\163\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145)
- /Parent 33 0 R
- /Prev 38 0 R
- /A 24 0 R
->> endobj
-40 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-41 0 obj
+8 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-42 0 obj
+9 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-43 0 obj
+10 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-44 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F7
-/BaseFont /Times-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
 1 0 obj
 << /Type /Pages
-/Count 4
-/Kids [6 0 R 26 0 R 28 0 R 30 0 R ] >>
+/Count 1
+/Kids [6 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 31 0 R
- /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 40 0 R /F5 41 0 R /F1 42 0 R /F2 43 0 R /F7 44 0 R >> 
+/Font << /F3 7 0 R /F5 8 0 R /F1 9 0 R /F2 10 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
-9 0 obj
-<<
-/S /GoTo
-/D [26 0 R /XYZ 85.0 659.0 null]
->>
-endobj
-11 0 obj
-<<
-/S /GoTo
-/D [26 0 R /XYZ 85.0 545.866 null]
->>
-endobj
-13 0 obj
-<<
-/S /GoTo
-/D [26 0 R /XYZ 85.0 514.732 null]
->>
-endobj
-16 0 obj
-<<
-/S /GoTo
-/D [26 0 R /XYZ 85.0 335.026 null]
->>
-endobj
-18 0 obj
-<<
-/S /GoTo
-/D [28 0 R /XYZ 85.0 655.0 null]
->>
-endobj
-20 0 obj
-<<
-/S /GoTo
-/D [28 0 R /XYZ 85.0 449.747 null]
->>
-endobj
-22 0 obj
-<<
-/S /GoTo
-/D [28 0 R /XYZ 85.0 276.894 null]
->>
-endobj
-24 0 obj
-<<
-/S /GoTo
-/D [30 0 R /XYZ 85.0 659.0 null]
->>
-endobj
-31 0 obj
-<<
- /First 32 0 R
- /Last 33 0 R
->> endobj
 xref
-0 45
+0 11
 0000000000 65535 f 
-0000010711 00000 n 
-0000010790 00000 n 
-0000010882 00000 n 
+0000001172 00000 n 
+0000001230 00000 n 
+0000001280 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000000972 00000 n 
-0000001092 00000 n 
-0000001173 00000 n 
-0000011005 00000 n 
-0000001308 00000 n 
-0000011068 00000 n 
-0000001444 00000 n 
-0000011134 00000 n 
-0000001582 00000 n 
-0000001718 00000 n 
-0000011200 00000 n 
-0000001855 00000 n 
-0000011266 00000 n 
-0000001992 00000 n 
-0000011330 00000 n 
-0000002129 00000 n 
-0000011396 00000 n 
-0000002266 00000 n 
-0000011462 00000 n 
-0000002403 00000 n 
-0000004418 00000 n 
-0000004526 00000 n 
-0000006437 00000 n 
-0000006545 00000 n 
-0000007312 00000 n 
-0000011526 00000 n 
-0000007420 00000 n 
-0000007588 00000 n 
-0000007785 00000 n 
-0000008384 00000 n 
-0000008750 00000 n 
-0000009066 00000 n 
-0000009438 00000 n 
-0000009778 00000 n 
-0000010155 00000 n 
-0000010268 00000 n 
-0000010378 00000 n 
-0000010486 00000 n 
-0000010602 00000 n 
+0000000622 00000 n 
+0000000728 00000 n 
+0000000840 00000 n 
+0000000949 00000 n 
+0000001056 00000 n 
 trailer
 <<
-/Size 45
+/Size 11
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-11577
+1389
 %%EOF
diff --git a/docs/linkmap.html b/docs/linkmap.html
index 9fa3cc202fa..81570119cbd 100644
--- a/docs/linkmap.html
+++ b/docs/linkmap.html
@@ -62,11 +62,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -100,25 +106,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
+<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">Documentation</div>
 <div id="menu_1.1" class="menuitemgroup">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -144,86 +201,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
@@ -256,38 +235,6 @@ document.write("Last Published: " + document.lastModified);
 <ul>
    
     
-  
-<ul>
-<li>
-<a>About</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>about</em>
-</li>
-<ul>
-      
-<ul>
-<li>
-<a href="index.html">Overview</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>overview</em>&nbsp;: Welcome to Java Lucene</li>
-</ul>
-      
-<ul>
-<li>
-<a href="features.html">Features</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>features</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>powered-by</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="whoweare.html">Who We Are</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>who-we-are</em>
-</li>
-</ul>
-  
-</ul>
-</ul>
     
   
 <ul>
@@ -298,10 +245,147 @@ document.write("Last Published: " + document.lastModified);
       
 <ul>
 <li>
-<a href="javadocs.html">Javadocs</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc</em>
+<a href="index.html">Overview</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>overview</em>
 </li>
 </ul>
-
+      
+<ul>
+<li>
+<a>Javadocs</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc</em>
+</li>
+<ul>
+         
+<ul>
+<li>
+<a href="api/index.html">All (Core, Demo, Contrib)</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-all</em>
+</li>
+</ul>
+		 
+<ul>
+<li>
+<a href="api/core/index.html">Core</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-core</em>
+</li>
+</ul>
+		 
+<ul>
+<li>
+<a href="api/demo/index.html">Demo</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-demo</em>
+</li>
+</ul>
+		 
+<ul>
+<li>
+<a>Contrib</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib</em>
+</li>
+<ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-analyzers/index.html">Analyzers</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-analyzers</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-ant/index.html">Ant</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-ant</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-bdb/index.html">Bdb</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-bdb</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-bdb-je</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-benchmark/index.html">Benchmark</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-benchmark</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-highlighter/index.html">Highlighter</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-highlighter</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-lucli/index.html">Lucli</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-lucli</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-memory/index.html">Memory</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-memory</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-misc/index.html">Miscellaneous</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-misc</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-queries/index.html">Queries</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-queries</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-regex/index.html">Regex</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-regex</em>
+</li>
+</ul>
+			
+            
+<ul>
+<li>
+<a href="api/contrib-snowball/index.html">Snowball</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-snowball</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-spellchecker</em>
+</li>
+</ul>
+		    
+<ul>
+<li>
+<a href="api/contrib-surround/index.html">Surround</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-surround</em>
+</li>
+</ul>			
+		    
+<ul>
+<li>
+<a href="api/contrib-swing/index.html">Swing</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-swing</em>
+</li>
+</ul>		    
+<ul>
+<li>
+<a href="api/contrib-wordnet/index.html">Wordnet</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-wordnet</em>
+</li>
+</ul>			
+		    
+<ul>
+<li>
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-xml-query-parser</em>
+</li>
+</ul>			
+		 
+</ul>
+</ul>
+	  
+</ul>
+</ul>
       
 <ul>
 <li>
@@ -353,179 +437,7 @@ document.write("Last Published: " + document.lastModified);
       
 <ul>
 <li>
-<a>Wiki</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>wiki</em>
-</li>
-<ul>
-        
-<ul>
-<li>
-<a href="http://wiki.apache.org/lucene-java">Main</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>wiki-main</em>
-</li>
-</ul>
-        
-<ul>
-<li>
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>wiki-con</em>
-</li>
-</ul>
-        
-<ul>
-<li>
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>wiki-howto</em>
-</li>
-</ul>
-        
-<ul>
-<li>
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>wiki-perf</em>
-</li>
-</ul>
-      
-</ul>
-</ul>
-  
-</ul>
-</ul>
-
-  
-<ul>
-<li>
-<a>Resources</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>resources</em>
-</li>
-<ul>
-      
-<ul>
-<li>
-<a href="developer-resources.html">Developers</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>developers</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>issues</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="mailinglists.html">Mailing Lists</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>contact</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="releases.html">Releases</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>release</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="systemrequirements.html">System Requirements</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>system</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>svn</em>
-</li>
-</ul>
-  
-</ul>
-</ul>
-  
-<ul>
-<li>
-<a>Site Versions</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>versions</em>
-</li>
-<ul>
-      
-<ul>
-<li>
-<a href="./">Main</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>official</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>rel1_4_3</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>rel1_9_0</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>rel1_9_1</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>rel2_0_0</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>rel2_1_0</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>rel2_2_0</em>
-</li>
-</ul>
-
-
-
-  
-</ul>
-</ul>
-  
-<ul>
-<li>
-<a>Related Projects</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>projects</em>
-</li>
-<ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>lucene</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>lucene</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org/lucy/">Lucy</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>lucene</em>
-</li>
-</ul>
-	  
-<ul>
-<li>
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>lucene</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org/nutch/">Nutch</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>lucene</em>
-</li>
-</ul>
-      
-<ul>
-<li>
-<a href="http://lucene.apache.org/solr/">SOLR</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>lucene</em>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>wiki</em>
 </li>
 </ul>
   
diff --git a/docs/linkmap.pdf b/docs/linkmap.pdf
index 9eee76c7f76..3cf90213764 100644
--- a/docs/linkmap.pdf
+++ b/docs/linkmap.pdf
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1216 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1131 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatUt?Z2u'(rl%9.Ce`T_"3%`GO=Y#l0(f&>pArNB:9)\%4f7DQtH<jZV;,"<#u]eV:IQaI=ABea#:Y907I#d#ZC_uFh*%b?a5./dfMs7s.UntD4EpXGT*^Yd2t<J8r6>@N0@4*\bTDdchmVo2QZLEm6$`s=T0ij,oY<^MZ/Rc?aMSH&0@'!3L1q@6TW;jG?&9B0_=AF/a$X6SRAB)P!`C>`)nJLr_O!aZuhR;bF>W/U`?@/[=+bF<e)tf$F$iFAEc2QGDt4),`A>[(<.MjVej-AKkLl-K3%cNO$DfXr'N`n1I)NG6Ol,2+YYhd'EJV*lklE>q:gnqeQaA/?h2(s6bG)b2[p2]^B((d?:F`pM;rD#7YZA42<6c2OGm]fi8in2+3/*d-u(ocS/J0a=T4Ju3]$IdcrTHVF,3+#aF#FW1C^tLR8XSTj1\!.%QZ<k1aSnO0?ClLUM,?kTZu63D!+)_L]Gi.T)<$DMiGpp2Q*;j0!HFAdN-*-I+us/-/+)VJplJ8:<#d9kO#Vo.:ke$hTMYNlU<X3Q#,U/!WoY9qa+Lir/V_'!!?nHJe(00;X)^>q\"Ah0rMQ)%smA51rX@)\'OZf37Ee3lDn`kYS2+(9nL)6RpoT=H8D/a!>F:>YV/uNOf'%A)DoS,p0fisJX=3rr+2<dc\7GaQ<!>IF=GsmY-&Vq7*i<k(G)s\>b2!mTpcAlW':ZdWoe#k?)bJ:G*SRXcD`]SpGGsSA6\0g1b"#BPFP_<'<")'D<*pf5uVZF=AQ62)KBs.4b8MI'QhSe03W"<=hX&7EB^II&&Ha3HnbtJpE"Pd<C[=_B3"0CZ#a=H>#"XpkXfloQr@8dTG+WYA+a)4k@u[Hd=r&#AEKtO#n;4Bf=[QeTkP=t:3,A6U3LUO:15:a1ko>/$ZU,M#/&98HVmg<Fk,JGq61fb'GeEEe*JJm6'qKnO!Emmc8W*'"o"95hbG6;$$V7\iB_O4'<PPQFWW]@eR<o>@_DkAlAJiuK9hrgH6JRW%J.3qAD\/(*57Oui-61-(j*X<Lnm?*gl#629:b#Vq]ODeQMN(8-`hafVtK&g?4Y\,>m(h&Y_ZHe#V_0?&XA90`LXP?d"t*YI]\^kKJM^k!AT"qi[i4X@*,)7=WZGRl=m09qh":(Ts9=qjN]X#cFIJq4lh<$?cc1dm7I3)ZBTdD[:a+0]N3Wo`G0Tl?$,pi:i*t8qS0=T'W_~>
+GatUtd;I\]'Sc)J'Y\C[K`MBo?T.;OWG4;-ak\^HN^FGgNh&4+]C+ng-AfP[7A?oQ)Q]J/43.8,R*8$lDo2Pg!/&s>"QdC7"G?@Q"]5,k+H_)25S14\Qu.JJ(Xp%UQbaM/Z++jpT9i@.FOtZZdRBkcY?'KPF]C?4D"a43Y@)N$P\GZP;E!TL'EJDpP+-=Z]aR3gSI>BWm4OG&WhC]gFgL%4,HJ8bJi?lZ51a"Q\^Zi^9krS8LTEMc*1Y]EKq0P5M3%"EN9NFG+t1W$)$K#bmJS3gV*q&^(&gAo3<s)IJ=%W*7*H(=EjS2A-6WWr(`M%:KN.M$<Hd#PkE\#O<ViGD,Qp\j9qc-`]f-c>P8t?q:CGmc(LFl;r7.9oL8nXm7Wf4+,(g`N(:(RE,us4*ek8+tCe?giR.##@E^Z$Lm/5>m\giST=O2[IC]:=!\Dc17CJ)Lqq-ng;RfsB+P#5g(*Rbk''#g+C,MboYV'=U+bKHh4Df!EXJRr\+(E&oia+uKsP=8$)l1%P[b;QS_9KLm2ZhB7P_o7-pfTbUBG)U;"_kC=K#\6uj>a9$np6XCf^6)rb`26(dE1D)$%b<=olrGSTmlDes++2/^\ER+3FiS%Ws-2V!&n-dhID3\KrM8O#B(Li:)aAZGQQQPN,Gr>-&6fGWAI,DeRIDudCt&7&)`.ub4Dng@3'.]gW^tlVSZhj8;i&2Cf,oU0[(8r'G,+@_G]A>:p(=Jh7IEkW'r`A'-S:R7M_W(L'0V0I[XRfiUe*Y5)[_#7m8:_h.Ge$?<dMj]))$lSjOM(riZsY:-)T#h<[bLUjei:Tqgm?ZpP2.WfesTAN6`jX(FC>,0E'gErl9M)MFE\rnb\EU&o\tfKNdb!/Z[Jlq[2Gs:eCsI;koDa5E!$B,A&g\F=.9*[c,og7qO*YXYOGlY_J/GQpt+@9b2AP*SSc2B5)@t3#NV:g9ZTn1lSP[R_IqGqEs:B]Z_5p"&,Q<#5L"n4h$1Km7nJ6#XgKl/I;QI"uQolU[Ot74B)l#+ZLMm`&Jr?4&\D/JqVMo#m$$Mluf^_X6$)(SJKF(79p9gaL"<hNHW6Z[7`<h4fqc0CKbL:\$FBJp(_7J;`c/QBXRS<S+"<CO=rndqEO/@1B7~>
 endstream
 endobj
 6 0 obj
@@ -20,10 +20,10 @@ endobj
 >>
 endobj
 7 0 obj
-<< /Length 940 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 776 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatUs9lo#B&;KZO$6><t<..t72OS12%S]mko[7guf*LBUfYf[io'a3i#e%f&Adk21TR@oaG,<`30_oZ<&S7?&?o9*@4e[\IQQiH05p[7H7%dq?IU,&i-83a]V38Vi(LN&/B>A,=)<>5u'W5^`Oea%$]_u*0h^J7,U?Wlt.`ac,I;LLSPsfVZ,i;:1.Ck4fKCW4`-Oj)!3K8s&(_91l(W'43ZEt%8EYt!TbT*!+PF/R.j2$BRdF5NnhDcMYPJ3*7")Rs7P\/BuDe>SbEGdZ]*?R^9l*5!NapaDY51U4lT-c5N/F?8P?siIU)')W"Yu8Hi/GA=TOA&Z9ME$N+*gaR/Bp$I)3Z"0)Ah39[:5=EMk^-m)Ni/T\<Sr;7>/a>Y-GrfA3NE;\@6P`j*4pt-TaS-`_bc"J.thBQj"mD*mV=5#5mF"c,cIa\.O]TaPi]W5U;Kf"30PG55;uK+H[oQ5E_<-\FCmSOoPCJ?q\k?`!X4@5/(#M1c\C_sYG'VG;"`KfM!%HR\>-ph/A's.50s4sk`"7qBZumK7CNN""7bF*F/JtZ(R_XScot\;g%K/qp*P'p*.;Z9L4*Y!-EYW+X4#:np`(omCcah8*;_q+'i(S<^9]@5JhQ:4TMi5q;itIfX!jE2`HS1!%AkOSd(WX4Vik%SMhCA6=%882UEuT@Zn65@'_A<1#3Og@Zgg`9KmV&;J&K9e`kn_d\6:cMaJ0_Rju8K1)]fOd;bsZus%]1EiRSnT_EWnUYA@d<<@c[CS@/-i@.IR;<r?]L'TN]",#L!42HHR-T[i,DjLTZocso`UGgP1g?XW9/PkX.jen;[-;URai@!/'&rC<$8E$@iK"Y?$!Y&:Q49-18YbM&Sk:ELotB/)_PB*F?n1Ho]oW,L"g<V\;lHR$#Q/mX2XoQRf(/P/!ueh29W.87H79AIMS5IU\ZT`~>
+GatUr?#SFN'Sc)P'u"K;iqY[]AQt-c;^W"dWKYnI1;TY%+b=#nqsW]qOdIVUPets*jF*Y1TAu.4E;!kg!@AA/0V0GlR:1X4(B[!l>ngO/JJ\Z:i:kJP+oE+#(is5;\p;GVFf(.(iM]rTqse_8rdaLM2%^Xgepu]Z##`#Js4")QkE-SBR44;aGA]P^)?)q!iM8YJ".[,T4PGV@_;_8KpI=Qp_+RKg(aQ6%:K8BW0f_,Pf;\EhY>]f&V;@oAnb.sq@#e>gJ;?QLOQ4%"U6hE#[`>Ak<:H?en$;6#NmMdfTcB_PW)GmJ,gW=iqK;lQf-k[)`u)d72:(_,PK>5a(6@!SS;%L)lo[j^=1%S3fI?EKU\4#:9%Pc*%URotO.d3>(%N+)2f26OD*$CI;2*E`l/sU+&.$n:S4m67.NKm*_-iHhSg'`u[WSRTodYH\$n;FV=LaZ2jl%4akn./IK>F^)Y,VlsHY1cL=PH!'0\<PCIZBEW(oiW$RqEVle#@(i)B>N6;W:k">KnlTNX+>&.G6&?lY8rg>fej!&0N-;DLFjE,S^$@6;3"-O_&"%MY$4'n--'cQt4sBg,j)D>,CZ%o%48l$WLc*7f=7N%b7cn8jmKnNR'1j)'DI0-o?`mMqNM=h=3?L[s1kM&25O2TH/4qf:V]``2IrCYhAi2pYHK9[kgBj+IPq@f2<.Trk1i\0;d0]jh<qmNk:)i,e>COd9U_#=&D1gk-6qIU:2o(:YAp:[ls(@QDRqaGoqC<[^5X,Y@4narrI]+-:%~>
 endstream
 endobj
 8 0 obj
@@ -87,19 +87,19 @@ endobj
 xref
 0 14
 0000000000 65535 f 
-0000003179 00000 n 
-0000003243 00000 n 
-0000003293 00000 n 
+0000002930 00000 n 
+0000002994 00000 n 
+0000003044 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001379 00000 n 
-0000001485 00000 n 
-0000002516 00000 n 
-0000002622 00000 n 
-0000002734 00000 n 
-0000002844 00000 n 
-0000002955 00000 n 
-0000003063 00000 n 
+0000001294 00000 n 
+0000001400 00000 n 
+0000002267 00000 n 
+0000002373 00000 n 
+0000002485 00000 n 
+0000002595 00000 n 
+0000002706 00000 n 
+0000002814 00000 n 
 trailer
 <<
 /Size 14
@@ -107,5 +107,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-3415
+3166
 %%EOF
diff --git a/docs/lucene-sandbox/index.html b/docs/lucene-sandbox/index.html
index 30b6258c096..1abd40ccc32 100644
--- a/docs/lucene-sandbox/index.html
+++ b/docs/lucene-sandbox/index.html
@@ -1,482 +1,461 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
-<meta name="Forrest-skin-name" content="pelt">
-<title>
-	Apache Lucene - Lucene Sandbox
-		</title>
-<link type="text/css" href="../skin/basic.css" rel="stylesheet">
-<link media="screen" type="text/css" href="../skin/screen.css" rel="stylesheet">
-<link media="print" type="text/css" href="../skin/print.css" rel="stylesheet">
-<link type="text/css" href="../skin/profile.css" rel="stylesheet">
-<script src="../skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="../skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="../skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="../images/favicon.ico">
-</head>
-<body onload="init()">
-<script type="text/javascript">ndeSetTextSize();</script>
-<div id="top">
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
-</div>
-<!--+
-    |header
-    +-->
-<div class="header">
-<!--+
-    |start group logo
-    +-->
-<div class="grouplogo">
-<a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="http://www.apache.org/images/asf_logo_simple.png" title="Apache Lucene"></a>
-</div>
-<!--+
-    |end group logo
-    +-->
-<!--+
-    |start Project Logo
-    +-->
-<div class="projectlogo">
-<a href="http://lucene.apache.org/java/"><img class="logoImage" alt="Lucene" src="http://lucene.apache.org/images/lucene_green_300.gif" title="Apache Lucene is a high-performance, full-featured text search engine library written entirely in
-      Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform."></a>
-</div>
-<!--+
-    |end Project Logo
-    +-->
-<!--+
-    |start Search
-    +-->
-<div class="searchbox">
-<form action="http://www.google.com/search" method="get" class="roundtopsmall">
-<input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input name="Search" value="Search" type="submit">
-</form>
-</div>
-<!--+
-    |end search
-    +-->
-<!--+
-    |start Tabs
-    +-->
-<ul id="tabs">
-<li class="current">
-<a class="selected" href="../index.html">Main</a>
-</li>
-<li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
-</li>
-</ul>
-<!--+
-    |end Tabs
-    +-->
-</div>
-</div>
-<div id="main">
-<div id="publishedStrip">
-<!--+
-    |start Subtabs
-    +-->
-<div id="level2tabs"></div>
-<!--+
-    |end Endtabs
-    +-->
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-
-             &nbsp;
-           </div>
-<!--+
-    |start Menu, mainarea
-    +-->
-<!--+
-    |start Menu
-    +-->
-<div id="menu">
-<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
-<div class="menuitem">
-<a href="../index.html" title="Welcome to Java Lucene">Overview</a>
-</div>
-<div class="menuitem">
-<a href="../features.html">Features</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
-</div>
-<div class="menuitem">
-<a href="../whoweare.html">Who We Are</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.2', '../skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Documentation</div>
-<div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
-<div class="menuitem">
-<a href="../javadocs.html">Javadocs</a>
-</div>
-<div class="menuitem">
-<a href="../benchmarks.html">Benchmarks</a>
-</div>
-<div class="menuitem">
-<a href="../contributions.html">Contributions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/LuceneFAQ">FAQ</a>
-</div>
-<div class="menuitem">
-<a href="../fileformats.html">File Formats</a>
-</div>
-<div class="menuitem">
-<a href="../gettingstarted.html">Getting Started</a>
-</div>
-<div class="menupage">
-<div class="menupagetitle">Lucene Sandbox</div>
-</div>
-<div class="menuitem">
-<a href="../queryparsersyntax.html">Query Syntax</a>
-</div>
-<div class="menuitem">
-<a href="../scoring.html">Scoring</a>
-</div>
-<div onclick="SwitchMenu('menu_1.2.10', '../skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', '../skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="../developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="../mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="../releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="../systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href=".././">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', '../skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
-</div>
-</div>
-<div id="credit">
-<hr>
-<a href="http://forrest.apache.org/"><img border="0" title="Built with Apache Forrest" alt="Built with Apache Forrest - logo" src="../images/built-with-forrest-button.png" style="width: 88px;height: 31px;"></a>
-</div>
-<div id="roundbottom">
-<img style="display: none" class="corner" height="15" width="15" alt="" src="../skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
-<!--+
-  |alternative credits
-  +-->
-<div id="credit2"></div>
-</div>
-<!--+
-    |end Menu
-    +-->
-<!--+
-    |start content
-    +-->
-<div id="content">
-<div title="Portable Document Format" class="pdflink">
-<a class="dida" href="index.pdf"><img alt="PDF -icon" src="../skin/images/pdfdoc.gif" class="skin"><br>
-        PDF</a>
-</div>
-<h1>
-	Apache Lucene - Lucene Sandbox
-		</h1>
-<div id="minitoc-area">
-<ul class="minitoc">
-<li>
-<a href="#Lucene Sandbox">Lucene Sandbox</a>
-<ul class="minitoc">
-<li>
-<a href="#Snowball Stemmers for Lucene">Snowball Stemmers for Lucene</a>
-</li>
-<li>
-<a href="#Analyzers, Tokenizers, Filters">Analyzers, Tokenizers, Filters</a>
-</li>
-<li>
-<a href="#Ant">Ant</a>
-</li>
-<li>
-<a href="#WordNet/Synonyms">WordNet/Synonyms</a>
-</li>
-<li>
-<a href="#Lucli - Lucene Command-line Interface">Lucli - Lucene Command-line Interface</a>
-</li>
-<li>
-<a href="#Term Highlighter">Term Highlighter</a>
-</li>
-<li>
-<a href="#Javascript Query Constructor">Javascript Query Constructor</a>
-</li>
-<li>
-<a href="#Javascript Query Validator">Javascript Query Validator</a>
-</li>
-<li>
-<a href="#High Frequency Terms">High Frequency Terms</a>
-</li>
-<li>
-<a href="#GData-Server">GData-Server</a>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-
-        
-<a name="N10012"></a><a name="Lucene Sandbox"></a>
-<h2 class="boxed">Lucene Sandbox</h2>
-<div class="section">
-<p>
-                Lucene project also contains a workspace, Lucene Sandbox, that is open to all Lucene committers, as well
-                as a few other developers.  The purpose of the Sandbox is to host various third party contributions,
-                and to serve as a place to try out new ideas and prepare them for inclusion into the core Lucene
-                distribution.<br>
-                Users are free to experiment with the components developed in the Sandbox, but Sandbox components will
-                not necessarily be maintained, particularly in their current state.
-            </p>
-<p>
-                You can access the Lucene Sandbox repository at
-                <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/">http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/</a>.
-            </p>
-<a name="N10023"></a><a name="Snowball Stemmers for Lucene"></a>
-<h3 class="boxed">Snowball Stemmers for Lucene</h3>
-<p>
-                    This project provides pre-compiled versions of the Snowball stemmers
-                    for Lucene.
-                </p>
-<p>
-                    
-<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/snowball">The
-                        repository for the Snowball contribution.</a>
-                
-</p>
-<p>
-                    
-<a href="http://snowball.tartarus.org/">Background information on Snowball</a>,
-                    which is a language for stemmers developed by Martin Porter.
-                </p>
-<a name="N1003A"></a><a name="Analyzers, Tokenizers, Filters"></a>
-<h3 class="boxed">Analyzers, Tokenizers, Filters</h3>
-<p>
-                  Contributed Analyzers, Tokenizers, and Filters for various languages.
-                </p>
-<p>
-                    
-<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/analyzers/">The
-                        repository for the Analyzers contribution.</a>
-                
-</p>
-<a name="N1004A"></a><a name="Ant"></a>
-<h3 class="boxed">Ant</h3>
-<p>
-                    The Ant project is a useful Ant task that creates a Lucene index out of an Ant fileset.  It also
-                    contains an example HTML parser that uses JTidy.
-                </p>
-<p>
-                    
-<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/ant/">The
-                        repository for the Ant contribution.</a>
-                
-</p>
-<a name="N1005A"></a><a name="WordNet/Synonyms"></a>
-<h3 class="boxed">WordNet/Synonyms</h3>
-<p>
-                    The Lucene WordNet code consists of a single class which parses a prolog file
-                    from the WordNet site that contains a list of English words and synonyms.
-                    The class builds a Lucene index from the synonyms file.  Your querying code could
-                    hit this index to build up a set of synonyms for the terms in the
-                    search query.
-                </p>
-<p>
-                    More information on the <a href="http://www.tropo.com/techno/java/lucene/wordnet.html">Lucene WordNet package</a>.
-                    <a href="http://wordnet.princeton.edu/">WordNet</a> is an online database of English language words that contains
-                    synonyms, definitions, and various relationships between synonym sets.
-                </p>
-<p>
-                    
-<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/wordnet/">The
-                        repository for the WordNet module.</a>
-                
-</p>
-<a name="N10075"></a><a name="Lucli - Lucene Command-line Interface"></a>
-<h3 class="boxed">Lucli - Lucene Command-line Interface</h3>
-<p>
-                  The Lucli application allows index manipulation from the
-                    command-line.
-                </p>
-<p>
-                    
-<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/lucli/">The
-                        repository for the Lucli contribution.</a>
-                
-</p>
-<a name="N10085"></a><a name="Term Highlighter"></a>
-<h3 class="boxed">Term Highlighter</h3>
-<p>
-                  A small set of classes for highlighting matching terms in
-                    search results.
-                </p>
-<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/highlighter/">The
-                        repository for the Highlighter contribution.</a><a name="N10092"></a><a name="Javascript Query Constructor"></a>
-<h3 class="boxed">Javascript Query Constructor</h3>
-<p>
-                    Javascript library to support client-side query-building. Provides support for a user interface similar to
-                    <a href="http://www.google.com.sg/advanced_search">Google's Advanced Search</a>.
-                </p>
-<p>
-
-                    
-<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/javascript/queryConstructor/">The
-                        repository for the Javascript Query Constructor files.</a>
-                
-</p>
-<a name="N100A6"></a><a name="Javascript Query Validator"></a>
-<h3 class="boxed">Javascript Query Validator</h3>
-<p>
-                    Javascript library to support client-side query validation. Lucene doesn't like malformed queries and tends to
-                    throw ParseException, which are often difficult to interpret and pass on to the user. This library hopes to
-                    alleviate that problem.
-                </p>
-<p>
-
-                    
-<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/javascript/queryValidator/">The
-                        repository for the Javascript Query Validator files.</a>
-                
-</p>
-<a name="N100B6"></a><a name="High Frequency Terms"></a>
-<h3 class="boxed">High Frequency Terms</h3>
-<p>
-                    The miscellaneous package is for classes that don't fit anywhere else. The only class in it right now determines
-                    what terms occur the most inside a Lucene index.  This could be useful for analyzing which terms may need to go
-                    into a custom stop word list for better search results.
-                </p>
-<p>
-
-                    
-<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/miscellaneous/">The
-                        repository for miscellaneous classes.</a>
-                
-</p>
-<a name="N100C6"></a><a name="GData-Server"></a>
-<h3 class="boxed">GData-Server</h3>
-<p>
-                     Apache - Lucene based serverside implementation of <a href="http://code.google.com/apis/gdata/">Google's GData</a> protocol. GData-Server provides an extendable
-                     full featured gdata feed server to add, remove, update ATOM 1.0 and RSS 2.0 feeds.
-                     Feeds are searchable via a defined HTTP GET parameter based query language like the Lucnene query syntax.
-                    </p>
-<p>
-
-                    
-<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/gdata-server/" title="Source repositiory">The
-                         repository for GData-server files and sources.</a>
-                    
-<br>
-                    
-<br>
-
-                    
-<a href="http://wiki.apache.org/lucene-java/GdataServer" title="GData-Server wiki">GData - Server wiki</a>
-
-                
-</p>
-</div>
-
-    
-</div>
-<!--+
-    |end content
-    +-->
-<div class="clearboth">&nbsp;</div>
-</div>
-<div id="footer">
-<!--+
-    |start bottomstrip
-    +-->
-<div class="lastmodified">
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<div class="copyright">
-        Copyright &copy;
-         2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
-<div id="logos"></div>
-<!--+
-    |end bottomstrip
-    +-->
-</div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="Apache Forrest" name="Generator">
+<meta name="Forrest-version" content="0.8">
+<meta name="Forrest-skin-name" content="pelt">
+<title>
+	Apache Lucene - Lucene Sandbox
+		</title>
+<link type="text/css" href="../skin/basic.css" rel="stylesheet">
+<link media="screen" type="text/css" href="../skin/screen.css" rel="stylesheet">
+<link media="print" type="text/css" href="../skin/print.css" rel="stylesheet">
+<link type="text/css" href="../skin/profile.css" rel="stylesheet">
+<script src="../skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="../skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="../skin/fontsize.js" language="javascript" type="text/javascript"></script>
+<link rel="shortcut icon" href="../images/favicon.ico">
+</head>
+<body onload="init()">
+<script type="text/javascript">ndeSetTextSize();</script>
+<div id="top">
+<!--+
+    |breadtrail
+    +-->
+<div class="breadtrail">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
+</div>
+<!--+
+    |header
+    +-->
+<div class="header">
+<!--+
+    |start group logo
+    +-->
+<div class="grouplogo">
+<a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="http://www.apache.org/images/asf_logo_simple.png" title="Apache Lucene"></a>
+</div>
+<!--+
+    |end group logo
+    +-->
+<!--+
+    |start Project Logo
+    +-->
+<div class="projectlogo">
+<a href="http://lucene.apache.org/java/"><img class="logoImage" alt="Lucene" src="http://lucene.apache.org/images/lucene_green_300.gif" title="Apache Lucene is a high-performance, full-featured text search engine library written entirely in
+      Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform."></a>
+</div>
+<!--+
+    |end Project Logo
+    +-->
+<!--+
+    |start Search
+    +-->
+<div class="searchbox">
+<form action="http://www.google.com/search" method="get" class="roundtopsmall">
+<input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
+                    <input name="Search" value="Search" type="submit">
+</form>
+</div>
+<!--+
+    |end search
+    +-->
+<!--+
+    |start Tabs
+    +-->
+<ul id="tabs">
+<li class="current">
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
+</li>
+<li>
+<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+</li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="../index.html">Lucene 2.4-dev Documentation</a>
+</li>
+</ul>
+<!--+
+    |end Tabs
+    +-->
+</div>
+</div>
+<div id="main">
+<div id="publishedStrip">
+<!--+
+    |start Subtabs
+    +-->
+<div id="level2tabs"></div>
+<!--+
+    |end Endtabs
+    +-->
+<script type="text/javascript"><!--
+document.write("Last Published: " + document.lastModified);
+//  --></script>
+</div>
+<!--+
+    |breadtrail
+    +-->
+<div class="breadtrail">
+
+             &nbsp;
+           </div>
+<!--+
+    |start Menu, mainarea
+    +-->
+<!--+
+    |start Menu
+    +-->
+<div id="menu">
+<div onclick="SwitchMenu('menu_selected_1.1', '../skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Documentation</div>
+<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
+<div class="menuitem">
+<a href="../index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', '../skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="../api/index.html">All (Core, Demo, Contrib)</a>
+</div>
+<div class="menuitem">
+<a href="../api/core/index.html">Core</a>
+</div>
+<div class="menuitem">
+<a href="../api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', '../skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="../api/contrib-analyzers/index.html">Analyzers</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-ant/index.html">Ant</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="../api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
+</div>
+<div class="menuitem">
+<a href="../benchmarks.html">Benchmarks</a>
+</div>
+<div class="menuitem">
+<a href="../contributions.html">Contributions</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/lucene-java/LuceneFAQ">FAQ</a>
+</div>
+<div class="menuitem">
+<a href="../fileformats.html">File Formats</a>
+</div>
+<div class="menuitem">
+<a href="../gettingstarted.html">Getting Started</a>
+</div>
+<div class="menupage">
+<div class="menupagetitle">Lucene Sandbox</div>
+</div>
+<div class="menuitem">
+<a href="../queryparsersyntax.html">Query Syntax</a>
+</div>
+<div class="menuitem">
+<a href="../scoring.html">Scoring</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
+</div>
+</div>
+<div id="credit">
+<hr>
+<a href="http://forrest.apache.org/"><img border="0" title="Built with Apache Forrest" alt="Built with Apache Forrest - logo" src="../images/built-with-forrest-button.png" style="width: 88px;height: 31px;"></a>
+</div>
+<div id="roundbottom">
+<img style="display: none" class="corner" height="15" width="15" alt="" src="../skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
+<!--+
+  |alternative credits
+  +-->
+<div id="credit2"></div>
+</div>
+<!--+
+    |end Menu
+    +-->
+<!--+
+    |start content
+    +-->
+<div id="content">
+<div title="Portable Document Format" class="pdflink">
+<a class="dida" href="index.pdf"><img alt="PDF -icon" src="../skin/images/pdfdoc.gif" class="skin"><br>
+        PDF</a>
+</div>
+<h1>
+	Apache Lucene - Lucene Sandbox
+		</h1>
+<div id="minitoc-area">
+<ul class="minitoc">
+<li>
+<a href="#Lucene Sandbox">Lucene Sandbox</a>
+<ul class="minitoc">
+<li>
+<a href="#Snowball Stemmers for Lucene">Snowball Stemmers for Lucene</a>
+</li>
+<li>
+<a href="#Analyzers, Tokenizers, Filters">Analyzers, Tokenizers, Filters</a>
+</li>
+<li>
+<a href="#Ant">Ant</a>
+</li>
+<li>
+<a href="#WordNet/Synonyms">WordNet/Synonyms</a>
+</li>
+<li>
+<a href="#Lucli - Lucene Command-line Interface">Lucli - Lucene Command-line Interface</a>
+</li>
+<li>
+<a href="#Term Highlighter">Term Highlighter</a>
+</li>
+<li>
+<a href="#Javascript Query Constructor">Javascript Query Constructor</a>
+</li>
+<li>
+<a href="#Javascript Query Validator">Javascript Query Validator</a>
+</li>
+<li>
+<a href="#High Frequency Terms">High Frequency Terms</a>
+</li>
+<li>
+<a href="#GData-Server">GData-Server</a>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+
+        
+<a name="N10012"></a><a name="Lucene Sandbox"></a>
+<h2 class="boxed">Lucene Sandbox</h2>
+<div class="section">
+<p>
+                Lucene project also contains a workspace, Lucene Sandbox, that is open to all Lucene committers, as well
+                as a few other developers.  The purpose of the Sandbox is to host various third party contributions,
+                and to serve as a place to try out new ideas and prepare them for inclusion into the core Lucene
+                distribution.<br>
+                Users are free to experiment with the components developed in the Sandbox, but Sandbox components will
+                not necessarily be maintained, particularly in their current state.
+            </p>
+<p>
+                You can access the Lucene Sandbox repository at
+                <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/">http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/</a>.
+            </p>
+<a name="N10023"></a><a name="Snowball Stemmers for Lucene"></a>
+<h3 class="boxed">Snowball Stemmers for Lucene</h3>
+<p>
+                    This project provides pre-compiled versions of the Snowball stemmers
+                    for Lucene.
+                </p>
+<p>
+                    
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/snowball">The
+                        repository for the Snowball contribution.</a>
+                
+</p>
+<p>
+                    
+<a href="http://snowball.tartarus.org/">Background information on Snowball</a>,
+                    which is a language for stemmers developed by Martin Porter.
+                </p>
+<a name="N1003A"></a><a name="Analyzers, Tokenizers, Filters"></a>
+<h3 class="boxed">Analyzers, Tokenizers, Filters</h3>
+<p>
+                  Contributed Analyzers, Tokenizers, and Filters for various languages.
+                </p>
+<p>
+                    
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/analyzers/">The
+                        repository for the Analyzers contribution.</a>
+                
+</p>
+<a name="N1004A"></a><a name="Ant"></a>
+<h3 class="boxed">Ant</h3>
+<p>
+                    The Ant project is a useful Ant task that creates a Lucene index out of an Ant fileset.  It also
+                    contains an example HTML parser that uses JTidy.
+                </p>
+<p>
+                    
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/ant/">The
+                        repository for the Ant contribution.</a>
+                
+</p>
+<a name="N1005A"></a><a name="WordNet/Synonyms"></a>
+<h3 class="boxed">WordNet/Synonyms</h3>
+<p>
+                    The Lucene WordNet code consists of a single class which parses a prolog file
+                    from the WordNet site that contains a list of English words and synonyms.
+                    The class builds a Lucene index from the synonyms file.  Your querying code could
+                    hit this index to build up a set of synonyms for the terms in the
+                    search query.
+                </p>
+<p>
+                    More information on the <a href="http://www.tropo.com/techno/java/lucene/wordnet.html">Lucene WordNet package</a>.
+                    <a href="http://wordnet.princeton.edu/">WordNet</a> is an online database of English language words that contains
+                    synonyms, definitions, and various relationships between synonym sets.
+                </p>
+<p>
+                    
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/wordnet/">The
+                        repository for the WordNet module.</a>
+                
+</p>
+<a name="N10075"></a><a name="Lucli - Lucene Command-line Interface"></a>
+<h3 class="boxed">Lucli - Lucene Command-line Interface</h3>
+<p>
+                  The Lucli application allows index manipulation from the
+                    command-line.
+                </p>
+<p>
+                    
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/lucli/">The
+                        repository for the Lucli contribution.</a>
+                
+</p>
+<a name="N10085"></a><a name="Term Highlighter"></a>
+<h3 class="boxed">Term Highlighter</h3>
+<p>
+                  A small set of classes for highlighting matching terms in
+                    search results.
+                </p>
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/highlighter/">The
+                        repository for the Highlighter contribution.</a><a name="N10092"></a><a name="Javascript Query Constructor"></a>
+<h3 class="boxed">Javascript Query Constructor</h3>
+<p>
+                    Javascript library to support client-side query-building. Provides support for a user interface similar to
+                    <a href="http://www.google.com.sg/advanced_search">Google's Advanced Search</a>.
+                </p>
+<p>
+
+                    
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/javascript/queryConstructor/">The
+                        repository for the Javascript Query Constructor files.</a>
+                
+</p>
+<a name="N100A6"></a><a name="Javascript Query Validator"></a>
+<h3 class="boxed">Javascript Query Validator</h3>
+<p>
+                    Javascript library to support client-side query validation. Lucene doesn't like malformed queries and tends to
+                    throw ParseException, which are often difficult to interpret and pass on to the user. This library hopes to
+                    alleviate that problem.
+                </p>
+<p>
+
+                    
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/javascript/queryValidator/">The
+                        repository for the Javascript Query Validator files.</a>
+                
+</p>
+<a name="N100B6"></a><a name="High Frequency Terms"></a>
+<h3 class="boxed">High Frequency Terms</h3>
+<p>
+                    The miscellaneous package is for classes that don't fit anywhere else. The only class in it right now determines
+                    what terms occur the most inside a Lucene index.  This could be useful for analyzing which terms may need to go
+                    into a custom stop word list for better search results.
+                </p>
+<p>
+
+                    
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/miscellaneous/">The
+                        repository for miscellaneous classes.</a>
+                
+</p>
+<a name="N100C6"></a><a name="GData-Server"></a>
+<h3 class="boxed">GData-Server</h3>
+<p>
+                     Apache - Lucene based serverside implementation of <a href="http://code.google.com/apis/gdata/">Google's GData</a> protocol. GData-Server provides an extendable
+                     full featured gdata feed server to add, remove, update ATOM 1.0 and RSS 2.0 feeds.
+                     Feeds are searchable via a defined HTTP GET parameter based query language like the Lucnene query syntax.
+                    </p>
+<p>
+
+                    
+<a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/gdata-server/" title="Source repositiory">The
+                         repository for GData-server files and sources.</a>
+                    
+<br>
+                    
+<br>
+
+                    
+<a href="http://wiki.apache.org/lucene-java/GdataServer" title="GData-Server wiki">GData - Server wiki</a>
+
+                
+</p>
+</div>
+
+    
+</div>
+<!--+
+    |end content
+    +-->
+<div class="clearboth">&nbsp;</div>
+</div>
+<div id="footer">
+<!--+
+    |start bottomstrip
+    +-->
+<div class="lastmodified">
+<script type="text/javascript"><!--
+document.write("Last Published: " + document.lastModified);
+//  --></script>
+</div>
+<div class="copyright">
+        Copyright &copy;
+         2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+</div>
+<div id="logos"></div>
+<!--+
+    |end bottomstrip
+    +-->
+</div>
+</body>
+</html>
diff --git a/docs/mailinglists.html b/docs/mailinglists.html
deleted file mode 100644
index aa8f3bf1ac2..00000000000
--- a/docs/mailinglists.html
+++ /dev/null
@@ -1,382 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
-<meta name="Forrest-skin-name" content="pelt">
-<title>
-	Apache Lucene - Mailing Lists
-		</title>
-<link type="text/css" href="skin/basic.css" rel="stylesheet">
-<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
-<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
-<link type="text/css" href="skin/profile.css" rel="stylesheet">
-<script src="skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="images/favicon.ico">
-</head>
-<body onload="init()">
-<script type="text/javascript">ndeSetTextSize();</script>
-<div id="top">
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
-</div>
-<!--+
-    |header
-    +-->
-<div class="header">
-<!--+
-    |start group logo
-    +-->
-<div class="grouplogo">
-<a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="http://www.apache.org/images/asf_logo_simple.png" title="Apache Lucene"></a>
-</div>
-<!--+
-    |end group logo
-    +-->
-<!--+
-    |start Project Logo
-    +-->
-<div class="projectlogo">
-<a href="http://lucene.apache.org/java/"><img class="logoImage" alt="Lucene" src="http://lucene.apache.org/images/lucene_green_300.gif" title="Apache Lucene is a high-performance, full-featured text search engine library written entirely in
-      Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform."></a>
-</div>
-<!--+
-    |end Project Logo
-    +-->
-<!--+
-    |start Search
-    +-->
-<div class="searchbox">
-<form action="http://www.google.com/search" method="get" class="roundtopsmall">
-<input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input name="Search" value="Search" type="submit">
-</form>
-</div>
-<!--+
-    |end search
-    +-->
-<!--+
-    |start Tabs
-    +-->
-<ul id="tabs">
-<li class="current">
-<a class="selected" href="index.html">Main</a>
-</li>
-<li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
-</li>
-</ul>
-<!--+
-    |end Tabs
-    +-->
-</div>
-</div>
-<div id="main">
-<div id="publishedStrip">
-<!--+
-    |start Subtabs
-    +-->
-<div id="level2tabs"></div>
-<!--+
-    |end Endtabs
-    +-->
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-
-             &nbsp;
-           </div>
-<!--+
-    |start Menu, mainarea
-    +-->
-<!--+
-    |start Menu
-    +-->
-<div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
-<div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
-</div>
-<div class="menuitem">
-<a href="features.html">Features</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
-</div>
-<div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
-<div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
-</div>
-<div class="menuitem">
-<a href="benchmarks.html">Benchmarks</a>
-</div>
-<div class="menuitem">
-<a href="contributions.html">Contributions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/LuceneFAQ">FAQ</a>
-</div>
-<div class="menuitem">
-<a href="fileformats.html">File Formats</a>
-</div>
-<div class="menuitem">
-<a href="gettingstarted.html">Getting Started</a>
-</div>
-<div class="menuitem">
-<a href="lucene-sandbox/index.html">Lucene Sandbox</a>
-</div>
-<div class="menuitem">
-<a href="queryparsersyntax.html">Query Syntax</a>
-</div>
-<div class="menuitem">
-<a href="scoring.html">Scoring</a>
-</div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.3', 'skin/')" id="menu_selected_1.3Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Resources</div>
-<div id="menu_selected_1.3" class="selectedmenuitemgroup" style="display: block;">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menupage">
-<div class="menupagetitle">Mailing Lists</div>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
-</div>
-</div>
-<div id="credit"></div>
-<div id="roundbottom">
-<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
-<!--+
-  |alternative credits
-  +-->
-<div id="credit2"></div>
-</div>
-<!--+
-    |end Menu
-    +-->
-<!--+
-    |start content
-    +-->
-<div id="content">
-<div title="Portable Document Format" class="pdflink">
-<a class="dida" href="mailinglists.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
-        PDF</a>
-</div>
-<h1>
-	Apache Lucene - Mailing Lists
-		</h1>
-<div id="minitoc-area">
-<ul class="minitoc">
-<li>
-<a href="#Java User List">Java User List</a>
-</li>
-<li>
-<a href="#Java Developer List">Java Developer List</a>
-</li>
-<li>
-<a href="#Archives">Mail Archives</a>
-</li>
-<li>
-<a href="#Other Mailing Lists">Other Mailing Lists</a>
-</li>
-</ul>
-</div>
-       
-<a name="N1000C"></a><a name="Java User List"></a>
-<h2 class="boxed">Java User List</h2>
-<div class="section">
-<p>
-              This list is for users of Java Lucene to ask questions, share knowledge,
-              and discuss issues. <b>Do</b> send mail to this list with usage and configuration questions and problems.  Also, please
-              send questions to this list to verify your problem before filing issues in JIRA.
-            </p>
-<ul>
-              
-<li>
-<a href="mailto:java-user-subscribe@lucene.apache.org">Subscribe</a>
-</li>
-              
-<li>
-<a href="mailto:java-user-unsubscribe@lucene.apache.org">Unsubscribe</a>
-</li>
-              
-<li>
-<a href="http://mail-archives.apache.org/mod_mbox/lucene-java-user/">Official Archive</a>
-              (<a href="http://mail-archives.apache.org/mod_mbox/jakarta-lucene-user/">Old Jakarta Archive</a>)</li>
-            
-</ul>
-</div>
-        
-<a name="N1002F"></a><a name="Java Developer List"></a>
-<h2 class="boxed">Java Developer List</h2>
-<div class="section">
-<p>
-              This is the list where participating developers of the Java Lucene project meet
-              and discuss issues concerning Lucene internals, code changes/additions, etc. Do not send mail to this list
-              with usage questions or configuration questions and problems.
-            </p>
-<p>
-          	Discussion list:
-            <ul>
-            
-<li>
-<a href="mailto:java-dev-subscribe@lucene.apache.org">Subscribe</a> -- <b>Do not send mail to this list
-              with usage questions or configuration questions and problems.</b>
-</li>
-            
-<li>
-<a href="mailto:java-dev-unsubscribe@lucene.apache.org">Unsubscribe</a>
-</li>
-            
-<li>
-<a href="http://mail-archives.apache.org/mod_mbox/lucene-java-dev/">Official Archive</a>
-            (<a href="http://mail-archives.apache.org/mod_mbox/jakarta-lucene-dev/">Old Jakarta Archive</a>)</li>
-            
-</ul>
-<br>
-            Commit notifications:
-            <ul>
-            
-<li>
-<a href="mailto:java-commits-subscribe@lucene.apache.org">Subscribe</a>
-</li>
-            
-<li>
-<a href="mailto:java-commits-unsubscribe@lucene.apache.org">Unsubscribe</a>
-</li>
-            
-<li>
-<a href="http://mail-archives.apache.org/mod_mbox/lucene-java-commits/">Archive</a>
-</li>
-            
-</ul>
-          
-</p>
-</div>
-      
-<a name="N10068"></a><a name="Archives"></a>
-<h2 class="boxed">Mail Archives</h2>
-<div class="section">
-<p>The Lucene Wiki maintains a list of searchable mailing list archives at <a href="http://wiki.apache.org/lucene-java/MailingListArchives">http://wiki.apache.org/lucene-java/MailingListArchives</a>.
-        No endorsement is implied by the listing of an archive on the Wiki.</p>
-</div>
-        
-<a name="N10075"></a><a name="Other Mailing Lists"></a>
-<h2 class="boxed">Other Mailing Lists</h2>
-<div class="section">
-<p>Each Lucene project maintains its own mailing lists.  Please refer to the project you are interested in for details
-                on subscribing to its mailing list.  For the Lucene TLP General mailing list, go <a href="http://lucene.apache.org/mail.html">here</a>.
-            </p>
-</div>
-
-
-</div>
-<!--+
-    |end content
-    +-->
-<div class="clearboth">&nbsp;</div>
-</div>
-<div id="footer">
-<!--+
-    |start bottomstrip
-    +-->
-<div class="lastmodified">
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<div class="copyright">
-        Copyright &copy;
-         2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
-<!--+
-    |end bottomstrip
-    +-->
-</div>
-</body>
-</html>
diff --git a/docs/mailinglists.pdf b/docs/mailinglists.pdf
deleted file mode 100644
index 5a411c561c5..00000000000
--- a/docs/mailinglists.pdf
+++ /dev/null
@@ -1,235 +0,0 @@
-%PDF-1.3
-%ª«¬­
-4 0 obj
-<< /Type /Info
-/Producer (FOP 0.20.5) >>
-endobj
-5 0 obj
-<< /Length 490 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb!#X9iHZu&A@Zcp.,^"o?#%X<I<rn30&6`*fu,n$pk,Tj1gpW`h^;@V]$%UPF(*R0CY9iF1(#C";6MgLZhh!&D/uW8H2KlopR66E\Dt,*B*=p+"*JF_4:<e^ZXGo&li-*ge@1s]ZA9eL!?*qRDCCAlb9S6F=_f;:&5JOpQ!dupoPBr9>0FfWL5,6frEKC-\7H0I$?=U:f8#,0d!gNljQ#s\'aNOMbV%N7b&j6>\5Z`nIhVc7!crI@,S>)'f\]Anm^&t=QiZuDH*NkCB"g?cjbYX;1M7a,:>[WJ;)PrZD"n/P:Z0%F5bkd_3)A)%<iD1(lW:L,^14+ct;uW>Q;(@r(BT.G<ksPJPk>`E]s[0)m"]*++4H)k`d3R:b,)-7q\f\O8W`\0OVVVQL@["1%Z`E*9ATeFg_7Lo3Koc5C6h%RYVR8R4,@8o%Z'oWjM_`CMRK]*Qi6Sk#I8hZ(`qg:qNuAeb`4A[V2Uh"#-u;XT~>
-endstream
-endobj
-6 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 5 0 R
-/Annots 7 0 R
->>
-endobj
-7 0 obj
-[
-8 0 R
-10 0 R
-12 0 R
-14 0 R
-]
-endobj
-8 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 559.666 178.652 547.666 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 9 0 R
-/H /I
->>
-endobj
-10 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 541.466 205.976 529.466 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 11 0 R
-/H /I
->>
-endobj
-12 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 523.266 178.988 511.266 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 13 0 R
-/H /I
->>
-endobj
-14 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 505.066 204.668 493.066 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 15 0 R
-/H /I
->>
-endobj
-16 0 obj
-<< /Length 1585 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gau0Dhc&8h&:Vr4iCB9G.$cF[8)NN-Qt,?r[HZJad0I]h&f&G^/I.%1rmniY<FVl"[)2lH>LIutC%kg\n#)oke'[oP9>W*!4fA/&.BWRW2[US'=?=>Q5@$@Ga<e"L$P%ZsW'69A+OoFH+e@<MT@*Q#BQ=hIZl1W(N*L!UJed4!3mCXl_/S;"Y+>U<-olLkXBt&U-@Ui3ogR'@=LUnhkK[.AHIK[-or?Uq(lsm-pH(?s8!jHL30Z:.C`nZL*],jR/#A67[.`'Rprt!QTXFh4]uq3ZZ.s41R7UnT\bR627q6r(8mSGZdsm`tH5.60mUMPIVfKM9BLnZ<NA4KqfkQN:CKQn0o[sqg+^lr+QO&hAGf=g,dXL]I&_`gV\\_Uj90%M^ag6\)DMu"3]n_PtBq$<=V/i\8$=0Gg8%`Y9)/InA\;19-gVE2aHb>pg0cp'7$ak46p.N+O%\T9r1C9J'pfXOpA]t$86oO&hk-%Psh<n%@BRd=G+<XoG!C&7bG2j*kK0iHm'>g'/ceFj_$8n#3o\sr/?KD>;poTl9R6K;bTYu8D+(8p_DR!#pMGZuQ'Zis1+o3;+mS]8_2t:B_PjuSCLNBOgDj45;,2sOV4"@6g))NV4bF7AATV,W6-^j+dP>tUZQO&Z>n:X!aVoU?K!i,4mY2[dh8e*>k9&a%,!;E^+)it;0'([`I!=?1S*7n[Ka)<_!#hDltX']0D7>6L<M7Ue&.i(N*O[Wl9Y`D._,n,W//H8:*7jF0sS1US/`:LOnD\TKNd,ngucZ0`E>I;'kk.i9/(\:MGmh&UU9]+\0HGK%V;RcmSfkd1dH54uBhO0s2]P_>V0Om_E8Os<&FiNJ!9`.IVp!!nL4>aps)*4n5JpB:1V6J"tU!?k@]uW,M[5[b;8@Rt*RbfZ*rliu0<Eblk^jSqLm`cX\]%IBmdk_Ti'E(M6]O6ic*BCm98U2HS'K(T.S!<)6_YgWhkolVoB[oD,=:]R$(,6F&U_Wq@Ljr#q@KA=;Y")6,B@thoJ(:="W\c6b(X(-$D;s]QAIO^>:`sr#>Ol].O*@;dT(FKbo:Zb?TrcCWo56=/#1+XP`5tW7]N@qW3iMR-k^&GRNSCJbGO-OMs$jj-qNMe"Y%9M1qbcZRW[+UI)*6a-rO)s6JEp;B[u/h4!-8og#@sKYfq'S(?fW#83:f8lR05T7_\lsW*P;]C,DtpiDdb$+I0osPN[-_H@m5Bb_Rg@_=)T0'0j\qt3D=a!ihl::r?/.\L>B>*Yg+l^!n1S%^14D*$AB.h2qr!Or,cB!a!k\>3+MKtah#^B-%qfRrf$.WfEr<;\+o3a">OqNrKbLBBR5#DN,*Z<<5#I_m!oc+L#)&9SJ.=qGBM=lG=UeKE5kDI`0h`3$_;gb.=ak3qA6Qb<,4b.MuoV[gq-'db<ed=-LKuEoi4j&NZ4'FZmkHE2bM0d7@3Od+/JsZ?KaB]LDt":o"I7)mCY.f-$>]7JJ)Algks?8<)a,9q8*Fu`(R^`^uhIib>k*j6!,3aR%VHN>4[a(G*g36>h/Q2Hr3):hrcglY4?EfYKmmc9hSDpe@mfGV3])aS0QS]+-78?!W~>
-endstream
-endobj
-17 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 16 0 R
->>
-endobj
-19 0 obj
-<<
- /Title (\376\377\0\61\0\40\0\112\0\141\0\166\0\141\0\40\0\125\0\163\0\145\0\162\0\40\0\114\0\151\0\163\0\164)
- /Parent 18 0 R
- /Next 20 0 R
- /A 9 0 R
->> endobj
-20 0 obj
-<<
- /Title (\376\377\0\62\0\40\0\112\0\141\0\166\0\141\0\40\0\104\0\145\0\166\0\145\0\154\0\157\0\160\0\145\0\162\0\40\0\114\0\151\0\163\0\164)
- /Parent 18 0 R
- /Prev 19 0 R
- /Next 21 0 R
- /A 11 0 R
->> endobj
-21 0 obj
-<<
- /Title (\376\377\0\63\0\40\0\115\0\141\0\151\0\154\0\40\0\101\0\162\0\143\0\150\0\151\0\166\0\145\0\163)
- /Parent 18 0 R
- /Prev 20 0 R
- /Next 22 0 R
- /A 13 0 R
->> endobj
-22 0 obj
-<<
- /Title (\376\377\0\64\0\40\0\117\0\164\0\150\0\145\0\162\0\40\0\115\0\141\0\151\0\154\0\151\0\156\0\147\0\40\0\114\0\151\0\163\0\164\0\163)
- /Parent 18 0 R
- /Prev 21 0 R
- /A 15 0 R
->> endobj
-23 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-24 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F5
-/BaseFont /Times-Roman
-/Encoding /WinAnsiEncoding >>
-endobj
-25 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding >>
-endobj
-26 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
-/Encoding /WinAnsiEncoding >>
-endobj
-27 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F7
-/BaseFont /Times-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-1 0 obj
-<< /Type /Pages
-/Count 2
-/Kids [6 0 R 17 0 R ] >>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 1 0 R
- /Outlines 18 0 R
- /PageMode /UseOutlines
- >>
-endobj
-3 0 obj
-<< 
-/Font << /F3 23 0 R /F5 24 0 R /F1 25 0 R /F2 26 0 R /F7 27 0 R >> 
-/ProcSet [ /PDF /ImageC /Text ] >> 
-endobj
-9 0 obj
-<<
-/S /GoTo
-/D [17 0 R /XYZ 85.0 659.0 null]
->>
-endobj
-11 0 obj
-<<
-/S /GoTo
-/D [17 0 R /XYZ 85.0 534.666 null]
->>
-endobj
-13 0 obj
-<<
-/S /GoTo
-/D [17 0 R /XYZ 85.0 317.132 null]
->>
-endobj
-15 0 obj
-<<
-/S /GoTo
-/D [17 0 R /XYZ 85.0 238.398 null]
->>
-endobj
-18 0 obj
-<<
- /First 19 0 R
- /Last 22 0 R
->> endobj
-xref
-0 28
-0000000000 65535 f 
-0000004484 00000 n 
-0000004549 00000 n 
-0000004641 00000 n 
-0000000015 00000 n 
-0000000071 00000 n 
-0000000652 00000 n 
-0000000772 00000 n 
-0000000818 00000 n 
-0000004764 00000 n 
-0000000953 00000 n 
-0000004827 00000 n 
-0000001090 00000 n 
-0000004893 00000 n 
-0000001227 00000 n 
-0000004959 00000 n 
-0000001364 00000 n 
-0000003042 00000 n 
-0000005025 00000 n 
-0000003150 00000 n 
-0000003323 00000 n 
-0000003541 00000 n 
-0000003724 00000 n 
-0000003928 00000 n 
-0000004041 00000 n 
-0000004151 00000 n 
-0000004259 00000 n 
-0000004375 00000 n 
-trailer
-<<
-/Size 28
-/Root 2 0 R
-/Info 4 0 R
->>
-startxref
-5076
-%%EOF
diff --git a/docs/queryparsersyntax.html b/docs/queryparsersyntax.html
index 497a42733e4..f65e6c34f1d 100644
--- a/docs/queryparsersyntax.html
+++ b/docs/queryparsersyntax.html
@@ -64,11 +64,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -102,25 +108,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
+<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
-<div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -146,86 +203,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menuitem">
 <a href="scoring.html">Scoring</a>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
diff --git a/docs/releases.html b/docs/releases.html
deleted file mode 100644
index 548d573afe6..00000000000
--- a/docs/releases.html
+++ /dev/null
@@ -1,310 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
-<meta name="Forrest-skin-name" content="pelt">
-<title>Apache Lucene - Downloads and Releases</title>
-<link type="text/css" href="skin/basic.css" rel="stylesheet">
-<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
-<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
-<link type="text/css" href="skin/profile.css" rel="stylesheet">
-<script src="skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="images/favicon.ico">
-</head>
-<body onload="init()">
-<script type="text/javascript">ndeSetTextSize();</script>
-<div id="top">
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
-</div>
-<!--+
-    |header
-    +-->
-<div class="header">
-<!--+
-    |start group logo
-    +-->
-<div class="grouplogo">
-<a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="http://www.apache.org/images/asf_logo_simple.png" title="Apache Lucene"></a>
-</div>
-<!--+
-    |end group logo
-    +-->
-<!--+
-    |start Project Logo
-    +-->
-<div class="projectlogo">
-<a href="http://lucene.apache.org/java/"><img class="logoImage" alt="Lucene" src="http://lucene.apache.org/images/lucene_green_300.gif" title="Apache Lucene is a high-performance, full-featured text search engine library written entirely in
-      Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform."></a>
-</div>
-<!--+
-    |end Project Logo
-    +-->
-<!--+
-    |start Search
-    +-->
-<div class="searchbox">
-<form action="http://www.google.com/search" method="get" class="roundtopsmall">
-<input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input name="Search" value="Search" type="submit">
-</form>
-</div>
-<!--+
-    |end search
-    +-->
-<!--+
-    |start Tabs
-    +-->
-<ul id="tabs">
-<li class="current">
-<a class="selected" href="index.html">Main</a>
-</li>
-<li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
-</li>
-</ul>
-<!--+
-    |end Tabs
-    +-->
-</div>
-</div>
-<div id="main">
-<div id="publishedStrip">
-<!--+
-    |start Subtabs
-    +-->
-<div id="level2tabs"></div>
-<!--+
-    |end Endtabs
-    +-->
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-
-             &nbsp;
-           </div>
-<!--+
-    |start Menu, mainarea
-    +-->
-<!--+
-    |start Menu
-    +-->
-<div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
-<div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
-</div>
-<div class="menuitem">
-<a href="features.html">Features</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
-</div>
-<div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
-<div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
-</div>
-<div class="menuitem">
-<a href="benchmarks.html">Benchmarks</a>
-</div>
-<div class="menuitem">
-<a href="contributions.html">Contributions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/LuceneFAQ">FAQ</a>
-</div>
-<div class="menuitem">
-<a href="fileformats.html">File Formats</a>
-</div>
-<div class="menuitem">
-<a href="gettingstarted.html">Getting Started</a>
-</div>
-<div class="menuitem">
-<a href="lucene-sandbox/index.html">Lucene Sandbox</a>
-</div>
-<div class="menuitem">
-<a href="queryparsersyntax.html">Query Syntax</a>
-</div>
-<div class="menuitem">
-<a href="scoring.html">Scoring</a>
-</div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.3', 'skin/')" id="menu_selected_1.3Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Resources</div>
-<div id="menu_selected_1.3" class="selectedmenuitemgroup" style="display: block;">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menupage">
-<div class="menupagetitle">Releases</div>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
-</div>
-</div>
-<div id="credit"></div>
-<div id="roundbottom">
-<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
-<!--+
-  |alternative credits
-  +-->
-<div id="credit2"></div>
-</div>
-<!--+
-    |end Menu
-    +-->
-<!--+
-    |start content
-    +-->
-<div id="content">
-<div title="Portable Document Format" class="pdflink">
-<a class="dida" href="releases.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
-        PDF</a>
-</div>
-<h1>Apache Lucene - Downloads and Releases</h1>
-<div id="minitoc-area">
-<ul class="minitoc">
-<li>
-<a href="#Downloads">Downloads and Releases</a>
-<ul class="minitoc">
-<li>
-<a href="#Official">Official Release</a>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-
-
-<a name="N10011"></a><a name="Downloads"></a>
-<h2 class="boxed">Downloads and Releases</h2>
-<div class="section">
-<p>Information on Lucene Java Downloads and Releases.</p>
-<a name="N10019"></a><a name="Official"></a>
-<h3 class="boxed">Official Release</h3>
-<p>Official releases are usually created when the <a href="whoweare.html">developers</a> feel there are
-            sufficient changes, improvements and bug fixes to warrant a release.
-            Due to the voluntary nature of Lucene, no releases are scheduled in advance. System Requirements are detailed
-            <a href="systemrequirements.html">here</a>.</p>
-<p>Both binary and source releases are available for 
-        <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">download from the Apache Mirrors</a>
-</p>
-<p>The lucene-VERSION.zip (where VERSION is the version number of the release, i.e. 2.0.0) file contains the
-            lucene-core jar file, html documentation, a demo application (see <a href="gettingstarted.html">Getting Started</a>)
-            and various jar files containing contributed code.
-            <br>
-             If all you need is the core jar file you can download that separately.
-        </p>
-</div>
-
-
-
-</div>
-<!--+
-    |end content
-    +-->
-<div class="clearboth">&nbsp;</div>
-</div>
-<div id="footer">
-<!--+
-    |start bottomstrip
-    +-->
-<div class="lastmodified">
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<div class="copyright">
-        Copyright &copy;
-         2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
-<!--+
-    |end bottomstrip
-    +-->
-</div>
-</body>
-</html>
diff --git a/docs/releases.pdf b/docs/releases.pdf
deleted file mode 100644
index fd40160130b..00000000000
--- a/docs/releases.pdf
+++ /dev/null
@@ -1,180 +0,0 @@
-%PDF-1.3
-%ª«¬­
-4 0 obj
-<< /Type /Info
-/Producer (FOP 0.20.5) >>
-endobj
-5 0 obj
-<< /Length 470 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GauI292i_N&:j6F'mja-V*H/aUK-XD39-sJW<Z*fRi-mJUiu\1L;Xj*SK8.DfO\FI%_Kf6q(`)q&;I7pYW_OW_^ZdZ]1jEU\qjc/7L<TIn1qQ,LjUeP0V`X9]hRq(\^[35F4VqKe&mK@E@RZ?.D.riGEdZ30#NlP;Db]T24Q<+&3<cMEoNT4P-DdeVA?acH#E:Ier<Pl&0qIsrX0>o'SXpG,STXH8)a/U@S1jjNGbS1>u;RI*lfMX<lmFG)@u@oDgd:(H?\7me?0s1hlaZNqU1;c%*Ktn;.pc"#sAT5qp&)si]TCbM,-LW8+mI)=lkoFIt5kdl[tCS%ce,t3X\.Kn`[^t_(gg/L;$cK.#1tm)*A*24')"#,)d-Q1[[sPi>e[+LU?B`0E%a#I+Qn`mJZ!Fb))<1`fZH?Iftg&o%B8p:=PkIBstSaD.PQpgluhGTA(=7=uN\cOp,mi59<_e5Q~>
-endstream
-endobj
-6 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 5 0 R
-/Annots 7 0 R
->>
-endobj
-7 0 obj
-[
-8 0 R
-10 0 R
-]
-endobj
-8 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 519.166 229.976 507.166 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 9 0 R
-/H /I
->>
-endobj
-10 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 500.966 201.14 488.966 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 11 0 R
-/H /I
->>
-endobj
-12 0 obj
-<< /Length 1126 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GatU2flEQ9'Rf-poU*iZ$3J0:fX+@"SZ]5q023O!&@OWM>_/EV?XL(j>hRK2e+&CU$8(G4Eu3X`SMs4)LZ@ARM-V42c[_,N8_kX]8?L;;a+lb;,VF7;8-AH*d.[Eq:e^ce.?7HSBBNmk>i/#,ZkJb9j.`qkFtc.4qPAa]VMAhfU9>@9?_T'SgZIM'I&[OqZ?dL"<Aka+]\omRk4:O=I+u8!]%ufZ:k!rT0Kd40>MQrHM^%0R\84h[_*QR<]!$.R9%F8NNG$0'G<4h#+76ORa8Xm&%,L\c2-b`#i4,K[`,DE+5N+Oq#c:IHciU6;1!`9<=E0(CQ@9bL3$eJ8KpU`eDoei=M`ii"It"I[b'rDM!VUZ<=]+P+JQ-X?E5;7tL'.+;%9T.j*A?K>/$OBGH!sF&VccOA\c^-V#+WD9eXG)C#*s'qBnY;pUS?Nn\`9Mh4VoRu]`t^Z:WPgHJV-WF#!oILp0a>'5.urpbYAqbC7#(@<ij]qI@6_i`!\8%:,63t5<^djN3IH9iL)<kOojjgZ5ouDkh'?O2nXh6qEkX5`iuc@Dj[bhB][6tcoo]CpAk.]2B/<QW%=Yo&Sn@Gb0L3Y6Y'qg.+kO"6`(h(`'\eNT9Us?7!uOV.C@t?V51+=h(p?&34QGNMi(9`X"SB4(AAn8i*TqTIX>mp$c3ut!QjW;!&I2ZQ.S]q/$>beb??n[#_GcY(^HqX@/'23b0(ofa&8*/aDrb)\;P)3m_D.=Tsrns^tW`30Q!8aJ?l#_%E,EOJ6=!n1L>ZDAD:rEdZZ<UGYrO$r#K\o;6;2dNTaJZ(+,):7;OE@%+-(o6L+CXIar'nFm$Ur-!&_L];a#O1FWUO=9S&Cb,12[`a3Bk)r)nFF!<cBcHPE"X.W:eq:09u.'5Aa11g;TYs8#,II!RD#I(?+;2c00`JI:;2/TSlFA0\&_FYGfn0W,p]!<mQ13"9S`&l[O(Sg]XeZhj(#Y/uMb,3S7[O(*lQ:t&I;Zk^6I?^,"<&>`t`7?h;&%GBiiLYg70+',;m1Ds1&lKDKL'5qCoh',r8usrlUP>U'W'*aBbB)KY["^os)h>`L?HBd))N&/lE[u9tFZG)jZ9G:7UH?'l2Qs[FnI43mIKT>iVl]~>
-endstream
-endobj
-13 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 12 0 R
->>
-endobj
-15 0 obj
-<<
- /Title (\376\377\0\61\0\40\0\104\0\157\0\167\0\156\0\154\0\157\0\141\0\144\0\163\0\40\0\141\0\156\0\144\0\40\0\122\0\145\0\154\0\145\0\141\0\163\0\145\0\163)
- /Parent 14 0 R
- /First 16 0 R
- /Last 16 0 R
- /Count -1
- /A 9 0 R
->> endobj
-16 0 obj
-<<
- /Title (\376\377\0\61\0\56\0\61\0\40\0\117\0\146\0\146\0\151\0\143\0\151\0\141\0\154\0\40\0\122\0\145\0\154\0\145\0\141\0\163\0\145)
- /Parent 15 0 R
- /A 11 0 R
->> endobj
-17 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-18 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F5
-/BaseFont /Times-Roman
-/Encoding /WinAnsiEncoding >>
-endobj
-19 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding >>
-endobj
-20 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
-/Encoding /WinAnsiEncoding >>
-endobj
-21 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F7
-/BaseFont /Times-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-1 0 obj
-<< /Type /Pages
-/Count 2
-/Kids [6 0 R 13 0 R ] >>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 1 0 R
- /Outlines 14 0 R
- /PageMode /UseOutlines
- >>
-endobj
-3 0 obj
-<< 
-/Font << /F3 17 0 R /F5 18 0 R /F1 19 0 R /F2 20 0 R /F7 21 0 R >> 
-/ProcSet [ /PDF /ImageC /Text ] >> 
-endobj
-9 0 obj
-<<
-/S /GoTo
-/D [13 0 R /XYZ 85.0 659.0 null]
->>
-endobj
-11 0 obj
-<<
-/S /GoTo
-/D [13 0 R /XYZ 85.0 606.666 null]
->>
-endobj
-14 0 obj
-<<
- /First 15 0 R
- /Last 15 0 R
->> endobj
-xref
-0 22
-0000000000 65535 f 
-0000003368 00000 n 
-0000003433 00000 n 
-0000003525 00000 n 
-0000000015 00000 n 
-0000000071 00000 n 
-0000000632 00000 n 
-0000000752 00000 n 
-0000000784 00000 n 
-0000003648 00000 n 
-0000000919 00000 n 
-0000003711 00000 n 
-0000001055 00000 n 
-0000002274 00000 n 
-0000003777 00000 n 
-0000002382 00000 n 
-0000002629 00000 n 
-0000002812 00000 n 
-0000002925 00000 n 
-0000003035 00000 n 
-0000003143 00000 n 
-0000003259 00000 n 
-trailer
-<<
-/Size 22
-/Root 2 0 R
-/Info 4 0 R
->>
-startxref
-3828
-%%EOF
diff --git a/docs/scoring.html b/docs/scoring.html
index 68676c2802b..2e71f3455c0 100644
--- a/docs/scoring.html
+++ b/docs/scoring.html
@@ -64,11 +64,17 @@
     +-->
 <ul id="tabs">
 <li class="current">
-<a class="selected" href="index.html">Main</a>
+<a class="selected" href="http://lucene.apache.org/java/docs/">Main</a>
 </li>
 <li>
 <a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
 </li>
+<li>
+<a class="unselected" href="http://lucene.apache.org/java/2_3_0/">Lucene 2.3.0 Documentation</a>
+</li>
+<li class="current">
+<a class="selected" href="index.html">Lucene 2.4-dev Documentation</a>
+</li>
 </ul>
 <!--+
     |end Tabs
@@ -102,25 +108,76 @@ document.write("Last Published: " + document.lastModified);
     |start Menu
     +-->
 <div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
+<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
+<a href="index.html">Overview</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2', 'skin/')" id="menu_1.1.2Title" class="menutitle">Javadocs</div>
+<div id="menu_1.1.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/index.html">All (Core, Demo, Contrib)</a>
 </div>
 <div class="menuitem">
-<a href="features.html">Features</a>
+<a href="api/core/index.html">Core</a>
 </div>
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
+<a href="api/demo/index.html">Demo</a>
+</div>
+<div onclick="SwitchMenu('menu_1.1.2.4', 'skin/')" id="menu_1.1.2.4Title" class="menutitle">Contrib</div>
+<div id="menu_1.1.2.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="api/contrib-analyzers/index.html">Analyzers</a>
 </div>
 <div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
+<a href="api/contrib-ant/index.html">Ant</a>
 </div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.2', 'skin/')" id="menu_selected_1.2Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Documentation</div>
-<div id="menu_selected_1.2" class="selectedmenuitemgroup" style="display: block;">
 <div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
+<a href="api/contrib-bdb/index.html">Bdb</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-benchmark/index.html">Benchmark</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-highlighter/index.html">Highlighter</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-lucli/index.html">Lucli</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-memory/index.html">Memory</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-misc/index.html">Miscellaneous</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-queries/index.html">Queries</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-regex/index.html">Regex</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-snowball/index.html">Snowball</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-surround/index.html">Surround</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-swing/index.html">Swing</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-wordnet/index.html">Wordnet</a>
+</div>
+<div class="menuitem">
+<a href="api/contrib-xml-query-parser/index.html">XML Query Parser</a>
+</div>
+</div>
 </div>
 <div class="menuitem">
 <a href="benchmarks.html">Benchmarks</a>
@@ -146,86 +203,8 @@ document.write("Last Published: " + document.lastModified);
 <div class="menupage">
 <div class="menupagetitle">Scoring</div>
 </div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
 <div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>
 </div>
 </div>
 <div id="credit"></div>
diff --git a/docs/skin/basic.css b/docs/skin/basic.css
index eb24c326c6c..3fad06f891f 100644
--- a/docs/skin/basic.css
+++ b/docs/skin/basic.css
@@ -1,166 +1,166 @@
-/*
-* 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.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/**
- * General
- */
-
-img { border: 0; }
-
-#content table {
-  border: 0;
-  width: 100%;
-}
-/*Hack to get IE to render the table at 100%*/
-* html #content table { margin-left: -3px; }
-
-#content th,
-#content td {
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-}
-
-.clearboth {
-  clear: both;
-}
-
-.note, .warning, .fixme {
-  border: solid black 1px;
-  margin: 1em 3em;
-}
-
-.note .label {
-  background: #369;
-  color: white;
-  font-weight: bold;
-  padding: 5px 10px;
-}
-.note .content {
-  background: #F0F0FF;
-  color: black;
-  line-height: 120%;
-  font-size: 90%;
-  padding: 5px 10px;
-}
-.warning .label {
-  background: #C00;
-  color: white;
-  font-weight: bold;
-  padding: 5px 10px;
-}
-.warning .content {
-  background: #FFF0F0;
-  color: black;
-  line-height: 120%;
-  font-size: 90%;
-  padding: 5px 10px;
-}
-.fixme .label {
-  background: #C6C600;
-  color: black;
-  font-weight: bold;
-  padding: 5px 10px;
-}
-.fixme .content {
-  padding: 5px 10px;
-}
-
-/**
- * Typography
- */
-
-body {
-  font-family: verdana, "Trebuchet MS", arial, helvetica, sans-serif;
-  font-size: 100%;
-}
-
-#content {
-  font-family: Georgia, Palatino, Times, serif;
-  font-size: 95%;
-}
-#tabs {
-  font-size: 70%;
-}
-#menu {
-  font-size: 80%;
-}
-#footer {
-  font-size: 70%;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  font-family: "Trebuchet MS", verdana, arial, helvetica, sans-serif;
-  font-weight: bold;
-  margin-top: 1em;
-  margin-bottom: .5em;
-}
-
-h1 {
-    margin-top: 0;
-    margin-bottom: 1em;
-  font-size: 1.4em;
-}
-#content h1 {
-  font-size: 160%;
-  margin-bottom: .5em;
-}
-#menu h1 {
-  margin: 0;
-  padding: 10px;
-  background: #336699;
-  color: white;
-}
-h2 { font-size: 120%; }
-h3 { font-size: 100%; }
-h4 { font-size: 90%; }
-h5 { font-size: 80%; }
-h6 { font-size: 75%; }
-
-p {
-  line-height: 120%;
-  text-align: left;
-  margin-top: .5em;
-  margin-bottom: 1em;
-}
-
-#content li,
-#content th,
-#content td,
-#content li ul,
-#content li ol{
-  margin-top: .5em;
-  margin-bottom: .5em;
-}
-
-
-#content li li,
-#minitoc-area li{
-  margin-top: 0em;
-  margin-bottom: 0em;
-}
-
-#content .attribution {
-  text-align: right;
-  font-style: italic;
-  font-size: 85%;
-  margin-top: 1em;
-}
-
-.codefrag {
-  font-family: "Courier New", Courier, monospace;
-  font-size: 110%;
-}
\ No newline at end of file
+/*
+* 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.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/**
+ * General
+ */
+
+img { border: 0; }
+
+#content table {
+  border: 0;
+  width: 100%;
+}
+/*Hack to get IE to render the table at 100%*/
+* html #content table { margin-left: -3px; }
+
+#content th,
+#content td {
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+}
+
+.clearboth {
+  clear: both;
+}
+
+.note, .warning, .fixme {
+  border: solid black 1px;
+  margin: 1em 3em;
+}
+
+.note .label {
+  background: #369;
+  color: white;
+  font-weight: bold;
+  padding: 5px 10px;
+}
+.note .content {
+  background: #F0F0FF;
+  color: black;
+  line-height: 120%;
+  font-size: 90%;
+  padding: 5px 10px;
+}
+.warning .label {
+  background: #C00;
+  color: white;
+  font-weight: bold;
+  padding: 5px 10px;
+}
+.warning .content {
+  background: #FFF0F0;
+  color: black;
+  line-height: 120%;
+  font-size: 90%;
+  padding: 5px 10px;
+}
+.fixme .label {
+  background: #C6C600;
+  color: black;
+  font-weight: bold;
+  padding: 5px 10px;
+}
+.fixme .content {
+  padding: 5px 10px;
+}
+
+/**
+ * Typography
+ */
+
+body {
+  font-family: verdana, "Trebuchet MS", arial, helvetica, sans-serif;
+  font-size: 100%;
+}
+
+#content {
+  font-family: Georgia, Palatino, Times, serif;
+  font-size: 95%;
+}
+#tabs {
+  font-size: 70%;
+}
+#menu {
+  font-size: 80%;
+}
+#footer {
+  font-size: 70%;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: "Trebuchet MS", verdana, arial, helvetica, sans-serif;
+  font-weight: bold;
+  margin-top: 1em;
+  margin-bottom: .5em;
+}
+
+h1 {
+    margin-top: 0;
+    margin-bottom: 1em;
+  font-size: 1.4em;
+}
+#content h1 {
+  font-size: 160%;
+  margin-bottom: .5em;
+}
+#menu h1 {
+  margin: 0;
+  padding: 10px;
+  background: #336699;
+  color: white;
+}
+h2 { font-size: 120%; }
+h3 { font-size: 100%; }
+h4 { font-size: 90%; }
+h5 { font-size: 80%; }
+h6 { font-size: 75%; }
+
+p {
+  line-height: 120%;
+  text-align: left;
+  margin-top: .5em;
+  margin-bottom: 1em;
+}
+
+#content li,
+#content th,
+#content td,
+#content li ul,
+#content li ol{
+  margin-top: .5em;
+  margin-bottom: .5em;
+}
+
+
+#content li li,
+#minitoc-area li{
+  margin-top: 0em;
+  margin-bottom: 0em;
+}
+
+#content .attribution {
+  text-align: right;
+  font-style: italic;
+  font-size: 85%;
+  margin-top: 1em;
+}
+
+.codefrag {
+  font-family: "Courier New", Courier, monospace;
+  font-size: 110%;
+}
diff --git a/docs/skin/print.css b/docs/skin/print.css
index aaa99319acd..90e78887d5a 100644
--- a/docs/skin/print.css
+++ b/docs/skin/print.css
@@ -1,54 +1,54 @@
-/*
-* 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.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-body {
-  font-family: Georgia, Palatino, serif;
-  font-size: 12pt;
-  background: white;
-}
-
-#tabs,
-#menu,
-#content .toc {
-  display: none;
-}
-
-#content {
-  width: auto;
-  padding: 0;
-  float: none !important;
-  color: black;
-  background: inherit;
-}
-
-a:link, a:visited {
-  color: #336699;
-  background: inherit;
-  text-decoration: underline;
-}
-
-#top .logo {
-  padding: 0;
-  margin: 0 0 2em 0;
-}
-
-#footer {
-  margin-top: 4em;
-}
-
-acronym {
-  border: 0;
-}
\ No newline at end of file
+/*
+* 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.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+body {
+  font-family: Georgia, Palatino, serif;
+  font-size: 12pt;
+  background: white;
+}
+
+#tabs,
+#menu,
+#content .toc {
+  display: none;
+}
+
+#content {
+  width: auto;
+  padding: 0;
+  float: none !important;
+  color: black;
+  background: inherit;
+}
+
+a:link, a:visited {
+  color: #336699;
+  background: inherit;
+  text-decoration: underline;
+}
+
+#top .logo {
+  padding: 0;
+  margin: 0 0 2em 0;
+}
+
+#footer {
+  margin-top: 4em;
+}
+
+acronym {
+  border: 0;
+}
diff --git a/docs/skin/profile.css b/docs/skin/profile.css
index 2ed95546ec6..654e1da047e 100644
--- a/docs/skin/profile.css
+++ b/docs/skin/profile.css
@@ -1,175 +1,175 @@
-
-
-/* ==================== aural ============================ */
-
-@media aural {
-  h1, h2, h3, h4, h5, h6 { voice-family: paul, male; stress: 20; richness: 90 }
-  h1 { pitch: x-low; pitch-range: 90 }
-  h2 { pitch: x-low; pitch-range: 80 }
-  h3 { pitch: low; pitch-range: 70 }
-  h4 { pitch: medium; pitch-range: 60 }
-  h5 { pitch: medium; pitch-range: 50 }
-  h6 { pitch: medium; pitch-range: 40 }
-  li, dt, dd { pitch: medium; richness: 60 }
-  dt { stress: 80 }
-  pre, code, tt { pitch: medium; pitch-range: 0; stress: 0; richness: 80 }
-  em { pitch: medium; pitch-range: 60; stress: 60; richness: 50 }
-  strong { pitch: medium; pitch-range: 60; stress: 90; richness: 90 }
-  dfn { pitch: high; pitch-range: 60; stress: 60 }
-  s, strike { richness: 0 }
-  i { pitch: medium; pitch-range: 60; stress: 60; richness: 50 }
-  b { pitch: medium; pitch-range: 60; stress: 90; richness: 90 }
-  u { richness: 0 }
-  
-  :link { voice-family: harry, male }
-  :visited { voice-family: betty, female }
-  :active { voice-family: betty, female; pitch-range: 80; pitch: x-high }
-}
-  
-a.external  {
-  padding: 0 20px 0px 0px;
-	display:inline;
-  background-repeat: no-repeat;
-	background-position: center right;
-	background-image: url(images/external-link.gif);
-}
-  
-#top          { background-color: #FFFFFF;}  
- 
-#top .header .current { background-color: #4C6C8F;} 
-#top .header .current a:link {  color: #ffffff;  }
-#top .header .current a:visited { color: #ffffff; }
-#top .header .current a:hover { color: #ffffff; }
- 
-#tabs li      { background-color: #E5E4D9 ;} 
-#tabs li a:link {  color: #000000;  }
-#tabs li a:visited { color: #000000; }
-#tabs li a:hover { color: #000000; }
-
-#level2tabs a.selected      { background-color: #4C6C8F ;} 
-#level2tabs a:link {  color: #ffffff;  }
-#level2tabs a:visited { color: #ffffff; }
-#level2tabs a:hover { color: #ffffff; }
-
-#level2tabs { background-color: #E5E4D9;}
-#level2tabs a.unselected:link {  color: #000000;  }
-#level2tabs a.unselected:visited { color: #000000; }
-#level2tabs a.unselected:hover { color: #000000; }
-
-.heading { background-color: #E5E4D9;} 
-
-.boxed { background-color: #E5E4D9;} 
-.underlined_5 	{border-bottom: solid 5px #E5E4D9;}
-.underlined_10 	{border-bottom: solid 10px #E5E4D9;}
-table caption { 
-background-color: #E5E4D9; 
-color: #000000;
-}
-    
-#feedback {
-color: #FFFFFF;
-background: #4C6C8F;
-text-align: center;
-}
-#feedback #feedbackto {
-color: #FFFFFF;
-}   
-
-#publishedStrip { 
-color: #FFFFFF;
-background: #4C6C8F; 
-}
-
-#publishedStrip { 
-color: #000000;
-background: #E5E4D9; 
-}
-
-#menu .menupagetitle  { background-color: #CFDCED;
-  color: #000000;}
-
-#menu           { border-color: #999999;}
-#menu .menupagetitle  { border-color: #999999;}
-#menu .menupageitemgroup  { border-color: #999999;}
-
-#menu      { background-color: #4C6C8F;} 
-#menu  {  color: #ffffff;} 
-#menu a:link {  color: #ffffff;} 
-#menu a:visited {  color: #ffffff;} 
-#menu a:hover {  
-background-color: #4C6C8F;
-color: #ffffff;} 
-
-#menu h1 {
-color: #000000;
-background-color: #cfdced;
-}   
- 
-#top .searchbox { 
-background-color: #E5E4D9 ;
-color: #000000; 
-} 
- 
-#menu .menupageitemgroup     { 
-background-color: #E5E4D9;
-}
-#menu .menupageitem {
-color: #000000;
-} 
-#menu .menupageitem a:link {  color: #000000;} 
-#menu .menupageitem a:visited {  color: #000000;} 
-#menu .menupageitem a:hover {  
-background-color: #E5E4D9;
-color: #000000;
-}
-
-body{ 
-background-color: #ffffff;
-color: #000000;
-} 
-a:link { color:#0000ff} 
-a:visited { color:#009999} 
-a:hover { color:#6587ff} 
-
- 
-.ForrestTable      { background-color: #ccc;} 
- 
-.ForrestTable td   { background-color: #ffffff;} 
- 
-.highlight        { background-color: #ffff00;} 
- 
-.fixme        { border-color: #c60;} 
- 
-.note         { border-color: #069;} 
- 
-.warning         { border-color: #900;} 
- 
-.code         { border-color: #a5b6c6;} 
- 
-#footer       { background-color: #E5E4D9;} 
-/* extra-css */
-    
-    p.quote {
-      margin-left: 2em;
-      padding: .5em;
-      background-color: #f0f0f0;
-      font-family: monospace;
-    }
-    img.float-right {
-      float: right;
-      margin-left: 2em;
-      padding: .5em;
-    }
-    
-    #footer a { color: #0F3660; }
-    #footer a:visited { color: #009999; }
-
-    pre.code {
-      margin-left: 2em;
-      margin-right: 2em;
-      padding: 0.5em;
-      background-color: #f0f0f0;
-    }
-      
-    
-  
\ No newline at end of file
+
+
+/* ==================== aural ============================ */
+
+@media aural {
+  h1, h2, h3, h4, h5, h6 { voice-family: paul, male; stress: 20; richness: 90 }
+  h1 { pitch: x-low; pitch-range: 90 }
+  h2 { pitch: x-low; pitch-range: 80 }
+  h3 { pitch: low; pitch-range: 70 }
+  h4 { pitch: medium; pitch-range: 60 }
+  h5 { pitch: medium; pitch-range: 50 }
+  h6 { pitch: medium; pitch-range: 40 }
+  li, dt, dd { pitch: medium; richness: 60 }
+  dt { stress: 80 }
+  pre, code, tt { pitch: medium; pitch-range: 0; stress: 0; richness: 80 }
+  em { pitch: medium; pitch-range: 60; stress: 60; richness: 50 }
+  strong { pitch: medium; pitch-range: 60; stress: 90; richness: 90 }
+  dfn { pitch: high; pitch-range: 60; stress: 60 }
+  s, strike { richness: 0 }
+  i { pitch: medium; pitch-range: 60; stress: 60; richness: 50 }
+  b { pitch: medium; pitch-range: 60; stress: 90; richness: 90 }
+  u { richness: 0 }
+  
+  :link { voice-family: harry, male }
+  :visited { voice-family: betty, female }
+  :active { voice-family: betty, female; pitch-range: 80; pitch: x-high }
+}
+  
+a.external  {
+  padding: 0 20px 0px 0px;
+	display:inline;
+  background-repeat: no-repeat;
+	background-position: center right;
+	background-image: url(images/external-link.gif);
+}
+  
+#top          { background-color: #FFFFFF;}  
+ 
+#top .header .current { background-color: #4C6C8F;} 
+#top .header .current a:link {  color: #ffffff;  }
+#top .header .current a:visited { color: #ffffff; }
+#top .header .current a:hover { color: #ffffff; }
+ 
+#tabs li      { background-color: #E5E4D9 ;} 
+#tabs li a:link {  color: #000000;  }
+#tabs li a:visited { color: #000000; }
+#tabs li a:hover { color: #000000; }
+
+#level2tabs a.selected      { background-color: #4C6C8F ;} 
+#level2tabs a:link {  color: #ffffff;  }
+#level2tabs a:visited { color: #ffffff; }
+#level2tabs a:hover { color: #ffffff; }
+
+#level2tabs { background-color: #E5E4D9;}
+#level2tabs a.unselected:link {  color: #000000;  }
+#level2tabs a.unselected:visited { color: #000000; }
+#level2tabs a.unselected:hover { color: #000000; }
+
+.heading { background-color: #E5E4D9;} 
+
+.boxed { background-color: #E5E4D9;} 
+.underlined_5 	{border-bottom: solid 5px #E5E4D9;}
+.underlined_10 	{border-bottom: solid 10px #E5E4D9;}
+table caption { 
+background-color: #E5E4D9; 
+color: #000000;
+}
+    
+#feedback {
+color: #FFFFFF;
+background: #4C6C8F;
+text-align: center;
+}
+#feedback #feedbackto {
+color: #FFFFFF;
+}   
+
+#publishedStrip { 
+color: #FFFFFF;
+background: #4C6C8F; 
+}
+
+#publishedStrip { 
+color: #000000;
+background: #E5E4D9; 
+}
+
+#menu .menupagetitle  { background-color: #CFDCED;
+  color: #000000;}
+
+#menu           { border-color: #999999;}
+#menu .menupagetitle  { border-color: #999999;}
+#menu .menupageitemgroup  { border-color: #999999;}
+
+#menu      { background-color: #4C6C8F;} 
+#menu  {  color: #ffffff;} 
+#menu a:link {  color: #ffffff;} 
+#menu a:visited {  color: #ffffff;} 
+#menu a:hover {  
+background-color: #4C6C8F;
+color: #ffffff;} 
+
+#menu h1 {
+color: #000000;
+background-color: #cfdced;
+}   
+ 
+#top .searchbox { 
+background-color: #E5E4D9 ;
+color: #000000; 
+} 
+ 
+#menu .menupageitemgroup     { 
+background-color: #E5E4D9;
+}
+#menu .menupageitem {
+color: #000000;
+} 
+#menu .menupageitem a:link {  color: #000000;} 
+#menu .menupageitem a:visited {  color: #000000;} 
+#menu .menupageitem a:hover {  
+background-color: #E5E4D9;
+color: #000000;
+}
+
+body{ 
+background-color: #ffffff;
+color: #000000;
+} 
+a:link { color:#0000ff} 
+a:visited { color:#009999} 
+a:hover { color:#6587ff} 
+
+ 
+.ForrestTable      { background-color: #ccc;} 
+ 
+.ForrestTable td   { background-color: #ffffff;} 
+ 
+.highlight        { background-color: #ffff00;} 
+ 
+.fixme        { border-color: #c60;} 
+ 
+.note         { border-color: #069;} 
+ 
+.warning         { border-color: #900;} 
+ 
+.code         { border-color: #a5b6c6;} 
+ 
+#footer       { background-color: #E5E4D9;} 
+/* extra-css */
+    
+    p.quote {
+      margin-left: 2em;
+      padding: .5em;
+      background-color: #f0f0f0;
+      font-family: monospace;
+    }
+    img.float-right {
+      float: right;
+      margin-left: 2em;
+      padding: .5em;
+    }
+    
+    #footer a { color: #0F3660; }
+    #footer a:visited { color: #009999; }
+
+    pre.code {
+      margin-left: 2em;
+      margin-right: 2em;
+      padding: 0.5em;
+      background-color: #f0f0f0;
+    }
+      
+    
+  
diff --git a/docs/skin/screen.css b/docs/skin/screen.css
index c6084f81df3..8616bb26000 100644
--- a/docs/skin/screen.css
+++ b/docs/skin/screen.css
@@ -1,587 +1,587 @@
-/*
-* 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.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-body {  margin: 0px 0px 0px 0px; font-family: Verdana, Helvetica, sans-serif; }
-
-h1     { font-size : 160%; margin: 0px 0px 0px 0px;  padding: 0px; }
-h2     { font-size : 140%; margin: 1em 0px 0.8em 0px; padding: 0px; font-weight : bold;}
-h3     { font-size : 130%; margin: 0.8em 0px 0px 0px; padding: 0px; font-weight : bold; }
-.h3 { margin: 22px 0px 3px 0px; }
-h4     { font-size : 120%; margin: 0.7em 0px 0px 0px; padding: 0px; font-weight : normal; text-align: left; }
-.h4 { margin: 18px 0px 0px 0px; }
-h4.faq { font-size : 120%; margin: 18px 0px 0px 0px; padding: 0px; font-weight : bold;   text-align: left; }
-h5     { font-size : 100%; margin: 14px 0px 0px 0px; padding: 0px; font-weight : normal; text-align: left; }
-
-/**
-* table
-*/
-table .title { background-color: #000000; }
-.ForrestTable         {
-    color: #ffffff;
-    background-color: #7099C5;
-    width: 100%;
-    font-size : 100%;
-    empty-cells: show;
-}
-table caption {
-    padding-left: 5px;
-    color: white;
-    text-align: left;
-    font-weight: bold;
-    background-color: #000000;
-}
-.ForrestTable td {
-    color: black;
-    background-color: #f0f0ff;
-}
-.ForrestTable th { text-align: center; }
-/**
- * Page Header
- */
-
-#top {
-    position: relative;
-    float: left;
-    width: 100%;
-    background: #294563; /* if you want a background in the header, put it here */
-}
-
-#top .breadtrail {
-    background: #CFDCED;
-    color: black;
-    border-bottom: solid 1px white;
-    padding: 3px 10px;
-    font-size: 75%;
-}
-#top .breadtrail a { color: black; }
-
-#top .header {
-    float: left;
-    width: 100%;
-    background: url("images/header_white_line.gif") repeat-x bottom;
-}
-
-#top .grouplogo {
-    padding: 7px 0 10px 10px;
-    float: left;
-    text-align: left;
-}
-#top .projectlogo {
-    padding: 7px 0 10px 10px;
-    float: left;
-    width: 33%;
-    text-align: right;
-}
-#top .projectlogoA1 {
-    padding: 7px 0 10px 10px;
-    float: right;
-}
-html>body #top .searchbox {
-    bottom: 0px;
-}
-#top .searchbox {
-    position: absolute;
-    right: 10px;
-    height: 42px;
-    font-size: 70%;
-    white-space: nowrap;
-    text-align: right;
-    color: white;
-    background-color: #000000;
-    z-index:0;
-    background-image: url(images/rc-t-l-5-1header-2searchbox-3searchbox.png);
-    background-repeat: no-repeat;
-    background-position: top left;
-    bottom: -1px; /* compensate for IE rendering issue */
-}
-
-#top .searchbox form {
-    padding: 5px 10px;
-    margin: 0;
-}
-#top .searchbox p {
-    padding: 0 0 2px 0;
-    margin: 0;
-}
-#top .searchbox input {
-    font-size: 100%;
-}
-
-#tabs {
-    clear: both;
-    padding-left: 10px;
-    margin: 0;
-    list-style: none;
-}
-/*    background: #CFDCED url("images/tab-right.gif") no-repeat right top;*/
-#tabs li {
-    float: left;
-    background-image: url(images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png);
-    background-repeat: no-repeat;
-    background-position: top right;
-    background-color: #000000;
-    margin: 0 3px 0 0;
-    padding: 0;
-}
-
-/*background: url("images/tab-left.gif") no-repeat left top;*/
-#tabs li a {
-    float: left;
-    display: block;
-    font-family: verdana, arial, sans-serif;
-    text-decoration: none;
-    color: black;
-    white-space: nowrap;
-    background-image: url(images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png);
-    background-repeat: no-repeat;
-    background-position: top left;
-    padding: 5px 15px 4px;
-    width: .1em; /* IE/Win fix */
-}
-
-#tabs li a:hover {
-   
-    cursor: pointer;
-    text-decoration:underline;
-}
-
-#tabs > li a { width: auto; } /* Rest of IE/Win fix */
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-#tabs a { float: none; }
-/* End IE5-Mac hack */
-
-#top .header .current {
-    background-color: #4C6C8F;
-    background-image: url(images/rc-t-r-5-1header-2tab-selected-3tab-selected.png);
-    background-repeat: no-repeat;
-    background-position: top right;
-}
-#top .header .current a {
-    font-weight: bold;
-    padding-bottom: 5px;
-    color: white;
-    background-image: url(images/rc-t-l-5-1header-2tab-selected-3tab-selected.png);
-    background-repeat: no-repeat;
-    background-position: top left;
-}
-#publishedStrip {
-    padding-right: 10px;
-    padding-left: 20px;
-    padding-top: 3px;
-    padding-bottom:3px;
-    color: #ffffff;
-    font-size : 60%;
-    font-weight: bold;
-    background-color: #4C6C8F;
-    text-align:right;
-}
-
-#level2tabs {
-margin: 0;
-float:left;
-position:relative;
-
-}
-
-
-
-#level2tabs  a:hover {
-   
-    cursor: pointer;
-    text-decoration:underline;
-    
-}
-
-#level2tabs  a{
-   
-    cursor: pointer;
-    text-decoration:none;
-    background-image: url('images/chapter.gif');
-    background-repeat: no-repeat;
-    background-position: center left;
-    padding-left: 6px;
-    margin-left: 6px;
-}
-
-/*
-*    border-top: solid #4C6C8F 15px;
-*/
-#main {
-    position: relative;
-    background: white;
-    clear:both;
-}
-#main .breadtrail {
-    clear:both;
-    position: relative;
-    background: #CFDCED;
-    color: black;
-    border-bottom: solid 1px black;
-    border-top: solid 1px black;
-    padding: 0px 180px;
-    font-size: 75%;
-    z-index:10;
-}
-/**
-* Round corner
-*/
-#roundtop {
-    background-image: url(images/rc-t-r-15-1body-2menu-3menu.png);
-    background-repeat: no-repeat;
-    background-position: top right;
-}
-
-#roundbottom {
-    background-image: url(images/rc-b-r-15-1body-2menu-3menu.png);
-    background-repeat: no-repeat;
-    background-position: top right;
-}
-
-img.corner {
-   width: 15px;
-   height: 15px;
-   border: none;
-   display: block !important;
-}
-
-.roundtopsmall {
-    background-image: url(images/rc-t-r-5-1header-2searchbox-3searchbox.png);
-    background-repeat: no-repeat;
-    background-position: top right;
-}
-
-#roundbottomsmall {
-    background-image: url(images/rc-b-r-5-1header-2tab-selected-3tab-selected.png);
-    background-repeat: no-repeat;
-    background-position: top right;
-}
-
-img.cornersmall {
-   width: 5px;
-   height: 5px;
-   border: none;
-   display: block !important;
-}
-/**
- * Side menu
- */
-#menu a {  font-weight: normal; text-decoration: none;}
-#menu a:visited {  font-weight: normal; }
-#menu a:active {  font-weight: normal; }
-#menu a:hover {  font-weight: normal;  text-decoration:underline;}
-
-#menuarea { width:10em;}
-#menu {
-    position: relative;
-    float: left;
-    width: 160px;
-    padding-top: 0px;
-    top:-18px;
-    left:10px;
-    z-index: 20;
-    background-color: #f90;
-    font-size : 70%;
-    
-}
-
-.menutitle {
-        cursor:pointer;
-        padding: 3px 12px;
-        margin-left: 10px;
-        background-image: url('images/chapter.gif');
-        background-repeat: no-repeat;
-        background-position: center left;
-        font-weight : bold;
-
-        
-}
-
-.menutitle:hover{text-decoration:underline;cursor: pointer;}
-
-#menu .menuitemgroup {
-        margin: 0px 0px 6px 8px;
-        padding: 0px;
-        font-weight : bold; }
-
-#menu .selectedmenuitemgroup{
-        margin: 0px 0px 0px 8px;
-        padding: 0px;
-        font-weight : normal; 
-       
-        }
-
-#menu .menuitem {
-        padding: 2px 0px 1px 13px;
-        background-image: url('images/page.gif');
-        background-repeat: no-repeat;
-        background-position: center left;
-        font-weight : normal;
-        margin-left: 10px;
-}
-
-#menu .menupage {
-        margin: 2px 0px 1px 10px;
-        padding: 0px 3px 0px 12px;
-        background-image: url('images/page.gif');
-        background-repeat: no-repeat;
-        background-position: center left;
-        font-style : normal;
-}
-#menu .menupagetitle {
-        padding: 0px 0px 0px 1px;
-        font-style : normal;
-        border-style: solid;
-        border-width: 1px;
-        margin-right: 10px;
-         
-}
-#menu .menupageitemgroup {
-        padding: 3px 0px 4px 6px;
-        font-style : normal;
-        border-bottom: 1px solid ;
-        border-left: 1px solid ;
-        border-right: 1px solid ;
-        margin-right: 10px;
-}
-#menu .menupageitem {
-        font-style : normal;
-        font-weight : normal;
-        border-width: 0px;
-        font-size : 90%;
-}
-#menu #credit {
-    text-align: center;
-}
-#menu #credit2 {
-    text-align: center;
-    padding: 3px 3px 3px 3px;
-    background-color: #ffffff;
-}
-#menu .searchbox {
-    text-align: center;
-}
-#menu .searchbox form {
-    padding: 3px 3px;
-    margin: 0;
-}
-#menu .searchbox input {
-    font-size: 100%;
-}
-
-#content {
-    padding: 20px 20px 20px 180px;
-    margin: 0;
-    font : small Verdana, Helvetica, sans-serif;
-    font-size : 80%;
-}
-
-#content ul {
-    margin: 0;
-    padding: 0 25px;
-}
-#content li {
-    padding: 0 5px;
-}
-#feedback {
-    color: black;
-    background: #CFDCED;
-    text-align:center;
-    margin-top: 5px;
-}
-#feedback #feedbackto {
-    font-size: 90%;
-    color: black;
-}
-#footer {
-    clear: both;
-    position: relative; /* IE bugfix (http://www.dracos.co.uk/web/css/ie6floatbug/) */
-    width: 100%;
-    background: #CFDCED;
-    border-top: solid 1px #4C6C8F;
-    color: black;
-}
-#footer .copyright {
-    position: relative; /* IE bugfix cont'd */
-    padding: 5px;
-    margin: 0;
-    width: 45%;
-}
-#footer .lastmodified {
-    position: relative; /* IE bugfix cont'd */
-    float: right;
-    width: 45%;
-    padding: 5px;
-    margin: 0;
-    text-align: right;
-}
-#footer a { color: white; }
-
-#footer #logos {
-    text-align: left;
-}
-
-
-/**
- * Misc Styles
- */
-
-acronym { cursor: help; }
-.boxed      { background-color: #a5b6c6;}
-.underlined_5     {border-bottom: solid 5px #4C6C8F;}
-.underlined_10     {border-bottom: solid 10px #4C6C8F;}
-/* ==================== snail trail ============================ */
-
-.trail {
-  position: relative; /* IE bugfix cont'd */
-  font-size: 70%;
-  text-align: right;
-  float: right;
-  margin: -10px 5px 0px 5px;
-  padding: 0;
-}
-
-#motd-area {
-    position: relative; /* IE bugfix cont'd */
-    float: right;
-    width: 35%;
-    background-color: #f0f0ff;
-    border-top: solid 1px #4C6C8F;
-    border-bottom: solid 1px #4C6C8F;
-    margin-bottom: 15px;
-    margin-left: 15px;
-    margin-right: 10%;
-    padding-bottom: 5px;
-    padding-top: 5px;
-}
-
-#minitoc-area {
-    border-top: solid 1px #4C6C8F;
-    border-bottom: solid 1px #4C6C8F;
-    margin: 15px 10% 5px 15px;
-   /* margin-bottom: 15px;
-    margin-left: 15px;
-    margin-right: 10%;*/
-    padding-bottom: 7px;
-    padding-top: 5px;
-}
-.minitoc {
-    list-style-image: url('images/current.gif');
-    font-weight: normal;
-}
-
-li p {
-    margin: 0;
-    padding: 0;
-}
-
-.pdflink {
-    position: relative; /* IE bugfix cont'd */
-    float: right;
-    margin: 0px 5px;
-    padding: 0;
-}
-.pdflink br {
-    margin-top: -10px;
-    padding-left: 1px;
-}
-.pdflink a {
-    display: block;
-    font-size: 70%;
-    text-align: center;
-    margin: 0;
-    padding: 0;
-}
-
-.pdflink img {
-    display: block;
-    height: 16px;
-    width: 16px;
-}
-.xmllink {
-    position: relative; /* IE bugfix cont'd */
-    float: right;
-    margin: 0px 5px;
-    padding: 0;
-}
-.xmllink br {
-    margin-top: -10px;
-    padding-left: 1px;
-}
-.xmllink a {
-    display: block;
-    font-size: 70%;
-    text-align: center;
-    margin: 0;
-    padding: 0;
-}
-
-.xmllink img {
-    display: block;
-    height: 16px;
-    width: 16px;
-}
-.podlink {
-    position: relative; /* IE bugfix cont'd */
-    float: right;
-    margin: 0px 5px;
-    padding: 0;
-}
-.podlink br {
-    margin-top: -10px;
-    padding-left: 1px;
-}
-.podlink a {
-    display: block;
-    font-size: 70%;
-    text-align: center;
-    margin: 0;
-    padding: 0;
-}
-
-.podlink img {
-    display: block;
-    height: 16px;
-    width: 16px;
-}
-
-.printlink {
-    position: relative; /* IE bugfix cont'd */
-    float: right;
-}
-.printlink br {
-    margin-top: -10px;
-    padding-left: 1px;
-}
-.printlink a {
-    display: block;
-    font-size: 70%;
-    text-align: center;
-    margin: 0;
-    padding: 0;
-}
-.printlink img {
-    display: block;
-    height: 16px;
-    width: 16px;
-}
-
-p.instruction {
-  display: list-item;
-  list-style-image: url('../images/instruction_arrow.png');
-  list-style-position: outside;
-  margin-left: 2em;
-} 
\ No newline at end of file
+/*
+* 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.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+body {  margin: 0px 0px 0px 0px; font-family: Verdana, Helvetica, sans-serif; }
+
+h1     { font-size : 160%; margin: 0px 0px 0px 0px;  padding: 0px; }
+h2     { font-size : 140%; margin: 1em 0px 0.8em 0px; padding: 0px; font-weight : bold;}
+h3     { font-size : 130%; margin: 0.8em 0px 0px 0px; padding: 0px; font-weight : bold; }
+.h3 { margin: 22px 0px 3px 0px; }
+h4     { font-size : 120%; margin: 0.7em 0px 0px 0px; padding: 0px; font-weight : normal; text-align: left; }
+.h4 { margin: 18px 0px 0px 0px; }
+h4.faq { font-size : 120%; margin: 18px 0px 0px 0px; padding: 0px; font-weight : bold;   text-align: left; }
+h5     { font-size : 100%; margin: 14px 0px 0px 0px; padding: 0px; font-weight : normal; text-align: left; }
+
+/**
+* table
+*/
+table .title { background-color: #000000; }
+.ForrestTable         {
+    color: #ffffff;
+    background-color: #7099C5;
+    width: 100%;
+    font-size : 100%;
+    empty-cells: show;
+}
+table caption {
+    padding-left: 5px;
+    color: white;
+    text-align: left;
+    font-weight: bold;
+    background-color: #000000;
+}
+.ForrestTable td {
+    color: black;
+    background-color: #f0f0ff;
+}
+.ForrestTable th { text-align: center; }
+/**
+ * Page Header
+ */
+
+#top {
+    position: relative;
+    float: left;
+    width: 100%;
+    background: #294563; /* if you want a background in the header, put it here */
+}
+
+#top .breadtrail {
+    background: #CFDCED;
+    color: black;
+    border-bottom: solid 1px white;
+    padding: 3px 10px;
+    font-size: 75%;
+}
+#top .breadtrail a { color: black; }
+
+#top .header {
+    float: left;
+    width: 100%;
+    background: url("images/header_white_line.gif") repeat-x bottom;
+}
+
+#top .grouplogo {
+    padding: 7px 0 10px 10px;
+    float: left;
+    text-align: left;
+}
+#top .projectlogo {
+    padding: 7px 0 10px 10px;
+    float: left;
+    width: 33%;
+    text-align: right;
+}
+#top .projectlogoA1 {
+    padding: 7px 0 10px 10px;
+    float: right;
+}
+html>body #top .searchbox {
+    bottom: 0px;
+}
+#top .searchbox {
+    position: absolute;
+    right: 10px;
+    height: 42px;
+    font-size: 70%;
+    white-space: nowrap;
+    text-align: right;
+    color: white;
+    background-color: #000000;
+    z-index:0;
+    background-image: url(images/rc-t-l-5-1header-2searchbox-3searchbox.png);
+    background-repeat: no-repeat;
+    background-position: top left;
+    bottom: -1px; /* compensate for IE rendering issue */
+}
+
+#top .searchbox form {
+    padding: 5px 10px;
+    margin: 0;
+}
+#top .searchbox p {
+    padding: 0 0 2px 0;
+    margin: 0;
+}
+#top .searchbox input {
+    font-size: 100%;
+}
+
+#tabs {
+    clear: both;
+    padding-left: 10px;
+    margin: 0;
+    list-style: none;
+}
+/*    background: #CFDCED url("images/tab-right.gif") no-repeat right top;*/
+#tabs li {
+    float: left;
+    background-image: url(images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png);
+    background-repeat: no-repeat;
+    background-position: top right;
+    background-color: #000000;
+    margin: 0 3px 0 0;
+    padding: 0;
+}
+
+/*background: url("images/tab-left.gif") no-repeat left top;*/
+#tabs li a {
+    float: left;
+    display: block;
+    font-family: verdana, arial, sans-serif;
+    text-decoration: none;
+    color: black;
+    white-space: nowrap;
+    background-image: url(images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png);
+    background-repeat: no-repeat;
+    background-position: top left;
+    padding: 5px 15px 4px;
+    width: .1em; /* IE/Win fix */
+}
+
+#tabs li a:hover {
+   
+    cursor: pointer;
+    text-decoration:underline;
+}
+
+#tabs > li a { width: auto; } /* Rest of IE/Win fix */
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+#tabs a { float: none; }
+/* End IE5-Mac hack */
+
+#top .header .current {
+    background-color: #4C6C8F;
+    background-image: url(images/rc-t-r-5-1header-2tab-selected-3tab-selected.png);
+    background-repeat: no-repeat;
+    background-position: top right;
+}
+#top .header .current a {
+    font-weight: bold;
+    padding-bottom: 5px;
+    color: white;
+    background-image: url(images/rc-t-l-5-1header-2tab-selected-3tab-selected.png);
+    background-repeat: no-repeat;
+    background-position: top left;
+}
+#publishedStrip {
+    padding-right: 10px;
+    padding-left: 20px;
+    padding-top: 3px;
+    padding-bottom:3px;
+    color: #ffffff;
+    font-size : 60%;
+    font-weight: bold;
+    background-color: #4C6C8F;
+    text-align:right;
+}
+
+#level2tabs {
+margin: 0;
+float:left;
+position:relative;
+
+}
+
+
+
+#level2tabs  a:hover {
+   
+    cursor: pointer;
+    text-decoration:underline;
+    
+}
+
+#level2tabs  a{
+   
+    cursor: pointer;
+    text-decoration:none;
+    background-image: url('images/chapter.gif');
+    background-repeat: no-repeat;
+    background-position: center left;
+    padding-left: 6px;
+    margin-left: 6px;
+}
+
+/*
+*    border-top: solid #4C6C8F 15px;
+*/
+#main {
+    position: relative;
+    background: white;
+    clear:both;
+}
+#main .breadtrail {
+    clear:both;
+    position: relative;
+    background: #CFDCED;
+    color: black;
+    border-bottom: solid 1px black;
+    border-top: solid 1px black;
+    padding: 0px 180px;
+    font-size: 75%;
+    z-index:10;
+}
+/**
+* Round corner
+*/
+#roundtop {
+    background-image: url(images/rc-t-r-15-1body-2menu-3menu.png);
+    background-repeat: no-repeat;
+    background-position: top right;
+}
+
+#roundbottom {
+    background-image: url(images/rc-b-r-15-1body-2menu-3menu.png);
+    background-repeat: no-repeat;
+    background-position: top right;
+}
+
+img.corner {
+   width: 15px;
+   height: 15px;
+   border: none;
+   display: block !important;
+}
+
+.roundtopsmall {
+    background-image: url(images/rc-t-r-5-1header-2searchbox-3searchbox.png);
+    background-repeat: no-repeat;
+    background-position: top right;
+}
+
+#roundbottomsmall {
+    background-image: url(images/rc-b-r-5-1header-2tab-selected-3tab-selected.png);
+    background-repeat: no-repeat;
+    background-position: top right;
+}
+
+img.cornersmall {
+   width: 5px;
+   height: 5px;
+   border: none;
+   display: block !important;
+}
+/**
+ * Side menu
+ */
+#menu a {  font-weight: normal; text-decoration: none;}
+#menu a:visited {  font-weight: normal; }
+#menu a:active {  font-weight: normal; }
+#menu a:hover {  font-weight: normal;  text-decoration:underline;}
+
+#menuarea { width:10em;}
+#menu {
+    position: relative;
+    float: left;
+    width: 160px;
+    padding-top: 0px;
+    top:-18px;
+    left:10px;
+    z-index: 20;
+    background-color: #f90;
+    font-size : 70%;
+    
+}
+
+.menutitle {
+        cursor:pointer;
+        padding: 3px 12px;
+        margin-left: 10px;
+        background-image: url('images/chapter.gif');
+        background-repeat: no-repeat;
+        background-position: center left;
+        font-weight : bold;
+
+        
+}
+
+.menutitle:hover{text-decoration:underline;cursor: pointer;}
+
+#menu .menuitemgroup {
+        margin: 0px 0px 6px 8px;
+        padding: 0px;
+        font-weight : bold; }
+
+#menu .selectedmenuitemgroup{
+        margin: 0px 0px 0px 8px;
+        padding: 0px;
+        font-weight : normal; 
+       
+        }
+
+#menu .menuitem {
+        padding: 2px 0px 1px 13px;
+        background-image: url('images/page.gif');
+        background-repeat: no-repeat;
+        background-position: center left;
+        font-weight : normal;
+        margin-left: 10px;
+}
+
+#menu .menupage {
+        margin: 2px 0px 1px 10px;
+        padding: 0px 3px 0px 12px;
+        background-image: url('images/page.gif');
+        background-repeat: no-repeat;
+        background-position: center left;
+        font-style : normal;
+}
+#menu .menupagetitle {
+        padding: 0px 0px 0px 1px;
+        font-style : normal;
+        border-style: solid;
+        border-width: 1px;
+        margin-right: 10px;
+         
+}
+#menu .menupageitemgroup {
+        padding: 3px 0px 4px 6px;
+        font-style : normal;
+        border-bottom: 1px solid ;
+        border-left: 1px solid ;
+        border-right: 1px solid ;
+        margin-right: 10px;
+}
+#menu .menupageitem {
+        font-style : normal;
+        font-weight : normal;
+        border-width: 0px;
+        font-size : 90%;
+}
+#menu #credit {
+    text-align: center;
+}
+#menu #credit2 {
+    text-align: center;
+    padding: 3px 3px 3px 3px;
+    background-color: #ffffff;
+}
+#menu .searchbox {
+    text-align: center;
+}
+#menu .searchbox form {
+    padding: 3px 3px;
+    margin: 0;
+}
+#menu .searchbox input {
+    font-size: 100%;
+}
+
+#content {
+    padding: 20px 20px 20px 180px;
+    margin: 0;
+    font : small Verdana, Helvetica, sans-serif;
+    font-size : 80%;
+}
+
+#content ul {
+    margin: 0;
+    padding: 0 25px;
+}
+#content li {
+    padding: 0 5px;
+}
+#feedback {
+    color: black;
+    background: #CFDCED;
+    text-align:center;
+    margin-top: 5px;
+}
+#feedback #feedbackto {
+    font-size: 90%;
+    color: black;
+}
+#footer {
+    clear: both;
+    position: relative; /* IE bugfix (http://www.dracos.co.uk/web/css/ie6floatbug/) */
+    width: 100%;
+    background: #CFDCED;
+    border-top: solid 1px #4C6C8F;
+    color: black;
+}
+#footer .copyright {
+    position: relative; /* IE bugfix cont'd */
+    padding: 5px;
+    margin: 0;
+    width: 45%;
+}
+#footer .lastmodified {
+    position: relative; /* IE bugfix cont'd */
+    float: right;
+    width: 45%;
+    padding: 5px;
+    margin: 0;
+    text-align: right;
+}
+#footer a { color: white; }
+
+#footer #logos {
+    text-align: left;
+}
+
+
+/**
+ * Misc Styles
+ */
+
+acronym { cursor: help; }
+.boxed      { background-color: #a5b6c6;}
+.underlined_5     {border-bottom: solid 5px #4C6C8F;}
+.underlined_10     {border-bottom: solid 10px #4C6C8F;}
+/* ==================== snail trail ============================ */
+
+.trail {
+  position: relative; /* IE bugfix cont'd */
+  font-size: 70%;
+  text-align: right;
+  float: right;
+  margin: -10px 5px 0px 5px;
+  padding: 0;
+}
+
+#motd-area {
+    position: relative; /* IE bugfix cont'd */
+    float: right;
+    width: 35%;
+    background-color: #f0f0ff;
+    border-top: solid 1px #4C6C8F;
+    border-bottom: solid 1px #4C6C8F;
+    margin-bottom: 15px;
+    margin-left: 15px;
+    margin-right: 10%;
+    padding-bottom: 5px;
+    padding-top: 5px;
+}
+
+#minitoc-area {
+    border-top: solid 1px #4C6C8F;
+    border-bottom: solid 1px #4C6C8F;
+    margin: 15px 10% 5px 15px;
+   /* margin-bottom: 15px;
+    margin-left: 15px;
+    margin-right: 10%;*/
+    padding-bottom: 7px;
+    padding-top: 5px;
+}
+.minitoc {
+    list-style-image: url('images/current.gif');
+    font-weight: normal;
+}
+
+li p {
+    margin: 0;
+    padding: 0;
+}
+
+.pdflink {
+    position: relative; /* IE bugfix cont'd */
+    float: right;
+    margin: 0px 5px;
+    padding: 0;
+}
+.pdflink br {
+    margin-top: -10px;
+    padding-left: 1px;
+}
+.pdflink a {
+    display: block;
+    font-size: 70%;
+    text-align: center;
+    margin: 0;
+    padding: 0;
+}
+
+.pdflink img {
+    display: block;
+    height: 16px;
+    width: 16px;
+}
+.xmllink {
+    position: relative; /* IE bugfix cont'd */
+    float: right;
+    margin: 0px 5px;
+    padding: 0;
+}
+.xmllink br {
+    margin-top: -10px;
+    padding-left: 1px;
+}
+.xmllink a {
+    display: block;
+    font-size: 70%;
+    text-align: center;
+    margin: 0;
+    padding: 0;
+}
+
+.xmllink img {
+    display: block;
+    height: 16px;
+    width: 16px;
+}
+.podlink {
+    position: relative; /* IE bugfix cont'd */
+    float: right;
+    margin: 0px 5px;
+    padding: 0;
+}
+.podlink br {
+    margin-top: -10px;
+    padding-left: 1px;
+}
+.podlink a {
+    display: block;
+    font-size: 70%;
+    text-align: center;
+    margin: 0;
+    padding: 0;
+}
+
+.podlink img {
+    display: block;
+    height: 16px;
+    width: 16px;
+}
+
+.printlink {
+    position: relative; /* IE bugfix cont'd */
+    float: right;
+}
+.printlink br {
+    margin-top: -10px;
+    padding-left: 1px;
+}
+.printlink a {
+    display: block;
+    font-size: 70%;
+    text-align: center;
+    margin: 0;
+    padding: 0;
+}
+.printlink img {
+    display: block;
+    height: 16px;
+    width: 16px;
+}
+
+p.instruction {
+  display: list-item;
+  list-style-image: url('../images/instruction_arrow.png');
+  list-style-position: outside;
+  margin-left: 2em;
+} 
diff --git a/docs/systemrequirements.html b/docs/systemrequirements.html
deleted file mode 100644
index 23b3eb09349..00000000000
--- a/docs/systemrequirements.html
+++ /dev/null
@@ -1,310 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
-<meta name="Forrest-skin-name" content="pelt">
-<title>Apache Lucene - System Requirements</title>
-<link type="text/css" href="skin/basic.css" rel="stylesheet">
-<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
-<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
-<link type="text/css" href="skin/profile.css" rel="stylesheet">
-<script src="skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="images/favicon.ico">
-</head>
-<body onload="init()">
-<script type="text/javascript">ndeSetTextSize();</script>
-<div id="top">
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
-</div>
-<!--+
-    |header
-    +-->
-<div class="header">
-<!--+
-    |start group logo
-    +-->
-<div class="grouplogo">
-<a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="http://www.apache.org/images/asf_logo_simple.png" title="Apache Lucene"></a>
-</div>
-<!--+
-    |end group logo
-    +-->
-<!--+
-    |start Project Logo
-    +-->
-<div class="projectlogo">
-<a href="http://lucene.apache.org/java/"><img class="logoImage" alt="Lucene" src="http://lucene.apache.org/images/lucene_green_300.gif" title="Apache Lucene is a high-performance, full-featured text search engine library written entirely in
-      Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform."></a>
-</div>
-<!--+
-    |end Project Logo
-    +-->
-<!--+
-    |start Search
-    +-->
-<div class="searchbox">
-<form action="http://www.google.com/search" method="get" class="roundtopsmall">
-<input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input name="Search" value="Search" type="submit">
-</form>
-</div>
-<!--+
-    |end search
-    +-->
-<!--+
-    |start Tabs
-    +-->
-<ul id="tabs">
-<li class="current">
-<a class="selected" href="index.html">Main</a>
-</li>
-<li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
-</li>
-</ul>
-<!--+
-    |end Tabs
-    +-->
-</div>
-</div>
-<div id="main">
-<div id="publishedStrip">
-<!--+
-    |start Subtabs
-    +-->
-<div id="level2tabs"></div>
-<!--+
-    |end Endtabs
-    +-->
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-
-             &nbsp;
-           </div>
-<!--+
-    |start Menu, mainarea
-    +-->
-<!--+
-    |start Menu
-    +-->
-<div id="menu">
-<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">About</div>
-<div id="menu_1.1" class="menuitemgroup">
-<div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
-</div>
-<div class="menuitem">
-<a href="features.html">Features</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
-</div>
-<div class="menuitem">
-<a href="whoweare.html">Who We Are</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
-<div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
-</div>
-<div class="menuitem">
-<a href="benchmarks.html">Benchmarks</a>
-</div>
-<div class="menuitem">
-<a href="contributions.html">Contributions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/LuceneFAQ">FAQ</a>
-</div>
-<div class="menuitem">
-<a href="fileformats.html">File Formats</a>
-</div>
-<div class="menuitem">
-<a href="gettingstarted.html">Getting Started</a>
-</div>
-<div class="menuitem">
-<a href="lucene-sandbox/index.html">Lucene Sandbox</a>
-</div>
-<div class="menuitem">
-<a href="queryparsersyntax.html">Query Syntax</a>
-</div>
-<div class="menuitem">
-<a href="scoring.html">Scoring</a>
-</div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_selected_1.3', 'skin/')" id="menu_selected_1.3Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Resources</div>
-<div id="menu_selected_1.3" class="selectedmenuitemgroup" style="display: block;">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menupage">
-<div class="menupagetitle">System Requirements</div>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
-</div>
-</div>
-<div id="credit"></div>
-<div id="roundbottom">
-<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
-<!--+
-  |alternative credits
-  +-->
-<div id="credit2"></div>
-</div>
-<!--+
-    |end Menu
-    +-->
-<!--+
-    |start content
-    +-->
-<div id="content">
-<div title="Portable Document Format" class="pdflink">
-<a class="dida" href="systemrequirements.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
-        PDF</a>
-</div>
-<h1>Apache Lucene - System Requirements</h1>
-<div id="minitoc-area">
-<ul class="minitoc">
-<li>
-<a href="#System Requirements">System Requirements</a>
-</li>
-</ul>
-</div>
-    <!-- <section id="Code Coverage"><title>Code Coverage</title>
-       <p>Code Coverage reports are available <a
-       href="">here</a></p>
-   </section> -->
-
-<a name="N10013"></a><a name="System Requirements"></a>
-<h2 class="boxed">System Requirements</h2>
-<div class="section">
-<p>
-    The latest Lucene <a href="releases.html">release</a> has the following minimum requirements:
-    <ul>
-        
-<li>Java 1.4.x or greater.</li>
-        
-<li>ANT 1.6.5 or greater.</li>
-        
-<li>JUnit 3.8.1 if you wish to run the unit tests.</li>
-        
-<li>CPU, Disk and Memory requirements are based on the many choices made in implementing Lucene (document size, number of documents, and number of hits retrieved to name a few.)
-            The <a href="benchmarks.html">benchmarks</a> page has some information related to performance on particular platforms.
-        Also, the <a href="http://svn.apache.org/viewvc/lucene/java/trunk/contrib/benchmark/">Contrib/benchmark</a> module has code related to benchmarking a standard set of documents.</li>
-    
-</ul>
-
-</p>
-<p>Contrib modules may have other requirements, refer to their documentation and build files for information.</p>
-</div>
-
-
-
-</div>
-<!--+
-    |end content
-    +-->
-<div class="clearboth">&nbsp;</div>
-</div>
-<div id="footer">
-<!--+
-    |start bottomstrip
-    +-->
-<div class="lastmodified">
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<div class="copyright">
-        Copyright &copy;
-         2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
-<!--+
-    |end bottomstrip
-    +-->
-</div>
-</body>
-</html>
diff --git a/docs/systemrequirements.pdf b/docs/systemrequirements.pdf
deleted file mode 100644
index a79a5c57cfe..00000000000
--- a/docs/systemrequirements.pdf
+++ /dev/null
@@ -1,151 +0,0 @@
-%PDF-1.3
-%ª«¬­
-4 0 obj
-<< /Type /Info
-/Producer (FOP 0.20.5) >>
-endobj
-5 0 obj
-<< /Length 413 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GauHFb>Q22']%q&m]nALH1nKW7iWO.8p9KoQ5#^;"Oa$^hb-lj.HB,mOdqnfc[FkJ'q3?+0S'P/)NjHd&:l.%5Yde8dFhD`0Mcad>Bis3G%J)0,8da<5J8?rLJ"$AO2H*hCg+Lm_'c2E)b.sPj."mIekU.kBq)I#A4D-U^8aJlPQK<=oRW(+1i5eXA<tq,G-e`BA3e+@,[B8lV`fkd^G`fRff^Xi%en,7G#4D+8qq_XFB-JI\]B(\)LLAK5^dnDI2UEYj_u!lK`>i`8RgO.!=:j^nY"7c9>ZaMOpkt9KWg\L-GaDpd4:Z/;I\8R&=g(#a@Jm%8mJ/)$BF5Yq0T_8](L(YrS\!F1a#7Y)N]hfG:USAXkTJr7@'?)Qpo]2Xhdk:ViD/S\XNlj7_<TP^nLF.(cSfQ~>
-endstream
-endobj
-6 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 5 0 R
-/Annots 7 0 R
->>
-endobj
-7 0 obj
-[
-8 0 R
-]
-endobj
-8 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 519.166 215.0 507.166 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 9 0 R
-/H /I
->>
-endobj
-10 0 obj
-<< /Length 1021 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gat=*9lHOU&A@ZcHq^>qK>!Y5hNG7&'X^r1OAjU1bF2]eJ2]As]D_C[+,bm`Zr.Vfb8AS#^%%R0Y%-Wnm(>A3%\qBVU?:&PV"nS>'I'>2B`@,2*HE>?]?"WVq<tTNq1::oQ6&pDXdnk*FmNAi#)G)TillDi`\A(L+$lHu[kuif'GouR)8YM"K!o+5*Y5jAKs`#tCFp5RGZj9PoFo4<*H]_!]^(,"4WO=t!6#I&*?ejIcjn/7"XVe/3Y:hIgJd^>ijuGhk;q]NGcuA;'+G_cM7,kW6Y/%!j^+/j]2XSa'QjGo=cskQQ=HS*LhRClR8RX%$0cj+PIJJ"148RECJ&012i8PT$;\WR&]=$Yr2["U%.@^"+5oS=_\r5FV#Z?YiXcc=MTe7+A8R=>cs)TN$$'181H/0l:22C`:S[SMlqaCiq=_2"+[-83@]cG2>N6)EUcM3,0Q9khhT?*27$)IHMPLB+e#a<5fC8GOC_l+=6Xl9j-o*[d?PL,b"ZFfmWT'PrehX@sD0AX3h]/GeXG[euMNHceNm;r*PH_e^DoGQM-T!qHP_J+^')W39&B^_@$GZjF9ZHi%q:s]!5-X$X\h+Qf!YW.=2KOSUAMM>U-<61-!a__f*2ZD)5Yb1Od85reY1cEXb,=p;92m4c3_r!BGNPF897uAQQ#!ptOk#FB9`eC_"(`T(\ZYNacDbXP2T<I*KQ+Gk$.eR.4;&dH,$c(c,RV%s?N!6(PEkNh[^(7oV^t?'FF]n=@.I%W'YICLh$^`__-N//nJCIRlk?X_.V)P;*13.-_+p(#Ci*gh6N]ImZZCCb;2@@p(mbiNN1kch!DT=Abge=;408VdNWPiir\,m/N%@'3LS_OahL$?Nd"r_"JG!F-`KW5I4?F$mEXJ'LN6?0s+uB1M*pU5K3ep'OTM"#=Es.7Tn/1pK+f6DP5!u#V=HfLHFpB<OgK&&TfQKR'Lpa2IqUXpN7q[@2[J$B>WdWdm]9QT')c??r0t?>U2;5AoYdro=1cT;mpBS#F<b;~>
-endstream
-endobj
-11 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 10 0 R
->>
-endobj
-13 0 obj
-<<
- /Title (\376\377\0\61\0\40\0\123\0\171\0\163\0\164\0\145\0\155\0\40\0\122\0\145\0\161\0\165\0\151\0\162\0\145\0\155\0\145\0\156\0\164\0\163)
- /Parent 12 0 R
- /A 9 0 R
->> endobj
-14 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-15 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F5
-/BaseFont /Times-Roman
-/Encoding /WinAnsiEncoding >>
-endobj
-16 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding >>
-endobj
-17 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
-/Encoding /WinAnsiEncoding >>
-endobj
-18 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F7
-/BaseFont /Times-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-1 0 obj
-<< /Type /Pages
-/Count 2
-/Kids [6 0 R 11 0 R ] >>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 1 0 R
- /Outlines 12 0 R
- /PageMode /UseOutlines
- >>
-endobj
-3 0 obj
-<< 
-/Font << /F3 14 0 R /F5 15 0 R /F1 16 0 R /F2 17 0 R /F7 18 0 R >> 
-/ProcSet [ /PDF /ImageC /Text ] >> 
-endobj
-9 0 obj
-<<
-/S /GoTo
-/D [11 0 R /XYZ 85.0 659.0 null]
->>
-endobj
-12 0 obj
-<<
- /First 13 0 R
- /Last 13 0 R
->> endobj
-xref
-0 19
-0000000000 65535 f 
-0000002821 00000 n 
-0000002886 00000 n 
-0000002978 00000 n 
-0000000015 00000 n 
-0000000071 00000 n 
-0000000575 00000 n 
-0000000695 00000 n 
-0000000720 00000 n 
-0000003101 00000 n 
-0000000853 00000 n 
-0000001967 00000 n 
-0000003164 00000 n 
-0000002075 00000 n 
-0000002265 00000 n 
-0000002378 00000 n 
-0000002488 00000 n 
-0000002596 00000 n 
-0000002712 00000 n 
-trailer
-<<
-/Size 19
-/Root 2 0 R
-/Info 4 0 R
->>
-startxref
-3215
-%%EOF
diff --git a/docs/whoweare.html b/docs/whoweare.html
deleted file mode 100644
index 1e27724636e..00000000000
--- a/docs/whoweare.html
+++ /dev/null
@@ -1,406 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8">
-<meta name="Forrest-skin-name" content="pelt">
-<title>	Apache Lucene - Who We Are</title>
-<link type="text/css" href="skin/basic.css" rel="stylesheet">
-<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
-<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
-<link type="text/css" href="skin/profile.css" rel="stylesheet">
-<script src="skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="skin/fontsize.js" language="javascript" type="text/javascript"></script>
-<link rel="shortcut icon" href="images/favicon.ico">
-</head>
-<body onload="init()">
-<script type="text/javascript">ndeSetTextSize();</script>
-<div id="top">
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://lucene.apache.org/">Lucene</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
-</div>
-<!--+
-    |header
-    +-->
-<div class="header">
-<!--+
-    |start group logo
-    +-->
-<div class="grouplogo">
-<a href="http://lucene.apache.org/"><img class="logoImage" alt="Lucene" src="http://www.apache.org/images/asf_logo_simple.png" title="Apache Lucene"></a>
-</div>
-<!--+
-    |end group logo
-    +-->
-<!--+
-    |start Project Logo
-    +-->
-<div class="projectlogo">
-<a href="http://lucene.apache.org/java/"><img class="logoImage" alt="Lucene" src="http://lucene.apache.org/images/lucene_green_300.gif" title="Apache Lucene is a high-performance, full-featured text search engine library written entirely in
-      Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform."></a>
-</div>
-<!--+
-    |end Project Logo
-    +-->
-<!--+
-    |start Search
-    +-->
-<div class="searchbox">
-<form action="http://www.google.com/search" method="get" class="roundtopsmall">
-<input value="lucene.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; 
-                    <input name="Search" value="Search" type="submit">
-</form>
-</div>
-<!--+
-    |end search
-    +-->
-<!--+
-    |start Tabs
-    +-->
-<ul id="tabs">
-<li class="current">
-<a class="selected" href="index.html">Main</a>
-</li>
-<li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
-</li>
-</ul>
-<!--+
-    |end Tabs
-    +-->
-</div>
-</div>
-<div id="main">
-<div id="publishedStrip">
-<!--+
-    |start Subtabs
-    +-->
-<div id="level2tabs"></div>
-<!--+
-    |end Endtabs
-    +-->
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<!--+
-    |breadtrail
-    +-->
-<div class="breadtrail">
-
-             &nbsp;
-           </div>
-<!--+
-    |start Menu, mainarea
-    +-->
-<!--+
-    |start Menu
-    +-->
-<div id="menu">
-<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">About</div>
-<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
-<div class="menuitem">
-<a href="index.html" title="Welcome to Java Lucene">Overview</a>
-</div>
-<div class="menuitem">
-<a href="features.html">Features</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>
-</div>
-<div class="menupage">
-<div class="menupagetitle">Who We Are</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Documentation</div>
-<div id="menu_1.2" class="menuitemgroup">
-<div class="menuitem">
-<a href="javadocs.html">Javadocs</a>
-</div>
-<div class="menuitem">
-<a href="benchmarks.html">Benchmarks</a>
-</div>
-<div class="menuitem">
-<a href="contributions.html">Contributions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/LuceneFAQ">FAQ</a>
-</div>
-<div class="menuitem">
-<a href="fileformats.html">File Formats</a>
-</div>
-<div class="menuitem">
-<a href="gettingstarted.html">Getting Started</a>
-</div>
-<div class="menuitem">
-<a href="lucene-sandbox/index.html">Lucene Sandbox</a>
-</div>
-<div class="menuitem">
-<a href="queryparsersyntax.html">Query Syntax</a>
-</div>
-<div class="menuitem">
-<a href="scoring.html">Scoring</a>
-</div>
-<div onclick="SwitchMenu('menu_1.2.10', 'skin/')" id="menu_1.2.10Title" class="menutitle">Wiki</div>
-<div id="menu_1.2.10" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/ConceptsAndDefinitions">Concepts and Definitions</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/HowTo">How To</a>
-</div>
-<div class="menuitem">
-<a href="http://wiki.apache.org/lucene-java/BasicsOfPerformance">Performance Tips</a>
-</div>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Resources</div>
-<div id="menu_1.3" class="menuitemgroup">
-<div class="menuitem">
-<a href="developer-resources.html">Developers</a>
-</div>
-<div class="menuitem">
-<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>
-</div>
-<div class="menuitem">
-<a href="mailinglists.html">Mailing Lists</a>
-</div>
-<div class="menuitem">
-<a href="releases.html">Releases</a>
-</div>
-<div class="menuitem">
-<a href="systemrequirements.html">System Requirements</a>
-</div>
-<div class="menuitem">
-<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Site Versions</div>
-<div id="menu_1.4" class="menuitemgroup">
-<div class="menuitem">
-<a href="./">Main</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>
-</div>
-</div>
-<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Related Projects</div>
-<div id="menu_1.5" class="menuitemgroup">
-<div class="menuitem">
-<a href="http://lucene.apache.org">Lucene (Top-Level)</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/hadoop/">Hadoop</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/lucy/">Lucy</a>
-</div>
-<div class="menuitem">
-<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/nutch/">Nutch</a>
-</div>
-<div class="menuitem">
-<a href="http://lucene.apache.org/solr/">SOLR</a>
-</div>
-</div>
-<div id="credit"></div>
-<div id="roundbottom">
-<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
-<!--+
-  |alternative credits
-  +-->
-<div id="credit2"></div>
-</div>
-<!--+
-    |end Menu
-    +-->
-<!--+
-    |start content
-    +-->
-<div id="content">
-<div title="Portable Document Format" class="pdflink">
-<a class="dida" href="whoweare.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
-        PDF</a>
-</div>
-<h1>	Apache Lucene - Who We Are</h1>
-<div id="minitoc-area">
-<ul class="minitoc">
-<li>
-<a href="#core">Core Committers</a>
-</li>
-<li>
-<a href="#contrib">Contrib Committers</a>
-</li>
-<li>
-<a href="#emeritus">Emeritus Committers</a>
-</li>
-</ul>
-</div>
-
-
-<p>Lucene is maintained by a team of volunteer developers.</p>
-
-
-<a name="N1001A"></a><a name="core"></a>
-<h2 class="boxed">Core Committers</h2>
-<div class="section">
-<ul>
-
-<li>
-<b>Michael Busch</b> (buschmi@...) </li>
-
-<li>
-<b>Doron Cohen</b> (doronc@...) </li>
-
-<li>
-<b><a href="http://blog.lucene.com/">Doug Cutting</a></b> (cutting@...)</li>
-
-<li>
-<b><a href="http://www.jroller.com/page/otis">Otis Gospodnetic</a></b> (otis@...)</li>
-
-<li>
-<b>Erik Hatcher</b> (ehatcher@...)</li>
-
-<li>
-<b>Chris Hostetter</b> (hossman@...)</li>
-
-<li>
-<b><a href="http://people.apache.org/list_I.html#gsingers">Grant Ingersoll</a></b> (gsingers@...) </li>
-
-<li>
-<b>Mike McCandless</b> (mikemccand@...) </li>
-
-<li>
-<b>Bernhard Messer</b> (bmesser@...)</li>
-
-<li>
-<b>Daniel Naber</b> (dnaber@...)</li>
-
-<li>
-<b>Yonik Seeley</b> (yonik@...)</li>
-
-</ul>
-</div>
-
-
-<a name="N10060"></a><a name="contrib"></a>
-<h2 class="boxed">Contrib Committers</h2>
-<div class="section">
-<ul>
-
-<li>
-<b>Simon Willnauer</b> (simonw@...)</li>
-
-<li>
-<b>Andi Vajda</b> (vajda@...)</li>
-
-<li>
-<b>Wolfgang Hoschek</b> (whoschek@...)</li>
-
-</ul>
-</div>
-
-
-<a name="N10078"></a><a name="emeritus"></a>
-<h2 class="boxed">Emeritus Committers</h2>
-<div class="section">
-<ul>
-
-<li>Josh Bloch</li>
-
-<li>
-<b>Peter Carlson</b> (carlson@...)</li>
-
-<li>
-<b>Tal Dayan</b> (zapta@...)</li>
-
-<li>
-<b>Scott Ganyo</b> (scottganyo@...)</li>
-
-<li>
-<b>Brian Goetz</b> (briangoetz@...)</li>
-
-<li>
-<b>Christoph Goller</b> (goller@...)</li>
-
-<li>
-<b>Eugene Gluzberg</b> (drag0n@...)</li>
-
-<li>
-<b>Cory Hubert</b> (clhubert@...)</li>
-
-<li>Ted Husted</li>
-
-<li>
-<b>Tim Jones</b> (tjones@...)</li>
-
-<li>
-<b>Dave Kor</b> (davekor@...)</li>
-
-<li>
-<b>Andrew C. Oliver</b> (acoliver@...)</li>
-
-<li>
-<b>Dmitry Serebrennikov</b> (dmitrys@...)</li>
-
-<li>
-<b>Jon Stevens</b> (jon at latchkey.com)</li>
-
-<li>
-<b>Matt Tucker</b> (mtucker@...)</li>
-
-</ul>
-</div>
-
-
-<p>Note that the email addresses above end with @apache.org.</p>
-
-
-</div>
-<!--+
-    |end content
-    +-->
-<div class="clearboth">&nbsp;</div>
-</div>
-<div id="footer">
-<!--+
-    |start bottomstrip
-    +-->
-<div class="lastmodified">
-<script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
-//  --></script>
-</div>
-<div class="copyright">
-        Copyright &copy;
-         2006 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
-</div>
-<!--+
-    |end bottomstrip
-    +-->
-</div>
-</body>
-</html>
diff --git a/docs/whoweare.pdf b/docs/whoweare.pdf
deleted file mode 100644
index 092b6398ff7..00000000000
--- a/docs/whoweare.pdf
+++ /dev/null
@@ -1,207 +0,0 @@
-%PDF-1.3
-%ª«¬­
-4 0 obj
-<< /Type /Info
-/Producer (FOP 0.20.5) >>
-endobj
-5 0 obj
-<< /Length 482 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb!#XYti1j&Dcpm2jU/WkJV?q[\X^*/;Qh*^lYEg)l\gTj+-oOij=U!$E7K#Fb]\EGOO@ojdTkum32ZK&IMYY;#;aE$L7\CFrs%cfA_UL0MWbF_<Yd?c\mdqJM@g0[l8VL$X%h$m%uETjT.#HU-%iSfg@-JJF"D.U<+&oQp_2(9WhXkIG5S\hl1edd&]+%Wn.?d!/uB%O-.@hI&,)TgV,^d[mmB>o0Utsets>[3$:BG6YbrMTcg<on=^qPAe+][5C036-U(J@?"JuESRfK#rcrU^fG[+=@)OZ:a-;CT'mA9?(Hq*0<`dK1n8>:_P!@Tr8GLS'GhKMA4l8h:RC9X1htFA)nD*\!$U4D>cp&8@Jd;i`?RmF]K9f=<:VkP(%lTpg,mb4spR2>-:=>LsVne'Lhgas,]eSro^+kWX0hPr21;D;.GFiGIR]ftC.gsnYX5$[S-=5DLlThZ0GZZk%J'&LGepdZCUD8C~>
-endstream
-endobj
-6 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 5 0 R
-/Annots 7 0 R
->>
-endobj
-7 0 obj
-[
-8 0 R
-10 0 R
-12 0 R
-]
-endobj
-8 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 546.166 193.004 534.166 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 9 0 R
-/H /I
->>
-endobj
-10 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 527.966 206.348 515.966 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 11 0 R
-/H /I
->>
-endobj
-12 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 102.0 509.766 213.008 497.766 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 13 0 R
-/H /I
->>
-endobj
-14 0 obj
-<< /Length 1685 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gatn'hfG;G&BE\sYMdfRLl)>pa'7OF3B+(([(^7O;tiQ_1(XP.6(I-/f4P82Yj+n/BI;cEn$HQ+O&fV%='Y/O^V&SJA]4=dNuQt,2Uq?WLO,p1[YQ^Pq4Y95]RMP_+#;Nl=5I`4:#ACi0Ad^G[2OL*^=`/"jh"X/C+5UJV&kul#?;;:QEj^g\NIr:4j0uUYIo@uh>>IADY)c*-V9d%JS./69$JaXe&:jh_Y\fFT3H4i9e0Tsn\T:%f9?peKO-%>rT90cV27b0d;Xu!*=YJ0)FRL\-s7t%<$u[dBe$69)'dTb[bDGq%7h1%$N_Wu,,"OrfE?X'PF2Cl(uqLpn/@mjVg^B^KS7=._d/Om6IlP.jj7Z%dX8RW)adQ;+bVtjRfE,+=?-5<>Zc5CM19!F<h3uFa@b,pP2,\B.m`0^KMEZJON\h7JN*k9X1#ehfjn9C&ja$u:r"58TmY@77r;9+XR]EW.`44Q*a6YeU@OjW^`bhFgiV)q1@2-i=c'WL_hBWhgIdbSG1/#RP$,7qAVUA/X*QABp;/eclMF&X.qr,LW*I>Tj_d0-l=K0dgB':EWbY:,o[RV]M*n8;I_d1q2t[hFHLA'hdH7k'H]6Fh1JO0$cT7^Q:#&]a*6p%JP[.LN%cr7'^p-sVhi+Ft1^SBTZ#Mbhpfb$>54Umn]oA2a`j1aQVJ[jn@lCC_Dq3i!FY@;XO-o!A*j@nY7]J6^-H)<aD6aP%'N./bi0fks>2<2*VgK9bPQV"K;hUZ/CXQJo$(',^-/pmQhcC7^17tVYDT-"eIrCp(=h4Mc7,We%J)`?1gGZ7$U&Pa4Ee-dl`iopu87<C,5`>q4K7$_m@j,f[K/45Po-]Lg;GOZmY/h^q+=><<O[0+M>Ehg&#`p6K)VJ,:ka`t:n<!-]Xob#0L0UFo+:Li30ULFEgt?s#]iR?H\LqZ/.^1"r2JaH&2BpY[rcuFXd`RhVU8rWP'jK@%>,aXlS%t!f4H_MF:8$)2=r`5bnl7g<[<o[oiOElXa*aW;B1epU^(p$4=m(D$08t#o%YNb!Fi%Q9,N0O'ZE%pi[S#hg<lQupKs@f!M%`CEZ8c,h3gO#S4dR"bY3i!j(bI7`,4;C<(.F.9Dhc-?H>`'-/#7$_:sV4#pa\eWi*P^r@cK2$)")`!Fl*[ZU9+l)Q_SCD$tNO#,r;'\GPKI34$[eUs):B)B-"t6U.)/q$=2TIX&`ESVZ($U/#NkX8"%6=H'[^&3$;)rVX2G83hOnoIF9rpeYhjhqLmATaVT'?U?qNWXq(0F&XaPS/('O$;6.]Hf'5+<6EJabfu\Xi>:;D[_2?k>i6$bKOMos3CHS=;$_kQ,?H[t;/Id-Er;uAgg>"`]jH3uQ=[C/.8"J,M?Z^`EE/N9Wfos+0N?1ep`9d$Qg,k5cK@3;l]#<(G-0gYQW)/Wk3G8f'9.3&7YH[M-Mb\eh8u#>^NHc48`=^W8A=bpT&ea37LTnBN:V@T'(M2i&e"`i:=)gp^3+<qT"#ucV>HQ5JZJ5)jDp<&Q<(K>=2T<e!8^'u,QuDDa:l%7eL"QEE3FE%_i2%T%K28kH6t).qcuc6OXYgff/;C5!ns5J[3!ght,p>sPSko+D@ojE,\3=mfXu56]Bu/A]QIbI<Up5K&2R`))UOEdqZFj+'RgWN$Q6<[$rP?u#a6lf/_Hls[F7]\/)`I$;Oo~>
-endstream
-endobj
-15 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 14 0 R
->>
-endobj
-17 0 obj
-<<
- /Title (\376\377\0\61\0\40\0\103\0\157\0\162\0\145\0\40\0\103\0\157\0\155\0\155\0\151\0\164\0\164\0\145\0\162\0\163)
- /Parent 16 0 R
- /Next 18 0 R
- /A 9 0 R
->> endobj
-18 0 obj
-<<
- /Title (\376\377\0\62\0\40\0\103\0\157\0\156\0\164\0\162\0\151\0\142\0\40\0\103\0\157\0\155\0\155\0\151\0\164\0\164\0\145\0\162\0\163)
- /Parent 16 0 R
- /Prev 17 0 R
- /Next 19 0 R
- /A 11 0 R
->> endobj
-19 0 obj
-<<
- /Title (\376\377\0\63\0\40\0\105\0\155\0\145\0\162\0\151\0\164\0\165\0\163\0\40\0\103\0\157\0\155\0\155\0\151\0\164\0\164\0\145\0\162\0\163)
- /Parent 16 0 R
- /Prev 18 0 R
- /A 13 0 R
->> endobj
-20 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-21 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F5
-/BaseFont /Times-Roman
-/Encoding /WinAnsiEncoding >>
-endobj
-22 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding >>
-endobj
-23 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
-/Encoding /WinAnsiEncoding >>
-endobj
-24 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F7
-/BaseFont /Times-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-1 0 obj
-<< /Type /Pages
-/Count 2
-/Kids [6 0 R 15 0 R ] >>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 1 0 R
- /Outlines 16 0 R
- /PageMode /UseOutlines
- >>
-endobj
-3 0 obj
-<< 
-/Font << /F3 20 0 R /F5 21 0 R /F1 22 0 R /F2 23 0 R /F7 24 0 R >> 
-/ProcSet [ /PDF /ImageC /Text ] >> 
-endobj
-9 0 obj
-<<
-/S /GoTo
-/D [15 0 R /XYZ 85.0 637.8 null]
->>
-endobj
-11 0 obj
-<<
-/S /GoTo
-/D [15 0 R /XYZ 85.0 455.466 null]
->>
-endobj
-13 0 obj
-<<
-/S /GoTo
-/D [15 0 R /XYZ 85.0 378.732 null]
->>
-endobj
-16 0 obj
-<<
- /First 17 0 R
- /Last 19 0 R
->> endobj
-xref
-0 25
-0000000000 65535 f 
-0000004252 00000 n 
-0000004317 00000 n 
-0000004409 00000 n 
-0000000015 00000 n 
-0000000071 00000 n 
-0000000644 00000 n 
-0000000764 00000 n 
-0000000803 00000 n 
-0000004532 00000 n 
-0000000938 00000 n 
-0000004595 00000 n 
-0000001075 00000 n 
-0000004661 00000 n 
-0000001212 00000 n 
-0000002990 00000 n 
-0000004727 00000 n 
-0000003098 00000 n 
-0000003278 00000 n 
-0000003491 00000 n 
-0000003696 00000 n 
-0000003809 00000 n 
-0000003919 00000 n 
-0000004027 00000 n 
-0000004143 00000 n 
-trailer
-<<
-/Size 25
-/Root 2 0 R
-/Info 4 0 R
->>
-startxref
-4778
-%%EOF