Updated Eclipse plugin installation instructions for JBoss Tools 4.4.1
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 95cf13c..efb7a4a 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -366,44 +366,50 @@
<td>Syntax highlight, syntax error marker, code completion for
macro names and bean property names.</td>
- <td><para>This is developed as part of the JBoss Tools
- Project.</para><para>Currently (2016-04-23, FreeMarker 2.3.24)
- it's highly recommended to install the nightly version instead of
- the official stable. For that, in Eclipse, go to
- <quote>Help</quote> / <quote>Install New Software...</quote>, and
- copy-paste
- http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-freemarker_master/latest/all/repo/
- into the <quote>Work with</quote> field. Then expand the check box
+ <td><para>This is developed as part of <link
+ xlink:href="http://tools.jboss.org/">JBoss
+ Tools</link>.</para><para>On Eclipse <emphasis>Neon</emphasis> or
+ later, go to <quote>Help</quote> / <quote>Eclipse
+ Marketplace...</quote>, search for <quote>JBoss Tools</quote>
+ (should give version 4.<emphasis role="bold">4</emphasis>.1 or
+ later), <quote>Install</quote>. A tree of check boxes will appear,
+ uncheck all (by unchecking the root) except <quote>FreeMarker
+ IDE</quote>.</para><para>On Eclipse <emphasis>Mars or
+ Luna</emphasis>, you should still install the <quote>FreeMarker
+ IDE</quote> plugin from JBoss Tool 4.<emphasis
+ role="bold">4</emphasis>.1 or later, but the Eclipse Marketplace
+ won't show it it. So in Eclipse, go to <quote>Help</quote> /
+ <quote>Install New Software...</quote>, and copy-paste
+ http://download.jboss.org/jbosstools/neon/stable/updates/ into the
+ <quote>Work with</quote> field. While this URL is for Eclipse
+ Neon, the <quote>FreeMarker IDE</quote> component under it works
+ on Eclipse Mars too (maybe even on Luna). So expand the check box
tree appearing below, and select <quote>FreeMarker IDE</quote>
- only, then <quote>Next</quote>, <quote>Next</quote>,
- <quote>Finish</quote>. This version works for Eclipse Mars too
- (probably even for Luna), despite that it's in the Neon branch of
- JBoss IDE.</para><para>Official stable version (not recommended at
- the moment - see above): In Eclipse, <quote>Help</quote> /
- <quote>Eclipse Marketplace...</quote>, search for <quote>JBoss
- Tools</quote>, <quote>Install</quote>. A tree of check boxes will
- appear, uncheck all (by unchecking the root) except
- <quote>FreeMarker IDE</quote>. (On older Eclipse you may have to
- use the <link xlink:href="http://tools.jboss.org/downloads/">JBoss
- Tools download page</link> instead.)</para><para>Note: If the
- plugin comes with a different FreeMarker version than the one your
- application uses, it will mark the usage of too fresh language
- features as errors, or the other way around. To fix this, find
- <literal>freemarker*.jar</literal> inside the installed plugin,
- under <literal><userHome>/.eclipse/</literal> or under the
- Eclipse installation directory (you may need to search inside
+ only. Don't left any other components checked. Then
+ <quote>Next</quote>, <quote>Next</quote>,
+ <quote>Finish</quote>.</para><para>Report bugs found on the <link
+ xlink:href="https://issues.jboss.org/issues/?jql=project%20%3D%20JBIDE%20AND%20component%20%3D%20freemarker">bug
+ tracker of the JBoss Tools project</link> (Key:
+ <literal>JBIDE</literal>; Component:
+ <literal>freemarker</literal>), and help to make the plugin better
+ <link
+ xlink:href="https://github.com/jbosstools/jbosstools-freemarker">on
+ GitHub</link>!</para><para>To install the nightly development
+ version, use this Eclipse update site:
+ http://download.jboss.org/jbosstools/neon/snapshots/builds/jbosstools-freemarker_master/latest/all/repo/
+ </para><para>Note: If the plugin comes with an older FreeMarker
+ version than the one your application uses, it will mark the usage
+ of too fresh language features as errors, or the other way around.
+ To fix this, find <literal>freemarker*.jar</literal> inside the
+ installed plugin, under
+ <literal><userHome>/.eclipse/</literal> or under the Eclipse
+ installation directory (you may need to search inside
<literal>jar</literal>-s). Exit Eclipse, and overwrite it with the
<literal>freemarker.jar</literal> you want, but keep the file name
of the replaced <literal>jar</literal>. You may also need to find
and delete the extracted OSGi bundle under
<literal>configuration\org.eclipse.osgi</literal> for the changes
- to take effect.</para><para>Report bugs found on the <link
- xlink:href="https://issues.jboss.org/issues/?jql=project%20%3D%20JBIDE%20AND%20component%20%3D%20freemarker">bug
- tracker of the JBoss Tools project</link> (Key:
- <literal>JBIDE</literal>; Component:
- <literal>freemarker</literal>), and help to make it better <link
- xlink:href="https://github.com/jbosstools/jbosstools-freemarker">on
- GitHub</link>!</para></td>
+ to take effect.</para></td>
</tr>
<tr>