Index: src/documentation/content/xdocs/site.xml
===================================================================
--- src/documentation/content/xdocs/site.xml	(revision 957670)
+++ src/documentation/content/xdocs/site.xml	(working copy)
@@ -44,9 +44,10 @@
     <tutorial8   label="Tutorial (0.8.x)"     href="tutorial8.html" />
     <webmasters  label="Robot     "       href="bot.html" />
     <i18n        label="i18n"             href="i18n.html" />
+    <apidocs     label="API Docs (1.1)"         href="apidocs-1.1/index.html" />
     <apidocs     label="API Docs (1.0)"         href="apidocs-1.0/index.html" />
     <apidocs     label="API Docs (0.9)"         href="apidocs-0.9/index.html" />
-    <apidocs     label="API Docs (0.8.x)"         href="apidocs-0.8.x/index.html" />
+    <apidocs     label="API Docs (0.8.x)"       href="apidocs-0.8.x/index.html" />
     <apidocs     label="API Docs (0.7.2)"       href="apidocs/index.html" />
     <apidocs     label="API Docs (nightly)"	href="ext:nightly-api" />
   </docs>
@@ -61,15 +62,15 @@
 
 
   <projects label="Related Projects">
-    <lucene     label="Lucene Java"      href="ext:lucene" />
+    <lucene     label="Lucene"      href="ext:lucene" />
     <hadoop     label="Hadoop"      href="ext:hadoop" />
     <solr       label="Solr"      href="ext:solr" />
   </projects>
 
   <external-refs>
     <lucene    href="http://lucene.apache.org/java/" />
-    <nightly-api href="http://lucene.zones.apache.org:8080/hudson/job/Nutch-Nightly/ws/trunk/build/docs/api/index.html" />
-    <hadoop    href="http://lucene.apache.org/hadoop/" />
+    <nightly-api href="http://hudson.zones.apache.org/hudson/job/Nutch-trunk/javadoc/" />
+    <hadoop    href="http://hadoop.apache.org/" />
     <solr      href="http://incubator.apache.org/solr/" />
     <wiki      href="http://wiki.apache.org/nutch/" />
     <faq       href="http://wiki.apache.org/nutch/FAQ" /> 
Index: src/documentation/content/xdocs/version_control.xml
===================================================================
--- src/documentation/content/xdocs/version_control.xml	(revision 957670)
+++ src/documentation/content/xdocs/version_control.xml	(working copy)
@@ -32,7 +32,7 @@
         The command-line SVN client can be obtained <a href="http://subversion.tigris.org/project_packages.html">here</a>.
         The TortoiseSVN GUI client for Windows can be obtained <a href="http://tortoisesvn.tigris.org/">here</a>. There
         are also SVN plugins available for both <a href="http://subclipse.tigris.org/">Eclipse</a> and 
-        <a href="http://svnup.tigris.org/">IntelliJ IDEA</a>.
+        <a href="http://svnup.tigris.org/">IntelliJ IDEA</a> as well as many other development environments.
       </p>
     </section>
     
@@ -40,7 +40,7 @@
       <title>Web Access (read-only)</title>
       <p>
         The source code can be browsed via the Web at 
-        <a href="http://svn.apache.org/viewcvs.cgi/nutch/">http://svn.apache.org/viewcvs.cgi/nutch/</a>.
+        <a href="http://svn.apache.org/viewvc/nutch/">http://svn.apache.org/viewvc/nutch/</a>.
         No SVN client software is required.
       </p>
     </section>
Index: src/documentation/content/xdocs/index.xml
===================================================================
--- src/documentation/content/xdocs/index.xml	(revision 957670)
+++ src/documentation/content/xdocs/index.xml	(working copy)
@@ -30,12 +30,12 @@
 
 
    <section>
-      <title>06 April 2010 - Apache Nutch 1.1 Released</title>
+      <title>06 June 2010 - Apache Nutch 1.1 Released</title>
       <p>The 1.1 release of Nutch is now available. This release includes several major upgrades of existing
       libraries (Hadoop, Solr, Tika, etc.) on which Nutch depends. Various bug fixes, and speedups (e.g., to
-      Fetcher2) have also been included. See <a href="http://www.apache.org/dist/lucene/nutch/CHANGES-1.1.txt">
+      Fetcher2) have also been included. See <a href="http://www.apache.org/dist/nutch/CHANGES-1.1.txt">
       list of changes</a>  made in this version. The release is available
-      <a href="http://lucene.apache.org/nutch/release/">here</a>.</p>
+      <a href="http://www.apache.org/dyn/closer.cgi/nutch/">here</a>.</p>
     </section>
     
     <section>
Index: src/documentation/content/xdocs/about.xml
===================================================================
--- src/documentation/content/xdocs/about.xml	(revision 957670)
+++ src/documentation/content/xdocs/about.xml	(working copy)
@@ -27,13 +27,21 @@
 
     <section>
       <title>Overview</title> <p>Nutch is open source web-search
-      software.  It builds on <a href="ext:lucene">Lucene Java</a>,
+      software.  It builds on <a href="ext:lucene">Lucene and SolR</a>,
       adding web-specifics, such as a crawler, a link-graph database,
       parsers for HTML and other document formats, etc.</p>
 
