--- a/build.xml	Tue Nov 24 11:37:34 2009 +0100
+++ b/build.xml	Tue Nov 24 11:58:14 2009 +0100
@@ -4,20 +4,20 @@
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contain the path to the SDK. It should *NOT* be checked in in Version
          Control Systems. -->
-    <property file="local.properties"/>
+    <property file="local.properties" />
 
     <!-- The build.properties file can be created by you and is never touched
          by the 'android' tool. This is the place to change some of the default property values
          used by the Ant rules.
          Here are some properties you may want to change/update:
 
-         application-package
+         application.package
              the name of your application package as defined in the manifest. Used by the
              'uninstall' rule.
-         source-folder
-             the name of the source folder. Default is 'src'.
-         out-folder
-             the name of the output folder. Default is 'bin'.
+         source.dir
+             the name of the source directory. Default is 'src'.
+         out.dir
+             the name of the output directory. Default is 'bin'.
 
          Properties related to the SDK location or the project target should be updated
           using the 'android' tool with the 'update' action.
@@ -26,41 +26,44 @@
          should be checked in in Version Control Systems.
 
          -->
-    <property file="build.properties"/>
+    <property file="build.properties" />
 
     <!-- The default.properties file is created and updated by the 'android' tool, as well
-         as ADT. 
+         as ADT.
          This file is an integral part of the build system for your application and
          should be checked in in Version Control Systems. -->
-    <property file="default.properties"/>
+    <property file="default.properties" />
 
     <!-- Custom Android task to deal with the project target, and import the proper rules.
          This requires ant 1.6.0 or above. -->
     <path id="android.antlibs">
-        <pathelement path="${sdk-location}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
     </path>
 
     <taskdef name="setup"
         classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs"/>
+        classpathref="android.antlibs" />
 
     <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the rules files.
-         To customize the rules, copy/paste them below the task, and disable import by setting
-         the import attribute to false:
-            <setup import="false" />
-         
+         and import the build rules files.
+
+         The rules file is imported from
+            <SDK>/platforms/<target_platform>/templates/android_rules.xml
+
+         To customize some build steps for your project:
+         - copy the content of the main node <project> from android_rules.xml
+         - paste it in this build.xml below the <setup /> task.
+         - disable the import by changing the setup task below to <setup import="false" />
+
          This will ensure that the properties are setup correctly but that your customized
-         targets are used.
+         build steps are used.
     -->
     <setup />
 
-    <property name="out.dir" value="bin" />
-    <property name="source.dir" value="src" />
     <property name="javadoc.output" value="doc/javadoc" />
     <property name="external.libs.dir" value="libs" />