diff --git a/docs/benchmarks.html b/docs/benchmarks.html
index 9f021920fba..4b5df36a5ad 100644
--- a/docs/benchmarks.html
+++ b/docs/benchmarks.html
@@ -67,9 +67,6 @@
 <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>
@@ -114,7 +111,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -170,6 +167,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/contributions.html b/docs/contributions.html
index a4f463d7b34..b75e4162e65 100644
--- a/docs/contributions.html
+++ b/docs/contributions.html
@@ -69,9 +69,6 @@
 <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>
@@ -116,7 +113,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -172,6 +169,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/demo.html b/docs/demo.html
index 66b34290390..323c7b69f44 100644
--- a/docs/demo.html
+++ b/docs/demo.html
@@ -69,9 +69,6 @@
 <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>
@@ -116,7 +113,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -172,6 +169,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/demo2.html b/docs/demo2.html
index 225abdb4e41..2181b0a6b84 100644
--- a/docs/demo2.html
+++ b/docs/demo2.html
@@ -69,9 +69,6 @@
 <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>
@@ -116,7 +113,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -172,6 +169,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/demo3.html b/docs/demo3.html
index 57e0ccd52f0..996121a504c 100644
--- a/docs/demo3.html
+++ b/docs/demo3.html
@@ -69,9 +69,6 @@
 <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>
@@ -116,7 +113,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -172,6 +169,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/demo4.html b/docs/demo4.html
index afb48ed67e9..8c507b82232 100644
--- a/docs/demo4.html
+++ b/docs/demo4.html
@@ -69,9 +69,6 @@
 <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>
@@ -116,7 +113,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -172,6 +169,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/fileformats.html b/docs/fileformats.html
index 48287f19408..cd60bf6fb2d 100644
--- a/docs/fileformats.html
+++ b/docs/fileformats.html
@@ -69,9 +69,6 @@
 <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>
@@ -116,7 +113,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -172,6 +169,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/gettingstarted.html b/docs/gettingstarted.html
index 44dc057c3d9..22c6d11658e 100644
--- a/docs/gettingstarted.html
+++ b/docs/gettingstarted.html
@@ -69,9 +69,6 @@
 <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>
@@ -116,7 +113,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -172,6 +169,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/index.html b/docs/index.html
index b76dfe389eb..ab422b6343c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -67,9 +67,6 @@
 <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>
