Index: xdocs/queryparsersyntax.xml
===================================================================
--- xdocs/queryparsersyntax.xml	(revision 380870)
+++ xdocs/queryparsersyntax.xml	(working copy)
@@ -10,9 +10,16 @@
         <section name="Overview">
             <p>Although Lucene provides the ability to create your own
             queries through its API, it also provides a rich query
-            language through the Query Parser.</p> <p>This page
-            provides syntax of Lucene's Query Parser, a lexer which
-            interprets a string into a Lucene Query using JavaCC.</p>
+            language through the Query Parser, a lexer which
+            interprets a string into a Lucene Query using JavaCC.
+	    </p>
+
+	    <p>This page provides the Query Parser syntax in Lucene 1.9.
+	    If you are using a different
+	    version of Lucene, pelase consult the copy of
+	    <code>docs/queryparsersyntax.html</code> that was distributed
+	    with the version you are using.
+	    </p>
             <p>
             Before choosing to use the provided Query Parser, please consider the following:
             <ol>
Index: xdocs/fileformats.xml
===================================================================
--- xdocs/fileformats.xml	(revision 380870)
+++ xdocs/fileformats.xml	(working copy)
@@ -14,7 +14,10 @@
 
             <p>
                 This document defines the index file formats used
-                in Lucene version 1.4 and above.
+                in Lucene version 1.9.  If you are using a different
+		version of Lucene, pelase consult the copy of
+		<code>docs/fileformats.html</code> that was distributed
+		with the version you are using.
             </p>
 
             <p>
Index: docs/queryparsersyntax.html
===================================================================
--- docs/queryparsersyntax.html	(revision 380870)
+++ docs/queryparsersyntax.html	(working copy)
@@ -117,10 +117,15 @@
         <blockquote>
                                     <p>Although Lucene provides the ability to create your own
             queries through its API, it also provides a rich query
-            language through the Query Parser.</p>
-                                                <p>This page
-            provides syntax of Lucene's Query Parser, a lexer which
-            interprets a string into a Lucene Query using JavaCC.</p>
+            language through the Query Parser, a lexer which
+            interprets a string into a Lucene Query using JavaCC.
+	    </p>
+                                                <p>This page provides the Query Parser syntax in Lucene 1.9.
+	    If you are using a different
+	    version of Lucene, pelase consult the copy of
+	    <code>docs/queryparsersyntax.html</code> that was distributed
+	    with the version you are using.
+	    </p>
                                                 <p>
             Before choosing to use the provided Query Parser, please consider the following:
             <ol>
Index: docs/fileformats.html
===================================================================
--- docs/fileformats.html	(revision 380870)
+++ docs/fileformats.html	(working copy)
@@ -113,7 +113,10 @@
         <blockquote>
                                     <p>
                 This document defines the index file formats used
-                in Lucene version 1.4 and above.
+                in Lucene version 1.9.  If you are using a different
+		version of Lucene, pelase consult the copy of
+		<code>docs/fileformats.html</code> that was distributed
+		with the version you are using.
             </p>
                                                 <p>
                 Apache Lucene is written in Java, but several
Index: build.xml
===================================================================
--- build.xml	(revision 380870)
+++ build.xml	(working copy)
@@ -364,25 +364,45 @@
         <tag name="todo" description="To Do:"/>
 
         <!-- TODO: find a dynamic way to do include multiple source roots -->
+	
         <packageset dir="src/java"/>
+
+	<packageset dir="src/demo"/>
+	
         <packageset dir="contrib/analyzers/src/java"/>
-        <packageset dir="contrib/wordnet/src/java"/>
+        <packageset dir="contrib/ant/src/java"/>
         <packageset dir="contrib/highlighter/src/java"/>
+        <packageset dir="contrib/lucli/src/java"/>
+        <packageset dir="contrib/memory/src/java"/>
+        <packageset dir="contrib/miscellaneous/src/java"/>
         <packageset dir="contrib/similarity/src/java"/>
+        <packageset dir="contrib/regex/src/java"/>
+        <packageset dir="contrib/snowball/src/java"/>
         <packageset dir="contrib/spellchecker/src/java"/>
-        <packageset dir="contrib/snowball/src/java"/>
+        <packageset dir="contrib/surround/src/java"/>
         <packageset dir="contrib/swing/src/java"/>
-        <packageset dir="contrib/memory/src/java"/>
+        <packageset dir="contrib/wordnet/src/java"/>
 
         <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*"/>
+
+        <group title="Demo" packages="org.apache.lucene.demo*"/>
+
         <group title="Analysis" packages="org.apache.lucene.analysis.*"/>
-        <group title="Snowball Stemmers" packages="org.apache.lucene.analysis.snowball*:net.sf.snowball*"/>
+        <group title="Ant" packages="org.apache.lucene.ant*"/>
+
         <group title="Highlighter" packages="org.apache.lucene.search.highlight*"/>
+        <group title="Lucli" packages="lucli*"/>
+        <group title="Memory" packages="org.apache.lucene.index.memory*"/>
+        <group title="Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
         <group title="MoreLikeThis" packages="org.apache.lucene.search.similar*"/>
-        <group title="SpellChecker" packages="org.apache.lucene.search.spell*"/>
+        <group title="RegEx" packages="org.apache.lucene.search.regex*:org.apache.regexp*"/>
+        <group title="Snowball Stemmers" packages="org.apache.lucene.analysis.snowball*:net.sf.snowball*"/>
+	<group title="SpellChecker" packages="org.apache.lucene.search.spell*"/>
+	<group title="Surround Parser" packages="org.apache.lucene.queryParser.surround*"/>
+        <group title="Swing" packages="org.apache.lucene.swing*"/>
         <group title="WordNet" packages="org.apache.lucene.wordnet*"/>
-        <group title="Swing" packages="org.apache.lucene.swing*"/>
-        <group title="Memory" packages="org.apache.lucene.index.memory*"/>
+
+	
       </javadoc>
     </sequential>
   </macrodef>
Index: README.txt
===================================================================
--- README.txt	(revision 380870)
+++ README.txt	(working copy)
@@ -22,11 +22,19 @@
 lucene-demos-XX.jar
   The compiled simple example code.
 
+luceneweb.war
+  The compiled simple example Web Application.
+
+contrib/*
+  Contributed code which extends and enhances Lucene, but is not
+  part of the core library.
+
 docs/index.html
   The contents of the Lucene website.
 
 docs/api/index.html
-  The Javadoc Lucene API documentation.
+  The Javadoc Lucene API documentation.  This includes the core
+  library, the demo, as well as all of the contrib modules.
 
 src/java
   The Lucene source code.