+      <p>Nutch can run on a single machine, but gains a lot of its
+      strength from running in a <a href="ext:hadoop">Hadoop cluster</a></p>
+
+      <p>The system can be enhanced (eg other document formats can be 
+      parsed) using a plugin mechanism</p>
+
       <p>For more information about Nutch, please see the <a
       href="ext:wiki">Nutch wiki.</a></p>
 
+      
+
     </section>
 
   </body>
Index: src/documentation/content/xdocs/nightly.xml
===================================================================
--- src/documentation/content/xdocs/nightly.xml	(revision 957670)
+++ src/documentation/content/xdocs/nightly.xml	(working copy)
@@ -29,14 +29,14 @@
     be functional. 
     </p>
     <p>
-    You can track the progress of 1.1-dev version from a <a href="http://issues.apache.org/jira/browse/NUTCH?report=com.atlassian.jira.plugin.system.project:roadmap-panel">jira report</a> 
+    You can track the progress of our current development versions from a <a href="http://issues.apache.org/jira/browse/NUTCH?report=com.atlassian.jira.plugin.system.project:roadmap-panel">jira report</a> 
     </p>
     <p>
     To report bugs see <a href="issue_tracking.html">issue tracking</a>
     </p>
     <p>
-    <a href="http://people.apache.org/builds/lucene/nutch/nightly/">Nutch nightly builds</a> (1.1-dev)
+    <a href="http://people.apache.org/builds/lucene/nutch/nightly/">Nutch nightly builds</a>
     </p>
   </body>
   
-</document>
\ No newline at end of file
+</document>
Index: src/documentation/content/xdocs/i18n.xml
===================================================================
--- src/documentation/content/xdocs/i18n.xml	(revision 957670)
+++ src/documentation/content/xdocs/i18n.xml	(working copy)
@@ -56,7 +56,7 @@
 </ol>
 
 <p>If you'd like to provide a translation, simply post translations of
-these five files to <a href="mailto:nutch-dev@lucene.apache.org">nutch-dev@lucene.apache.org</a>
+these five files to <a href="mailto:dev@nutch.apache.org">dev@nutch.apache.org</a>
 as an attachment.</p>
 
 </section>
@@ -85,7 +85,7 @@
 
 <p>For example, the header file for an English translation is filed
 as <a
-href="http://svn.apache.org/repos/asf/lucene/nutch/trunk/src/web/include/en/header.xml"><tt>src/web/include/en/header.xml</tt></a>.</p>
+href="http://svn.apache.org/viewvc/nutch/trunk/src/web/include/en/header.xml"><tt>src/web/include/en/header.xml</tt></a>.</p>
 
 
 </section>
@@ -125,7 +125,7 @@
 
 <p>For example, the English language "about" page is filed
 as <a
-href="http://svn.apache.org/repos/asf/lucene/nutch/trunk/src/web/pages/en/about.xml"><tt>src/web/pages/en/about.xml</tt></a>.</p>
+href="http://svn.apache.org/viewvc/nutch/trunk/src/web/pages/en/about.xml"><tt>src/web/pages/en/about.xml</tt></a>.</p>
 
 </section>
 
@@ -143,12 +143,12 @@
 <p>These property files are filed as
 <tt>src/web/locale/org/nutch/jsp/<i>page</i>_<i>language</i>.xml</tt>
 where <i>page</i> is the name of the JSP page in <a
-href="http://svn.apache.org/repos/asf/lucene/nutch/trunk/src/web/jsp/"><tt>src/web/jsp/</tt></a>
+href="http://svn.apache.org/viewvc/nutch/trunk/src/web/jsp/"><tt>src/web/jsp/</tt></a>
 and <i>language</i> is the IS0639 language code, as above.</p>
 
 <p>For example, text for the English language search results page is filed
 as <a
-href="http://svn.apache.org/repos/asf/lucene/nutch/trunk/src/web/locale/org/nutch/jsp/search_en.properties"><tt>src/web/locale/org/nutch/jsp/search_en.properties</tt></a>.
+href="http://svn.apache.org/viewvc/nutch/trunk/src/web/locale/org/nutch/jsp/search_en.properties"><tt>src/web/locale/org/nutch/jsp/search_en.properties</tt></a>.
  This contains something like:</p>
 
 <pre>
@@ -178,7 +178,7 @@
  href="http://java.sun.com/j2se/downloads.html">Java</a>, <a
  href="http://ant.apache.org/">Ant</a> and Nutch installed.  To
  install Nutch, either download and unpack the latest <a
- href="http://lucene.apache.org/nutch/release/nightly/">release</a>, or check it
+ href="http://nutch.apache.org/nightly.html">release</a>, or check it
  out from <a
  href="version_control.html">Subversion</a>.</p>
 
@@ -203,12 +203,11 @@
 href="http://jakarta.apache.org/tomcat/">Tomcat</a> installed.</p>
 
 <p>An index is also required.  You can collect your own by working
-through the <a href="http://lucene.apache.org/nutch/tutorial.html">tutorial</a>.
+through the <a href="http://nutch.apache.org/tutorial.html">tutorial</a>.
 Once you have an index, follow the steps outlined at the end of the
 tutorial for searching.</p>
 
-<i>This documentation needs more detail.  Could someone
-please submit a list of the actual steps required here?</i>
+<p>For the latest documentation and training it is best to search the wiki for user contributed material</p>
 
 </section>