diff --git a/doc/doc/install.html b/doc/doc/install.html
index 3d61a8b0..a31042d7 100644
--- a/doc/doc/install.html
+++ b/doc/doc/install.html
@@ -24,59 +24,71 @@
 	<script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
 <body>
-	<textarea id="xooki-source">
-There are basically two way to install Ivy. Either manually or automatically.
-<h1>Manually</h1>
-Download the version you want <a href="../download.html">here</a>, unpack the downloaded zip file wherever you want, and copy the ivy jar file in your ant lib directory (ANT_HOME/lib).
-
-If you use ant 1.6.0 or superior, you can then simply go to the src/example/hello-ivy dir and run ant: if the build is successful, you have successfully installed Ivy !
-
-If you use ant 1.5.1 or superior, you have to modify the build files in the examples:
-- remove the namespace section at their head: xmlns:ivy="antlib:org.apache.ivy.ant" 
-- add taskdefs for ivy tasks:
-<code>
-  <taskdef name="ivy-configure" classname="org.apache.ivy.ant.IvyConfigure"/>
-  <taskdef name="ivy-resolve" classname="org.apache.ivy.ant.IvyResolve"/>
-  <taskdef name="ivy-retrieve" classname="org.apache.ivy.ant.IvyRetrieve"/>
-  <taskdef name="ivy-publish" classname="org.apache.ivy.ant.IvyPublish"/> 
-</code>
-- replace ivy:xxx tasks by ivy-xxx
-You can now run the build, if it is successful, you have successfully installed Ivy !
-
-If the build is not successful, check the <a href="../faq.html">FAQ</a> to see what can be the problem with the ivyrep resolver.
-<h1>Automatically</h1>
-If you want to use Ivy only in your ant build scripts, and have an internet connection when you build, you can download Ivy from this site and use the downloaded version automatically, using this simple build snippet:
-<code type="xml">
-    <property name="ivy.install.version" value="1.4-RC1" />
-
-    <condition property="ivy.home" value="${env.IVY_HOME}">
-        <isset property="env.IVY_HOME" />
-    </condition>
-    <property name="ivy.home" value="${user.home}/.ivy" />
-    <property name="ivy.jar.dir" value="${ivy.home}/jars" />
-    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-	
-    <target name="download-ivy" unless="offline">
-        <mkdir dir="${ivy.jar.dir}"/>
-        <!-- download Ivy from web site so that it can be used even without any special installation -->
-        <get src="http://www.jayasoft.org/downloads/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
-            dest="${ivy.jar.file}" usetimestamp="true"/>
-    </target>
-	
-    <target name="init-ivy" depends="download-ivy">
-    	<!-- try to load ivy here from ivy home, in case the user has not already dropped
-              it into ant's lib dir (note that the latter copy will always take precedence).
-              We will not fail as long as local lib dir exists (it may be empty) and
-              ivy is in at least one of ant's lib dir or the local lib dir. -->
-        <path id="ivy.lib.path">
-            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
-        </path>
-        <taskdef resource="org/apache/ivy/ant/antlib.xml"
-                 uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-    </target>
-</code>
-
-Then the only thing to do is to add the init-ivy target in the depends attribute of your targets using Ivy, and add ivy namespace to your build script. See the self contained [[svn:src/example/go-ivy/build.xml go-ivy]] example for details about this.
+	<textarea id="xooki-source">
+There are basically two way to install Ivy. Either manually or automatically.
+<h1>Manually</h1>
+Download the version you want <a href="../download.html">here</a>, unpack the downloaded zip file wherever you want, and copy the ivy jar file in your ant lib directory (ANT_HOME/lib).
+
+If you use ant 1.6.0 or superior, you can then simply go to the src/example/hello-ivy dir and run ant: if the build is successful, you have successfully installed Ivy !
+
+If you use ant 1.5.1 or superior, you have to modify the build files in the examples:
+- remove the namespace section at their head: xmlns:ivy="antlib:org.apache.ivy.ant" 
+- add taskdefs for ivy tasks:
+<code>
+  <taskdef name="ivy-configure" classname="org.apache.ivy.ant.IvyConfigure"/>
+  <taskdef name="ivy-resolve" classname="org.apache.ivy.ant.IvyResolve"/>
+  <taskdef name="ivy-retrieve" classname="org.apache.ivy.ant.IvyRetrieve"/>
+  <taskdef name="ivy-publish" classname="org.apache.ivy.ant.IvyPublish"/> 
+</code>
+- replace ivy:xxx tasks by ivy-xxx
+You can now run the build, if it is successful, you have successfully installed Ivy !
+
+If the build is not successful, check the <a href="../faq.html">FAQ</a> to see what can be the problem with the ivyrep resolver.
+
+<h2>Ivy dependendencies</h2>
+
+The latest binary version of Ivy, 2.0.0-alpha-1, doesn't include the optional dependencies. To download them using Ivy, all you need is to have Ant installed and follow these instructions:
+1. open a shell or command line in the directory where you unzipped your binary distribution, where you can find the ivy-2.0.0-alpha-1-incubating.jar
+2. copy <a href="../samples/build-install.xml">this build</a> script to the directory
+3. run the following command:
+<code>
+ant -f build-install.xml
+</code>
+4. That's all, you should now see the Ivy optional dependencies in the lib directory, organized per configuration (see the ivy.xml for details about the configurations and their use)
+
+<h1>Automatically</h1>
+If you want to use Ivy only in your ant build scripts, and have an internet connection when you build, you can download Ivy from this site and use the downloaded version automatically, using this simple build snippet:
+<code type="xml">
+    <property name="ivy.install.version" value="1.4-RC1" />
+
+    <condition property="ivy.home" value="${env.IVY_HOME}">
+        <isset property="env.IVY_HOME" />
+    </condition>
+    <property name="ivy.home" value="${user.home}/.ivy" />
+    <property name="ivy.jar.dir" value="${ivy.home}/jars" />
+    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+	
+    <target name="download-ivy" unless="offline">
+        <mkdir dir="${ivy.jar.dir}"/>
+        <!-- download Ivy from web site so that it can be used even without any special installation -->
+        <get src="http://www.jayasoft.org/downloads/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+            dest="${ivy.jar.file}" usetimestamp="true"/>
+    </target>
+	
+    <target name="init-ivy" depends="download-ivy">
+    	<!-- try to load ivy here from ivy home, in case the user has not already dropped
+              it into ant's lib dir (note that the latter copy will always take precedence).
+              We will not fail as long as local lib dir exists (it may be empty) and
+              ivy is in at least one of ant's lib dir or the local lib dir. -->
+        <path id="ivy.lib.path">
+            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+        </path>
+        <taskdef resource="org/apache/ivy/ant/antlib.xml"
+                 uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+    </target>
+</code>
+
+Then the only thing to do is to add the init-ivy target in the depends attribute of your targets using Ivy, and add ivy namespace to your build script. See the self contained [[svn:src/example/go-ivy/build.xml go-ivy]] example for details about this.
 	</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>
