Merge branch 'master' into eclipse-javadoc

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	test/core/src/lombok/RunTestsViaEcj.java

5 files changed, 14 insertions, 2 deletions

diff --git a/website/resources/img/eclipse-p2-step1.png b/website/resources/img/eclipse-p2-step1.png
new file mode 100644
index 00000000..92cdef86
--- /dev/null
+++ b/website/resources/img/eclipse-p2-step1.png
diff --git a/website/resources/img/eclipse-p2-step2.png b/website/resources/img/eclipse-p2-step2.png
new file mode 100644
index 00000000..84139ad8
--- /dev/null
+++ b/website/resources/img/eclipse-p2-step2.png
diff --git a/website/templates/features/Builder.html b/website/templates/features/Builder.html
index f9897d03..1b6c6e62 100644
--- a/website/templates/features/Builder.html
+++ b/website/templates/features/Builder.html
@@ -132,7 +132,7 @@
 				</li>
 			</ul>
 		</p><p>
-			If your identifiers are written in common english, lombok assumes that the name of any collection with <code>@Singular</code> on it is an english plural and will attempt to automatically singularize that name. If this is possible, the add-one method will use this name. For example, if your collection is called <code>statuses</code>, then the add-one method will automatically be called <code>status</code>. You can also specify the singular form of your identifier explictly by passing the singular form as argument to the annotation like so: <code>@Singular("axis") List&lt;Line&gt; axes;</code>.<br />
+			If your identifiers are written in common english, lombok assumes that the name of any collection with <code>@Singular</code> on it is an english plural and will attempt to automatically singularize that name. If this is possible, the add-one method will use this name. For example, if your collection is called <code>statuses</code>, then the add-one method will automatically be called <code>status</code>. You can also specify the singular form of your identifier explicitly by passing the singular form as argument to the annotation like so: <code>@Singular("axis") List&lt;Line&gt; axes;</code>.<br />
 			If lombok cannot singularize your identifier, or it is ambiguous, lombok will generate an error and force you to explicitly specify the singular name.
 		</p><p>
 			The snippet below does not show what lombok generates for a <code>@Singular</code> field/parameter because it is rather complicated. You can view a snippet <a href="builderSingular">here</a>.
diff --git a/website/templates/setup/eclipse.html b/website/templates/setup/eclipse.html
index 85304c83..d9621501 100644
--- a/website/templates/setup/eclipse.html
+++ b/website/templates/setup/eclipse.html
@@ -23,4 +23,16 @@
 			<img src="/img/eclipse-about.png" />
 		</p>
 	</@s.introduction>
+	<@s.section title="Via eclipse plugin installer">
+		<em>WARNING: This plugin installer is currently unsigned, and we have given up on figuring out how to fix that; if team eclipse or somebody else can help us out, we're all ears!</em>
+		<p>
+			You can install lombok directly from within eclipse, and in that way, you can also include lombok as part of your team eclipse deployment configuration. To do this, use
+			update site <code>https://projectlombok.org/p2</code>:<br />
+			<br />
+			<img width="448" height="431" src="/img/eclipse-p2-step1.png" /><br />
+			<br />
+			<br />
+			<img width="626" height="216" src="/img/eclipse-p2-step2.png" />
+		</p>
+	</@s.section>
 </@s.scaffold>
diff --git a/website/templates/setup/kobalt.html b/website/templates/setup/kobalt.html
index 26adf23d..beb60d8c 100644
--- a/website/templates/setup/kobalt.html
+++ b/website/templates/setup/kobalt.html
@@ -3,7 +3,7 @@
 <@s.scaffold title="Kobalt">
 	<@s.introduction>
 		<p>
-			To set up lombok with any build tool, you have to specify that the lombok dependency is required to compile your source code, but does not need to be present when running/testing/jarring/otherwise deploying your code. Generally this is called a 'provided' dependency. This page explains how to integrate lombok with the <a href="http://beust.com/kobalt/home/index.html">Kobalt</a> buid tool.
+			To set up lombok with any build tool, you have to specify that the lombok dependency is required to compile your source code, but does not need to be present when running/testing/jarring/otherwise deploying your code. Generally this is called a 'provided' dependency. This page explains how to integrate lombok with the <a href="http://beust.com/kobalt/home/index.html">Kobalt</a> build tool.
 		</p><p>
 			Lombok is available in maven central, so telling Kobalt to download lombok is easy.
 		</p>