Index: lucene/module-build.xml
===================================================================
--- lucene/module-build.xml	(revision 1328355)
+++ lucene/module-build.xml	(working copy)
@@ -63,13 +63,17 @@
   </target>
   <target name="build-artifacts-and-tests" depends="jar, compile-test" />
 	
-  <target name="javadocs" depends="compile-core">
-   	<sequential>
+  <!-- TODO: why does this previous depend on compile-core? -->
+  <target name="javadocs" depends="compile-core,javadocs-lucene-core">
+     <sequential>
        <mkdir dir="${javadoc.dir}/${name}"/>
        <invoke-javadoc
          destdir="${javadoc.dir}/${name}"
        	title="${Name} ${version} ${name} API">
          <sources>
+         <!-- TODO, refactor into a macro so that modules
+              can easily add their dependencies -->
+           <link href="../core/"/>
            <link href=""/>
            <packageset dir="${src.dir}"/>
         </sources>
@@ -79,9 +83,10 @@
   </target>	
 
   <target name="javadocs-index.html" description="Generate line for index.html of JavaDocs">
+    <xmlproperty file="${ant.file}" collapseAttributes="true"/>
     <echo file="${javadoc.dir}/index.html" append="true">
 <![CDATA[
-  <li><a href="${name}/index.html">${name}</a></li>
+  <li><a href="${name}/index.html">${name}</a>: ${project.description}</a></li>
 ]]></echo>
   </target>
 
Index: lucene/facet/build.xml
===================================================================
--- lucene/facet/build.xml	(revision 1328355)
+++ lucene/facet/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="facet" default="default">
 
   <description>
-    Faceted search module
+    Faceted indexing and search capabilities
   </description>
 
   <!-- prettify.css/js -->
Index: lucene/queryparser/build.xml
===================================================================
--- lucene/queryparser/build.xml	(revision 1328355)
+++ lucene/queryparser/build.xml	(working copy)
@@ -17,7 +17,7 @@
 
 <project name="queryparser" default="default">
   <description>
-    Lucene QueryParsers
+    Query parsers and parsing framework
   </description>
 
   <import file="../module-build.xml"/>
Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1328355)
+++ lucene/common-build.xml	(working copy)
@@ -553,6 +553,19 @@
     <property name="core.compiled" value="true"/>
   </target>
 
+  <target name="check-lucene-core-javadocs-uptodate" unless="core-javadocs.uptodate">
+    <uptodate property="core-javadocs.uptodate" targetfile="${common.dir}/build/core/lucene-core-${version}-javadoc.jar">
+       <srcfiles dir="${common.dir}/core/src/java" includes="**/*.java"/>
+    </uptodate>
+  </target>
+
+  <target name="javadocs-lucene-core" depends="check-lucene-core-javadocs-uptodate" unless="core-javadocs.uptodate">
+    <ant dir="${common.dir}/core" target="javadocs" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="core-javadocs.uptodate" value="true"/>
+  </target>
+
   <target name="compile-test-framework" unless="lucene.test.framework.compiled">
     <ant dir="${common.dir}/test-framework" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
Index: lucene/demo/build.xml
===================================================================
--- lucene/demo/build.xml	(revision 1328355)
+++ lucene/demo/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="demo" default="default" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
   <description>
-    Lucene Demo
+    Simple example code
   </description>
 
   <property name="demo.name" value="lucene-demos-${version}"/>
Index: lucene/core/build.xml
===================================================================
--- lucene/core/build.xml	(revision 1328355)
+++ lucene/core/build.xml	(working copy)
@@ -18,7 +18,7 @@
  -->
 
 <project name="core" default="default">
-  <description>Lucene Core</description>
+  <description>Lucene core library</description>
 
   <property name="build.dir" location="../build/core"/>
 
Index: lucene/benchmark/build.xml
===================================================================
--- lucene/benchmark/build.xml	(revision 1328355)
+++ lucene/benchmark/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="benchmark" default="default">
 
     <description>
-        Lucene Benchmarking Contributions
+      System for benchmarking Lucene
     </description>
 
     <import file="../module-build.xml"/>
Index: lucene/spatial/build.xml
===================================================================
--- lucene/spatial/build.xml	(revision 1328355)
+++ lucene/spatial/build.xml	(working copy)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="spatial" default="default">
   <description>
-    Lucene Spatial
+    Geospatial search
   </description>
 
   <import file="../module-build.xml"/>
Index: lucene/build.xml
===================================================================
--- lucene/build.xml	(revision 1328355)
+++ lucene/build.xml	(working copy)
@@ -197,17 +197,16 @@
 
   <target name="javadoc" depends="javadocs"/>
   <target name="javadocs" description="Generate javadoc" 
