Bug 468284: N&N for Mars (4.5): finished PDE N&N
diff --git a/bundles/org.eclipse.pde.doc.user/whatsNew/images/pde-45M4orbefore-showViewInPDEPerspective.png b/bundles/org.eclipse.pde.doc.user/whatsNew/images/pde-45M4orbefore-showViewInPDEPerspective.png
deleted file mode 100644
index 32e0ea5..0000000
--- a/bundles/org.eclipse.pde.doc.user/whatsNew/images/pde-45M4orbefore-showViewInPDEPerspective.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/whatsNew/images/pde-45M5-showViewInPDEPerspective.png b/bundles/org.eclipse.pde.doc.user/whatsNew/images/pde-45M5-showViewInPDEPerspective.png
deleted file mode 100644
index 04eb29c..0000000
--- a/bundles/org.eclipse.pde.doc.user/whatsNew/images/pde-45M5-showViewInPDEPerspective.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/whatsNew/images/pde-logsize-filter-dialog.png b/bundles/org.eclipse.pde.doc.user/whatsNew/images/pde-logsize-filter-dialog.png
index d507e69..042aef6 100644
--- a/bundles/org.eclipse.pde.doc.user/whatsNew/images/pde-logsize-filter-dialog.png
+++ b/bundles/org.eclipse.pde.doc.user/whatsNew/images/pde-logsize-filter-dialog.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/whatsNew/images/product-css-location.png b/bundles/org.eclipse.pde.doc.user/whatsNew/images/product-css-location.png
index 6ce916b..9fa4871 100644
--- a/bundles/org.eclipse.pde.doc.user/whatsNew/images/product-css-location.png
+++ b/bundles/org.eclipse.pde.doc.user/whatsNew/images/product-css-location.png
Binary files differ
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 7b67bc4..69c8c66 100644
--- a/bundles/org.eclipse.pde.doc.user/whatsNew/pde_whatsnew.html
+++ b/bundles/org.eclipse.pde.doc.user/whatsNew/pde_whatsnew.html
@@ -21,35 +21,36 @@
 <p>Here are descriptions of some of the more interesting or significant changes made to the Plug-in Development Environment (PDE)
 for the Mars (4.5) release of Eclipse. They are grouped into:</p>
 <ul>
+	<li><a href="#dialogs-editors-views">Dialogs, Editors, and Views</a></li>
+	<li><a href="#wizards">Wizards</a></li>
 	<li><a href="#APITools">API Tools</a></li>
-	<li><a href="#ViewsAndEditors">Views and Editors</a></li>
-	<li><a href="#Misc">Misc</a></li>
 </ul>
 <p>See also the
 <b><a href="../../org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">Eclipse Platform What's New</a></b>
 and
 <b><a href="../../org.eclipse.jdt.doc.user/whatsNew/jdt_whatsnew.html">JDT What's New</a></b>
 documents.</p>
-<p>We also recommend to read the <a href="../tips/pde_tips.html">Tips and Tricks</a>.</p>
+<p>We also recommend to read the <a href="../tips/pde_tips.htm">Tips and Tricks</a>.</p>
 <br/>
 
 <table class="news" border="0" cellpadding="10" cellspacing="0" width="80%" summary="New and noteworthy items">
 <tbody>
 
-<!-- ******************** APITools ********************** -->
+<!-- ******************** Dialogs, Editors, and Views ********************** -->
   <tr>
-    <td id="APITools" class="section" colspan="2"><h2>API Tools</h2></td>
+    <td id="dialogs-editors-views" class="section" colspan="2"><h2>Dialogs, Editors, and Views</h2></td>
   </tr>
   
