Index: src/site/src/documentation/conf/cli.xconf
===================================================================
--- src/site/src/documentation/conf/cli.xconf	(revision 809380)
+++ src/site/src/documentation/conf/cli.xconf	(working copy)
@@ -209,6 +209,7 @@
    <exclude pattern="**/"/>
    <exclude pattern="**apidocs**"/>
    <exclude pattern="api/**"/>
+   <exclude pattern="**/api/contrib**"/>
 
 <!--
   This is a workaround for FOR-284 "link rewriting broken when
Index: src/site/src/documentation/content/xdocs/lucene-sandbox/index.xml
===================================================================
--- src/site/src/documentation/content/xdocs/lucene-sandbox/index.xml	(revision 809380)
+++ src/site/src/documentation/content/xdocs/lucene-sandbox/index.xml	(working copy)
@@ -2,165 +2,133 @@
 <document>
 	<header>
         <title>
-	Apache Lucene - Lucene Sandbox
+	      Apache Lucene - Lucene Sandbox (contrib)
 		</title>
 	</header>
-    <properties>
-        <author>Otis Gospodentic</author>
-    </properties>
     <body>
 
         <section id="Lucene Sandbox"><title>Lucene Sandbox</title>
             <p>
-                Lucene project also contains a workspace, Lucene Sandbox, that is open to all Lucene committers, as well
-                as a few other developers.  The purpose of the Sandbox is to host various third party contributions,
-                and to serve as a place to try out new ideas and prepare them for inclusion into the core Lucene
-                distribution.<br/>
-                Users are free to experiment with the components developed in the Sandbox, but Sandbox components will
-                not necessarily be maintained, particularly in their current state.
+                Lucene  also contains a workspace historically called the Lucene Sandbox, though now its more well known as contrib.
+                Contrib holds a variety of modules that add functionality to core Lucene. By default, contribs have no backwards
+                compatibility commitment, though some explicitly follow one.
             </p>
 
             <p>
-                You can access the Lucene Sandbox repository at
+                You can access the current trunk Lucene Sandbox repository at
                 <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/">http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/</a>.
             </p>
 
-            <section id="Snowball Stemmers for Lucene"><title>Snowball Stemmers for Lucene</title>
-                <p>
-                    This project provides pre-compiled versions of the Snowball stemmers
-                    for Lucene.
-                </p>
-
-                <p>
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/snowball">The
-                        repository for the Snowball contribution.</a>
-                </p>
-
-                <p>
-                    <a href="http://snowball.tartarus.org/">Background information on Snowball</a>,
-                    which is a language for stemmers developed by Martin Porter.
-                </p>
+            <section id="analyzers"><title>analyzers</title>
+                <p>Contributed Analyzers, Tokenizers, and Filters for various uses and languages.</p>
+                <p><a href="../api/contrib-analyzers/index.html">analyzers javadoc</a></p>
             </section>
-
-            <section id="Analyzers, Tokenizers, Filters"><title>Analyzers, Tokenizers, Filters</title>
-                <p>
-                  Contributed Analyzers, Tokenizers, and Filters for various languages.
-                </p>
-
-                <p>
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/analyzers/">The
-                        repository for the Analyzers contribution.</a>
-                </p>
+            
+            <section id="ant"><title>ant</title>
+                <p>Ant task to create Lucene indexes.</p>
+                <p><a href="../api/contrib-ant/index.html">ant javadoc</a></p>
             </section>
-
-            <section id="Ant"><title>Ant</title>
-                <p>
-                    The Ant project is a useful Ant task that creates a Lucene index out of an Ant fileset.  It also
-                    contains an example HTML parser that uses JTidy.
-                </p>
-                <p>
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/ant/">The
-                        repository for the Ant contribution.</a>
-                </p>
+            
+            <section id="benchmark"><title>benchmark</title>
+                <p>The benchmark contribution contains tools for benchmarking Lucene using standard, freely available corpora.</p>
+                <p><a href="../api/contrib-benchmark/index.html">benchmark javadoc</a></p>
             </section>