-          depends="javadocs-all, javadocs-core, javadocs-modules, javadocs-test-framework">
+          depends="javadocs-core, javadocs-modules, javadocs-test-framework">
     <echo file="${javadoc.dir}/index.html" append="false">
 <![CDATA[<html><head><title>${Name} ${version} Javadoc Index</title></head>
 <body>
 <h1>${Name} ${version} Javadoc Index</h1>
 <ul>
-  <li><a href="all/index.html">All</a></li>
-  <li><a href="core/index.html">Core</a></li>
-  <li><a href="test-framework/index.html">Test Framework</a></li>
+  <li><a href="core/index.html">core</a>: Lucene core library</li>
+  <li><a href="test-framework/index.html">test-framework</a>: Framework for testing Lucene-based applications</li>
 ]]></echo>
-    <modules-crawl target="javadocs-index.html" failonerror="false"/>
+    <modules-crawl target="javadocs-index.html" failonerror="true"/>
     <echo file="${javadoc.dir}/index.html" append="true"><![CDATA[
 </ul></body>]]></echo>
   </target>
@@ -226,83 +225,9 @@
 
   <target name="javadocs-modules" description="Generate javadoc for modules classes">
     <modules-crawl target="javadocs"
-                   failonerror="false"/>
+                   failonerror="true"/>
   </target>
 
-  <!-- call resolve to force dependencies to be in lib/ for javadocs -->
-  <target name="javadocs-all" depends="resolve"
-          description="Generate javadoc for all classes">
-  	<sequential>
-      <mkdir dir="${javadoc.dir}/all"/>
-      
-      <path id="javadoc.classpath">
-        <path refid="classpath"/>
-        <pathelement location="${ant.home}/lib/ant.jar"/>
-        <fileset dir="." includes="**/lib/" excludes="**/lib/*.txt"/>
-      </path>
-
-      <invoke-javadoc overview="${common.dir}/core/src/java/overview.html"
-                      destdir="${javadoc.dir}/all">
-        <sources>
-          <!-- TODO: find a dynamic way to do include multiple source roots -->
-          <packageset dir="core/src/java"/>
-          <packageset dir="test-framework/src/java"/>
-
-          <!-- please keep this list up to date, and in alpha order...   -->
-        
-          <!-- ie: `find ./* -path \*src/java | sort` -->
-
-          <!-- if you make changes to the list of package sets, also -->
-          <!-- make sure the group list below is updated.            -->
-          <!-- Also remember to keep site.xml in sync.            -->		  
-          <packageset dir="analysis/common/src/java"/>
-          <packageset dir="analysis/icu/src/java"/>
-          <packageset dir="analysis/kuromoji/src/java"/>
-          <packageset dir="analysis/morfologik/src/java"/>
-          <packageset dir="analysis/phonetic/src/java"/>
-          <packageset dir="analysis/smartcn/src/java"/>
-          <packageset dir="analysis/stempel/src/java"/>
-          <packageset dir="analysis/uima/src/java"/>
-          <packageset dir="benchmark/src/java"/>
-          <packageset dir="demo/src/java"/>
-          <packageset dir="facet/src/java"/>
-          <packageset dir="grouping/src/java"/>
-          <packageset dir="highlighter/src/java"/>
-          <packageset dir="join/src/java"/>
-          <packageset dir="memory/src/java"/>
-          <packageset dir="misc/src/java"/>
-          <packageset dir="queries/src/java"/>
-          <packageset dir="queryparser/src/java"/>
-          <packageset dir="sandbox/src/java"/>
-          <packageset dir="spatial/src/java"/>
-          <packageset dir="suggest/src/java"/>
-          <!-- end alpha sort -->
-
-          <!-- If the main javadoc Group listing includes an "Other   -->
-          <!-- Packages" group after the ones listed here, then those -->
-          <!-- packages are not being matched by any of these rules   -->
-  
-          <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.tokenattributes*"/>
-          <group title="Analysis" packages="org.apache.lucene.analysis.*:org.apache.lucene.collation*:org.tartarus.snowball*:org.egothor.stemmer*"/>
-          <group title="Benchmark" packages="org.apache.lucene.benchmark*"/>
-          <group title="Demo" packages="org.apache.lucene.demo*"/>
-          <group title="Facet" packages="org.apache.lucene.facet*:org.apache.lucene.util.encoding*:org.apache.lucene.util.collections*"/>
-          <group title="Grouping" packages="org.apache.lucene.search.grouping*"/>
-          <group title="Highlighter" packages="org.apache.lucene.search.highlight*:org.apache.lucene.search.vectorhighlight*"/>
-          <group title="Join" packages="org.apache.lucene.search.join*"/>
-          <group title="Memory" packages="org.apache.lucene.index.memory*"/>
-          <group title="Misc" packages="org.apache.lucene.misc*"/>
-          <group title="Queries" packages="org.apache.lucene.queries*"/>
-          <group title="Query Parser" packages="org.apache.lucene.queryparser*"/>
-          <group title="Sandbox" packages="org.apache.lucene.sandbox*"/>
-          <group title="Spatial" packages="org.apache.lucene.spatial*"/>
-          <group title="Suggest" packages="org.apache.lucene.search.spell*:org.apache.lucene.search.suggest*"/>
-
-        </sources>
-      </invoke-javadoc>
-  	</sequential>
-  </target>
-
   <target name="rat-sources">
     <sequential>
        <ant dir="core" target="rat-sources" inheritall="false"/>
