more cleansing

8 files changed, 26 insertions, 49 deletions

diff --git a/bundles/org.eclipse.pde.doc.user/whatsNew/images/pdeIcons.png b/bundles/org.eclipse.pde.doc.user/whatsNew/images/pdeIcons.png
deleted file mode 100644
index 42f95dcb1..000000000
--- a/bundles/org.eclipse.pde.doc.user/whatsNew/images/pdeIcons.png
+++ /dev/null
diff --git a/bundles/org.eclipse.pde.doc.user/whatsNew/images/target-statusbar.png b/bundles/org.eclipse.pde.doc.user/whatsNew/images/target-statusbar.png
deleted file mode 100644
index 9dcf35b25..000000000
--- a/bundles/org.eclipse.pde.doc.user/whatsNew/images/target-statusbar.png
+++ /dev/null
diff --git a/bundles/org.eclipse.pde.doc.user/whatsNew/images/trace-output.png b/bundles/org.eclipse.pde.doc.user/whatsNew/images/trace-output.png
deleted file mode 100644
index 9d3acc43c..000000000
--- a/bundles/org.eclipse.pde.doc.user/whatsNew/images/trace-output.png
+++ /dev/null
diff --git a/bundles/org.eclipse.pde.doc.user/whatsNew/pde_whatsnew.html b/bundles/org.eclipse.pde.doc.user/whatsNew/pde_whatsnew.html
index 3c1d3135b..7f0f9dab1 100644
--- a/bundles/org.eclipse.pde.doc.user/whatsNew/pde_whatsnew.html
+++ b/bundles/org.eclipse.pde.doc.user/whatsNew/pde_whatsnew.html
@@ -53,9 +53,9 @@
   </tr>
   
   <tr id="api-tag-visibility">
-    <td class="title">API Tools javadoc tag visibility matches Java Language Specification</td>
+    <td class="title">API Tools Javadoc tag visibility matches Java Language Specification</td>
     <td class="content">
-     API Tools supports API restrictions using <a href="http://wiki.eclipse.org/PDE/API_Tools/Javadoc_Tags">javadoc tags</a> such as 
+     API Tools supports API restrictions using <a href="http://wiki.eclipse.org/PDE/API_Tools/Javadoc_Tags">Javadoc tags</a> such as 
      @noextend and @noreference. The API Tools builder has an option to add problem markers for invalid use of the tags. The
      logic to check whether a tag is valid has been upgraded and now follows the visibility rules in the 
      <a href="http://docs.oracle.com/javase/specs/">Java Language Specification (JLS)</a>.
@@ -76,7 +76,7 @@
           API Tools now provides support for using annotations to describe your API usage. Prior to the new annotation support you would have, for example,
           used the <code>@noreference</code> Javadoc tag to indicate noone should use the tagged type / member. Now you can add the <code>@NoReference</code>
           annotation (in Java 1.5+ source) to the member directly without the need for Javadoc.
-      <img src="images/annotation-example.png" alt="The @NoExtend annotation being used on a class"/>
+      <p><img src="images/annotation-example.png" alt="The @NoExtend annotation being used on a class"/></p>
       <p>
         To make the transition from Javadoc tags to the new annotation support, API Tools provides a conversion wizard that is found 
         using the <strong>Plug-in Tools &gt; Convert API Tools Javadoc tags...</strong> command for a selected project. The wizard can convert all existing Javadoc tags to their annotation
@@ -111,10 +111,13 @@
   <tr id="target-statusbar">
     <td class="title">Display target platform in the status bar</td>
     <td class="content">
-     You can now have target platform information displayed in the workbench status bar.  Currently it displays the active target
-     name and double clicking on it will open the <b>Target Platform</b> preference page. This feature can be enabled on the
-     <b>General &gt; Plug-in Development</b> preference page.
-     <p><img src="images/target-statusbar.png" alt="Target platform in the status bar"/></p>
+     You can now have target platform information displayed in the workbench status bar. The active target
+     name is shown, and the icon reveals problems with the target platform (if any).
+     Double-clicking on it will open the <b>Target Platform</b> preference page.
+     
+     <p>This feature can be enabled on the
+     <b>General &gt; Plug-in Development</b> preference page.</p>
+     <p><img src="images/target-status.png" alt="The target platform state in the status bar showing an error"/></p>
     </td>
   </tr>
   
@@ -123,6 +126,8 @@
     <td class="content">
      The tracing options provided by PDE UI can now be enabled from the <b>General &gt; Tracing</b> preference page:
      <p><img src="images/pde-tracing.png" alt="PDE tracing options"/></p>
+     You can choose to have the output of debug trace statements being written to a file or
+     sent to the standard output stream.
     </td>
   </tr>
   
@@ -144,27 +149,6 @@
     </td>
   </tr>
   
-  <tr id="target-status">
-    <td class="title">Updated target platform state in the status bar</td>
-    <td class="content">
-          In 4.4 you could add the target platform indicator to the status bar allowing easy access to the preferences to customize it. Now this 
-          indicator has been updated to show problems with the target platform (if any). The state of the target platform is immediately apparent based on its 
-          icon / decoration and any problems are added to the tooltip.
-      <img src="images/target-status.png" alt="The target platform state in the status bar showing an error"/>
-    </td>
-  </tr>
-  
-  <tr id="trace-std-out">
-    <td class="title">Print debug trace to the standard output stream</td>
-    <td class="content">
-      On the <b>General &gt; Tracing</b> preference page you can now choose to have the output of debug trace statements
-      being sent to the standard output stream.
-      <p>
-      <img src="images/trace-output.png" alt="The tracing preference page with output to standard output stream option"/>
-      </p>
-    </td>
-  </tr>
-  
   <tr id="os-arch-system-props">
     <td class="title">Products can specify OS/arch system properties</td>
     <td class="content">