-
-            <section id="WordNet/Synonyms"><title>WordNet/Synonyms</title>
-                <p>
-                    The Lucene WordNet code consists of a single class which parses a prolog file
-                    from the WordNet site that contains a list of English words and synonyms.
-                    The class builds a Lucene index from the synonyms file.  Your querying code could
-                    hit this index to build up a set of synonyms for the terms in the
-                    search query.
-                </p>
-                <p>
-                    More information on the <a href="http://www.tropo.com/techno/java/lucene/wordnet.html">Lucene WordNet package</a>.
-                    <a href="http://wordnet.princeton.edu/">WordNet</a> is an online database of English language words that contains
-                    synonyms, definitions, and various relationships between synonym sets.
-                </p>
-                <p>
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/wordnet/">The
-                        repository for the WordNet module.</a>
-                </p>
-            </section>
-
-            <section id="Lucli - Lucene Command-line Interface"><title>Lucli - Lucene Command-line Interface</title>
-                <p>
-                  The Lucli application allows index manipulation from the
-                    command-line.
-                </p>
-
-                <p>
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/lucli/">The
-                        repository for the Lucli contribution.</a>
-                </p>
+            
+            <section id="collation"><title>collation</title>
+                <p>CollationKeyFilter/Analyzer and ICUCollationKeyFilter/Analyzer</p>
+                <p><a href="../api/contrib-collation/index.html">collation javadoc</a></p>
             </section>
-
-            <section id="Term Highlighter"><title>Term Highlighter</title>
-                <p>
-                  A small set of classes for highlighting matching terms in
-                    search results.
-                </p>
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/highlighter/">The
-                        repository for the Highlighter contribution.</a>
+            
+            <section id="db"><title>db</title>
+                <p>Provides integration with Berkley DB.</p>
+                <p><a href="../api/contrib-db/index.html">db javadoc</a></p>
             </section>
-
-            <section id="Fast Vector Highlighter"><title>Fast Vector Highlighter</title>
-                <p>
-                  An alternative set of classes for highlighting matching terms in search results.
-                </p>
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/fast-vector-highlighter/">The
-                        repository for the Fast Vector Highlighter contribution.</a>
+            
+            <section id="highlighter"><title>highlighter</title>
+                <p>A set of classes for highlighting matching terms in search results.</p>
+                <p><a href="../api/contrib-highlighter/index.html">highlighter javadoc</a></p>
             </section>
-
-            <section id="Javascript Query Constructor"><title>Javascript Query Constructor</title>
-                <p>
-                    Javascript library to support client-side query-building. Provides support for a user interface similar to
-                    <a href="http://www.google.com.sg/advanced_search">Google's Advanced Search</a>.
-                </p>
-                <p>
-
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/javascript/queryConstructor/">The
-                        repository for the Javascript Query Constructor files.</a>
-                </p>
+            
+            <section id="fast-vector-highlighter"><title>fast-vector-highlighter</title>
+                <p>An alternative set of classes for highlighting matching terms in search results that relies on stored term vectors.</p>
+                <p><a href="../api/contrib-fast-vector-highlighter/index.html">fast-vector-highlighter javadoc</a></p>
             </section>
 
-            <section id="Javascript Query Validator"><title>Javascript Query Validator</title>
-                <p>
-                    Javascript library to support client-side query validation. Lucene doesn't like malformed queries and tends to
-                    throw ParseException, which are often difficult to interpret and pass on to the user. This library hopes to
-                    alleviate that problem.
-                </p>
-                <p>
-
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/javascript/queryValidator/">The
-                        repository for the Javascript Query Validator files.</a>
-                </p>
+            <section id="instantiated"><title>instantiated</title>
+                <p>RAM-based index that enables much faster searching than RAMDirectory in certain situations.</p>
+                <p><a href="../api/contrib-instantiated/index.html">instantiated javadoc</a></p>
             </section>
 