@@ -114,7 +111,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -170,6 +167,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/javadocs.html b/docs/javadocs.html
deleted file mode 100644
index eeaa5f79ccd..00000000000
--- a/docs/javadocs.html
+++ /dev/null
@@ -1,306 +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 - Javadocs</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="menupage">
-<div class="menupagetitle">Javadocs</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="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="javadocs.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
-        PDF</a>
-</div>
-<h1>Apache Lucene - Javadocs</h1>
-<div id="minitoc-area">
-<ul class="minitoc">
-<li>
-<a href="#Releases_Javadocs">Javadocs for Official Releases</a>
-</li>
-</ul>
-</div>
-
-
-<a name="N10011"></a><a name="Releases_Javadocs"></a>
-<h2 class="boxed">Javadocs for Official Releases</h2>
-<div class="section">
-<p>
-    
-<ul>
-<li>
-<a href="http://lucene.apache.org/java/2_2_0/api/index.html">2.2.0</a>
-</li>
-    
-<li>
-<a href="http://lucene.apache.org/java/2_1_0/api/index.html">2.1.0</a>
-</li>
-    
-<li>
-<a href="http://lucene.apache.org/java/2_0_0/api/index.html">2.0.0</a>
-</li>
-</ul>
-  
-</p>
-<p>Javadocs from older (pre 2.x) Lucene releases can be found under the Site Versions
-  section on the left-hand menu</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/javadocs.pdf b/docs/javadocs.pdf
deleted file mode 100644
index a1a63dc0a98..00000000000
--- a/docs/javadocs.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 420 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gau0>9i&Y\%))C:pt-U!i\YB',=;ko+X*L;i"3JAX&PP8G!l1SqD"9EE@!Ujc`uB6*A=_V@Mo1_a<2u72B7"X?kX*UIM8N0/J\bi3.^E:T#8aBcF7BiF0:]*/\Kj$VY9N7?!$lqf/@P[n-[jKQQdP98Y,CpKTHg$n_Z17mMs8a]eN5sX6N*IJAbe?0ju'@'1o(YW\Gk]4GC4_pY=>jWB6H2"CgPA`.fgSUbGd^+8Od.8t[oopNC]ZL_dF=i4^V^][W4Q4IXFVf(8tf`;a&T-4,^[YTW#IZECOlA,Q&*PJe.b$"D,<+d^Om."[4^0oQK)[>SJ1Q&sk0OHc-P'%.'IYnpJbpXPLtXnSYF>`qIEZ.Pbo+0FFqp10*L;`C:ZC%q:(GGVFh$`b`^7d\dEVDZW7XO3=4%F7YKEW~>
-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 546.166 255.62 534.166 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 9 0 R
-/H /I
->>
-endobj
-10 0 obj
-<< /Length 598 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GarnTbAQ&g&A7<Zp?3L/+Xt-ICl18=:nVYLoMYG!aHS8AQ<[$WgV5E7E(Cc\"GiKmB6SMZHH;:GH1EI/W&%.G(fjDrYR6P-!4RaFc0%Sf14fY)i;V!?n@b\#C!+7pGYPmu%s`31;*]m=H'o5r-U*04-qmU3qVr4Z,Q(Y@]Rr'\e#].bS(Y2<(F!GV!r,ZZ<Df/F7%S749kQWJ-fe'%?Z[jn33,_5C+1es[J'&kV#\XbQ.H?\7BRtg>K2?"8Ej*:TdS(WXuSlp>N4#a*0COQ9,t7QOUCd*\M5ei*Wp0CSW*i`?(IJpOPui!?%AQnKl*Q$pHIA*UbGLCY;X+lF0c8$K=G`ILlT2KI>#==f2ZZ$e`^hsqoI%-^#e>1H.sn2YAMsr%jmT`[*<mAGJ@RZOiJ9`;iO[J:t3+?AQ/F9-W<]AQ,63d(6@WA[(\lc14gAKmuQ0O;5hG"6\7u?2CpL>V#Q>c?;.@taLlrOXQce=?^GD&;j>Kj)eu7[Ljh?6"D1P^k.Wu>V>Ai9rjliokf8'soEGsc+@_.q.%a!aJnQtcIVI")[rG8U1Ut70[tkWuXofMVG7h9SF`2GY@<VYN31L@j~>
-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\112\0\141\0\166\0\141\0\144\0\157\0\143\0\163\0\40\0\146\0\157\0\162\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\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 
-0000002469 00000 n 
-0000002534 00000 n 
-0000002626 00000 n 
-0000000015 00000 n 
-0000000071 00000 n 
-0000000582 00000 n 
-0000000702 00000 n 
-0000000727 00000 n 
-0000002749 00000 n 
-0000000861 00000 n 
-0000001551 00000 n 
-0000002812 00000 n 
-0000001659 00000 n 
-0000001913 00000 n 
-0000002026 00000 n 
-0000002136 00000 n 
-0000002244 00000 n 
-0000002360 00000 n 
-trailer
-<<
-/Size 19
-/Root 2 0 R
-/Info 4 0 R
->>
-startxref
-2863
-%%EOF
diff --git a/docs/linkmap.html b/docs/linkmap.html
index 81570119cbd..5ff50d640c5 100644
--- a/docs/linkmap.html
+++ b/docs/linkmap.html
@@ -67,9 +67,6 @@
 <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>
@@ -114,7 +111,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -170,6 +167,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
@@ -257,7 +257,7 @@ document.write("Last Published: " + document.lastModified);
          
 <ul>
 <li>
-<a href="api/index.html">All (Core, Demo, Contrib)</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-all</em>
+<a href="api/index.html">All</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-all</em>
 </li>
 </ul>
 		 
@@ -368,7 +368,14 @@ document.write("Last Published: " + document.lastModified);
 <li>
 <a href="api/contrib-swing/index.html">Swing</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-swing</em>
 </li>
-</ul>		    
+</ul>
+			
+<ul>
+<li>
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-wikipedia</em>
+</li>
+</ul>					    
+			
 <ul>
 <li>
 <a href="api/contrib-wordnet/index.html">Wordnet</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>javadoc-contrib-wordnet</em>
diff --git a/docs/linkmap.pdf b/docs/linkmap.pdf
index 3cf90213764..fd8bafa8f25 100644
--- a/docs/linkmap.pdf
+++ b/docs/linkmap.pdf
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1131 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1107 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-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~>
+GatUt?#Q2d'Sc)J/%BCKiqXP'Cq<VFeS<g$]60PJE=uFV.?J`/YFc7qY[O[\[oH@CPk.(&SC\k,(6_NQ,et,0@'Q:goe2lO?o((LPeSW&<?J+M&0;"5?1@GpSi,L_R,Tf_G:r<hib=bGqi4+NbdI?0]"bs3MaeCTI2Vqi(:R20"UK=pL)^Rg^`i++(>Gok+dfi^TjK2GjcQ3OFHYI&ZP@m5/U.(s1g3\Gl)ga`BhF@3<B&GOD%;g2B6IfoB/,4;,PqS_m%(s:W7&OB"S=P)]0e%TKu@@Lr-S?_%`h-@0ol?$g^Mkqd11`<JtNBWBOFUJl3@:!9Fj5\gla!7$XY_W$&E)-$E_JC]ja63FYG@2/SO$J7.l_"=)TQX\qK;djZ08t$t9cNaDR3.U`5nD^>u'-VSls\o0'6Y<>:E`n"0X4<M'(8.g1NE1]3ALR]*_K/l);L*,o2MQ$:mpc=F(%1]@\3D$.Dk.'o8TfTk<(+mR/@pa<@I)q[TVltO^Id8\fI+"dUW`25qp[UX,(+!taQTTEA@E)e1ZgL!g'Rm<*U)OVcO_J.H!3*8`dg3lgThKb(U0_h$?ERXI!lAjQ?s!b!(P$s@>6b_[)rM7u&AFkW<Rm)/qQQc\pVl%=\&6fGW-%T+3bX@S2G=hJg%8)GFPRWTaB.r72Q,C%5kA.NZk45\feV@NIXY)E*h<I$2?5t2jIH8*gcb)hX7qr;<8b5]n`>E'bM=0JQ>J9hKC"uJFL;FLBGEd&Db&)pY9(uJZMEFZA;',W_:+DTF9MM2mXAj58W_X#fpOfD"i=CdpZ>D'")4s\;/ke[8?MYg'ifAS+b!hJ_nV<3+-f@6X0sfSH?BhY:`.)Pl0kn+/L;je25)ZpA6Z+d/HnUC6h2:jh,;YNE,FL;3=@:+4/9dsL5Ks^=<?BkXSS)\W]/UZH,MKJ[Mj-V143_-=@e69SQ('d$@"d2^ZpDDW-I;'N^HK"L(kRhQZmC8'Z_.rIHLcJ>;f;qP=9sq*#U16dVS+*;N.IA&+=;VmSa:L0J#h(ndNAE00LL6r6ccYo#$^JC_::_@p%H%'2m5fLp"ZK6[qAR2IBE1fZ-d=<>$KMI6ml$.+8S3IR3nL~>
 endstream
 endobj
 6 0 obj
@@ -20,10 +20,10 @@ endobj
 >>
 endobj
 7 0 obj
-<< /Length 776 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 805 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-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]+-:%~>
+GatUr?&t^6'Sc)T'tp-JT\Bu\b2kTc2qcD%CF%S)FuGfs79L3:lT"n@/I4[#KS7aRF-QEI:-%_+1miZY0n9Qu+G_BNX<nc,o>Q5Vf-EB:O<YPE>O_OKN=bdh*/kaj5<\p:2T\]_M)75IWmor'cQi2eK($^6?Yp\hQ[$mOM/DfZ^<7o8SM8B3OY!&%lV\+q4/&+.HI2%hc&3uKH8I)ETeD(9EC\`-$uo_W8It"MNu&Il9/&T1i`sZ4-!7.g&VI$EpaM,R.RobZ]LusEakP6-[]-SdBq/IGelsB]AV(3m78JnAQ%eP+/2i9gb`oGkflC5=A;BAnIoejA8j;Mccc-'5-@q"j'\^\sN,F,(c^s9oaXF_8O6(hXL@k6,/4ijr['REt9)XTJl^9XF[UEtlS@B.P6:H@Xa>^'TPh&F7C2"Jf(0X/ehm5!a(q2[$;<L@ldm6l5pq<0XjVY#!Z`FP&7EbU=1oT>o@W#DIQ%sEoUk`nPe@TM]UZtHucEnQ%CN^47Y&/DDIL`dT&1YT2RqE>%[o;t83&m6k8r7D)BJbLS.-]PWjZ*4oY-uhUQ!F7j!<Tk+kTs%:$9V!*-N<+h7A?iCo?9Vl3&+-pA=K^V=h-dM;u9pICk^sOWj:q[r>JB'e]#BY&[@`^*]&^U"pbhG$3fG2Hnm9l,5;q;)*BAsn6IG)^DV5GgRiT1`2LDlR-Hf#Fm_&QR@1l/&?[H!?_j:bh76'WCL-1]Eo#UY_ehdQib]C2<?"'fACukXH)sfIk[\<$0oKRfg;D3GC"`cVpRr6N1L&a:"P^?]%ii_hp]~>
 endstream
 endobj
 8 0 obj
@@ -87,19 +87,19 @@ endobj
 xref
 0 14
 0000000000 65535 f 
-0000002930 00000 n 
-0000002994 00000 n 
-0000003044 00000 n 
+0000002935 00000 n 
+0000002999 00000 n 
+0000003049 00000 n 
 0000000015 00000 n 
 0000000071 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 
+0000001270 00000 n 
+0000001376 00000 n 
+0000002272 00000 n 
+0000002378 00000 n 
+0000002490 00000 n 
+0000002600 00000 n 
+0000002711 00000 n 
+0000002819 00000 n 
 trailer
 <<
 /Size 14
@@ -107,5 +107,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-3166
+3171
 %%EOF
diff --git a/docs/lucene-sandbox/index.html b/docs/lucene-sandbox/index.html
index 1abd40ccc32..b09c423d90a 100644
--- a/docs/lucene-sandbox/index.html
+++ b/docs/lucene-sandbox/index.html
@@ -69,9 +69,6 @@
 <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>
@@ -116,7 +113,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="../api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="../api/core/index.html">Core</a>
@@ -172,6 +169,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="../api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="../api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="../api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/queryparsersyntax.html b/docs/queryparsersyntax.html
index f65e6c34f1d..b9696bf5525 100644
--- a/docs/queryparsersyntax.html
+++ b/docs/queryparsersyntax.html
@@ -69,9 +69,6 @@
 <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>
@@ -116,7 +113,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -172,6 +169,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/docs/scoring.html b/docs/scoring.html
index 2e71f3455c0..f9ed5c27485 100644
--- a/docs/scoring.html
+++ b/docs/scoring.html
@@ -69,9 +69,6 @@
 <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>
@@ -116,7 +113,7 @@ document.write("Last Published: " + document.lastModified);
 <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>
+<a href="api/index.html">All</a>
 </div>
 <div class="menuitem">
 <a href="api/core/index.html">Core</a>
@@ -172,6 +169,9 @@ document.write("Last Published: " + document.lastModified);
 <a href="api/contrib-swing/index.html">Swing</a>
 </div>
 <div class="menuitem">
+<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
+</div>
+<div class="menuitem">
 <a href="api/contrib-wordnet/index.html">Wordnet</a>
 </div>
 <div class="menuitem">
diff --git a/src/site/src/documentation/content/xdocs/site.xml b/src/site/src/documentation/content/xdocs/site.xml
index a64271afc01..d76a81c74ba 100755
--- a/src/site/src/documentation/content/xdocs/site.xml
+++ b/src/site/src/documentation/content/xdocs/site.xml
@@ -44,7 +44,7 @@ See http://forrest.apache.org/docs/linking.html for more info
   <docs label="Documentation">
       <overview label="Overview" href="index.html"/>
       <javadoc label="Javadocs">
-         <javadoc-all label="All (Core, Demo, Contrib)" href="ext:javadocs-all"/>
+         <javadoc-all label="All" href="ext:javadocs-all"/>
 		 <javadoc-core label="Core" href="ext:javadocs-core"/>
 		 <javadoc-demo label="Demo" href="ext:javadocs-demo"/>
 		 <javadoc-contrib label="Contrib">
@@ -65,7 +65,9 @@ See http://forrest.apache.org/docs/linking.html for more info
             <javadoc-contrib-snowball label="Snowball" href="ext:javadocs-contrib-snowball"/>
 		    <javadoc-contrib-spellchecker label="Spellchecker" href="ext:javadocs-contrib-spellchecker"/>
 		    <javadoc-contrib-surround label="Surround" href="ext:javadocs-contrib-surround"/>			
-		    <javadoc-contrib-swing label="Swing" href="ext:javadocs-contrib-swing"/>		    <javadoc-contrib-wordnet label="Wordnet" href="ext:javadocs-contrib-wordnet"/>			
+		    <javadoc-contrib-swing label="Swing" href="ext:javadocs-contrib-swing"/>
+			<javadoc-contrib-wikipedia label="Wikipedia" href="ext:javadocs-contrib-wikipedia"/>					    
+			<javadoc-contrib-wordnet label="Wordnet" href="ext:javadocs-contrib-wordnet"/>			
 		    <javadoc-contrib-xml-query-parser label="XML Query Parser" href="ext:javadocs-contrib-xml-query-parser"/>			
 		 </javadoc-contrib>
 	  </javadoc>
@@ -108,6 +110,7 @@ See http://forrest.apache.org/docs/linking.html for more info
 	<javadocs-contrib-spellchecker href="api/contrib-spellchecker/index.html"/>
 	<javadocs-contrib-surround href="api/contrib-surround/index.html"/>
 	<javadocs-contrib-swing href="api/contrib-swing/index.html"/>
+	<javadocs-contrib-wikipedia href="api/contrib-wikipedia/index.html"/>
 	<javadocs-contrib-wordnet href="api/contrib-wordnet/index.html"/>
 	<javadocs-contrib-xml-query-parser href="api/contrib-xml-query-parser/index.html"/>
 	
diff --git a/src/site/src/documentation/content/xdocs/tabs.xml b/src/site/src/documentation/content/xdocs/tabs.xml
index 42bb95fa151..376545ecaca 100755
--- a/src/site/src/documentation/content/xdocs/tabs.xml
+++ b/src/site/src/documentation/content/xdocs/tabs.xml
@@ -39,7 +39,9 @@
 
   <tab id="" label="Main" href="http://lucene.apache.org/java/docs/"/>
   <tab id="wiki" label="Wiki" href="http://wiki.apache.org/lucene-java"/>
+    <!--
   <tab label="Lucene 2.3.0 Documentation" href="http://lucene.apache.org/java/2_3_0/"/>
+  -->
   <tab label="Lucene 2.4-dev Documentation" dir=""/>