@@ -180,7 +164,7 @@
     <td class="title">Products can specify OS/arch launch arguments</td>
     <td class="content">
       In the <b>Product Editor</b> you can now add program and VM arguments to all platforms, a specific operating system or
-      a specific architecture/OS combination. A preview area shows the complete list of arguments that will apply to the selected
+      a specific OS/architecture combination. A preview area shows the complete list of arguments that will apply to the selected
       OS and architecture.
       <p>
       <img src="images/osarch-args.png" alt="The product editor showing os/arch vm arguments"/>
@@ -242,16 +226,6 @@ org.eclipse.equinox.p2.reconciler.dropins@start</pre>
     </td>
   </tr>
   
-  <tr id="pdeNewIcons"> 
-    <td class="title">New eclipse launcher icons</td>
-    <td class="content">
-       PDE has a new set of icons used in preference pages, launch configurations and editors.  These new icons match the new platform icons.
-       <p><img src="images/pdeIcons.png" alt="New PDE launcher icons"/></p>
-    </td>
-  </tr>
-
-
-  
   
   <!-- ******************** Misc ********************** -->
   <tr>
diff --git a/bundles/org.eclipse.platform.doc.isv/whatsNew/platform_isv_whatsnew.html b/bundles/org.eclipse.platform.doc.isv/whatsNew/platform_isv_whatsnew.html
index 8d55c78db..c27c99162 100644
--- a/bundles/org.eclipse.platform.doc.isv/whatsNew/platform_isv_whatsnew.html
+++ b/bundles/org.eclipse.platform.doc.isv/whatsNew/platform_isv_whatsnew.html
@@ -534,8 +534,8 @@ public class RealE4View {
     <td class="content">
       Linux builds come with GTK+ 3 support enabled by default on GTK+ 3 versions prior to 3.10, 
       versions newer than that will fall back to GTK+ 2.x by default for maximum stability. 
-      The GTK+ 3 support can however, still be enabled by using either the environment variable 
-      <code>SWT_GTK3</code> or the launcher parameter <code>--launcher.GTK_version</code>.
+      The GTK+ 3 support can however still be enabled either by setting the environment variable 
+      <code>SWT_GTK3</code> to <code>1</code> or by adding the launcher parameters <code>--launcher.GTK_version 3</code>.
     </td>
   </tr>
   
diff --git a/bundles/org.eclipse.platform.doc.user/whatsNew/images/OpenAsProject.png b/bundles/org.eclipse.platform.doc.user/whatsNew/images/OpenAsProject.png
deleted file mode 100644
index ec1f00e93..000000000
--- a/bundles/org.eclipse.platform.doc.user/whatsNew/images/OpenAsProject.png
+++ /dev/null
diff --git a/bundles/org.eclipse.platform.doc.user/whatsNew/images/import-as-project.png b/bundles/org.eclipse.platform.doc.user/whatsNew/images/import-as-project.png
new file mode 100644
index 000000000..c758e012c
--- /dev/null
+++ b/bundles/org.eclipse.platform.doc.user/whatsNew/images/import-as-project.png
diff --git a/bundles/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html b/bundles/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html
index 77584acfb..d2456bd81 100644
--- a/bundles/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html
+++ b/bundles/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html
@@ -60,7 +60,7 @@ document in the plug-in developer's guide.
       If you find the <b>Quick Access</b> field in the toolbar takes up too much space, you can now hide it.
       From the context menu in the toolbar, select <b>Hide</b>.
       <p><img src="images/quick-access-hide.png" alt="Hiding quick access"/></p>
-      <p>Once hidden, invoking the <b>Quick Access</b> key binding will instead show a popup dialog.</p>
+      <p>Once hidden, pressing <b>Ctrl+3</b> will instead show a popup dialog.</p>
       <p><img src="images/quick-access-dialog.png" alt="Quick access dialog"/></p>
     </td>
   </tr>
@@ -138,22 +138,25 @@ document in the plug-in developer's guide.
     </td>
   </tr>
 
-  <tr id="OpenAsProject">
-    <td class="title">Open as project</td>
+  <tr id="import-as-project">
+    <td class="title">Import as Project</td>
     <td class="content">
       In the <b>Project Explorer</b>, a folder that contains a <code>.project</code> file and whose related project
-      isn't already in the workspace now shows an <b>Open As Project</b> context menu entry that imports the folder
-      as existing project into the workspace.
-      <p><img src="images/OpenAsProject.png" alt="menu popup with Open As Project"/></p>
+      isn't already in the workspace now shows an <b>Import as Project</b> context menu entry that imports the folder
+      into the workspace as an existing project.
+      <p><img src="images/import-as-project.png" alt=""/></p>
     </td>
   </tr>
   
-  <tr id="ShowInSystemExplorer">
+  <tr id="show-in-system-explorer">
     <td class="title">Show In System Explorer</td>
     <td class="content">
-      If you select a resource and right click, there is now a <b>Show In&gt;System Explorer</b> context menu entry
+      If you select a resource and right click, there is now a <b>Show In &gt; System Explorer</b> context menu entry
       that will open the folder containing that resource in your system's file explorer. 
       <p><img src="images/shown-in-system-explorer.png" alt="menu popup with Show In System Explorer"/></p>
+      The command for launching the system explorer can be configured on the 
+      <strong>General &gt; Workspace</strong>
+      preference page.
     </td>
   </tr>