Index: xdocs/repository-upload.xml
===================================================================
RCS file: /home/cvspublic/maven/xdocs/repository-upload.xml,v
retrieving revision 1.14
diff -u -w -r1.14 repository-upload.xml
--- xdocs/repository-upload.xml	28 Jun 2004 15:09:19 -0000	1.14
+++ xdocs/repository-upload.xml	2 Aug 2004 23:08:48 -0000
@@ -67,9 +67,9 @@
         In that case the project.xml should at least contain the following elements:
       </p>
       <ul>
-        <li>groupId</li>
-        <li>id</li>
+        <li>artifactId</li>
         <li>name</li>
+        <li>groupId</li>
         <li>currentVersion</li>
         <li>dependencies</li>
       </ul>
Index: xdocs/misc/glossary.xml
===================================================================
RCS file: /home/cvspublic/maven/xdocs/misc/glossary.xml,v
retrieving revision 1.3
diff -u -w -r1.3 glossary.xml
--- xdocs/misc/glossary.xml	22 Jul 2004 16:28:27 -0000	1.3
+++ xdocs/misc/glossary.xml	2 Aug 2004 23:23:46 -0000
@@ -88,7 +88,7 @@
             A repository is an structured storage of project artifacts. Those
             artifacts are organized under the following structure:
             <p>
-              <code>$MAVEN_REPO/project id/artifact type/project-version.extension</code>
+              <code>$MAVEN_REPO/groupId/artifact type/artifactId-version.extension</code>
             </p>
             <p>
               For instance, a Maven JAR artifact will be stored in a repository
Index: xdocs/reference/project-descriptor.xml
===================================================================
RCS file: /home/cvspublic/maven/xdocs/reference/project-descriptor.xml,v
retrieving revision 1.35
diff -u -w -r1.35 project-descriptor.xml
--- xdocs/reference/project-descriptor.xml	23 Jul 2004 04:40:08 -0000	1.35
+++ xdocs/reference/project-descriptor.xml	2 Aug 2004 23:26:11 -0000
@@ -51,7 +51,8 @@
 <a href="#project" class="required">&lt;project&gt;</a>
     <a href="#extend" class="optional">&lt;extend/&gt;</a>
     <a href="#pomVersion">&lt;pomVersion/&gt;</a>
-    <a href="#id">&lt;id/&gt;</a>
+    <a href="#artifactId">&lt;artifactId/&gt;</a>
+    <a href="#id">&lt;id/&gt;</a> <em>deprecated</em>
     <a href="#name" title="short name for the project">&lt;name/&gt;</a>
     <a href="#groupId">&lt;groupId/&gt;</a>
     <a href="#currentVersion">&lt;currentVersion/&gt;</a>
@@ -131,7 +132,7 @@
     <a href="#licenses">&lt;/licenses&gt;</a>
     <a href="#dependencies">&lt;dependencies&gt;</a>
         <a href="#dependency">&lt;dependency&gt;</a>
-            <a href="#dependency_id">&lt;id/&gt;</a>
+            <a href="#dependency_id">&lt;id/&gt;</a> <em>deprecated</em>
             <a href="#dependency_groupId">&lt;groupId/&gt;</a>
             <a href="#dependency_artifactId">&lt;artifactId/&gt;</a>
             <a href="#dependency_version">&lt;version/&gt;</a>
@@ -157,7 +158,7 @@
             <a href="#sourceModification">&lt;/sourceModification&gt;</a>
         <a href="#sourceModifications">&lt;/sourceModifications&gt;</a>
         <a href="#build_unitTestSourceDirectory">&lt;unitTestSourceDirectory/&gt;</a>
-        <a href="#build_integrationUnitTestSourceDirectory">&lt;integrationUnitTestSourceDirectory/&gt;</a>
+        <a href="#build_integrationUnitTestSourceDirectory">&lt;integrationUnitTestSourceDirectory/&gt;</a> <em>deprecated</em>
         <a href="#build_aspectSourceDirectory">&lt;aspectSourceDirectory/&gt;</a>
         <a href="#unitTest">&lt;unitTest&gt;</a>
             <a href="#unitTest_includes">&lt;includes&gt;</a>
@@ -231,14 +232,25 @@
           </td>
         </tr>
         <tr>
-          <td><a name="id">id</a></td>
+          <td><a name="artifactId">artifactId</a></td>
           <td>
-            The short name of the project.  This value is used when
+            The identifier of the project.  This value is used when
             naming <a href="plugins/java/index.html">jars</a> and <a
             href="plugins/dist/index.html">distribution files</a>.
           </td>
         </tr>
         <tr>
+          <td><a name="id">id</a></td>
+          <td>
+            The identifier of the project.
+            <p>
+              <strong>Note:</strong> The use of the id element is
+              <em>deprecated</em>. Please use <a href="#artifactId">artifactId</a>
+              instead.
+            </p>
+          </td>
+        </tr>
+        <tr>
           <td><a name="name">name</a></td>
           <td>
             The full name of the project.  This value is used when
@@ -968,7 +980,7 @@
         <tr>
           <td><a name="build_integrationUnitTestSourceDirectory">integrationUnitTestSourceDirectory</a></td>
           <td>