diff --git a/doc/doc/releasenotes/2.0.0-alpha-1.html b/doc/doc/releasenotes/2.0.0-alpha-1.html
new file mode 100644
index 00000000..a86fe340
--- /dev/null
+++ b/doc/doc/releasenotes/2.0.0-alpha-1.html
@@ -0,0 +1,230 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<html>
+<head>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+	<script type="text/javascript">var xookiConfig = {level: 2};</script>	
+	<script type="text/javascript" src="../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+<h2>Disclaimer</h2>
+<code>
+Apache Ivy is an effort undergoing incubation at The Apache Software
+Foundation (ASF). Incubation is required of all newly accepted projects
+until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with
+other successful ASF projects. While incubation status is not necessarily
+a reflection of the completeness or stability of the code, it does
+indicate that the project has yet to be fully endorsed by the ASF.
+</code>
+<h2>Announcement</h2>
+<code>
+April 26 2007 - The Ivy incubator project is please to announce its
+2.0.0 alpha 1 release, exactly two years after Ivy 1.0!
+
+Ivy is a tool for managing (recording, tracking, resolving and
+reporting) project dependencies, characterized by flexibility,
+configurability, and tight integration with Apache Ant.
+
+This is the first release of Ivy in the Apache incubator, and as an
+alpha version we do not guarantee any stability, that API and features
+are still likely to change until final 2.0.0 version. Still we encourage
+the use of this version for early testing.
+
+This version focus was to refactor the code to get better readability,
+rename packages to org.apache.ivy, improve maven 2 compatibility along
+with some other bug fixes and improvement.
+
+Download the 2.0.0 alpha 1 release files at:
+http://incubator.apache.org/ivy/download.html
+
+More information can be found on the Ivy website -
+http://incubator.apache.org/ivy/
+
+regards,
+Xavier Hanin (2.0.0-alpha-1 release mgr)
+</code>
+<h2>Release Notes</h2>
+CONTENTS
+1. What is Apache Ivy?
+2. Status of this release
+3. Major Changes in this Release
+4. Migrating from Jayasoft Ivy to Apache Ivy
+5. How to Get Involved
+6. How to Report Issues
+7. Committers and Contributors for this release
+8. List of Changes in this Release   
+   
+   
+<h3>1. What is Apache Ivy?</h3>
+
+Apache Ivy is a tool for managing (recording, tracking, resolving and reporting) project dependencies. 
+It is characterized by the following:
+
+   1. flexibility and configurability 
+   		Apache Ivy is essentially process agnostic and is not tied to any methodology or structure. 
+   		Instead it provides the necessary flexibility and configurability to be adapted to a broad range of dependency management and build processes.
+
+   2. tight integration with Apache Ant
+   		while available as a standalone tool, Apache Ivy works particularly well with Apache Ant providing a number of powerful Ant tasks ranging from dependency resolution to dependency reporting and publication.
+
+<h3>2. Status of this release </h3>
+
+This release of Apache Ivy is the first release within the Apache Incubator, and is labelled and should be considered as an alpha version.
+
+This means that we do not guarantee any stability, that API and features are still likely to change until final 2.0.0 version. Still we encourage
+the use of this version for early testing.
+
+The current production quality version is still 1.4.1, which has not been produced within the Apache Software Foundation.
+
+<h3>3. Major Changes in this Release</h3>
+
+This section describes what has changed between version 1.4.1 and this version of Apache Ivy.
+
+This new version of Apache Ivy is fully compatible with previous versions as long as you do not use custom plugins: Ivy API has changed, but not its behavior:
+
+Some tasks and configuration elements have been renamed, but the old versions
+are still available, they are only deprecated (you will see deprecated warnings).
+
+<h4>3.1. Java Package Name Changes</h4>
+
+All of the Ivy Java package names have changed in Apache Ivy. They now start 
+with org.apache rather than fr.jayasoft. There have been other changes as well. 
+Important refactorings have done on the source code to ease the understanding
+of Ivy internal architecture by new developers.
+
+A class named org.apache.ivy.Ivy14 is provided with an API compatible with the
+fr.jayasoft.Ivy class of Ivy 1.4.1, to ease migration to this new version.
+
+<h4>3.2. Configuration replaced by Settings</h4>
+
+Configuration used to have two meanings in prior Ivy versions, causing some confusion with new users.
+To avoid this confusion, Apache Ivy calls settings instead of configuration the files used to customize Ivy. Configuration is still used for module configurations.
+
+Besides the changes in the documentation, this renaming also imply a modification in settings files, which now use ivysettings as root element instead of ivyconf, and settings instead of conf element to define top level defaults (such as defaultCache, ...).
+Previous names have been deprecated, so previous settings files can still be used, but you will see a deprecation warning.
+
+<h4>3.3. public resolver in default settings is now ibiblio in m2 compatible mode</h4>
+
+In previous versions Ivy used to use the ivyrep resolver as default public resolver, but ivyrep is no longer maintained, while maven 2 repository on ibiblio is growing rapidly.
+
+Since Ivy is compatible with maven 2 repository, defaulting to the ibiblio maven 2 repository makes more sense.
+
+If you have any issue of backward compatibility with these new settings, you can simply set the following ant property before calling configure (implicitly or explicitly):
+<code>
+ivy.14.compatible=true
+</code>
+
+<h3>4. Migrating from Jayasoft Ivy to Apache Ivy</h3>
+
+Apache Ivy is fully compatible with Jayasoft Ivy as long as you do not use 
+custom plugins.
+This means that you can use Apache Ivy as a drop in replacement of Jayasoft Ivy.
+
+However due to the the renaming of configuration files to settings files, we
+strongly suggest to update your configuration files:
+- rename the files called ivyconf*.xml in ivysettings*.xml
+- rename 'ivyconf' element in 'ivysettings'
+- rename 'conf' element of those settings file in 'settings'
+
+Migrating custom plugins can be done by using the org.apache.ivy.Ivy14 class instead of fr.jayasoft.ivy.Ivy, and reorganizing your imports to reflect the changes in the package names.
+
+<h3>5. How to Get Involved</h3>
+
+The Apache Ivy project really needs and appreciates any contributions, including documentation help, source code and feedback.  If you are interested in contributing, please visit http://incubator.apache.org/ivy/get-involved.html.
+
+<h3>6. How to Report Issues</h3>
+
+The Apache Ivy project uses JIRA for issue tracking.  Please report any issues you find at http://issues.apache.org/jira/browse/IVY
+
+<h3>7. Committers and Contributors for this Release</h3>
+
+Here is the list of people who have contributed source code and documentation to this release. Many thanks to all of them, and also to the whole Ivy community contributing ideas and feedback, and promoting the use of Ivy. The list would be too long, but Ivy couldn't be what it is without you!
+
+<h4>Committers</h4>
+	Maarten Coene
+	Xavier Hanin
+
+<h4>Contributors</h4>
+	Stephane Baillez
+	Pierre Hägnestrand
+	Matt Inger
+	Costin Leau
+	William Lyvers
+	Gilles Scokart
+	John Williams
+
+<h3>8. List of Changes in this Release</h3>
+
+For a full release history of Ivy see the file <a href="http://svn.apache.org/repos/asf/incubator/ivy/core/branches/2.0.0-alpha-1/CHANGES.txt">CHANGES.txt</a>
+
+For details about the following changes, check our JIRA install at http://issues.apache.org/jira/browse/ivy
+
+- TASK: refactor Ivy source code to improve readibility (IVY-434)
+
+- NEW: define artifacts not declared by the dependency module descriptor (IVY-419)
+- NEW: Module wide exclude (IVY-431)
+- NEW: The default public resolver used is now ibiblio with m2 compatible mode (IVY-463)
+
+- IMPROVE: OSGIfy ivy artifacts (IVY-464) (thanks to Costin Leau)
+- IMPROVE: Let user specify Ivy file when using a post-resolve task (IVY-455)
+- IMPROVE: IvyArtifactProperty and IvyArtifactReport tasks should be a post resolve task (IVY-452)
+- IMPROVE: Rename ivy configuration in settings to remove ambiguity on configuration meaning (IVY-438)
+- IMPROVE: Please typedef CacheResolver as "cache" for us (IVY-359)
+- IMPROVE: ivy:retrieve should be able to create symlinks (IVY-353) (thanks to John Williams)
+- IMPROVE: Ability to have multiple roots in the <ivy:buildfilelist> task (IVY-340) (thanks to Matt Inger)
+- IMPROVE: Refactoring / documentation / test of matcher package (IVY-375) (thanks to Stephane Baillez)
+- IMPROVE: Add a unit test to verify that latest.integration accepts released modules (IVY-394) (thanks to Gilles Scokart)
+- IMPROVE: New "modules in use" section in console report at the end of resolve (IVY-373) (thanks to John Wiliams)
+- IMPROVE: Generated XML reports now contains more information about the resolved module (IVY-446)
+
+- FIX: ivy-retrieve failure when explicit absolute 'ivy.dep.file' path specified (IVY-396)
+- FIX: IvyPostResolve Task doesn't reuse Ivy file of previous resolve (IVY-458)
+- FIX: Ivy standalone is passing null args to main method when invoking with no args (IVY-457)
+- FIX: Invalid error report with m2compatible resolver (IVY-456)
+- FIX: IvyPostResolve Task doesn't use specified cache for the resolve (IVY-453)
+- FIX: XmlModuleDescriptorWriterTest not working with Java 6 (IVY-374)
+- FIX: Conflict managers ignored, when assigned to modules in Ivy configuration (setting, ivyconf.xml) (IVY-448)
+- FIX: Ivy should fail if ';' has been used in publications/artifact/@conf of ivy.xml (IVY-441)
+- FIX: Ivy should fail where dependency uses undefined configuration (IVY-442)
+- FIX: Dynamic revision not calculated properly when using multiple directories (IVY-427)
+- FIX: LatestRevisionStrategy.sort() doesn't sort as specified (IVY-435)
+- FIX: setting m2compatible on ibiblio resolver overwrite root and pattern settings (IVY-437)
+- FIX: ivy.revision property not set correctly for second resolve (IVY-429)
+- FIX: NPE when no organisation or no name is provided in module element of ivyconf (IVY-422)
+- FIX: FileUtil#copy(File src, File dest, CopyProgressListener l, boolean overwrite) (IVY-420)
+- FIX: Invalid pom parsing when version is only declared in parent (IVY-436)
+- FIX: ${project.groupId} and ${project.version} not processed correctly in poms (IVY-425)
+- FIX: Incorrect pom parsing with profile (IVY-423)
+- FIX: Ivy doesn't recognize maven2 classifiers (IVY-418)
+- FIX: PomModuleDescriptorParser fails with nested profile dependency (IVY-392) (thanks to William Lyvers)
+- FIX: Static revision replacement is not working when delivering an artifact with a dependency having extra attributes (IVY-415)
+- FIX: Static revision replacement is not working when delivering an artifact with a dependency on a branch (IVY-404)
+- FIX: latest-time conflict manager not working properly (IVY-407)
+- FIX: LatestRevisionStrategy do not consider all dynamic revisions properly (IVY-383) (thanks to John Williams for the unit test)
+- FIX: IOException during publish causes NullPointerException (IVY-371)
+- FIX: Comments in ivy.xml duplicated (IVY-336) (thanks to Gilles Scokart)
+- FIX: Ivy failure when the ivy.xml file contains non US-ASCII characters (IVY-346) (thanks to Gilles Scokart)
+- FIX: Urlresolver is not possible to use dynamic revisions on nonstandard repository structure (IVY-350) (thanks to Pierre Hägnestrand)
+</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>
diff --git a/doc/doc/releasenotes/2.0.html b/doc/doc/releasenotes/2.0.html
new file mode 100644
index 00000000..ee9b9a61
--- /dev/null
+++ b/doc/doc/releasenotes/2.0.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<html>
+<head>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+	<script type="text/javascript">var xookiConfig = {level: 2};</script>	
+	<script type="text/javascript" src="../../xooki/xooki.js"></script>
+</head>
+<body>
+	<textarea id="xooki-source">
+The 2.0 version will be the first stable version released at Apache.
+
+Most of the efforts of the development team is concentrated on this version, and a [[doc/releasenotes/2.0.0-alpha-1 first alpha]] version is available for early preview.
+
+Despite the version name, the 2.0 version will be mostly backward compatible with prior 1.x versions. Indeed we choose to use a major version number change to reflect the change in the Ivy API which has been deeply revisited, and our migration to the Apache Software Foundation. But from a user point of view, Ivy 2.0 will be mostly a drop in replacement of the previous 1.x versions.</textarea>
+<script type="text/javascript">xooki.postProcess();</script>
+</body>
+</html>
diff --git a/doc/download.html b/doc/download.html
index 30b5d133..77d8f407 100644
--- a/doc/download.html
+++ b/doc/download.html
@@ -24,43 +24,90 @@
 	<script type="text/javascript" src="xooki/xooki.js"></script>
 </head>
 <body>
