Index: lucene/site/src/documentation/content/xdocs/site.xml
===================================================================
--- lucene/site/src/documentation/content/xdocs/site.xml	(revision 1328710)
+++ lucene/site/src/documentation/content/xdocs/site.xml	(working copy)
@@ -44,30 +44,7 @@
   <docs label="Documentation">
       <overview label="Overview" href="index.html"/>
       <changes label="Changes" href="ext:changes"/>
-      <javadoc label="Javadocs">
-         <javadoc-core label="Core" href="ext:javadocs-core"/>
-         <javadoc-analyzers-common label="Analysis: Common" href="ext:javadocs-analyzers-common"/>
-         <javadoc-analyzers-kuromoji label="Analysis: Kuromoji (Japanese)" href="ext:javadocs-analyzers-kuromoji"/>
-         <javadoc-analyzers-morfologik label="Analysis: Morfologik (Polish)" href="ext:javadocs-analyzers-morfologik"/>
-         <javadoc-analyzers-phonetic label="Analysis: Phonetic" href="ext:javadocs-analyzers-phonetic"/>
-         <javadoc-analyzers-smartcn label="Analysis: Smart Chinese" href="ext:javadocs-analyzers-smartcn"/>
-         <javadoc-analyzers-stempel label="Analysis: Stempel (Polish)" href="ext:javadocs-analyzers-stempel"/>
-         <javadoc-analyzers-uima label="Analysis: UIMA" href="ext:javadocs-analyzers-uima"/>
-         <javadoc-benchmark label="Benchmark" href="ext:javadocs-benchmark"/>
-         <javadoc-demo label="Demo" href="ext:javadocs-demo"/>
-         <javadoc-facet label="Faceting" href="ext:javadocs-facet"/>
-         <javadoc-grouping label="Grouping" href="ext:javadocs-grouping"/>
-         <javadoc-highlighter label="Highlighter" href="ext:javadocs-highlighter"/>
-         <javadoc-join label="Join" href="ext:javadocs-join"/>
-         <javadoc-memory label="Memory" href="ext:javadocs-memory"/>
-         <javadoc-misc label="Miscellaneous" href="ext:javadocs-misc"/>
-         <javadoc-queries label="Queries" href="ext:javadocs-queries"/>
-         <javadoc-queryparser label="Query Parsers" href="ext:javadocs-queryparser"/>
-         <javadoc-sandbox label="Sandbox" href="ext:javadocs-sandbox"/>
-         <javadoc-spatial label="Spatial" href="ext:javadocs-spatial"/>
-         <javadoc-suggest label="Suggest / Spellcheck" href="ext:javadocs-suggest"/>						    
-         <javadoc-test-framework label="Test Framework" href="ext:javadocs-test-framework"/>	
-	  </javadoc>
+      <javadoc label="Javadocs" href="ext:javadocs"/>
       <systemrequirements label="System Requirements" href="systemrequirements.html"/>
       <contributions label="Contributions" href="contributions.html"/>
       <faq         label="FAQ"              href="ext:faq" />
@@ -89,29 +66,7 @@
 
   <external-refs>
     <changes href="changes/Changes.html" />
-	<javadocs-core href="api/core/index.html"/>
-	<javadocs-analyzers-common href="api/analyzers-common/index.html"/>
-	<javadocs-analyzers-icu href="api/analyzers-icu/index.html"/>
-	<javadocs-analyzers-kuromoji href="api/analyzers-kuromoji/index.html"/>
-	<javadocs-analyzers-morfologik href="api/analyzers-morfologik/index.html"/>
-	<javadocs-analyzers-phonetic href="api/analyzers-phonetic/index.html"/>
-	<javadocs-analyzers-smartcn href="api/analyzers-smartcn/index.html"/>
-	<javadocs-analyzers-stempel href="api/analyzers-stempel/index.html"/>
-	<javadocs-analyzers-uima href="api/analyzers-uima/index.html"/>
-	<javadocs-benchmark href="api/benchmark/index.html"/>
-    <javadocs-demo href="api/demo/index.html"/>
-    <javadocs-facet href="api/facet/index.html"/>
-    <javadocs-grouping href="api/grouping/index.html"/>
-	<javadocs-highlighter href="api/highlighter/index.html"/>
-	<javadocs-join href="api/join/index.html"/>
-	<javadocs-memory href="api/memory/index.html"/>
-	<javadocs-misc href="api/misc/index.html"/>
-	<javadocs-queries href="api/queries/index.html"/>
-    <javadocs-queryparser href="api/queryparser/index.html"/>
-	<javadocs-sandbox href="api/sandbox/index.html"/>
-	<javadocs-spatial href="api/spatial/index.html"/>
-	<javadocs-suggest href="api/suggest/index.html"/>
-    <javadocs-test-framework href="api/test-framework/index.html"/>
+	<javadocs href="api/index.html"/>
 
     <forrest href="http://forrest.apache.org/">
       <linking href="docs/linking.html"/>