diff --git a/docs/benchmarks.html b/docs/benchmarks.html
index 54a82b2e6ae..0cd911be8de 100644
--- a/docs/benchmarks.html
+++ b/docs/benchmarks.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Lucene - Resources - Performance Benchmarks</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -16,89 +16,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -217,17 +172,8 @@ document.write("Last Published: " + document.lastModified);
 <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="benchmarks.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
@@ -1134,27 +1080,18 @@ A            34 minutes
 
     
 </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);
+document.write("<text>Last Published:</text> " + 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/contributions.html b/docs/contributions.html
index 6c81f532b1d..b256b4d7bdf 100644
--- a/docs/contributions.html
+++ b/docs/contributions.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
 	Apache Lucene - Contributions
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -219,17 +174,8 @@ document.write("Last Published: " + document.lastModified);
 <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="contributions.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
@@ -693,27 +639,18 @@ document.write("Last Published: " + document.lastModified);
 </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);
+document.write("<text>Last Published:</text> " + 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/demo.html b/docs/demo.html
index 2a2815e9154..237322795ac 100644
--- a/docs/demo.html
+++ b/docs/demo.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
 	Apache Lucene - Building and Installing the Basic Demo
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -219,17 +174,8 @@ document.write("Last Published: " + document.lastModified);
 <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="demo.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
@@ -339,27 +285,18 @@ you whether you want more results.
 
 
 </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);
+document.write("<text>Last Published:</text> " + 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/demo2.html b/docs/demo2.html
index 9009dda9c23..70e39ab1bf5 100644
--- a/docs/demo2.html
+++ b/docs/demo2.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
 	Apache Lucene - Basic Demo Sources Walk-through
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -219,17 +174,8 @@ document.write("Last Published: " + document.lastModified);
 <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="demo2.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
@@ -367,27 +313,18 @@ displayed to the user.
 
 
 </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);
+document.write("<text>Last Published:</text> " + 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/demo3.html b/docs/demo3.html
index e7a04fb94ae..e7878a16fde 100644
--- a/docs/demo3.html
+++ b/docs/demo3.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
 	Apache Lucene - Building and Installing the Basic Demo
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -219,17 +174,8 @@ document.write("Last Published: " + document.lastModified);
 <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="demo3.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
@@ -362,27 +308,18 @@ If you want to know more about how this web app works or how to customize it the
 
 
 </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);
+document.write("<text>Last Published:</text> " + 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/demo4.html b/docs/demo4.html
index 1f4146e9815..c062fa069ec 100644
--- a/docs/demo4.html
+++ b/docs/demo4.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
 	Apache Lucene - Basic Demo Sources Walkthrough
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -219,17 +174,8 @@ document.write("Last Published: " + document.lastModified);
 <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="demo4.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
@@ -427,27 +373,18 @@ everyone can share in them.  Thanks for understanding!
 
 
 </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);
+document.write("<text>Last Published:</text> " + 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.html b/docs/developer-resources.html
index 85c8980a34f..3e45adefcd0 100644
--- a/docs/developer-resources.html
+++ b/docs/developer-resources.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Lucene - Developer Resources</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -16,89 +16,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -217,17 +172,8 @@ document.write("Last Published: " + document.lastModified);
 <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>
@@ -264,10 +210,7 @@ document.write("Last Published: " + document.lastModified);
 <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="Downloads"></a>
 <h2 class="boxed">Downloads</h2>
@@ -310,27 +253,18 @@ document.write("Last Published: " + document.lastModified);
 
 
 </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);
+document.write("<text>Last Published:</text> " + 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.html b/docs/features.html
index 0edee66a7e9..0dc7dca6023 100644
--- a/docs/features.html
+++ b/docs/features.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Lucene - Features</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -16,89 +16,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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;">
@@ -217,17 +172,8 @@ document.write("Last Published: " + document.lastModified);
 <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>
@@ -320,27 +266,18 @@ document.write("Last Published: " + document.lastModified);
 
 
 </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);
+document.write("<text>Last Published:</text> " + 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/fileformats.html b/docs/fileformats.html
index 212d3a4e68b..df1db05a76e 100644
--- a/docs/fileformats.html
+++ b/docs/fileformats.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
             Apache Lucene - Index File Formats
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -219,17 +174,8 @@ document.write("Last Published: " + document.lastModified);
 <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="fileformats.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
@@ -2339,27 +2285,18 @@ document.write("Last Published: " + document.lastModified);
 
     
 </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);
+document.write("<text>Last Published:</text> " + 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/gettingstarted.html b/docs/gettingstarted.html
index 0b2635e097a..f21f4c6a3b2 100644
--- a/docs/gettingstarted.html
+++ b/docs/gettingstarted.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
 	Apache Lucene - Getting Started Guide
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -219,17 +174,8 @@ document.write("Last Published: " + document.lastModified);
 <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="gettingstarted.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
@@ -300,27 +246,18 @@ may wish to skip sections.
 
 
 </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);
+document.write("<text>Last Published:</text> " + 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/index.html b/docs/index.html
index b14cdac5fdc..1c7f303de6a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
 	Apache Lucene - Overview
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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;">
@@ -222,17 +177,8 @@ document.write("Last Published: " + document.lastModified);
 </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>
@@ -332,7 +278,7 @@ document.write("Last Published: " + document.lastModified);
 </li>
 			  
 <li> 
-<a href="http://lucene.apache.org/java/2_2_0/api/index.html?org/apache/lucene/search/function/package-summary.html">Funtion queries</a>
+<a href="http://lucene.apache.org/java/2_2_0/api/index.html?org/apache/lucene/search/function/package-summary.html">Function queries</a>
 </li>
 			  
 <li> 
@@ -534,18 +480,12 @@ document.write("Last Published: " + document.lastModified);
 
     
 </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);
+document.write("<text>Last Published:</text> " + document.lastModified);
 //  --></script>
 </div>
 <div class="copyright">