-            <section id="High Frequency Terms"><title>High Frequency Terms</title>
-                <p>
-                    The miscellaneous package is for classes that don't fit anywhere else. The only class in it right now determines
-                    what terms occur the most inside a Lucene index.  This could be useful for analyzing which terms may need to go
-                    into a custom stop word list for better search results.
-                </p>
-                <p>
-
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/miscellaneous/">The
-                        repository for miscellaneous classes.</a>
-                </p>
+            <section id="lucli"><title>lucli</title>
+                <p>An application that allows Lucene index manipulation from the command-line.</p>
+                <p><a href="../api/contrib-lucli/index.html">lucli javadoc</a></p>
             </section>
-
-            <section id="InstantiatedIndex"><title>InstantiatedIndex</title>
-                <p>
-                   RAM-based index that enables much faster searching than RAMDirectory.
-	        </p>
-                <p>
-                    <a href="http://svn.apache.org/repos/asf/lucene/java/trunk/contrib/instantiated/">The
-                        repository for instantiated index.</a>
-                </p>
+            
+            <section id="memory"><title>memory</title>
+                <p>High-performance single-document main memory index.</p>
+                <p><a href="../api/contrib-memory/index.html">memory javadoc</a></p>
+            </section>         
+            
+            <section id="misc"><title>misc</title>
+                <p>A variety of miscellaneous files, including QueryParsers, and other alternate Lucene class implementations and tools.</p>
+                <p><a href="../api/contrib-misc/index.html">misc javadoc</a></p>
             </section>
-
-        </section>
-
+            
+            <section id="queryparser"><title>queryparser</title>
+                <p>A new Lucene query parser implementation, which matches the syntax of the core QueryParser but offers a more modular architecture to enable customization.</p>
+                <p><a href="../api/contrib-queryparser/index.html">queryparser javadoc</a></p>
+            </section>                          
+ 
+            <section id="regex"><title>regex</title>
+                <p>Queries with additional regex matching capabilities.</p>
+                <p><a href="../api/contrib-regex/index.html">regex javadoc</a></p>
+            </section> 
+            
+            <section id="remote"><title>remote</title>
+                <p>Classes to help use Lucene with RMI.</p>
+                <p><a href="../api/contrib-remote/index.html">remote javadoc</a></p>
+            </section>    
+            
+            <section id="snowball"><title>snowball</title>
+                <p>Pre-compiled versions of the Snowball stemmers for Lucene.</p>
+                <p><a href="../api/contrib-snowball/index.html">snowball javadoc</a></p>
+            </section>               
+                        
+            <section id="spatial"><title>spatial</title>
+                <p>Classes to help with efficient distance based sorting.</p>
+                <p><a href="../api/contrib-spatial/index.html">spatial javadoc</a></p>
+            </section>    
+            
+            <section id="spellchecker"><title>spatial</title>
+                <p>Provides tools for spellchecking and suggestions with Lucene.</p>
+                <p><a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a></p>
+            </section>                
+  
+            <section id="surround"><title>surround</title>
+                <p>A QueryParser that also supports the Span family of queries.</p>
+                <p><a href="../api/contrib-surround/index.html">surround javadoc</a></p>
+            </section>       
+            
+            <section id="swing"><title>swing</title>
+                <p>Swing components designed to integrate with Lucene.</p>
+                <p><a href="../api/contrib-swing/index.html">swing javadoc</a></p>
+            </section>    
+           
+            <section id="wikipedia"><title>wikipedia</title>
+                <p>Tools for working with wikipedia content.</p>
+                <p><a href="../api/contrib-wikipedia/index.html">wikipedia javadoc</a></p>
+            </section>   
+            
+            <section id="wordnet"><title>wordnet</title>
+                <p>Tools to help utilize wordnet synonyms with Lucene</p>
+                <p><a href="../api/contrib-wordnet/index.html">wordnet javadoc</a></p>
+            </section>  
+            
+            <section id="xml-query-parser"><title>xml-query-parser</title>
+                <p>A QueryParser that can read queries written in an XML format.</p>
+                <p><a href="../api/contrib-wordnet/index.html">xml-query-parser javadoc</a></p>
+            </section>  
+           
+		</section>
     </body>
 </document>