-	<textarea id="xooki-source">
-Ivy has not yet released a version under the Apache Incubator. Previous releases can be considered production quality, but are not endorsed by the Apache Software Foundation.
-
-<h2>Building from source</h2>
-What you can get here at the ASF is the latest sources from the Subversion repository:
-<code>
-svn co https://svn.apache.org/repos/asf/incubator/ivy/core/trunk ivy
-</code>
-Then to build Ivy from source, assuming you have ant 1.6.2+ and a jdk 1.4+ installed, then you only need to run the following command:
-<code>
-ant jar
-</code>
-Then you will find ivy.jar in <b>build/artifact</b>.
-
-<h2>Snapshot build</h2>
-There is also a snapshot build available here at the ASF, with the new package names (for those who use the Ivy API). It should not be considered production quality, is not a release, and is not fully endorsed by the ASF. If after all these warnings you're still interested, here is the link:
-http://incubator.apache.org/ivy/downloads/latest/
-
-<h2>Latest stable version (not Apache)</h2>
-The latest stable version of Ivy is <a href="doc/releasenotes/1.4.1.html">1.4.1</a>, and is not an Apache incubating release, but a release done while Ivy was still hosted by jayasoft:
-<ul>
-<li><a href="http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-bin.zip">binaries</a></li>
-<li><a href="http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip">sources</a></li>
-<li><a href="http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-doc.zip">documentation</a></li>
-</ul>
-
-To have a quick overview of some of the changes in this version, check the <a href="doc/releasenotes/1.4.html">1.4.1 release notes</a> page.
-
-You can also download ivy jar and ivy.xml alone directly from the jayasoft site (useful especially for easy ant setup) using the following pattern:
-http://www.jayasoft.org/downloads/ivy/[revision]/[artifact]-[revision].[ext]
-
-This is used to auto install Ivy from internet, in the <a href="doc/tutorial.html">first tutorial</a>. Take a look at these examples if you want such an auto install feature in your own builds.
-The xsd for ivy files of the version is also available online at:
-http://www.jayasoft.org/downloads/ivy/[revision]/ivy.xsd
-
-To have info about the different kind of distributions, see <a href="choose-distrib.html">that page</a>.
-For previous version information and download, see the <a href="doc/releasenotes.html">release notes page</a> in the documentation.</textarea>
+	<textarea id="xooki-source">
+<h2>Disclaimer</h2>
+<code>
+Apache Ivy is an effort undergoing incubation at The Apache Software
+Foundation (ASF). Incubation is required of all newly accepted projects
+until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with
+other successful ASF projects. While incubation status is not necessarily
+a reflection of the completeness or stability of the code, it does
+indicate that the project has yet to be fully endorsed by the ASF.
+</code>
+
+<h2>Download</h2>
+<div style="float:right;margin:10px;"><a href="http://people.apache.org/dist/incubator/ivy/2.0.0-alpha-1-incubating/"><img src="images/ivy-dl-2.0.0-alpha-1.png" style="border: none;"/></a></div>
+The first release of Ivy within the Apache Incubator, <b>2.0.0-alpha-1</b>, is now available! Check the [[doc/releasenotes/2.0.0-alpha-1 release notes]].
+
+Use the links below to download a distribution of Ivy from our repository. It is good practice to <a href="#VerifyReleases">verify the integrity</a> of the distribution files, especially if you are using one of our mirror sites. In order to do this you must use the signatures from our <a href="http://people.apache.org/dist/incubator/ivy/">main distribution directory</a>.
+
+Ivy is distributed as zip and tar.gz archives - the contents are the same. Please note that the tar.gz archives contain file names longer than 100 characters and have been created using GNU tar extensions. Thus they must be untarred with a GNU compatible version of tar.
+
+You can download Ivy binary and source distribution here:
+<code>
+http://people.apache.org/dist/incubator/ivy/
+</code>
+
+<h2>Building from source</h2>
+What you can get here at the ASF is the latest sources from the Subversion repository:
+<code>
+svn co https://svn.apache.org/repos/asf/incubator/ivy/core/trunk ivy
+</code>
+Then to build Ivy from source, assuming you have ant 1.6.2+ and a jdk 1.4+ installed, then you only need to run the following command:
+<code>
+ant jar
+</code>
+Then you will find ivy.jar in <b>build/artifact</b>.
+
+<h2>Snapshot build</h2>
+We drop snapshot builds from time to time to help people give early testing, without going into the full release process. These snapshot builds are usually built from the trunk with no other testing than our unit tests suite. Here is where they can be found:
+http://incubator.apache.org/ivy/downloads/latest/
+
+<h2><a name="VerifyReleases">Verify Releases</a></h2>
+It is essential that you verify the integrity of the downloaded files using the PGP signature or the SHA1 or MD5 checksums.  The checksums are not as strong indicators as the PGP signature.
+
+The PGP signatures can be verified using PGP or GPG.  First download the <a href="http://people.apache.org/dist/incubator/ivy/KEYS">KEYS</a> as well as the asc signature file for the particular distribution.  Make sure you get these files from the <a href="http://people.apache.org/dist/incubator/ivy/">main distribution directory</a>, rather than from a mirror. Then verify the signatures using
+
+<code>
+% pgpk -a KEYS
+% pgpv apache-ivy-2.0.0-alpha-1-incubating-bin.tar.gz.asc
+</code>
+<em>or</em>
+<code>
+% pgp -ka KEYS
+% pgp apache-ivy-2.0.0-alpha-1-incubating-bin.tar.gz.asc
+</code>
+<em>or</em>
+<code>
+% gpg --import KEYS
+% gpg --verify apache-ivy-2.0.0-alpha-1-incubating-bin.tar.gz.asc
+</code>
+
+Alternatively, you can verify the checksums on the files.  Unix programs called md5/sha1 or md5sum/sha1sum are included in many unix distributions.  *sum is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>.  Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/freeware/console/">here</a>.  <a href="http://www.slavasoft.com/fsum/">fsum</a> supports MD5 and SHA1.
+
+We highly recommend to verify the PGP signature, though.
+
+<h2>Latest stable version (not Apache)</h2>
+The latest stable version of Ivy is <a href="doc/releasenotes/1.4.1.html">1.4.1</a>, and is not an Apache incubating release, but a release done while Ivy was still hosted by jayasoft:
+<ul>
+<li><a href="http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-bin.zip">binaries</a></li>
+<li><a href="http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip">sources</a></li>
+<li><a href="http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-doc.zip">documentation</a></li>
+</ul>
+
+To have a quick overview of some of the changes in this version, check the <a href="doc/releasenotes/1.4.html">1.4.1 release notes</a> page.
+
+You can also download ivy jar and ivy.xml alone directly from the jayasoft site (useful especially for easy ant setup) using the following pattern:
+http://www.jayasoft.org/downloads/ivy/[revision]/[artifact]-[revision].[ext]
+
+This is used to auto install Ivy from internet, in the <a href="doc/tutorial.html">first tutorial</a>. Take a look at these examples if you want such an auto install feature in your own builds.
+The xsd for ivy files of the version is also available online at:
+http://www.jayasoft.org/downloads/ivy/[revision]/ivy.xsd
+
+To have info about the different kind of distributions, see <a href="choose-distrib.html">that page</a>.
+For previous version information and download, see the <a href="doc/releasenotes.html">release notes page</a> in the documentation.
+</textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>
 </html>
