diff --git a/features/org.eclipse.rcp/rootfiles/readme/readme_eclipse.html b/features/org.eclipse.rcp/rootfiles/readme/readme_eclipse.html
index d6fe718..5cac4da 100644
--- a/features/org.eclipse.rcp/rootfiles/readme/readme_eclipse.html
+++ b/features/org.eclipse.rcp/rootfiles/readme/readme_eclipse.html
@@ -55,7 +55,7 @@
   </p>
 </blockquote>
 
-<h2>1. <a name="TargetOperatingEnvironments"></a>Target Operating Environments</h2>
+<h2 id="TargetOperatingEnvironments">1. Target Operating Environments</h2>
 <p>In order to remain current, each Eclipse Project release targets reasonably current
   operating environments.</p>
 <p>Most of the Eclipse SDK is &quot;pure&quot; Java code and has no direct dependence
@@ -260,7 +260,7 @@
   on Windows, Linux and the Macintosh.</p>
 <p>German and Japanese locales are tested.</p>
 
-<h2>2. <a name="Compatibility"></a>Compatibility with Previous Releases</h2>
+<h2 id="Compatibility">2. Compatibility with Previous Releases</h2>
 <h3>Compatibility of Release 4.5 with 4.4</h3>
 <p>Eclipse 4.5 is compatible with Eclipse 4.4 (and all earlier 3.x versions).</p>
 
@@ -325,7 +325,7 @@
     <em>How to Use the Eclipse API</em>
   </a> for information about how to write compliant plug-ins. </p>
 
-<h2>3. <a name="KnownIssues"></a> Known Issues</h2>
+<h2 id="KnownIssues">3. Known Issues</h2>
 <blockquote>
   <a href="#I-General">
   3.1 General problems</a><br/>
@@ -353,9 +353,9 @@
 </blockquote>
 <p>Note: Bug numbers refer to the Eclipse project bug database at <a href="http://dev.eclipse.org/bugs/">http://bugs.eclipse.org/bugs/</a></p>
 
-<h3>3.1 <a name="I-General">General problems</a></h3>
+<h3 id="I-General">3.1 General problems</h3>
 
-<h3>3.1.1 <a name="I-General-Startup">General - Startup</a></h3>
+<h3 id="I-General-Startup">3.1.1 General - Startup</h3>
 <h4>Installation/Configuration issues that can cause Eclipse to fail start</h4>
 <p>Here are some common problems that can cause Eclipse not to start:</p>
 <ul>
@@ -406,7 +406,7 @@
 on addressing this VM problem.
 </p>
 
-<h3>3.1.2 <a name="I-General-GCJ">General - GCJ</a></h3>
+<h3 id="I-General-GCJ">3.1.2 General - GCJ</h3>
 <p>GCJ is an effort by the GCC team to provide an open source Java compiler and
 runtime environment to interpret Java bytecode. Unfortunately, the GCJ runtime
 environment is not an environment that is often tested on by Eclipse developers.</p>
@@ -497,7 +497,7 @@
 and/or <a href="https://bugs.eclipse.org/bugs/">bugzilla</a>.
 </p>
 
-<h3>3.1.3 <a name="I-General-64bitJava">General - 64-bit Java HotSpot(TM) VM</a></h3>
+<h3 id="I-General-64bitJava">3.1.3 General - 64-bit Java HotSpot(TM) VM</h3>
 <p>
 There is a known issue with the Java HotSpot(TM) 1.6.0 VM compiler which causes eclipse to 
 crash (see Sun bug <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100">http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100</a>,
@@ -539,9 +539,9 @@
 disable the compiler with the VM arg &quot;-Xint&quot;. 
 </p>
 
-<h3>3.2 <a name="I-Platform">Platform</a></h3>
+<h3 id="I-Platform">3.2 Platform</h3>
 
-<h3>3.2.1 <a name="I-Platform-Core">Platform - Core</a></h3>
+<h3 id="I-Platform-Core">3.2.1 Platform - Core</h3>
 
 <h4>Installing plug-ins by unzipping them into the plugins directory</h4>
 <p>New plug-ins can be installed into the system by unzipping them into the plugins
@@ -662,7 +662,7 @@
 }
 </pre>
 
-<h3>3.2.2 <a name="I-Platform-Ant">Platform - Ant</a></h3>
+<h3 id="I-Platform-Ant">3.2.2 Platform - Ant</h3>
 <h4> Custom Ant tasks and Ant types must be separate from plug-in library JARs</h4>
 <p>Including the class files for custom Ant tasks or Ant types in the regular
 code JAR for your plug-in causes problems. These class files must be provided in