Index: lucene/join/build.xml
===================================================================
--- lucene/join/build.xml	(revision 1328355)
+++ lucene/join/build.xml	(working copy)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="join" default="default">
   <description>
-    Queries and collectors for performing joins
+    Index-time and Query-time joins for normalized content
   </description>
 
   <import file="../module-build.xml"/>
Index: lucene/memory/build.xml
===================================================================
--- lucene/memory/build.xml	(revision 1328355)
+++ lucene/memory/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="memory" default="default">
 
   <description>
-    High-performance single-document index to compare against Query
+    Single-document in-memory index implementation
   </description>
 
   <import file="../module-build.xml"/>
Index: lucene/suggest/build.xml
===================================================================
--- lucene/suggest/build.xml	(revision 1328355)
+++ lucene/suggest/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="suggest" default="default">
 
   <description>
-    Suggest
+    Auto-suggest and Spellchecking support
   </description>
 	
   <!-- just a list of words for testing suggesters -->
Index: lucene/analysis/icu/build.xml
===================================================================
--- lucene/analysis/icu/build.xml	(revision 1328355)
+++ lucene/analysis/icu/build.xml	(working copy)
@@ -20,8 +20,7 @@
 <project name="analyzers-icu" default="default">
 
   <description>
-  	Provides integration with ICU (International Components for Unicode) for
-  	stronger Unicode and internationalization support. 
+   Analysis integration with ICU (International Components for Unicode).
   </description>
 
   <import file="../analysis-module-build.xml"/>
Index: lucene/analysis/common/build.xml
===================================================================
--- lucene/analysis/common/build.xml	(revision 1328355)
+++ lucene/analysis/common/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="analyzers-common" default="default">
 
   <description>
-   Analyzers
+   Analyzers for indexing content in different languages and domains.
   </description>
 
   <!-- some files for testing that do not have license headers -->
Index: lucene/analysis/uima/build.xml
===================================================================
--- lucene/analysis/uima/build.xml	(revision 1328355)
+++ lucene/analysis/uima/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="analyzers-uima" default="default">
 
   <description>
-    UIMA Analysis module
+    Analysis integration with Apache UIMA
   </description>
 	
   <property name="tests.userdir" value="src/test-files"/>
Index: lucene/analysis/kuromoji/build.xml
===================================================================
--- lucene/analysis/kuromoji/build.xml	(revision 1328355)
+++ lucene/analysis/kuromoji/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="analyzers-kuromoji" default="default">
 
   <description>
-    Kuromoji Japanese Morphological Analyzer
+    Japanese Morphological Analyzer
   </description>
 
   <!-- default configuration: uses mecab-ipadic -->
Index: lucene/analysis/smartcn/build.xml
===================================================================
--- lucene/analysis/smartcn/build.xml	(revision 1328355)
+++ lucene/analysis/smartcn/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="analyzers-smartcn" default="default">
 
   <description>
-    Smart Chinese Analyzer
+    Analyzer for indexing Chinese
   </description>
 
   <import file="../analysis-module-build.xml"/>
Index: lucene/analysis/morfologik/build.xml
===================================================================
--- lucene/analysis/morfologik/build.xml	(revision 1328355)
+++ lucene/analysis/morfologik/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="analyzers-morfologik" default="default">
 
   <description>
-    Morfologik Analyzer
+    Analyzer for indexing Polish
   </description>
 
   <import file="../analysis-module-build.xml"/>
Index: lucene/analysis/phonetic/build.xml
===================================================================
--- lucene/analysis/phonetic/build.xml	(revision 1328355)
+++ lucene/analysis/phonetic/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="analyzers-phonetic" default="default">
 
   <description>