@@ -553,9 +493,6 @@ document.write("Last Published: " + document.lastModified);
          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/index.pdf b/docs/index.pdf
index 2b7f8273d43..087448a999c 100644
--- a/docs/index.pdf
+++ b/docs/index.pdf
@@ -201,10 +201,10 @@ endobj
 >>
 endobj
 40 0 obj
-<< /Length 1996 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2021 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm<9lo&I&A@C2E-b):;]u;=SX]#dN\aDh`k$8\*Zu(.O\gQ0Jl8+Ghk_ci$]7p42WG[C+:2H5gQ/i%j^Rpu1&E`t8XcK)i3iSP9&'B.T;A,lf&$&:%l`>ro82qT;$apFe6^I86td-X7X3,0n$C3Vm)=,,dIr:5C?Bm/)6<gfeE`ud!PBJ#MiIJoF%UoTk3R)Uk8.?oQ_GT%f&T06pb-RUVDFZ)Y'"e>+UCXXa%%@P#/AfDaJ5gm_;1\[&glH&;`c&@ZL4oAIp'p:3St1MdUpBs/q3%,XdZ8YY6;=o&Oh3(MQaH1eUj:'m)MGp-/Q(n9>f"AIq*Dm[6bn4E8gR@@0\bY=_U9X-;)fq^Yq87fY4cnLsq6o<4^LnZsqi^bEisL(0Kc*$D:f0\AEmc[ZWY[;BrMaacRl=Ht`RJ4^bYWmhC277DqE`moW#m&G9)bP#p;-guu>@D_#^0kE4.LPCTJ/,sW"i]bP3[lc/"!f%0%\,"JTJ1U9'ZlH0D)W6flkBjMophGo0Zk`l>_D!Am(qM^BaUHoX65)Bda\?j-]R;Fg5OQW@@LJ/;M^&PG"7%o\5rG9l$d0/t)ZORHie)#I"p@Vt,M4e`3!BY0@^eO+7B`B0+dEh;//Y"4+@LP^[L07"*0K`g_AX-l+"uI/MoDPI,c25Zp@Lu=oYgI-Ti$ur!`)$(0,Dc^'T%Y/2:s@@\6a8%ZG+#$q,tC`i:7[LdaKV5f5WqO(e5G6N4B^$B%:T>ks2djQY.iL@a)WPdTd1X5Ht4d[H'EIcJ%F*,fst('.lZIcTd!%8*aLLp,b8'-N^'nITH9X?Ua2P!GMO[V%"DuEO^`\Y(6NQF*J^MM]A&/D[P`Xe?9N\RU:?A\R]tS.q`))S<q;uHY2-u8Fs?TQN$.p;%ici?b@Za9r[RD)@<3,@pHjf>$F6<8MQ>>FmquIf'8q2=LTWsG8?mJ?Sq7)6_ccUCmo<:o/X<=I?_'>==FB_'X#5@`eRi^G:.dUJbmRUeQAB9]'`rs@#ucHaYm@J/FMgNgTm/bZ4NCX<e@'Hn`L;bjc*lP29\Oohr@OG3`XOIeVa@*:kbFSg_d6dSSMm4K@"aCKV<$!_HWa@9$`=l('DfC1n)RZ'PH<6KC)dsJ%`BEPeCcVF4r3i`I4:H1iAuu9p.L+@Xc^fH\maX;j%'PX$M-V(OMDCcjH0=eEFr?EJrCbi)7L_FmB<_4dPMFaP6*n+7I:#VB>)/Nnl91m,Ft'7QGt1\I:j9MP(&Hs1[()%M0s,8)\_WCjlK6V%Hef/j*E2N9>3c3_pL`J>4*AI#JmC5M@[uN'/Z9".Z6'&%+QSJIJ0C(2RO9si#A1,\8?Kk@7Tb"``:m;,M1I'o[7,-P*nPAP+NbcWPl[g5rb:aEp"47E`A`7(mF`FpprV//Y"'OrSYc^euYPI/[%@!ZVLIcJWCiqiio37Eh!:?+*DH[)c9-3+FL7pl)N0Y^kio?0jK\Z)HdW5n>Ws#K,eT!hDCLQTQ98/.!BG<E@.+pp_;YM'-#!$k#FQATV6FLPm4'gHX91<ZR'XF!p1/>TYNHd)`T1:7,N3uL=TI%UohoSEN*s(E5acj;4XA!PaSO$-`*St1oJ08CjAk4l3_*-XuDjD9+&7Q#sr9po(4I!OdhCt6nSH4XEO?,7XHR*1g]>2G70j/:\CRMrIn2;E,rK#*)fX"%6o6b$a$mN_8"mfcP5i?^#]u.'o_rh=egm%++1EBUS&7n<'n1@a8HCdR:H)A&F3BO#A"ei:o2P?_u6[rIRQR[N%!Uj/8Jslg4:'lbY(N`'eKi'E!c1MODr@JiV/ri+^#F6bk]_i\MJOB^!f`bk9AE$JD>>+rIcHD6"qJIUK2#/8"HJDUEVB=J3\Yi,#&P*h=7nb4[Ym@hrut>0.[DSo^.o5&]s%R91+5RkXDZHp;+gmq3[Iep'.6TZAA3!:o1ZD/IkaU4j!Zt?E`_pd#rNqY'$Ls8(SA1XfG4Qi,S3(NM4(TSL@=dp,AUY?GZ~>
+Gatm<9lo&I&A@C2E,nN2;^!F]SX]#dN\aDh`k$8\*Zu(.O\gQ0J<HI1hk_ci$^t&C2WG[C+:2H5@X$^6ShF]Z(UL;$T4E60LL0jB$A.u$m,sf"l*WJKnDfcmbC/As8K>Qb'Xu]c+=9AkH('*'fcRQl`U)\tl36P_Mq-&Geh^D/rW99m)MR[,i[m(F?S;KOM`7OEbIfghZD-@Wq"LZD'#oEJMmo8)_8BGX#8=t1A4^eu,,=Xc9o-K5Fsa`Rdssi#\,4[8a0@>s2<unGZ**4nY#e56Qn8$9rM*@kfCK_i[aDbSDd.['qiTi2(KE]^E\6dh[9.1@n,"&N/Ze()i!L9\T+QC"_ke*:f4^n?rUjC'A'!EVp:E:90.Nr9[72[87Td+#OgX,$INSY02Ln@]fPYJ%0Imhmb>o$SUA<CF0URD]49%H4+6PBK&*Q*YU9icib6u.$Cepai1%T8,CjUD;FNlWffma;>"A3Mk)B%)h!mTG6opHU%24TW(:O%#Y3I4Z)]rVr!d:(n]S/LrkK*Si*@S;/97]Xq0MA)U-#8anVq$NO,'nT6rgmFe5#gV<,=`WNCa8(1ikdY:mq"8>+LQ^oNI*_P!ZJ<Ap2q!d/[h&(\KRSOHs!\f`*,j9BM8LLVE!0[8k9PnY,=Yp=K,iEl#32PoTD#%*J,,3;ie\:/)Qa[eMSM5DRQnY[@mY[@2Ff21ZRkH>/1R/qH>$3qd*mtQB>b!0Cr\J2&(*I.8=Y?/(3I4oZ%/2@m%e,mhp&4,gkcXl8Oj2].#hYA&9JSXh'aH6>faGj)uaZp#XY[a=,[6E9rrTWmb:WI7d#IC8LES*2R7;fnCND1_8d@d0o74mEr:$&F$3C:[[K"olMGLe'j$"=';kXu*sgK>8lh7p[<n:Z:8j`i'#`\fOb9$3frVI/G8rj.[QnhRbP<!J0G"&Z\9N)grp'/.Yuh]"mOGc$*&FAf'W*8u:83MoYF?/gWK8F@F8"Bsp+7a@fD'c\S=)i.8`e;W.p`-X,$1hVj9XP$CBI(_=_KZ]*%pe!"nYCI"X`9+ZB]2T->bSQ[O&8-ddALDh`?r?XC*24,mkBB+Q_Z=lif;od1MoQ,Hci!8e-o%0BsJQ_GLDEK#!`:SO,n-,jQj\Kqe^i!T.B7Fgd5N+-$,m4r;Y0\B[AK"]Hk/eRI362f,"/*77Rtf0<8dKRO'+6iQQ-RH>(^_/NptX?hH>^V8c%h)J`/AE[GQioBJqlNJo(Y8[q6FHWhAQB6nHBpFeKohmW,J`8JHJm.k8XHl@8IM@lYXi=h&`]9I0m'^o%#S\D$k(Mu<mQkTWWT:#1%_W<W#+%gG*16fVAUk9qD9IUM8!$.G8IigrhSAO3fu@-s9=DZ^L)&&uBET#/Q^BFrN-']lJ1LrK&RkX;V"iq'<mC*2*/)MP>3t&8<fM,?%7:aK&7;m%gVW3(D[5+%>Q'9]BNb:Fh!9Ok.eM+5j>_N`mhj=tM7]YNc%_Pd!XO"+.ok29%lf]lXu)?;r?nF*ToUs?%E,-Jo;5f=#V*lcBB?9r,:B5=JKFl>o#/Q<X]]Kf8j.u<Qa9Mg[B2A;_Q>%Q>i;N@"i*#sC$<(!7,JLp9jfY0$!X$B`4<bMj+;-VUPojsnRPXF;EEN&F/76:GX?DNC6W^lg2,K(1?d:L:o8EYdr2H\Tg+6N@+i$P`nbDKm5_p_GaXbf5_>4aesEP!i(g\talPj.9RROgpu*/m.^_DGrkfe,nbDVO*NPm6@*I6NC/m0E[_n-R5lc"G/0Wj3j6$djc8#8]no^uG#%\\h:oR9lidRS@5=cqVN)86"09*2s_W'Z'oeI.gDN)F8_Ck=U&-DsXLS'aXPiQOFZ-OM1c(35e:glH5G$%;Q!-*5@+n="U^tDP=ig-iN8&c$n7`Ab/#g!'E,YJY+h6=<!4[l"F^LMZ<5r=R1oGKRfma%*Lb9DI\:c0&(H`tE"H:U\Bj2"TbBH6Xh@&9Y@/Inr)H7/II>ICd6K=L78>cL8Z%nB:>[&uH4K87,L)FJr'4'j-0pCBl-E;f~>
 endstream
 endobj
 41 0 obj