diff --git a/doc/images/ivy-dl-2.0.0-alpha-1.png b/doc/images/ivy-dl-2.0.0-alpha-1.png
new file mode 100644
index 00000000..3092c214
Binary files /dev/null and b/doc/images/ivy-dl-2.0.0-alpha-1.png differ
diff --git a/doc/images/ivy-dl.xcf b/doc/images/ivy-dl.xcf
new file mode 100644
index 00000000..1ba37843
Binary files /dev/null and b/doc/images/ivy-dl.xcf differ
diff --git a/doc/index.html b/doc/index.html
index 4687eab5..458f629a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -24,21 +24,21 @@
 	<script type="text/javascript" src="xooki/xooki.js"></script>
 </head>
 <body>
-	<textarea id="xooki-source">
-<table border="0" class="home">
-<tr><td colspan="4"><img src="images/ivy-lierre.png"/></td></tr>
-<tr style="font-size:xx-large;"><td colspan="4"><span style="font-size:xx-large;">The agile dependency manager</span></td></tr>
-<tr><td colspan="4" style="font-size:large; padding: 1cm 0 0.7cm 0;">Ivy is a popular dependency manager focusing on flexibility and simplicity.<br/>
-Find out more about its unique <a href="features.html">enterprise features</a>, what <a href="testimonials.html">people say about it</a>,<br/>
-and <a href="doc.html">how it can improve your build system!</a></td></tr>
-<tr class="homeitems"><td><a href="download.html"><img src="images/ivy-dl-1.4.1.png"/></a></td><td><a href="doc.html"><img src="images/ivy-book.png"/></a></td><td><a href="demo.html"><img src="images/ivy-demo.png"/></a></td><td><a href="mailing-lists.html"><img src="images/ivy-forum.png"/></a></td></tr>
-<tr class="homeitems"><td><a href="download.html">download</a></td><td><a href="doc.html">documentation<br/>& tutorials</a></td><td><a href="demo.html">demo</a></td><td><a href="mailing-lists.html">share your experience</a></td></tr>
-</table>
-<hr/><a href="">Latest News</a><table border="0" cellpadding="5">
-<tr><td>03/28/2007</td><td> <a href="http://www.jetbrains.com/teamcity/features/newfeatures.html#TeamCity_Administration_Interface_Enhancements">TeamCity</a>  integrates Ivy for dependent build management</td></tr>
-<tr><td>03/01/2007</td><td> New site menu and new look for the home page.<br/> [[mailing-lists Tell us]] what you think about it!</td></tr>
-<tr><td>01/22/2007</td><td> Ivy now builds on <a href="http://vmgump.apache.org/gump/public/ivy/ivy/index.html">gump</a>!</td></tr>
-<tr><td>01/12/2007</td><td> First <a href="http://incubator.apache.org/ivy/downloads/latest/">build with apache package names</a> available</td></tr>
+	<textarea id="xooki-source">
+<table border="0" class="home">
+<tr><td colspan="4"><img src="images/ivy-lierre.png"/></td></tr>
+<tr style="font-size:xx-large;"><td colspan="4"><span style="font-size:xx-large;">The agile dependency manager</span></td></tr>
+<tr><td colspan="4" style="font-size:large; padding: 1cm 0 0.7cm 0;">Ivy is a popular dependency manager focusing on flexibility and simplicity.<br/>
+Find out more about its unique <a href="features.html">enterprise features</a>, what <a href="testimonials.html">people say about it</a>,<br/>
+and <a href="doc.html">how it can improve your build system!</a></td></tr>
+<tr class="homeitems"><td><a href="download.html"><img src="images/ivy-dl-2.0.0-alpha-1.png"/></a></td><td><a href="doc.html"><img src="images/ivy-book.png"/></a></td><td><a href="demo.html"><img src="images/ivy-demo.png"/></a></td><td><a href="mailing-lists.html"><img src="images/ivy-forum.png"/></a></td></tr>
+<tr class="homeitems"><td><a href="download.html">download</a></td><td><a href="doc.html">documentation<br/>& tutorials</a></td><td><a href="demo.html">demo</a></td><td><a href="mailing-lists.html">share your experience</a></td></tr>
+</table>
+<hr/><a href="">Latest News</a><table border="0" cellpadding="5">
+<tr><td>04/26/2007</td><td>[[doc/releasenotes/2.0.0-alpha-1]] version available</td></tr>
+<tr><td>03/28/2007</td><td> <a href="http://www.jetbrains.com/teamcity/features/newfeatures.html#TeamCity_Administration_Interface_Enhancements">TeamCity</a>  integrates Ivy for dependent build management</td></tr>
+<tr><td>03/01/2007</td><td> New site menu and new look for the home page.<br/> [[mailing-lists Tell us]] what you think about it!</td></tr>
+<tr><td>01/22/2007</td><td> Ivy now builds on <a href="http://vmgump.apache.org/gump/public/ivy/ivy/index.html">gump</a>!</td></tr>
 </table></textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>
