Index: src/java/org/apache/lucene/queryParser/QueryParser.java
===================================================================
--- src/java/org/apache/lucene/queryParser/QueryParser.java	(revision 713160)
+++ src/java/org/apache/lucene/queryParser/QueryParser.java	(working copy)
@@ -62,7 +62,7 @@
  *
  * <p>
  * Examples of appropriately formatted queries can be found in the <a
- * href="http://lucene.apache.org/java/docs/queryparsersyntax.html">query syntax
+ * href="../../../../../../queryparsersyntax.html">query syntax
  * documentation</a>.
  * </p>
  *
Index: src/java/org/apache/lucene/queryParser/QueryParser.jj
===================================================================
--- src/java/org/apache/lucene/queryParser/QueryParser.jj	(revision 713160)
+++ src/java/org/apache/lucene/queryParser/QueryParser.jj	(working copy)
@@ -86,7 +86,7 @@
  *
  * <p>
  * Examples of appropriately formatted queries can be found in the <a
- * href="http://lucene.apache.org/java/docs/queryparsersyntax.html">query syntax
+ * href="../../../../../../queryparsersyntax.html">query syntax
  * documentation</a>.
  * </p>
  *
Index: src/java/org/apache/lucene/search/Similarity.java
===================================================================
--- src/java/org/apache/lucene/search/Similarity.java	(revision 713160)
+++ src/java/org/apache/lucene/search/Similarity.java	(working copy)
@@ -209,7 +209,7 @@
  *      <b>t.getBoost()</b>
  *      is a search time boost of term <i>t</i> in the query <i>q</i> as
  *      specified in the query text
- *      (see <A HREF="../../../../../queryparsersyntax.html#Boosting a Term">query syntax</A>),
+ *      (see <A HREF="../../../../../../queryparsersyntax.html#Boosting a Term">query syntax</A>),
  *      or as set by application calls to
  *      {@link org.apache.lucene.search.Query#setBoost(float) setBoost()}.
  *      Notice that there is really no direct API for accessing a boost of one term in a multi term query,
Index: src/java/org/apache/lucene/document/package.html
===================================================================
--- src/java/org/apache/lucene/document/package.html	(revision 713160)
+++ src/java/org/apache/lucene/document/package.html	(working copy)
@@ -37,7 +37,7 @@
   to create Documents based on the content of the files you are working with in your application (Word, txt, PDF, Excel or any other format.)
   How this is done is completely up to you.  That being said, there are many tools available in other projects that can make
   the process of taking a file and converting it into a Lucene {@link org.apache.lucene.document.Document}.  To see an example of this,
-  take a look at the Lucene <a href="http://lucene.apache.org/java/docs/gettingstarted.html" target="top">demo</a> and the associated source code
+  take a look at the Lucene <a href="../../../../../../gettingstarted.html" target="top">demo</a> and the associated source code
   for extracting content from HTML.
 </p>
 <p>The {@link org.apache.lucene.document.DateTools} and {@link org.apache.lucene.document.NumberTools} classes are utility
Index: src/site/src/documentation/content/xdocs/site.xml
===================================================================
--- src/site/src/documentation/content/xdocs/site.xml	(revision 713160)
+++ src/site/src/documentation/content/xdocs/site.xml	(working copy)
@@ -92,7 +92,7 @@
   -->
 
   <external-refs>
-    <javadocs-all href="api/index.html"/>
+    <javadocs-all href="api/all/index.html"/>
 	<javadocs-core href="api/core/index.html"/>
 	<javadocs-demo href="api/demo/index.html"/>
 	<javadocs-contrib-analyzers href="api/contrib-analyzers/index.html"/>
Index: build.xml
===================================================================
--- build.xml	(revision 713160)
+++ build.xml	(working copy)
@@ -268,9 +268,9 @@
   	
   <target name="javadocs-all" description="Generate javadoc for core, demo and contrib classes" depends="build-contrib">
   	<sequential>
-      <mkdir dir="${javadoc.dir}"/>
+      <mkdir dir="${javadoc.dir}/all"/>
       <invoke-javadoc
-        destdir="${javadoc.dir}">
+        destdir="${javadoc.dir}/all">
         <sources>
           <!-- TODO: find a dynamic way to do include multiple source roots -->
           <packageset dir="src/java"/>
Index: contrib/miscellaneous/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java
===================================================================
--- contrib/miscellaneous/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java	(revision 713160)
+++ contrib/miscellaneous/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java	(working copy)
@@ -66,7 +66,7 @@
  *
  * <p>
  * Examples of appropriately formatted queries can be found in the <a
- * href="http://jakarta.apache.org/lucene/docs/queryparsersyntax.html">query syntax
+ * href="../../../../../../../queryparsersyntax.html">query syntax
  * documentation</a>.
  * </p>
  *
Index: contrib/miscellaneous/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj
===================================================================
--- contrib/miscellaneous/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj	(revision 713160)
+++ contrib/miscellaneous/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj	(working copy)
@@ -90,7 +90,7 @@
  *
  * <p>
  * Examples of appropriately formatted queries can be found in the <a
- * href="http://jakarta.apache.org/lucene/docs/queryparsersyntax.html">query syntax
+ * href="../../../../../../../queryparsersyntax.html">query syntax
  * documentation</a>.
  * </p>
  *
Index: contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
===================================================================
--- contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	(revision 713160)
+++ contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	(working copy)
@@ -80,7 +80,7 @@
  * <a target="_blank" href="http://today.java.net/pub/a/today/2003/07/30/LuceneIntro.html">Lucene Analyzer Intro</a>.
  * <p>
  * Arbitrary Lucene queries can be run against this class - see <a target="_blank" 
- * href="http://lucene.apache.org/java/docs/queryparsersyntax.html">Lucene Query Syntax</a>
+ * href="../../../../../../../queryparsersyntax.html">Lucene Query Syntax</a>
  * as well as <a target="_blank" 
  * href="http://today.java.net/pub/a/today/2003/11/07/QueryParserRules.html">Query Parser Rules</a>.
  * Note that a Lucene query selects on the field names and associated (indexed) 