@@ -586,76 +586,76 @@ endobj
 xref
 0 71
 0000000000 65535 f 
-0000024764 00000 n 
-0000024850 00000 n 
-0000024942 00000 n 
+0000024789 00000 n 
+0000024875 00000 n 
+0000024967 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000001301 00000 n 
 0000001421 00000 n 
 0000001551 00000 n 
-0000025093 00000 n 
+0000025118 00000 n 
 0000001686 00000 n 
-0000025156 00000 n 
+0000025181 00000 n 
 0000001822 00000 n 
-0000025222 00000 n 
+0000025247 00000 n 
 0000001959 00000 n 
-0000025288 00000 n 
+0000025313 00000 n 
 0000002096 00000 n 
-0000025354 00000 n 
+0000025379 00000 n 
 0000002233 00000 n 
-0000025418 00000 n 
+0000025443 00000 n 
 0000002370 00000 n 
-0000025484 00000 n 
+0000025509 00000 n 
 0000002507 00000 n 
-0000025550 00000 n 
+0000025575 00000 n 
 0000002644 00000 n 
-0000025616 00000 n 
+0000025641 00000 n 
 0000002781 00000 n 
-0000025682 00000 n 
+0000025707 00000 n 
 0000002918 00000 n 
-0000025748 00000 n 
+0000025773 00000 n 
 0000003055 00000 n 