-  
-<!-- ******************** Views and Editors ********************** -->
-  <tr>
-    <td id="ViewsAndEditors" class="section" colspan="2"><h2>Views and Editors</h2></td>
-  </tr>
-  
-  <!-- ******************** Misc ********************** -->
-  <tr>
-    <td id="Misc" class="section" colspan="2"><h2>Misc</h2></td>
+  <tr id="wildcard-support-plugins-features">
+    <td class="title">Added wildcard support for selecting plug-ins</td>
+    <td class="content">
+      Wildcard support and implicit prefix completion are now supported in all plug-in selection dialogs,
+      e.g. in the product editor or in the target definition.
+      Due to the implicit "*" at the beginning of the pattern, you can just type "platf" to find "org.eclipse.platform".
+          <p>
+            <img src="images/plugin-selection-without-wildcards.png" alt="" />
+          </p>
+    </td>
   </tr>
   
   <tr id="product-default-preferences">
@@ -67,29 +68,7 @@
       </p>
     </td>
   </tr>
-  <tr id="category-repository-references">
-    <td class="title">Category editor can specify additional update repositories</td>
-    <td class="content">
-      In the <b>Category Manifest Editor</b> you can now specify additional update repositories that should be
-      referenced by the generated update repository. These additional repositories will be searched for
-      content whenever the generated repository receives a request for content.
-      <p>
-      <img src="images/category-repositories.png" alt=""/>
-      </p>
-    </td>
-  </tr>
-  <tr id="category-download-statistics">
-    <td class="title">Category editor can define download statistics</td>
-    <td class="content">
-      In the <b>Category Manifest Editor</b> you can now specify a download statistics server that should
-      be used to collect download statistics about your product. You can also specify which features and/or
-      bundles should be used to collect download information. 
-      <p>
-      <img src="images/category-download-statistics.png" alt=""/>
-      </p>
-    </td>
-  </tr>
-  
+
   <tr id="pde-css-product-editor">
     <td class="title">Products can specify CSS file</td>
     <td class="content">
@@ -102,39 +81,42 @@
     </td>
   </tr>
 
-  <tr id="wildcard-support-plugins-features">
-    <td class="title">Added wildcard support for selecting plug-ins</td>
+  <tr id="category-repository-references">
+    <td class="title">Category editor can specify additional update repositories</td>
     <td class="content">
-      Wildcard support and implicit prefix completion already worked in some plug-in selection dialogs.
-      Now, it works in all such dialogs, e.g. in the product editor or in the target definition.
-      Due to the implicit "*" at the beginning of the pattern, you can just type "platf" to find "org.eclipse.platform".
-          <p>
-            <img src="images/plugin-selection-without-wildcards.png" alt="" />
-          </p>
-    </td>
-  </tr>
-
-  <tr id="pde-target-editor-retains-selection">
-    <td class="title">Target editor retains selection </td>
-    <td class="content">
-      In the <b> Target Editor</b>, while editing an existing software site location, 
-      the <b>  Edit Software Site </b>  dialog now opens with the appropriate selection.
-        
-    </td>
-  </tr>
-
-  <tr id="pde-api-use-scan">
-    <td class="title">API use scan report specifies additional filters used </td>
-    <td class="content">
-      <b> API use scan report</b>  specifies the location of additional filters (.api_filter files)
-      used during the scan. It also reports the number of illegal references filtered out due to 
-      additional filters used.
+      In the <b>Category Manifest Editor</b> you can now specify additional update repositories that should be
+      referenced by the generated update repository. These additional repositories will be searched for
+      content whenever the generated repository receives a request for content.
       <p>
-        <img src="images/pde-additional-filter-information.png" alt="Additional Filter Information"/>
+      <img src="images/category-repositories.png" alt=""/>
       </p>
     </td>
   </tr>
