Index: BUILDING.txt
===================================================================
--- BUILDING.txt	(revision 400216)
+++ BUILDING.txt	(working copy)
@@ -518,21 +518,24 @@
     The above command will build all classes into
     ${derby.source}/classes. If you add this directory
     in your classpath, you will have full functionality
-    of engine, tools, and network server. 
+    of engine, tools, network server, and network client. 
 
     In addition, if you would like to build the Derby test
-    framework and related files, run the following command:
+    framework, demos, and related files, run the following command:
 
-    >ant testing
+    >ant all
 
-    NOTE ABOUT building JDBC4/JDK1.6 : The JDBC4 class files have
-    dependencies on JDK 1.6.  However, to build for JDBC4, do NOT
-    set your JAVA_HOME to the JDK 1.6 location.  Instead, set it
-    to your standard JDK 1.4 or JDK 1.3 location.  In your ant.properties,
-    make sure you set jdk16 as described in section
-    2.2.4, and that is all you need to do.
+    NOTE ABOUT building JDBC4/JDK1.6 : The JDBC4 class files have dependencies
+    on JDK 1.6, but it is still required that you have the runtime classes from 
+    JDK 1.4 and JDK 1.3. However, you may set JAVA_HOME to your 1.6 installation
+    and use it for running Ant. However, even if JAVA_HOME is set to your JDK
+    1.6 installation, it is still necessary to set the jdk16 property in your
+    ant.properties as described in section 3.2. At some point in the future, 
+    JDK 1.6 will replace JDK 1.4 as the preferred JDK with which to run Ant to
+    build.
 
 
+
 (3) Run the following command to build all jars:
     
     >ant buildjars