-0000025812 00000 n 
+0000025837 00000 n 
 0000003192 00000 n 
-0000025878 00000 n 
+0000025903 00000 n 
 0000003328 00000 n 
-0000025944 00000 n 
+0000025969 00000 n 
 0000003465 00000 n 
-0000026008 00000 n 
+0000026033 00000 n 
 0000003602 00000 n 
-0000026074 00000 n 
+0000026099 00000 n 
 0000003739 00000 n 
-0000005828 00000 n 
-0000005936 00000 n 
-0000008011 00000 n 
-0000008119 00000 n 
-0000010337 00000 n 
-0000017595 00000 n 
-0000017703 00000 n 
-0000019137 00000 n 
-0000026140 00000 n 
-0000019245 00000 n 
-0000019413 00000 n 
-0000019611 00000 n 
-0000019913 00000 n 
-0000020285 00000 n 
-0000020625 00000 n 
-0000021016 00000 n 
-0000021220 00000 n 
-0000021424 00000 n 
-0000021744 00000 n 
-0000022071 00000 n 
-0000022399 00000 n 
-0000022759 00000 n 
-0000023089 00000 n 
-0000023500 00000 n 
-0000023879 00000 n 
-0000024208 00000 n 
-0000024321 00000 n 
-0000024431 00000 n 
-0000024539 00000 n 
-0000024655 00000 n 
+0000005853 00000 n 
+0000005961 00000 n 
+0000008036 00000 n 
+0000008144 00000 n 
+0000010362 00000 n 
+0000017620 00000 n 
+0000017728 00000 n 
+0000019162 00000 n 
+0000026165 00000 n 
+0000019270 00000 n 
+0000019438 00000 n 
+0000019636 00000 n 
+0000019938 00000 n 
+0000020310 00000 n 
+0000020650 00000 n 
+0000021041 00000 n 
+0000021245 00000 n 
+0000021449 00000 n 
+0000021769 00000 n 
+0000022096 00000 n 
+0000022424 00000 n 
+0000022784 00000 n 
+0000023114 00000 n 
+0000023525 00000 n 
+0000023904 00000 n 
+0000024233 00000 n 
+0000024346 00000 n 
+0000024456 00000 n 
+0000024564 00000 n 
+0000024680 00000 n 
 trailer
 <<
 /Size 71
@@ -663,5 +663,5 @@ trailer
 /Info 4 0 R
 >>
 startxref
-26191
+26216
 %%EOF
diff --git a/docs/linkmap.html b/docs/linkmap.html
index 22279884f5e..ceb9e03119e 100644
--- a/docs/linkmap.html
+++ b/docs/linkmap.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
-<title>Site Linkmap Table of Contents</title>
+<title>Site Linkmap</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">
@@ -16,89 +16,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -217,29 +172,27 @@ document.write("Last Published: " + document.lastModified);
 <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="linkmap.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
         PDF</a>
 </div>
-<h1>Site Linkmap Table of Contents</h1>
-<p>
-          This is a map of the complete site and its structure.
-        </p>
+<h1>Site Linkmap</h1>
+<div id="minitoc-area">
+<ul class="minitoc">
+<li>
+<a href="#Table+of+Contents">Table of Contents</a>
+</li>
+</ul>
+</div>
+<a name="N10007"></a><a name="Table+of+Contents"></a>
+<h2 class="boxed">Table of Contents</h2>
+<div class="section">
 <ul>
 <li>
-<a>Lucene</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>site</em>
+<a href="">Lucene</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>site</em>
 </li>
 <ul>
    
@@ -247,30 +200,31 @@ document.write("Last Published: " + document.lastModified);
   
 <ul>
 <li>
-<a>About</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>about</em>
+<a href="">About</a>&nbsp;&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>
+<a href="index.html">Overview</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>overview</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>
+<a href="features.html">Features</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>features</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="whoweare.html">Who We Are</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>who-we-are</em>
+<a href="http://wiki.apache.org/lucene-java/PoweredBy">Powered by Lucene</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>powered-by</em>
+</li>
+</ul>
+      
+<ul>
+<li>
+<a href="whoweare.html">Who We Are</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>who-we-are</em>
 </li>
 </ul>
   
@@ -280,68 +234,68 @@ document.write("Last Published: " + document.lastModified);
   
 <ul>
 <li>
-<a>Documentation</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>docs</em>
+<a href="">Documentation</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>docs</em>
 </li>
 <ul>
 
       
 <ul>
 <li>
-<a href="api/index.html">API Docs</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>apidocs</em>
+<a href="api/index.html">API Docs</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>apidocs</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="benchmarks.html">Benchmarks</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>benchmarks</em>
+<a href="benchmarks.html">Benchmarks</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>benchmarks</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="contributions.html">Contributions</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>contributions</em>
+<a href="contributions.html">Contributions</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>contributions</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="http://wiki.apache.org/lucene-java/LuceneFAQ">FAQ</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>faq</em>
+<a href="http://wiki.apache.org/lucene-java/LuceneFAQ">FAQ</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>faq</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="fileformats.html">File Formats</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>file-formats</em>
+<a href="fileformats.html">File Formats</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>file-formats</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="gettingstarted.html">Getting Started</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>tutorial</em>
+<a href="gettingstarted.html">Getting Started</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>tutorial</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="lucene-sandbox/index.html">Lucene Sandbox</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>lucene-sandbox</em>
+<a href="lucene-sandbox/index.html">Lucene Sandbox</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>lucene-sandbox</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="queryparsersyntax.html">Query Syntax</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>query-syntax</em>
+<a href="queryparsersyntax.html">Query Syntax</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>query-syntax</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="scoring.html">Scoring</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>scoring</em>
+<a href="scoring.html">Scoring</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>scoring</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="http://wiki.apache.org/lucene-java">Wiki</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>wiki</em>
+<a href="http://wiki.apache.org/lucene-java">Wiki</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>wiki</em>
 </li>
 </ul>
   
