Merge branch 'master' of github.com:rzwitserloot/lombok

build.xml

@@ -391,6 +391,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</tar>
 	</target>
 	
+	<target name="javadoc" depends="compile, version" description="Builds javadoc into doc/api.">
+		<ant antfile="buildScripts/website.ant.xml" target="javadoc" inheritAll="false">
+			<property name="lombok.version" value="${lombok.version}" />
+		</ant>
+	</target>
+	
 	<target name="maven" depends="version, dist, test" description="Build a maven artifact bundle.">
 		<ant antfile="buildScripts/website.ant.xml" target="javadoc" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />

buildScripts/website.ant.xml

@@ -303,6 +303,7 @@ such as converting the changelog into HTML, and creating javadoc.
 		]]></echo>
 		<javadoc sourcepath="src/core" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}">
 			<classpath refid="build.path" />
+			<classpath location="build/lombok" />
 			<link href="http://download.oracle.com/javase/6/docs/api/" />
 			<link href="http://www.slf4j.org/api/" />
 			<link href="http://commons.apache.org/logging/apidocs/" />

website/setup/android.html

@@ -55,7 +55,9 @@
 				In eclipse, create a 'lightweight' lombok jar that contains only the annotations by running:
 				<pre>
 java -jar lombok.jar publicApi</pre>
-				Then, add this jar to your android project, and, as usual, install lombok into eclipse.
+				Then, add the <code>lombok-api.jar</code> file created by running this command
+				to your android project instead of the complete <code>lombok.jar</code>, and,
+				as usual, install lombok into eclipse by double-clicking <code>lombok.jar</code>.
 			</div>
 			<h3>Ant</h3>
 			<div>
@@ -70,6 +72,9 @@ java -jar lombok.jar publicApi</pre>
 			<h3>Maven</h3>
 			<div>
 				You should be able to just follow the normal <a href="../mavenrepo/index.html">lombok with maven instructions</a>.<br />
+				Note that if you use android, eclipse, and maven together you may have to replace <code>lombok.jar</code> in your eclipse android project's build path
+				(which you can modify in that project's properties page) with <code>lombok-api.jar</code>, as produced in the procedure explained for <em>Eclipse</em>,
+				above.
 			</div>
 		<div class="endBar">
 		</div>