diff --git a/doc/samples/build-install.xml b/doc/samples/build-install.xml
new file mode 100644
index 00000000..1b89d22c
--- /dev/null
+++ b/doc/samples/build-install.xml
@@ -0,0 +1,72 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+
+<!--
+	This build script is used to download dependencies for a freshly downloaded
+	binary distribution of Ivy without dependencies.
+	
+	To use it, you only need to have this script in the directory where you
+	have unzipped your binary distribution of Ivy, and to call it using
+	ant -f build-install.xml
+	
+	If you don't want to download all optional dependencies, you can set
+	the conf attribute value in the ivy:retrieve task, to select only
+	the configuration you want (check the ivy.xml for details about
+	which configurations are available, and what they are useful for).
+-->
+<project name="ivy-bin-install" default="download-deps" 
+		xmlns:ivy="antlib:org.apache.ivy.ant">
+	<target name="init-ivy-settings">
+		<echo file="${basedir}/ivysettings.xml">
+		<![CDATA[
+<ivysettings>
+	<include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
+	<settings defaultResolver="public" />
+	<resolvers>
+		<!--  
+			we use ivyrep for ivy and some artifacts, and ibiblio for other artifacts
+			The reason for that is that commons vfs is still not released, thus we depend on an integration
+			version only available on ivyrep, but not on ivyrep
+			As soon as vfs will be available on ibiblio, the default configuration could be used again
+			-->
+		<url name="public">
+			<ivy pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/ivy-[revision].xml"/>
+			<artifact pattern="http://ivyrep.jayasoft.org/[organisation]/[module]/[revision]/[artifact].[ext]"/>
+			<artifact pattern="http://repo1.maven.org/maven/[module]/[type]s/[artifact]-[revision].[ext]"/>
+		</url>
+	</resolvers>
+</ivysettings>
+		]]>  
+		</echo>
+	</target>
+	
+	<target name="init-ivy" depends="init-ivy-settings">
+    	<path id="ivy.lib.path">
+    	    <fileset dir="${basedir}" includes="*.jar" excludes="ivy-core-*.jar"/>
+    	</path>
+    	<taskdef resource="org/apache/ivy/ant/antlib.xml"
+    	          uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+	</target>
+	
+	<target name="download-deps" depends="init-ivy">
+		<ivy:retrieve 
+				conf="*" 
+				pattern="${basedir}/lib/[conf]/[artifact]-[revision].[ext]"/>
+	</target>
+</project>
\ No newline at end of file
diff --git a/doc/toc.json b/doc/toc.json
index 9e6e6fca..406b987b 100644
--- a/doc/toc.json
+++ b/doc/toc.json
@@ -59,6 +59,21 @@
 
                 ]
             },
+            {
+              "id":"doc/releasenotes/2.0",
+              "title":"2.0",
+              "children": [
+                  {
+                    "id":"doc/releasenotes/2.0.0-alpha-1",
+                    "title":"2.0.0-alpha-1",
+                    "children": [
+
+                      ]
+,
+                    "level":3                  }
+                ]
+,
+              "level":3            },
             {
               "id":"doc/releasenotes/1.4.1",
               "title":"1.4.1",