@@ -351,43 +305,43 @@ document.write("Last Published: " + document.lastModified);
   
 <ul>
 <li>
-<a>Resources</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>resources</em>
+<a href="">Resources</a>&nbsp;&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>
+<a href="developer-resources.html">Developers</a>&nbsp;&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>
+<a href="http://issues.apache.org/jira/browse/LUCENE">Issue Tracking</a>&nbsp;&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>
+<a href="mailinglists.html">Mailing Lists</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>contact</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="releases.html">Releases</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>release</em>
+<a href="releases.html">Releases</a>&nbsp;&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>
+<a href="systemrequirements.html">System Requirements</a>&nbsp;&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>
+<a href="http://svn.apache.org/viewcvs.cgi/lucene/java/">Version Control</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>svn</em>
 </li>
 </ul>
   
@@ -396,49 +350,49 @@ document.write("Last Published: " + document.lastModified);
   
 <ul>
 <li>
-<a>Site Versions</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>versions</em>
+<a href="">Site Versions</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>versions</em>
 </li>
 <ul>
       
 <ul>
 <li>
-<a href="./">Main</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>official</em>
+<a href="./">Main</a>&nbsp;&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>
+<a href="http://lucene.apache.org/java/1_4_3/">1.4.3</a>&nbsp;&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>
+<a href="http://lucene.apache.org/java/1_9_0/">1.9.0</a>&nbsp;&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>
+<a href="http://lucene.apache.org/java/1_9_1/">1.9.1</a>&nbsp;&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>
+<a href="http://lucene.apache.org/java/2_0_0/">2.0.0</a>&nbsp;&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>
+<a href="http://lucene.apache.org/java/2_1_0/">2.1.0</a>&nbsp;&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>
+<a href="http://lucene.apache.org/java/2_2_0/">2.2.0</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>rel2_2_0</em>
 </li>
 </ul>
 
@@ -450,43 +404,43 @@ document.write("Last Published: " + document.lastModified);
   
 <ul>
 <li>
-<a>Related Projects</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>projects</em>
+<a href="">Related Projects</a>&nbsp;&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>
+<a href="http://lucene.apache.org">Lucene (Top-Level)</a>&nbsp;&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>
+<a href="http://lucene.apache.org/hadoop/">Hadoop</a>&nbsp;&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>
+<a href="http://lucene.apache.org/lucy/">Lucy</a>&nbsp;&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>
+<a href="http://incubator.apache.org/projects/lucene.net.html">Lucene.Net</a>&nbsp;&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>
+<a href="http://lucene.apache.org/nutch/">Nutch</a>&nbsp;&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://lucene.apache.org/solr/">SOLR</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>lucene</em>
 </li>
 </ul>
   
@@ -501,27 +455,19 @@ document.write("Last Published: " + document.lastModified);
 </ul>
 </ul>
 </div>
-<!--+
-    |end content
-    +-->
+</div>
 <div class="clearboth">&nbsp;</div>
 </div>
 <div id="footer">
-<!--+
-    |start bottomstrip
-    +-->
 <div class="lastmodified">
 <script type="text/javascript"><!--