-  	Provides phonetic encoding support via Apache Commons Codec.
+    Analyzer for indexing phonetic signatures (for sounds-alike search)
   </description>
 
   <import file="../analysis-module-build.xml"/>
Index: lucene/analysis/stempel/build.xml
===================================================================
--- lucene/analysis/stempel/build.xml	(revision 1328355)
+++ lucene/analysis/stempel/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="analyzers-stempel" default="default">
 
   <description>
-    Stempel Analyzer
+    Analyzer for indexing Polish
   </description>
 	
   <import file="../analysis-module-build.xml"/>
Index: lucene/grouping/build.xml
===================================================================
--- lucene/grouping/build.xml	(revision 1328355)
+++ lucene/grouping/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="grouping" default="default">
   
     <description>
-       Grouping module. Collectors for grouping search results
+       Collectors for grouping search results.
     </description>
 
     <import file="../module-build.xml"/>
Index: lucene/misc/build.xml
===================================================================
--- lucene/misc/build.xml	(revision 1328355)
+++ lucene/misc/build.xml	(working copy)
@@ -22,7 +22,7 @@
   <!-- TODO: add javacc capability for PrecedenceQueryParser -->
 
   <description>
-    Miscellaneous Lucene extensions
+    Index tools and other miscellaneous code
   </description>
 
   <import file="../module-build.xml"/>
Index: lucene/highlighter/build.xml
===================================================================
--- lucene/highlighter/build.xml	(revision 1328355)
+++ lucene/highlighter/build.xml	(working copy)
@@ -20,7 +20,7 @@
 <project name="highlighter" default="default">
 
   <description>
-    Hits highlighter
+    Highlights search keywords in results
   </description>
 
   <import file="../module-build.xml"/>
Index: lucene/sandbox/build.xml
===================================================================
--- lucene/sandbox/build.xml	(revision 1328355)
+++ lucene/sandbox/build.xml	(working copy)
@@ -18,7 +18,7 @@
 <project name="sandbox" default="default">
 
   <description>
-    Sandbox for odd contrib code
+    Various third party contributions and new ideas
   </description>
 
   <import file="../module-build.xml"/>
Index: lucene/test-framework/build.xml
===================================================================
--- lucene/test-framework/build.xml	(revision 1328355)
+++ lucene/test-framework/build.xml	(working copy)
@@ -18,7 +18,7 @@
  -->
 
 <project name="test-framework" default="default">
-  <description>Lucene Test Framework</description>
+  <description>Framework for testing Lucene-based applications</description>
 
   <property name="build.dir" location="../build/test-framework"/>
 
@@ -46,7 +46,7 @@
   </target>
 
   <target name="javadocs-core" depends="javadocs"/>
-  <target name="javadocs" depends="init">
+  <target name="javadocs" depends="init,javadocs-lucene-core">
     <sequential>
       <mkdir dir="${javadoc.dir}/test-framework"/>
       <invoke-javadoc overview="${src.dir}/overview.html"
@@ -56,6 +56,7 @@
           <packageset dir="${src.dir}"/>
           <link offline="true" href="${javadoc.link.junit}"
                 packagelistLoc="${javadoc.packagelist.dir}/junit"/>
+          <link href="../core/"/>
           <link href=""/>
         </sources>
       </invoke-javadoc>
Index: lucene/README.txt
===================================================================
--- lucene/README.txt	(revision 1328355)
+++ lucene/README.txt	(working copy)
@@ -22,12 +22,13 @@
 Additional modules contain the same structure:
 
 analysis/common/: Analyzers for indexing content in different languages and domains
+analysis/icu/: Analysis integration with ICU (International Components for Unicode)
 analysis/kuromoji/: Analyzer for indexing Japanese
 analysis/morfologik/: Analyzer for indexing Polish
 analysis/phonetic/: Analyzer for indexing phonetic signatures (for sounds-alike search)
 analysis/smartcn/: Analyzer for indexing Chinese
 analysis/stempel/: Analyzer for indexing Polish
-analysis/uima/: Analyzer that integrates with Apache UIMA
+analysis/uima/: Analysis integration with Apache UIMA
 benchmark/: System for benchmarking Lucene
 demo/: Simple example code
 facet/: Faceted indexing and search capabilities
Index: lucene/queries/build.xml
===================================================================
--- lucene/queries/build.xml	(revision 1328355)
+++ lucene/queries/build.xml	(working copy)
@@ -17,7 +17,7 @@
 
 <project name="queries" default="default">
   <description>
-    Queries that exist outside of Lucene core
+    Filters and Queries that add to core Lucene
   </description>
 
   <import file="../../lucene/module-build.xml"/>