-            This element is <em>deprecated</em> and should no longer be used.
+            <strong>Note:</strong> This element is <em>deprecated</em> and should no longer be used.
             Initially it was used by the first Cactus plugin. Now
             the location of the Cactus test sources is defined
             through a plugin property. See the
Index: xdocs/reference/user-guide.xml
===================================================================
RCS file: /home/cvspublic/maven/xdocs/reference/user-guide.xml,v
retrieving revision 1.71
diff -u -w -r1.71 user-guide.xml
--- xdocs/reference/user-guide.xml	24 Jul 2004 17:03:48 -0000	1.71
+++ xdocs/reference/user-guide.xml	2 Aug 2004 23:28:45 -0000
@@ -1470,7 +1470,6 @@
 
 <source><![CDATA[
 <project>
-  <groupId>bar</groupId>
   <artifactId>foo</artifactId>
   ...
 </project>
@@ -1490,7 +1489,6 @@
 
 <source><![CDATA[
 <project>
-  <groupId>bar</groupId>
   <artifactId>foo</artifactId>
   <name>The Grand Master Foo</name>
   ...
@@ -1504,9 +1502,9 @@
 
 <source><![CDATA[
 <project>
-  <groupId>bar</groupId>
   <artifactId>foo</artifactId>
   <name>The Grand Master Foo</name>
+  <groupId>bar</groupId>
   ...
 </project>
 ]]></source>
@@ -1539,9 +1537,9 @@
 
 <source><![CDATA[
 <project>
-  <groupId>yourProject</groupId>
   <artifactId>yourArtifact</artifactId>
   <name>Your Groovey Machine</name>
+  <groupId>yourProject</groupId>
   ...
 
   <dependencies>
@@ -1577,10 +1575,10 @@
         <p>
           <ul>
             <li>
-              The project id is not used as the base name of the published
+              The project artifactId is not used as the base name of the published
               JAR e.g. the Xerces products where xercesImpl is the base name
               of the published JAR. It neither matches the gump id or the
-              maven id.
+              maven artifactId.
             </li>
             <li>
               The published JAR name has no version declaration e.g. many of
@@ -1588,7 +1586,7 @@
               published JAR names.
             </li>
             <li>
-              The project id is not used as the base name of the published JAR and
+              The project artifactId is not used as the base name of the published JAR and
               the published JAR name has no version declaration e.g. the worst
               case scenerio which is the Java Activation Framework JAR which
               doesn't even vaguely follow other Sun naming conventions and there is no
@@ -1672,8 +1670,8 @@
       <p>
         Every separate project has its own directory in the repository where
         artifacts for that project can be stored. Each project has a unique
-        project id and directory where a project stores its artifacts is named
-        after the project id.
+        project groupId and directory where a project stores its artifacts is named
+        after the project groupId.
       </p>
 
       <p>
Index: xdocs/reference/developers/developer-guide.xml
===================================================================
RCS file: /home/cvspublic/maven/xdocs/reference/developers/developer-guide.xml,v
retrieving revision 1.7
diff -u -w -r1.7 developer-guide.xml
--- xdocs/reference/developers/developer-guide.xml	22 Jul 2004 16:28:27 -0000	1.7
+++ xdocs/reference/developers/developer-guide.xml	2 Aug 2004 23:11:57 -0000
@@ -77,7 +77,7 @@
  
 &lt;project&gt; 
     &lt;pomVersion&gt;3&lt;/pomVersion&gt; 
-    &lt;id&gt;maven-hello-plugin&lt;/id&gt; 
+    &lt;artifactId&gt;maven-hello-plugin&lt;/artifactId&gt;
     &lt;name&gt;Maven hello world plugin&lt;/name&gt; 
     &lt;currentVersion&gt;1.0.0&lt;/currentVersion&gt; 
     &lt;organization&gt; 
@@ -100,7 +100,8 @@
     &lt;dependencies&gt; 
 &lt;!-- 
         &lt;dependency&gt; 
-            &lt;id&gt;commons-logging&lt;/id&gt; 
+            &lt;groupId&gt;commons-logging&lt;/groupId&gt; 
+            &lt;artifactId&gt;commons-logging&lt;/artifactId&gt;
             &lt;version&gt;1.0.3&lt;/version&gt; 
         &lt;/dependency&gt; 
 --&gt; 
Index: xdocs/start/integrate.xml
===================================================================
RCS file: /home/cvspublic/maven/xdocs/start/integrate.xml,v
retrieving revision 1.26
diff -u -w -r1.26 integrate.xml
--- xdocs/start/integrate.xml	22 Jul 2004 16:28:26 -0000	1.26
+++ xdocs/start/integrate.xml	2 Aug 2004 23:12:31 -0000
@@ -69,7 +69,7 @@
         <source><![CDATA[<?xml version="1.0"?>
 <project>
   <pomVersion>3</pomVersion>
-  <id>maven</id>
+  <artifactId>maven</artifactId>
   <name>Maven</name>
   <currentVersion>1.0.1-SNAPSHOT</currentVersion>
   <organization>