-document.write("Last Published: " + document.lastModified);
+document.write("<text>Last Published:</text> " + 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/linkmap.pdf b/docs/linkmap.pdf
index c90eed381a8..b1568f52060 100644
--- a/docs/linkmap.pdf
+++ b/docs/linkmap.pdf
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 1211 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 357 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatU4h/;7$(qn6opp+rQQ@IY1f1n9*)0N@9-;lL/<\*0k`i<NHN194h&%7Z=;DG>E<b_YnF3Y"1pu#a=q-ul<9EC(flNqD,AJ5nD9i(u[08e2TNDg)g:SPfdqJeC=NVjJbELbZ7=*Jrc]G8&m@3Lqjo3JKqneY:E=dnVSoP_,3AsleTE6%=mYrDq-dZ/4Maf>Vt2.*NAZKR2O"^Rt"m)iobqb!`o]0[F6V97V_-s$nBEMt@^lcdj^Js1?ld*>ON-3rp&0kS0,(;XTb(l*V_UV3]a=Z2E[Cl/1=s)S8&mf5(<!C>Lrls^B]^q:7F&\ubW4[l:Wrd(PY1KG-&4*g=i_[A!S9`r<,Da;]7Y>W-tE^*_A,Mb>i*9mYF<(>:ME,sOuF2(BiARX2XZ_EEDbMU7=ZXSt/h/]&T%P^KUOjBh:Q=2X3ElnDqguhe35R6G)-DWT_RBl9r0=>m1[![3Bm5WK-,![]]8&+BbV@Ce3Cef==SB668.!P[eo!KO@QWP3(1%one)`?HpWR/OpUm)&-GcS,rCH#+!E`J-,"U(VMp5)g"qnNPP"GZW,mpGtN]5>s8g(S]$>V`S-5Gf"_TR1QeR;KB!5ED/NRGH^5T4R9&%]CUD*->"u4R.;s2`!O%?u-bnp5(OHGt9/UJp*PfhiCf-i&UR9]F:j7C![9p]PniP;gKt<"]HApeX#u`CWeD;++]3C2A$.hr[!QGbGS\6g^%cNrGps]-e9Ntk;9SD3Z#c>;?VV!3UP?eTf+K+WrGQs9mD$9HB^kA0s-J_"*/C=K!)YfV05V&q4$1Za,@@n+di+Z0+Gh+3WK[^[0RrIbVM=Bm2?hTCD2;JMX$!XUs#Vt+WET,chV.Tp<`OcgqXe_#n;4B5ut#:f`bLgZ?\.t3HPcm1fT88c#G7@AYF9F?a.d?^hMf7X;ojnFXUfe079n%g2ZOIMsU8&"W)6,f_LJO6h(2B[VNqgIuCu/[_fYh\mX9QmG4")T<UEG6oKG75V*DVi^">X<0sE7ELSG&*4c4m(.OI[4m$[JOkY?[*ootbCUri8eg"+0K[*`$"&7P5cc+tAI2?QM\Hp1tAeAnU+i#YW10RKA-TB:s!k."&iB8@#0kJXO!b+';i[d\.?ua6Y7IArRrj4EY6buRB:g_*OEp%jZj1I!LmmQ<hkA"l-D2NaXRAmc&[E11C\eRY@Bt5al/h;8\PUk+9rX8R!'"%~>
+GauI0_,>n>&;KY!METC?CGrC"Nj`F.NYeV(W<]6G1/^A&*T(0o)+Zp_BQ?ZCAG=hhs0WHJ>9?gp&kjq=\>2I.5nM+G'#`g5(eF;:#g<UH]j9#u/%AG;)K*4.U3]$MbmIdn4:EnQ1r1dMX;T+jcNKHEPnq3rPum.l5-:kLX86_r0p''/O]3Qe#m5V<OW1G%7,)fBqF^G*>hr$Mh_DcrLsR56#bIK6F`53R[DXtdUdiT?fEY&K$uH3ZGS9>i8i:fc@\e+]Ng%D?EQA^gaAXTIFn=&tLL\*oq4a5lV5+M9AWDf@G>473H<9;.GLAN"g\S81-[einkbOL*,&HYld92gD?eHKeYQ"[EZBJD~>
 endstream
 endobj
 6 0 obj
@@ -17,95 +17,160 @@ endobj
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
 /Contents 5 0 R
+/Annots 7 0 R
 >>
 endobj
 7 0 obj
-<< /Length 800 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GatUr9lldX&;KZO$6AM$<.+kh-IYYdj/-P7oMTlqe.sqo5nmgQo'\*E0p4=B%+qI`>OObfddHI=jLr1g!#(/RP^!K#4:I>N@Xpo7'O3nS(l4d"pXtE84pO"`F/4;SI?Wb9<Oqgbeo@VYW`5C0E7?kuDa/=4"%8c'<,mck)Nb4<$Gl(rLJrX^_VZ?L7+@=JLWfe09Ind.SrjPY&Li?s&j,+;,3n<,MhqO,*1WY]1`oMI>:NQY,tY[>j/eT)LET%q.L^I6j0?t=HmpkaAo$*2jbGO/6>=Dq:o8UB's:CuPX*N+W1i]K-r^*RL&7P\G!:BRqrCA;nf!Ced?$s4idBtnilP#oHio(X5U#E?kZVm[PUYKTOoId+Z]"(AkBc>f15dZnmDdafWIDr`21BqX!)g]#TZ'@,Vg_;nkOW%#2_m;rm:mE9ias?010`#Di\Eo0.."Is3D^eJj3Fh&(iPZh`n-<h0I1gpTiCm2?#?8cpbLq3$=V*g77+_p.G@FK&$d)_-86-mfhhs:dD0sL`l#(8m)N1clRiJ0!(3GJi9Z$VQc7Eu-GB$G`7D\4+s;E[l46#^"%%R".E!KJ&%sSX^(3S<&:KINrqe]./70+kbj9hY`%pXY:?In:n0.B%1tuG@kD&YHqAc^dD$1.MV$)YLe[qs88UQN>24i[l5fd?kT.(lBSK4=>Bju0j7s/u=j5s7^\Xj'H"AC2%>H'\a]ThYu?T!-q1OTPLSOF)&SJCO'B=onWNG1%G;Z2SJ_fN#Aq)5DJIKtjB=k4Hbm"8`iK.Kf=$bP-k"'[+I9`~>
-endstream
+[
+8 0 R
+]
 endobj
 8 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 102.0 559.666 195.992 547.666 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 9 0 R
+/H /I
+>>
+endobj
+10 0 obj
+<< /Length 1313 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gatn'>BALX!/9>+'ma[<:j'8G8=CjRSaL;,R*EP:cAjV7GQKdcD:nd`au3WVNN1:&a\4t<3p/lYdHtO+q/&-;R33=o0qt=fAJfWp*$m<>C'38kI(TQF"@3.nBDO:Ah>8Y`&5rdt"KTY^jCUFJ1lhY)*a%P<"?$pqTRS[5W\URr(LXcYIt,9',FFX#k//r[mGqBNo'u\AWbc5!e/uNA@/9]h%<*tJGNPS-`^3pd=HYpY!F^N#!+`tY%M9dbrZQre%6i&4GL'b5T.@-ZW:74>AD%Pb"6G$8T<#!e:6fQoMM7m2(QJ>)#SA'_&s,L.q%Vk?A%&Dk-4l(^D`lH6e4h7#%sT'[oKLft8#_N&49^<_Ui.p8W4FJUkX5R6pZ^fqD-A7O5e<=M_1cHb?^6%]/;E/4])1b<Q!BB$=M9a`J&O*P$pfc<`GcYfVk'.bSKuh7qZd"5>E,RW7_WLbPZ^L(M25_lg/c[dS>OFN+HDR75dsbEme(sk2FUW#NX,]MKNN-X.eA]*Q=*dWB(oZPB"[NM_BO\\7+3kR'L,)*@991@A=7</WHo&m@u.rHN\.;sU$X)c`0I??<Dg`8m<Uc,''m!D`,a%;GonE1XpE9b%tQkpOuEkrqVimN9=Q2ho>4b3kEXc!9lN&W:nlT_c*beQ^SlKuBu4/,\W]`dPade[dA3f,kL6(fO*#8mA_aXeV2BBXViA2:37n!(!h5MA<V:haXPR<+l_`pYl]%e77GimEKe#_*X]3;t[!:,BB.0uZ'ICtDIHbRFoi^++9-[N2(7FTdIQRbYm$&.+VnNH6fPp27el2*Dr/.kN(8kKfZQ9amB6NA!;:\aJZJaONf6^e4)6$Kddps^r>_0GN8%GZ1;?\_,#o"r!XO`-7O&-s#5/,NhCF"5*dd/u=!&AujdYBU,[ci*fJs9\F2#^%(SMaDr/aDi)4b8hPbI1Upe'*<7+G@7fngJ];Xi%X7U>K:E7VYcn_]e<&bi6$JjF1pb8,:RK9(%I5Cf"p@<DDfUm,aq[0m+f+00R%)Xfc[%<n/gEc-`"(_(=XC=F+U(/=7qYMuIC;Tfch?NdurZ'=hh(]INdsQ15qa.J3*@Tn1EAWUd^CbT-lg0k==kl[:nU'L\<T9Tl+'V;WW3B8HcUEa:ltdt;q@dTtDq[iuYX0]M8XVU$j,]1U2cX->Pt>T;(XJqWB+55X06)r$Dj^_dO<'>^&(N#O]DR-Qb,E"FgbNX)Q0e_sLCRr-X?FdFenV)]Si"<fLcQ<Q?bAqr3!bDRig:AsGHo#\OZbB8<]K1<9)DCkG:[8E6t<(FKRA(uD6I,h/S~>
+endstream
+endobj
+11 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 7 0 R
+/Contents 10 0 R
 >>
 endobj
-9 0 obj
+12 0 obj
+<< /Length 697 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gatn%9lJ`N&;KZQ'mkT9e(sPCG`PGH[&Qrk#2_b$>Za0n#J8!Ob.mDN37q!4_3-OYjk82.qe293juNu9`PJ0sOd3UE#FY]?;G-iIip],uY!J5fOIsA`i&V?3g^(dDm_m;!\h%S\N%fNZPX9ttSA^KL@5(+a6S`,p<>mRL&DC5,_jTs3OrktKC5(_?kX?b]qR&k&;E!RAn<>6ubGroU"l,#JlWs^r.H8_HN1NOL&`>`allp+;OU@)=72+D;HI2$XA\-G*Z"Q+l*P*S^L<,:m/qhdiEG2E]R\X7/+Q.t#RN`4NhabS:XT`?D)r-o>.F#`4i,R_YaF9P&\a,(k.0u'FV=RXMF1k!6RUa"&S#rZ8Vh6tP7q;.$dcmtX1q0\m[aii!mMmqj]q5%_/@$hqgJ7sSZ)uK;NCT\o1q&n"rP+^t[RIcZ8aa"1nX/:dPWd?W>/tU=f':DuL"A8mqf9F=ff<XD*&23OF@EOUp,Q[SD1(6-9Rp*p<d@,g,QcgrEcZnC+Y_EdN6.r=7TBf&P%YAKZi0iijAcXJKcK4]QcZ0--)qQ1!fFkqZ@!NTfUHWE6_l3:]4BG-$QH%'<mqFEW46Nd0LAmf$PII&c&SVaB)-MQ=fk=u064f_-s.K5V6Z-@[AeeZ4IJ.g8[^2M-:MG+-JNGT8\)sOcq$gY3cNfb7Vm7FGVTZ*)tsm"n4?s~>
+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\124\0\141\0\142\0\154\0\145\0\40\0\157\0\146\0\40\0\103\0\157\0\156\0\164\0\145\0\156\0\164\0\163)
+ /Parent 14 0 R
+ /A 9 0 R
+>> endobj
+16 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-10 0 obj
+17 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-11 0 obj
+18 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F6
 /BaseFont /Times-Italic
 /Encoding /WinAnsiEncoding >>
 endobj
-12 0 obj
+19 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-13 0 obj
+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 8 0 R ] >>
+/Count 3
+/Kids [6 0 R 11 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 9 0 R /F5 10 0 R /F1 12 0 R /F6 11 0 R /F2 13 0 R >> 
+/Font << /F3 16 0 R /F5 17 0 R /F1 19 0 R /F6 18 0 R /F2 20 0 R /F7 21 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
+9 0 obj
+<<
+/S /GoTo
+/D [11 0 R /XYZ 85.0 659.0 null]
+>>
+endobj
+14 0 obj
+<<
+ /First 15 0 R
+ /Last 15 0 R
+>> endobj
 xref
-0 14
+0 22
 0000000000 65535 f 
-0000003034 00000 n 
-0000003098 00000 n 
-0000003148 00000 n 
+0000004054 00000 n 
+0000004126 00000 n 
+0000004218 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001374 00000 n 
-0000001480 00000 n 
-0000002371 00000 n 
-0000002477 00000 n 
-0000002589 00000 n 
-0000002699 00000 n 
-0000002810 00000 n 
-0000002918 00000 n 
+0000000519 00000 n 
+0000000639 00000 n 
+0000000664 00000 n 
+0000004352 00000 n 
+0000000799 00000 n 
+0000002205 00000 n 
+0000002313 00000 n 
+0000003102 00000 n 
+0000004415 00000 n 
+0000003210 00000 n 
+0000003387 00000 n 
+0000003500 00000 n 
+0000003610 00000 n 
+0000003721 00000 n 
+0000003829 00000 n 
+0000003945 00000 n 
 trailer
 <<
-/Size 14
+/Size 22
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-3270
+4466
 %%EOF
diff --git a/docs/lucene-sandbox/index.html b/docs/lucene-sandbox/index.html
index 5a2db3018ef..23c7a05f8d4 100644
--- a/docs/lucene-sandbox/index.html
+++ b/docs/lucene-sandbox/index.html
@@ -146,6 +146,9 @@ document.write("<text>Last Published:</text> " + document.lastModified);
 <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">
diff --git a/docs/mailinglists.html b/docs/mailinglists.html
index 25288bbd053..21be41fcbd7 100644
--- a/docs/mailinglists.html
+++ b/docs/mailinglists.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
 	Apache Lucene - Mailing Lists
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -219,17 +174,8 @@ document.write("Last Published: " + document.lastModified);
 <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>
@@ -454,27 +400,18 @@ document.write("Last Published: " + document.lastModified);
 
     
 </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);
+document.write("<text>Last Published:</text> " + 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/queryparsersyntax.html b/docs/queryparsersyntax.html
index 1e488358750..01e62f451d0 100644
--- a/docs/queryparsersyntax.html
+++ b/docs/queryparsersyntax.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
 	Apache Lucene - Query Parser Syntax
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -219,17 +174,8 @@ document.write("Last Published: " + document.lastModified);
 <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="queryparsersyntax.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
@@ -504,27 +450,18 @@ document.write("Last Published: " + document.lastModified);
 
    
 </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);
+document.write("<text>Last Published:</text> " + 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.html b/docs/releases.html
index e1d2e54abf9..35185183194 100644
--- a/docs/releases.html
+++ b/docs/releases.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Lucene - Downloads and Releases</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -16,89 +16,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -217,17 +172,8 @@ document.write("Last Published: " + document.lastModified);
 <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>
@@ -272,27 +218,18 @@ document.write("Last Published: " + document.lastModified);
 
 
 </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);
+document.write("<text>Last Published:</text> " + 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/scoring.html b/docs/scoring.html
index 3d9c38b350d..6d9edcd4c57 100644
--- a/docs/scoring.html
+++ b/docs/scoring.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>
 	Apache Lucene - Scoring
@@ -18,89 +18,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -219,17 +174,8 @@ document.write("Last Published: " + document.lastModified);
 <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="scoring.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
@@ -451,7 +397,7 @@ document.write("Last Published: " + document.lastModified);
                     When the BooleanScorer2 is asked to score it delegates its work to an internal Scorer based on the type
                     of clauses in the Query.  This internal Scorer essentially loops over the sub scorers and sums the scores
                     provided by each scorer while factoring in the coord() score.
-                    <!-- Do we want to fill in the details of the counting sum scorer, disjunction scorer, etc.? -->
+                    
                 </p>
 <a name="N1011A"></a><a name="Query Classes"></a>
 <h3 class="boxed">Query Classes</h3>
@@ -584,33 +530,24 @@ document.write("Last Published: " + document.lastModified);
                     into a while loop based on the Scorer#next() method. The next() method advances to the next document
                     matching the query. This is an
                     abstract method in the Scorer class and is thus overriden by all derived
-                    implementations.  <!-- DOUBLE CHECK THIS -->If you have a simple OR query
+                    implementations.  If you have a simple OR query
                     your internal Scorer is most likely a DisjunctionSumScorer, which essentially combines the scorers
                     from the sub scorers of the OR'd terms.</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);
+document.write("<text>Last Published:</text> " + 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.html b/docs/systemrequirements.html
index c785b19b877..a98fa2de341 100644
--- a/docs/systemrequirements.html
+++ b/docs/systemrequirements.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Apache Lucene - System Requirements</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -16,89 +16,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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">
@@ -217,17 +172,8 @@ document.write("Last Published: " + document.lastModified);
 <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>
@@ -241,10 +187,7 @@ document.write("Last Published: " + document.lastModified);
 </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>
@@ -272,27 +215,18 @@ document.write("Last Published: " + document.lastModified);
 
 
 </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);
+document.write("<text>Last Published:</text> " + 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.html b/docs/whoweare.html
index 769a383fb34..c81cbba087c 100644
--- a/docs/whoweare.html
+++ b/docs/whoweare.html
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!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-version" content="0.7">
 <meta name="Forrest-skin-name" content="pelt">
 <title>	Apache Lucene - Who We Are</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -16,89 +16,44 @@
 <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">
+                    <input attr="value" 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>
+<a class="base-selected" href="index.html">Main</a>
 </li>
 <li>
-<a class="unselected" href="http://wiki.apache.org/lucene-java">Wiki</a>
+<a class="base-not-selected" 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);
+document.write("<text>Last Published:</text> " + 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;">
@@ -217,17 +172,8 @@ document.write("Last Published: " + document.lastModified);
 <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>
@@ -368,27 +314,18 @@ document.write("Last Published: " + document.lastModified);
 
 
 </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);
+document.write("<text>Last Published:</text> " + 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/src/site/src/documentation/content/xdocs/index.xml b/src/site/src/documentation/content/xdocs/index.xml
index 0311bff742f..867f2617f65 100644
--- a/src/site/src/documentation/content/xdocs/index.xml
+++ b/src/site/src/documentation/content/xdocs/index.xml
@@ -35,7 +35,7 @@
 			<ul>
 			  <li> <a href="http://lucene.apache.org/java/2_2_0/api/index.html?org/apache/lucene/index/IndexWriter.html">"Point-in-time" searching</a></li>
 			  <li> <a href="http://lucene.apache.org/java/2_2_0/api/index.html?org/apache/lucene/search/payloads/package-summary.html">Payloads</a></li>
-			  <li> <a href="http://lucene.apache.org/java/2_2_0/api/index.html?org/apache/lucene/search/function/package-summary.html">Funtion queries</a></li>
+			  <li> <a href="http://lucene.apache.org/java/2_2_0/api/index.html?org/apache/lucene/search/function/package-summary.html">Function queries</a></li>
 			  <li> <a href="http://lucene.apache.org/java/2_2_0/api/index.html?org/apache/lucene/document/Field.html">New API for preanalyzed fields</a></li>
 			</ul>
 			In addition Lucene 2.2 has many performance