- 
+
+  <tr id="category-download-statistics">
+    <td class="title">Category editor can define download statistics</td>
+    <td class="content">
+      In the <b>Category Manifest Editor</b> you can now specify a download statistics server that should
+      be used to collect download statistics about your product. You can also specify which features and/or
+      bundles should be used to collect download information. 
+      <p>
+      <img src="images/category-download-statistics.png" alt=""/>
+      </p>
+    </td>
+  </tr>
+  
+  <tr id="pde-target-editor-reload">
+    <td class="title">"Reload" button in target editor </td>
+    <td class="content">
+       In the <b>Target Editor</b>, on the <b>Locations</b> section, there is now a <b>Reload</b> button that clears the cached 
+       p2 profile and then resolves the target. This button is helpful in scenarios where the target editor is left in inconsistent
+       state due to issues like unstable network connection.
+      <p>
+        <img src="images/pde-target-editor-reload-button.png" alt=""/>
+      </p>
+    </td>
+  </tr>
+
   <tr id="pde-error-log-size">
     <td class="title">Option to set maximum log size</td>
     <td class="content">
@@ -147,35 +129,11 @@
     </td>
   </tr>
 
-  <tr id="pde-target-editor-reload">
-    <td class="title">Reload button added in target editor </td>
-    <td class="content">
-       In the <b>Target Editor</b>, on the <b>Locations</b> section, there is a reload button that clears the cached 
-       p2 profile and then resolves the target. This button is helpful in scenarios where the target editor is left in inconsistent
-       state due to issues like unstable network connection.
-      <p>
-        <img src="images/pde-target-editor-reload-button.png" alt="Target Editor Reload Button"/>
-      </p>
-    </td>
+  <!-- ******************** Wizards ********************** -->
+  <tr>
+    <td id="wizards" class="section" colspan="2"><h2>Wizards</h2></td>
   </tr>
-
-  <tr id="pde-perspective-open-view">
-    <td class="title"> Show view in plug-in perspective has changed </td>
-    <td class="content">
-       In the <b>Plug-in Development Perspective</b>, the default <b>Show View menu</b> now has 
-      <p>
-        <img src="images/pde-45M5-showViewInPDEPerspective.png" alt="Show View in PDE Perspective 45M5"/>
-      </p>
-      
-       In contrast, the default Show View menu earlier had
-      <p>
-        <img src="images/pde-45M4orbefore-showViewInPDEPerspective.png" alt="Show View in PDE Perspective 45M4 or before"/>
-      </p>
-      
-      
-    </td>
-  </tr>
-
+  
   <tr id="e4Template">
     <td class="title">Create an E4 project from "New Plug-in" wizard</td>
     <td class="content">
@@ -185,7 +143,7 @@
         <img src="images/e4-template-step-1.png" alt="" />
       </p>
       <p>
-        On the next page will get a template to create an E4 project:
+        The next page will offer a template to create an E4 project:
       </p>
        <p>
         <img src="images/e4-template-step-2.png" alt="" />
@@ -205,14 +163,30 @@
 	</td>
   </tr>
 
+<!-- ******************** APITools ********************** -->
+  <tr>
+    <td id="APITools" class="section" colspan="2"><h2>API Tools</h2></td>
+  </tr>
+
   <tr id="apibaselinefromtarget">
-    <td class="title">Create an API Baseline from a Target Definition</td>
+    <td class="title">Create an API baseline from a target definition</td>
     <td class="content">
-		API Baselines can now be created from a target definition in the
-		<b>Plug-in Development &gt; API Baselines</b> preference page.
+		In the <b>Plug-in Development &gt; API Baselines</b> preference page,
+		an API baseline can now be created from an existing target definition.
     </td>
   </tr>
 
+  <tr id="pde-api-use-scan">
+    <td class="title">API use scan report specifies additional filters used </td>
+    <td class="content">
+      <b> API use scan report</b>  specifies the location of additional filters (.api_filter files)
+      used during the scan. It also reports the number of illegal references filtered out due to 
+      additional filters used.
+      <p>
+        <img src="images/pde-additional-filter-information.png" alt="Additional Filter Information"/>
+      </p>
+    </td>
+  </tr>
 
 </tbody>
 </table>