@@ -711,7 +711,7 @@
 and the <a href="http://ant.apache.org/manual/install.html#optionalTasks">Optional Tasks</a> section in the Ant manual. 
 </p>
 
-<h3>3.2.3 <a name="I-Platform-User-Assistance">Platform - User Assistance</a></h3>
+<h3 id="I-Platform-User-Assistance">3.2.3 Platform - User Assistance</h3>
 <h4>Welcome page not displayed properly (Linux/Unix)</h4>
 <p>The default Welcome implementation is HTML-based and requires a supported browser
 in order to work. If no supported browser can be found, Welcome falls back to its
@@ -793,10 +793,10 @@
 (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=359778">359778</a>)
 </p>
 
-<h3>3.2.5 <a name="I-Platform-Text">Platform - Text</a></h3>
+<h3 id="I-Platform-Text">3.2.5 Platform - Text</h3>
 None.
 
-<h3>3.2.6 <a name="I-Platform-SWT">Platform - SWT</a></h3>
+<h3 id="I-Platform-SWT">3.2.6 Platform - SWT</h3>
 <h4>SWT Browser widget crashes when run with XULRunner 31 run-time (Linux only)</h4>
 <p>Creation of an SWT Mozilla style Browser with XULRunner 31 run-time crashes on Linux.
 The workaround is to use other supported XULRunner run-times or webkit which is the default on Linux.
@@ -895,7 +895,7 @@
 </p>
 
 
-<h3>3.2.7 <a name="I-Platform-Team-CVS">Platform - Team - CVS</a></h3>
+<h3 id="I-Platform-Team-CVS">3.2.7 Platform - Team - CVS</h3>
 <p>The following are known problems with the CVS repository provider only, and
 do not apply to other repository providers. Additional information on how to use
 CVS from Eclipse can be found in the <a href="https://wiki.eclipse.org/CVS_FAQ">Eclipse
@@ -952,7 +952,7 @@
 <code>"-Dorg.eclipse.core.net.enableGnome"</code> switch. That is,</p>
 <pre>eclipse -Dorg.eclipse.core.net.enableGnome</pre>
 
-<h3>3.2.8 <a name="I-Platform-Install-Update">Platform - Install/Update</a></h3>
+<h3 id="I-Platform-Install-Update">3.2.8 Platform - Install/Update</h3>
 <h4>Manually installing features and plug-ins on a FAT file system (Windows only)</h4>
 
 <p>When features and plug-ins are manually installed on top of an Eclipse-based
@@ -974,14 +974,14 @@
 install. On a second startup using the same install path, the extension location 
 is added again (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=95403">95403</a>). <br/></p>
 
-<h3>3.2.9 <a name="I-Platform-Debug">Platform - Debug</a></h3>
+<h3 id="I-Platform-Debug">3.2.9 Platform - Debug</h3>
 <p>None. (Known problems with the Java debugger appear below in the <a href="#I-JDT">JDT</a>
 section.)</p>
 
-<h3>3.2.10 <a name="I-Platform-Compare">Platform - Compare</a></h3>
+<h3 id="I-Platform-Compare">3.2.10 Platform - Compare</h3>
 <p>None.</p>
 
-<h3>3.3 <a name="I-JDT">Java development tools (JDT)</a></h3>
+<h3 id="I-JDT">3.3 Java development tools (JDT)</h3>
 
 <h4>Multiple regions formatting in a given source snippet</h4>
 In version 3.4, the API method <code>org.eclipse.jdt.core.formatter.CodeFormatter.format(int, String, IRegion[], int, String)</code>
@@ -1127,14 +1127,6 @@
 processes in the OS may not be properly cleaned up. If a debug target has no
 suspended threads, termination works properly. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=1631">1631</a>)
 
-<h4>Java 6 and MacOS</h4>
-Apple JavaSE-1.6 VMs only execute on 64-bit architectures but JDT will detect 1.6 VMs installed on 32-bit
-architectures when a new workspace is started or when the user presses the &quot;Search...&quot; button
-on the Installed JREs preference page. Error messages will appear in the log each time JDT attempts to
-determine which execution environments a 1.6 VM is compatible with. JDT can be configured to ignore 1.6
-JREs by removing them from the Installed JREs preference page.
-(bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=262542">262542</a>)
-
 <h4>Java Annotation Processing</h4>
 <p>Some methods in the processing API are unimplemented when compiling within the IDE, and will
 throw <code>UnsupportedOperationException</code>.</p>
@@ -1155,7 +1147,7 @@
 used, the Java Search might miss matches located in such a folder. To avoid this kind of problem, it is strongly advised to use different
 folders for sources and binary classes. (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=309903">309903</a>)</p>
 
-<h3>3.4 <a name="I-PDE">Plug-in Development Environment (PDE)</a></h3>
+<h3 id="I-PDE">3.4 Plug-in Development Environment (PDE)</h3>
 <h4>Feature manifest editor does not preserve all comments</h4>
 
 <p>When a non-source page of the feature manifest editor is used, PDE will convert
@@ -1226,7 +1218,7 @@
 (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=402393">402393</a>)
 </p>
 
-<h2>4. <a name="RunningEclipse">Running Eclipse</a></h2>
+<h2 id="RunningEclipse">4. Running Eclipse</h2>
 <p>After installing the Eclipse SDK in a directory, you can start the Workbench
 by running the Eclipse executable included with the release (you also need a Java SE 7
 JRE, not included with the Eclipse SDK). On Windows, the executable file is called <samp>eclipse.exe</samp>,
@@ -1302,12 +1294,12 @@
 <p>Opening this shortcut launches Eclipse. (You can drag the shortcut to the 
 Windows Desktop if you want to keep it in easy reach.)</p>
 
-<h3><a name="macosx">Mac OS X</a></h3>
+<h3 id="macosx">Mac OS X</h3>
 <p>On Mac OS X, you start Eclipse by double clicking the Eclipse application. If you need to 
 pass arguments to Eclipse, you'll have to edit the <code>eclipse.ini</code> file
 inside the Eclipse application bundle: select the Eclipse application bundle icon while holding down the Control Key.
 This will present you with a popup menu. Select &quot;Show Package Contents&quot; in the popup menu.
-Locate <code>eclipse.ini</code> file in the <code>Contents/MacOS</code> sub-folder and open it with your favorite text editor to edit the command line options.
+Locate <code>eclipse.ini</code> file in the <code>Contents/Eclipse</code> sub-folder and open it with your favorite text editor to edit the command line options.
 </p>
 
 <p>
@@ -1319,15 +1311,15 @@
 the same time (bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=139319">139319</a>).
 </p>
 
-<p>If you need to launch Eclipse from the command line, you can use the symbolic link &quot;eclipse&quot; in the
-top-level eclipse folder. It refers to the eclipse executable inside the application bundle and takes
+<p>If you need to launch Eclipse from the command line, you can create a symbolic link such as &quot;eclipse&quot;. 
+It should point to the eclipse executable inside the application bundle and takes
 the same arguments as &quot;eclipse.exe&quot; on other platforms. 
 </p>
 <p>On Mac OS X 10.4 and later, you may notice a slow down when working with significant
 numbers of resources if you allow Spotlight to index your workspace. To prevent this, start
 System Preferences, select the Spotlight icon, then the Privacy tab, then click the Add button
 (&quot;+&quot;) and find your workspace directory in the dialog that appears.</p>
-<h3><a name="SharedInstall">Shared Install</a></h3>
+<h3 id="SharedInstall">Shared Install</h3>
 <p>The startup speed of a shared install can be improved if proper cache information is stored in the shared 
 install area. To achieve this, after unzipping Eclipse distribution, run Eclipse once with the &quot;-initialize&quot; 
 option from an account that has a write access to the install directory. 
@@ -1396,8 +1388,8 @@
 aware of any install-time failure to resolve dependencies.
 </p>
 
-<h2>6. <a name="InteroperabilityWithPreviousReleases">Interoperability with
-Previous Releases</a></h2>
+<h2 id="InteroperabilityWithPreviousReleases">6. Interoperability with
+Previous Releases</h2>
 <h3>6.1 Interoperability of Release 4.5 with previous releases</h3>
 <h4>Sharing projects between heterogeneous Eclipse 4.5 and 4.4</h4>
 <p>Special care is required when a project in a team repository is being loaded
@@ -1479,7 +1471,7 @@
 of others.</p>
 <p>(c) Copyright Eclipse Contributors 2009, 2015</p>
 
-<h2><a name="appendix">Appendix 1: Execution Environment by Bundle</a></h2>
+<h2 id="appendix">Appendix 1: Execution Environment by Bundle</h2>
 
 <!-- 
      Remember, the URL to appendix link must be full URL, since some may be