diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index 29f4313a109..1cf18448e56 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -28,49 +28,18 @@
   Platform Runtime is the minimum requirement for core RSE and Terminal.
   Discovery needs EMF, and the RemoteCDT integration needs CDT.</li>
 <li>Important Bug Fixes, Enhancements and API changes:<ul>
-<li>A new <b>Synchronize Cache</b> action now allows to check all locally cached files
-  and open editors for their update status with a single action. Select one or more
-  remote folders in the RSE System View, and choose "Synchronize Cache" from the context
-  menu 
-  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=143503">143503</a>].</li>
-<li><b>Archive Handling</b> has been improved to run outside the dispatch thread on the
-  Local and DStore subsystems. Several API changes were made to support a cancelable
-  progress monitor with the archive operations
-  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=160775">160775</a>].</li>
-<li>The <b>File Transfer Mode Preference Page</b> has been improved for better usability.
-  Transfer mode preferences are now decoupled from Eclipse Platform Editor File Types
-  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=203114">203114</a>];
-  Upload and Download do honor the preference such that in text mode, encoding conversions
-  are performed to ensure that remote text files are always locally stored in the local
-  default encoding. This allows for external tools to easily perform operations on remote
-  files which are in uncommon encodings
-  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=210812">210812</a>].</li>
-<li>API: The <b><a href="http://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.isv/reference/extension-points/org_eclipse_rse_subsystems_files_core_remoteFileTypes.html">
-  remoteFileTypes</a></b> extension point has been added to specify the default file transfer mode
-  (binary/ascii) for a specific file type
-  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=208951">208951</a>].</li>
-<li>Remote file encoding now defaults to the parent folder encoding
-  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=209660">209660</a>].</li>
-<li>API: A new <b><a href="http://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.isv/reference/extension-points/org_eclipse_rse_services_codePageConverters.html">
-  codePageConverters</a></b> extension point has been added to support services
-  that need to perform special additional conversions on encodings
-  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=209704">209704</a>].</li>
-<li>API: The <b>Select Input Dialog</b> now supports setting a viewer filter such that unwanted kinds of items
-  can not e selected [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=187543">187543</a>].</li>
-<li>API: The new <b>uploadMulti()</b>, <b>downloadMulti()</b> API has been renamed in  
-  <a href="http://dsdp.eclipse.org/help/latest/topic/org.eclipse.rse.doc.isv/reference/api/org/eclipse/rse/services/files/IFileService.html"><tt>IFileService</tt></a>.
-  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=162195">162195</a>]. 
-  Also, the new multi-API is now being leveraged in <tt>UniversalFileTransferUtility</tt>
-  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=209375">209375</a>].</li>
+<li>The RSE "Link with Editor" action has been fixed. A new <tt>IViewLinker</tt>
+  API as well as extensions to the <tt>ISystemTree</tt> API were made to get this done
+  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=187711">187711</a>].</li>
 </ul></li>
-<li>At least 53 bugs were fixed: Use 
-  <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&chfieldfrom=2007-11-06&chfieldto=2008-01-07&chfield=resolution&cmdtype=doit"> -->
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&chfieldfrom=2007-11-06&chfieldto=2008-01-07&chfield=resolution&cmdtype=doit&negate0=1&field0-0-0=target_milestone&type0-0-0=substring&value0-0-0=2.0.&field0-0-1=target_milestone&type0-0-1=regexp&value0-0-1=3.0%20M%5B35%5D">
-  <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&target_milestone=3.0+M4&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&cmdtype=doit"> -->
+<li>At least 4 bugs were fixed: Use 
+  <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&chfieldfrom=2008-01-05&chfieldto=2008-02-18&chfield=resolution&cmdtype=doit"> -->
+  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&chfieldfrom=2008-01-05&chfieldto=2008-02-18&chfield=resolution&cmdtype=doit&negate0=1&field0-0-0=target_milestone&type0-0-0=substring&value0-0-0=2.0.&field0-0-1=target_milestone&type0-0-1=regexp&value0-0-1=3.0%20M%5B34%5D">
+  <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&target_milestone=3.0+M5&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&cmdtype=doit"> -->
   this query</a> to show the list of bugs fixed since the last milestone,
-  <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M3-200711141025/index.php">
-  TM 3.0M3</a>
-  [<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M3-200711141025/buildNotes.php">build notes</a>].</li>
+  <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M4-200801071150/">
+  TM 3.0M4</a>
+  [<a href="http://download.eclipse.org/dsdp/tm/downloads/drops/S-3.0M4-200801071150/buildNotes.php">build notes</a>].</li>
 <li>For details on checkins, see the
   <a href="http://download.eclipse.org/dsdp/tm/downloads/drops/N-changelog/index.html">
   RSE CVS changelog</a>, and the
@@ -142,6 +111,9 @@ More information can be found in the associated bugzilla items.
 <ul>
 <li>TM @buildId@ Breaking API Changes
 <ul>
+</ul></li>
+<li>TM 3.0M4 Breaking API Changes
+<ul>
 <li><b><a href="http://dsdp.eclipse.org/help/latest/topic/org.eclipse.rse.doc.isv/reference/api/org/eclipse/rse/core/subsystems/IRemoteObjectResolver.html#getObjectWithAbsoluteName(java.lang.String,%20org.eclipse.core.runtime.IProgressMonitor)">
     IRemoteObjectResolver.getObjectWithAbsoluteName()</a></b>
     now takes an additional <tt>IProgressMonitor</tt> parameter, in order to support cancellation of deferred queries.
@@ -169,7 +141,7 @@ More information can be found in the associated bugzilla items.
 <li><b>Removed</b> obsolete method
     <tt><a href="http://dsdp.eclipse.org/help/latest/topic/org.eclipse.rse.doc.isv/reference/api/org/eclipse/rse/ui/RSESystemTypeAdapter.html">RSESystemTypeAdapter</a>#acceptContextMenuActionContribution()</tt>
     [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=199032">199032</a>].</li>
-</ul>
+</ul></li>
 <li>TM 3.0M3 Breaking API Changes
 <ul>
 <li><b>Optimized IFileService for multi-queries</b>. This is not a breaking API change for clients
@@ -224,7 +196,6 @@ We'll strive to fix these as soon as possible.
 <ul>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=198143">bug 198143</a> - maj - [dstore][performance] Refresh a big directory takes very long time, and freezes workbench</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=198395">bug 198395</a> - maj - [dstore] Can connect to DStore with expired password</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=203501">bug 203501</a> - maj - NPE in PFMetadataLocation when saving RSEDOM</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=208185">bug 208185</a> - maj - [terminal][serial] terminal can hang the UI when text is entered while the backend side is not reading characters</li>
 </ul>
 <!--