Bug 578309: Tidy doc HTML files in /reference

All these have been cleanup up with HTML tidy with:
  tidy -miq --wrap 120 --tidy-mark no

Change-Id: Ief0aced6fdb6748128c1f671bb37748fb6655f78
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.common/+/190114
Tested-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/help_preferences.htm b/bundles/org.eclipse.platform.doc.user/reference/help_preferences.htm
index f4cae1b..efd3d7c 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/help_preferences.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/help_preferences.htm
@@ -1,80 +1,69 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-<title>Help preferences</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Help preferences</title>
 </head>
 <body>
-
-<h1>Help preferences</h1>
-
-<P CLASS="Para">
-On the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.help.ui.browsersPreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Help</strong></a>
-
-preferences page, you can indicate how to display help information.</P>
-<TABLE BORDER="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Option</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Description</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Default</P></TH>
-    </TR>
-  </THEAD>
-  <TR> 
-      <TH align="left"> <span style="font-weight: 400">Open Help Search</span></TH>
-      <TH align="left"> <span style="font-weight: 400">Configures whether Help/Search (and Help/Index if configured) opens the help view or help contents.</span></TH>
-      <TH align="left"> <span style="font-weight: 400">In the dynamic help view</span></TH>
-    </TR>
-    <TR> 
-      <TH align="left"> <span style="font-weight: 400">Open help view documents</span></TH>
-      <TH align="left"><span style="font-weight: 400">This option allows you to 
-        determine whether the documents selected in the help view will be opened
-        in-place, in the editor area or in a browser.</span></TH>
-      <TH align="left"> <span style="font-weight: 400">in-place </span></TH>
-    </TR>
-    <TR> 
-      <TH align="left"> <span style="font-weight: 400">Open Help Contents</span></TH>
-      <TH align="left"> <span style="font-weight: 400">Allows you to open help contents
-      in an external web browser or in the Eclipse help browser.  Use &quot;Web
-        Browser&quot; preference page to select browser to use.</span> </TH>
-      <TH align="left"> <span style="font-weight: 400">Off</span></TH>
-    </TR>
-    <TR> 
-      <TH align="left"> <span style="font-weight: 400">Open window context help 
-        </span></TH>
-      <TH align="left"><span style="font-weight: 400">This option allows you to 
-        determine whether the window context help will be opened in a dynamic 
-        help view or in an infopop.</span></TH>
-      <TH align="left"> <span style="font-weight: 400">in a dynamic help view 
-        </span></TH>
-    </TR>
-    <TR> 
-      <TH align="left"> <span style="font-weight: 400">Open dialog context help</span></TH>
-      <TH align="left"><span style="font-weight: 400">This option allows you to 
-        determine whether the dialog context help will be opened in a dynamic 
-        help section of help view or in an infopop.</span></TH>
-      <TH align="left"> <span style="font-weight: 400">in dialog tray</span></TH>
-    </TR>
-</TABLE>
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/help.htm">Help</a><br>
-<a href="../concepts/help_view.htm">Help view</a>
-
-<a href="../tasks/help.xhtml">Accessing help</a><br>
-<a href="../tasks/help_settings.htm">Help display settings</a>
-
-<h3 class="related">Related reference</h3>
-<a href="help_preferences_content.htm">Help Content preferences</a><br>
-<a href="ref-42.htm">Web Browser preferences</a>
-
+  <h1>Help preferences</h1>
+  <p class="Para">On the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.help.ui.browsersPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Help</strong></a> preferences
+  page, you can indicate how to display help information.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Open Help Search</span></th>
+      <th align="left"><span style="font-weight: 400">Configures whether Help/Search (and Help/Index if configured)
+      opens the help view or help contents.</span></th>
+      <th align="left"><span style="font-weight: 400">In the dynamic help view</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Open help view documents</span></th>
+      <th align="left"><span style="font-weight: 400">This option allows you to determine whether the documents
+      selected in the help view will be opened in-place, in the editor area or in a browser.</span></th>
+      <th align="left"><span style="font-weight: 400">in-place</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Open Help Contents</span></th>
+      <th align="left"><span style="font-weight: 400">Allows you to open help contents in an external web browser or in
+      the Eclipse help browser. Use "Web Browser" preference page to select browser to use.</span></th>
+      <th align="left"><span style="font-weight: 400">Off</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Open window context help</span></th>
+      <th align="left"><span style="font-weight: 400">This option allows you to determine whether the window context
+      help will be opened in a dynamic help view or in an infopop.</span></th>
+      <th align="left"><span style="font-weight: 400">in a dynamic help view</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Open dialog context help</span></th>
+      <th align="left"><span style="font-weight: 400">This option allows you to determine whether the dialog context
+      help will be opened in a dynamic help section of help view or in an infopop.</span></th>
+      <th align="left"><span style="font-weight: 400">in dialog tray</span></th>
+    </tr>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/help.htm">Help</a><br>
+  <a href="../concepts/help_view.htm">Help view</a> <a href="../tasks/help.xhtml">Accessing help</a><br>
+  <a href="../tasks/help_settings.htm">Help display settings</a>
+  <h3 class="related">Related reference</h3><a href="help_preferences_content.htm">Help Content preferences</a><br>
+  <a href="ref-42.htm">Web Browser preferences</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/help_preferences_content.htm b/bundles/org.eclipse.platform.doc.user/reference/help_preferences_content.htm
index 5060a75..fb71d7f 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/help_preferences_content.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/help_preferences_content.htm
@@ -1,134 +1,90 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-<title>Help Content preferences</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Help Content preferences</title>
 </head>
 <body>
-
-<h1>Help Content preferences</h1>
-
-<P CLASS="Para">
-Help topics from remote servers can be included seamlessly into the local help system.
-Use the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.help.ui.contentPreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Help &gt; Content</strong></a>
-
-preference page to configure one or more remote servers from which to include content.
-</P>
-<TABLE BORDER="1" cellspacing="0">
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Button</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-</TR>
-</THEAD>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Include local help only</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Remote help content is not enabled.</span>
-</TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Include remote help and give local help priority</span></TH>
-<TH align="left">
-<span style="font-weight: 400">The help system will show locally installed help contents as well as help
-contents from the information centers specified in the table. If the same page exists both locally and 
-on the remote information center the local page will be shown.</span>
-</TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Include remote help and give it priority</span></TH>
-<TH align="left">
-<span style="font-weight: 400">The help system will show locally installed help contents as well as help
-contents from the information centers specified in the table. If the same page exists both locally and 
-on the remote information center the remote page will be shown.</span>
-</TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">New/Edit/Delete</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Add, edit or delete a remote data source</span></TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">View Properties</span></TH>
-<TH align="left">
-<span style="font-weight: 400">View the properties for this remote data source</span></TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Test Connection</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Tests to see if it is possible to connect to this 
-host/port combination</span></TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Disable/Enable</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Allows a data source to be disabled so the help 
-system will not try to read topics from that source.</span></TH>
-</TR>
-</TABLE>
-
-<P>
-Pressing the &quot;New&quot; button opens a dialog to add a new information center, these are the 
-fields that can be entered in the Add new information center dialog.
-</P>
-
-<TABLE BORDER="1" cellspacing="0">
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Name</span></TH>
-<TH align="left">
-<span style="font-weight: 400">A name for this information center</span></TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">URL</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Specifies the url of the information center server</span>
-</TH>
-</TR>
-</TABLE>
-
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/help.htm">Help</a>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/help.xhtml">Accessing help</a>
-
-<h3 class="related">Related reference</h3>
-<a href="help_preferences.htm">Help preferences</a><br>
-<a href="ref-42.htm">Web Browser preferences</a>
-
+  <h1>Help Content preferences</h1>
+  <p class="Para">Help topics from remote servers can be included seamlessly into the local help system. Use the
+  <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.help.ui.contentPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Help &gt; Content</strong></a>
+  preference page to configure one or more remote servers from which to include content.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Button</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Include local help only</span></th>
+      <th align="left"><span style="font-weight: 400">Remote help content is not enabled.</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Include remote help and give local help priority</span></th>
+      <th align="left"><span style="font-weight: 400">The help system will show locally installed help contents as well
+      as help contents from the information centers specified in the table. If the same page exists both locally and on
+      the remote information center the local page will be shown.</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Include remote help and give it priority</span></th>
+      <th align="left"><span style="font-weight: 400">The help system will show locally installed help contents as well
+      as help contents from the information centers specified in the table. If the same page exists both locally and on
+      the remote information center the remote page will be shown.</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">New/Edit/Delete</span></th>
+      <th align="left"><span style="font-weight: 400">Add, edit or delete a remote data source</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">View Properties</span></th>
+      <th align="left"><span style="font-weight: 400">View the properties for this remote data source</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Test Connection</span></th>
+      <th align="left"><span style="font-weight: 400">Tests to see if it is possible to connect to this host/port
+      combination</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Disable/Enable</span></th>
+      <th align="left"><span style="font-weight: 400">Allows a data source to be disabled so the help system will not
+      try to read topics from that source.</span></th>
+    </tr>
+  </table>
+  <p>Pressing the "New" button opens a dialog to add a new information center, these are the fields that can be entered
+  in the Add new information center dialog.</p>
+  <table border="1" cellspacing="0">
+    <tr>
+      <th rowspan="1" colspan="1">
+        <p class="Para">Option</p>
+      </th>
+      <th rowspan="1" colspan="1">
+        <p class="Para">Description</p>
+      </th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Name</span></th>
+      <th align="left"><span style="font-weight: 400">A name for this information center</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">URL</span></th>
+      <th align="left"><span style="font-weight: 400">Specifies the url of the information center server</span></th>
+    </tr>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/help.htm">Help</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/help.xhtml">Accessing help</a>
+  <h3 class="related">Related reference</h3><a href="help_preferences.htm">Help preferences</a><br>
+  <a href="ref-42.htm">Web Browser preferences</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-10.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-10.htm
index e6c87f5..f826396 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-10.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-10.htm
@@ -1,88 +1,78 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta http-equiv="Content-Style-Type" content="text/css">
-   <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
-   <title>General</title>
-<link REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
+  <title>General</title>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
 </head>
 <body bgcolor="#FFFFFF">
-<h1 CLASS="Head">General</h1>
-
-<div CLASS="Intro">General settings for the Workbench.  The term <i>Workbench</i> refers to the desktop development
-environment.</div>
-
-
-<p>Each Workbench window contains one or more
-perspectives. Perspectives contain views and editors and control
-what appears in certain menus and tool bars. More than one Workbench
-window can exist on the desktop at any given time.</p>
-
-<p CLASS="Para">The following preferences can be changed on the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General</strong></a>
-
-preference page. </p>
-<table width="75%" border="1">
-  <tr> 
-    <td><strong>Option</strong></td>
-    <td><strong>Description</strong></td>
-    <td><strong>Default</strong></td>
-  </tr>
-  <tr> 
-    <td>Always run in background</td>
-    <td>Turn this option on to perform long running operations in the background 
-    without blocking you from doing other work.<br></td>
-    <td>Off<br></td>
-  </tr>
-  <tr> 
-    <td>Keep next/previous part dialog open </td>
-    <td>If this option is turned on then the editor and view cycle dialogs will 
-      remain open when their activation key is let go. Normally the dialog closes 
-      as soon as the key combination is release.</td>
-    <td>Off </td>
-  </tr>
-  <tr> 
-    <td>Show Heap Status</td>
-    <td>Turn this option on to display an indicator
-    showing information about current Java heap usage.<br></td>
-    <td>Off<br></td>
-  </tr>
-  <tr> 
-    <td>Workbench save interval</td>
-    <td>The field indicates how often the state of the workbench like perspective layouts and open editors is automatically saved to disk.
-    Set to 0 to disable.<br></td>
-    <td>5<br></td>
-  </tr>
-  <tr> 
-    <td>Open mode...</td>
-    <td><div CLASS="Para">You can select one of the following methods for opening 
-        resources:</div>
-      <div CLASS="Para"></div>
-       <ul>
-        <li CLASS="Item"> Double click - Single clicking on a resource will select 
-          it and double clicking on it will open it in an editor.</li>
-        <li CLASS="Item"> Single click (Select on hover) - Hovering the mouse 
-          cursor over the resource will select it and clicking on it once will 
+  <h1 class="Head">General</h1>
+  <div class="Intro">
+    General settings for the Workbench. The term <i>Workbench</i> refers to the desktop development environment.
+  </div>
+  <p>Each Workbench window contains one or more perspectives. Perspectives contain views and editors and control what
+  appears in certain menus and tool bars. More than one Workbench window can exist on the desktop at any given
+  time.</p>
+  <p class="Para">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General</strong></a> preference
+  page.</p>
+  <table width="75%" border="1">
+    <tr>
+      <td><strong>Option</strong></td>
+      <td><strong>Description</strong></td>
+      <td><strong>Default</strong></td>
+    </tr>
+    <tr>
+      <td>Always run in background</td>
+      <td>Turn this option on to perform long running operations in the background without blocking you from doing
+      other work.<br></td>
+      <td>Off<br></td>
+    </tr>
+    <tr>
+      <td>Keep next/previous part dialog open</td>
+      <td>If this option is turned on then the editor and view cycle dialogs will remain open when their activation key
+      is let go. Normally the dialog closes as soon as the key combination is release.</td>
+      <td>Off</td>
+    </tr>
+    <tr>
+      <td>Show Heap Status</td>
+      <td>Turn this option on to display an indicator showing information about current Java heap usage.<br></td>
+      <td>Off<br></td>
+    </tr>
+    <tr>
+      <td>Workbench save interval</td>
+      <td>The field indicates how often the state of the workbench like perspective layouts and open editors is
+      automatically saved to disk. Set to 0 to disable.<br></td>
+      <td>5<br></td>
+    </tr>
+    <tr>
+      <td>Open mode...</td>
+      <td>
+        <div class="Para">
+          You can select one of the following methods for opening resources:
+        </div>
+        <div class="Para"></div>
+        <ul>
+          <li class="Item">Double click - Single clicking on a resource will select it and double clicking on it will
           open it in an editor.</li>
-        <li CLASS="Item"> Single click (Open when using arrow keys) - Selecting 
-          a resource with the arrow keys will open it in an editor.
-         <p CLASS="Para"><strong>Note:</strong> Depending on which view has focus, 
-          selecting and opening a resource may have different behavior. </p></li>
-      </ul></td>
-    <td>Double click</td>
-  </tr>
-</table>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-23.htm">Workbench Window Layout</a>
-
+          <li class="Item">Single click (Select on hover) - Hovering the mouse cursor over the resource will select it
+          and clicking on it once will open it in an editor.</li>
+          <li class="Item">Single click (Open when using arrow keys) - Selecting a resource with the arrow keys will
+          open it in an editor.
+            <p class="Para"><strong>Note:</strong> Depending on which view has focus, selecting and opening a resource
+            may have different behavior.</p>
+          </li>
+        </ul>
+      </td>
+      <td>Double click</td>
+    </tr>
+  </table>
+  <h3 class="related">Related reference</h3><a href="ref-23.htm">Workbench Window Layout</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-11.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-11.htm
index 5470ba3..c4479ab 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-11.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-11.htm
@@ -1,185 +1,196 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta http-equiv="Content-Style-Type" content="text/css">
-   <title>Compare/Patch</title>
-<link REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <title>Compare/Patch</title>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
 </head>
 <body bgcolor="#FFFFFF">
-
-<h1 CLASS="Head">
-Compare/Patch</h1>
-
-<p>The following preferences can be changed on the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.compare.internal.ComparePreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Compare/Patch</strong></a> preference page.</p>
-
-<h2>General options</h2>
-<table border="1" cellspacing="0" style="width: 100%;">
-  <tbody>
-    <tr> 
-      <th width="25%"> <div class="Para">Option</div></th>
-      <th> <div class="Para">Description</div></th>
-      <th> <div class="Para">Default</div></th>
-    </tr>
-    <tr> 
-      <td align="left" valign="top" width="25%"> <div class="Para">Open structure 
-          compare automatically
-        </div></td>
-      <td align="left" valign="top"> <div class="Para"> 
-          <div CLASS="Para">This option controls whether a structure compare is 
-            automatically performed whenever a content compare is done. Turn this 
-            option off if you don't want to see the structural differences.</div>
-        </div></td>
-      <td align="left" valign="top"> <div class="Para">On</div></td>
-    </tr>
-	<tr> 
-		<td style="vertical-align: top; width: 25%;">Show structure compare in Outline 
-		view when possible</td>
-		<td style="vertical-align: top;">If this option is on, structure compare will
-		be displayed in the Outline view whenever it is possible.</td>
-		<td style="vertical-align: top;">Off </td>
-	</tr>
-    <tr> 
-      <td style="vertical-align: top; width: 25%;">Show additional compare information 
-        in the status line </td>
-      <td style="vertical-align: top;">If this option is on, additional information 
-        about a change is shown in
-        the status line. Turn this option on if you are interested in additional 
-        information about a change. </td>
-      <td style="vertical-align: top;">Off </td>
-    </tr>
-    <tr> 
-      <td style="vertical-align: top; width: 25%;">Ignore white space</td>
-      <td style="vertical-align: top;">This option controls whether or not whitespace 
-        change are shown in the compare viewer. Turn this option on if you want 
-        to see changes in whitespace. </td>
-      <td style="vertical-align: top;">Off </td>
-    </tr>
-    <tr> 
-      <td style="vertical-align: top; width: 25%;">Automatically save dirty editors before browsing patches</td>
-      <td style="vertical-align: top;">This option controls whether any unsaved 
-        changes are automatically saved before a patch is applied. Turn this option 
-        on if you want to save changes automatically. </td>
-      <td style="vertical-align: top;">Off </td>
-    </tr>
-    <tr> 
-      <td style="vertical-align: top; width: 25%;">Added/Removed lines</td>
-      <td style="vertical-align: top;">These options control  which lines should
-       be counted as added and removed lines when applying a patch. Both options
-       are based on regular expressions. </td>
-      <td style="vertical-align: top;"><br></td>
-    </tr>    
-    <tr> 
-      <td style="vertical-align: top; width: 25%;">Filtered Members</td>
-      <td style="vertical-align: top;"><p>This option allows you to filter members 
-          that should be excluded from 'Compare With Each Other'. </p>
-        <p><strong>Note: </strong>The names in the list must be separated by a 
-          comma.
-        </p></td>
-      <td style="vertical-align: top;"><br> </td>
-    </tr>
-  </tbody>
-</table>
-<h2>Text Compare options</h2>
-<table border="1" cellspacing="0" style="width: 100%;">
-  <tbody>
-    <tr> 
-      <th width="25%"> <div class="Para">Option</div></th>
-      <th> <div class="Para">Description</div></th>
-      <th> <div class="Para">Default</div></th>
-    </tr>
-    <tr> 
-      <td align="left" valign="top" width="25%"> <div class="Para">Synchronize 
-          scrolling between panes in compare viewers
-        </div></td>
-      <td align="left" valign="top"> <div class="Para">
-          <div CLASS="Para">The two comparison viewers will "lock scroll" along 
-            with one another in order to keep identical and corresponding portions 
-            of the code in each pane side-by-side. Turn this option off if you 
-            do not want the compare viewers to lock scroll.</div>
-        </div></td>
-      <td align="left" valign="top"> <div class="Para">On</div></td>
-    </tr>
-    <tr> 
-      <td style="vertical-align: top; width: 25%;">Initially show ancestor pane</td>
-      <td style="vertical-align: top;">Sometimes you want to compare two versions 
-        of a resource with the previous version from which they were both derived. 
-        This is called their <i>common ancestor</i>, and it appears in its own 
-        comparison pane during a three way compare. Turn this option on if you 
-        want the ancestor pane to always appear at the start of a comparison. </td>
-      <td style="vertical-align: top;">Off </td>
-    </tr>
-    <tr> 
-      <td style="vertical-align: top; width: 25%;">Show pseudo conflicts </td>
-      <td style="vertical-align: top;">Displays pseudo conflicts, which occur 
-        when two developers make the same change (for example, both add or remove 
-        the exact same line of code or comment). Turn this option on if you want 
-        pseudo conflicts to appear in compare browsers. </td>
-      <td style="vertical-align: top;">Off </td>
-    </tr>
-    <tr> 
-      <td style="vertical-align: top; width: 25%;">Connect ranges with single 
-        line</td>
-      <td style="vertical-align: top;">Controls whether differing ranges are visually 
-        connected by a single line or a range delimited by two lines. </td>
-      <td style="vertical-align: top;">On </td>
-    </tr>
-	<tr> 
-		<td style="vertical-align: top; width: 25%;">Highlight individual changes</td>
-		<td style="vertical-align: top;">Controls whether the individual changes inside
-		conflicts are highlighted.</td>
-		<td style="vertical-align: top;">On </td>
-	</tr>
-	<tr> 
-		<td style="vertical-align: top; width: 25%;">Disable capping when comparing 
-		 large documents</td>
-		<td style="vertical-align: top;">The capping mechanism is used to speed up finding
-		differences in large files. In case where the capping happens the result can either 
-		be correct or it can display too many changes, but it never misses any change. Turn
-		this option on, if you prefer a precise result in favour of possibly longer
-		calculation time.</td>
-		<td style="vertical-align: top;">Off </td>
-	</tr>
-	<tr> 
-		<td style="vertical-align: top; width: 25%;">When the end/beginning is 
-		reached while navigating an element</td>
-		<td style="vertical-align: top;">Use this option to configure what occurs when
-		the end/beginning is reached while navigating an element.
-		<ul>
-			<li><strong>Prompt: </strong>If this option is on and you selected 
-			to compare a single element you will be asked whether you want to go
-			to the beginning/end of the element after the end/beginning is reached.
-			If you are comparing two or more elements you will be asked whether 
-			you want to go to the beginning/end	of the current element or to go 
-			to the next/previous element. Moreover,	if you choose to remember your
-			decision, this option will be changed to one of the below respectively.</li>
-			<li><strong>Loop back to the beginning/end: </strong>When this option
-			is on, the selection will me moved back to the beginning/end after you reach
-			the end/beginning of an element.</li>
-			<li><strong>Go to the next/previous element: </strong>If you are comparing
-			two or more elements and this option is on after you reach the end/beginning
-			of an element the next/previous element will be opened.</li>
-		</ul>
-		</td>
-		<td style="vertical-align: top;">Prompt </td>
-	</tr>
-
-
-
-  </tbody>
-</table>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-25.htm">Compare Editor</a><br>
-<a href="ref-33.htm">CVS Synchronization View</a>
-
+  <h1 class="Head">Compare/Patch</h1>
+  <p>The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.compare.internal.ComparePreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt;
+  Compare/Patch</strong></a> preference page.</p>
+  <h2>General options</h2>
+  <table border="1" cellspacing="0" style="width: 100%;">
+    <tbody>
+      <tr>
+        <th width="25%">
+          <div class="Para">
+            Option
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Description
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Default
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Open structure compare automatically
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            <div class="Para">
+              This option controls whether a structure compare is automatically performed whenever a content compare is
+              done. Turn this option off if you don't want to see the structural differences.
+            </div>
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Show structure compare in Outline view when possible</td>
+        <td style="vertical-align: top;">If this option is on, structure compare will be displayed in the Outline view
+        whenever it is possible.</td>
+        <td style="vertical-align: top;">Off</td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Show additional compare information in the status line</td>
+        <td style="vertical-align: top;">If this option is on, additional information about a change is shown in the
+        status line. Turn this option on if you are interested in additional information about a change.</td>
+        <td style="vertical-align: top;">Off</td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Ignore white space</td>
+        <td style="vertical-align: top;">This option controls whether or not whitespace change are shown in the compare
+        viewer. Turn this option on if you want to see changes in whitespace.</td>
+        <td style="vertical-align: top;">Off</td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Automatically save dirty editors before browsing patches</td>
+        <td style="vertical-align: top;">This option controls whether any unsaved changes are automatically saved
+        before a patch is applied. Turn this option on if you want to save changes automatically.</td>
+        <td style="vertical-align: top;">Off</td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Added/Removed lines</td>
+        <td style="vertical-align: top;">These options control which lines should be counted as added and removed lines
+        when applying a patch. Both options are based on regular expressions.</td>
+        <td style="vertical-align: top;"><br></td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Filtered Members</td>
+        <td style="vertical-align: top;">
+          <p>This option allows you to filter members that should be excluded from 'Compare With Each Other'.</p>
+          <p><strong>Note:</strong> The names in the list must be separated by a comma.</p>
+        </td>
+        <td style="vertical-align: top;"><br></td>
+      </tr>
+    </tbody>
+  </table>
+  <h2>Text Compare options</h2>
+  <table border="1" cellspacing="0" style="width: 100%;">
+    <tbody>
+      <tr>
+        <th width="25%">
+          <div class="Para">
+            Option
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Description
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Default
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Synchronize scrolling between panes in compare viewers
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            <div class="Para">
+              The two comparison viewers will "lock scroll" along with one another in order to keep identical and
+              corresponding portions of the code in each pane side-by-side. Turn this option off if you do not want the
+              compare viewers to lock scroll.
+            </div>
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Initially show ancestor pane</td>
+        <td style="vertical-align: top;">Sometimes you want to compare two versions of a resource with the previous
+        version from which they were both derived. This is called their <i>common ancestor</i>, and it appears in its
+        own comparison pane during a three way compare. Turn this option on if you want the ancestor pane to always
+        appear at the start of a comparison.</td>
+        <td style="vertical-align: top;">Off</td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Show pseudo conflicts</td>
+        <td style="vertical-align: top;">Displays pseudo conflicts, which occur when two developers make the same
+        change (for example, both add or remove the exact same line of code or comment). Turn this option on if you
+        want pseudo conflicts to appear in compare browsers.</td>
+        <td style="vertical-align: top;">Off</td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Connect ranges with single line</td>
+        <td style="vertical-align: top;">Controls whether differing ranges are visually connected by a single line or a
+        range delimited by two lines.</td>
+        <td style="vertical-align: top;">On</td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Highlight individual changes</td>
+        <td style="vertical-align: top;">Controls whether the individual changes inside conflicts are highlighted.</td>
+        <td style="vertical-align: top;">On</td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">Disable capping when comparing large documents</td>
+        <td style="vertical-align: top;">The capping mechanism is used to speed up finding differences in large files.
+        In case where the capping happens the result can either be correct or it can display too many changes, but it
+        never misses any change. Turn this option on, if you prefer a precise result in favour of possibly longer
+        calculation time.</td>
+        <td style="vertical-align: top;">Off</td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top; width: 25%;">When the end/beginning is reached while navigating an element</td>
+        <td style="vertical-align: top;">
+          Use this option to configure what occurs when the end/beginning is reached while navigating an element.
+          <ul>
+            <li><strong>Prompt:</strong> If this option is on and you selected to compare a single element you will be
+            asked whether you want to go to the beginning/end of the element after the end/beginning is reached. If you
+            are comparing two or more elements you will be asked whether you want to go to the beginning/end of the
+            current element or to go to the next/previous element. Moreover, if you choose to remember your decision,
+            this option will be changed to one of the below respectively.</li>
+            <li><strong>Loop back to the beginning/end:</strong> When this option is on, the selection will me moved
+            back to the beginning/end after you reach the end/beginning of an element.</li>
+            <li><strong>Go to the next/previous element:</strong> If you are comparing two or more elements and this
+            option is on after you reach the end/beginning of an element the next/previous element will be opened.</li>
+          </ul>
+        </td>
+        <td style="vertical-align: top;">Prompt</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="ref-25.htm">Compare Editor</a><br>
+  <a href="ref-33.htm">CVS Synchronization View</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-12.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-12.htm
index 73eaf6b..eb434c6 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-12.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-12.htm
@@ -1,56 +1,45 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Editors preference page</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Editors preference page</title>
 </head>
-<body bgcolor="#ffffff">
-
-<h1 class="Head">Editors preference page</h1>
-
-<p class="Para">You can change the following preferences on the
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Editors)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>General &gt; Editors</strong></a>
-preference page:
-</p>
-
-<table border="1" cellspacing="0" cellpadding="5">
-<thead>
-<tr valign="top">
-<th>Option</th>
-<th>Description</th>
-<th>Default</th>
-</tr>
-</thead>
-<tbody>
-<tr valign="top">
-<td><b>Size of recently opened files list</b></td>
-<td>Each file that is opened in an editor is stored in a list of 
-recently used files in the <b>File</b> menu. 
-This option controls the number of files that is displayed in that list.
-</td>
-<td>4</td>
-</tr>
-<tr valign="top">
-<td><b>Close editors automatically</b></td>
-<td>Specifies whether or not to re-use editors in the Workbench. 
-If on, you may specify the number of editors to use before they are recycled 
-(the default is 8). 
-You can also specify if a prompt dialog should be opened or if a new editor should be opened 
-when all editors are "dirty" (have unsaved changes). 
-Once it is turned on, the Pin Editor action is added to the toolbar and editor tab menu. 
-Pinned editors are not recycled.
-</td>
-<td>Off</td>
-</tr>
-</tbody>
-</table>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-24.htm">Editor Area</a>
-
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Editors preference page</h1>
+  <p class="Para">You can change the following preferences on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Editors)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>General &gt;
+  Editors</strong></a> preference page:</p>
+  <table border="1" cellspacing="0" cellpadding="5">
+    <thead>
+      <tr valign="top">
+        <th>Option</th>
+        <th>Description</th>
+        <th>Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr valign="top">
+        <td><b>Size of recently opened files list</b></td>
+        <td>Each file that is opened in an editor is stored in a list of recently used files in the <b>File</b> menu.
+        This option controls the number of files that is displayed in that list.</td>
+        <td>4</td>
+      </tr>
+      <tr valign="top">
+        <td><b>Close editors automatically</b></td>
+        <td>Specifies whether or not to re-use editors in the Workbench. If on, you may specify the number of editors
+        to use before they are recycled (the default is 8). You can also specify if a prompt dialog should be opened or
+        if a new editor should be opened when all editors are "dirty" (have unsaved changes). Once it is turned on, the
+        Pin Editor action is added to the toolbar and editor tab menu. Pinned editors are not recycled.</td>
+        <td>Off</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="ref-24.htm">Editor Area</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-13.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-13.htm
index bbc7ce6..35db981 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-13.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-13.htm
@@ -1,61 +1,45 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>File Associations</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-File Associations</H1>
-<P CLASS="Intro">
-On the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Editors &gt; File Associations</strong></a>
-preference page, you can add or remove file
-types recognized by the Workbench. You can also associate
-editors with file types in the file types list.</p>
-<DIV CLASS="Topic">
-<h2>
-File types list</h2>
-<UL CLASS="UnorderedList">
-    <LI CLASS="Item"> <strong>Add...</strong>: Adds a new file or file type 
-      (extension) to the predefined list. In the resulting New File Type dialog, 
-      type the name of a file or a file extension. If you are adding a file extension, 
-      you must type either a dot or a &quot;*.&quot; before the file type (e.g., 
-      &quot;.xml&quot; or &quot;*.xml&quot; as opposed to simply &quot;xml&quot;).</LI>
-    <LI CLASS="Item"><strong> Remove</strong>: Removes the selected file 
-      type from the list</LI>
-</UL>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Associated editors list</h2>
-  <UL CLASS="UnorderedList">
-    <LI CLASS="Item"> <strong>Add...</strong>: Adds a new editor to the 
-      list of editors associated with the file type selected above. In the resulting 
-      Editor Selection dialog, you can choose an editor to launch either inside 
-      the Workbench (internal) or outside the Workbench (external); click <b>Browse</b> 
-      to locate an editor yourself if the editor you want is not displayed in 
-      the list.</LI>
-    <LI CLASS="Item"> <strong>Remove</strong>: Removes the association between 
-      an editor and the file type selected above.<strong> Note:</strong> Any editor 
-      that is bound by content type may not be removed from this list. Currently, 
-      there is no mechanism available to remove these editors.</LI>
-    <LI CLASS="Item"> <strong>Default</strong>: Sets the selected editor 
-      as the default editor for the file type selected above. The editor moves 
-      to the top of the Associated Editors list to indicate that it is the default 
-      editor for that file type.</LI>
-  </UL>
-</DIV>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>File Associations</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">File Associations</h1>
+  <p class="Intro">On the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Editors &gt; File
+  Associations</strong></a> preference page, you can add or remove file types recognized by the Workbench. You can also
+  associate editors with file types in the file types list.</p>
+  <div class="Topic">
+    <h2>File types list</h2>
+    <ul class="UnorderedList">
+      <li class="Item"><strong>Add...</strong>: Adds a new file or file type (extension) to the predefined list. In the
+      resulting New File Type dialog, type the name of a file or a file extension. If you are adding a file extension,
+      you must type either a dot or a "*." before the file type (e.g., ".xml" or "*.xml" as opposed to simply
+      "xml").</li>
+      <li class="Item"><strong>Remove</strong>: Removes the selected file type from the list</li>
+    </ul>
+  </div>
+  <div class="Topic">
+    <h2>Associated editors list</h2>
+    <ul class="UnorderedList">
+      <li class="Item"><strong>Add...</strong>: Adds a new editor to the list of editors associated with the file type
+      selected above. In the resulting Editor Selection dialog, you can choose an editor to launch either inside the
+      Workbench (internal) or outside the Workbench (external); click <b>Browse</b> to locate an editor yourself if the
+      editor you want is not displayed in the list.</li>
+      <li class="Item"><strong>Remove</strong>: Removes the association between an editor and the file type selected
+      above. <strong>Note:</strong> Any editor that is bound by content type may not be removed from this list.
+      Currently, there is no mechanism available to remove these editors.</li>
+      <li class="Item"><strong>Default</strong>: Sets the selected editor as the default editor for the file type
+      selected above. The editor moves to the top of the Associated Editors list to indicate that it is the default
+      editor for that file type.</li>
+    </ul>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-14.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-14.htm
index 831327b..e012ae6 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-14.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-14.htm
@@ -1,101 +1,84 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Local History</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Local History</H1>
-<P CLASS="Intro"> The following preferences can be changed on the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileStates)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Workspace &gt; Local History</strong></a> preference page.</p>
-<TABLE BORDER="1" cellspacing="0">
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Limit history size</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">If enabled, then options below will be used to limit the local history size on disk.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Enabled</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para"> Days to keep files</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Indicates for how many days you want to maintain changes in the local history.
-History state older than this value will be lost.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-7 days</P>
-</TD>
-</TR>
-<TR>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Maximum entries per File</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Indicates how many history states per file you want to maintain in the local
-history. If you exceed this value, you will lose older history to make room
-for new history.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-50 entries</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para"> Maximum file size (MB)</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Indicates the maximum size of individual states in the history store. If a
-file is over this size, it will not be stored.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-1 MB</P>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-6a.htm">Local History</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Local History</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Local History</h1>
+  <p class="Intro">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileStates)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Workspace &gt;
+  Local History</strong></a> preference page.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Limit history size</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">If enabled, then options below will be used to limit the local history size on disk.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Enabled</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Days to keep files</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Indicates for how many days you want to maintain changes in the local history. History state
+          older than this value will be lost.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">7 days</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Maximum entries per File</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Indicates how many history states per file you want to maintain in the local history. If you
+          exceed this value, you will lose older history to make room for new history.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">50 entries</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Maximum file size (MB)</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Indicates the maximum size of individual states in the history store. If a file is over this
+          size, it will not be stored.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">1 MB</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="ref-6a.htm">Local History</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-14b.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-14b.htm
index df80a84..2adb8cb 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-14b.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-14b.htm
@@ -1,54 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Linked Resources</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Linked Resources</H1>
-<P CLASS="Intro">
-
-The 
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.LinkedResources)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Workspace &gt; Linked Resources</strong></a>
-
-preference page is used when working with 
-<a href="../concepts/concepts-13.htm">linked resources</a>. The preference 
-<b>Enable linked resources</b> is used to globally enable or disable the linked resource
-feature for the entire workspace.  By default, linked resources are enabled. If you
-disable linked resources, then you will not be able to create any new linked resources,
-or import existing projects that contain linked resources.
-</P>
-<P CLASS="Para">
-Not all versions of the workbench support linked resources and recognize them as such. 
-You may not want to use linked resources if you plan to share your workspace data with 
-other users. Disable this preference if they will not be able to work with linked resources.
-
-</P>
-<P CLASS="Para"> The remainder of this page is for defining <a href="../concepts/cpathvars.htm">path 
-  variables</a> that are used when creating linked resources. Use the <b>New</b> 
-  button to define new variables, the <b>Edit</b> button to change the value of 
-  an existing variable, and the <b>Remove</b> button to get rid of an existing 
-  variable. Note if you change a path variable that is currently in use, you will 
-  need to perform a local refresh on those projects to &quot;discover&quot; what 
-  is different in the file system. You can refresh a resource by opening the one 
-  of the navigation views' context menu for that resource and selecting <b>Refresh</b>. 
-  It is not recommended that you remove a path variable that is currently in use. 
-</P>
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/concepts-13.htm">Linked resources</a><br>
-<a href="../concepts/cpathvars.htm">Path variables</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Linked Resources</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Linked Resources</h1>
+  <p class="Intro">The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.LinkedResources)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Workspace &gt;
+  Linked Resources</strong></a> preference page is used when working with <a href="../concepts/concepts-13.htm">linked
+  resources</a>. The preference <b>Enable linked resources</b> is used to globally enable or disable the linked
+  resource feature for the entire workspace. By default, linked resources are enabled. If you disable linked resources,
+  then you will not be able to create any new linked resources, or import existing projects that contain linked
+  resources.</p>
+  <p class="Para">Not all versions of the workbench support linked resources and recognize them as such. You may not
+  want to use linked resources if you plan to share your workspace data with other users. Disable this preference if
+  they will not be able to work with linked resources.</p>
+  <p class="Para">The remainder of this page is for defining <a href="../concepts/cpathvars.htm">path variables</a>
+  that are used when creating linked resources. Use the <b>New</b> button to define new variables, the <b>Edit</b>
+  button to change the value of an existing variable, and the <b>Remove</b> button to get rid of an existing variable.
+  Note if you change a path variable that is currently in use, you will need to perform a local refresh on those
+  projects to "discover" what is different in the file system. You can refresh a resource by opening the one of the
+  navigation views' context menu for that resource and selecting <b>Refresh</b>. It is not recommended that you remove
+  a path variable that is currently in use.</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-13.htm">Linked resources</a><br>
+  <a href="../concepts/cpathvars.htm">Path variables</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-15.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-15.htm
index 1112547..c489f75 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-15.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-15.htm
@@ -1,152 +1,113 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Perspectives</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Perspectives</H1>
-<P CLASS="Para">
-On the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Perspectives)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Perspectives</strong></a>
-
-preference page, you can manage the various perspectives defined in the Workbench.</P>
-
-
-<TABLE BORDER="1" cellspacing="0">
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Open a new perspective
-</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Use this option to set what happens when you open a new perspective. Do you want the perspective opened within
-the current Workbench window or opened in a new window?
-</P>
-</TD>
-<TD>
-In the same window
-</TD>
-</TR>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-New project options
-</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Use this option to specify the perspective behavior when a new project is created. You can set it
-to switch the current perspective to be the one associated with the project type and 
-open the perspective in the same Workbench window as the current one, switch the perspective and
-open it in a new Workbench window, or not to switch perspectives at all.
-</P>
-</TD>
-<TD>
-Open perspective in the same window
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-
-
-<h2>Available Perspectives Options:</h2>
-<TABLE BORDER="1" cellspacing="0">
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Make Default</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Sets the selected perspective as the default perspective.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Resource</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Revert</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Resets the definition of the selected perspective to the default configuration. This option is only applicable 
-to built-in perspectives that have been overwritten using Window &gt; Perspective &gt; Save Perspective As...</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-n/a</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Delete</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Deletes the selected perspective. This option is only applicable to user-defined
-perspectives (built-in perspectives can not be deleted).</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-n/a</P>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-<h3 class="related">Related reference</h3>
-<a href="ref-6.htm">Perspectives</a>
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Perspectives</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Perspectives</h1>
+  <p class="Para">On the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Perspectives)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt;
+  Perspectives</strong></a> preference page, you can manage the various perspectives defined in the Workbench.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Open a new perspective</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Use this option to set what happens when you open a new perspective. Do you want the
+          perspective opened within the current Workbench window or opened in a new window?</p>
+        </td>
+        <td>In the same window</td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">New project options</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Use this option to specify the perspective behavior when a new project is created. You can
+          set it to switch the current perspective to be the one associated with the project type and open the
+          perspective in the same Workbench window as the current one, switch the perspective and open it in a new
+          Workbench window, or not to switch perspectives at all.</p>
+        </td>
+        <td>Open perspective in the same window</td>
+      </tr>
+    </tbody>
+  </table>
+  <h2>Available Perspectives Options:</h2>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Make Default</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Sets the selected perspective as the default perspective.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Resource</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Revert</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Resets the definition of the selected perspective to the default configuration. This option
+          is only applicable to built-in perspectives that have been overwritten using Window &gt; Perspective &gt;
+          Save Perspective As...</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">n/a</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Delete</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Deletes the selected perspective. This option is only applicable to user-defined perspectives
+          (built-in perspectives can not be deleted).</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">n/a</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="ref-6.htm">Perspectives</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-16.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-16.htm
index 5c86825..defecc9 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-16.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-16.htm
@@ -1,43 +1,41 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation, Red Hat, and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Appearance preference page</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation, Red Hat, and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Appearance preference page</title>
 </head>
-<body bgcolor="#ffffff">
-
-<h1 class="Head">Appearance preference page</h1>
-
-<p class="Para">You can change the following preference on the
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Views)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>General &gt; Appearance</strong></a> preferences page.
-</p>
-
-<table width="80%" border="1" cellspacing="0" cellpadding="5">
-<tr>
-<th>Option</th>
-<th>Description</th>
-<th>Default</th>
-</tr>
-<tr valign="top">
-<td><b>Theme</b></td>
-<td>Specify the currently active theme (look and feel).</td>
-<td>Dependent on the operating system</td>
-</tr>
-<tr valign="top">
-<td><b>Enable animations</b></td>
-<td>Specify if the animations should be enabled</td>
-<td>Disabled</td>
-</tr>
-<tr valign="top">
-<td><b>Use mixed fonts and colors for labels</b></td>
-<td>Specify if the fonts and colors for labels should be mixed</td>
-<td>Fonts and colors should be mixed</td>
-</tr>
-</table>
-
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Appearance preference page</h1>
+  <p class="Para">You can change the following preference on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Views)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>General &gt;
+  Appearance</strong></a> preferences page.</p>
+  <table width="80%" border="1" cellspacing="0" cellpadding="5">
+    <tr>
+      <th>Option</th>
+      <th>Description</th>
+      <th>Default</th>
+    </tr>
+    <tr valign="top">
+      <td><b>Theme</b></td>
+      <td>Specify the currently active theme (look and feel).</td>
+      <td>Dependent on the operating system</td>
+    </tr>
+    <tr valign="top">
+      <td><b>Enable animations</b></td>
+      <td>Specify if the animations should be enabled</td>
+      <td>Disabled</td>
+    </tr>
+    <tr valign="top">
+      <td><b>Use mixed fonts and colors for labels</b></td>
+      <td>Specify if the fonts and colors for labels should be mixed</td>
+      <td>Fonts and colors should be mixed</td>
+    </tr>
+  </table>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-17.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-17.htm
index 77b71e4..00f3c84 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-17.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-17.htm
@@ -1,103 +1,104 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Build</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Build</H1>
-
-<P CLASS="Para">On the
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.BuildOrder)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Workspace &gt; Build</strong></a> preferences page, you can configure how the projects inside the workspace will be built.</P>
-
-<TABLE BORDER="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Option</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Description</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Default</P></TH>
-    </TR>
-  </THEAD>
-  <TBODY>
-    <tr> 
-    <td>Build automatically</td>
-    <td>If this option is turned on, then the Workbench will perform an automatic 
-      build whenever a modified resource is saved.</td>
-    <td>On</td>
-  </tr>
-  <tr> 
-    <td>Save automatically before build</td>
-    <td>If this option is selected, when a manual build is performed the Workbench 
-      will automatically save all resources that have been modified since the 
-      last build was performed.<br></td>
-    <td>Off<br></td>
-  </tr>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Use default builder order</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          This option allows the platform to computes the build ordering. 
-          Turning off this option enables access to the projects list, the ordering 
-          of which can be manipulated. </P>
-          <P>Often the order in which projects are built is important. For
-example, if one project requires the Java classes which were defined in another
-project, the first project must be built after its prerequisite classes have
-been built. The Workbench allows users to explicitly define the order in
-which projects are built. Alternatively, users can let the platform compute the
-build order by interpreting project references as prerequisite relationships.
-The build order is applied for both building the entire workspace or for a group
-of projects.<P></TD>
-      <TD>On</TD>
-    </TR>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Project build order</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para">This 
-          option allows you to select projects and use the <b>Up</b> and <b>Down</b> 
-          buttons to change the build order. Add and remove projects in the build 
-          order using the <b>Add Project</b> and <b>Remove Project</b> buttons. 
-          Projects removed from the build order <i>will</i> be built, but they 
-          will be built after all projects in the build order are built.</P></TD>
-      <TD></TD>
-    </TR>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Max iterations when building with cycles</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para">This 
-          preference allows you to deal with build orders that contain cycles. 
-          Ideally, you should avoid cyclic references between projects. Projects 
-          with cycles really logically belong to a single project, and so they 
-          should be collapsed into a single project if possible. However, if you 
-          absolutely must have cycles, it may take several iterations of the build 
-          order to correctly build everything. Changing this preference will alter 
-          the maximum number of times the workbench will attempt to iterate over 
-          the build order before giving up.</P></TD>
-      <TD> 10</TD>
-    </TR>
-    <TR>
-      <TD>Max simultaneous project builds</TD>
-      <TD>Under some safe circumstances, the workspace can chose to build independent projects in parallel. In such
-      case, this preference controls the maximum amount of jobs/threads that will be running builds in parallel. A value of
-      <code>1</code> indicates that build won't be parallelized and keeps the legacy behavior.</p>
-      <p>The optimal value depends on your machine and workspace projects specificities. We do recommend to try relatively
-      low values (such as <code>4</code>) first which already allow to save time, when projects allow it, while not risking to
-      overload your CPU.</TD>
-      <TD>1</TD>
-  </TBODY>
-</TABLE>
-<h3 class="related">Related reference</h3>
-<a href="ref-5.htm">Builds</a><br>
-<a href="ref-59.htm">Project menu</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Build</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Build</h1>
+  <p class="Para">On the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.BuildOrder)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Workspace &gt;
+  Build</strong></a> preferences page, you can configure how the projects inside the workspace will be built.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Build automatically</td>
+        <td>If this option is turned on, then the Workbench will perform an automatic build whenever a modified
+        resource is saved.</td>
+        <td>On</td>
+      </tr>
+      <tr>
+        <td>Save automatically before build</td>
+        <td>If this option is selected, when a manual build is performed the Workbench will automatically save all
+        resources that have been modified since the last build was performed.<br></td>
+        <td>Off<br></td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Use default builder order</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This option allows the platform to computes the build ordering. Turning off this option
+          enables access to the projects list, the ordering of which can be manipulated.</p>
+          <p>Often the order in which projects are built is important. For example, if one project requires the Java
+          classes which were defined in another project, the first project must be built after its prerequisite classes
+          have been built. The Workbench allows users to explicitly define the order in which projects are built.
+          Alternatively, users can let the platform compute the build order by interpreting project references as
+          prerequisite relationships. The build order is applied for both building the entire workspace or for a group
+          of projects.</p>
+        </td>
+        <td>On</td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Project build order</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This option allows you to select projects and use the <b>Up</b> and <b>Down</b> buttons to
+          change the build order. Add and remove projects in the build order using the <b>Add Project</b> and <b>Remove
+          Project</b> buttons. Projects removed from the build order <i>will</i> be built, but they will be built after
+          all projects in the build order are built.</p>
+        </td>
+        <td></td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Max iterations when building with cycles</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This preference allows you to deal with build orders that contain cycles. Ideally, you should
+          avoid cyclic references between projects. Projects with cycles really logically belong to a single project,
+          and so they should be collapsed into a single project if possible. However, if you absolutely must have
+          cycles, it may take several iterations of the build order to correctly build everything. Changing this
+          preference will alter the maximum number of times the workbench will attempt to iterate over the build order
+          before giving up.</p>
+        </td>
+        <td>10</td>
+      </tr>
+      <tr>
+        <td>Max simultaneous project builds</td>
+        <td>
+          Under some safe circumstances, the workspace can chose to build independent projects in parallel. In such
+          case, this preference controls the maximum amount of jobs/threads that will be running builds in parallel. A
+          value of <code>1</code> indicates that build won't be parallelized and keeps the legacy behavior.
+          <p>The optimal value depends on your machine and workspace projects specificities. We do recommend to try
+          relatively low values (such as <code>4</code>) first which already allow to save time, when projects allow
+          it, while not risking to overload your CPU.</p>
+        </td>
+        <td>1</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="ref-5.htm">Builds</a><br>
+  <a href="ref-59.htm">Project menu</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19.htm
index 9a17c97..acc3ba3 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19.htm
@@ -1,108 +1,106 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Team</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Team</H1>
-<P CLASS="Para"> The
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.ui.TeamPreferences)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Version Control (Team)</strong></a>
-
-preferences page contains options which 
-  affect the version management support.</P>
-<TABLE BORDER="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Option</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Description</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Default</P></TH>
-    </TR>
-  </THEAD>
-  <TBODY>
-    <TR> 
-      <TD COLSPAN="1" valign="top" align="left">Show all synchronization information 
-        in a resource's text label</TD>
-      <TD COLSPAN="1" valign="top" align="left">Use this option to have the synchronization 
-        state of a resource displayed as text in the resource's label. By default, 
-        only an icon decorator is used to identify a resource's synchronization 
-        state.</TD>
-      <TD COLSPAN="1" valign="top" align="left">Disabled</TD>
-    </TR>
-  	<TR> 
-      <TD COLSPAN="1" valign="top" align="left">Show the file author in compare
-      editors</TD>
-      <TD COLSPAN="1" valign="top" align="left">Use this option to display the file
-      author in all compare editors opened by an action on a repository provider (if 
-      supported by the repository provider)</TD>
-      <TD COLSPAN="1" valign="top" align="left">Disabled</TD>
-    </TR>
-  	<TR> 
-      <TD COLSPAN="1" valign="top" align="left">When editing file in non-shared projects, automatically make files writable if prompting is not possible</TD>
-      <TD COLSPAN="1" valign="top" align="left">Use this option to make the file 
-      writable in a non-shared project if prompting is not possible.</TD>
-      <TD COLSPAN="1" valign="top" align="left">Disabled</TD>
-    </TR>
-  	<TR> 
-      <TD COLSPAN="1" valign="top" align="left">Reuse open compare editors when opening comparisons</TD>
-      <TD COLSPAN="1" valign="top" align="left">Use this option to have a new comparison open in an existing 
-      compare editor. Enabling this option will decrease number of compare editors open.</TD>
-      <TD COLSPAN="1" valign="top" align="left">Enabled</TD>
-    </TR>    
-  	<TR> 
-      <TD COLSPAN="1" valign="top" align="left">Run Project Set import in the background</TD>
-      <TD COLSPAN="1" valign="top" align="left">Use this option to run Project Set import in the background.</TD>
-      <TD COLSPAN="1" valign="top" align="left">Disabled</TD>
-    </TR>         
-  	<TR> 
-      <TD COLSPAN="1" valign="top" align="left">Apply Patch in Synchronize view</TD>
-      <TD COLSPAN="1" valign="top" align="left">Use this option to preview patch changes in the Synchronize view.</TD>
-      <TD COLSPAN="1" valign="top" align="left">Disabled</TD>
-    </TR>
-    <TR> 
-      <TD COLSPAN="1" valign="top" align="left">Choose the presentation to be used when displaying 
-        Workspace projects</TD>
-      <TD COLSPAN="1" valign="top" align="left">Use this option to configure the 
-        default layout used when a synchronization is first added to the Synchronize 
-        view. The layout can be subsequently changed in the view drop down menu.</TD>
-      <TD COLSPAN="1" valign="top" align="left">Compressed Folders</TD>
-    </TR>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Open the associated perspective when a synchronize operation completes</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para">Use 
-          this option to configure what happens when a synchronization operation 
-          is run. The options are:</P>
-        <ul>
-          <li><strong class="Para">Always</strong>: always switch perspectives</li>
-          <li><strong class="Para">Never</strong>: never switch perspectives</li>
-          <li><strong class="Para">Prompt</strong>: prompt to switch perspectives</li>
-        </ul></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Prompt</P></TD>
-    </TR>
-    <TR> 
-      <TD COLSPAN="1" valign="top" align="left">Perspectives</TD>
-      <TD COLSPAN="1" valign="top" align="left">Use this option to configure which 
-        perspective is to be shown when a synchronize operation is run.</TD>
-      <TD COLSPAN="1" valign="top" align="left">Team Synchronizing</TD>
-    </TR>
-  </TBODY>
-</TABLE>
-<h3 class="related">Related reference</h3>
-<a href="ref-33.htm">CVS Synchronize view</a><br> 
-<a href="ref-6.htm">Perspectives</a> 
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Team</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Team</h1>
+  <p class="Para">The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.ui.TeamPreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Version Control
+  (Team)</strong></a> preferences page contains options which affect the version management support.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td colspan="1" valign="top" align="left">Show all synchronization information in a resource's text label</td>
+        <td colspan="1" valign="top" align="left">Use this option to have the synchronization state of a resource
+        displayed as text in the resource's label. By default, only an icon decorator is used to identify a resource's
+        synchronization state.</td>
+        <td colspan="1" valign="top" align="left">Disabled</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left">Show the file author in compare editors</td>
+        <td colspan="1" valign="top" align="left">Use this option to display the file author in all compare editors
+        opened by an action on a repository provider (if supported by the repository provider)</td>
+        <td colspan="1" valign="top" align="left">Disabled</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left">When editing file in non-shared projects, automatically make files
+        writable if prompting is not possible</td>
+        <td colspan="1" valign="top" align="left">Use this option to make the file writable in a non-shared project if
+        prompting is not possible.</td>
+        <td colspan="1" valign="top" align="left">Disabled</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left">Reuse open compare editors when opening comparisons</td>
+        <td colspan="1" valign="top" align="left">Use this option to have a new comparison open in an existing compare
+        editor. Enabling this option will decrease number of compare editors open.</td>
+        <td colspan="1" valign="top" align="left">Enabled</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left">Run Project Set import in the background</td>
+        <td colspan="1" valign="top" align="left">Use this option to run Project Set import in the background.</td>
+        <td colspan="1" valign="top" align="left">Disabled</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left">Apply Patch in Synchronize view</td>
+        <td colspan="1" valign="top" align="left">Use this option to preview patch changes in the Synchronize
+        view.</td>
+        <td colspan="1" valign="top" align="left">Disabled</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left">Choose the presentation to be used when displaying Workspace
+        projects</td>
+        <td colspan="1" valign="top" align="left">Use this option to configure the default layout used when a
+        synchronization is first added to the Synchronize view. The layout can be subsequently changed in the view drop
+        down menu.</td>
+        <td colspan="1" valign="top" align="left">Compressed Folders</td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Open the associated perspective when a synchronize operation completes</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Use this option to configure what happens when a synchronization operation is run. The
+          options are:</p>
+          <ul>
+            <li><strong class="Para">Always</strong>: always switch perspectives</li>
+            <li><strong class="Para">Never</strong>: never switch perspectives</li>
+            <li><strong class="Para">Prompt</strong>: prompt to switch perspectives</li>
+          </ul>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Prompt</p>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left">Perspectives</td>
+        <td colspan="1" valign="top" align="left">Use this option to configure which perspective is to be shown when a
+        synchronize operation is run.</td>
+        <td colspan="1" valign="top" align="left">Team Synchronizing</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="ref-33.htm">CVS Synchronize view</a><br>
+  <a href="ref-6.htm">Perspectives</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-annotate.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-annotate.htm
index cf034eb..33a53bb 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-annotate.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-annotate.htm
@@ -1,50 +1,50 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>CVS Annotate</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">CVS Annotate</H1>
-<P class="Para">The following preference can be changed on the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.AnnotatePreferences)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Team &gt; CVS &gt; Annotate</strong></a>
-
-preference page.</P>
-<TABLE border="1" cellspacing="0">
-<THEAD>
-    <TR> 
-      <TH width="164"> <P class="Para">Option</P></TH>
-      <TH width="490"> <P class="Para">Description</P></TH>
-      <TH width="152"> <P class="Para">Default</P></TH>
-    </TR>
-  </THEAD>
-  <TR> 
-    <TD valign="top" align="left">Attempt to annotate a binary file</TD>
-    <TD valign="top" align="left">Use this option to configure whether the annotate operation should attempt to annotate
-    a binary file. The choices are:
-    <ul>
-      <li><strong>Yes:</strong> Always attempt to annotate a binary file.</li>
-      <li><strong>No:</strong> Never attempt to annotate a binary file.</li>
-      <li><strong>Prompt:</strong> Prompt user whether to attempt to annotate a binary file.</li>
-    </ul></TD>
-    <TD valign="top" align="left">Prompt</TD>
-  </TR>
-</TABLE>
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/concepts-cvs-watch.htm">Watch/Edit</a>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-cvs-watch.htm">Finding out who's working on what: watch/edit</a>
-
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>CVS Annotate</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS Annotate</h1>
+  <p class="Para">The following preference can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.AnnotatePreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; CVS &gt;
+  Annotate</strong></a> preference page.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th width="164">
+          <p class="Para">Option</p>
+        </th>
+        <th width="490">
+          <p class="Para">Description</p>
+        </th>
+        <th width="152">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <td valign="top" align="left">Attempt to annotate a binary file</td>
+      <td valign="top" align="left">
+        Use this option to configure whether the annotate operation should attempt to annotate a binary file. The
+        choices are:
+        <ul>
+          <li><strong>Yes:</strong> Always attempt to annotate a binary file.</li>
+          <li><strong>No:</strong> Never attempt to annotate a binary file.</li>
+          <li><strong>Prompt:</strong> Prompt user whether to attempt to annotate a binary file.</li>
+        </ul>
+      </td>
+      <td valign="top" align="left">Prompt</td>
+    </tr>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-cvs-watch.htm">Watch/Edit</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-cvs-watch.htm">Finding out who's working on what:
+  watch/edit</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-commenttemplates.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-commenttemplates.htm
index 0f5dd01..9f0fb53 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-commenttemplates.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-commenttemplates.htm
@@ -1,46 +1,46 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>CVS Comment Templates</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">CVS Comment Templates</H1>
-<P class="Para">The
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.CommentTemplatesPreferences)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Team &gt; CVS &gt; Comment Templates</strong></a>
-
-preference page allows you to create, edit and remove
-comments that will show up in the comments section of the commit dialog. This can be helpful if
-you need to enter the same string (or some part of a string) for a comment in all commits.</P>
-<TABLE border="1" cellspacing="0">
-<THEAD>
-    <TR> 
-      <TH width="240"> <P class="Para">Button</P></TH>
-      <TH width="566"> <P class="Para">Description</P></TH>
-    </TR>
-  </THEAD>
-  <TR> 
-    <TD valign="top" align="left">New...</TD>
-    <TD valign="top" align="left">Opens the 'Enter Template Comment' dialog which allows you to enter
-    a new comment.</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Edit...</TD>
-    <TD valign="top" align="left">Opens the selected comment in the 'Enter Template Comment' dialog.</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Remove</TD>
-    <TD valign="top" align="left"> Removes the selected comment.</TD>
-  </TR>
-</TABLE>
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>CVS Comment Templates</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS Comment Templates</h1>
+  <p class="Para">The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.CommentTemplatesPreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; CVS &gt; Comment
+  Templates</strong></a> preference page allows you to create, edit and remove comments that will show up in the
+  comments section of the commit dialog. This can be helpful if you need to enter the same string (or some part of a
+  string) for a comment in all commits.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th width="240">
+          <p class="Para">Button</p>
+        </th>
+        <th width="566">
+          <p class="Para">Description</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <td valign="top" align="left">New...</td>
+      <td valign="top" align="left">Opens the 'Enter Template Comment' dialog which allows you to enter a new
+      comment.</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Edit...</td>
+      <td valign="top" align="left">Opens the selected comment in the 'Enter Template Comment' dialog.</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Remove</td>
+      <td valign="top" align="left">Removes the selected comment.</td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-console.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-console.htm
index 9f12136..6ba71bf 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-console.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-console.htm
@@ -1,63 +1,62 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>CVS Console</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">CVS Console</H1>
-<P class="Para">The following preferences can be changed on the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.ConsolePreferences)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Team &gt; CVS &gt; Console</strong></a>
-
-preference page.</P>
-<TABLE width="100%" border="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH> <P class="Para">Option</P></TH>
-      <TH> <P class="Para">Description</P></TH>
-      <TH>Default</TH>
-    </TR>
-  </THEAD>
-  <TR> 
-    <TD valign="top" align="left">Fixed width</TD>
-    <TD valign="top" align="left">Use this option to fix the width of console 
-      lines. Enabling this option allows the width to be specified. The default 
-      width is 80.</TD>
-    <TD valign="top" align="left">Disabled</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Limit console output</TD>
-    <TD valign="top" align="left">Use this option to limit the number of characters 
-      to be buffered by the console. The default buffer size is 500000.</TD>
-    <TD valign="top" align="left">Enabled</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Show CVS output in Console view</TD>
-    <TD valign="top" align="left">Use this option to show the output of CVS commands 
-      in the Console view. Enabling this option may show useful information but 
-      will slow down command operation.</TD>
-    <TD valign="top" align="left">Disabled</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Console text color settings</TD>
-    <TD valign="top" align="left">Use these options to change the colors for the 
-      text shown in CVS Console. 
-      <UL>
-        <LI>Command line text <I>(black)</I></li>
-        <LI>Message text <I>(blue)</I></li> 
-        <LI>Error text <I>(red)</I></LI>
-      </UL></TD>
-    <TD valign="top" align="left"></TD>
-  </TR>
-</TABLE>
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>CVS Console</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS Console</h1>
+  <p class="Para">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.ConsolePreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; CVS &gt;
+  Console</strong></a> preference page.</p>
+  <table width="100%" border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th>
+          <p class="Para">Option</p>
+        </th>
+        <th>
+          <p class="Para">Description</p>
+        </th>
+        <th>Default</th>
+      </tr>
+    </thead>
+    <tr>
+      <td valign="top" align="left">Fixed width</td>
+      <td valign="top" align="left">Use this option to fix the width of console lines. Enabling this option allows the
+      width to be specified. The default width is 80.</td>
+      <td valign="top" align="left">Disabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Limit console output</td>
+      <td valign="top" align="left">Use this option to limit the number of characters to be buffered by the console.
+      The default buffer size is 500000.</td>
+      <td valign="top" align="left">Enabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Show CVS output in Console view</td>
+      <td valign="top" align="left">Use this option to show the output of CVS commands in the Console view. Enabling
+      this option may show useful information but will slow down command operation.</td>
+      <td valign="top" align="left">Disabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Console text color settings</td>
+      <td valign="top" align="left">
+        Use these options to change the colors for the text shown in CVS Console.
+        <ul>
+          <li>Command line text <i>(black)</i></li>
+          <li>Message text <i>(blue)</i></li>
+          <li>Error text <i>(red)</i></li>
+        </ul>
+      </td>
+      <td valign="top" align="left"></td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-decorations.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-decorations.htm
index d107967..7f1892e 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-decorations.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-decorations.htm
@@ -1,54 +1,49 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>CVS Labels Decorations</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">CVS Label Decorations</H1>
-<P class="Para">The following preferences can be changed on the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.CVSDecoratorPreferences)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Team &gt; CVS &gt; Label Decorations</strong></a>
-
-preference page.</P>
-<TABLE width="100%" border="1" cellspacing="0">
-  <TR> 
-    <TD valign="top" align="left">General </TD>
-    <TD valign="top" align="left"> Use the options on this page to configure general 
-      preferences about the decorators: 
-      <ul>
-        <li><STRONG>Compute deep outgoing state for folders: </STRONG>Use this 
-          option to configure if the outgoing indicators on folders should be 
-          calculated. Disabling this option improves the performance of the decorators 
-          because calculating the dirty state for folders requires computing the 
-          dirty state for all child resources. (<EM>enabled by default</EM>)</li>
-        <li><strong>Enable font and color decorations: </strong>Use this option 
-          to enable font and color decorations. The colors and fonts used for 
-          outgoing changes, ignored resources, etc. can be configured on the 
-          <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.ColorsAndFonts)")'>
-    	<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-    	<b>General &gt; Appearance &gt; Colors and Fonts</b></a> preference page</li>
-      </ul></TD>
-  </TR>
-  <TR> 
-    <TD valign="middle" align="left">Text </TD>
-    <TD valign="top" align="left"> Use the options on this page to configure how 
-      CVS information will be added to text labels.</TD>
-  </TR>
-  <TR> 
-    <TD valign="middle" align="left">Icons </TD>
-    <TD valign="top" align="left">Use the options on this page to configure the 
-      which icons can be used as overlays to show CVS specific information in 
-      views. </TD>
-  </TR>
-</TABLE>
-</BODY>
-</HTML>
\ No newline at end of file
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>CVS Labels Decorations</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS Label Decorations</h1>
+  <p class="Para">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.CVSDecoratorPreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; CVS &gt; Label
+  Decorations</strong></a> preference page.</p>
+  <table width="100%" border="1" cellspacing="0">
+    <tr>
+      <td valign="top" align="left">General</td>
+      <td valign="top" align="left">
+        Use the options on this page to configure general preferences about the decorators:
+        <ul>
+          <li><strong>Compute deep outgoing state for folders:</strong> Use this option to configure if the outgoing
+          indicators on folders should be calculated. Disabling this option improves the performance of the decorators
+          because calculating the dirty state for folders requires computing the dirty state for all child resources.
+          (<em>enabled by default</em>)</li>
+          <li><strong>Enable font and color decorations:</strong> Use this option to enable font and color decorations.
+          The colors and fonts used for outgoing changes, ignored resources, etc. can be configured on the <a class=
+          "command-link" href=
+          'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.ColorsAndFonts)")'>
+          <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General &gt; Appearance &gt;
+          Colors and Fonts</b></a> preference page</li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td valign="middle" align="left">Text</td>
+      <td valign="top" align="left">Use the options on this page to configure how CVS information will be added to text
+      labels.</td>
+    </tr>
+    <tr>
+      <td valign="middle" align="left">Icons</td>
+      <td valign="top" align="left">Use the options on this page to configure the which icons can be used as overlays
+      to show CVS specific information in views.</td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-ext.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-ext.htm
index f7d121e..582e335 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-ext.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-ext.htm
@@ -1,65 +1,56 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>CVS Ext Connection Method</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">CVS Ext Connection Method</H1>
-<P class="Para">The following preferences can be changed on the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.ExtMethodPreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Team &gt; CVS &gt; Ext Connection Method</strong></a>
-  
-preference page.</P>
-<TABLE border="1" cellspacing="0">
-  <TR> 
-    <TD width="150" align="left" valign="top">Use external program vs. Use internal 
-      connection method </TD>
-    <TD width="650" align="left" valign="top">This page allows you to configure 
-      the ext connection method to use an external program or another connection 
-      method to to connect to a server. The later option is provided to allow 
-      custom connection method such as extssh to remain compatible with external 
-      CVS client tools.</TD>
-    <TD width="65" valign="top">Use external program</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">CVS_RSH </TD>
-    <TD valign="top" align="left"> Use this option to configure the program that 
-      will be called to connect to the remote CVS server. The RSH command is invoked 
-      with following calling pattern: 
-      <P><EM>CVS_RSH Parameters CVS_SERVER</EM></P></TD>
-    <TD valign="top">ssh </TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Parameters </TD>
-    <TD valign="top" align="left"> Use this option to configure the parameters 
-      passed to the CVS_RSH program. The default parameter pattern is {host} -l 
-      {user}. It can be tailored using the {host}, {user}, {password} and {port} 
-      variables.</TD>
-    <TD valign="top">-l {host} {user} </TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">CVS_SERVER </TD>
-    <TD valign="top" align="left">Use this option to configure the name of the 
-      remote CVS server program to run. Change this setting only if the remote 
-      CVS server binary name is different than the default. </TD>
-    <TD valign="top">cvs </TD>
-  </TR>
-  <TR>
-    <TD valign="top" align="left">Connection type</TD>
-    <TD valign="top" align="left">Use this option to set the connection method 
-      to be used for repository locations that use the ext connection method, 
-      if the option to use another connection method is enabled.</TD>
-    <TD>pserver</TD>
-  </TR>
-</TABLE>
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>CVS Ext Connection Method</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS Ext Connection Method</h1>
+  <p class="Para">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.ExtMethodPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; CVS &gt; Ext
+  Connection Method</strong></a> preference page.</p>
+  <table border="1" cellspacing="0">
+    <tr>
+      <td width="150" align="left" valign="top">Use external program vs. Use internal connection method</td>
+      <td width="650" align="left" valign="top">This page allows you to configure the ext connection method to use an
+      external program or another connection method to to connect to a server. The later option is provided to allow
+      custom connection method such as extssh to remain compatible with external CVS client tools.</td>
+      <td width="65" valign="top">Use external program</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">CVS_RSH</td>
+      <td valign="top" align="left">
+        Use this option to configure the program that will be called to connect to the remote CVS server. The RSH
+        command is invoked with following calling pattern:
+        <p><em>CVS_RSH Parameters CVS_SERVER</em></p>
+      </td>
+      <td valign="top">ssh</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Parameters</td>
+      <td valign="top" align="left">Use this option to configure the parameters passed to the CVS_RSH program. The
+      default parameter pattern is {host} -l {user}. It can be tailored using the {host}, {user}, {password} and {port}
+      variables.</td>
+      <td valign="top">-l {host} {user}</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">CVS_SERVER</td>
+      <td valign="top" align="left">Use this option to configure the name of the remote CVS server program to run.
+      Change this setting only if the remote CVS server binary name is different than the default.</td>
+      <td valign="top">cvs</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Connection type</td>
+      <td valign="top" align="left">Use this option to set the connection method to be used for repository locations
+      that use the ext connection method, if the option to use another connection method is enabled.</td>
+      <td>pserver</td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-sync.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-sync.htm
index e37b0ac..20d00c3 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-sync.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-sync.htm
@@ -1,82 +1,80 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html lang="en"><head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css"><link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"><title>CVS Synchronize/Compare</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>																						  
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>CVS Synchronize/Compare</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
 </head>
-
-
-<body bgcolor="#ffffff">
-<h1 class="Head">CVS Synchronize/Compare</h1>
-<p class="Para">The following preferences can be changed on the
-
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.ComparePreferences)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>Team &gt; CVS &gt; Synchronize/Compare</strong></a>
-
-  preference page.</p>
-<table border="1" cellspacing="0" width="100%">
-<thead>
-    <tr> 
-      <th width="164"> <p class="Para">Option</p></th>
-      <th width="490"> <p class="Para">Description</p></th>
-      <th width="152"> <p class="Para">Default</p></th>
-    </tr>
-  </thead>
-  <tbody><tr> 
-    <td align="left" valign="top" width="21%">Only look at timestamps to detect changes</td>
-    <td align="left" valign="top" width="58%">For more precise comparison,
-      the contents can be compared. If performance is an issue this can be enabled
-      to use the much faster time stamp based comparison. This option only applies
-      to comparisons of remote resources or when comparing a selected project or folder
-      with a branch or version. The option is not honored in synchronizations launched
-      using the <b>Team &gt; Synchronize</b> menu command, the <b>Synchronize</b> toolbar command
-      or the <b>Compare With &gt; Latest From &lt;branch/version&gt;</b> menu command.</td>
-    <td align="left" valign="top" width="21%">Disabled</td>
-  </tr>
-  <tr>
-    <td align="left" valign="top">Regular expression to ignore changes in synchronizations</td>
-    <td align="left" valign="top">This option controls which changes should be ignored during
-    content-based synchronizations i.e. when <b>Only look at timestamps to detect changes</b> is
-    disabled. If at least one side of the change matches the defined regular expression, the change
-    will be ignored.</td>
-    <td align="left" valign="top"></td>
-  </tr>
-  <tr> 
-    <td align="left" valign="top">Show revision comparisons in dialog</td>
-    <td align="left" valign="top">Use this this option to show revision comparisons 
-      in a dialog instead of a compare editor.</td>
-    <td align="left" valign="top">Disabled</td>
-  </tr>
-  <tr> 
-    <td align="left" valign="top">Automatically enable change set grouping in CVS synchronizations</td>
-    <td align="left" valign="top">Use the option to have change sets enabled by 
-      default in those CVS synchronizations that support them.</td>
-    <td align="left" valign="top">Disabled</td>
-  </tr><tr>
-      <td style="vertical-align: top;">Allow models (e.g. Java) to participate in synchronizations<br>
-      </td>
-      <td style="vertical-align: top;">Use this option to display model
-elements (such as Java packages) in the sync view. If this
-element is disabled, only resources will be shown in the sync view.<br>
-      </td>
-      <td style="vertical-align: top;">Enabled<br>
-      </td>
-    </tr>
-    <tr> 
-    	<td align="left" valign="top">Open a compare editor when comparing a single file</td>
-    	<td align="left" valign="top">Use this this option to open a compare editor when comparing a single file. 
-    	If disabled, the results of the comparison will be displayed in the Synchronize view.</td>
-    	<td align="left" valign="top">Enabled</td>
-  	</tr>
-
-</tbody></table>
-<h3 class="related">Related reference</h3>
-<a href="ref-19.htm">Team</a><br>
-<a href="ref-33.htm">CVS Workspace Synchronization</a><br>
-<a href="ref-33a.htm">CVS Merge Synchronization</a>
-
-</body></html>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS Synchronize/Compare</h1>
+  <p class="Para">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.ComparePreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; CVS &gt;
+  Synchronize/Compare</strong></a> preference page.</p>
+  <table border="1" cellspacing="0" width="100%">
+    <thead>
+      <tr>
+        <th width="164">
+          <p class="Para">Option</p>
+        </th>
+        <th width="490">
+          <p class="Para">Description</p>
+        </th>
+        <th width="152">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td align="left" valign="top" width="21%">Only look at timestamps to detect changes</td>
+        <td align="left" valign="top" width="58%">For more precise comparison, the contents can be compared. If
+        performance is an issue this can be enabled to use the much faster time stamp based comparison. This option
+        only applies to comparisons of remote resources or when comparing a selected project or folder with a branch or
+        version. The option is not honored in synchronizations launched using the <b>Team &gt; Synchronize</b> menu
+        command, the <b>Synchronize</b> toolbar command or the <b>Compare With &gt; Latest From
+        &lt;branch/version&gt;</b> menu command.</td>
+        <td align="left" valign="top" width="21%">Disabled</td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">Regular expression to ignore changes in synchronizations</td>
+        <td align="left" valign="top">This option controls which changes should be ignored during content-based
+        synchronizations i.e. when <b>Only look at timestamps to detect changes</b> is disabled. If at least one side
+        of the change matches the defined regular expression, the change will be ignored.</td>
+        <td align="left" valign="top"></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">Show revision comparisons in dialog</td>
+        <td align="left" valign="top">Use this this option to show revision comparisons in a dialog instead of a
+        compare editor.</td>
+        <td align="left" valign="top">Disabled</td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">Automatically enable change set grouping in CVS synchronizations</td>
+        <td align="left" valign="top">Use the option to have change sets enabled by default in those CVS
+        synchronizations that support them.</td>
+        <td align="left" valign="top">Disabled</td>
+      </tr>
+      <tr>
+        <td style="vertical-align: top;">Allow models (e.g. Java) to participate in synchronizations<br></td>
+        <td style="vertical-align: top;">Use this option to display model elements (such as Java packages) in the sync
+        view. If this element is disabled, only resources will be shown in the sync view.<br></td>
+        <td style="vertical-align: top;">Enabled<br></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">Open a compare editor when comparing a single file</td>
+        <td align="left" valign="top">Use this this option to open a compare editor when comparing a single file. If
+        disabled, the results of the comparison will be displayed in the Synchronize view.</td>
+        <td align="left" valign="top">Enabled</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="ref-19.htm">Team</a><br>
+  <a href="ref-33.htm">CVS Workspace Synchronization</a><br>
+  <a href="ref-33a.htm">CVS Merge Synchronization</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-updatemerge.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-updatemerge.htm
index 19c2a4e..e37458f 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-updatemerge.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-updatemerge.htm
@@ -1,70 +1,57 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>CVS Update/Merge</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">CVS Update/Merge</H1>
-<P CLASS="Para"> The
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.UpdateMergePreferences)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Team &gt; CVS &gt; Update/Merge</strong></a>
-
-preferences page contains options which 
-  affect the update/merge workflows.</P>
-<TABLE BORDER="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH ROWSPAN="1" COLSPAN="1">Option</TH>
-      <TH ROWSPAN="1" COLSPAN="1">Description</TH>
-      <TH ROWSPAN="1" COLSPAN="1">Default</TH>
-    </TR>
-  </THEAD>
-  <TBODY>
-  	<TR> 
-      <TD COLSPAN="1" valign="top" align="left">When performing an update</TD>
-      <TD COLSPAN="1" valign="top" align="left">Use this option to select what the workflow
-      should be for performing an update. The options are:
-      <ul>
-          <li><strong>Preview all incoming changes before updating</strong>:
-          <br>All incoming changes are displayed in either the synchronize view or a dialog. You must explicitly
-          select which resources to update and deal with conflicts.</li>
-       
-          <li><strong>Update all non-conflicting changes and preview remaining updates</strong>:
-          <br>All non-conflicting resources are updated automatically and a list of conflicts (if applicable) are presented to you in
-          either the synchronize view or a dialog.</li>
-        
-          <li><strong>Never preview and use CVS text markup to indicate conflicts</strong>: 
-          <br>All non-conflicting resources are updated automatically and conflicts are dealt with by adding the conflicting code to the file
-          and using CVS text markup to delineate the boundaries of the conflict. You must then go through each file that had a conflict, look
-          for the markup, and manually merge the contents.</li>
-        </ul>
-      </TD>
-      <TD COLSPAN="1" valign="top" align="left">Never preview and use CVS text markup to indicate conflicts</TD>
-    </TR>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> 
-          When an update preview is required</TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> Use 
-          this option to configure how to preview incoming changes. Changes can be previewed in
-          a dialog or in the Synchronize view.
-	 </TD>	  
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> 
-          Preview updates in the Synchronize view.</TD>
-    </TR>
-  </TBODY>
-</TABLE>
-<h3 class="related">Related reference</h3>
-<a href="ref-33.htm">CVS Synchronize view</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>CVS Update/Merge</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS Update/Merge</h1>
+  <p class="Para">The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.UpdateMergePreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; CVS &gt;
+  Update/Merge</strong></a> preferences page contains options which affect the update/merge workflows.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">Option</th>
+        <th rowspan="1" colspan="1">Description</th>
+        <th rowspan="1" colspan="1">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td colspan="1" valign="top" align="left">When performing an update</td>
+        <td colspan="1" valign="top" align="left">
+          Use this option to select what the workflow should be for performing an update. The options are:
+          <ul>
+            <li><strong>Preview all incoming changes before updating</strong>:<br>
+            All incoming changes are displayed in either the synchronize view or a dialog. You must explicitly select
+            which resources to update and deal with conflicts.</li>
+            <li><strong>Update all non-conflicting changes and preview remaining updates</strong>:<br>
+            All non-conflicting resources are updated automatically and a list of conflicts (if applicable) are
+            presented to you in either the synchronize view or a dialog.</li>
+            <li><strong>Never preview and use CVS text markup to indicate conflicts</strong>:<br>
+            All non-conflicting resources are updated automatically and conflicts are dealt with by adding the
+            conflicting code to the file and using CVS text markup to delineate the boundaries of the conflict. You
+            must then go through each file that had a conflict, look for the markup, and manually merge the
+            contents.</li>
+          </ul>
+        </td>
+        <td colspan="1" valign="top" align="left">Never preview and use CVS text markup to indicate conflicts</td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">When an update preview is required</td>
+        <td rowspan="1" colspan="1" valign="top" align="left">Use this option to configure how to preview incoming
+        changes. Changes can be previewed in a dialog or in the Synchronize view.</td>
+        <td rowspan="1" colspan="1" valign="top" align="left">Preview updates in the Synchronize view.</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="ref-33.htm">CVS Synchronize view</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-watch-edit.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-watch-edit.htm
index d548c22..7e53521 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-watch-edit.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs-watch-edit.htm
@@ -1,96 +1,94 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>CVS Watch/Edit</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">CVS Watch/Edit</H1>
-<P class="Para">The following preferences can be changed on the
-
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.WatchEditPreferencePage)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>Team &gt; CVS &gt; Watch/Edit</strong></a>
-
-  preference page.</P>
-<TABLE border="1" cellspacing="0">
-<THEAD>
-    <TR> 
-      <TH width="164"> <P class="Para">Option</P></TH>
-      <TH width="490"> <P class="Para">Description</P></TH>
-      <TH width="152"> <P class="Para">Default</P></TH>
-    </TR>
-  </THEAD>
-  <TR> 
-    <TD valign="top" align="left">Configure projects to use Watch/edit on checkout</TD>
-    <TD valign="top" align="left"> Use this option to indicate that files checked 
-      out out from the repository should be made read-only.</TD>
-    <TD valign="top" align="left">Disabled</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Enable temporary watches on edit</TD>
-    <TD valign="top" align="left"> Use this option to receive a notification whenever a user 
-    starts to edit a file that you are currently editing.</TD>
-    <TD valign="top" align="left">Disabled</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">When read-only files are modified in an editor</TD>
-    <TD valign="top" align="left"> Use this option to configure what occurs when 
-      a read-only file is modified in an open editor or by another tool. The options 
-      are: 
-      <ul>
-        <li><strong>Send a cvs edit notification to the server: </strong>Issues 
-          a cvs edit notification to the server before making the file writable. 
-          If other editors exist on the file, you will be prompted and may 
-          continue or cancel.</li>
-        <li><strong>Send a cvs edit notification to the server in the background: 
-          </strong>Issues a cvs edit notification to the server in the background 
-          after making the file writable. This allows you to keep typing 
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>CVS Watch/Edit</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS Watch/Edit</h1>
+  <p class="Para">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.WatchEditPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; CVS &gt;
+  Watch/Edit</strong></a> preference page.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th width="164">
+          <p class="Para">Option</p>
+        </th>
+        <th width="490">
+          <p class="Para">Description</p>
+        </th>
+        <th width="152">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <td valign="top" align="left">Configure projects to use Watch/edit on checkout</td>
+      <td valign="top" align="left">Use this option to indicate that files checked out out from the repository should
+      be made read-only.</td>
+      <td valign="top" align="left">Disabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Enable temporary watches on edit</td>
+      <td valign="top" align="left">Use this option to receive a notification whenever a user starts to edit a file
+      that you are currently editing.</td>
+      <td valign="top" align="left">Disabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">When read-only files are modified in an editor</td>
+      <td valign="top" align="left">
+        Use this option to configure what occurs when a read-only file is modified in an open editor or by another
+        tool. The options are:
+        <ul>
+          <li><strong>Send a cvs edit notification to the server:</strong> Issues a cvs edit notification to the server
+          before making the file writable. If other editors exist on the file, you will be prompted and may continue or
+          cancel.</li>
+          <li><strong>Send a cvs edit notification to the server in the background:</strong> Issues a cvs edit
+          notification to the server in the background after making the file writable. This allows you to keep typing
           uninterrupted while the edit notification is sent to the server.</li>
-        <li><strong>Edit the file without informing the server: </strong>Makes 
-          the file read-only without notifying the server.</li>
-      </ul></TD>
-    <TD valign="top" align="left">Send a cvs edit notification to the server in 
-      the background</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Before a CVS edit notification is sent to the 
-      server </TD>
-    <TD valign="top" align="left">Use this option to configure what occurs when 
-      a cvs edit notification needs to be send to the server. 
-      The options are: <ul>
-        <li><strong>Always Prompt: </strong>Always prompt for confirmation.</li>
-        <li><strong>Only prompt if there are other editors: </strong>Shows the 
-          user the list of current editors and allows you to confirm or cancel 
-          the edit.</li>
-        <li><strong>Never Prompt: </strong>Send the edit notification without 
-          prompting</li>
-      </ul></TD>
-    <TD valign="top" align="left">Only prompt if there are other editors</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Update edited files</TD>
-    <TD valign="top" align="left">Use this option to configure what occurs before
-    editing a file. The options are: <ul>
-        <li><strong>Always update before editing: </strong>Always update a file before editing.</li>
-        <li><strong>Prompt to update if out of date: </strong>Prompt for confirmation of update
-        only if a file is out of date.</li>
-        <li><strong>Never update: </strong>Never update a file before editing.</li>
-      </ul></TD>
-    <TD valign="top" align="left">Never update</TD>
-  </TR>  
-</TABLE>
-<h3 class="related">Related concepts</h3>
-  <a href="../concepts/concepts-cvs-watch.htm">Watch/Edit</a>
-
-<h3 class="related">Related tasks</h3>
- <a href="../tasks/tasks-cvs-watch.htm">Finding out who's working on what: watch/edit</a>
-
-</BODY>
-</HTML>
+          <li><strong>Edit the file without informing the server:</strong> Makes the file read-only without notifying
+          the server.</li>
+        </ul>
+      </td>
+      <td valign="top" align="left">Send a cvs edit notification to the server in the background</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Before a CVS edit notification is sent to the server</td>
+      <td valign="top" align="left">
+        Use this option to configure what occurs when a cvs edit notification needs to be send to the server. The
+        options are:
+        <ul>
+          <li><strong>Always Prompt:</strong> Always prompt for confirmation.</li>
+          <li><strong>Only prompt if there are other editors:</strong> Shows the user the list of current editors and
+          allows you to confirm or cancel the edit.</li>
+          <li><strong>Never Prompt:</strong> Send the edit notification without prompting</li>
+        </ul>
+      </td>
+      <td valign="top" align="left">Only prompt if there are other editors</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Update edited files</td>
+      <td valign="top" align="left">
+        Use this option to configure what occurs before editing a file. The options are:
+        <ul>
+          <li><strong>Always update before editing:</strong> Always update a file before editing.</li>
+          <li><strong>Prompt to update if out of date:</strong> Prompt for confirmation of update only if a file is out
+          of date.</li>
+          <li><strong>Never update:</strong> Never update a file before editing.</li>
+        </ul>
+      </td>
+      <td valign="top" align="left">Never update</td>
+    </tr>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-cvs-watch.htm">Watch/Edit</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-cvs-watch.htm">Finding out who's working on what:
+  watch/edit</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs.htm
index de70ce0..ffea20e 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-19cvs.htm
@@ -1,253 +1,245 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>CVS</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">CVS</H1>
-<p class="Head">The following sections describe the preferences available in the 
-  tab groups of the
-  
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.CVSPreferences)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>Team &gt; CVS</strong></a>
-  
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>CVS</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS</h1>
+  <p class="Head">The following sections describe the preferences available in the tab groups of the <a class=
+  "command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.CVSPreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; CVS</strong></a>
   preferences page.</p>
-<h2 class="Para">General</h2>
-<p>On the General tab group of the CVS preference page you can customize several 
-  aspects of the CVS Plug-in.</p>
-<TABLE border="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH> <P class="Para">Option</P></TH>
-      <TH> <P class="Para">Description</P></TH>
-      <TH> <P class="Para">Default</P></TH>
-    </TR>
-  </THEAD>
-  <TR> 
-    <TD valign="top" align="left">Validate server version compatibility on first 
-      connection </TD>
-    <TD valign="top" align="left">Use this option to enable a query of the CVS 
-      server version on the first connection to determine server compatibility. 
-      The server version will be output to the console and if an incompatibility 
-      is detected a warning message will be logged when connecting. </TD>
-    <TD>Enabled </TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Confirm move tag on tag operation</TD>
-    <TD valign="top" align="left">Use this option to be prompted when the Move 
-      tag option is chosen when tagging.</TD>
-    <TD>Enabled</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Display detailed protocol output to stdout</TD>
-    <TD valign="top" align="left">Use this option to display the communication 
-      trace between the Workbench and a CVS server.</TD>
-    <TD>Disabled</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Refresh tags when comparing or replacing tags</TD>
-    <TD valign="top" align="left">Use this option to have the Compare with and 
-      Replace With tag dialogs automatically refresh the known tags by contacting 
-      the server.</TD>
-    <TD>Disabled</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Automatically share projects containing CVS 
-      meta information </TD>
-    <TD valign="top" align="left">Use this option to have any imported project 
-      that was checked out from CVS using a different CVS tool automatically shared 
-      with CVS. </TD>
-    <TD>Enabled</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Use .project project name instead of module name on check out</TD>
-    <TD valign="top" align="left">Use this option to use the project name stored in the .project file as the 
-    project name. If the checkout wizard cannot find a .project file, it will fallback to use the module name.</TD>
-    <TD>Disabled</TD>
-  </TR>
-  <TR>
-    <TD valign="top" align="left">Maximum number of files displayed when committing</TD>
-    <TD valign="top" align="left">Use this option to limit the number of files 
-      that get displayed in the commit dialog.</TD>
-    <TD>1000</TD>
-  </TR>
-  <TR>
-    <TD valign="top" align="left">Maximum number of comments on history</TD>
-    <TD valign="top" align="left">Use this option to limit the number of comments 
-      that get displayed in the commit dialog.</TD>
-    <TD>10</TD>
-  </TR>  
-</TABLE>
-<p>This is what the General tab group of the CVS preference page looks like:</p>
-<p><img alt="CVS preference page - General tab" src="../images/cvs-general.png"></p>
-<h2><strong>Files and Folders</strong></h2>
-<p>On the File and Folders tab group of the CVS preference page you can customize 
-  several aspects of the CVS Plug-in.</p>
-<TABLE border="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH> <P class="Para">Option</P></TH>
-      <TH> <P class="Para">Description</P></TH>
-      <TH> <P class="Para">Default</P></TH>
-    </TR>
-  </THEAD>
-  <TR> 
-    <TD valign="top" align="left">Treat all new files as binary </TD>
-    <TD valign="top" align="left">Use this option to override the file content 
-      settings and treat all new files as binary. </TD>
-    <TD>Disabled </TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Convert text files to use platform line ending</TD>
-    <TD valign="top" align="left">Use the option to convert the line endings of 
-      text files to the line ending used by the platform. This option can be disabled 
-      if you are checking out resources to a *nix drive that is mounted on a Windows 
-      machine. The option applies to both the files and the CVS control 
-files.</TD>
-    <TD>Enabled</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left"> Prune empty directories</TD>
-    <TD valign="top" align="left"> Use this option to specify the pruning of empty 
-      directories on update and in the synchronization view. Although pruned directories 
-      aren't shown in the workbench there is actually still an empty directory 
-      in the repository. This is helpful because CVS doesn't provide a client 
-      with the ability to remove directories from the server. It should be noted that
-      pruning is always on when checking out from a branch of version regardless 
-      of the value of this preference, in accordance with the CVS specification.</TD>
-    <TD>Enabled </TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Delete unmanaged resources on replace </TD>
-    <TD valign="top" align="left">Use this option to allows resources not under 
-      CVS control to be deleted when replacing with resources from the repository. 
-    </TD>
-    <TD>Enabled </TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Default text mode</TD>
-    <TD valign="top" align="left">Use this option to set the default keyword substitution 
-      for text files. </TD>
-    <TD>ASCII with keyword expansion (-kkv)</TD>
-  </TR>
-</TABLE>
-<p>This is what the File and Folders tab group of the CVS preference page looks 
-  like:</p>
-<p><img alt="CVS preference page - File and Folders tab" src="../images/cvs-files.png"></p>
-<h2>Connection</h2>
-<p>On the Connections tab group of the CVS preference page you can customize several 
-  aspects of the CVS Plug-in.</p>
-<TABLE border="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH> <P class="Para">Option</P></TH>
-      <TH> <P class="Para">Description</P></TH>
-      <TH> <P class="Para">Default</P></TH>
-    </TR>
-  </THEAD>
-  <TR> 
-    <TD valign="top" align="left">Communication timeout </TD>
-    <TD valign="top" align="left">Use this option to configure the amount of time 
-      in seconds to wait before timing out from a connection to the CVS server. 
-    </TD>
-    <TD>60 seconds </TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Quietness level </TD>
-    <TD valign="top" align="left">Sets the amount of status information CVS prints 
-      for a command. In <STRONG>Somewhat quiet</STRONG> mode the printing of unimportant 
-      informational messages is suppressed. The consideration of what is important 
-      depends on each command. In <STRONG>Very quiet</STRONG> mode all output 
-      except what is absolutely necessary to complete the command is suppressed. 
-      In <STRONG>Very Quiet</STRONG> mode, some CVS servers may not communicate 
-      important information about errors that have occurred. You may want to consider 
-      using <STRONG>Somewhat quiet</STRONG> mode instead. </TD>
-    <TD>Verbose </TD>
-  </TR>
-  <TR>
-    <TD valign="top" align="left">Compression</TD>
-    <TD valign="top" align="left">Use this option to set the compression level 
-      used when sending files between the client and server. Setting this option to
-      0 means that the compression is disabled.</TD>
-    <TD>0 (disabled)</TD>
-  </TR>
-</TABLE>
-<p>This is what the Connection tab group of the CVS preference page looks like:</p>
-<p><img alt="CVS preference page - Connection tab" src="../images/cvs-connection.png"></p>
-<h2>Prompting</h2>
-<p>On the Prompting tab group of the CVS preference page you can customize several 
-  aspects of the CVS Plug-in.</p>
-<TABLE border="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH> <P class="Para">Option</P></TH>
-      <TH> <P class="Para">Description</P></TH>
-      <TH> <P class="Para">Default</P></TH>
-    </TR>
-  </THEAD>
-    <TR> 
-      <TD valign="top" align="left">Allow empty commit comments</TD>
-      <TD valign="top" align="left"><p>Use the option to configure what happens 
-          if a commit comment is not provided when committing.</p>
+  <h2 class="Para">General</h2>
+  <p>On the General tab group of the CVS preference page you can customize several aspects of the CVS Plug-in.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th>
+          <p class="Para">Option</p>
+        </th>
+        <th>
+          <p class="Para">Description</p>
+        </th>
+        <th>
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <td valign="top" align="left">Validate server version compatibility on first connection</td>
+      <td valign="top" align="left">Use this option to enable a query of the CVS server version on the first connection
+      to determine server compatibility. The server version will be output to the console and if an incompatibility is
+      detected a warning message will be logged when connecting.</td>
+      <td>Enabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Confirm move tag on tag operation</td>
+      <td valign="top" align="left">Use this option to be prompted when the Move tag option is chosen when
+      tagging.</td>
+      <td>Enabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Display detailed protocol output to stdout</td>
+      <td valign="top" align="left">Use this option to display the communication trace between the Workbench and a CVS
+      server.</td>
+      <td>Disabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Refresh tags when comparing or replacing tags</td>
+      <td valign="top" align="left">Use this option to have the Compare with and Replace With tag dialogs automatically
+      refresh the known tags by contacting the server.</td>
+      <td>Disabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Automatically share projects containing CVS meta information</td>
+      <td valign="top" align="left">Use this option to have any imported project that was checked out from CVS using a
+      different CVS tool automatically shared with CVS.</td>
+      <td>Enabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Use .project project name instead of module name on check out</td>
+      <td valign="top" align="left">Use this option to use the project name stored in the .project file as the project
+      name. If the checkout wizard cannot find a .project file, it will fallback to use the module name.</td>
+      <td>Disabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Maximum number of files displayed when committing</td>
+      <td valign="top" align="left">Use this option to limit the number of files that get displayed in the commit
+      dialog.</td>
+      <td>1000</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Maximum number of comments on history</td>
+      <td valign="top" align="left">Use this option to limit the number of comments that get displayed in the commit
+      dialog.</td>
+      <td>10</td>
+    </tr>
+  </table>
+  <p>This is what the General tab group of the CVS preference page looks like:</p>
+  <p><img alt="CVS preference page - General tab" src="../images/cvs-general.png"></p>
+  <h2><strong>Files and Folders</strong></h2>
+  <p>On the File and Folders tab group of the CVS preference page you can customize several aspects of the CVS
+  Plug-in.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th>
+          <p class="Para">Option</p>
+        </th>
+        <th>
+          <p class="Para">Description</p>
+        </th>
+        <th>
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <td valign="top" align="left">Treat all new files as binary</td>
+      <td valign="top" align="left">Use this option to override the file content settings and treat all new files as
+      binary.</td>
+      <td>Disabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Convert text files to use platform line ending</td>
+      <td valign="top" align="left">Use the option to convert the line endings of text files to the line ending used by
+      the platform. This option can be disabled if you are checking out resources to a *nix drive that is mounted on a
+      Windows machine. The option applies to both the files and the CVS control files.</td>
+      <td>Enabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Prune empty directories</td>
+      <td valign="top" align="left">Use this option to specify the pruning of empty directories on update and in the
+      synchronization view. Although pruned directories aren't shown in the workbench there is actually still an empty
+      directory in the repository. This is helpful because CVS doesn't provide a client with the ability to remove
+      directories from the server. It should be noted that pruning is always on when checking out from a branch of
+      version regardless of the value of this preference, in accordance with the CVS specification.</td>
+      <td>Enabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Delete unmanaged resources on replace</td>
+      <td valign="top" align="left">Use this option to allows resources not under CVS control to be deleted when
+      replacing with resources from the repository.</td>
+      <td>Enabled</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Default text mode</td>
+      <td valign="top" align="left">Use this option to set the default keyword substitution for text files.</td>
+      <td>ASCII with keyword expansion (-kkv)</td>
+    </tr>
+  </table>
+  <p>This is what the File and Folders tab group of the CVS preference page looks like:</p>
+  <p><img alt="CVS preference page - File and Folders tab" src="../images/cvs-files.png"></p>
+  <h2>Connection</h2>
+  <p>On the Connections tab group of the CVS preference page you can customize several aspects of the CVS Plug-in.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th>
+          <p class="Para">Option</p>
+        </th>
+        <th>
+          <p class="Para">Description</p>
+        </th>
+        <th>
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <td valign="top" align="left">Communication timeout</td>
+      <td valign="top" align="left">Use this option to configure the amount of time in seconds to wait before timing
+      out from a connection to the CVS server.</td>
+      <td>60 seconds</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Quietness level</td>
+      <td valign="top" align="left">Sets the amount of status information CVS prints for a command. In <strong>Somewhat
+      quiet</strong> mode the printing of unimportant informational messages is suppressed. The consideration of what
+      is important depends on each command. In <strong>Very quiet</strong> mode all output except what is absolutely
+      necessary to complete the command is suppressed. In <strong>Very Quiet</strong> mode, some CVS servers may not
+      communicate important information about errors that have occurred. You may want to consider using
+      <strong>Somewhat quiet</strong> mode instead.</td>
+      <td>Verbose</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Compression</td>
+      <td valign="top" align="left">Use this option to set the compression level used when sending files between the
+      client and server. Setting this option to 0 means that the compression is disabled.</td>
+      <td>0 (disabled)</td>
+    </tr>
+  </table>
+  <p>This is what the Connection tab group of the CVS preference page looks like:</p>
+  <p><img alt="CVS preference page - Connection tab" src="../images/cvs-connection.png"></p>
+  <h2>Prompting</h2>
+  <p>On the Prompting tab group of the CVS preference page you can customize several aspects of the CVS Plug-in.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th>
+          <p class="Para">Option</p>
+        </th>
+        <th>
+          <p class="Para">Description</p>
+        </th>
+        <th>
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <td valign="top" align="left">Allow empty commit comments</td>
+      <td valign="top" align="left">
+        <p>Use the option to configure what happens if a commit comment is not provided when committing.</p>
         <ul>
-          <li><STRONG>Yes: </STRONG>Allow the commit to occur without a comment.</li>
-          <li><strong>No: </strong>Do not allow the commit to proceed until a 
-            comment is provided.</li>
-          <li><STRONG>Prompt: </STRONG>Ask whether you want to allow 
-            the commit to proceed without a comment.</li>
-        </ul></TD>
-      <TD valign="top" align="left">Prompt</TD>
-    </TR>
-  <TR> 
-    <TD valign="top" align="left">Automatically save dirty editors before CVS 
-      operations </TD>
-    <TD valign="top" align="left"> Use this option to configure what happens when 
-      there are open editors with unsaved changes when a CVS operation is performed. 
-      Options are: 
-      <ul>
-        <li><STRONG>Yes: </STRONG>Automatically save unsaved changes in open editors 
-          before each CVS operation.</li>
-        <li><strong>No: </strong>Continue CVS operations even if there are unsaved 
-          changes in open editors.</li>
-        <li><STRONG>Prompt: </STRONG>Ask what to do with unsaved changes 
-          in open editors.</li>
-      </ul></TD>
-    <TD valign="top" align="left">Prompt </TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Consult change sets when synchronizing or committing</TD>
-    <TD valign="top" align="left">Use this option to configure whether all the resources that
-    are contained in the same change set should be included in the operation when synchronizing or
-    committing.</TD>
-    <TD valign="top" align="left">No</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Commit resources with warnings</TD>
-    <TD valign="top" align="left">Use this option to configure whether the resources with warnings
-    should be committed.</TD>
-    <TD valign="top" align="left">Yes</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Commit resources with errors</TD>
-    <TD valign="top" align="left">Use this option to configure whether the resources with errors
-    should be committed.</TD>
-    <TD valign="top" align="left">Prompt</TD>
-  </TR>  
-    
-</TABLE>
-<p>This is what the Prompting tab group of the CVS preference page looks like:</p>
-<p><img alt="CVS preference page - Prompting tab" src="../images/cvs-prompting.png"></p>
-
-<h3 class="related">Related reference</h3>
-  <A href="ref-6.htm">Perspectives</A>
-
-</BODY>
-</HTML>
+          <li><strong>Yes:</strong> Allow the commit to occur without a comment.</li>
+          <li><strong>No:</strong> Do not allow the commit to proceed until a comment is provided.</li>
+          <li><strong>Prompt:</strong> Ask whether you want to allow the commit to proceed without a comment.</li>
+        </ul>
+      </td>
+      <td valign="top" align="left">Prompt</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Automatically save dirty editors before CVS operations</td>
+      <td valign="top" align="left">
+        Use this option to configure what happens when there are open editors with unsaved changes when a CVS operation
+        is performed. Options are:
+        <ul>
+          <li><strong>Yes:</strong> Automatically save unsaved changes in open editors before each CVS operation.</li>
+          <li><strong>No:</strong> Continue CVS operations even if there are unsaved changes in open editors.</li>
+          <li><strong>Prompt:</strong> Ask what to do with unsaved changes in open editors.</li>
+        </ul>
+      </td>
+      <td valign="top" align="left">Prompt</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Consult change sets when synchronizing or committing</td>
+      <td valign="top" align="left">Use this option to configure whether all the resources that are contained in the
+      same change set should be included in the operation when synchronizing or committing.</td>
+      <td valign="top" align="left">No</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Commit resources with warnings</td>
+      <td valign="top" align="left">Use this option to configure whether the resources with warnings should be
+      committed.</td>
+      <td valign="top" align="left">Yes</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Commit resources with errors</td>
+      <td valign="top" align="left">Use this option to configure whether the resources with errors should be
+      committed.</td>
+      <td valign="top" align="left">Prompt</td>
+    </tr>
+  </table>
+  <p>This is what the Prompting tab group of the CVS preference page looks like:</p>
+  <p><img alt="CVS preference page - Prompting tab" src="../images/cvs-prompting.png"></p>
+  <h3 class="related">Related reference</h3><a href="ref-6.htm">Perspectives</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-2.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-2.htm
index bb36900..1430d7f 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-2.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-2.htm
@@ -1,72 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Workbench toolbar</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Workbench toolbar </H1>
-<P CLASS="Intro">The Workbench toolbar is displayed
-at the top of the Workbench window, directly underneath the menu bar. The
-contents of the toolbar change based on the active editor. Actions in the
-toolbar may apply to particular views, so these actions may be enabled or
-disabled based on the state of the currently active view or editor.</p>
-<P CLASS="Para">
-Here is an example of the toolbar in the Resource perspective:</P>
-<P CLASS="Para">
-<img src="../images/Image214_toobar_rsrc.png" alt="Workbench toolbar" border="0" ></P>
-<DIV CLASS="XRefList">
-
-<h2>
-New Wizard</h2>
-<P CLASS="Para">
-This command brings up a dialog where you can choose
-the type of resource to create.</P>
-
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Save The Open Editor Contents</h2>
-<P CLASS="Para">
-This command saves the file currently displayed in the editor area.</P>
-</DIV>
-<DIV CLASS="Topic"> 
-  <h2> Print</h2>
-  <P CLASS="Para"> This command opens a dialog which allows you to specify where 
-    you would like to print the contents of the file currently being displayed 
-    in the editor.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-External Tools</h2>
-  <P CLASS="Para"> This command presents a drop-down menu which allows you to run 
-    or configure external tools. <br>
-  </P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Search</h2>
-<P CLASS="Para">
-This command opens the search dialog, which allows you to search the
-workspace for
-specified text.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Navigation</h2>
-  <P CLASS="Para"> This tool group contains a variety of editor navigation commands. <br>
-  </P>
-</DIV>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-3.htm">Shortcut Bar</a><br>
-<a href="ref-4.htm">View Toolbars</a>
-
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Workbench toolbar</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Workbench toolbar</h1>
+  <p class="Intro">The Workbench toolbar is displayed at the top of the Workbench window, directly underneath the menu
+  bar. The contents of the toolbar change based on the active editor. Actions in the toolbar may apply to particular
+  views, so these actions may be enabled or disabled based on the state of the currently active view or editor.</p>
+  <p class="Para">Here is an example of the toolbar in the Resource perspective:</p>
+  <p class="Para"><img src="../images/Image214_toobar_rsrc.png" alt="Workbench toolbar" border="0"></p>
+  <div class="XRefList">
+    <h2>New Wizard</h2>
+    <p class="Para">This command brings up a dialog where you can choose the type of resource to create.</p>
+  </div>
+  <div class="Topic">
+    <h2>Save The Open Editor Contents</h2>
+    <p class="Para">This command saves the file currently displayed in the editor area.</p>
+  </div>
+  <div class="Topic">
+    <h2>Print</h2>
+    <p class="Para">This command opens a dialog which allows you to specify where you would like to print the contents
+    of the file currently being displayed in the editor.</p>
+  </div>
+  <div class="Topic">
+    <h2>External Tools</h2>
+    <p class="Para">This command presents a drop-down menu which allows you to run or configure external tools.<br></p>
+  </div>
+  <div class="Topic">
+    <h2>Search</h2>
+    <p class="Para">This command opens the search dialog, which allows you to search the workspace for specified
+    text.</p>
+  </div>
+  <div class="Topic">
+    <h2>Navigation</h2>
+    <p class="Para">This tool group contains a variety of editor navigation commands.<br></p>
+  </div>
+  <h3 class="related">Related reference</h3><a href="ref-3.htm">Shortcut Bar</a><br>
+  <a href="ref-4.htm">View Toolbars</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-20-fileContent.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-20-fileContent.htm
index 157bec6..e31367b 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-20-fileContent.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-20-fileContent.htm
@@ -1,48 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Team File Content</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head"> Team File Content</H1>
-<P CLASS="Intro"> On the
-
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.ui.TextPreferences)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>Team &gt; File Content</strong></a>
-
-  preference page, you can associate 
-  file names or extensions with the type of data the file contains. The two choices 
-  for file content type are ASCII and Binary. Repository providers such as CVS 
-  can then use this information to provide content type appropriate behavior. 
-  For example, for ASCII files, CVS ensures that line terminators conform to those 
-  of the OS platform.</p> 
-<P CLASS="Intro">Entries are added to the File Content page in two ways. The first 
-  is through contributions from workbench plug-ins. Tools integrated into the 
-  workbench provide the workbench with the file content types for file extensions 
-  specific to the tool. The workbench itself also defines the file content type 
-  for file extensions that are common and appear frequently in the workbench (e.g. 
-  html,.png, etc.).</p> 
-<P CLASS="Intro">The second method is for users to add file content types explicitly 
-  on the File Content preference page. To do so, you can simply click on 
-  the <strong>Add Extension</strong> button and enter an extension or click on 
-  the <strong>Add Name</strong> button and add a name.. Following this, you can 
-  toggle the type associated with the name or extension by selecting the entry 
-  for the extension in the table and clicking <strong>Change</strong>. Entries 
-  can be removed from the list by selecting them and clicking <strong>Remove</strong>. 
-  Only those entries that were manually added can be removed. Entries contributed 
-  through the plug-in manifest can only be changed.</p> 
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-cvs-11.htm">Setting the CVS keyword substitution mode</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Team File Content</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Team File Content</h1>
+  <p class="Intro">On the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.ui.TextPreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; File
+  Content</strong></a> preference page, you can associate file names or extensions with the type of data the file
+  contains. The two choices for file content type are ASCII and Binary. Repository providers such as CVS can then use
+  this information to provide content type appropriate behavior. For example, for ASCII files, CVS ensures that line
+  terminators conform to those of the OS platform.</p>
+  <p class="Intro">Entries are added to the File Content page in two ways. The first is through contributions from
+  workbench plug-ins. Tools integrated into the workbench provide the workbench with the file content types for file
+  extensions specific to the tool. The workbench itself also defines the file content type for file extensions that are
+  common and appear frequently in the workbench (e.g. html,.png, etc.).</p>
+  <p class="Intro">The second method is for users to add file content types explicitly on the File Content preference
+  page. To do so, you can simply click on the <strong>Add Extension</strong> button and enter an extension or click on
+  the <strong>Add Name</strong> button and add a name.. Following this, you can toggle the type associated with the
+  name or extension by selecting the entry for the extension in the table and clicking <strong>Change</strong>. Entries
+  can be removed from the list by selecting them and clicking <strong>Remove</strong>. Only those entries that were
+  manually added can be removed. Entries contributed through the plug-in manifest can only be changed.</p>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-cvs-11.htm">Setting the CVS keyword substitution
+  mode</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-20.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-20.htm
index c0c5c20..bf60341 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-20.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-20.htm
@@ -1,44 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Ignored Resources</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">Team Ignored Resources</H1>
-<P CLASS="Intro"> On the
-
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.ui.IgnorePreferences)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>Team &gt; Ignored Resources</strong></a>
-
-  preference 
-  page, you can specify file name patterns to exclude from the version control 
-  management system. There is a list of file patterns against which resources 
-  will be matched before they are considered as version control candidates. 
-  These patterns may contain the wildcard characters "*" and "?". This pattern 
-  "*" represents any sequence of zero or more characters. This pattern "?" 
-  represents any one character. For example, you can specify a pattern of 
-  "*~", which would match any temporary files that end with "~". Any 
-  file or directory that matches any one of the patterns will be ignored during 
-  update or commit operations.</p> 
-<P CLASS="Para"> To add a file type to the ignore list, simply click <strong>Add 
-  Pattern</strong>. In the dialog, enter a file type (e.g. *.class). To remove 
-  a file type from the ignore list, simply select the file type in the ignore 
-  list and click <strong>Remove</strong>.</P>
-<P CLASS="Para"> You can temporarily disable ignoring the file pattern by deselecting 
-  it from the list. You do not have to remove the specified file pattern from 
-  the list to temporarily disable it.</P>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-48a.htm">Ignoring Resources from Version Control</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Ignored Resources</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Team Ignored Resources</h1>
+  <p class="Intro">On the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.ui.IgnorePreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team &gt; Ignored
+  Resources</strong></a> preference page, you can specify file name patterns to exclude from the version control
+  management system. There is a list of file patterns against which resources will be matched before they are
+  considered as version control candidates. These patterns may contain the wildcard characters "*" and "?". This
+  pattern "*" represents any sequence of zero or more characters. This pattern "?" represents any one character. For
+  example, you can specify a pattern of "*~", which would match any temporary files that end with "~". Any file or
+  directory that matches any one of the patterns will be ignored during update or commit operations.</p>
+  <p class="Para">To add a file type to the ignore list, simply click <strong>Add Pattern</strong>. In the dialog,
+  enter a file type (e.g. *.class). To remove a file type from the ignore list, simply select the file type in the
+  ignore list and click <strong>Remove</strong>.</p>
+  <p class="Para">You can temporarily disable ignoring the file pattern by deselecting it from the list. You do not
+  have to remove the specified file pattern from the list to temporarily disable it.</p>
+  <h3 class="related">Related reference</h3><a href="ref-48a.htm">Ignoring Resources from Version Control</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-20team-models.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-20team-models.htm
index ce7da36..746004c 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-20team-models.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-20team-models.htm
@@ -1,22 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Team Models</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">Team Models</H1>
-<p>The
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.ui.enabledModels)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Team &gt; Models</strong></a>preference page allows you to select which model providers are to be included in Team operations.</p> 
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Team Models</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Team Models</h1>
+  <p>The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.ui.enabledModels)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg"
+  alt="command link"> <strong>Team &gt; Models</strong></a>preference page allows you to select which model providers
+  are to be included in Team operations.</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-22.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-22.htm
index 314784e..c145f77 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-22.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-22.htm
@@ -1,107 +1,79 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en">
-  <head>
-    <meta name="copyright" content=
-    "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <title>
-      Annotations preference page
-    </title>
-    <script language="JavaScript" src=
-    "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript">
-</script>
-    <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type=
-    "text/css" />
-
-    <style type="text/css">
-/*<![CDATA[*/
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <title>Annotations preference page</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
+  <style type="text/css">
+  /*<![CDATA[*/
     table.c2 {width: 100%;}
     th.c1 {width: 25%;}
     /*]]>*/
-    </style>
-  </head>
-  <body>
-    <h1 class="Head">
-      Annotations preference page
-    </h1>
-    <div class="Para">
-      <p>
-        The following preferences can be changed on the <a class="command-link"
-        href=
-        'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.Annotations)")'>
-
-        <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt=
-        "command link" /> <strong>General &gt; Editors &gt; Text Editors &gt;
-        Annotations</strong></a> preference page.
-      </p>
-    </div>
-    <table border="1" cellspacing="0" class="c2">
-
-      <tbody>
-        <tr>
-          <th class="c1">
-            <div class="Para">
-              Option
-            </div>
-          </th>
-          <th>
-            <div class="Para">
-
-              Description
-            </div>
-          </th>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="25%">
-            Show in Text as
-          </td>
-          <td align="left" valign="top">
-            This option controls whether the selected annotation type is shown
-            in the text. The corresponding text will be underlined with
-            squiggles or highlighted.<br />
-
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="25%">
-            <div class="Para">
-              Show in Overview ruler<br />
-            </div>
-          </td>
-
-          <td align="left" valign="top">
-            This option controls whether the overview ruler on the right side
-            of the text editor is shown.
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Show in Vertical ruler<br />
-            </div>
-
-          </td>
-          <td align="left" valign="top">
-            This option controls whether the selected annotation type is shown
-            in the vertical ruler.
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="25%">
-            <div class="Para">
-              Color
-            </div>
-
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option controls the color for the selected annotation
-              type.<br />
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </body>
+  </style>
+</head>
+<body>
+  <h1 class="Head">Annotations preference page</h1>
+  <div class="Para">
+    <p>The following preferences can be changed on the <a class="command-link" href=
+    'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.Annotations)")'>
+    <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>General &gt; Editors &gt;
+    Text Editors &gt; Annotations</strong></a> preference page.</p>
+  </div>
+  <table border="1" cellspacing="0" class="c2">
+    <tbody>
+      <tr>
+        <th class="c1">
+          <div class="Para">
+            Option
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Description
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">Show in Text as</td>
+        <td align="left" valign="top">This option controls whether the selected annotation type is shown in the text.
+        The corresponding text will be underlined with squiggles or highlighted.<br /></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Show in Overview ruler<br />
+          </div>
+        </td>
+        <td align="left" valign="top">This option controls whether the overview ruler on the right side of the text
+        editor is shown.</td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Show in Vertical ruler<br />
+          </div>
+        </td>
+        <td align="left" valign="top">This option controls whether the selected annotation type is shown in the
+        vertical ruler.</td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Color
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option controls the color for the selected annotation type.<br />
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-23.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-23.htm
index db288ad..eea93bc 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-23.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-23.htm
@@ -1,332 +1,184 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta name="copyright" content=
-    "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type=
-    "text/css" />
-    <title>
-      Workbench window layout
-    </title>
-  </head>
-  <body>
-    <h1 class="Head">
-      Workbench window layout
-    </h1>
-    <p class="Para">
-      You can rearrange the layout of Workbench windows as follows:
-    </p>
-    <ul class="UnorderedList">
-      <li class="Item">Drag views to different positions within the Workbench
-      window.
-      </li>
-      <li class="Item">Drag editors such that they are simultaneously visible
-      beside, above, or below another editor.
-      </li>
-      <li class="Item">Resize views and editors by dragging the sashes which
-      separate them.
-      </li>
-    </ul>
-    <div class="Topic">
-      <h2>
-        Drop cursors
-      </h2>
-
-      <p class="Para">
-        <i>Drop cursors</i> indicate where a view will dock when you release
-        your mouse button. This indication is relative to the view or editor
-        area underneath the cursor.
-      </p>
-      <table border="1" width="669" cellspacing="0">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
+  <title>Workbench window layout</title>
+</head>
+<body>
+  <h1 class="Head">Workbench window layout</h1>
+  <p class="Para">You can rearrange the layout of Workbench windows as follows:</p>
+  <ul class="UnorderedList">
+    <li class="Item">Drag views to different positions within the Workbench window.</li>
+    <li class="Item">Drag editors such that they are simultaneously visible beside, above, or below another
+    editor.</li>
+    <li class="Item">Resize views and editors by dragging the sashes which separate them.</li>
+  </ul>
+  <div class="Topic">
+    <h2>Drop cursors</h2>
+    <p class="Para"><i>Drop cursors</i> indicate where a view will dock when you release your mouse button. This
+    indication is relative to the view or editor area underneath the cursor.</p>
+    <table border="1" width="669" cellspacing="0">
+      <caption>
+        Drop Cursors
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1" width="54">
+            <p class="Para">Cursor</p>
+          </th>
+          <th rowspan="1" colspan="1" width="113">
+            <p class="Para">Name</p>
+          </th>
+          <th rowspan="1" colspan="1" width="480">
+            <p class="Para">Description</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" width="54"><img src="../images/ref-1.png" align="top" alt="Up arrow" /></td>
+          <td rowspan="1" colspan="1" width="113">
+            <p class="Para">Dock above</p>
+          </td>
+          <td rowspan="1" colspan="1" width="480">
+            <p class="Para">The view will appear above the view underneath the cursor.</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" width="54"><img src="../images/ref-2.png" align="top" alt="Down arrow" /></td>
+          <td rowspan="1" colspan="1" width="113">
+            <p class="Para">Dock below</p>
+          </td>
+          <td rowspan="1" colspan="1" width="480">
+            <p class="Para">The view will appear below the view underneath the cursor.</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" width="54"><img src="../images/ref-3.png" align="top" alt="Right arrow" /></td>
+          <td rowspan="1" colspan="1" width="113">
+            <p class="Para">Dock to the right</p>
+          </td>
+          <td rowspan="1" colspan="1" width="480">
+            <p class="Para">The view will appear to the right of the view underneath the cursor.</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" width="54"><img src="../images/ref-4.png" align="top" alt="Left arrow" /></td>
+          <td rowspan="1" colspan="1" width="113">
+            <p class="Para">Dock to the left</p>
+          </td>
+          <td rowspan="1" colspan="1" width="480">
+            <p class="Para">The view will appear to the left of the view underneath the cursor.</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" width="54"><img src="../images/ref-5.png" align="top" alt="Stack" /></td>
+          <td rowspan="1" colspan="1" width="113">
+            <p class="Para">Stack</p>
+          </td>
+          <td rowspan="1" colspan="1" width="480">
+            <p class="Para">The view will appear as a tab in the same pane as the view underneath the cursor.</p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="Topic">
+    <div class="Subtopic">
+      <h2 class="Head">Double-Click</h2>
+      <p class="Para">Double-clicking a view or editor's title bar maximizes the part in the Workbench window.</p>
+    </div>
+    <div class="Subtopic">
+      <h2 class="Head">Title bar context menu</h2>
+      <p class="Para">From the context menu of a view or editor's title bar, you can select how you want the view to
+      appear within the Workbench window.</p>
+      <table border="1" cellspacing="0">
         <caption>
-          Drop Cursors
+          View and editor title bar context menu options
         </caption>
         <thead>
           <tr>
-
-            <th rowspan="1" colspan="1" width="54">
-              <p class="Para">
-                Cursor
-              </p>
+            <th rowspan="1" colspan="1">
+              <p class="Para"><a name="pgfId-1096571" id="pgfId-1096571">O</a>ption</p>
             </th>
-            <th rowspan="1" colspan="1" width="113">
-              <p class="Para">
-                Name
-              </p>
-            </th>
-
-            <th rowspan="1" colspan="1" width="480">
-              <p class="Para">
-                Description
-              </p>
+            <th rowspan="1" colspan="1">
+              <p class="Para">Description</p>
             </th>
           </tr>
         </thead>
         <tbody>
           <tr>
-            <td rowspan="1" colspan="1" width="54">
-              <img src="../images/ref-1.png" align="top" alt=
-              "Up arrow" />
+            <td rowspan="1" colspan="1" valign="top" align="left">
+              <p class="Para">Restore</p>
             </td>
-            <td rowspan="1" colspan="1" width="113">
-              <p class="Para">
-                Dock above
-              </p>
-
-            </td>
-            <td rowspan="1" colspan="1" width="480">
-              <p class="Para">
-                The view will appear above the view underneath the cursor.
-              </p>
+            <td rowspan="1" colspan="1" valign="top" align="left">
+              <p class="Para">Restores the view to its originating (non-maximized/non-minimized) size and position
+              within the Workbench.</p>
             </td>
           </tr>
           <tr>
-            <td rowspan="1" colspan="1" width="54">
-              <img src="../images/ref-2.png" align="top" alt=
-              "Down arrow" />
+            <td colspan="1" valign="top" align="left">Restore</td>
+            <td colspan="1" valign="top" align="left">Restores the view or editor to its originating
+            (non-maximized/non-minimized) size and position within the Workbench.</td>
+          </tr>
+          <tr>
+            <td colspan="1" valign="top" align="left">Move</td>
+            <td colspan="1" valign="top" align="left">Move the part or part group.</td>
+          </tr>
+          <tr>
+            <td colspan="1" valign="top" align="left">Size</td>
+            <td colspan="1" valign="top" align="left">Change the size of the part in the direction specified.</td>
+          </tr>
+          <tr>
+            <td rowspan="1" colspan="1" valign="top" align="left">
+              <p class="Para">Maximize</p>
             </td>
-            <td rowspan="1" colspan="1" width="113">
-              <p class="Para">
-                Dock below
-              </p>
-            </td>
-
-            <td rowspan="1" colspan="1" width="480">
-              <p class="Para">
-                The view will appear below the view underneath the cursor.
-              </p>
+            <td rowspan="1" colspan="1" valign="top" align="left">
+              <p class="Para">Maximizes the part in the Workbench window.</p>
             </td>
           </tr>
           <tr>
-            <td rowspan="1" colspan="1" width="54">
-              <img src="../images/ref-3.png" align="top" alt=
-              "Right arrow" />
+            <td rowspan="1" colspan="1" valign="top" align="left">
+              <p class="Para">Minimize</p>
             </td>
-            <td rowspan="1" colspan="1" width="113">
-              <p class="Para">
-                Dock to the right
-              </p>
-            </td>
-            <td rowspan="1" colspan="1" width="480">
-              <p class="Para">
-                The view will appear to the right of the view underneath the
-                cursor.
-              </p>
+            <td rowspan="1" colspan="1" valign="top" align="left">
+              <p class="Para">Minimizes the part in the Workbench window.</p>
             </td>
           </tr>
           <tr>
-            <td rowspan="1" colspan="1" width="54">
-              <img src="../images/ref-4.png" align="top" alt=
-              "Left arrow" />
+            <td rowspan="1" colspan="1" valign="top" align="left">
+              <p class="Para">Close</p>
             </td>
-            <td rowspan="1" colspan="1" width="113">
-              <p class="Para">
-                Dock to the left
-              </p>
-            </td>
-            <td rowspan="1" colspan="1" width="480">
-              <p class="Para">
-
-                The view will appear to the left of the view underneath the
-                cursor.
-              </p>
+            <td rowspan="1" colspan="1" valign="top" align="left">
+              <p class="Para">Closes the part.</p>
             </td>
           </tr>
           <tr>
-            <td rowspan="1" colspan="1" width="54">
-              <img src="../images/ref-5.png" align="top" alt=
-              "Stack" />
-
+            <td colspan="1" valign="top" align="left">
+              <p>Close Others</p>
+              <p>(editors only)</p>
             </td>
-            <td rowspan="1" colspan="1" width="113">
-              <p class="Para">
-                Stack
-              </p>
+            <td colspan="1" valign="top" align="left">Closes all editors except the current editor.</td>
+          </tr>
+          <tr>
+            <td colspan="1" valign="top" align="left">
+              <p>Close All</p>
+              <p>(editors only)</p>
             </td>
-            <td rowspan="1" colspan="1" width="480">
-              <p class="Para">
-                The view will appear as a tab in the same pane as the view
-                underneath the cursor.
-              </p>
-
-            </td>
+            <td colspan="1" valign="top" align="left">Closes all editors.</td>
           </tr>
         </tbody>
       </table>
     </div>
-    <div class="Topic">
-      <div class="Subtopic">
-        <h2 class="Head">
-          Double-Click
-        </h2>
-        <p class="Para">
-          Double-clicking a view or editor's title bar maximizes the part in
-          the Workbench window.
-        </p>
-      </div>
-      <div class="Subtopic">
-
-        <h2 class="Head">
-          Title bar context menu
-        </h2>
-        <p class="Para">
-          From the context menu of a view or editor's title bar, you can select
-          how you want the view to appear within the Workbench window.
-        </p>
-        <table border="1" cellspacing="0">
-          <caption>
-            View and editor title bar context menu options
-          </caption>
-
-          <thead>
-            <tr>
-              <th rowspan="1" colspan="1">
-                <p class="Para">
-                  <a name="pgfId-1096571" id="pgfId-1096571">O</a>ption
-                </p>
-              </th>
-              <th rowspan="1" colspan="1">
-                <p class="Para">
-
-                  Description
-                </p>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td rowspan="1" colspan="1" valign="top" align="left">
-                <p class="Para">
-
-                  Restore
-                </p>
-              </td>
-              <td rowspan="1" colspan="1" valign="top" align="left">
-                <p class="Para">
-                  Restores the view to its originating
-                  (non-maximized/non-minimized) size and position within the
-                  Workbench.
-                </p>
-              </td>
-            </tr>
-            <tr>
-              <td colspan="1" valign="top" align="left">
-                Restore
-              </td>
-              <td colspan="1" valign="top" align="left">
-                Restores the view or editor to its originating
-                (non-maximized/non-minimized) size and position within the
-                Workbench.
-              </td>
-            </tr>
-            <tr>
-              <td colspan="1" valign="top" align="left">
-
-                Move
-              </td>
-              <td colspan="1" valign="top" align="left">
-                Move the part or part group.
-              </td>
-            </tr>
-            <tr>
-              <td colspan="1" valign="top" align="left">
-                Size
-              </td>
-
-              <td colspan="1" valign="top" align="left">
-                Change the size of the part in the direction specified.
-              </td>
-            </tr>
-            <tr>
-              <td rowspan="1" colspan="1" valign="top" align="left">
-                <p class="Para">
-                  Maximize
-                </p>
-              </td>
-
-              <td rowspan="1" colspan="1" valign="top" align="left">
-                <p class="Para">
-                  Maximizes the part in the Workbench window.
-                </p>
-              </td>
-            </tr>
-            <tr>
-              <td rowspan="1" colspan="1" valign="top" align="left">
-                <p class="Para">
-
-                  Minimize
-                </p>
-              </td>
-              <td rowspan="1" colspan="1" valign="top" align="left">
-                <p class="Para">
-                  Minimizes the part in the Workbench window.
-                </p>
-              </td>
-            </tr>
-            <tr>
-
-              <td rowspan="1" colspan="1" valign="top" align="left">
-                <p class="Para">
-                  Close
-                </p>
-              </td>
-              <td rowspan="1" colspan="1" valign="top" align="left">
-                <p class="Para">
-                  Closes the part.
-                </p>
-
-              </td>
-            </tr>
-            <tr>
-              <td colspan="1" valign="top" align="left">
-                <p>
-                  Close Others
-                </p>
-                <p>
-                  (editors only)
-                </p>
-
-              </td>
-              <td colspan="1" valign="top" align="left">
-                Closes all editors except the current editor.
-              </td>
-            </tr>
-            <tr>
-              <td colspan="1" valign="top" align="left">
-                <p>
-                  Close All
-                </p>
-
-                <p>
-                  (editors only)
-                </p>
-              </td>
-              <td colspan="1" valign="top" align="left">
-                Closes all editors.
-              </td>
-            </tr>
-          </tbody>
-        </table>
-
-      </div>
-    </div>
-    <p>
-      Here is what a view's context menu looks like:
-    </p>
-    <p>
-      <img src="../images/Image229_view_popup.png" alt="View's context menu"
-      border="1" />
-    </p>
-    <p>
-
-      Here is what an editor's context menu looks like:
-    </p>
-    <p>
-      <img src="../images/Image229_editor_popup.png" alt=
-      "Editor's context menu" border="1" />
-    </p>
-  </body>
+  </div>
+  <p>Here is what a view's context menu looks like:</p>
+  <p><img src="../images/Image229_view_popup.png" alt="View's context menu" border="1" /></p>
+  <p>Here is what an editor's context menu looks like:</p>
+  <p><img src="../images/Image229_editor_popup.png" alt="Editor's context menu" border="1" /></p>
+</body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-24.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-24.htm
index 949665e..510d200 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-24.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-24.htm
@@ -1,90 +1,62 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Editor area</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Editor area</H1>
-<P CLASS="Intro">
-
-The editor area is where you modify the contents of files in the Workbench.</p>
-<P CLASS="Para">
-Here is what the editor area looks like when multiple files are open and a text
-file is being edited:</P>
-<P CLASS="Para">
-<img src="../images/Image230_editor_area.png" alt="Editor Area" border="0" ></P>
-<DIV CLASS="Topic"> 
-  <h2>
-Marker bar</h2>
-<P CLASS="Para">
-The marker bar is the vertical bar located at the left of the editor area.</P>
-<P CLASS="Para">
-Here is what the marker bar looks like:</P>
-  <P CLASS="Para"> <img src="../images/Image231_marker_bar.png" alt="Marker Bar" border="0" ></P>
-<h2>Markers</h2>
-<P CLASS="Para">
-Markers are displayed in the marker bar, to the left of the text editor.</P>
-<P CLASS="Para">
-Depending on the type of file displayed in the editor area, three kinds of markers
-may be displayed:</P>
-<UL CLASS="UnorderedList">
-<LI CLASS="Item">
-Bookmarks </LI>
-<LI CLASS="Item">
-Task markers (for associated tasks) </LI>
-<LI CLASS="Item">
-Debugging breakpoints </LI>
-</UL>
-<P CLASS="Para">
-You can create and associate a marker with a specific line in a file by accessing the context menu from the marker bar,
-which is directly to the left of that line. </P>
-  <P CLASS="Para"> Here is what the context menu of the marker bar for a java 
-    editor looks like: </P>
-  <P CLASS="Para"> <img src="../images/Image232_marker_context.png" alt="Marker Bar Menu" border="1" > 
-  </P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Types of editors</h2>
-<P CLASS="Para">
-The Workbench uses three types of editors:</P>
-<UL CLASS="UnorderedList">
-<LI CLASS="Item">
-Internal: These editors are launched inside the editor area in the Workbench window.</LI>
-<LI CLASS="Item">
-External: You can go outside the Workbench in the file system, edit a Workbench file outside the Workbench, and save the edited file. For example, 
-imagine that you add an SGML file to the Workbench. Later, you go into the file system and open the 
-file in an SGML editor, then save the file. The edited SGML file is still represented in the Workbench, even 
-though you did not edit the file in the Workbench. If you associate a file type with an external editor in 
-the Workbench
-(<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>General &gt; Editors &gt; File Associations</b></a>
-preference page), then the Workbench
-will launch this external editor.</LI>
-<LI CLASS="Item">
-ActiveX: On Microsoft Windows platforms, the Workbench makes use of ActiveX controls for applications that allow for them. For example, Microsoft Word supports being embedded as an OLE
-document. Thus if you have a <i>.doc</i> file in the Workbench, and Word is registered as the editor for
-<i>.doc </i>files in your operating system, then opening the file will launch Word as an OLE document within the Workbench editor area. Notice how OLE documents also add such features as menus
-and toolbar buttons.</LI>
-</UL>
-<p>The following illustrates Microsoft Word embedded as an OLE document:</p>
-<DIV CLASS="Figure">
-    <DIV> <IMG SRC="../images/ref-7.png"  alt="Workbench with OLE Editor" > 
-    </DIV>
-</DIV>
-</DIV>
-
-
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Editor area</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Editor area</h1>
+  <p class="Intro">The editor area is where you modify the contents of files in the Workbench.</p>
+  <p class="Para">Here is what the editor area looks like when multiple files are open and a text file is being
+  edited:</p>
+  <p class="Para"><img src="../images/Image230_editor_area.png" alt="Editor Area" border="0"></p>
+  <div class="Topic">
+    <h2>Marker bar</h2>
+    <p class="Para">The marker bar is the vertical bar located at the left of the editor area.</p>
+    <p class="Para">Here is what the marker bar looks like:</p>
+    <p class="Para"><img src="../images/Image231_marker_bar.png" alt="Marker Bar" border="0"></p>
+    <h2>Markers</h2>
+    <p class="Para">Markers are displayed in the marker bar, to the left of the text editor.</p>
+    <p class="Para">Depending on the type of file displayed in the editor area, three kinds of markers may be
+    displayed:</p>
+    <ul class="UnorderedList">
+      <li class="Item">Bookmarks</li>
+      <li class="Item">Task markers (for associated tasks)</li>
+      <li class="Item">Debugging breakpoints</li>
+    </ul>
+    <p class="Para">You can create and associate a marker with a specific line in a file by accessing the context menu
+    from the marker bar, which is directly to the left of that line.</p>
+    <p class="Para">Here is what the context menu of the marker bar for a java editor looks like:</p>
+    <p class="Para"><img src="../images/Image232_marker_context.png" alt="Marker Bar Menu" border="1"></p>
+  </div>
+  <div class="Topic">
+    <h2>Types of editors</h2>
+    <p class="Para">The Workbench uses three types of editors:</p>
+    <ul class="UnorderedList">
+      <li class="Item">Internal: These editors are launched inside the editor area in the Workbench window.</li>
+      <li class="Item">External: You can go outside the Workbench in the file system, edit a Workbench file outside the
+      Workbench, and save the edited file. For example, imagine that you add an SGML file to the Workbench. Later, you
+      go into the file system and open the file in an SGML editor, then save the file. The edited SGML file is still
+      represented in the Workbench, even though you did not edit the file in the Workbench. If you associate a file
+      type with an external editor in the Workbench ( <a class="command-link" href=
+      'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'>
+      <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General &gt; Editors &gt; File
+      Associations</b></a> preference page), then the Workbench will launch this external editor.</li>
+      <li class="Item">ActiveX: On Microsoft Windows platforms, the Workbench makes use of ActiveX controls for
+      applications that allow for them. For example, Microsoft Word supports being embedded as an OLE document. Thus if
+      you have a <i>.doc</i> file in the Workbench, and Word is registered as the editor for <i>.doc</i> files in your
+      operating system, then opening the file will launch Word as an OLE document within the Workbench editor area.
+      Notice how OLE documents also add such features as menus and toolbar buttons.</li>
+    </ul>
+    <p>The following illustrates Microsoft Word embedded as an OLE document:</p>
+    <div class="Figure">
+      <div><img src="../images/ref-7.png" alt="Workbench with OLE Editor"></div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-25.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-25.htm
index 5407e59..f7df8e9 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-25.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-25.htm
@@ -1,117 +1,90 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-             
-  <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
-             
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
-              
-  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1"
- type="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
   <title>Compare editor</title>
 </head>
-  <body bgcolor="#ffffff">
-       
-<h1 class="Head"> Compare editor</h1>
-       
-<p class="Para"> You can view the differences between two files by comparing 
- them. You can compare different files, you can compare versions in 
- the Workbench with versions in the repository, or with the local edit history.
- In some cases you can compare three files (when a common ancestor exists).</p>
-       
-<p class="Para"> After a comparison is carried out, the compare editor opens 
- in the editor area. In the compare editor, you can browse through 
- all the differences and copy highlighted differences between the compared 
- resources. You can save changes to resources that are made in the comparison 
- editor.</p>
- 
-<p class="Para"> Compare editor allows for two kind of navigation: using differences
-or changes. A change is a portion of text that has been modified within the line,
-and the difference is a section of file consisting of one or more lines, and can contain
-many changes.</p>
-
-<p class="Para">
-<img
- src="../images/compare-editor-diff-change.png"
- alt="Differences and changes."  border="0" align="top"> 
-</p>
-
-<p class="Para">
- Differences are marked with blue color, changes with red.
-</p>  
-       
-<p class="Para">Here is how the compare editor looks when you open it from a CVS 
-Workspace synchronization.</p>
-       
-<p class="Para"><img
- src="../images/compare-editor.png"
- alt="Picture of 3-paned editor. Top pane compares project structure; bottom 2 panes (side by side) compare lines of source."  border="0" align="top"> 
-</p>
-       
-<div class="Topic">    
-<div class="Subtopic">    
-<h2>Toolbar</h2>
-       
-<p>The toolbar of the Compare editor includes the following buttons:</p>
-           
-<dl>
-  <dt>Switch Compare Viewer&nbsp;<img src="../images/view_menu.svg" alt="Image of the 'Switch Compare Viewer' button"></dt>
-  <dd>Basing on the content type the system determines which compare viewer 
-  should be used during a comparison. The button opens a drop down menu which allows to choose between other 
-  viewers registered for the same content type. If there is no alternative 
-  content viewer available the button is hidden.</dd>
-  <dt>Control Visibility of Ancestor Pane&nbsp;<img src="../images/ancestorpane_co.svg" alt="Image of the 'Control Visibility of Ancestor Pane' button"></dt>
-  <dd>There are two conditions under which a three way compare will occur, 
-		both when using the version management support: when comparing 
-		a file that is in conflict, and when comparing a file being merged 
-		from a branch. In both cases, the system will determine a common 
- 		ancestor in the repository to compare the conflict or merge against. 
- 		This button determines the visibility of the third editor. By default, 
- 		the ancestor pane is not visible.</dd>
-  <dt>Perform Three way/Two way Compare&nbsp;<img src="../images/twowaycompare_co.svg" alt="Image of the 'Perform Three way/Two way Compare' button"></dt>
-  <dd>The compare editor can be toggled between performing a three way compare 
-		or a two way compare which ignores the common ancestor.</dd>
-  <dt>Copy All from Left to Right&nbsp;<img src="../images/copy_r_co.svg" alt="Image of the 'Copy All from Left to Right' button"></dt>
-  <dd>Copies the entire contents of the file in the left pane into the file 
-          in the right pane, making the contents of the two files identical.</dd>
-  <dt>Copy All Non-Conflicting Changes from Right to Left&nbsp;<img src="../images/copy_l_co.svg" alt="Image of the 'Copy All Non-Conflicting Changes from Right to Left' button"></dt>
-  <dd>Copies all the non-conflicting changes from the right pane into the left
-  pane. Conflicting changes must be copied individually.</dd>
-  <dt>Copy Current Change from Left to Right&nbsp;<img src="../images/copycont_r_co.svg" alt="Image of the 'Copy Current Change from Left to Right' button"></dt>
-  <dd>Merges changes in two files by copying the highlighted change in the 
-		left pane into the highlighted fragment on the right. This 
- 		will overwrite the highlighted fragment in the right pane.</dd>
-  <dt>Copy Current Change from Right to Left&nbsp;<img src="../images/copycont_l_co.svg" alt="Image of the 'Copy Current Change from Right to Left' button"></dt>
-  <dd>Does the opposite of the one just described.</dd>
-  <dt>Select Next Difference&nbsp;<img src="../images/next_diff_nav.svg" alt="Image of the 'Select Next Difference' button"></dt>
-  <dd>Highlights the next difference that is found between the compared resources.</dd>
-  <dt>Select Previous Difference&nbsp;<img src="../images/prev_diff_nav.svg" alt="Image of the 'Select Previous Difference' button"></dt>
-  <dd>Highlights the previous difference that is found between the compared 
-          resources.</dd>
-  <dt>Select Next Change&nbsp;<img src="../images/next_change_nav.svg" alt="Image of the 'Select Next Change' button"></dt>
-  <dd>Highlights the next change that is found between the compared resources.</dd>
-  <dt>Select Previous Change&nbsp;<img src="../images/prev_change_nav.svg" alt="Image of the 'Select Previous Change' button"></dt>
-  <dd>Highlights the previous change that is found between the compared resources.</dd>
-</dl>
-           
-<h3 class="related">Related concepts</h3>
-   <a href="../concepts/concepts-30.htm">Synchronizing with a CVS Repository</a><br>
-   <a href="../concepts/concepts-29.htm">Three way comparisons</a>
-
-<h3 class="related">Related tasks</h3>
-    <a href="../tasks/tasks-68.htm">Comparing resources</a><br>
-    <a href="../tasks/tasks-115.htm">Synchronizing with the repository</a><br>
-    <a href="../tasks/tasks-68dg.htm">Merging changes in the compare editor</a><br>
-    <a href="../tasks/tasks-113b.htm">Resolving conflicts</a><br>
-    <a href="../tasks/tasks-68b.htm">Setting preferences for comparing files</a><br>
-    <a href="../tasks/tasks-101.htm">Comparing resources with repository versions</a>
-
-      </div>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Compare editor</h1>
+  <p class="Para">You can view the differences between two files by comparing them. You can compare different files,
+  you can compare versions in the Workbench with versions in the repository, or with the local edit history. In some
+  cases you can compare three files (when a common ancestor exists).</p>
+  <p class="Para">After a comparison is carried out, the compare editor opens in the editor area. In the compare
+  editor, you can browse through all the differences and copy highlighted differences between the compared resources.
+  You can save changes to resources that are made in the comparison editor.</p>
+  <p class="Para">Compare editor allows for two kind of navigation: using differences or changes. A change is a portion
+  of text that has been modified within the line, and the difference is a section of file consisting of one or more
+  lines, and can contain many changes.</p>
+  <p class="Para"><img src="../images/compare-editor-diff-change.png" alt="Differences and changes." border="0" align=
+  "top"></p>
+  <p class="Para">Differences are marked with blue color, changes with red.</p>
+  <p class="Para">Here is how the compare editor looks when you open it from a CVS Workspace synchronization.</p>
+  <p class="Para"><img src="../images/compare-editor.png" alt=
+  "Picture of 3-paned editor. Top pane compares project structure; bottom 2 panes (side by side) compare lines of source."
+  border="0" align="top"></p>
+  <div class="Topic">
+    <div class="Subtopic">
+      <h2>Toolbar</h2>
+      <p>The toolbar of the Compare editor includes the following buttons:</p>
+      <dl>
+        <dt>Switch Compare Viewer&nbsp;<img src="../images/view_menu.svg" alt=
+        "Image of the 'Switch Compare Viewer' button"></dt>
+        <dd>Basing on the content type the system determines which compare viewer should be used during a comparison.
+        The button opens a drop down menu which allows to choose between other viewers registered for the same content
+        type. If there is no alternative content viewer available the button is hidden.</dd>
+        <dt>Control Visibility of Ancestor Pane&nbsp;<img src="../images/ancestorpane_co.svg" alt=
+        "Image of the 'Control Visibility of Ancestor Pane' button"></dt>
+        <dd>There are two conditions under which a three way compare will occur, both when using the version management
+        support: when comparing a file that is in conflict, and when comparing a file being merged from a branch. In
+        both cases, the system will determine a common ancestor in the repository to compare the conflict or merge
+        against. This button determines the visibility of the third editor. By default, the ancestor pane is not
+        visible.</dd>
+        <dt>Perform Three way/Two way Compare&nbsp;<img src="../images/twowaycompare_co.svg" alt=
+        "Image of the 'Perform Three way/Two way Compare' button"></dt>
+        <dd>The compare editor can be toggled between performing a three way compare or a two way compare which ignores
+        the common ancestor.</dd>
+        <dt>Copy All from Left to Right&nbsp;<img src="../images/copy_r_co.svg" alt=
+        "Image of the 'Copy All from Left to Right' button"></dt>
+        <dd>Copies the entire contents of the file in the left pane into the file in the right pane, making the
+        contents of the two files identical.</dd>
+        <dt>Copy All Non-Conflicting Changes from Right to Left&nbsp;<img src="../images/copy_l_co.svg" alt=
+        "Image of the 'Copy All Non-Conflicting Changes from Right to Left' button"></dt>
+        <dd>Copies all the non-conflicting changes from the right pane into the left pane. Conflicting changes must be
+        copied individually.</dd>
+        <dt>Copy Current Change from Left to Right&nbsp;<img src="../images/copycont_r_co.svg" alt=
+        "Image of the 'Copy Current Change from Left to Right' button"></dt>
+        <dd>Merges changes in two files by copying the highlighted change in the left pane into the highlighted
+        fragment on the right. This will overwrite the highlighted fragment in the right pane.</dd>
+        <dt>Copy Current Change from Right to Left&nbsp;<img src="../images/copycont_l_co.svg" alt=
+        "Image of the 'Copy Current Change from Right to Left' button"></dt>
+        <dd>Does the opposite of the one just described.</dd>
+        <dt>Select Next Difference&nbsp;<img src="../images/next_diff_nav.svg" alt=
+        "Image of the 'Select Next Difference' button"></dt>
+        <dd>Highlights the next difference that is found between the compared resources.</dd>
+        <dt>Select Previous Difference&nbsp;<img src="../images/prev_diff_nav.svg" alt=
+        "Image of the 'Select Previous Difference' button"></dt>
+        <dd>Highlights the previous difference that is found between the compared resources.</dd>
+        <dt>Select Next Change&nbsp;<img src="../images/next_change_nav.svg" alt=
+        "Image of the 'Select Next Change' button"></dt>
+        <dd>Highlights the next change that is found between the compared resources.</dd>
+        <dt>Select Previous Change&nbsp;<img src="../images/prev_change_nav.svg" alt=
+        "Image of the 'Select Previous Change' button"></dt>
+        <dd>Highlights the previous change that is found between the compared resources.</dd>
+      </dl>
+      <h3 class="related">Related concepts</h3><a href="../concepts/concepts-30.htm">Synchronizing with a CVS
+      Repository</a><br>
+      <a href="../concepts/concepts-29.htm">Three way comparisons</a>
+      <h3 class="related">Related tasks</h3><a href="../tasks/tasks-68.htm">Comparing resources</a><br>
+      <a href="../tasks/tasks-115.htm">Synchronizing with the repository</a><br>
+      <a href="../tasks/tasks-68dg.htm">Merging changes in the compare editor</a><br>
+      <a href="../tasks/tasks-113b.htm">Resolving conflicts</a><br>
+      <a href="../tasks/tasks-68b.htm">Setting preferences for comparing files</a><br>
+      <a href="../tasks/tasks-101.htm">Comparing resources with repository versions</a>
     </div>
-        
+  </div>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-26.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-26.htm
index cb1f011..eb4491a 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-26.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-26.htm
@@ -1,77 +1,48 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"><head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"><title>Search view</title></head><body bgcolor="#ffffff">
-
-<h1>Search view</h1>
-
-<p>
-This view displays the results of a search.</p>
-
-<p>
-Text searches will only search for expressions in files with extensions (file
-types) specified in the search dialog.</p>
-
-<dl>
-<dt>Show Next Match</dt>
-<dd>
-This command highlights the next match of the search
-expression in the editor area, opening the file if required.</dd>
-
-<dt>Show Previous Match</dt>
-<dd>
-This command highlights the previous match of the
-search expression in the editor area, opening the file if required.</dd>
-
-
-<dt>Remove Selected Matches</dt>
-<dd>Removes all highlighted matches from the search results.</dd>
-
-<dt>Remove All Matches</dt>
-<dd>Remove all matches from the search results.</dd>
-
-<dt>Expand All</dt>
-<dd>Expand all matches in the hierarchical view.</dd>
-
-<dt>Collapse All</dt>
-<dd>Collapse all matches in the hierarchical view.</dd>
-
-<dt>Run the current search again</dt>
-<dd>Re-runs the most recent search.</dd>
-
-<dt>Cancel Current Search</dt>
-<dd>Cancel a search that is running.</dd>
-
-
-<dt>Previous Search Results</dt>
-<dd>
-This command allows you to browse previously
-conducted searches and repeat a previous search. You can select a previous
-search from the drop-down menu or clear the search history.</dd>
-
-<dt>Pin the Search view</dt>
-<dd>
-Pinning the search view means that subsequent searches will shown their
-results in another search view and that the pinned view remains unchanged.
-</dd>
-
-</dl>
-
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/csearchview.htm">Search view</a><br>
-<a href="../gettingStarted/qs-36c.htm">Quick Text Search Dialog</a>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-84b.htm">Searching for files</a><br>
-<a href="../tasks/tasks-84.htm">Searching for text within a file</a>
-
-
-<h3 class="related">Related reference</h3>
-<a href="ref-45.htm">File search</a>
-
-</body></html>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Search view</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1>Search view</h1>
+  <p>This view displays the results of a search.</p>
+  <p>Text searches will only search for expressions in files with extensions (file types) specified in the search
+  dialog.</p>
+  <dl>
+    <dt>Show Next Match</dt>
+    <dd>This command highlights the next match of the search expression in the editor area, opening the file if
+    required.</dd>
+    <dt>Show Previous Match</dt>
+    <dd>This command highlights the previous match of the search expression in the editor area, opening the file if
+    required.</dd>
+    <dt>Remove Selected Matches</dt>
+    <dd>Removes all highlighted matches from the search results.</dd>
+    <dt>Remove All Matches</dt>
+    <dd>Remove all matches from the search results.</dd>
+    <dt>Expand All</dt>
+    <dd>Expand all matches in the hierarchical view.</dd>
+    <dt>Collapse All</dt>
+    <dd>Collapse all matches in the hierarchical view.</dd>
+    <dt>Run the current search again</dt>
+    <dd>Re-runs the most recent search.</dd>
+    <dt>Cancel Current Search</dt>
+    <dd>Cancel a search that is running.</dd>
+    <dt>Previous Search Results</dt>
+    <dd>This command allows you to browse previously conducted searches and repeat a previous search. You can select a
+    previous search from the drop-down menu or clear the search history.</dd>
+    <dt>Pin the Search view</dt>
+    <dd>Pinning the search view means that subsequent searches will shown their results in another search view and that
+    the pinned view remains unchanged.</dd>
+  </dl>
+  <h3 class="related">Related concepts</h3><a href="../concepts/csearchview.htm">Search view</a><br>
+  <a href="../gettingStarted/qs-36c.htm">Quick Text Search Dialog</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-84b.htm">Searching for files</a><br>
+  <a href="../tasks/tasks-84.htm">Searching for text within a file</a>
+  <h3 class="related">Related reference</h3><a href="ref-45.htm">File search</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-27.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-27.htm
index 3d74527..315f798 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-27.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-27.htm
@@ -1,229 +1,181 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright"
-	content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1"
-	TYPE="text/css">
-<title>Project Explorer view</title>
-<script language="JavaScript"
-	src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"  type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<h1>Project Explorer view</H1>
-<P CLASS="Intro">This view provides a hierarchical view of the
-artifacts in the Workbench, which is customized by the specific
-configuration of your Workbench.</p>
-<P>From here, you can open files for editing or select resources for operations such as exporting.</P>
-<P CLASS="Para">A typical Project Explorer with only the Java
-Development Tools (JDT) installed looks similar to the Package Explorer:</P>
-<P>Right-click on any resource in the Project Explorer view to open a pop-up menu that allows you to perform operations such as copying, moving, creating new resources, comparing resources with each other, or performing team operations. To see a description of what each menu item does, move selection highlight to that menu item and press the context-sensitive help key (e.g., F1 on Microsoft Windows).</P>
-<p CLASS="Head">By default, the Project Explorer view is included in the Resources perspective. To add the Project Explorer view to the current
-perspective, click <a class="command-link"
-	href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.navigator.ProjectExplorer)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window
-&gt; Show View &gt; Other... &gt; General &gt; Project Explorer</b></a>.</p>
-<h2>Toolbar</h2>
-<DIV CLASS="Topic"></DIV>
-<H3>Collapse All</H3>
-<P>This command collapses the tree expansion state of all resources
-in the view.</P>
-<H3>Link with Editor</H3>
-<P>This command toggles whether the Project Explorer selection is
-linked to the active editor. When this option is selected, changing the
-active editor will automatically update the Project Explorer selection to the
-resource being edited.</P>
-<H3>Select and deselect content to filter to the content in the tree</H3>
-<P>This command opens a dialog allowing to configure some filters to enable.</P>
-<H2>View Menus</H2>
-<P>Click the &#8942; vertical ellipsis  to open a menu of items
-specific to the Project Explorer. Some extra menu entries can be
-added by extension and may not be documented here.</P>
-<H3>Project Presentation</H3>
-<P>Select whether the physically nested projects should be shown as root elements (Flat), or
-should be shown under their parent project in place of their corresponding folder (Hierarchical).
-<H3>Top-Level Elements</H3>
-<P>Select whether the top level-elements should be the selected working sets with projects as children,
-or the visible projects.</P>
-<H3>Select Working Set</H3>
-<P>Opens the <B>Select Working Set</B> dialog to allow selecting a
-working set for the Project Explorer.</P>
-<H3>Deselect Working Set</H3>
-<P>Deselects the current working set.</P>
-<H3>Edit Active Working Set</H3>
-<P>Opens the <B>Edit Working Set</B> dialog to allow changing the
-current working set.</P>
-<P><BR>
-In addition to these menu items, the Project Explorer menu shows a list of
-recently used working sets that have been selected in the view.</P>
-<DIV CLASS="Topic">
-<h3>Filters and Customization</h3>
-<P CLASS="Para">This command allows you to change the view for your
-specific needs. You may select pre-defined filters to apply to the view so that you
-can show or hide various artifacts as needed. The default filters
-available with the Java development tools (JDT) is shown below:</P>
-<P CLASS="Para"><img src="../images/Image276_available_filters.png"
-	alt="Available Customizations &gt; Filters dialog" border="0"></P>
-
-<P class="Para">You can also define your own filters based on the name
-of a resource. Full name or regular expressions are allowed.</P>
-<P CLASS="Para"><img src="../images/Image276_user_filters.png"
-	alt="Available Customizations &gt; User filters dialog" border="0"></P>
-</P>
-
-<P CLASS="Para">You may also choose the types of content for the view
-to show as well. The default content extensions available with the
-Java development tools (JDT) is shown below, but your specific extensions
-will be determined by your workbench configuration:</P>
-<P CLASS="Para"><img src="../images/Image276_available_content.png"
-	alt="Available Customizations &gt; Content dialog" border="0"></P>
-</DIV>
-<H3>Link with Editor</H3>
-<P>See the toolbar item description above.</P>
-<P><BR>
-</P>
-
-<h2>Context menu</h2>
-<P>The context-menu allows to access some general Project management operations as
-well as operations that are specific to your selection. Some plugins can extend the
-context-menu with additional entries that might not be documented here.</P>
-<DIV CLASS="Topic">
-<h3 CLASS="Head">New</H3>
-<P CLASS="Para">This command allows you to create a new resource in
-the Workbench. Select the type of resource to create from the submenu.</P>
-</DIV>  
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Copy</H3>
-<P CLASS="Para">This command copies the selected resource to the
-clipboard.</P>
-</DIV>
-<H3>Paste</H3>
-<P>This command pastes resources on the clipboard into the selected
-project or folder. If a resource is selected the resources on the
-clipboard are pasted as siblings of the selected resource.</P>
-<h3 CLASS="Head">Delete</H3>
-<P CLASS="Para">This command deletes the selected resource from the
-workspace.</P>
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Move</H3>
-<P CLASS="Para">This command moves the selected resource to another
-location. A dialog will appear, prompting for the destination location
-to which the resource will be moved.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Rename</H3>
-<P CLASS="Para">This command allows you to specify a new name for
-the selected resource.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Import</H3>
-<P CLASS="Para">This command opens the import wizard and allows you
-to select resources to import into the Workbench.</P>
-</DIV>
-
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Export</H3>
-<P CLASS="Para">This command opens the export wizard and allows you
-to export resources to an external location.</P>
-</DIV>
-
-<h3 CLASS="Head">Refresh</H3>
-<P CLASS="Para">This command refreshes the Workbench's view of the
-selected resource and its children. For example, this is used when you
-create a new file for an existing project outside the Workbench and want
-the file to appear in the Project Explorer view.</P>
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Close Project</H3>
-<P CLASS="Para">The close project command is visible when an open
-project is selected. This command closes the selected project.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Close Unrelated Projects</H3>
-<P CLASS="Para">This command will close any project which are
-unrelated to the selected project.</P>
-</DIV>
-<H3>Open Project</H3>
-<P>The open project command is visible when a closed project is
-selected. This command opens the selected project.</P>
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Team</H3>
-<p CLASS="Head">Menu items in the Team sub-menu are related to
-version control management and are determined by the version control
-management system that is associated with the project. Eclipse provides
-the special menu item<b> Share Project...</b> for projects that are not
-under version control management. This command will present a wizard
-that allows you to choose to share the project with any version control
-management systems that has been added to Eclipse. Eclipse ships with
-support for CVS.</p>
-</DIV>
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Compare With</H3>
-
-<P CLASS="Para">Commands on the Compare With sub-menu allow you to
-do one of the following types of compares:</P>
-<UL CLASS="UnorderedList">
-	<LI CLASS="Item">Compare two or three selected resources with each
-	other</LI>
-	<LI CLASS="Item">Compare the selected resource with remote
-	versions (if the project is associated with a version control
-	management system).</LI>
-	<LI CLASS="Item">Compare the selected resource with a local
-	history state</LI>
-</UL>
-
-<P CLASS="Para">After you select the type of compare you want to do,
-you will either see a compare editor or a compare dialog. In the compare
-editor, you can browse and copy various changes between the compared
-resources. In the compare dialog, you can only browse through the
-changes.</P>
-
-</DIV>
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Replace With</h3>
-<P CLASS="Para">Commands on the Replace With sub-menu allow you to
-replace the selected resource with another state from the local history.
-If the project is under version control management, there may be
-additional items supplied by the version control management system as
-well.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h3 CLASS="Head">Properties</H3>
-<P CLASS="Para">This command displays the properties of the selected
-resource. The kinds of properties that are displayed depend on what type
-of resource is selected. Resource properties may include (but are not
-limited to):</P>
-<UL CLASS="UnorderedList">
-	<LI CLASS="Item">Path relative to the project in which it is held</LI>
-	<LI CLASS="Item">Type of resource</LI>
-	<LI CLASS="Item">Absolute file system path, or name of path
-	variable when using linked resources</LI>
-	<LI CLASS="Item">Resolved path variable when using a path variable
-	for a linked resource</LI>
-	<LI CLASS="Item">Size of resource</LI>
-	<LI CLASS="Item">Last modified date</LI>
-	<LI CLASS="Item">Read-only status</LI>
-	<LI CLASS="Item">Derived resource status</LI>
-	<LI CLASS="Item">Execution arguments, if it is an executable
-	resource</LI>
-	<LI CLASS="Item">Program launchers, if it is launchable</LI>
-	<LI CLASS="Item">Project dependencies, if any</LI>
-</UL>
-</DIV>
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/cworkset.htm">Working Sets</a> <br>
-<a href="../concepts/concepts-26.htm">Team programming with CVS</a> <br>
-<a HREF="../concepts/concepts-29.htm">Three-way compare</a> <br>
-<a href="../concepts/concepts-13.htm">Linked resources</a>
-
-<p><h3 class="related">Related reference</h3>
-<a href="ref-25.htm">Compare editor</a>
-
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Project Explorer view</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1>Project Explorer view</h1>
+  <p class="Intro">This view provides a hierarchical view of the artifacts in the Workbench, which is customized by the
+  specific configuration of your Workbench.</p>
+  <p>From here, you can open files for editing or select resources for operations such as exporting.</p>
+  <p class="Para">A typical Project Explorer with only the Java Development Tools (JDT) installed looks similar to the
+  Package Explorer:</p>
+  <p>Right-click on any resource in the Project Explorer view to open a pop-up menu that allows you to perform
+  operations such as copying, moving, creating new resources, comparing resources with each other, or performing team
+  operations. To see a description of what each menu item does, move selection highlight to that menu item and press
+  the context-sensitive help key (e.g., F1 on Microsoft Windows).</p>
+  <p class="Head">By default, the Project Explorer view is included in the Resources perspective. To add the Project
+  Explorer view to the current perspective, click <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.navigator.ProjectExplorer)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window &gt; Show View &gt; Other...
+  &gt; General &gt; Project Explorer</b></a>.</p>
+  <h2>Toolbar</h2>
+  <div class="Topic"></div>
+  <h3>Collapse All</h3>
+  <p>This command collapses the tree expansion state of all resources in the view.</p>
+  <h3>Link with Editor</h3>
+  <p>This command toggles whether the Project Explorer selection is linked to the active editor. When this option is
+  selected, changing the active editor will automatically update the Project Explorer selection to the resource being
+  edited.</p>
+  <h3>Select and deselect content to filter to the content in the tree</h3>
+  <p>This command opens a dialog allowing to configure some filters to enable.</p>
+  <h2>View Menus</h2>
+  <p>Click the â‹® vertical ellipsis to open a menu of items specific to the Project Explorer. Some extra menu entries
+  can be added by extension and may not be documented here.</p>
+  <h3>Project Presentation</h3>
+  <p>Select whether the physically nested projects should be shown as root elements (Flat), or should be shown under
+  their parent project in place of their corresponding folder (Hierarchical).</p>
+  <h3>Top-Level Elements</h3>
+  <p>Select whether the top level-elements should be the selected working sets with projects as children, or the
+  visible projects.</p>
+  <h3>Select Working Set</h3>
+  <p>Opens the <b>Select Working Set</b> dialog to allow selecting a working set for the Project Explorer.</p>
+  <h3>Deselect Working Set</h3>
+  <p>Deselects the current working set.</p>
+  <h3>Edit Active Working Set</h3>
+  <p>Opens the <b>Edit Working Set</b> dialog to allow changing the current working set.</p>
+  <p><br>
+  In addition to these menu items, the Project Explorer menu shows a list of recently used working sets that have been
+  selected in the view.</p>
+  <div class="Topic">
+    <h3>Filters and Customization</h3>
+    <p class="Para">This command allows you to change the view for your specific needs. You may select pre-defined
+    filters to apply to the view so that you can show or hide various artifacts as needed. The default filters
+    available with the Java development tools (JDT) is shown below:</p>
+    <p class="Para"><img src="../images/Image276_available_filters.png" alt=
+    "Available Customizations &gt; Filters dialog" border="0"></p>
+    <p class="Para">You can also define your own filters based on the name of a resource. Full name or regular
+    expressions are allowed.</p>
+    <p class="Para"><img src="../images/Image276_user_filters.png" alt=
+    "Available Customizations &gt; User filters dialog" border="0"></p>
+    <p class="Para">You may also choose the types of content for the view to show as well. The default content
+    extensions available with the Java development tools (JDT) is shown below, but your specific extensions will be
+    determined by your workbench configuration:</p>
+    <p class="Para"><img src="../images/Image276_available_content.png" alt=
+    "Available Customizations &gt; Content dialog" border="0"></p>
+  </div>
+  <h3>Link with Editor</h3>
+  <p>See the toolbar item description above.</p>
+  <p><br></p>
+  <h2>Context menu</h2>
+  <p>The context-menu allows to access some general Project management operations as well as operations that are
+  specific to your selection. Some plugins can extend the context-menu with additional entries that might not be
+  documented here.</p>
+  <div class="Topic">
+    <h3 class="Head">New</h3>
+    <p class="Para">This command allows you to create a new resource in the Workbench. Select the type of resource to
+    create from the submenu.</p>
+  </div>
+  <div class="Topic">
+    <h3 class="Head">Copy</h3>
+    <p class="Para">This command copies the selected resource to the clipboard.</p>
+  </div>
+  <h3>Paste</h3>
+  <p>This command pastes resources on the clipboard into the selected project or folder. If a resource is selected the
+  resources on the clipboard are pasted as siblings of the selected resource.</p>
+  <h3 class="Head">Delete</h3>
+  <p class="Para">This command deletes the selected resource from the workspace.</p>
+  <div class="Topic">
+    <h3 class="Head">Move</h3>
+    <p class="Para">This command moves the selected resource to another location. A dialog will appear, prompting for
+    the destination location to which the resource will be moved.</p>
+  </div>
+  <div class="Topic">
+    <h3 class="Head">Rename</h3>
+    <p class="Para">This command allows you to specify a new name for the selected resource.</p>
+  </div>
+  <div class="Topic">
+    <h3 class="Head">Import</h3>
+    <p class="Para">This command opens the import wizard and allows you to select resources to import into the
+    Workbench.</p>
+  </div>
+  <div class="Topic">
+    <h3 class="Head">Export</h3>
+    <p class="Para">This command opens the export wizard and allows you to export resources to an external
+    location.</p>
+  </div>
+  <h3 class="Head">Refresh</h3>
+  <p class="Para">This command refreshes the Workbench's view of the selected resource and its children. For example,
+  this is used when you create a new file for an existing project outside the Workbench and want the file to appear in
+  the Project Explorer view.</p>
+  <div class="Topic">
+    <h3 class="Head">Close Project</h3>
+    <p class="Para">The close project command is visible when an open project is selected. This command closes the
+    selected project.</p>
+  </div>
+  <div class="Topic">
+    <h3 class="Head">Close Unrelated Projects</h3>
+    <p class="Para">This command will close any project which are unrelated to the selected project.</p>
+  </div>
+  <h3>Open Project</h3>
+  <p>The open project command is visible when a closed project is selected. This command opens the selected
+  project.</p>
+  <div class="Topic">
+    <h3 class="Head">Team</h3>
+    <p class="Head">Menu items in the Team sub-menu are related to version control management and are determined by the
+    version control management system that is associated with the project. Eclipse provides the special menu item
+    <b>Share Project...</b> for projects that are not under version control management. This command will present a
+    wizard that allows you to choose to share the project with any version control management systems that has been
+    added to Eclipse. Eclipse ships with support for CVS.</p>
+  </div>
+  <div class="Topic">
+    <h3 class="Head">Compare With</h3>
+    <p class="Para">Commands on the Compare With sub-menu allow you to do one of the following types of compares:</p>
+    <ul class="UnorderedList">
+      <li class="Item">Compare two or three selected resources with each other</li>
+      <li class="Item">Compare the selected resource with remote versions (if the project is associated with a version
+      control management system).</li>
+      <li class="Item">Compare the selected resource with a local history state</li>
+    </ul>
+    <p class="Para">After you select the type of compare you want to do, you will either see a compare editor or a
+    compare dialog. In the compare editor, you can browse and copy various changes between the compared resources. In
+    the compare dialog, you can only browse through the changes.</p>
+  </div>
+  <div class="Topic">
+    <h3 class="Head">Replace With</h3>
+    <p class="Para">Commands on the Replace With sub-menu allow you to replace the selected resource with another state
+    from the local history. If the project is under version control management, there may be additional items supplied
+    by the version control management system as well.</p>
+  </div>
+  <div class="Topic">
+    <h3 class="Head">Properties</h3>
+    <p class="Para">This command displays the properties of the selected resource. The kinds of properties that are
+    displayed depend on what type of resource is selected. Resource properties may include (but are not limited
+    to):</p>
+    <ul class="UnorderedList">
+      <li class="Item">Path relative to the project in which it is held</li>
+      <li class="Item">Type of resource</li>
+      <li class="Item">Absolute file system path, or name of path variable when using linked resources</li>
+      <li class="Item">Resolved path variable when using a path variable for a linked resource</li>
+      <li class="Item">Size of resource</li>
+      <li class="Item">Last modified date</li>
+      <li class="Item">Read-only status</li>
+      <li class="Item">Derived resource status</li>
+      <li class="Item">Execution arguments, if it is an executable resource</li>
+      <li class="Item">Program launchers, if it is launchable</li>
+      <li class="Item">Project dependencies, if any</li>
+    </ul>
+  </div>
+  <h3 class="related">Related concepts</h3><a href="../concepts/cworkset.htm">Working Sets</a><br>
+  <a href="../concepts/concepts-26.htm">Team programming with CVS</a><br>
+  <a href="../concepts/concepts-29.htm">Three-way compare</a><br>
+  <a href="../concepts/concepts-13.htm">Linked resources</a>
+  <h3 class="related">Related reference</h3><a href="ref-25.htm">Compare editor</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-28.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-28.htm
index dfdd3f8..f50b905 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-28.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-28.htm
@@ -1,57 +1,45 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Bookmarks view</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Bookmarks view</H1>
-<P CLASS="Para">
-The Bookmarks view displays user defined bookmarks.</P>
-<P CLASS="Para">
-<img align="top" border="0" src="../images/Image244_bmark_view.png" alt="Bookmarks view" ></P>
-<p CLASS="Head">
-To add the Bookmarks view to the current perspective, click
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.BookmarkView)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>Window &gt; Show View &gt; Other... &gt; General &gt; Bookmarks</b></a>.
-</p>
-<DIV CLASS="Subtopic">
-<P CLASS="Para">
-The Description column contains a description of the bookmark. You can edit the description by selecting <b>Properties</b> from the context menu.</P>
-</DIV>
-<DIV CLASS="Subtopic">
-<P CLASS="Para">
-The Resource and Path columns provide the name and location of the resource
-associated with each bookmark.</P>
-</DIV>
-<P CLASS="Para">
-The Location column indicates the line number of the bookmark within its associated resource.</P>
-<h2>Toolbar</h2>
-<p>The toolbar of the Bookmarks view includes the following buttons.</p>
-<dl>
-  <dt>Delete</dt>
-  <dd>Delete the selected bookmark.</dd>
-  <dt>Go to</dt>
-  <dd>Open the bookmark's resource and navigate to the bookmarked region.</dd>
-</dl>
-<h2>Menus</h2>
-<p>Click the icon at the left end of the view's title bar to open a menu of items
-generic to all views. Click the black upside-down triangle icon to open a menu of items
-specific to the Bookmarks view. Right-click inside the view to open a context menu.</p>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-81b.htm">Creating a bookmark for an entire file</a><br>
-<a href="../tasks/tasks-81.htm">Creating a bookmark within a file</a><br>
-<a href="../tasks/tasks-82.htm">Deleting a Bookmark</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Bookmarks view</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Bookmarks view</h1>
+  <p class="Para">The Bookmarks view displays user defined bookmarks.</p>
+  <p class="Para"><img align="top" border="0" src="../images/Image244_bmark_view.png" alt="Bookmarks view"></p>
+  <p class="Head">To add the Bookmarks view to the current perspective, click <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.BookmarkView)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window &gt; Show View &gt; Other...
+  &gt; General &gt; Bookmarks</b></a>.</p>
+  <div class="Subtopic">
+    <p class="Para">The Description column contains a description of the bookmark. You can edit the description by
+    selecting <b>Properties</b> from the context menu.</p>
+  </div>
+  <div class="Subtopic">
+    <p class="Para">The Resource and Path columns provide the name and location of the resource associated with each
+    bookmark.</p>
+  </div>
+  <p class="Para">The Location column indicates the line number of the bookmark within its associated resource.</p>
+  <h2>Toolbar</h2>
+  <p>The toolbar of the Bookmarks view includes the following buttons.</p>
+  <dl>
+    <dt>Delete</dt>
+    <dd>Delete the selected bookmark.</dd>
+    <dt>Go to</dt>
+    <dd>Open the bookmark's resource and navigate to the bookmarked region.</dd>
+  </dl>
+  <h2>Menus</h2>
+  <p>Click the icon at the left end of the view's title bar to open a menu of items generic to all views. Click the
+  black upside-down triangle icon to open a menu of items specific to the Bookmarks view. Right-click inside the view
+  to open a context menu.</p>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-81b.htm">Creating a bookmark for an entire file</a><br>
+  <a href="../tasks/tasks-81.htm">Creating a bookmark within a file</a><br>
+  <a href="../tasks/tasks-82.htm">Deleting a Bookmark</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-29.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-29.htm
index 2284d23..7e9719c 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-29.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-29.htm
@@ -1,35 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Properties view</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Properties view</H1>
-<P CLASS="Para">
-This view displays property names and basic properties of a selected resource.</P>
-<P CLASS="Para">Toolbar buttons allow you to toggle whether to display
-properties by category and whether to filter advanced properties. Another
-toolbar button allows you to restore the selected property to its default value.</P>
-<P>To see more detailed information about a resource than the Properties view
-gives you, right-click the resource name in one of the navigation views and select
-Properties from the pop-up menu.
-</P>
-<p CLASS="Head">
-To add the Properties view to the current perspective, click
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.PropertySheet)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>Window &gt; Show View &gt; Other... &gt; General &gt; Properties</b></a>.
-</p>
-
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Properties view</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Properties view</h1>
+  <p class="Para">This view displays property names and basic properties of a selected resource.</p>
+  <p class="Para">Toolbar buttons allow you to toggle whether to display properties by category and whether to filter
+  advanced properties. Another toolbar button allows you to restore the selected property to its default value.</p>
+  <p>To see more detailed information about a resource than the Properties view gives you, right-click the resource
+  name in one of the navigation views and select Properties from the pop-up menu.</p>
+  <p class="Head">To add the Properties view to the current perspective, click <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.PropertySheet)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window &gt; Show View &gt; Other...
+  &gt; General &gt; Properties</b></a>.</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-3.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-3.htm
index 317bf62..e7dcad1 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-3.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-3.htm
@@ -1,63 +1,53 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Perspective bar</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head"> Perspective Bar</H1>
-<P CLASS="Intro">
-The perspective bar allows quick access to perspectives that are currently open, as well
-as providing an easy way to open a new perspective. The perspective bar may be docked in three different positions.  It may be docked in the upper right corner (the default position), the upper left corner (under the main toolbar) and to the far left.</p>
-<P CLASS="Para">
-Here is an example of what the perspective bar looks like:</P>
-<P CLASS="Para">
-<img src="../images/Image211_perspective.png" alt="Perspective Bar" border="0"></P>
-<DIV CLASS="Topic">
-<h3>
-Open Perspective</h3>
-<P CLASS="Para">
-This command opens a new perspective that is
-selected from a drop-down menu.  All of the perspectives that are open within a single Workbench window are
-shown on the shortcut bar.</P>
-</DIV>
-<DIV CLASS="Topic"> 
-  <h3>Perspective Buttons</h3>
-  <P CLASS="Para"> These buttons provide a quick way to switch to one of the open 
-    perspectives in the current Workbench window. </P>
-  <P CLASS="Para"></P>
-  <h3>Available Perspectives</h3>
-  <p>There are several available perspectives, while one is set as a default, 
-    others can be manually added to the perspective bar. To add new perspectives 
-    to your workspace, click <strong>Open Perspective</strong> <img src="../images/new_persp.svg" alt="Open Perspective Icon" border="0" >, 
-    select <strong>Other</strong> and choose from the following
-    <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective")'>
-    <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-    available perspectives</a>:</p>
-</DIV>
-<ul>
-  <li>CVS Repository Exploring;</li>
-  <li>Debug;</li>
-  <li>Java;</li>
-  <li>Java Browsing;</li>
-  <li>Java Type Hierarchy;</li>
-  <li>Plug-in Development;</li>
-  <li>Resource;</li>
-  <li>Team Synchronizing.</li>
-</ul>
-
-<h3 class="related">Related reference</h3>
-  <a href="ref-6.htm">Perspectives</a> <br>
-  <a href="ref-4.htm">View Toolbars</a> <br>
-  <a href="ref-2.htm">Workbench Toolbar</a> <br>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Perspective bar</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Perspective Bar</h1>
+  <p class="Intro">The perspective bar allows quick access to perspectives that are currently open, as well as
+  providing an easy way to open a new perspective. The perspective bar may be docked in three different positions. It
+  may be docked in the upper right corner (the default position), the upper left corner (under the main toolbar) and to
+  the far left.</p>
+  <p class="Para">Here is an example of what the perspective bar looks like:</p>
+  <p class="Para"><img src="../images/Image211_perspective.png" alt="Perspective Bar" border="0"></p>
+  <div class="Topic">
+    <h3>Open Perspective</h3>
+    <p class="Para">This command opens a new perspective that is selected from a drop-down menu. All of the
+    perspectives that are open within a single Workbench window are shown on the shortcut bar.</p>
+  </div>
+  <div class="Topic">
+    <h3>Perspective Buttons</h3>
+    <p class="Para">These buttons provide a quick way to switch to one of the open perspectives in the current
+    Workbench window.</p>
+    <p class="Para"></p>
+    <h3>Available Perspectives</h3>
+    <p>There are several available perspectives, while one is set as a default, others can be manually added to the
+    perspective bar. To add new perspectives to your workspace, click <strong>Open Perspective</strong> <img src=
+    "../images/new_persp.svg" alt="Open Perspective Icon" border="0">, select <strong>Other</strong> and choose from
+    the following <a class="command-link" href=
+    'javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective")'><img src=
+    "PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> available perspectives</a>:</p>
+  </div>
+  <ul>
+    <li>CVS Repository Exploring;</li>
+    <li>Debug;</li>
+    <li>Java;</li>
+    <li>Java Browsing;</li>
+    <li>Java Type Hierarchy;</li>
+    <li>Plug-in Development;</li>
+    <li>Resource;</li>
+    <li>Team Synchronizing.</li>
+  </ul>
+  <h3 class="related">Related reference</h3><a href="ref-6.htm">Perspectives</a><br>
+  <a href="ref-4.htm">View Toolbars</a><br>
+  <a href="ref-2.htm">Workbench Toolbar</a><br>
   <a href="ref-23.htm">Workbench Window Layout</a>
-
-</BODY>
-</HTML>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-30.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-30.htm
index e5c8544..c4660c8 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-30.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-30.htm
@@ -1,32 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Outline view</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Outline view</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
 <body>
-<H1 CLASS="Head">
-Outline view</H1>
-
-<P>This view displays an outline of a structured file
-that is currently open in the editor area, and lists structural
-elements. The contents of the outline view are editor-specific. In the
-example below, which is for a Java source file, the structural elements are classes, variables, and methods.
-The contents of the toolbar are also editor-specific.
-</p>
-
-<p CLASS="Head">
-To add the Outline view to the current perspective, click
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.ContentOutline)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>Window &gt; Show View &gt; Other... &gt; General &gt; Outline</b></a>.
-</p>
+  <h1 class="Head">Outline view</h1>
+  <p>This view displays an outline of a structured file that is currently open in the editor area, and lists structural
+  elements. The contents of the outline view are editor-specific. In the example below, which is for a Java source
+  file, the structural elements are classes, variables, and methods. The contents of the toolbar are also
+  editor-specific.</p>
+  <p class="Head">To add the Outline view to the current perspective, click <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.ContentOutline)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window &gt; Show View &gt; Other...
+  &gt; General &gt; Outline</b></a>.</p>
 </body>
-</HTML>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-30a.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-30a.htm
index bcd39ff..339b163 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-30a.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-30a.htm
@@ -1,31 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>CVS views</title>
-
-</HEAD>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>CVS views</title>
+</head>
 <body>
-<H1 CLASS="Head">
-CVS views</H1>
-
-<P>There are several CVS specific views, the CVS Repositories view, the CVS Resource 
-History view, the CVS Console view and the Synchronize view.
-</p>
-<P>  See Team Support in the
-Reference section for details on these views.
-</p>
-
-<h3 class="related">Related reference</h3>
-     <a href="ref-32.htm">CVS Repositories view</a><br>
-     <a href="ref-32a.htm">CVS Resource History View</a><br>
-     <a href="ref-32b.htm">CVS Console view</a><br>
-     <a href="ref-33.htm">Synchronize view</a>
-     
+  <h1 class="Head">CVS views</h1>
+  <p>There are several CVS specific views, the CVS Repositories view, the CVS Resource History view, the CVS Console
+  view and the Synchronize view.</p>
+  <p>See Team Support in the Reference section for details on these views.</p>
+  <h3 class="related">Related reference</h3><a href="ref-32.htm">CVS Repositories view</a><br>
+  <a href="ref-32a.htm">CVS Resource History View</a><br>
+  <a href="ref-32b.htm">CVS Console view</a><br>
+  <a href="ref-33.htm">Synchronize view</a>
 </body>
-</HTML>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-31.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-31.htm
index 4faa1b5..11107b9 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-31.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-31.htm
@@ -1,98 +1,85 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Tasks view (reference)</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Tasks view</H1>
-<P CLASS="Para"> The Tasks view displays tasks that you add manually. You can 
-  associate a task with a resource in the Workbench, but this is not required.</P>
-<p CLASS="Head">
-By default, the Tasks view is included in the Resources perspective. To add it
-to the current perspective, click
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.TaskList)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>Window &gt; Show View &gt; Other... &gt; General &gt; Tasks</b></a>.
-</p>
-<p CLASS="Head">
-The following icons are used by the Tasks view:</p>
-<table border="1" cellspacing="0" cellpadding="5" summary="Icon table">
-  <tr> 
-    <th valign="top" align="center">Icon</th>
-    <th valign="top" align="left">Description</th>
-  </tr>
-  <tr> 
-    <td valign="top" align="center"><img src="../images/ihigh_obj.svg" alt=" High priority task item" border="0" ></td>
-    <td valign="top" align="left"> High priority task</td>
-  </tr>
-  <tr> 
-    <td valign="top" align="center"><img src="../images/ilow_obj.svg" alt=" Low priority task icon" border="0"></td>
-    <td valign="top" align="left"> Low priority task </td>
-  </tr>
-  <tr> 
-    <td valign="top" align="center"><img src="../images/complete_tsk.svg"  alt="Completed task icon" border="0"></td>
-    <td valign="top" align="left"> Completed task </td>
-  </tr>
-    <tr> 
-    <td valign="top" align="center"><img src="../images/addtsk_tsk.svg" alt="Add task" border="0" ></td>
-    <td valign="top" align="left"> Add task</td>
-  </tr>
-  <tr> 
-    <td valign="top" align="center"><img src="../images/delete_edit.svg" alt="Delete" border="0"></td>
-    <td valign="top" align="left"> Delete</td>
-  </tr>
-  <tr> 
-    <td valign="top" align="center"><img src="../images/filter_ps.svg" alt="Filter" border="0" ></td>
-    <td valign="top" align="left"> Filter</td>
-  </tr>
-
-</table>
-
-<p CLASS="Head"> The first column indicates whether the task is completed. Completed 
-  tasks are flagged with a check mark, which you add manually.</p>
-<p CLASS="Head"> The second column indicates whether the task is high, normal, 
-  or low priority.</p>
-<DIV CLASS="Subtopic">
-<P CLASS="Para">
-The Description column contains a description of the line item. You can edit the description of user-defined tasks by selecting <b>Properties</b> from the context menu.</P>
-</DIV>
-<DIV CLASS="Subtopic">
-<P CLASS="Para">
-The Resource and Path columns provide the name and location of the resource
-associated with each line item.</P>
-</DIV>
-<P CLASS="Para">
-The Location column indicates the line number of the line item within its associated resource.</P>
-<h2>Toolbar</h2>
-<p>The toolbar of the Tasks view includes the following buttons.</p>
-<dl>
-  <dt>Add task</dt>
-  <dd>Manually add a &quot;to do&quot; item to the Tasks view.</dd>
-  <dt>Delete</dt>
-  <dd>Delete the selected line item.</dd>
-  <dt>Filter</dt>
-  <dd>Filter the view according to the type of item.</dd>
-</dl>
-<h2>Menus</h2>
-<p>Click the icon at the left end of the view's title bar to open a menu of items 
-  generic to all views. Click the upside-down triangle icon to open a menu of 
-  items specific to the Tasks view. Right-click inside the view to open a context 
-  menu.</p>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-77.htm">Adding line items in the Tasks view</a>
-<a href="../tasks/tasks-77b.htm"><br>Associating a task with a resource</a>
-<a href="../tasks/tasks-78.htm"><br>Deleting tasks</a>
-<a href="../tasks/tasks-79.htm"><br>Filtering the task view</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Tasks view (reference)</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Tasks view</h1>
+  <p class="Para">The Tasks view displays tasks that you add manually. You can associate a task with a resource in the
+  Workbench, but this is not required.</p>
+  <p class="Head">By default, the Tasks view is included in the Resources perspective. To add it to the current
+  perspective, click <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.TaskList)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window &gt; Show View &gt; Other...
+  &gt; General &gt; Tasks</b></a>.</p>
+  <p class="Head">The following icons are used by the Tasks view:</p>
+  <table border="1" cellspacing="0" cellpadding="5" summary="Icon table">
+    <tr>
+      <th valign="top" align="center">Icon</th>
+      <th valign="top" align="left">Description</th>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/ihigh_obj.svg" alt=" High priority task item" border=
+      "0"></td>
+      <td valign="top" align="left">High priority task</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/ilow_obj.svg" alt=" Low priority task icon" border="0"></td>
+      <td valign="top" align="left">Low priority task</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/complete_tsk.svg" alt="Completed task icon" border="0"></td>
+      <td valign="top" align="left">Completed task</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/addtsk_tsk.svg" alt="Add task" border="0"></td>
+      <td valign="top" align="left">Add task</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/delete_edit.svg" alt="Delete" border="0"></td>
+      <td valign="top" align="left">Delete</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/filter_ps.svg" alt="Filter" border="0"></td>
+      <td valign="top" align="left">Filter</td>
+    </tr>
+  </table>
+  <p class="Head">The first column indicates whether the task is completed. Completed tasks are flagged with a check
+  mark, which you add manually.</p>
+  <p class="Head">The second column indicates whether the task is high, normal, or low priority.</p>
+  <div class="Subtopic">
+    <p class="Para">The Description column contains a description of the line item. You can edit the description of
+    user-defined tasks by selecting <b>Properties</b> from the context menu.</p>
+  </div>
+  <div class="Subtopic">
+    <p class="Para">The Resource and Path columns provide the name and location of the resource associated with each
+    line item.</p>
+  </div>
+  <p class="Para">The Location column indicates the line number of the line item within its associated resource.</p>
+  <h2>Toolbar</h2>
+  <p>The toolbar of the Tasks view includes the following buttons.</p>
+  <dl>
+    <dt>Add task</dt>
+    <dd>Manually add a "to do" item to the Tasks view.</dd>
+    <dt>Delete</dt>
+    <dd>Delete the selected line item.</dd>
+    <dt>Filter</dt>
+    <dd>Filter the view according to the type of item.</dd>
+  </dl>
+  <h2>Menus</h2>
+  <p>Click the icon at the left end of the view's title bar to open a menu of items generic to all views. Click the
+  upside-down triangle icon to open a menu of items specific to the Tasks view. Right-click inside the view to open a
+  context menu.</p>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-77.htm">Adding line items in the Tasks view</a>
+  <a href="../tasks/tasks-77b.htm"><br>
+  Associating a task with a resource</a> <a href="../tasks/tasks-78.htm"><br>
+  Deleting tasks</a> <a href="../tasks/tasks-79.htm"><br>
+  Filtering the task view</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-31a.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-31a.htm
index 5ee462e..708d743 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-31a.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-31a.htm
@@ -1,98 +1,83 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Problems view (reference)</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head"> Problems view</H1>
-<P CLASS="Para"> The Problems view displays system-generated errors, warnings, 
-  or information associated with a resource. These are typically produced by builders. 
-  For example, if you save a Java source file that contains syntax errors, the 
-  errors will automatically be logged in this view.</P>
-<p CLASS="Head"> By default, the Problems view is included in the Resources perspective. 
-  To add it to the current perspective, click
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.ProblemView)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <b>Window &gt; Show View &gt; Other... &gt; General &gt; Problems</b></a>.
-</p>
-<p CLASS="Head"> The following icons are used by the Problems view:</p>
-<table border="1" cellspacing="0" cellpadding="5" summary="Icon table">
-  <tr>
-    <th valign="top" align="center">Icon</th>
-    <th valign="top" align="left">Description</th>
-  </tr>
-  <tr>
-    <td valign="top" align="center"><img src="../images/info_obj.svg" alt=" Information icon" border="0" ></td>
-    <td valign="top" align="left">
-      Information</td>
-  </tr>
-  <tr>
-    <td valign="top" align="center"><img src="../images/warning_obj.svg" alt="Warning icon" border="0"></td>
-    <td valign="top" align="left">
-      Warning</td>
-  </tr>
-  <tr>
-    <td valign="top" align="center"><img src="../images/quickfix_warning_obj.svg" alt="Warning with quick fix icon" border="0"></td>
-    <td valign="top" align="left">
-      Warning with quick fix</td>
-  </tr>
-  <tr>
-    <td valign="top" align="center"><img src="../images/error_obj.svg" alt="Error icon" border="0"></td>
-    <td valign="top" align="left">
-      Error</td>
-  </tr>
-  <tr>
-    <td valign="top" align="center"><img src="../images/quickfix_error_obj.svg" alt="Error with quick fix icon" border="0"></td>
-    <td valign="top" align="left">
-      Error with quick fix</td>
-  </tr>
-  <tr> 
-    <td valign="top" align="center"><img src="../images/delete_edit.svg" alt="Delete" border="0"></td>
-    <td valign="top" align="left"> Delete</td>
-  </tr>
-  <tr> 
-    <td valign="top" align="center"><img src="../images/filter_ps.svg" alt="Filter" border="0" ></td>
-    <td valign="top" align="left"> Filter</td>
-  </tr>
-</table>
-
-<p CLASS="Head"> The first column indicates whether the line item is a task or 
-  a compiler generated error, warning or info.</p>
-<DIV CLASS="Subtopic">
-<P CLASS="Para">
-The Description column contains a description of the line item. You can edit the description of user-defined tasks by selecting <b>Properties</b> from the context menu.</P>
-</DIV>
-<DIV CLASS="Subtopic">
-<P CLASS="Para">
-The Resource and Path columns provide the name and location of the resource
-associated with each line item.</P>
-</DIV>
-<P CLASS="Para">
-The Location column indicates the line number of the line item within its associated resource.</P>
-<h2>Toolbar</h2>
-<p>The toolbar of the Problems view includes the following buttons.</p>
-<dl>
-  <dt>Delete</dt>
-  <dd>Delete the selected line item.</dd>
-  <dt>Filter</dt>
-  <dd>Filter the view according to the type of item.</dd>
-</dl>
-<h2>Menus</h2>
-<p>Click the icon at the left end of the view's title bar to open a menu of items 
-  generic to all views. Click the upside-down triangle icon to open a menu of 
-  items specific to the Problems view. Right-click inside the view to open a context 
-  menu.</p>
-
-
-
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Problems view (reference)</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Problems view</h1>
+  <p class="Para">The Problems view displays system-generated errors, warnings, or information associated with a
+  resource. These are typically produced by builders. For example, if you save a Java source file that contains syntax
+  errors, the errors will automatically be logged in this view.</p>
+  <p class="Head">By default, the Problems view is included in the Resources perspective. To add it to the current
+  perspective, click <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.ProblemView)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window &gt; Show View &gt; Other...
+  &gt; General &gt; Problems</b></a>.</p>
+  <p class="Head">The following icons are used by the Problems view:</p>
+  <table border="1" cellspacing="0" cellpadding="5" summary="Icon table">
+    <tr>
+      <th valign="top" align="center">Icon</th>
+      <th valign="top" align="left">Description</th>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/info_obj.svg" alt=" Information icon" border="0"></td>
+      <td valign="top" align="left">Information</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/warning_obj.svg" alt="Warning icon" border="0"></td>
+      <td valign="top" align="left">Warning</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/quickfix_warning_obj.svg" alt="Warning with quick fix icon"
+      border="0"></td>
+      <td valign="top" align="left">Warning with quick fix</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/error_obj.svg" alt="Error icon" border="0"></td>
+      <td valign="top" align="left">Error</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/quickfix_error_obj.svg" alt="Error with quick fix icon"
+      border="0"></td>
+      <td valign="top" align="left">Error with quick fix</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/delete_edit.svg" alt="Delete" border="0"></td>
+      <td valign="top" align="left">Delete</td>
+    </tr>
+    <tr>
+      <td valign="top" align="center"><img src="../images/filter_ps.svg" alt="Filter" border="0"></td>
+      <td valign="top" align="left">Filter</td>
+    </tr>
+  </table>
+  <p class="Head">The first column indicates whether the line item is a task or a compiler generated error, warning or
+  info.</p>
+  <div class="Subtopic">
+    <p class="Para">The Description column contains a description of the line item. You can edit the description of
+    user-defined tasks by selecting <b>Properties</b> from the context menu.</p>
+  </div>
+  <div class="Subtopic">
+    <p class="Para">The Resource and Path columns provide the name and location of the resource associated with each
+    line item.</p>
+  </div>
+  <p class="Para">The Location column indicates the line number of the line item within its associated resource.</p>
+  <h2>Toolbar</h2>
+  <p>The toolbar of the Problems view includes the following buttons.</p>
+  <dl>
+    <dt>Delete</dt>
+    <dd>Delete the selected line item.</dd>
+    <dt>Filter</dt>
+    <dd>Filter the view according to the type of item.</dd>
+  </dl>
+  <h2>Menus</h2>
+  <p>Click the icon at the left end of the view's title bar to open a menu of items generic to all views. Click the
+  upside-down triangle icon to open a menu of items specific to the Problems view. Right-click inside the view to open
+  a context menu.</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-32.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-32.htm
index d44d346..75e25bf 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-32.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-32.htm
@@ -1,227 +1,152 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-         
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-         
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
-          
   <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
   <title>CVS Repositories view</title>
-    
 </head>
- <body bgcolor="#ffffff">
-     
-<h1> CVS Repositories view</h1>
-     
-<p class="Para">The CVS Repositories view, which is part of the CVS Repository
-    Exploring perspective, shows the CVS repository locations that you have
- added to your Workbench. Expanding a location reveals the main trunk
- (HEAD), project versions and branches in that repository. You can further
- expand the project versions and branches to reveal the folders and files
- contained within them. </p>
-     
-<p>The pop-up menu for this view also allows you to specify new repository
- locations. Use the CVS Repositories view to check out resources from
- the repository to the Workbench, configure the branches and versions
-shown by the view, view resource history, and compare resource versions.
-</p>
-     
-<p class="Para"> Here is what the CVS Repositories view looks like:</p>
-     
-<p class="Para"> <img
- src="../images/Image242_repo_view.png" alt="CVS Repositories View"  border="0" align="top"> 
-</p>
-     
-     
-  
-<p>There are two types of folders displayed in the repositories view. For the 
-  most part, they can be treated in the same fashion. That is, they can be checked 
-  out from the Repositories view, etc. However, there are some cases where modules 
-  cannot be expanded in the Repositories view even though they can still be checked 
-  out. </p>
-<table width="75%" border="1">
-  <tr>
-    <td width="9%" align="center"><img alt="Image for a CVS module that maps to a folder on the CVS server." src="../images/fldr_obj.svg"></td>
-    <td width="91%">A CVS module that maps to a folder on the CVS server.</td>
-  </tr>
-  <tr>
-    <td align="center"><img alt="Image for a CVS module defined in the CVSROOT/modules file of the repository." src="../images/cvs_module_rep.svg"></td>
-    <td>A CVS module defined in the CVSROOT/modules file of the repository.</td>
-  </tr>
-</table>
-<p>Like other views in the Workbench, the CVS Repositories view has its own toolbar. 
-  Toolbar buttons are provided for refreshing the view, navigating and creating 
-  new repository locations. The toolbar also contains a drop-down menu that allows 
-  you to filter the view by working set.</p>
-       
-<h2>Toolbar</h2>
-
-<div class="Topic"> 
-<h3>Home</h3>  
-<p class="Para">This command redraws the view, showing the repository locations as the roots 
-displayed by the view.</p>
-</div>
-     
-<div class="Topic">     
-<h3>Back</h3> 
-<p class="Para"> This command redraws the view, showing the roots that
- where displayed immediately prior to the previous issued Go Into command.</p>
-</div>
-     
-<div class="Topic">     
-<h3> Go Into</h3>  
-<p class="Para"> This command redraws the view, making the children of the  selected entry 
-the roots displayed by the view.</p>
-</div>
-     
-<div class="Topic">     
-<h3> Refresh View</h3>
-<p class="Para"> This command refreshes the contents of the Repositories view.</p>
-</div>
-     
-<div class="Topic">     
-<h3>Collapse All</h3>
-  <p class="Para"> This command collapses all expanded entries in the Repositories 
+<body bgcolor="#FFFFFF">
+  <h1>CVS Repositories view</h1>
+  <p class="Para">The CVS Repositories view, which is part of the CVS Repository Exploring perspective, shows the CVS
+  repository locations that you have added to your Workbench. Expanding a location reveals the main trunk (HEAD),
+  project versions and branches in that repository. You can further expand the project versions and branches to reveal
+  the folders and files contained within them.</p>
+  <p>The pop-up menu for this view also allows you to specify new repository locations. Use the CVS Repositories view
+  to check out resources from the repository to the Workbench, configure the branches and versions shown by the view,
+  view resource history, and compare resource versions.</p>
+  <p class="Para">Here is what the CVS Repositories view looks like:</p>
+  <p class="Para"><img src="../images/Image242_repo_view.png" alt="CVS Repositories View" border="0" align="top"></p>
+  <p>There are two types of folders displayed in the repositories view. For the most part, they can be treated in the
+  same fashion. That is, they can be checked out from the Repositories view, etc. However, there are some cases where
+  modules cannot be expanded in the Repositories view even though they can still be checked out.</p>
+  <table width="75%" border="1">
+    <tr>
+      <td width="9%" align="center"><img alt="Image for a CVS module that maps to a folder on the CVS server." src=
+      "../images/fldr_obj.svg"></td>
+      <td width="91%">A CVS module that maps to a folder on the CVS server.</td>
+    </tr>
+    <tr>
+      <td align="center"><img alt="Image for a CVS module defined in the CVSROOT/modules file of the repository." src=
+      "../images/cvs_module_rep.svg"></td>
+      <td>A CVS module defined in the CVSROOT/modules file of the repository.</td>
+    </tr>
+  </table>
+  <p>Like other views in the Workbench, the CVS Repositories view has its own toolbar. Toolbar buttons are provided for
+  refreshing the view, navigating and creating new repository locations. The toolbar also contains a drop-down menu
+  that allows you to filter the view by working set.</p>
+  <h2>Toolbar</h2>
+  <div class="Topic">
+    <h3>Home</h3>
+    <p class="Para">This command redraws the view, showing the repository locations as the roots displayed by the
     view.</p>
-</div>
-
-<div class="Topic">     
-<h3>Add CVS Repository</h3>
-  <p class="Para"> This command brings up the wizard to help you specify a new repository 
-  location.</p>
-</div>
-
-<h3 class="Para">Drop-Down Menu</h3>
-<p class="Para">The drop down menu in the title bar allows the repositories view 
-  to be filtered by a working set. It also allows to hide CVS modules defined in
-  the CVSROOT/modules file.</p>
-     
-<h2 class="Para">Context menu </h2>
-     
-<p class="Para">From the context menu of the Repositories view you can  perform
-a number of interesting operations.</p>
-     
-<h3>New &gt; Repository Location</h3>
-     
-<p class="Para">This command brings up the wizard to help you specify a new repository 
-  location (same as Add CVS Repository toolbar item).</p>
-  
+  </div>
+  <div class="Topic">
+    <h3>Back</h3>
+    <p class="Para">This command redraws the view, showing the roots that where displayed immediately prior to the
+    previous issued Go Into command.</p>
+  </div>
+  <div class="Topic">
+    <h3>Go Into</h3>
+    <p class="Para">This command redraws the view, making the children of the selected entry the roots displayed by the
+    view.</p>
+  </div>
+  <div class="Topic">
+    <h3>Refresh View</h3>
+    <p class="Para">This command refreshes the contents of the Repositories view.</p>
+  </div>
+  <div class="Topic">
+    <h3>Collapse All</h3>
+    <p class="Para">This command collapses all expanded entries in the Repositories view.</p>
+  </div>
+  <div class="Topic">
+    <h3>Add CVS Repository</h3>
+    <p class="Para">This command brings up the wizard to help you specify a new repository location.</p>
+  </div>
+  <h3 class="Para">Drop-Down Menu</h3>
+  <p class="Para">The drop down menu in the title bar allows the repositories view to be filtered by a working set. It
+  also allows to hide CVS modules defined in the CVSROOT/modules file.</p>
+  <h2 class="Para">Context menu</h2>
+  <p class="Para">From the context menu of the Repositories view you can perform a number of interesting
+  operations.</p>
+  <h3>New &gt; Repository Location</h3>
+  <p class="Para">This command brings up the wizard to help you specify a new repository location (same as Add CVS
+  Repository toolbar item).</p>
   <h3>New &gt; Date Tag</h3>
-     
-<p class="Para">This command, available on the repository location and Date category 
-  entries, brings up the dialog which allows the specification of a date tag that 
-  is to be added to the Date category of the location entry in the Repositories 
-  view.</p>
-
-<h3>Check Out</h3>
-<p>This command checks the selected CVS modules out into projects in the Workbench 
-  with the same names as the remote modules (for remote modules that are folders 
-  on the server) or into projects with the name specified with the module (if 
-  the module is defined in the CVSROOT/modules file on the server).</p>
-     
-<h3>Check Out As...</h3>
-<p>This command open the Check Out wizard in order to allow the configuration of how the selected remote modules
-are checked out into the Workbench.</p>
-
-<h3>Tag as Version...</h3>  
-<p> This command versions the selected resource based on the current branch
- contents.</p>
-     
-<h3>Tag with Existing...</h3>  
-<p> This command versions the selected resource based on the current branch
- contents, moving the tag from previously tagged resources if required.</p>
-
-<h3> Compare</h3>   
-<p class="Para">This command will compare two selected resources.</p>
-
-<h3>Compare With...</h3>
-<p class="Para">This command will compare the selected folder with a branch or 
-version of the same folder.</p>
-
-<h3>Expand All</h3>
-<p class="Para">This command will fetch all of the subfolders of the selected item
-in one pass.</p>
-
-<h3>Refresh View</h3>
-<p class="Para">This command will refresh the repository folder tree.</p>
-
-<h3>Paste connection</h3>
-<p class="Para">Creates a new repository location based on the content of the clipboard. 
-There must a valid repository location string (eg. :pserver:dev.eclipse.org:/cvsroot/eclipse) 
-in the clipboard in order paste a new connection.</p>
-
-<h3>Copy to clipboard</h3>
-<p class="Para">Copies the identification string of the selected repository to the clipboard.</p>
-
-<h3>Discard Location</h3>
-<p class="Para">This command will remove the selected repository location. Note that
-all projects that were previously mapped to this repository must first be unmapped.</p>
-  
-<h3>Configure Branches and Versions</h3>
-<p class="Para"> This command brings up the wizard to help you discover the branch 
-  and version tags that exist in the repository for the selected folder so they 
-  can be added to the repositories view to allow the resources that have these 
-  tags can be browsed.</p>
-
-<h3>Refresh Branches...</h3>
-<p class="Para"> This command, available on repository location entries, allows 
-  you to refresh the list of known branches and versions that are displayed in 
-  the repositories view for selected projects. This operation makes use of the 
-  defined auto-refresh files for each project. If the operation fails for a particular 
-  project, use Configure Branches and Versions on the project to select one or 
-  more appropriate refresh files.</p>
-  
-<h3>Add to Branch List...</h3>
-<p> This command adds the selected project to the list of projects that are displayed 
-  under the specified branch in the repositories view. This command only modifies 
-  the repositories view and does not affect the repository in any way. If you 
-  want to add the project to a branch, you can perform a <strong>Tag with Existing</strong> 
-  after performing this operation.</p>
-  
-<h3> Open</h3>
-<p> This command opens the selected file in an editor. Since file revisions
-    in the repository are immutable, the editor opens in a read-only state,
- so it is not modifiable. </p>
-
-<h3> Show Annotation</h3>   
-<p> This command shows the contents of file with annotations identifying the author
-of each line of code in the file.</p>
-   
-<h3> Show History</h3>   
-<p> This command shows the revision history of the selected file in the History view.</p>
-     
-
-<h3>Properties</h3>   
-<p> Available on repository location entries, this command allows the modification 
-  of any of the properties of the location. It also allows the assignment of a 
-  display name and a server encoding which is used to translate file paths and 
-  commit comments between the client and server (but does not affect file contents).</p>
-
-      
-<h3 class="related">Related concepts</h3>
-     <a href="../concepts/concepts-26.htm">Team programming with CVS</a><br>
-     <a href="../concepts/concepts-27c.htm">CVS Repositories</a><br>
-     <a href="../concepts/concepts-27b.htm">Branches</a><br>
-     <a href="../concepts/concepts-27.htm">Versions</a><br>
-     <a href="../concepts/concepts-17a.htm">Local history</a>
-
-<h3 class="related">Related tasks</h3>
-     <a href="../tasks/tasks-92.htm">Creating a CVS repository location</a><br>
-     <a href="../tasks/tasks-94.htm">Discarding a CVS repository location</a><br>
-     <a href="../tasks/tasks-93.htm">Refreshing the CVS repositories view</a><br>
-     <a href="../tasks/tasks-95.htm">Changing the properties of a CVS Repository Location</a><br>
-     <a href="../tasks/tasks-96.htm">Checking out a project from a CVS repository</a><br>
-     <a href="../tasks/tasks-103.htm">Replacing resources in the Workbench</a><br>
-     <a href="../tasks/tasks-117.htm">Sharing a new project using CVS</a><br>
-     <a href="../tasks/tasks-119.htm">Viewing a file's revision history</a>
-
-<h3 class="related">Related reference</h3>
-     <a href="ref-47.htm">CVS</a><br>
-     <a href="ref-32a.htm">CVS Resource History View</a>
-
+  <p class="Para">This command, available on the repository location and Date category entries, brings up the dialog
+  which allows the specification of a date tag that is to be added to the Date category of the location entry in the
+  Repositories view.</p>
+  <h3>Check Out</h3>
+  <p>This command checks the selected CVS modules out into projects in the Workbench with the same names as the remote
+  modules (for remote modules that are folders on the server) or into projects with the name specified with the module
+  (if the module is defined in the CVSROOT/modules file on the server).</p>
+  <h3>Check Out As...</h3>
+  <p>This command open the Check Out wizard in order to allow the configuration of how the selected remote modules are
+  checked out into the Workbench.</p>
+  <h3>Tag as Version...</h3>
+  <p>This command versions the selected resource based on the current branch contents.</p>
+  <h3>Tag with Existing...</h3>
+  <p>This command versions the selected resource based on the current branch contents, moving the tag from previously
+  tagged resources if required.</p>
+  <h3>Compare</h3>
+  <p class="Para">This command will compare two selected resources.</p>
+  <h3>Compare With...</h3>
+  <p class="Para">This command will compare the selected folder with a branch or version of the same folder.</p>
+  <h3>Expand All</h3>
+  <p class="Para">This command will fetch all of the subfolders of the selected item in one pass.</p>
+  <h3>Refresh View</h3>
+  <p class="Para">This command will refresh the repository folder tree.</p>
+  <h3>Paste connection</h3>
+  <p class="Para">Creates a new repository location based on the content of the clipboard. There must a valid
+  repository location string (eg. :pserver:dev.eclipse.org:/cvsroot/eclipse) in the clipboard in order paste a new
+  connection.</p>
+  <h3>Copy to clipboard</h3>
+  <p class="Para">Copies the identification string of the selected repository to the clipboard.</p>
+  <h3>Discard Location</h3>
+  <p class="Para">This command will remove the selected repository location. Note that all projects that were
+  previously mapped to this repository must first be unmapped.</p>
+  <h3>Configure Branches and Versions</h3>
+  <p class="Para">This command brings up the wizard to help you discover the branch and version tags that exist in the
+  repository for the selected folder so they can be added to the repositories view to allow the resources that have
+  these tags can be browsed.</p>
+  <h3>Refresh Branches...</h3>
+  <p class="Para">This command, available on repository location entries, allows you to refresh the list of known
+  branches and versions that are displayed in the repositories view for selected projects. This operation makes use of
+  the defined auto-refresh files for each project. If the operation fails for a particular project, use Configure
+  Branches and Versions on the project to select one or more appropriate refresh files.</p>
+  <h3>Add to Branch List...</h3>
+  <p>This command adds the selected project to the list of projects that are displayed under the specified branch in
+  the repositories view. This command only modifies the repositories view and does not affect the repository in any
+  way. If you want to add the project to a branch, you can perform a <strong>Tag with Existing</strong> after
+  performing this operation.</p>
+  <h3>Open</h3>
+  <p>This command opens the selected file in an editor. Since file revisions in the repository are immutable, the
+  editor opens in a read-only state, so it is not modifiable.</p>
+  <h3>Show Annotation</h3>
+  <p>This command shows the contents of file with annotations identifying the author of each line of code in the
+  file.</p>
+  <h3>Show History</h3>
+  <p>This command shows the revision history of the selected file in the History view.</p>
+  <h3>Properties</h3>
+  <p>Available on repository location entries, this command allows the modification of any of the properties of the
+  location. It also allows the assignment of a display name and a server encoding which is used to translate file paths
+  and commit comments between the client and server (but does not affect file contents).</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-26.htm">Team programming with CVS</a><br>
+  <a href="../concepts/concepts-27c.htm">CVS Repositories</a><br>
+  <a href="../concepts/concepts-27b.htm">Branches</a><br>
+  <a href="../concepts/concepts-27.htm">Versions</a><br>
+  <a href="../concepts/concepts-17a.htm">Local history</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-92.htm">Creating a CVS repository location</a><br>
+  <a href="../tasks/tasks-94.htm">Discarding a CVS repository location</a><br>
+  <a href="../tasks/tasks-93.htm">Refreshing the CVS repositories view</a><br>
+  <a href="../tasks/tasks-95.htm">Changing the properties of a CVS Repository Location</a><br>
+  <a href="../tasks/tasks-96.htm">Checking out a project from a CVS repository</a><br>
+  <a href="../tasks/tasks-103.htm">Replacing resources in the Workbench</a><br>
+  <a href="../tasks/tasks-117.htm">Sharing a new project using CVS</a><br>
+  <a href="../tasks/tasks-119.htm">Viewing a file's revision history</a>
+  <h3 class="related">Related reference</h3><a href="ref-47.htm">CVS</a><br>
+  <a href="ref-32a.htm">CVS Resource History View</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-32a.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-32a.htm
index 23a830d..a28837b 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-32a.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-32a.htm
@@ -1,233 +1,164 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-     
-  <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
-     
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
-      
-  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1"
- type="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
   <title>CVS History View</title>
-   
 </head>
- <body style="background-color: rgb(255,255,255);">
-   
-<h1 class="Head"> CVS History view</h1>
-    
-<p class="Intro"> This view provides a list of all the revisions of a resource in the repository as
-well as all the revisions of a resource in the local history. From this view you can compare revisions,
-load a revision, revert the corresponding workspace file to a revision, tag
-with an existing tag, show annotations and open an editor on a revision. </p>
- 
-<p class="Para">Here is what the CVS History View looks like:</p>
-   
-<p class="Para"><img
- src="../images/Image216_history_view.png"
- alt="CVS Resource History View"  border="0" align="top"> </p>
-
-<h2>Columns</h2>
-<p class="Para">The History View is able to display both local and remote revisions. Local History revisions have
-minimal information associated with them - only a time stamp. As a result, the majority of the column items will appear
-blank for Local History revisions. Remote revisions, on the other hand, will have a much more complete set
-of information. Here are the columns: </p>
-   
-<div class="Topic">    
-<h3> Revision</h3>
-<p class="Para"> Since the CVS History view can display both remote and local revisions.
-For remote revisions:
-</p>
-	<ul>
-		<li>the column displays the remote revision icon: 
-		<img
-	     src="../images/remote_history_mode.svg"
-	     alt="Remote History Mode icon"  border="0" align="top"> </li>
-		<li>the column displays the revision number in the history. </li>
-	</ul>
-	
-	For local history revisions:
-	<ul>
-		<li>the column displays the local history revision icon: 
-		<img
-	     src="../images/local_history_mode.svg"
-	     alt="Local History Mode icon"  border="0" align="top"> </li>
-	</ul>
-
-</div>
-   
-<div class="Topic">    
-<h3>Branches</h3>   
-<p class="Para">This column displays the list of branches on which the revision is available. <i>(Remote revisions only)</i></p>
-</div>
-
-<div class="Topic">    
-<h3>Tags</h3>   
-<p class="Para">The tags that are associated with the revision. Selecting 
-a      revision line will list the tags in the lower left pane of the view. <i>(Remote revisions only)</i></p>
-</div>
-   
-<div class="Topic">  
-<h3> Revision Time</h3>   
-<p class="Para"> This column displays the creation date and time of the revision 
-     in the history.</p>
-</div>
-   
-<div class="Topic">       
-<h3> Author</h3>
-<p class="Para"> This column displays the name of the person who created and
-authored the version. <i>(Remote revisions only)</i></p>
-</div>
-   
-<div class="Topic">  
-<h3> Comment</h3>   
-<p class="Para"> This column displays the comment (if any) supplied for this 
-     revision at the time it was committed. Selecting a revision line will 
-show the complete comment in the lower right pane of the view. 
-Also, mousing over a dotted comment will result in showing a tooltip with complete comment. <i>(Remote revisions only)</i></p>
-</div>
-
-<h2>Toolbar</h2>
-
-<div class="Topic"> 
-<h3>Refresh</h3>  
-<p class="Para">This command refreshes the contents of the view, 
-fetching the latest history information for the resource from the server.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Link with Editor and Selection</h3>  
-<p class="Para">When enabled, the view will display the history for the resource 
-of the active editor or of the active selection.</p>
-</div> 
-
-<div class="Topic"> 
-<h3>Pin</h3>  
-<p class="Para">When enabled will pin the view and its contents. Any new requests for history
-will open a new instance of the History View.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Navigation History</h3>  
-<p class="Para">When enabled will allow you to select from a drop down menu a 
-resource for which a history has been viewed in the past. The action is disabled 
-when the History view is opened for the first time.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Group Revisions by Date</h3>  
-<p class="Para">When enabled, all history items will be sorted into one of the following date
-categories: </p>
-<ul>
-<li>Today</li>
-<li>Yesterday</li>
-<li>This Month</li>
-<li>Previous</li>
-</ul>
-
-</div>
-
-<div class="Topic"> 
-<h3>Local and Remote Revisions</h3>  
-<p class="Para">When enabled will display both local and remote revisions of the resource in the
-History view.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Local Revisions</h3>  
-<p class="Para">When enabled will display only the local revisions of the resource in the
-History view.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Remote Revisions</h3>  
-<p class="Para">When enabled will display only the remote revisions of the resource in the
-History view.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Collapse All</h3>  
-<p class="Para">Will the view is in the Group by Date mode, Collapse All will collapse all of the
-date categories.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Compare Mode</h3>  
-<p class="Para">When enabled, a double click (or a single click depending on your Open Mode strategy set
-in <b>Preferences&gt;General</b>) will open a compare editor. When it is disabled, clicking on a revision
-will open that revision.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Drop Down Menu</h3>  
-<p class="Para">The drop down menu contains the following items:</p>
-<ul>
-<li><b>Wrap Comments</b>: Will wrap comments in the Comment Viewer.</li>
-<li><b>Show Comment Viewer</b>: shows the Comment Viewer.</li>
-<li><b>Show Tag Viewer</b>: shows the Tag Viewer.</li>
-<li><b>Show Search Field</b>: shows the Search Field.</li>
-<li><b>Filter....</b>: Opens the Filter Dialog.</li>
-<li><b>Remove Filters</b>: Removes any filtering from the History View.</li>
-</ul>
-</div> 
-
-<h2 class="Para">Context menu </h2>
-     
-<p class="Para">From the context menu of the CVS Resource History view you can  perform
-a number of interesting operations.</p>
-     
-<h3>Open</h3>   
-<p class="Para">This command will open the contents of the selected revision in a read only
-editor. (The editor used is the one that is registered as the default editor for the file type).
-<i>Note</i>: If the revision being opened is the current version of the file, then it will be opened
-in a regular editor.</p>
-
-<h3>Open With</h3>   
-<p class="Para">This menu allows choosing an editor to open the contents of the selected revision.
-<i>Note</i>: If the revision being opened is the current version of the file, then it will be opened
-in a regular editor, otherwise a read only editor is used.</p>
-
-<h3>Compare Current With Revision/Compare With Each Other</h3>   
-<p class="Para">The compare command differs based on the number of revisions selected in the 
-history view. For a single selection, <b>Compare Current With Revision</b> will the compare the
-current version of the resource with the selected revision. For two selections, <b>Compare with Each
-Other</b> will compare the selected revisions.</p>
-
-<h3>Get Contents</h3>   
-<p class="Para">This command will load the contents of the selected revision
-into the local copy of the file whose history
-is displayed in the view. The local file can then be committed to make
-the contents of latest revision in HEAD (or a branch) match the contents of
-the selected revision.</p>
-
-<h3>Get Sticky Revision</h3>   
-<p class="Para">This command will load the selected revision over the local 
-  file whose history is being displayed. This operation is rarely needed and is 
-  mainly used to change the tag on one or more resources. The loaded revision 
+<body style="background-color: rgb(255,255,255);">
+  <h1 class="Head">CVS History view</h1>
+  <p class="Intro">This view provides a list of all the revisions of a resource in the repository as well as all the
+  revisions of a resource in the local history. From this view you can compare revisions, load a revision, revert the
+  corresponding workspace file to a revision, tag with an existing tag, show annotations and open an editor on a
+  revision.</p>
+  <p class="Para">Here is what the CVS History View looks like:</p>
+  <p class="Para"><img src="../images/Image216_history_view.png" alt="CVS Resource History View" border="0" align=
+  "top"></p>
+  <h2>Columns</h2>
+  <p class="Para">The History View is able to display both local and remote revisions. Local History revisions have
+  minimal information associated with them - only a time stamp. As a result, the majority of the column items will
+  appear blank for Local History revisions. Remote revisions, on the other hand, will have a much more complete set of
+  information. Here are the columns:</p>
+  <div class="Topic">
+    <h3>Revision</h3>
+    <p class="Para">Since the CVS History view can display both remote and local revisions. For remote revisions:</p>
+    <ul>
+      <li>the column displays the remote revision icon: <img src="../images/remote_history_mode.svg" alt=
+      "Remote History Mode icon" border="0" align="top"></li>
+      <li>the column displays the revision number in the history.</li>
+    </ul>For local history revisions:
+    <ul>
+      <li>the column displays the local history revision icon: <img src="../images/local_history_mode.svg" alt=
+      "Local History Mode icon" border="0" align="top"></li>
+    </ul>
+  </div>
+  <div class="Topic">
+    <h3>Branches</h3>
+    <p class="Para">This column displays the list of branches on which the revision is available. <i>(Remote revisions
+    only)</i></p>
+  </div>
+  <div class="Topic">
+    <h3>Tags</h3>
+    <p class="Para">The tags that are associated with the revision. Selecting a revision line will list the tags in the
+    lower left pane of the view. <i>(Remote revisions only)</i></p>
+  </div>
+  <div class="Topic">
+    <h3>Revision Time</h3>
+    <p class="Para">This column displays the creation date and time of the revision in the history.</p>
+  </div>
+  <div class="Topic">
+    <h3>Author</h3>
+    <p class="Para">This column displays the name of the person who created and authored the version. <i>(Remote
+    revisions only)</i></p>
+  </div>
+  <div class="Topic">
+    <h3>Comment</h3>
+    <p class="Para">This column displays the comment (if any) supplied for this revision at the time it was committed.
+    Selecting a revision line will show the complete comment in the lower right pane of the view. Also, mousing over a
+    dotted comment will result in showing a tooltip with complete comment. <i>(Remote revisions only)</i></p>
+  </div>
+  <h2>Toolbar</h2>
+  <div class="Topic">
+    <h3>Refresh</h3>
+    <p class="Para">This command refreshes the contents of the view, fetching the latest history information for the
+    resource from the server.</p>
+  </div>
+  <div class="Topic">
+    <h3>Link with Editor and Selection</h3>
+    <p class="Para">When enabled, the view will display the history for the resource of the active editor or of the
+    active selection.</p>
+  </div>
+  <div class="Topic">
+    <h3>Pin</h3>
+    <p class="Para">When enabled will pin the view and its contents. Any new requests for history will open a new
+    instance of the History View.</p>
+  </div>
+  <div class="Topic">
+    <h3>Navigation History</h3>
+    <p class="Para">When enabled will allow you to select from a drop down menu a resource for which a history has been
+    viewed in the past. The action is disabled when the History view is opened for the first time.</p>
+  </div>
+  <div class="Topic">
+    <h3>Group Revisions by Date</h3>
+    <p class="Para">When enabled, all history items will be sorted into one of the following date categories:</p>
+    <ul>
+      <li>Today</li>
+      <li>Yesterday</li>
+      <li>This Month</li>
+      <li>Previous</li>
+    </ul>
+  </div>
+  <div class="Topic">
+    <h3>Local and Remote Revisions</h3>
+    <p class="Para">When enabled will display both local and remote revisions of the resource in the History view.</p>
+  </div>
+  <div class="Topic">
+    <h3>Local Revisions</h3>
+    <p class="Para">When enabled will display only the local revisions of the resource in the History view.</p>
+  </div>
+  <div class="Topic">
+    <h3>Remote Revisions</h3>
+    <p class="Para">When enabled will display only the remote revisions of the resource in the History view.</p>
+  </div>
+  <div class="Topic">
+    <h3>Collapse All</h3>
+    <p class="Para">Will the view is in the Group by Date mode, Collapse All will collapse all of the date
+    categories.</p>
+  </div>
+  <div class="Topic">
+    <h3>Compare Mode</h3>
+    <p class="Para">When enabled, a double click (or a single click depending on your Open Mode strategy set in
+    <b>Preferences&gt;General</b>) will open a compare editor. When it is disabled, clicking on a revision will open
+    that revision.</p>
+  </div>
+  <div class="Topic">
+    <h3>Drop Down Menu</h3>
+    <p class="Para">The drop down menu contains the following items:</p>
+    <ul>
+      <li><b>Wrap Comments</b>: Will wrap comments in the Comment Viewer.</li>
+      <li><b>Show Comment Viewer</b>: shows the Comment Viewer.</li>
+      <li><b>Show Tag Viewer</b>: shows the Tag Viewer.</li>
+      <li><b>Show Search Field</b>: shows the Search Field.</li>
+      <li><b>Filter....</b>: Opens the Filter Dialog.</li>
+      <li><b>Remove Filters</b>: Removes any filtering from the History View.</li>
+    </ul>
+  </div>
+  <h2 class="Para">Context menu</h2>
+  <p class="Para">From the context menu of the CVS Resource History view you can perform a number of interesting
+  operations.</p>
+  <h3>Open</h3>
+  <p class="Para">This command will open the contents of the selected revision in a read only editor. (The editor used
+  is the one that is registered as the default editor for the file type). <i>Note</i>: If the revision being opened is
+  the current version of the file, then it will be opened in a regular editor.</p>
+  <h3>Open With</h3>
+  <p class="Para">This menu allows choosing an editor to open the contents of the selected revision. <i>Note</i>: If
+  the revision being opened is the current version of the file, then it will be opened in a regular editor, otherwise a
+  read only editor is used.</p>
+  <h3>Compare Current With Revision/Compare With Each Other</h3>
+  <p class="Para">The compare command differs based on the number of revisions selected in the history view. For a
+  single selection, <b>Compare Current With Revision</b> will the compare the current version of the resource with the
+  selected revision. For two selections, <b>Compare with Each Other</b> will compare the selected revisions.</p>
+  <h3>Get Contents</h3>
+  <p class="Para">This command will load the contents of the selected revision into the local copy of the file whose
+  history is displayed in the view. The local file can then be committed to make the contents of latest revision in
+  HEAD (or a branch) match the contents of the selected revision.</p>
+  <h3>Get Sticky Revision</h3>
+  <p class="Para">This command will load the selected revision over the local file whose history is being displayed.
+  This operation is rarely needed and is mainly used to change the tag on one or more resources. The loaded revision
   cannot be subsequently committed but can be tagged.</p>
-
-<h3>Tag with Existing...</h3>   
-<p class="Para">This command allows an existing tag to be moved to the
-selected file revision.</p>
-
-<h3> Show Annotation</h3>   
-<p> This command shows the contents of file with annotations identifying the author
-of each line of code in the file.</p>
-
-<h3>Refresh View</h3>   
-<p> This command refreshes the contents of the view.</p>
-
-
-<h3 class="related">Related reference</h3>
-    <a href="ref-32.htm">CVS Repositories view</a>
-
-<h3 class="related">Related concepts</h3>
- <a href="../concepts/concepts-12.htm">Resources</a> <br>
- <a href="../concepts/concepts-27c.htm">CVS Repositories</a> <br>
- <a href="../concepts/concepts-17a.htm">Local history</a>
-
+  <h3>Tag with Existing...</h3>
+  <p class="Para">This command allows an existing tag to be moved to the selected file revision.</p>
+  <h3>Show Annotation</h3>
+  <p>This command shows the contents of file with annotations identifying the author of each line of code in the
+  file.</p>
+  <h3>Refresh View</h3>
+  <p>This command refreshes the contents of the view.</p>
+  <h3 class="related">Related reference</h3><a href="ref-32.htm">CVS Repositories view</a>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-12.htm">Resources</a><br>
+  <a href="../concepts/concepts-27c.htm">CVS Repositories</a><br>
+  <a href="../concepts/concepts-17a.htm">Local history</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-32b.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-32b.htm
index 0ef6152..ccd4285 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-32b.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-32b.htm
@@ -1,39 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-     
-  <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
-     
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
-      
-  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1"
- type="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
   <title>CVS Console</title>
-   
 </head>
- <body style="background-color: rgb(255,255,255);">
-   
-<h1 class="Head"> CVS Console</h1>
-    
-<p class="Intro">The CVS Console is shown in the Workbench Console view. The CVS 
-  entry in this view shows the output from CVS commands. This output is similar 
-  to that of the CVS command line client. If an error occurs during a CVS operation 
-  opening the console can help troubleshoot the cause of the error.</p>
- 
-<p class="Para">Here is what the CVS Console in the Console view looks like:</p>
-<p class="Para"><img src="../images/cvs-console.png" alt="Console View" ></p>
-
-<h3 class="related">Related reference</h3>
-    <a href="ref-32.htm">CVS Repositories view</a>
-
-<h3 class="related">Related concepts</h3>
- <a href="../concepts/concepts-12.htm">Resources</a> <br>
- <a href="../concepts/concepts-27c.htm">CVS Repositories</a> <br>
- <a href="../concepts/concepts-17a.htm">Local history</a>
-
+<body style="background-color: rgb(255,255,255);">
+  <h1 class="Head">CVS Console</h1>
+  <p class="Intro">The CVS Console is shown in the Workbench Console view. The CVS entry in this view shows the output
+  from CVS commands. This output is similar to that of the CVS command line client. If an error occurs during a CVS
+  operation opening the console can help troubleshoot the cause of the error.</p>
+  <p class="Para">Here is what the CVS Console in the Console view looks like:</p>
+  <p class="Para"><img src="../images/cvs-console.png" alt="Console View"></p>
+  <h3 class="related">Related reference</h3><a href="ref-32.htm">CVS Repositories view</a>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-12.htm">Resources</a><br>
+  <a href="../concepts/concepts-27c.htm">CVS Repositories</a><br>
+  <a href="../concepts/concepts-17a.htm">Local history</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-33.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-33.htm
index 7037967..b7644d9 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-33.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-33.htm
@@ -1,378 +1,268 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-  <meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
   <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
   <title>CVS Workspace Synchronization</title>
 </head>
 <body>
-
-<h1>CVS Workspace Synchronization</h1>
-
-<p>A CVS workspace synchronization launched using the <em class="UILabel">Team &gt; Synchronize</em>
-menu command or the <em class="UILabel">Synchronize</em> toolbar command in the Team Perspective will appear
-in the Synchronize view. This view allows you to inspect the differences between the local 
-Workbench resources and their remote counterparts as well as
-update resources in the Workbench 
-and commit resources from the Workbench to a repository.</p>
-   
-<p>Here is what the CVS Workspace Synchronization in the Synchronize view looks like:</p>
-<p>
-<img align="top" border="0" src="../images/Image245_sync_view.png" alt="CVS Workspace Synchronization" >
-</p>
-
-<h2>Features</h2>
-
-<p>The following is a brief summary of some of the features of the synchronize view.</p>
-
-<h3>Synchronization state</h3>
-
-  <p>The synchronize view shows the synchronization 
-    state of resources in your workspace compared to those in the repository. 
-    This state is shown by using icons and can also be configured to show the 
-    state as text appended to the resource name. A description of the icons is 
-    shown in the table below:</p>
+  <h1>CVS Workspace Synchronization</h1>
+  <p>A CVS workspace synchronization launched using the <em class="UILabel">Team &gt; Synchronize</em> menu command or
+  the <em class="UILabel">Synchronize</em> toolbar command in the Team Perspective will appear in the Synchronize view.
+  This view allows you to inspect the differences between the local Workbench resources and their remote counterparts
+  as well as update resources in the Workbench and commit resources from the Workbench to a repository.</p>
+  <p>Here is what the CVS Workspace Synchronization in the Synchronize view looks like:</p>
+  <p><img align="top" border="0" src="../images/Image245_sync_view.png" alt="CVS Workspace Synchronization"></p>
+  <h2>Features</h2>
+  <p>The following is a brief summary of some of the features of the synchronize view.</p>
+  <h3>Synchronization state</h3>
+  <p>The synchronize view shows the synchronization state of resources in your workspace compared to those in the
+  repository. This state is shown by using icons and can also be configured to show the state as text appended to the
+  resource name. A description of the icons is shown in the table below:</p>
   <table width="100%" border="1">
-    <tr> 
-      <td width="9%" align="center"><img src="../images/r_inadd_ov.svg" alt="Incoming addition icon" ></td>
-      <td width="91%">An incoming addition means that a resource has been added 
-        to the repository. <strong>Updating</strong> will transfer the resource 
-        to your workspace.</td>
+    <tr>
+      <td width="9%" align="center"><img src="../images/r_inadd_ov.svg" alt="Incoming addition icon"></td>
+      <td width="91%">An incoming addition means that a resource has been added to the repository.
+      <strong>Updating</strong> will transfer the resource to your workspace.</td>
     </tr>
-    <tr> 
-      <td align="center"><img src="../images/r_inchg_ov.svg" alt="Incoming change icon" ></td>
-      <td>An incoming change means that the file has changed in the repository. 
-        <strong>Updating</strong> will transfer the new file revision to your 
-        workspace.</td>
+    <tr>
+      <td align="center"><img src="../images/r_inchg_ov.svg" alt="Incoming change icon"></td>
+      <td>An incoming change means that the file has changed in the repository. <strong>Updating</strong> will transfer
+      the new file revision to your workspace.</td>
     </tr>
-    <tr> 
-      <td align="center"><img src="../images/r_indel_ov.svg" alt="Incoming deletion icon" ></td>
-      <td>An incoming deletion means that a resource was deleted from the server. 
-        <strong>Updating</strong> will delete your local resource.</td>
+    <tr>
+      <td align="center"><img src="../images/r_indel_ov.svg" alt="Incoming deletion icon"></td>
+      <td>An incoming deletion means that a resource was deleted from the server. <strong>Updating</strong> will delete
+      your local resource.</td>
     </tr>
-    <tr> 
-      <td align="center"><img src="../images/r_outadd_ov.svg" alt="Outgoing addition icon" ></td>
-      <td>An outgoing addition means that the file was added to your workspace 
-        and is not yet in the repository. <strong>Adding</strong> then <strong>Committing</strong> 
-        will transfer the new file to the repository.</td>
+    <tr>
+      <td align="center"><img src="../images/r_outadd_ov.svg" alt="Outgoing addition icon"></td>
+      <td>An outgoing addition means that the file was added to your workspace and is not yet in the repository.
+      <strong>Adding</strong> then <strong>Committing</strong> will transfer the new file to the repository.</td>
     </tr>
-    <tr> 
-      <td align="center"><img src="../images/r_outchg_ov.svg" alt="Outgoing change icon" ></td>
-      <td>An outgoing change means that the file was change locally. <strong>Committing</strong> 
-        the file will transfer the changes to the repository and create a new 
-        revision of the file.</td>
+    <tr>
+      <td align="center"><img src="../images/r_outchg_ov.svg" alt="Outgoing change icon"></td>
+      <td>An outgoing change means that the file was change locally. <strong>Committing</strong> the file will transfer
+      the changes to the repository and create a new revision of the file.</td>
     </tr>
-    <tr> 
-      <td align="center"><img src="../images/r_outdel_ov.svg" alt="Outgoing deletion icon" ></td>
-      <td>An outgoing deletion is a resource that has been deleted locally. <strong>Committing 
-        </strong>these resources will cause the remote resource to be deleted. 
-        <strong>Note</strong>: in CVS directories are never really deleted from 
-        the repository. Instead, files are deleted and empty directories are pruned 
-        from your workspace. </td>
+    <tr>
+      <td align="center"><img src="../images/r_outdel_ov.svg" alt="Outgoing deletion icon"></td>
+      <td>An outgoing deletion is a resource that has been deleted locally. <strong>Committing</strong> these resources
+      will cause the remote resource to be deleted. <strong>Note</strong>: in CVS directories are never really deleted
+      from the repository. Instead, files are deleted and empty directories are pruned from your workspace.</td>
     </tr>
-    <tr> 
-      <td align="center"><img src="../images/confadd_ov.svg" alt="Conflicting addition icon" ></td>
-      <td>A conflicting additions means that the resource has been added locally 
-        and remotely.</td>
+    <tr>
+      <td align="center"><img src="../images/confadd_ov.svg" alt="Conflicting addition icon"></td>
+      <td>A conflicting additions means that the resource has been added locally and remotely.</td>
     </tr>
-    <tr> 
-      <td align="center"><img src="../images/confchg_ov.svg" alt="Conflicting change icon" ></td>
-      
-    <td>A conflicting change means that the file has been changed locally and 
-      remotely. A manual or automatic merge will be required. Also, 
-      any entries in the view that contain children that are conflicts will also 
-      be decorated with the conflict icon. This is done to make conflicts easy 
-      to find. </td>
+    <tr>
+      <td align="center"><img src="../images/confchg_ov.svg" alt="Conflicting change icon"></td>
+      <td>A conflicting change means that the file has been changed locally and remotely. A manual or automatic merge
+      will be required. Also, any entries in the view that contain children that are conflicts will also be decorated
+      with the conflict icon. This is done to make conflicts easy to find.</td>
     </tr>
-    <tr> 
-      <td align="center"><img src="../images/confdel_ov.svg" alt="Conflicting deletion icon" ></td>
-      <td>A conflicting deletion means that the resource was deleted locally and 
-        remotely. </td>
+    <tr>
+      <td align="center"><img src="../images/confdel_ov.svg" alt="Conflicting deletion icon"></td>
+      <td>A conflicting deletion means that the resource was deleted locally and remotely.</td>
     </tr>
   </table>
-
-<h3>Mode</h3>
-
-<p>The Synchronize view can be filtered using modes using either the toolbar actions or
-the menu items in the view's drop down menu. 
-Modes can be used to show only incoming, outgoing or conflicting changes.
-The advantages to modes are: </p>
-<ul>
-  <li>
-    They support and encourage the <a href="../concepts/concepts-26.htm#IdealWorkFlow"> ideal work flow.</a></li>
-  <li>
-    They reduce the amount of information you are faced with at any one time.</li>
-    <li> They provide a degree of safety restricting you to those operations appropriate 
-      to that mode. For example, you can't accidentally commit a conflict when 
-      in incoming mode.</li>
-</ul>
-     
-  <p> <b>Important</b>: It is preferable to update resources in the 
-    Workbench first, resolve any conflicts that exist by merging, then commit 
-    Workbench resources to the repository.</p>
-   
-<h3>Models</h3>
-<p> The Synchronize view is capable of displaying different model representations of the resources. Each product
-may contain its own product specific representations. The Eclipse SDK comes with three models:</p> 
-<ul>
-  <li><b>Workspace Model</b>: displays a resource based model. Layout options for this model can be controlled
-  from the Preferences dialog in the drop down menu. The layout options for the Workspace model are:<br>
+  <h3>Mode</h3>
+  <p>The Synchronize view can be filtered using modes using either the toolbar actions or the menu items in the view's
+  drop down menu. Modes can be used to show only incoming, outgoing or conflicting changes. The advantages to modes
+  are:</p>
   <ul>
-	 <li>Flat layout shows all the out-of-sync resources as direct children of their project.</li>
-	  <li>Tree layout shows the resource hierarchy as it is shown in the 
-	    Project Explorer.</li>
-	  <li>Compress Folders shows changes grouped by project and then by folder. This 
-	    results in a hierarchy that is at most three levels deep with folder paths 
-	    being compressed into a single level (similar to a Java package).</li>
-  	</ul>
-  </li>
-  <li><b>Java Model</b>: displays a Java based model (similar to what appears in the Package Explorer).</li>
-  <li><b>Change Sets</b>: displays a Change Set based model. This model shows incoming 
-   	  changes grouped by commit 
-      comment which is handy for seeing who released what and why. For outgoing changes, 
-      you can create Change Sets for grouping related 
-      changes together. Grouping is performed using various commands in the context 
-      menu. </li>
+    <li>They support and encourage the <a href="../concepts/concepts-26.htm#IdealWorkFlow">ideal work flow.</a></li>
+    <li>They reduce the amount of information you are faced with at any one time.</li>
+    <li>They provide a degree of safety restricting you to those operations appropriate to that mode. For example, you
+    can't accidentally commit a conflict when in incoming mode.</li>
   </ul>
-  <p> In addition to to the models, there is also a <b>Flat Presentation</b> which 
-  displays all the out-of-sync elements as top level elements.</p>
-
-<h3>Navigation</h3>
-
-The Synchronize view provides toolbar actions for navigating through the changes in the view.
-These actions not only navigate between files but also go from change to change within a file.
-
-<h3>Update and Commit Operations</h3>
-
-<p> There are several flavours of update and commit operations available in the 
-  Synchronize view. You can perform the standard update and commit operation on 
-  all visible applicable changes or a selected subset. You can also choose to 
-  override and update, thus ignoring any local changes, or override and commit, 
-  thus making the remote resource match the contents of the local resource. You 
-  can also choose to clean the timestamps for files that have been modified locally 
-  (perhaps by an external build tool) but whose contents match that of the server.</p> 
-<h3>Conflict Handling</h3>
-
-<p> When dealing with conflicts, you can first perform an update and any conflicting 
-  changes The update operation will correctly update conflicts that are auto-mergeable 
-  (i.e. files content changes do not overlap) but will skip files that contain 
-  changes that overlap. Alternatively, conflicts can be handled using a Compare 
-  editor. A Compare editor can be opened by double-clicking (or single-clicking 
-  if you have change your open strategy in the preferences) on the conflict or 
-  by choosing <b>Open in Compare Editor</b> from the context menu. The Compare 
-  editor allows you to manually resolve the conflicts in the file. Once completed, 
-  perform a <b>Mark as Merged</b> on the conflict to indicate that you are done. 
-  This will change the conflict into an outgoing change.</p> 
-<h3>Problem Markers</h3>
-
-<p>
-The Synchronize view will show <i>error</i> or <i>warning</i> problem markers on any change that appears
-in the view or any folder or project that appears in the view that contains a resource that has such a problem
-marker. This is done to prevent resources with problems from getting committed to the repository.</p>
-
-<h2>Toolbar</h2>
-
-<div class="Topic"> 
-<h3>Synchronize</h3>  
-  <p class="Para">This command allows you to repeat the current synchronization 
-    which refetches the remote state of the resources. The drop down of the toolbar 
-    item allows you to select other existing synchronizations or create new ones 
-    using the <b>Synchronize...</b> menu command.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Pin Current Synchronization</h3>  
-<p>This command allows you to pin or unpin the current synchronization.
-Pinned synchronizations will not be replaced by the next synchronization of the same type
-while unpinned synchronizations will be replaced.
-This allows you to keep a synchronization around for easy access. Such a synchronization 
-will automatically update when changes to Workbench resources take place and can be configured
-to perform scheduled refreshes in order to keep up-to-date with the remote state of the resources. </p>
-</div>
-
-<div class="Topic"> 
-<h3>Models drop down</h3>  
-<p>This drop down list presents the models that can be displayed in the Sync View.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Next Difference</h3>  
-<p>This command will go to the next difference displayed by the view. All the
-differences within a single file will be visited before opening the next file in the view.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Previous Difference</h3>  
-<p>This command will go to the previous difference displayed by the view. All the
-differences within a single file will be visited before opening the previous file in the view.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Collapse All</h3>  
-<p>Collapse all the expanded entries in the view.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Incoming Mode</h3>  
-<p>In this mode, only resources which have been changed in the repository 
-       since they were last loaded or synchronized with those in the Workbench 
-       (incoming changes) are visible.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Outgoing Mode</h3>  
-<p>In this mode, only resources which have been modified in the Workbench 
-       (outgoing changes) are visible.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Incoming/Outgoing Mode</h3>  
-<p> In this mode both incoming and outgoing changes are shown, and you can 
-      both update and commit. The advantage to using this dual mode is 
-      you can do either task as you choose. The disadvantage is that performing 
-      a simultaneous bi-directional merge is often complicated.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Conflicts Mode</h3>  
-  <p> In this mode only conflicts (resources modified both in the Workbench 
-    and in the repository) are shown.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Update All Incoming Changes</h3>  
-  <p>This command updates all the incoming changes visible in the view. 
-    The command will also update conflicts that are auto-mergeable but will skip 
-    files whose contents contain conflicts.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Commit All Outgoing Changes</h3>  
-  <p>This command commits all the outgoing changes visible in the view. 
-    Conflicts are not included in the commit.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Drop Down Menu</h3>  
-  <p>The drop down menu allows you to pin or remove the current or remove all 
-    synchronizations, change the mode or layout, restore removed from view 
-    items, configure the current synchronization to perform scheduled refreshes 
-    as well as set other view preferences.</p>
-</div>
-
-<h2>Context menu </h2>
-     
-<p>From the context menu of the Synchronize view you can  perform
-a number    of interesting operations.</p>
-     
-<h3>Open</h3>
-<p>This command open the local resource for the selected change in 
-the default Workbench editor for the file type.</p>
-
-<h3>Open With</h3>
-<p>This command allows you to open the local resource for the selected 
-  change in the a Workbench editor.</p>
-  
-<h3>Show In</h3>
-<p>This sub-menu is used to show the currently selected resource in another view.</p>
-
-<h3>Open in Compare Editor</h3>
-<p>This command open the selected change in a Compare editor which allows 
-you to inspect the changes within the file.</p>
-
-<h3>Edit</h3>
-<p>This menu allows for renaming, deleting, moving or copying the resource.</p>
-
-<h3>Synchronize</h3>
-<p>This command refreshed the remote state of the selected resources.
-  In addition, this command will adjust the timestamps of outgoing changes whose 
-  contents already match the contents of the corresponding resource on the server 
-  so that the file is no longer an outgoing change. This is useful in situations 
-  where build tools regenerate files whose contents have not changed.</p>
-
-<h3>Expand All</h3>
-<p >This command expands all of the selected resource's children.</p>
-
-<h3>Remove from View</h3>
-<p>This command removes the selected resources from the view. The
-resources will only reappear if the state of the removed resources changes or the 
-Workbench is restarted or the <strong> Restore Removed Items </strong> action is
-invoked from the Drop Down menu.</p>
-
-<h3>Update</h3>
-<p>This command updates the selected resources. Conflicts can be 
-  included in an update but only auto-mergeable conflicts will be updated. Non-mergeable 
-  conflicts will be skipped and should be merged manually using a compare editor.</p>
-
-<h3>Commit</h3>
-<p>This command commits the selected resources. Only outgoing 
-changes can be committed.</p>
-
-<h3>Override and Update</h3>
-<p>This command operates on conflicts and outgoing changes
-and replaces the local contents of those resources with the contents 
-from the server.</p>
-
-<h3>Mark as Merged</h3>
-<p>This command adjusts the CVS timestamps of conflicting changes
-so they become outgoing changes. This command should be performed after
-conflicts are merged manually using a compare editor.</p>
-
-<h3>Add to .cvsignore</h3>
-<p>This command will add the selected resource to the .cvsignore list which will
- cause CVS to skip the resource during all CVS operations.</p>
-
-<h3>Create Patch</h3>
-<p>This command will bring up the Create Patch wizard and populate it with the selected
-resources.</p>
-
-<h3>Branch...</h3>
-<p>This command will create a new branch and a new branch tag which can be used to merge
-the branch back to the source branch.</p>
-
-<h3>Show Annotation</h3>
-<p>Depending on your Annotation preferences, this command will either bring up turn on the Quick Diff annotate
-or open the Annotate view for the selected resource.</p>
-
-<h3>Change ASCII/Binary Property...</h3>
-<p>This command will open a dialog containing all of the selected resources. You can then
-alter the ASCII/Binary property for each resource.</p>
-
-<h3>Reassign Changes To</h3>
-<p>This command will move changes to the change set selected from the sub-menu.</p>
-
-<h3>Edit Change Set...</h3>
-<p>This command will open a dialog that allows to create or edit the name and comment
-for the selected change set.</p>
-
-<h3>Make Changes Unassigned</h3>
-<p>This command removes changes from the selected change set. If all changes are removed
-the change set is deleted.</p>
-
-<h3>Mark Change Set as Default</h3>
-<p>This command will mark/unmark the selected change set as default.</p>
-
-<h3>Don't Use Default Change Set</h3>
-<p>This command will remove the default flag from the change set currently marked as default.</p>
-
-<h3 class="related">Related concepts</h3>
-    <a href="../concepts/concepts-26.htm">Team programming with CVS</a><br>
-    <a href="../concepts/concepts-30.htm">Synchronizing with a CVS repository</a>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-115.htm">Synchronizing with the repository</a><br>
-<a href="../tasks/tasks-113.htm">Updating</a><br>
-<a href="../tasks/tasks-113b.htm">Resolving conflicts</a><br>
-<a href="../tasks/tasks-100b.htm">Merging from a branch</a><br>
-<a href="../tasks/tasks-114.htm">Committing</a><br>
-<a href="../tasks/tasks-68.htm">Comparing resources</a><br>
-<a href="../tasks/tasks-68dg.htm">Merging changes in the compare editor</a>
-
-<h3 class="related">Related reference</h3>
-<a href="../reference/ref-47.htm">CVS</a><br>
-<a href="ref-25.htm">Compare editor</a>
-
+  <p><b>Important</b>: It is preferable to update resources in the Workbench first, resolve any conflicts that exist by
+  merging, then commit Workbench resources to the repository.</p>
+  <h3>Models</h3>
+  <p>The Synchronize view is capable of displaying different model representations of the resources. Each product may
+  contain its own product specific representations. The Eclipse SDK comes with three models:</p>
+  <ul>
+    <li>
+      <b>Workspace Model</b>: displays a resource based model. Layout options for this model can be controlled from the
+      Preferences dialog in the drop down menu. The layout options for the Workspace model are:<br>
+      <ul>
+        <li>Flat layout shows all the out-of-sync resources as direct children of their project.</li>
+        <li>Tree layout shows the resource hierarchy as it is shown in the Project Explorer.</li>
+        <li>Compress Folders shows changes grouped by project and then by folder. This results in a hierarchy that is
+        at most three levels deep with folder paths being compressed into a single level (similar to a Java
+        package).</li>
+      </ul>
+    </li>
+    <li><b>Java Model</b>: displays a Java based model (similar to what appears in the Package Explorer).</li>
+    <li><b>Change Sets</b>: displays a Change Set based model. This model shows incoming changes grouped by commit
+    comment which is handy for seeing who released what and why. For outgoing changes, you can create Change Sets for
+    grouping related changes together. Grouping is performed using various commands in the context menu.</li>
+  </ul>
+  <p>In addition to to the models, there is also a <b>Flat Presentation</b> which displays all the out-of-sync elements
+  as top level elements.</p>
+  <h3>Navigation</h3>The Synchronize view provides toolbar actions for navigating through the changes in the view.
+  These actions not only navigate between files but also go from change to change within a file.
+  <h3>Update and Commit Operations</h3>
+  <p>There are several flavours of update and commit operations available in the Synchronize view. You can perform the
+  standard update and commit operation on all visible applicable changes or a selected subset. You can also choose to
+  override and update, thus ignoring any local changes, or override and commit, thus making the remote resource match
+  the contents of the local resource. You can also choose to clean the timestamps for files that have been modified
+  locally (perhaps by an external build tool) but whose contents match that of the server.</p>
+  <h3>Conflict Handling</h3>
+  <p>When dealing with conflicts, you can first perform an update and any conflicting changes The update operation will
+  correctly update conflicts that are auto-mergeable (i.e. files content changes do not overlap) but will skip files
+  that contain changes that overlap. Alternatively, conflicts can be handled using a Compare editor. A Compare editor
+  can be opened by double-clicking (or single-clicking if you have change your open strategy in the preferences) on the
+  conflict or by choosing <b>Open in Compare Editor</b> from the context menu. The Compare editor allows you to
+  manually resolve the conflicts in the file. Once completed, perform a <b>Mark as Merged</b> on the conflict to
+  indicate that you are done. This will change the conflict into an outgoing change.</p>
+  <h3>Problem Markers</h3>
+  <p>The Synchronize view will show <i>error</i> or <i>warning</i> problem markers on any change that appears in the
+  view or any folder or project that appears in the view that contains a resource that has such a problem marker. This
+  is done to prevent resources with problems from getting committed to the repository.</p>
+  <h2>Toolbar</h2>
+  <div class="Topic">
+    <h3>Synchronize</h3>
+    <p class="Para">This command allows you to repeat the current synchronization which refetches the remote state of
+    the resources. The drop down of the toolbar item allows you to select other existing synchronizations or create new
+    ones using the <b>Synchronize...</b> menu command.</p>
+  </div>
+  <div class="Topic">
+    <h3>Pin Current Synchronization</h3>
+    <p>This command allows you to pin or unpin the current synchronization. Pinned synchronizations will not be
+    replaced by the next synchronization of the same type while unpinned synchronizations will be replaced. This allows
+    you to keep a synchronization around for easy access. Such a synchronization will automatically update when changes
+    to Workbench resources take place and can be configured to perform scheduled refreshes in order to keep up-to-date
+    with the remote state of the resources.</p>
+  </div>
+  <div class="Topic">
+    <h3>Models drop down</h3>
+    <p>This drop down list presents the models that can be displayed in the Sync View.</p>
+  </div>
+  <div class="Topic">
+    <h3>Next Difference</h3>
+    <p>This command will go to the next difference displayed by the view. All the differences within a single file will
+    be visited before opening the next file in the view.</p>
+  </div>
+  <div class="Topic">
+    <h3>Previous Difference</h3>
+    <p>This command will go to the previous difference displayed by the view. All the differences within a single file
+    will be visited before opening the previous file in the view.</p>
+  </div>
+  <div class="Topic">
+    <h3>Collapse All</h3>
+    <p>Collapse all the expanded entries in the view.</p>
+  </div>
+  <div class="Topic">
+    <h3>Incoming Mode</h3>
+    <p>In this mode, only resources which have been changed in the repository since they were last loaded or
+    synchronized with those in the Workbench (incoming changes) are visible.</p>
+  </div>
+  <div class="Topic">
+    <h3>Outgoing Mode</h3>
+    <p>In this mode, only resources which have been modified in the Workbench (outgoing changes) are visible.</p>
+  </div>
+  <div class="Topic">
+    <h3>Incoming/Outgoing Mode</h3>
+    <p>In this mode both incoming and outgoing changes are shown, and you can both update and commit. The advantage to
+    using this dual mode is you can do either task as you choose. The disadvantage is that performing a simultaneous
+    bi-directional merge is often complicated.</p>
+  </div>
+  <div class="Topic">
+    <h3>Conflicts Mode</h3>
+    <p>In this mode only conflicts (resources modified both in the Workbench and in the repository) are shown.</p>
+  </div>
+  <div class="Topic">
+    <h3>Update All Incoming Changes</h3>
+    <p>This command updates all the incoming changes visible in the view. The command will also update conflicts that
+    are auto-mergeable but will skip files whose contents contain conflicts.</p>
+  </div>
+  <div class="Topic">
+    <h3>Commit All Outgoing Changes</h3>
+    <p>This command commits all the outgoing changes visible in the view. Conflicts are not included in the commit.</p>
+  </div>
+  <div class="Topic">
+    <h3>Drop Down Menu</h3>
+    <p>The drop down menu allows you to pin or remove the current or remove all synchronizations, change the mode or
+    layout, restore removed from view items, configure the current synchronization to perform scheduled refreshes as
+    well as set other view preferences.</p>
+  </div>
+  <h2>Context menu</h2>
+  <p>From the context menu of the Synchronize view you can perform a number of interesting operations.</p>
+  <h3>Open</h3>
+  <p>This command open the local resource for the selected change in the default Workbench editor for the file
+  type.</p>
+  <h3>Open With</h3>
+  <p>This command allows you to open the local resource for the selected change in the a Workbench editor.</p>
+  <h3>Show In</h3>
+  <p>This sub-menu is used to show the currently selected resource in another view.</p>
+  <h3>Open in Compare Editor</h3>
+  <p>This command open the selected change in a Compare editor which allows you to inspect the changes within the
+  file.</p>
+  <h3>Edit</h3>
+  <p>This menu allows for renaming, deleting, moving or copying the resource.</p>
+  <h3>Synchronize</h3>
+  <p>This command refreshed the remote state of the selected resources. In addition, this command will adjust the
+  timestamps of outgoing changes whose contents already match the contents of the corresponding resource on the server
+  so that the file is no longer an outgoing change. This is useful in situations where build tools regenerate files
+  whose contents have not changed.</p>
+  <h3>Expand All</h3>
+  <p>This command expands all of the selected resource's children.</p>
+  <h3>Remove from View</h3>
+  <p>This command removes the selected resources from the view. The resources will only reappear if the state of the
+  removed resources changes or the Workbench is restarted or the <strong>Restore Removed Items</strong> action is
+  invoked from the Drop Down menu.</p>
+  <h3>Update</h3>
+  <p>This command updates the selected resources. Conflicts can be included in an update but only auto-mergeable
+  conflicts will be updated. Non-mergeable conflicts will be skipped and should be merged manually using a compare
+  editor.</p>
+  <h3>Commit</h3>
+  <p>This command commits the selected resources. Only outgoing changes can be committed.</p>
+  <h3>Override and Update</h3>
+  <p>This command operates on conflicts and outgoing changes and replaces the local contents of those resources with
+  the contents from the server.</p>
+  <h3>Mark as Merged</h3>
+  <p>This command adjusts the CVS timestamps of conflicting changes so they become outgoing changes. This command
+  should be performed after conflicts are merged manually using a compare editor.</p>
+  <h3>Add to .cvsignore</h3>
+  <p>This command will add the selected resource to the .cvsignore list which will cause CVS to skip the resource
+  during all CVS operations.</p>
+  <h3>Create Patch</h3>
+  <p>This command will bring up the Create Patch wizard and populate it with the selected resources.</p>
+  <h3>Branch...</h3>
+  <p>This command will create a new branch and a new branch tag which can be used to merge the branch back to the
+  source branch.</p>
+  <h3>Show Annotation</h3>
+  <p>Depending on your Annotation preferences, this command will either bring up turn on the Quick Diff annotate or
+  open the Annotate view for the selected resource.</p>
+  <h3>Change ASCII/Binary Property...</h3>
+  <p>This command will open a dialog containing all of the selected resources. You can then alter the ASCII/Binary
+  property for each resource.</p>
+  <h3>Reassign Changes To</h3>
+  <p>This command will move changes to the change set selected from the sub-menu.</p>
+  <h3>Edit Change Set...</h3>
+  <p>This command will open a dialog that allows to create or edit the name and comment for the selected change
+  set.</p>
+  <h3>Make Changes Unassigned</h3>
+  <p>This command removes changes from the selected change set. If all changes are removed the change set is
+  deleted.</p>
+  <h3>Mark Change Set as Default</h3>
+  <p>This command will mark/unmark the selected change set as default.</p>
+  <h3>Don't Use Default Change Set</h3>
+  <p>This command will remove the default flag from the change set currently marked as default.</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-26.htm">Team programming with CVS</a><br>
+  <a href="../concepts/concepts-30.htm">Synchronizing with a CVS repository</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-115.htm">Synchronizing with the repository</a><br>
+  <a href="../tasks/tasks-113.htm">Updating</a><br>
+  <a href="../tasks/tasks-113b.htm">Resolving conflicts</a><br>
+  <a href="../tasks/tasks-100b.htm">Merging from a branch</a><br>
+  <a href="../tasks/tasks-114.htm">Committing</a><br>
+  <a href="../tasks/tasks-68.htm">Comparing resources</a><br>
+  <a href="../tasks/tasks-68dg.htm">Merging changes in the compare editor</a>
+  <h3 class="related">Related reference</h3><a href="../reference/ref-47.htm">CVS</a><br>
+  <a href="ref-25.htm">Compare editor</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-33a.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-33a.htm
index 1c43c6f..421667e 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-33a.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-33a.htm
@@ -1,129 +1,79 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-     
-  <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
-     
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
-      
-  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1"
- type="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
   <title>CVS Merge Synchronization</title>
-   
 </head>
- <body style="background-color: rgb(255,255,255);">
-<h1>CVS Merge Synchronization</h1>
-<p class="Para">CVS Merge synchronizations launched using the <b>Team &gt; Merge</b> 
-  menu command will appear in the Synchronize view. This view allows you to inspect 
-  the differences between the local Workbench resources and their remote counterparts 
-  that are being merged and allows you to update the local resources. Committing 
-  is not supported when merging.</p>
-   
-<p class="Para"> Here is what the CVS Merge Synchronization in the Synchronize view looks like:</p>
-   
-<p class="Para"> <img src="../images/cvs-merge-sync.png"  align="top" border="0" alt="CVS Merge Synchronization">
-
- </p>
-
-<h2>Features</h2>
-
-<p class="Para"> 
-The features of the CVS Merge Synchronization are similar to those of the 
-<a href="ref-33.htm">CVS Workspace Synchronization</a> with the following
-differences.
-</p>
-
-<ul>
-<li><b>Modes:</b>
-When merging, only incoming and conflicting changes are possible. 
-As such, only the Incoming Mode and Conflicts mode are supported.</li>
-
-  <li><b>Operations:</b> Only updating is supported when merging.</li>
-  <li><b>Ongoing merges:</b> In order to compensate for the poor ongoing merge 
-support of CVS, a CVS Merge Synchronization can be pinned and kept indefinitely.
-The timestamps of merged changes are recorded and, on refresh, only new changes since the last
-merge are shown in the view.</li>
-</ul>
-
-<h2>Toolbar</h2>
-
-<p>The Toolbar buttons are the exact same as in the <a href="ref-33.htm">CVS Workspace Synchronization</a>,
-with the omission of an Outgoing mode and Both mode buttons.</p> 
-
-<h2 class="Para">Context menu </h2>
-     
-<p class="Para">From the context menu of the Synchronize view you can  perform
-a number of interesting operations.</p>
-        
-<h3>Open</h3>
-<p class="Para">This command open the local resource for the selected change in 
-the default Workbench editor for the file type.</p>
-
-<h3>Open With</h3>
-<p class="Para">This command allows you to open the local resource for the selected 
-  change in the a Workbench editor.</p>
-
-<h3>Open in Compare Editor</h3>
-<p class="Para">This command open the selected change in a Compare editor which allows 
-you to inspect the changes within the file.</p>
-
-<h3>Synchronize</h3>
-<p class="Para">This command refreshed the remote state of the selected resources.
-  In addition, this command will adjust the timestamps of outgoing changes whose 
-  contents already match the contents of the corresponding resource on the server 
-  so that the file is no longer an outgoing change. This is useful in situations 
-  where build tools regenerate files whose contents have not changed.</p>
-
-<h3>Remove From View</h3>
-<p class="Para">This command removes the selected resources from the view. The
-resources will only reappear if the state of the removed resources changes or the 
-Workbench is restarted.</p>
-
-<h3>Expand All</h3>
-<p class="Para">This command expands all of the selected resource's children.</p>
-
-<h3>Merge</h3>
-<p class="Para">This command updates the selected resources. Conflicts can be 
-  included in an update but only auto-mergeable conflicts will be updated. Non-mergeable 
-  conflicts will be skipped and should be merged manually using a compare editor.</p>
-
-<h3>Overwrite</h3>
-<p class="Para">This command operates on conflicts
-and replaces the local contents of those resources with the contents 
-from the server.</p>
-
-<h3>Mark as Merged</h3>
-<p class="Para">This command adjusts the CVS timestamps of conflicting changes
-so they become outgoing changes. This command should be performed after
-conflicts are merged manually using a compare editor.</p>
-
-<h3>Show Annotation</h3>
-<p class="Para">Depending on your Annotation preferences, this command will either bring up turn on the Quick Diff annotate
-or open the Annotate view for the selected resource.</p>
-
-<h3>Show in History</h3>
-<p class="Para">This command will show the history for the selected resource..</p>
-
-
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/concepts-26.htm">Team programming with CVS</a>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-113b.htm">Resolving conflicts</a><br>
-<a href="../tasks/tasks-100b.htm">Merging from a branch</a><br>
-<a href="../tasks/tasks-68.htm">Comparing resources</a><br>
-<a href="../tasks/tasks-68dg.htm">Merging changes in the compare editor</a>
-
-<h3 class="related">Related reference</h3>
-     <a href="../reference/ref-47.htm">CVS</a>
- <br><a href="ref-41a.htm">Merge wizard</a>
- <br><a href="ref-33.htm">CVS Workspace Synchronization</a>
- <br><a href="ref-25.htm">Compare editor</a>
-
+<body style="background-color: rgb(255,255,255);">
+  <h1>CVS Merge Synchronization</h1>
+  <p class="Para">CVS Merge synchronizations launched using the <b>Team &gt; Merge</b> menu command will appear in the
+  Synchronize view. This view allows you to inspect the differences between the local Workbench resources and their
+  remote counterparts that are being merged and allows you to update the local resources. Committing is not supported
+  when merging.</p>
+  <p class="Para">Here is what the CVS Merge Synchronization in the Synchronize view looks like:</p>
+  <p class="Para"><img src="../images/cvs-merge-sync.png" align="top" border="0" alt="CVS Merge Synchronization"></p>
+  <h2>Features</h2>
+  <p class="Para">The features of the CVS Merge Synchronization are similar to those of the <a href="ref-33.htm">CVS
+  Workspace Synchronization</a> with the following differences.</p>
+  <ul>
+    <li><b>Modes:</b> When merging, only incoming and conflicting changes are possible. As such, only the Incoming Mode
+    and Conflicts mode are supported.</li>
+    <li><b>Operations:</b> Only updating is supported when merging.</li>
+    <li><b>Ongoing merges:</b> In order to compensate for the poor ongoing merge support of CVS, a CVS Merge
+    Synchronization can be pinned and kept indefinitely. The timestamps of merged changes are recorded and, on refresh,
+    only new changes since the last merge are shown in the view.</li>
+  </ul>
+  <h2>Toolbar</h2>
+  <p>The Toolbar buttons are the exact same as in the <a href="ref-33.htm">CVS Workspace Synchronization</a>, with the
+  omission of an Outgoing mode and Both mode buttons.</p>
+  <h2 class="Para">Context menu</h2>
+  <p class="Para">From the context menu of the Synchronize view you can perform a number of interesting operations.</p>
+  <h3>Open</h3>
+  <p class="Para">This command open the local resource for the selected change in the default Workbench editor for the
+  file type.</p>
+  <h3>Open With</h3>
+  <p class="Para">This command allows you to open the local resource for the selected change in the a Workbench
+  editor.</p>
+  <h3>Open in Compare Editor</h3>
+  <p class="Para">This command open the selected change in a Compare editor which allows you to inspect the changes
+  within the file.</p>
+  <h3>Synchronize</h3>
+  <p class="Para">This command refreshed the remote state of the selected resources. In addition, this command will
+  adjust the timestamps of outgoing changes whose contents already match the contents of the corresponding resource on
+  the server so that the file is no longer an outgoing change. This is useful in situations where build tools
+  regenerate files whose contents have not changed.</p>
+  <h3>Remove From View</h3>
+  <p class="Para">This command removes the selected resources from the view. The resources will only reappear if the
+  state of the removed resources changes or the Workbench is restarted.</p>
+  <h3>Expand All</h3>
+  <p class="Para">This command expands all of the selected resource's children.</p>
+  <h3>Merge</h3>
+  <p class="Para">This command updates the selected resources. Conflicts can be included in an update but only
+  auto-mergeable conflicts will be updated. Non-mergeable conflicts will be skipped and should be merged manually using
+  a compare editor.</p>
+  <h3>Overwrite</h3>
+  <p class="Para">This command operates on conflicts and replaces the local contents of those resources with the
+  contents from the server.</p>
+  <h3>Mark as Merged</h3>
+  <p class="Para">This command adjusts the CVS timestamps of conflicting changes so they become outgoing changes. This
+  command should be performed after conflicts are merged manually using a compare editor.</p>
+  <h3>Show Annotation</h3>
+  <p class="Para">Depending on your Annotation preferences, this command will either bring up turn on the Quick Diff
+  annotate or open the Annotate view for the selected resource.</p>
+  <h3>Show in History</h3>
+  <p class="Para">This command will show the history for the selected resource..</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-26.htm">Team programming with CVS</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-113b.htm">Resolving conflicts</a><br>
+  <a href="../tasks/tasks-100b.htm">Merging from a branch</a><br>
+  <a href="../tasks/tasks-68.htm">Comparing resources</a><br>
+  <a href="../tasks/tasks-68dg.htm">Merging changes in the compare editor</a>
+  <h3 class="related">Related reference</h3><a href="../reference/ref-47.htm">CVS</a><br>
+  <a href="ref-41a.htm">Merge wizard</a><br>
+  <a href="ref-33.htm">CVS Workspace Synchronization</a><br>
+  <a href="ref-25.htm">Compare editor</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-35.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-35.htm
index 3fe5089..06fc302 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-35.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-35.htm
@@ -1,166 +1,120 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta name="copyright" content=
-    "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <title>
-      Quick Diff Preference Page
-    </title>
-    <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
-    <style type="text/css">
-/*<![CDATA[*/
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <title>Quick Diff Preference Page</title>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
+  <style type="text/css">
+  /*<![CDATA[*/
     table.c3 {width: 100%;}
     td.c2 {vertical-align: top;}
     td.c1 {vertical-align: top; width: 25%;}
     /*]]>*/
-    </style>
-  </head>
-  <body>
-    <script language="JavaScript" src=
-    "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript">
-</script>
-    <h1 class="Head">
-      Quick Diff Preference Page
-    </h1>
-    <div class="Para"></div>
-    <div class="Para">
-      <p>
-
-        The following preferences can be changed on the <a class="command-link"
-        href=
-        'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.QuickDiff)")'>
-        <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt=
-        "command link" /> <strong>General &gt; Editors &gt; Text Editors &gt;
-        Quick Diff</strong></a> preference page.
-      </p>
-    </div>
-
-    <table border="1" cellspacing="0" class="c3">
-      <tbody>
-        <tr>
-          <th width="25%">
-            <div class="Para">
-              Option
-            </div>
-          </th>
-          <th>
-
-            <div class="Para">
-              Description
-            </div>
-          </th>
-          <th>
-            <div class="Para">
-              Default
-            </div>
-          </th>
-        </tr>
-
-        <tr>
-          <td align="left" valign="top" width="25%">
-            <div class="Para">
-              Enable quick diff<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-
-              This option will enable or disable the quick diff option.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              On
-            </div>
-          </td>
-        </tr>
-        <tr>
-
-          <td class="c1">
-            Show differences in overview ruler<br />
-          </td>
-          <td class="c2">
-            This option will show differences in the overview ruler.
-          </td>
-          <td class="c2">
-            Off<br />
-
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="25%">
-            <div class="Para">
-              Colors - Changes<br />
-            </div>
-          </td>
-
-          <td align="left" valign="top">
-            This option controls the color of changes.
-          </td>
-          <td align="left" valign="top">
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="25%">
-
-            <div class="Para">
-              Colors - Additions<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option controls the color of additions.<br />
-            </div>
-
-          </td>
-          <td align="left" valign="top">
-            <br />
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="25%">
-            <div class="Para">
-              Colors - Deletions<br />
-
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option controls the color of deletions.<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-
-            <br />
-          </td>
-        </tr>
-        <tr>
-          <td class="c1">
-            Use this reference source<br />
-          </td>
-          <td class="c2">
-
-            This option sets which reference to use as the base for generating
-            quick diff comparisons. Options are:
-            <ul>
-              <li>
-                <strong>Version on Disk:</strong> Current file is compared
-                against the last saved version on disk.
-              </li>
-              <li>
-                <strong>Latest CVS Revision:</strong> Current file is compared
-                against the latest CVS revision for the file.
-              </li>
-
-            </ul>
-          </td>
-          <td class="c2">
-            Version on Disk<br />
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </body>
+  </style>
+</head>
+<body>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <h1 class="Head">Quick Diff Preference Page</h1>
+  <div class="Para"></div>
+  <div class="Para">
+    <p>The following preferences can be changed on the <a class="command-link" href=
+    'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.QuickDiff)")'>
+    <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>General &gt; Editors &gt;
+    Text Editors &gt; Quick Diff</strong></a> preference page.</p>
+  </div>
+  <table border="1" cellspacing="0" class="c3">
+    <tbody>
+      <tr>
+        <th width="25%">
+          <div class="Para">
+            Option
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Description
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Default
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Enable quick diff<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option will enable or disable the quick diff option.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td class="c1">Show differences in overview ruler<br /></td>
+        <td class="c2">This option will show differences in the overview ruler.</td>
+        <td class="c2">Off<br /></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Colors - Changes<br />
+          </div>
+        </td>
+        <td align="left" valign="top">This option controls the color of changes.</td>
+        <td align="left" valign="top"></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Colors - Additions<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option controls the color of additions.<br />
+          </div>
+        </td>
+        <td align="left" valign="top"><br /></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Colors - Deletions<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option controls the color of deletions.<br />
+          </div>
+        </td>
+        <td align="left" valign="top"><br /></td>
+      </tr>
+      <tr>
+        <td class="c1">Use this reference source<br /></td>
+        <td class="c2">
+          This option sets which reference to use as the base for generating quick diff comparisons. Options are:
+          <ul>
+            <li><strong>Version on Disk:</strong> Current file is compared against the last saved version on disk.</li>
+            <li><strong>Latest CVS Revision:</strong> Current file is compared against the latest CVS revision for the
+            file.</li>
+          </ul>
+        </td>
+        <td class="c2">Version on Disk<br /></td>
+      </tr>
+    </tbody>
+  </table>
+</body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-36.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-36.htm
index 24b8099..50e017d 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-36.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-36.htm
@@ -1,325 +1,264 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta name="copyright" content=
-    "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>
-      Spelling preference page
-    </title>
-    <script language="JavaScript" src=
-    "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript">
-</script>
-    <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
-    <style type="text/css">
-/*<![CDATA[*/
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>Spelling preference page</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
+  <style type="text/css">
+  /*<![CDATA[*/
     table.c3 {width: 100%;}
     td.c2 {vertical-align: top;}
     td.c1 {vertical-align: top; width: 25%;}
     /*]]>*/
-    </style>
-  </head>
-  <body>
-    <h1 class="Head">
-      Spelling Preference Page
-    </h1>
-    <div class="Para">
-      <p>
-        The following preferences can be changed on the <a class="command-link"
-        href=
-        'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.Spelling)")'>
-
-        <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt=
-        "command link" /> <strong>General &gt; Editors &gt; Text Editors &gt;
-        Spelling</strong></a> preference page.
-      </p>
-    </div>
-    <table border="1" cellspacing="0" class="c3">
-
-      <tbody>
-        <tr>
-          <th width="25%">
-            <div class="Para">
-              Option
-            </div>
-          </th>
-          <th>
-            <div class="Para">
-
-              Description
-            </div>
-          </th>
-          <th>
-            <div class="Para">
-              Default
-            </div>
-          </th>
-        </tr>
-        <tr>
-
-          <td align="left" valign="top" width="25%">
-            <div class="Para">
-              Enable spell checking<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option enables spell checking.
-            </div>
-
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              On
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td class="c1">
-
-            Ignore words with digits<br />
-          </td>
-          <td class="c2">
-            This option ignores words with digits when performing spell
-            checking.<br />
-          </td>
-          <td class="c2">
-            On<br />
-
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="25%">
-            <div class="Para">
-              Ignore mixed case words<br />
-            </div>
-          </td>
-
-          <td align="left" valign="top">
-            This option ignores mixed case words when performing spell
-            checking.
-          </td>
-          <td align="left" valign="top">
-            On<br />
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="25%">
-
-            <div class="Para">
-              Ignore sentence capitalization<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option ignores sentence capitalization when performing spell
-              checking.<br />
-            </div>
-
-          </td>
-          <td align="left" valign="top">
-            On<br />
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top" width="25%">
-            <div class="Para">
-
-              Ignore upper case words<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option ignores upper case words when performing spell
-              checking.
-            </div>
-          </td>
-          <td align="left" valign="top">
-
-            <div class="Para">
-              On
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Ignore internet addresses<br />
-
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option ignores internet addresses when performing spell
-              checking.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-
-              On
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Ignore non-letters at word boundaries<br />
-            </div>
-
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option ignores non-letters at word boundaries when
-              performing spell checking.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              On
-            </div>
-
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Ignore single letters<br />
-            </div>
-          </td>
-
-          <td align="left" valign="top">
-            <div class="Para">
-              This option ignores single letters when performing spell
-              checking.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              On
-            </div>
-          </td>
-
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Ignore Java string literals<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-
-            <div class="Para">
-              This option ignores Java string literals when performing spell
-              checking.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              On
-            </div>
-          </td>
-        </tr>
-
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Ignore '&amp;' in Java properties files<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-
-              This option ignores '&amp;' in Java properties files when
-              performing spell checking.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              On
-            </div>
-          </td>
-        </tr>
-
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Platform dictionary<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-
-              This option selects a platform dictionary to use.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              English (United States)
-            </div>
-          </td>
-        </tr>
-        <tr>
-
-          <td align="left" valign="top">
-            <div class="Para">
-              User defined dictionary<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option selects a User defined dictionary to use.
-            </div>
-
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              -
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-
-            <div class="Para">
-              Encoding<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option selects which encoding to use for reading the
-              dictonaries.
-            </div>
-          </td>
-
-          <td align="left" valign="top">
-            <div class="Para">
-              Default (depends on Platform)
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-
-              Maximum number of correction proposals<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option limits the possible corrections displayed to the
-              given value.
-            </div>
-          </td>
-          <td align="left" valign="top">
-
-            <div class="Para">
-              20
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </body>
+  </style>
+</head>
+<body>
+  <h1 class="Head">Spelling Preference Page</h1>
+  <div class="Para">
+    <p>The following preferences can be changed on the <a class="command-link" href=
+    'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.Spelling)")'>
+    <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>General &gt; Editors &gt;
+    Text Editors &gt; Spelling</strong></a> preference page.</p>
+  </div>
+  <table border="1" cellspacing="0" class="c3">
+    <tbody>
+      <tr>
+        <th width="25%">
+          <div class="Para">
+            Option
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Description
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Default
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Enable spell checking<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option enables spell checking.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td class="c1">Ignore words with digits<br /></td>
+        <td class="c2">This option ignores words with digits when performing spell checking.<br /></td>
+        <td class="c2">On<br /></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Ignore mixed case words<br />
+          </div>
+        </td>
+        <td align="left" valign="top">This option ignores mixed case words when performing spell checking.</td>
+        <td align="left" valign="top">On<br /></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Ignore sentence capitalization<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option ignores sentence capitalization when performing spell checking.<br />
+          </div>
+        </td>
+        <td align="left" valign="top">On<br /></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Ignore upper case words<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option ignores upper case words when performing spell checking.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Ignore internet addresses<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option ignores internet addresses when performing spell checking.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Ignore non-letters at word boundaries<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option ignores non-letters at word boundaries when performing spell checking.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Ignore single letters<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option ignores single letters when performing spell checking.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Ignore Java string literals<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option ignores Java string literals when performing spell checking.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Ignore '&amp;' in Java properties files<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option ignores '&amp;' in Java properties files when performing spell checking.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Platform dictionary<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option selects a platform dictionary to use.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            English (United States)
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            User defined dictionary<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option selects a User defined dictionary to use.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            -
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Encoding<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option selects which encoding to use for reading the dictonaries.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            Default (depends on Platform)
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Maximum number of correction proposals<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option limits the possible corrections displayed to the given value.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            20
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-37.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-37.htm
index 9478978..f882fe1 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-37.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-37.htm
@@ -1,110 +1,103 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-   <meta http-equiv="Content-Style-Type" content="text/css"/>
-   <title>New Project wizard</title>
-   <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"/>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <title>New Project wizard</title>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
 </head>
 <body bgcolor="#FFFFFF">
-
-<h1 class="Head">
-New Project wizard</h1>
-
-<div class="Intro">This wizard helps you create a new project in the Workbench.</div>
-
-
-<p class="Para">When you first bring up the New Project wizard, you need to select 
-  the type of project you want to create. Select the General type if you 
-  want to create a generic project. To assist in locating a particular wizard, 
-  the text field can be used to show only the wizards that match the entered text. </p>
-
-<div class="Topic">
-<h2>
-Create a New Project Resource Page</h2>
-When you select Next, you will be presented with the New Project Resource
-Page, containing the following edit fields:
-<br/>
-<table border="1" cellspacing="0">
-<tr>
-<th>
-<div class="Para">Field</div>
-</th>
-
-<th>
-<div class="Para">Description</div>
-</th>
-
-<th>
-<div class="Para">Default</div>
-</th>
-</tr>
-
-<tr>
-<td align="left" valign="top">
-<div class="Para">Project Name</div>
-</td>
-
-<td align="left" valign="top">
-<div class="Para">The name of the new project to be created.</div>
-</td>
-
-<td align="left" valign="top">
-<div class="Para">&lt;blank&gt;</div>
-</td>
-</tr>
-
-<tr>
-<td align="left" valign="top">
-<div class="Para">Location</div>
-</td>
-
-<td align="left" valign="top">
-<div class="Para">The location in the file system where the project will
-be created. Deselect "Use default location" to specify a location other
-than the default. You can type the new location or browse to select
-a file system location for the new project.</div>
-</td>
-
-<td align="left" valign="top">
-<div class="Para">The workspace root directory</div>
-</td>
-</tr>
-</table>
-
-
-  <p class="Para">After you indicate a name and location for the project, you 
-    can either click <strong>Finish </strong>to create the project, or you can 
-    click <strong>Next </strong>to set up project dependencies on the Select Referenced 
-    Projects page.</p> 
-</div>
-
-<div class="Topic">
-<h2>
-Select Referenced Projects page</h2>
-
-<div class="Para">In the Referenced Projects list, you can set project
-dependencies for the new project. In the list of other projects in the
-Workbench, you can select one or more projects on which you want the new
-project to depend. Initially, no projects will be selected.</div>
-
-
-  <p class="Para">Click <strong>Finish</strong> when you are done to create the 
-    new project in the Workbench.</p> </div>
-
-<div class="Topic">
-<h2>
-New Project perspective options</h2>
-
-<div class="Para">On the <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"/> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Perspectives)")'>
-    <strong>General &gt; Perspectives</strong></a> preference page, you can change the way that new projects are initially
-    displayed. For details on how to change this option see <a href="ref-10.htm">General</a>.</div>
-</div>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-27.htm">Project Explorer View</a>
-
+  <h1 class="Head">New Project wizard</h1>
+  <div class="Intro">
+    This wizard helps you create a new project in the Workbench.
+  </div>
+  <p class="Para">When you first bring up the New Project wizard, you need to select the type of project you want to
+  create. Select the General type if you want to create a generic project. To assist in locating a particular wizard,
+  the text field can be used to show only the wizards that match the entered text.</p>
+  <div class="Topic">
+    <h2>Create a New Project Resource Page</h2>When you select Next, you will be presented with the New Project
+    Resource Page, containing the following edit fields:<br />
+    <table border="1" cellspacing="0">
+      <tr>
+        <th>
+          <div class="Para">
+            Field
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Description
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Default
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Project Name
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            The name of the new project to be created.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            &lt;blank&gt;
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Location
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            The location in the file system where the project will be created. Deselect "Use default location" to
+            specify a location other than the default. You can type the new location or browse to select a file system
+            location for the new project.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            The workspace root directory
+          </div>
+        </td>
+      </tr>
+    </table>
+    <p class="Para">After you indicate a name and location for the project, you can either click
+    <strong>Finish</strong> to create the project, or you can click <strong>Next</strong> to set up project
+    dependencies on the Select Referenced Projects page.</p>
+  </div>
+  <div class="Topic">
+    <h2>Select Referenced Projects page</h2>
+    <div class="Para">
+      In the Referenced Projects list, you can set project dependencies for the new project. In the list of other
+      projects in the Workbench, you can select one or more projects on which you want the new project to depend.
+      Initially, no projects will be selected.
+    </div>
+    <p class="Para">Click <strong>Finish</strong> when you are done to create the new project in the Workbench.</p>
+  </div>
+  <div class="Topic">
+    <h2>New Project perspective options</h2>
+    <div class="Para">
+      On the <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <a class="command-link"
+      href=
+      'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Perspectives)")'>
+      <strong>General &gt; Perspectives</strong></a> preference page, you can change the way that new projects are
+      initially displayed. For details on how to change this option see <a href="ref-10.htm">General</a>.
+    </div>
+  </div>
+  <h3 class="related">Related reference</h3><a href="ref-27.htm">Project Explorer View</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-38.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-38.htm
index 4f83601..0d569b1 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-38.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-38.htm
@@ -1,91 +1,71 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>New Folder wizard</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-New Folder wizard</H1>
-<P CLASS="Para">
-This wizard helps you create a new folder in the Workbench.</P>
-</P>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-New Folder Fields</CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Field</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Enter or select the parent folder</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The resource in which the new folder will be created. Type or navigate the list to
-select the resource.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The resource that was selected when you chose to create the new folder</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Folder name</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The name for the new folder.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-&lt;blank&gt;</P>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-<H2>Advanced</H2>
-<P>The <B>Advanced</B> button reveals or hides a section of the wizard used 
-to create a virtual or linked folder. Select the <B>Folder is not located in the file system</B>
-radio buton to create a virtual folder.  Select the <B>Link to folder in the file system</B> 
-radio button if you want the new folder to reference a folder in the file
-system. Use the field below the radio button to enter a folder path or the
-name of a path variable. Use the <B>Browse...</B> button to browse for a folder 
-in the file system. Use the <B>Variables...</B> button if you want to use a path 
-variable to reference a file system folder.</P>
-
-<h3 class="related">Related concepts</h3>
-    <A href="../concepts/virtualfolders.htm">Virtual Folders</A>
-<br><A href="../concepts/concepts-13.htm">Linked resources</A>
-<br><A href="../concepts/cpathvars.htm">Path variables</A>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-43.htm">Creating a folder</a><br>
-<a href="../tasks/tasks-45.htm">Creating linked resources</a>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-27.htm">Project Explorer View</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>New Folder wizard</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">New Folder wizard</h1>
+  <p class="Para">This wizard helps you create a new folder in the Workbench.</p>
+  <table border="1" cellspacing="0">
+    <caption>
+      New Folder Fields
+    </caption>
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Field</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Enter or select the parent folder</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">The resource in which the new folder will be created. Type or navigate the list to select the
+          resource.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">The resource that was selected when you chose to create the new folder</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Folder name</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">The name for the new folder.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">&lt;blank&gt;</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <h2>Advanced</h2>
+  <p>The <b>Advanced</b> button reveals or hides a section of the wizard used to create a virtual or linked folder.
+  Select the <b>Folder is not located in the file system</b> radio buton to create a virtual folder. Select the <b>Link
+  to folder in the file system</b> radio button if you want the new folder to reference a folder in the file system.
+  Use the field below the radio button to enter a folder path or the name of a path variable. Use the <b>Browse...</b>
+  button to browse for a folder in the file system. Use the <b>Variables...</b> button if you want to use a path
+  variable to reference a file system folder.</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/virtualfolders.htm">Virtual Folders</a><br>
+  <a href="../concepts/concepts-13.htm">Linked resources</a><br>
+  <a href="../concepts/cpathvars.htm">Path variables</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-43.htm">Creating a folder</a><br>
+  <a href="../tasks/tasks-45.htm">Creating linked resources</a>
+  <h3 class="related">Related reference</h3><a href="ref-27.htm">Project Explorer View</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-39.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-39.htm
index 30e6e32..7441964 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-39.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-39.htm
@@ -1,88 +1,69 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>New File wizard</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-New File wizard</H1>
-<P CLASS="Para">
-This wizard helps you create a new file in the Workbench.</P>
-</P>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-New File Fields</CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Field</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Enter or select the parent folder</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The resource in which the new file will be created. Type or browse the list to select the resource.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The resource that was selected when you invoked the New File wizard.</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">File name</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The name for the new file, including the file extension.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-&lt;blank&gt;</P>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-<H2>Advanced</H2>
-<P>The <B>Advanced</B> button reveals or hides a section of the wizard used 
-to create a linked file. Check the <B>Link to file in the file system</B> checkbox if 
-you want the new file to reference a file in the file system. Use the field below the 
-checkbox to enter a file path or the name of a path variable. Use the 
-<B>Browse...</B> button to browse for a file in the file system. Use the 
-<B>Variables...</B> button if you want to use a path variable to reference a file system file.</P>
-
-<h3 class="related">Related concepts</h3>
-<A href="../concepts/concepts-13.htm">Linked resources</A>
-<br>
-<A href="../concepts/cpathvars.htm">Path variables</A>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-44.htm">Creating a file</a><br>
-<a href="../tasks/tasks-45.htm">Creating linked resources</a>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-27.htm">Project Explorer View</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>New File wizard</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">New File wizard</h1>
+  <p class="Para">This wizard helps you create a new file in the Workbench.</p>
+  <table border="1" cellspacing="0">
+    <caption>
+      New File Fields
+    </caption>
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Field</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Enter or select the parent folder</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">The resource in which the new file will be created. Type or browse the list to select the
+          resource.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">The resource that was selected when you invoked the New File wizard.</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">File name</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">The name for the new file, including the file extension.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">&lt;blank&gt;</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <h2>Advanced</h2>
+  <p>The <b>Advanced</b> button reveals or hides a section of the wizard used to create a linked file. Check the
+  <b>Link to file in the file system</b> checkbox if you want the new file to reference a file in the file system. Use
+  the field below the checkbox to enter a file path or the name of a path variable. Use the <b>Browse...</b> button to
+  browse for a file in the file system. Use the <b>Variables...</b> button if you want to use a path variable to
+  reference a file system file.</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-13.htm">Linked resources</a><br>
+  <a href="../concepts/cpathvars.htm">Path variables</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-44.htm">Creating a file</a><br>
+  <a href="../tasks/tasks-45.htm">Creating linked resources</a>
+  <h3 class="related">Related reference</h3><a href="ref-27.htm">Project Explorer View</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-39a.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-39a.htm
index 54a04ca..c80166a 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-39a.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-39a.htm
@@ -1,31 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>CVS Wizards</title>
-
-</HEAD>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>CVS Wizards</title>
+</head>
 <body>
-<H1 CLASS="Head">
-CVS Wizards</H1>
-
-<P>There are several CVS specific wizards. These include the Import CVS Project 
-  wizard (which is also available from the New Project wizard) and the New CVS 
-  Repository Location wizard. There are also wizards for several CVS operations, 
-  such as committing and merging.</p>
-<P>  See Team Support in the
-Reference section for details on these wizards.
-</p>
-
-<h3 class="related">Related reference</h3>
-  <a href="ref-40a.htm">CVS Checkout wizard</a><br>
-     <a href="ref-40.htm">New CVS Repository Location wizard</a><br>
-     <a href="ref-41a.htm">Merge wizard</a>
-
+  <h1 class="Head">CVS Wizards</h1>
+  <p>There are several CVS specific wizards. These include the Import CVS Project wizard (which is also available from
+  the New Project wizard) and the New CVS Repository Location wizard. There are also wizards for several CVS
+  operations, such as committing and merging.</p>
+  <p>See Team Support in the Reference section for details on these wizards.</p>
+  <h3 class="related">Related reference</h3><a href="ref-40a.htm">CVS Checkout wizard</a><br>
+  <a href="ref-40.htm">New CVS Repository Location wizard</a><br>
+  <a href="ref-41a.htm">Merge wizard</a>
 </body>
-</HTML>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-4.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-4.htm
index 448e2e7..5577205 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-4.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-4.htm
@@ -1,38 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>View toolbars</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-View toolbars</H1>
-<P CLASS="Para">
-View toolbars contain actions that apply only to the particular view in which they appear. 
-The view toolbar also contains a context menu that contains other actions for that view.
-This menu is opened by clicking on the
-downwards pointing triangle. If there is enough space, view toolbars are in the view tab area.  Otherwise they appear in the view.</P>
-<P CLASS="Para">
-Here is an example of the view toolbar for the Properties view:</P>
-<P CLASS="Para">
-<img src="../images/Image215_toolbar_view.png" alt="Properties View Tool Bar" border="0" ></P>
-
-<h2>
-Title Bar</h2>
-<P CLASS="Para">
-View title bars contain the view name, its icon, and
-the view toolbar. </P>
-
-<h3 class="related">Related reference</h3>
-    <a href="ref-3.htm">Shortcut Bar</a>
-<br><a href="ref-2.htm">Workbench Toolbar</a>
-<br><a href="ref-23.htm">Workbench Window Layout</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>View toolbars</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">View toolbars</h1>
+  <p class="Para">View toolbars contain actions that apply only to the particular view in which they appear. The view
+  toolbar also contains a context menu that contains other actions for that view. This menu is opened by clicking on
+  the downwards pointing triangle. If there is enough space, view toolbars are in the view tab area. Otherwise they
+  appear in the view.</p>
+  <p class="Para">Here is an example of the view toolbar for the Properties view:</p>
+  <p class="Para"><img src="../images/Image215_toolbar_view.png" alt="Properties View Tool Bar" border="0"></p>
+  <h2>Title Bar</h2>
+  <p class="Para">View title bars contain the view name, its icon, and the view toolbar.</p>
+  <h3 class="related">Related reference</h3><a href="ref-3.htm">Shortcut Bar</a><br>
+  <a href="ref-2.htm">Workbench Toolbar</a><br>
+  <a href="ref-23.htm">Workbench Window Layout</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-40.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-40.htm
index 1e52f5f..ebca40f 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-40.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-40.htm
@@ -1,152 +1,94 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-     
-  <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
-     
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
-      
-  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1"
- type="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
   <title>Add CVS Repository wizard</title>
-   
 </head>
- <body style="background-color: rgb(255,255,255);">
-   
-<h1 class="Head">Add CVS Repository wizard</h1>
-   
-<p class="Para"> This wizard helps you create a repository location.</p>
-   
-<p class="Para"> Here is what the New CVS Repository Location wizard looks 
-like:</p>
-   
-<p class="Para"> <img align="top" border="0"
- src="../images/Image249_repo_wiz.png" alt="Repositories View" >
- </p>
-   
-<div class="Topic">  
-<h2 class="Head">Fields</h2>
-   
-<p class="Head"> The following are the editable fields for a new CVS repository 
-location:</p>
-     
-<table border="1" cellspacing="0" cellpadding="3">
-      <thead>      <tr>
-         <th rowspan="1" colspan="1">               
-    <p class="Para"> Option</p>
-        </th>
-        <th rowspan="1" colspan="1">               
-    <p class="Para"> Description</p>
-        </th>
-        <th rowspan="1" colspan="1">               
-    <p class="Para"> Default</p>
-        </th>
-      </tr>
-      </thead> <tbody>
-       <tr>
-         <td rowspan="1" colspan="1" valign="top" align="left">         
-       Host
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-     	The address of the host (e.g., "hostmachine.com").
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-      &lt;blank&gt;
-        </td>
-      </tr>
-      <tr>
-         <td rowspan="1" colspan="1" valign="top" align="left">         
-       Repository Path
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-     	The path to the repository on the host (e.g., "/x/y/z", 
-           "d:/myrepo").
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-     	&lt;blank&gt;
-        </td>
-      </tr>
-      <tr>
-         <td rowspan="1" colspan="1" valign="top" align="left">         
-       	User Name
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-		The user name under which you want to connect to the 
-           server.
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-	    &lt;blank&gt;
-        </td>
-      </tr>
-      <tr>
-        <td colspan="1" valign="top" align="left">Password</td>
-        <td colspan="1" valign="top" align="left">The password required for 
-the          above user name to access the above host.</td>
-        <td colspan="1" valign="top" align="left">&lt;blank&gt;</td>
-      </tr>
-      <tr>
-         <td rowspan="1" colspan="1" valign="top" align="left">         
-		 Connection Type
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-		The type of CVS connection for the repository, either 
-           "pserver", "extssh", "pserverssh2" or "ext".
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-		pserver
-        </td>
-      </tr>
-      <tr>
-         <td colspan="1" valign="top" align="left">Port</td>
-        <td colspan="1" valign="top" align="left">Option to use a custom
-port for          the connection.</td>
-        <td colspan="1" valign="top" align="left">Use Default Port</td>
-      </tr>
-      <tr>
-         <td rowspan="1" colspan="1" valign="top" align="left">         
-		Validate connection on finish
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-     
-    Check this option if you want to attempt a connection 
-           to the host upon completion of the wizard to validate that the 
-entered            information is correct. If this option is not enabled, 
-you will            not know whether the information entered is correct until 
-you try to            access the contents of a repository for the first time. 
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-     
-      <p class="Para">On</p>
-        </td>
-      </tr>
-         
-       <tr>
-         <td rowspan="1" colspan="1" valign="top" align="left">         
-       	Save Password
-        </td>
-        <td rowspan="1" colspan="1" valign="top" align="left">Check this option 
-          if you want the password to be saved between sessions. To persist 
-          login credentials in a safe, encrypted form 
-          <a href="../reference/ref-securestorage-start.htm">Secure Storage</a> 
-          is used.</td>
-        <td rowspan="1" colspan="1" valign="top" align="left">           
-     
-      <p class="Para">Off</p>
-        </td>
-      </tr>
-      
-  </tbody>     
-</table>
-    <h3 class="related">Related reference</h3>
-    <a href="ref-32.htm">CVS Repositories View</a><br> 
+<body style="background-color: rgb(255,255,255);">
+  <h1 class="Head">Add CVS Repository wizard</h1>
+  <p class="Para">This wizard helps you create a repository location.</p>
+  <p class="Para">Here is what the New CVS Repository Location wizard looks like:</p>
+  <p class="Para"><img align="top" border="0" src="../images/Image249_repo_wiz.png" alt="Repositories View"></p>
+  <div class="Topic">
+    <h2 class="Head">Fields</h2>
+    <p class="Head">The following are the editable fields for a new CVS repository location:</p>
+    <table border="1" cellspacing="0" cellpadding="3">
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">Host</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">The address of the host (e.g., "hostmachine.com").</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">&lt;blank&gt;</td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">Repository Path</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">The path to the repository on the host (e.g., "/x/y/z",
+          "d:/myrepo").</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">&lt;blank&gt;</td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">User Name</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">The user name under which you want to connect to the
+          server.</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">&lt;blank&gt;</td>
+        </tr>
+        <tr>
+          <td colspan="1" valign="top" align="left">Password</td>
+          <td colspan="1" valign="top" align="left">The password required for the above user name to access the above
+          host.</td>
+          <td colspan="1" valign="top" align="left">&lt;blank&gt;</td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">Connection Type</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">The type of CVS connection for the repository, either
+          "pserver", "extssh", "pserverssh2" or "ext".</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">pserver</td>
+        </tr>
+        <tr>
+          <td colspan="1" valign="top" align="left">Port</td>
+          <td colspan="1" valign="top" align="left">Option to use a custom port for the connection.</td>
+          <td colspan="1" valign="top" align="left">Use Default Port</td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">Validate connection on finish</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">Check this option if you want to attempt a connection
+          to the host upon completion of the wizard to validate that the entered information is correct. If this option
+          is not enabled, you will not know whether the information entered is correct until you try to access the
+          contents of a repository for the first time.</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">On</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">Save Password</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">Check this option if you want the password to be saved
+          between sessions. To persist login credentials in a safe, encrypted form <a href=
+          "../reference/ref-securestorage-start.htm">Secure Storage</a> is used.</td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Off</p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <h3 class="related">Related reference</h3><a href="ref-32.htm">CVS Repositories View</a><br>
     <a href="../reference/ref-securestorage-start.htm">Secure Storage</a><br>
-	<a href="../reference/ref-securestorage-prefs.htm">Secure storage preference page</a></div>
-    
-
-    
+    <a href="../reference/ref-securestorage-prefs.htm">Secure storage preference page</a>
+  </div>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-40a.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-40a.htm
index 6fdac7b..806d1c6 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-40a.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-40a.htm
@@ -1,80 +1,40 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-     
-  <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
-     
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
-      
-  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1"
- type="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
   <title>CVS Checkout wizard</title>
-   
 </head>
- <body style="background-color: rgb(255,255,255);">
-   
-<h1 class="Head">CVS Checkout wizard</h1>
-   
-<p class="Para"> This wizard helps you check out one or more projects from a CVS repository.
-It is available from the Import menu, the New &gt; Project menu and the toolbar of the CVS
-Repository Exploring perspective. It is also opened when performing a Checkout As from the
-CVS Repositories view.</p>
-   
-<p class="Para">The first page of the checkout wizard allows you to choose an existing repository
-location or create a new one. If you choose to create a new location, the page from the 
-<a href="ref-40.htm">New Repository Location wizard</a> is shown.</p>
-   
-<p class="Para"> <img align="top" border="0"
- src="../images/cvs-checkout1.png" alt="CVS Checkout wizard" >
-</p>
-
-<p class="Para"> After a repository location is selected, you can now choose one 
-  or more modules to check out. You can either enter a module path or select one 
-  or more from the list of existing modules. A dot (.) can be entered to checkout 
-  the entire contents of the repository for those rare cases where the repository 
-  represents a single project. </p>
-
-<p class="Para"> <img align="top" border="0"
- src="../images/cvs-checkout2.png" alt="CVS Checkout wizard" >
-</p>
-
-<p class="Para"> Once one or more modules are selected, you can choose to check 
-  out one or more selected modules as a new projects or into an existing project 
-  or folder. If one module is selected and it does not contain a .project file 
-  (the Workbench project configuration file), you will also have the option to 
-  configure the project using the new project wizard (in order to make the project 
-  a Java project, for instance). The option to check out subfolders is selected by default. 
-  Also, you are given the option to add the checked out modules to a working set.</p>
-
-<p class="Para"> <img align="top" border="0"
- src="../images/cvs-checkout3.png" alt="CVS Checkout wizard" >
-</p> 
-
-<p class="Para">
-For a single project, you can configure the location of the project to be either
-the default location or a custom location outside the workspace. For multiple
-projects, you can configure the parent folder where all the projects should be
-located.
-</p>
-
-<p class="Para"> <img align="top" border="0"
- src="../images/cvs-checkout4.png" alt="CVS Checkout wizard" >
-</p> 
-
-<p class="Para">
-Finally, you can choose the tag to be used for the check out.
-</p>
-
-<p class="Para"> <img align="top" border="0"
- src="../images/cvs-checkout5.png" alt="CVS Checkout wizard" >
-</p> 
-   
-<h3 class="related">Related reference</h3>
-     <a href="ref-32.htm">CVS Repositories View</a>
- <br><a href="ref-40.htm">Add CVS Repository wizard</a> 
+<body style="background-color: rgb(255,255,255);">
+  <h1 class="Head">CVS Checkout wizard</h1>
+  <p class="Para">This wizard helps you check out one or more projects from a CVS repository. It is available from the
+  Import menu, the New &gt; Project menu and the toolbar of the CVS Repository Exploring perspective. It is also opened
+  when performing a Checkout As from the CVS Repositories view.</p>
+  <p class="Para">The first page of the checkout wizard allows you to choose an existing repository location or create
+  a new one. If you choose to create a new location, the page from the <a href="ref-40.htm">New Repository Location
+  wizard</a> is shown.</p>
+  <p class="Para"><img align="top" border="0" src="../images/cvs-checkout1.png" alt="CVS Checkout wizard"></p>
+  <p class="Para">After a repository location is selected, you can now choose one or more modules to check out. You can
+  either enter a module path or select one or more from the list of existing modules. A dot (.) can be entered to
+  checkout the entire contents of the repository for those rare cases where the repository represents a single
+  project.</p>
+  <p class="Para"><img align="top" border="0" src="../images/cvs-checkout2.png" alt="CVS Checkout wizard"></p>
+  <p class="Para">Once one or more modules are selected, you can choose to check out one or more selected modules as a
+  new projects or into an existing project or folder. If one module is selected and it does not contain a .project file
+  (the Workbench project configuration file), you will also have the option to configure the project using the new
+  project wizard (in order to make the project a Java project, for instance). The option to check out subfolders is
+  selected by default. Also, you are given the option to add the checked out modules to a working set.</p>
+  <p class="Para"><img align="top" border="0" src="../images/cvs-checkout3.png" alt="CVS Checkout wizard"></p>
+  <p class="Para">For a single project, you can configure the location of the project to be either the default location
+  or a custom location outside the workspace. For multiple projects, you can configure the parent folder where all the
+  projects should be located.</p>
+  <p class="Para"><img align="top" border="0" src="../images/cvs-checkout4.png" alt="CVS Checkout wizard"></p>
+  <p class="Para">Finally, you can choose the tag to be used for the check out.</p>
+  <p class="Para"><img align="top" border="0" src="../images/cvs-checkout5.png" alt="CVS Checkout wizard"></p>
+  <h3 class="related">Related reference</h3><a href="ref-32.htm">CVS Repositories View</a><br>
+  <a href="ref-40.htm">Add CVS Repository wizard</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-40b.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-40b.htm
index 5333945..ffe3ced 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-40b.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-40b.htm
@@ -1,75 +1,38 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-     
-  <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
-     
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Style-Type" content="text/css">
-      
-  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1"
- type="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
   <title>CVS Sharing wizard</title>
-   
 </head>
- <body style="background-color: rgb(255,255,255);">
-   
-<h1 class="Head">CVS Sharing wizard</h1>
-   
-<p class="Para"> This wizard helps you share a project with others using a CVS 
-  repository. It is available from the <strong>Team &gt; Share Project </strong>menu 
-  command of views that display resources such as one of the navigation views 
-  and the Java Packages Explorer.</p>
-   
-<p class="Para">The first page of the Sharing wizard allows you to choose the type of
-repository you would like to share you project with. If the repository type
-you wish to share with is not listed, you can click the Show All Wizards checkbox
-to see repository types that are installed but not enabled.</p>
-   
-<p class="Para"> <img align="top" border="0"
- src="../images/cvs-share1.png" alt="Sharing wizard" >
-</p>
-
-<p class="Para">
-Selecting CVS will bring you to the CVS Sharing wizard. On the first page of the
-CVS wizard, you can select the repository you wish to share with. If the repository
-is not in the list, you can select to create a new repository.
-If you choose to create a new location, the page from the 
-<a href="ref-40.htm">New Repository Location wizard</a> is shown.
-</p>
-
-<p class="Para"> <img align="top" border="0"
- src="../images/cvs-share2.png" alt="CVS Sharing wizard" >
-</p>
-
-<p class="Para">
-After you have selected the repository, you must indicate the name of the module
-that will be used to share the project. You can choose to use the same name
-as the local project or you can type in a path containing one or more folder segments
-indicating the remote module. There is also an option to reconnect the local project to an existing
-module.
-</p>
-
-<p class="Para"> <img align="top" border="0"
- src="../images/cvs-share3.png" alt="CVS Sharing wizard" >
-</p>
-
-<p class="Para"> The final page of the CVS Sharing wizard allows you to decide 
-  which resources to commit and which to ignore. There are toolbar items for changing 
-  the layout of the view and for committing and ignoring resources. If there are 
-  resources left in the view when Finish is pressed, you will be prompted to commit 
-  the remaining resources in the background (if the <em>Launch the Commit Wizard</em> 
-  option is enabled) which will allow you to return to work while the commit takes 
-  place. </p>
-
-<p class="Para"> <img align="top" border="0"
- src="../images/cvs-share4.png" alt="CVS Sharing wizard" >
-</p>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-40.htm">Add CVS Repository wizard</a>    
+<body style="background-color: rgb(255,255,255);">
+  <h1 class="Head">CVS Sharing wizard</h1>
+  <p class="Para">This wizard helps you share a project with others using a CVS repository. It is available from the
+  <strong>Team &gt; Share Project</strong> menu command of views that display resources such as one of the navigation
+  views and the Java Packages Explorer.</p>
+  <p class="Para">The first page of the Sharing wizard allows you to choose the type of repository you would like to
+  share you project with. If the repository type you wish to share with is not listed, you can click the Show All
+  Wizards checkbox to see repository types that are installed but not enabled.</p>
+  <p class="Para"><img align="top" border="0" src="../images/cvs-share1.png" alt="Sharing wizard"></p>
+  <p class="Para">Selecting CVS will bring you to the CVS Sharing wizard. On the first page of the CVS wizard, you can
+  select the repository you wish to share with. If the repository is not in the list, you can select to create a new
+  repository. If you choose to create a new location, the page from the <a href="ref-40.htm">New Repository Location
+  wizard</a> is shown.</p>
+  <p class="Para"><img align="top" border="0" src="../images/cvs-share2.png" alt="CVS Sharing wizard"></p>
+  <p class="Para">After you have selected the repository, you must indicate the name of the module that will be used to
+  share the project. You can choose to use the same name as the local project or you can type in a path containing one
+  or more folder segments indicating the remote module. There is also an option to reconnect the local project to an
+  existing module.</p>
+  <p class="Para"><img align="top" border="0" src="../images/cvs-share3.png" alt="CVS Sharing wizard"></p>
+  <p class="Para">The final page of the CVS Sharing wizard allows you to decide which resources to commit and which to
+  ignore. There are toolbar items for changing the layout of the view and for committing and ignoring resources. If
+  there are resources left in the view when Finish is pressed, you will be prompted to commit the remaining resources
+  in the background (if the <em>Launch the Commit Wizard</em> option is enabled) which will allow you to return to work
+  while the commit takes place.</p>
+  <p class="Para"><img align="top" border="0" src="../images/cvs-share4.png" alt="CVS Sharing wizard"></p>
+  <h3 class="related">Related reference</h3><a href="ref-40.htm">Add CVS Repository wizard</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-41a.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-41a.htm
index 10d3e08..84eb7cc 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-41a.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-41a.htm
@@ -1,71 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Merge wizard</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Merge wizard</H1>
-<P CLASS="Intro"> This wizard helps you merge changes between two states of a 
-  project into your workspace. Often the Merge Wizard is used to move changes 
-  from one branch into another, for example after splitting a branch to work on 
-  a bug fix. The merge operation takes changes between two points in a branch, 
-  the <b> start point</b> and the <b> end point</b>, and merges them into your 
-  workspace. Typically the start point will be the root of a branch (version tag) 
-  and the end point can either be the tip (latest and best) of the branch 
-  or another version tag.<br>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Merge wizard</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Merge wizard</h1>
+  <p class="Intro">This wizard helps you merge changes between two states of a project into your workspace. Often the
+  Merge Wizard is used to move changes from one branch into another, for example after splitting a branch to work on a
+  bug fix. The merge operation takes changes between two points in a branch, the <b>start point</b> and the <b>end
+  point</b>, and merges them into your workspace. Typically the start point will be the root of a branch (version tag)
+  and the end point can either be the tip (latest and best) of the branch or another version tag.<br>
   <br>
-  It is very important to understand that the destination of the merge is always 
-  the project in your workspace. After the merge has been completed you can test the 
-  changes locally and then commit them to the new branch (usually HEAD).</p>
-<P CLASS="Intro">To start a merge, select a project (or one or more resources), 
-  and select <b>Team &gt; Merge...</b> from the pop-up menu. The following dialog 
-  will appear.</p>
-<P><img src="../images/Image269_merge_init.png" alt="Merge dialog initial state" border="0" > 
-</P>
-
-
-<p>First, you should choose the end tag of the merge. This is the branch or version 
-  being merged into the workspace. Choose a version when you want to merge the 
-  differences between two versions of a project into your workspace. Choose a 
-  branch if you want to merge the changes made in the branch into your local workspace.</p>
-<p>The wizard will try to pick an appropriate tag for the start tag or base tag. 
-  If one cannot be determined, you should enter it manually. If there is no start 
-  tag, you can choose to merge without a preview, in which case a start tag is 
-  not required but the merge will happen directly into the workspace. The drawback 
-  of this is that CVS uses a text base markup to identify conflicts and this is 
-  cumbersome to work with.</p>
-
-
-<P>If the merge preview option is selected, after the finish button is pressed, 
-  the changes between the start point and end point are calculated and displayed 
-  as a <a href="ref-33a.htm">CVS Merge Synchronization</a> in the Synchronize 
-  view. Depending on the size of the project you are merging, this may take some 
-  time but can be run in the background. In the Synchronize view you can update 
-  or merge changes into your Workbench. Also, you have the option to automatically 
-  merge non-conflicting changes which means you will only need to deal with the conflicting changes in
-  the Synchronize view.</P>
-
-
-<h3 class="related">Related concepts</h3>
-    <a href="../concepts/concepts-26.htm">Team programming with CVS</a>
-<br><a href="../concepts/concepts-27b.htm">Branches</a>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-100a.htm">Branching</a><br>
-<a href="../tasks/tasks-100b.htm">Merging from a branch</a>
-
-<h3 class="related">Related reference</h3>
-      <a href="../reference/ref-47.htm">CVS</a>
-  <br><a href="ref-33a.htm">CVS Merge Synchronization</a>  
-  <br><a href="ref-25.htm">Compare editor</a>  
-
-</BODY>
-</HTML>
+  It is very important to understand that the destination of the merge is always the project in your workspace. After
+  the merge has been completed you can test the changes locally and then commit them to the new branch (usually
+  HEAD).</p>
+  <p class="Intro">To start a merge, select a project (or one or more resources), and select <b>Team &gt; Merge...</b>
+  from the pop-up menu. The following dialog will appear.</p>
+  <p><img src="../images/Image269_merge_init.png" alt="Merge dialog initial state" border="0"></p>
+  <p>First, you should choose the end tag of the merge. This is the branch or version being merged into the workspace.
+  Choose a version when you want to merge the differences between two versions of a project into your workspace. Choose
+  a branch if you want to merge the changes made in the branch into your local workspace.</p>
+  <p>The wizard will try to pick an appropriate tag for the start tag or base tag. If one cannot be determined, you
+  should enter it manually. If there is no start tag, you can choose to merge without a preview, in which case a start
+  tag is not required but the merge will happen directly into the workspace. The drawback of this is that CVS uses a
+  text base markup to identify conflicts and this is cumbersome to work with.</p>
+  <p>If the merge preview option is selected, after the finish button is pressed, the changes between the start point
+  and end point are calculated and displayed as a <a href="ref-33a.htm">CVS Merge Synchronization</a> in the
+  Synchronize view. Depending on the size of the project you are merging, this may take some time but can be run in the
+  background. In the Synchronize view you can update or merge changes into your Workbench. Also, you have the option to
+  automatically merge non-conflicting changes which means you will only need to deal with the conflicting changes in
+  the Synchronize view.</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-26.htm">Team programming with CVS</a><br>
+  <a href="../concepts/concepts-27b.htm">Branches</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-100a.htm">Branching</a><br>
+  <a href="../tasks/tasks-100b.htm">Merging from a branch</a>
+  <h3 class="related">Related reference</h3><a href="../reference/ref-47.htm">CVS</a><br>
+  <a href="ref-33a.htm">CVS Merge Synchronization</a><br>
+  <a href="ref-25.htm">Compare editor</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-42.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-42.htm
index a12d18a..2e34c47 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-42.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-42.htm
@@ -1,51 +1,73 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Web Browser preferences</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Web Browser preferences</title>
 </head>
 <body>
-
-<h1>Web Browser preferences</h1>
-
-<div class="Para"> 
-  <p>The following preferences can be changed on the
-  
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.browser.preferencePage)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>General &gt; Web Browser</strong></a>
-  
-  preference page.</p>
-</div>
-
-<table border="1" cellspacing="0" style="width: 100%;">
-  <tbody>
-    <tr> 
-      <th width="25%"> <div class="Para">Option</div></th>
-      <th> <div class="Para">Description</div></th>
-      <th> <div class="Para">Default</div></th>
-    </tr>
-    <tr> 
-      <td align="left" valign="top" width="25%"> <div class="Para">Use internal 
-          Web browser<br>
-        </div></td>
-      <td align="left" valign="top"> <div class="Para">This option enables you 
-          to use an internal Web browser. </div></td>
-      <td align="left" valign="top"> <div class="Para">On</div></td>
-    </tr>
-    <tr> 
-      <td align="left" valign="top"> <div class="Para">Use external Web browser<br>
-        </div></td>
-      <td align="left" valign="top"> <div class="Para">This option enables you 
-          to use an external Web browser. Select the required browser from the 
-          list of available external web browsers.</div></td>
-      <td style="vertical-align: top;">Off<br> </td>
-    </tr>
-  </tbody>
-</table>
-
-</body></html>
\ No newline at end of file
+  <h1>Web Browser preferences</h1>
+  <div class="Para">
+    <p>The following preferences can be changed on the <a class="command-link" href=
+    'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.browser.preferencePage)")'>
+    <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Web
+    Browser</strong></a> preference page.</p>
+  </div>
+  <table border="1" cellspacing="0" style="width: 100%;">
+    <tbody>
+      <tr>
+        <th width="25%">
+          <div class="Para">
+            Option
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Description
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Default
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <td align="left" valign="top" width="25%">
+          <div class="Para">
+            Use internal Web browser<br>
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option enables you to use an internal Web browser.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            On
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Use external Web browser<br>
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option enables you to use an external Web browser. Select the required browser from the list of
+            available external web browsers.
+          </div>
+        </td>
+        <td style="vertical-align: top;">Off<br></td>
+      </tr>
+    </tbody>
+  </table>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-43.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-43.htm
index 4255fe1..27fb971 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-43.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-43.htm
@@ -1,59 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Workbench User Guide</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Workbench User Guide</H1>
-<P CLASS="Para">
-The Help view displays help related to using the Workbench. If you select Workbench
-User Guide in the list of books displayed in the Help window, you will see help
-topics related to using the Workbench in the Contents tab. The Workbench User Guide
-is broken down into four main sections, described below.</P>
-<DIV CLASS="Topic">
-
-<DIV CLASS="Subtopic">
-<H2 CLASS="Head">
-Getting started</H2>
-<P CLASS="Para">
-This section contains tutorials that will help you
-when you start using the Workbench.</P>
-</DIV>
-<DIV CLASS="Subtopic">
-<H2 CLASS="Head">
-Concepts</H2>
-<P CLASS="Para">
-Concepts are high level descriptions of the schema
-and functions of the Workbench. This section helps provide a general
-understanding of how the Workbench functions. For example, the Concepts section includes a discussion of what perspectives and views are and how they relate to one another.</P>
-</DIV>
-<DIV CLASS="Subtopic">
-<H2 CLASS="Head">
-Tasks</H2>
-<P CLASS="Para">
-Task descriptions are step by step instructions for
-performing specific actions and tasks in the Workbench. For example, the Tasks section contains step by step instructions for
-creating a repository location, and for importing a file from the file system into the Workbench.</P>
-</DIV>
-<DIV CLASS="Subtopic">
-<H2 CLASS="Head">
-Reference</H2>
-<P CLASS="Para">
-Reference materials are helpful resources that will assist you while you are using the Workbench. This includes descriptions of various wizards, dialogs, and fields as well as Workbench resources such as specific views and perspectives.</P>
-<P CLASS="Para">
-The Reference section also includes a glossary of terms that you might find useful while using the Workbench.</P>
-</DIV>
-</DIV>
-
-
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Workbench User Guide</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Workbench User Guide</h1>
+  <p class="Para">The Help view displays help related to using the Workbench. If you select Workbench User Guide in the
+  list of books displayed in the Help window, you will see help topics related to using the Workbench in the Contents
+  tab. The Workbench User Guide is broken down into four main sections, described below.</p>
+  <div class="Topic">
+    <div class="Subtopic">
+      <h2 class="Head">Getting started</h2>
+      <p class="Para">This section contains tutorials that will help you when you start using the Workbench.</p>
+    </div>
+    <div class="Subtopic">
+      <h2 class="Head">Concepts</h2>
+      <p class="Para">Concepts are high level descriptions of the schema and functions of the Workbench. This section
+      helps provide a general understanding of how the Workbench functions. For example, the Concepts section includes
+      a discussion of what perspectives and views are and how they relate to one another.</p>
+    </div>
+    <div class="Subtopic">
+      <h2 class="Head">Tasks</h2>
+      <p class="Para">Task descriptions are step by step instructions for performing specific actions and tasks in the
+      Workbench. For example, the Tasks section contains step by step instructions for creating a repository location,
+      and for importing a file from the file system into the Workbench.</p>
+    </div>
+    <div class="Subtopic">
+      <h2 class="Head">Reference</h2>
+      <p class="Para">Reference materials are helpful resources that will assist you while you are using the Workbench.
+      This includes descriptions of various wizards, dialogs, and fields as well as Workbench resources such as
+      specific views and perspectives.</p>
+      <p class="Para">The Reference section also includes a glossary of terms that you might find useful while using
+      the Workbench.</p>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-45.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-45.htm
index f025832..6c6c5a6 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-45.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-45.htm
@@ -1,78 +1,56 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"><head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"><title>File search</title></head>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>File search</title>
+</head>
 <body>
-
-<h1>File search</h1>
-
-<p>
-In the Search Dialog, the File Search tab allows you to search for files or text in the Workbench.
-You can bring up the Search Dialog by clicking on the Search toolbar button.</p>
-
-<h2>Containing text</h2>
-<p>Type the expression for which you wish to do the text search. Leave this field empty to search for files.</p>
-
-<p>From the drop-down menu, you can choose to repeat or
-modify a recent search.</p>
-
-<h3>Wildcards</h3>
-<p>The available wildcards for search expressions are displayed in the search dialog:</p>
-
-<ul>
-	<li>"*" matches any set of characters, including the empty string</li>
-	<li>"?" matches for any character</li>
-	<li> "\" is the escape for a literal; if you want to search for an asterisk, question mark, or backslash character, type a backslash before it to indicate that you are not using these characters as wildcards (e.g., "\*", "\?", or "\\")</li>
-</ul>
-
-<h2>File name patterns</h2>
-<p>In this field, enter all the file name patterns for the files to find or search
-through for the specified expression.<br>
-</p>
-
-<h3>Wildcards</h3>
-<p>The available wildcards for file name patterns are displayed in the search dialog:</p>
-<ul>
-	<li>"*" matches any set of characters, including the empty string</li>
-	<li>"?" matches for any character</li>
-	<li>"!" excludes the given file name pattern, e.g. "!*.html or !plugin.xml</li>
-</ul>
-
-<h2>Case sensitive</h2>
-<p>Turn this option on if you want the text search to be case sensitive.</p>
-
-<h2>Regular expression</h2>
-<p>Turn this option on to specify that the search text is a regular expression.</p>
-
-<h2>Whole word</h2>
-<p>Turn this option on if you want to search for whole words that are identical to the search text.</p>
-
-<h2>Scope</h2>
-<p>Choose the scope of your search. You can either search the whole workspace,
-pre-defined working sets, previously selected resources or projects enclosing
-the selected resources.</p>
-
-<h1>Quick Text Search</h1>
-
-<p>As an alternative to the Search Dialog and Search View, you can also use the <a href="../gettingStarted/qs-36c.htm">Quick Text Search Dialog</a> to search for
-textual matches in the workspace and quickly jump to them. It is described in detail <a href="../gettingStarted/qs-36c.htm">here</a>.
-</p>
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/csearchview.htm">Search view</a><br>
-<a href="../gettingStarted/qs-36c.htm">Quick Text Search Dialog</a><br>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-84b.htm">Searching for files</a><br>
-<a href="../tasks/tasks-84.htm">Searching for text within a file</a>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-26.htm">Search view</a>
-
+  <h1>File search</h1>
+  <p>In the Search Dialog, the File Search tab allows you to search for files or text in the Workbench. You can bring
+  up the Search Dialog by clicking on the Search toolbar button.</p>
+  <h2>Containing text</h2>
+  <p>Type the expression for which you wish to do the text search. Leave this field empty to search for files.</p>
+  <p>From the drop-down menu, you can choose to repeat or modify a recent search.</p>
+  <h3>Wildcards</h3>
+  <p>The available wildcards for search expressions are displayed in the search dialog:</p>
+  <ul>
+    <li>"*" matches any set of characters, including the empty string</li>
+    <li>"?" matches for any character</li>
+    <li>"\" is the escape for a literal; if you want to search for an asterisk, question mark, or backslash character,
+    type a backslash before it to indicate that you are not using these characters as wildcards (e.g., "\*", "\?", or
+    "\\")</li>
+  </ul>
+  <h2>File name patterns</h2>
+  <p>In this field, enter all the file name patterns for the files to find or search through for the specified
+  expression.<br></p>
+  <h3>Wildcards</h3>
+  <p>The available wildcards for file name patterns are displayed in the search dialog:</p>
+  <ul>
+    <li>"*" matches any set of characters, including the empty string</li>
+    <li>"?" matches for any character</li>
+    <li>"!" excludes the given file name pattern, e.g. "!*.html or !plugin.xml</li>
+  </ul>
+  <h2>Case sensitive</h2>
+  <p>Turn this option on if you want the text search to be case sensitive.</p>
+  <h2>Regular expression</h2>
+  <p>Turn this option on to specify that the search text is a regular expression.</p>
+  <h2>Whole word</h2>
+  <p>Turn this option on if you want to search for whole words that are identical to the search text.</p>
+  <h2>Scope</h2>
+  <p>Choose the scope of your search. You can either search the whole workspace, pre-defined working sets, previously
+  selected resources or projects enclosing the selected resources.</p>
+  <h1>Quick Text Search</h1>
+  <p>As an alternative to the Search Dialog and Search View, you can also use the <a href=
+  "../gettingStarted/qs-36c.htm">Quick Text Search Dialog</a> to search for textual matches in the workspace and
+  quickly jump to them. It is described in detail <a href="../gettingStarted/qs-36c.htm">here</a>.</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/csearchview.htm">Search view</a><br>
+  <a href="../gettingStarted/qs-36c.htm">Quick Text Search Dialog</a><br>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-84b.htm">Searching for files</a><br>
+  <a href="../tasks/tasks-84.htm">Searching for text within a file</a>
+  <h3 class="related">Related reference</h3><a href="ref-26.htm">Search view</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-47.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-47.htm
index 419513d..755d997 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-47.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-47.htm
@@ -1,26 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>CVS</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head"> CVS </H1>
-<DIV CLASS="Topic"> 
-  <P CLASS="Para"> The Workbench is shipped with a built in client for the Concurrent 
-    Versions System (CVS). With this client you can access CVS repositories.</P>
-  <P CLASS="Para"> You can find more information on CVS at <a href="https://directory.fsf.org/wiki/CVS" target="_blank">https://directory.fsf.org/wiki/CVS</a>.</P>
-  <P CLASS="Para">You can also visit the <a href="http://wiki.eclipse.org/index.php/CVS_FAQ" target="_blank">Eclipse 
-    CVS FAQ</a>.</P>
-</DIV>
-
-
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>CVS</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS</h1>
+  <div class="Topic">
+    <p class="Para">The Workbench is shipped with a built in client for the Concurrent Versions System (CVS). With this
+    client you can access CVS repositories.</p>
+    <p class="Para">You can find more information on CVS at <a href="https://directory.fsf.org/wiki/CVS" target=
+    "_blank">https://directory.fsf.org/wiki/CVS</a>.</p>
+    <p class="Para">You can also visit the <a href="http://wiki.eclipse.org/index.php/CVS_FAQ" target="_blank">Eclipse
+    CVS FAQ</a>.</p>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-48a.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-48a.htm
index a44d347..9acee32 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-48a.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-48a.htm
@@ -1,74 +1,57 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Ignoring resources from version control</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head"> Ignoring resources from version control</H1>
-<P>When synchronizing resources, it is possible that there 
-  are some resources that you do not want to commit to the repository. There 
-  are two ignore facilities provided, allowing you to specify what resources 
-  should be excluded from update and commit operations.</P>
-<P>The first is a global ignore facility, provided by the
-Workbench. The second is the CVS ignore facility, which reads the contents of a
-special file .<i>cvsignore</i> to determine what to ignore.</P>
-<h2>Why ignore files when synchronizing?</h2>
-<P>There are many files that a user may not want to commit to the repository. 
-For example, external editors may create temporary files in your project. Compilation of .java files creates .class files, and
-likewise many build operations result in binary files. These files, when taken together, may
-be quite large. In addition, they may be re-generated whenever a build is performed,
-resulting in many outgoing changes.  Typically these are not files that one wants to share with other members of a team or persist in the repository.</P>
-<DIV CLASS="Subtopic">
-<h2>
-Global ignore facility</h2>
-<p CLASS="Head">A global ignore facility is provided by the Workbench via the
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.ui.TeamPreferences)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Team</strong></a> preference page.
-There is a list of file patterns against which resources will be matched before they are
-considered as version control candidates. 
-These patterns may contain the wildcard characters "*" and "?". "*"
-represents any sequence of zero or more characters. "?" represents any one
-character. For example, you can specify a pattern of "*~", which would match
-any temporary files that end with "~". Any file or directory that matches any one of the
-patterns will be ignored during update or commit operations. When
-you specify a file pattern to ignore, you can temporarily disable ignoring the
-file pattern by deselecting it from the list; you do not have to remove the
-specified file pattern from the list.<br>
-<br>
-The patterns in the global ignore facility are matched against resource names during a
-synchronize operation. It is important to note that the path leading up to the resource name is not
-included in the matching. For example, for the file &quot;/path/to/file.txt&quot;, only the string
-&quot;file.txt&quot; is matched against the patterns. This facility is not intended for specifying fully-qualified
-path names but for specifying globally-applicable patterns.<br>
-</p>
-<h2>CVS ignore facility</h2>
-  <p CLASS="Head">The Eclipse CVS client recognizes a file named &quot;.cvsignore&quot; 
-    in each directory of a project. This is a standard CVS facility and 
-    many existing CVS projects may contain this file.<br>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2015. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Ignoring resources from version control</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Ignoring resources from version control</h1>
+  <p>When synchronizing resources, it is possible that there are some resources that you do not want to commit to the
+  repository. There are two ignore facilities provided, allowing you to specify what resources should be excluded from
+  update and commit operations.</p>
+  <p>The first is a global ignore facility, provided by the Workbench. The second is the CVS ignore facility, which
+  reads the contents of a special file .<i>cvsignore</i> to determine what to ignore.</p>
+  <h2>Why ignore files when synchronizing?</h2>
+  <p>There are many files that a user may not want to commit to the repository. For example, external editors may
+  create temporary files in your project. Compilation of .java files creates .class files, and likewise many build
+  operations result in binary files. These files, when taken together, may be quite large. In addition, they may be
+  re-generated whenever a build is performed, resulting in many outgoing changes. Typically these are not files that
+  one wants to share with other members of a team or persist in the repository.</p>
+  <div class="Subtopic">
+    <h2>Global ignore facility</h2>
+    <p class="Head">A global ignore facility is provided by the Workbench via the <a class="command-link" href=
+    'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.ui.TeamPreferences)")'>
+    <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Team</strong></a> preference
+    page. There is a list of file patterns against which resources will be matched before they are considered as
+    version control candidates. These patterns may contain the wildcard characters "*" and "?". "*" represents any
+    sequence of zero or more characters. "?" represents any one character. For example, you can specify a pattern of
+    "*~", which would match any temporary files that end with "~". Any file or directory that matches any one of the
+    patterns will be ignored during update or commit operations. When you specify a file pattern to ignore, you can
+    temporarily disable ignoring the file pattern by deselecting it from the list; you do not have to remove the
+    specified file pattern from the list.<br>
     <br>
-    This text file consists of a list of files, directories, or patterns. 
-    In a similar way to the global ignore facility, the wildcards "*" and "?" 
-    may be present in any entry in the .cvsignore file. Any file or sub-directory 
-    <b> in the current directory</b> that matches any one of the patterns will 
-    be ignored. It is important to note that the semantics of this file 
-    differs from that of the global ignore facility in that it applies only to 
-    files and directories in the same directory as the .cvsignore file itself. 
-    A project may contain one .cvsignore file in each directory. For more 
-    information, please visit <a href="https://directory.fsf.org/wiki/CVS" target="_blank">https://directory.fsf.org/wiki/CVS</a>.</p>
-  <p CLASS="Head">Resources that have not been added to CVS control can be ignored 
-    by selecting <b>Team &gt; Add to .cvsignore</b> from the pop-up menu of the 
-    resource in one of the navigation views. This menu option is also available 
-    in the Synchronize view.</p>
-</DIV>
-
-
-</BODY>
-</HTML>
+    The patterns in the global ignore facility are matched against resource names during a synchronize operation. It is
+    important to note that the path leading up to the resource name is not included in the matching. For example, for
+    the file "/path/to/file.txt", only the string "file.txt" is matched against the patterns. This facility is not
+    intended for specifying fully-qualified path names but for specifying globally-applicable patterns.<br></p>
+    <h2>CVS ignore facility</h2>
+    <p class="Head">The Eclipse CVS client recognizes a file named ".cvsignore" in each directory of a project. This is
+    a standard CVS facility and many existing CVS projects may contain this file.<br>
+    <br>
+    This text file consists of a list of files, directories, or patterns. In a similar way to the global ignore
+    facility, the wildcards "*" and "?" may be present in any entry in the .cvsignore file. Any file or sub-directory
+    <b>in the current directory</b> that matches any one of the patterns will be ignored. It is important to note that
+    the semantics of this file differs from that of the global ignore facility in that it applies only to files and
+    directories in the same directory as the .cvsignore file itself. A project may contain one .cvsignore file in each
+    directory. For more information, please visit <a href="https://directory.fsf.org/wiki/CVS" target=
+    "_blank">https://directory.fsf.org/wiki/CVS</a>.</p>
+    <p class="Head">Resources that have not been added to CVS control can be ignored by selecting <b>Team &gt; Add to
+    .cvsignore</b> from the pop-up menu of the resource in one of the navigation views. This menu option is also
+    available in the Synchronize view.</p>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-5.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-5.htm
index b900cf7..02b3b20 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-5.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-5.htm
@@ -1,61 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Builds</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-
-<h1 class="Head">Builds</h1>
-<p class="Para">Builders create or modify workspace resources,
-usually based on the existence and state of other resources. They are a powerful
-mechanism for enforcing the constraints of some domain. For example, a Java
-builder converts Java source files (.java files) into executable class files
-(.class files), a web link builder updates links to files whose name/location
-have changed, etc. As resources are created and modified, builders are run
-and the constraints are maintained. This transform need not be one to one. For
-example, a single .java file can produce several .class files.</p>
-<h2>Auto-build vs. Manual Build</h2>
-<p class="Intro">There are two distinct user work modes with respect to
-building: relying on Auto-build, or user initiated manual building.</p>
-<p class="Intro">If you don't need fine-grained control over when builds occur,
-you can turn on auto-building. With auto-building on,
-builds occur after every set of resource changes (e.g., saving a file, importing
-a ZIP, ...). Auto-building is efficient because the amount of work done is
-proportional to the amount of change done. The benefit of auto-building is
-that your derived resources (e.g., Java .class files) are always up to date.
-Auto-building is turned on/off via the <b>Build automatically</b> option on the
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workspace)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>General &gt; Workspace</b></a> preference page.</p>
-<p class="Intro">If you need more control over when builds occur, you can turn off
-auto-building and invoke builds manually. This is sometimes desirable in
-cases where, for example, you know building is of no value until you finish a
-large set of changes. In this case there is no benefit to paying the cost of
-auto-building. Builds can be invoked manually in numerous ways, for example, by
-right-clicking the project and selecting <b>Build Project</b>.</p>
-<p class="Intro">The disadvantage of manual building is that the problems that
-were generated to indicate build errors quickly become out of date until you
-build. In addition, it is very important that you remember to manually build
-before relying on build output (e.g. before running your Java program).</p>
-<h2>Building and Cleaning</h2>
-<p class="Intro">Builds work incrementally based on a previous built state. They
-will apply the transforms of the configured builders only on the resources that have 
-changed since that previous state was computed (i.e., since the last build).
-Auto-building always uses incremental building for efficiency.</p>
-<p class="Intro">A clean build (<b>Project &gt; Clean</b>) discards any existing
-built state.  The next build after a clean will transform all resources according the 
-domain rules of the configured builders.</p>
-<p class="Intro">Depending on your needs, build and clean can
-be done over a specific set of projects or the workspace as a whole. Specific
-files and folders cannot be built separately.</p>
-
-</BODY>
-</HTML>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Builds</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Builds</h1>
+  <p class="Para">Builders create or modify workspace resources, usually based on the existence and state of other
+  resources. They are a powerful mechanism for enforcing the constraints of some domain. For example, a Java builder
+  converts Java source files (.java files) into executable class files (.class files), a web link builder updates links
+  to files whose name/location have changed, etc. As resources are created and modified, builders are run and the
+  constraints are maintained. This transform need not be one to one. For example, a single .java file can produce
+  several .class files.</p>
+  <h2>Auto-build vs. Manual Build</h2>
+  <p class="Intro">There are two distinct user work modes with respect to building: relying on Auto-build, or user
+  initiated manual building.</p>
+  <p class="Intro">If you don't need fine-grained control over when builds occur, you can turn on auto-building. With
+  auto-building on, builds occur after every set of resource changes (e.g., saving a file, importing a ZIP, ...).
+  Auto-building is efficient because the amount of work done is proportional to the amount of change done. The benefit
+  of auto-building is that your derived resources (e.g., Java .class files) are always up to date. Auto-building is
+  turned on/off via the <b>Build automatically</b> option on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workspace)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General &gt; Workspace</b></a>
+  preference page.</p>
+  <p class="Intro">If you need more control over when builds occur, you can turn off auto-building and invoke builds
+  manually. This is sometimes desirable in cases where, for example, you know building is of no value until you finish
+  a large set of changes. In this case there is no benefit to paying the cost of auto-building. Builds can be invoked
+  manually in numerous ways, for example, by right-clicking the project and selecting <b>Build Project</b>.</p>
+  <p class="Intro">The disadvantage of manual building is that the problems that were generated to indicate build
+  errors quickly become out of date until you build. In addition, it is very important that you remember to manually
+  build before relying on build output (e.g. before running your Java program).</p>
+  <h2>Building and Cleaning</h2>
+  <p class="Intro">Builds work incrementally based on a previous built state. They will apply the transforms of the
+  configured builders only on the resources that have changed since that previous state was computed (i.e., since the
+  last build). Auto-building always uses incremental building for efficiency.</p>
+  <p class="Intro">A clean build (<b>Project &gt; Clean</b>) discards any existing built state. The next build after a
+  clean will transform all resources according the domain rules of the configured builders.</p>
+  <p class="Intro">Depending on your needs, build and clean can be done over a specific set of projects or the
+  workspace as a whole. Specific files and folders cannot be built separately.</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-56.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-56.htm
index d80befa..c2ed58e 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-56.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-56.htm
@@ -1,120 +1,71 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>File menu</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-
-<h1>File menu</h1>
-   
-<p>The <b>File</b> menu enables you to create, save, close, print, import, and export Workbench resources and to exit the Workbench.
-</p>
-
-<dl>
-
-<dt><b>New</b> (Shift+Alt+N)</dt>
-<dd>Enables you to create new resources.
-Before you can create a new file, you must create a project in which to store the file.
-</dd>
-
-<dt><b>Open File</b></dt>
-<dd>Enables you to open a file for editing - including files that do not reside in the Workspace.
-</dd>
-
-<dt><b>Close</b> (Ctrl+W)</dt>
-<dd>Closes the active editor.
-You are prompted to save changes before the file closes.
-</dd>
-
-<dt><b>Close All</b> (Shift+Ctrl+W)</dt>
-<dd>Closes all open editors.
-You are prompted to save changes before the files close.
-</dd>
-
-<dt><img src="../images/save_edit.svg" alt="Save edit image"> <b>Save</b> (Ctrl+S)</dt>
-<dd>Saves the contents of the active editor.
-</dd>
-
-<dt><img src="../images/saveas_edit.svg" alt="Save as image"> <b>Save As</b></dt>
-<dd>Enables you to save the contents of the
-active editor under another file name or location.
-</dd>
-
-<dt><img src="../images/saveall_edit.svg" alt="Save all image"> <b>Save All</b> (Shift+Ctrl+S)</dt>
-<dd>Saves the contents of all open editors.
-</dd>
-
-<dt><b>Revert</b></dt>
-<dd>Replaces the contents of the active editor with the previously saved contents.
-</dd>
-
-<dt><b>Move</b></dt>
-<dd>Enables you to move the currently selected resources to a different project
-or to create a Java package with those resources.
-</dd>
-
-<dt><b>Rename</b> (F2)</dt>
-<dd>Enables you to change the name of the currently selected resource.
-</dd>
-
-<dt><b>Refresh</b> (F5)</dt>
-<dd>Refreshes the resource with the contents in the file system.
-</dd>
-
-<dt><b>Convert Line Delimiters To</b></dt>
-<dd>Alters the line delimiters for the selected files.
-Changes are immediate and persist until you change the delimiter 
-again - you do not need to save the file.
-</dd>
-
-<dt><img src="../images/print_edit.svg" alt="Print editor image"> <b>Print</b> (Ctrl+P)</dt>
-<dd>Prints the contents of the active editor.
-</dd>
-
-<dt><b>Switch Workspace</b></dt>
-<dd>Opens the <b>Workspace Launcher</b>, from which you can
-switch to a different workspace. This restarts the Workbench.
-</dd>
-
-<dt><img src="../images/import_wiz.svg" alt="Import wizard image"> <b>Import</b></dt>
-<dd>Launches the <b>Import</b> wizard, which enables you to add resources to the Workbench.
-</dd>
-
-<dt><img src="../images/export_wiz.svg" alt="Export wizard image"> <b>Export</b></dt>
-<dd>Launches the <b>Export</b> wizard, which enables you to export resources from the Workbench.
-</dd>
-
-<dt><b>Properties</b> (Alt+Enter)</dt>
-<dd>Opens the <b>Properties</b> dialog for the currently selected resource.
-You can learn:
-<ul>
-<li>The path to the resource in your file system</li>
-<li>The date of the last modification</li>
-<li>Whether a file is writable or executable, and what its encoding is</li>
-<li>Whether a project's resources inherit their encoding and line delimiters
-or whether they are set to a particular value.</li>
-</ul> 
-</dd>
-
-<dt><b>Recent file list</b></dt>
-<dd>Contains a list of the most recently accessed files in the Workbench. 
-You can open any of these files from the <b>File</b> menu by simply clicking the file name.
-You can control the number of files in this list from the 
-<a href="ref-12.htm">Editors preference page</a>.
-</dd>
-
-<dt><b>Exit</b></dt>
-<dd>Closes and exits the Workbench.
-</dd>
-
-</dl>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>File menu</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1>File menu</h1>
+  <p>The <b>File</b> menu enables you to create, save, close, print, import, and export Workbench resources and to exit
+  the Workbench.</p>
+  <dl>
+    <dt><b>New</b> (Shift+Alt+N)</dt>
+    <dd>Enables you to create new resources. Before you can create a new file, you must create a project in which to
+    store the file.</dd>
+    <dt><b>Open File</b></dt>
+    <dd>Enables you to open a file for editing - including files that do not reside in the Workspace.</dd>
+    <dt><b>Close</b> (Ctrl+W)</dt>
+    <dd>Closes the active editor. You are prompted to save changes before the file closes.</dd>
+    <dt><b>Close All</b> (Shift+Ctrl+W)</dt>
+    <dd>Closes all open editors. You are prompted to save changes before the files close.</dd>
+    <dt><img src="../images/save_edit.svg" alt="Save edit image"> <b>Save</b> (Ctrl+S)</dt>
+    <dd>Saves the contents of the active editor.</dd>
+    <dt><img src="../images/saveas_edit.svg" alt="Save as image"> <b>Save As</b></dt>
+    <dd>Enables you to save the contents of the active editor under another file name or location.</dd>
+    <dt><img src="../images/saveall_edit.svg" alt="Save all image"> <b>Save All</b> (Shift+Ctrl+S)</dt>
+    <dd>Saves the contents of all open editors.</dd>
+    <dt><b>Revert</b></dt>
+    <dd>Replaces the contents of the active editor with the previously saved contents.</dd>
+    <dt><b>Move</b></dt>
+    <dd>Enables you to move the currently selected resources to a different project or to create a Java package with
+    those resources.</dd>
+    <dt><b>Rename</b> (F2)</dt>
+    <dd>Enables you to change the name of the currently selected resource.</dd>
+    <dt><b>Refresh</b> (F5)</dt>
+    <dd>Refreshes the resource with the contents in the file system.</dd>
+    <dt><b>Convert Line Delimiters To</b></dt>
+    <dd>Alters the line delimiters for the selected files. Changes are immediate and persist until you change the
+    delimiter again - you do not need to save the file.</dd>
+    <dt><img src="../images/print_edit.svg" alt="Print editor image"> <b>Print</b> (Ctrl+P)</dt>
+    <dd>Prints the contents of the active editor.</dd>
+    <dt><b>Switch Workspace</b></dt>
+    <dd>Opens the <b>Workspace Launcher</b>, from which you can switch to a different workspace. This restarts the
+    Workbench.</dd>
+    <dt><img src="../images/import_wiz.svg" alt="Import wizard image"> <b>Import</b></dt>
+    <dd>Launches the <b>Import</b> wizard, which enables you to add resources to the Workbench.</dd>
+    <dt><img src="../images/export_wiz.svg" alt="Export wizard image"> <b>Export</b></dt>
+    <dd>Launches the <b>Export</b> wizard, which enables you to export resources from the Workbench.</dd>
+    <dt><b>Properties</b> (Alt+Enter)</dt>
+    <dd>
+      Opens the <b>Properties</b> dialog for the currently selected resource. You can learn:
+      <ul>
+        <li>The path to the resource in your file system</li>
+        <li>The date of the last modification</li>
+        <li>Whether a file is writable or executable, and what its encoding is</li>
+        <li>Whether a project's resources inherit their encoding and line delimiters or whether they are set to a
+        particular value.</li>
+      </ul>
+    </dd>
+    <dt><b>Recent file list</b></dt>
+    <dd>Contains a list of the most recently accessed files in the Workbench. You can open any of these files from the
+    <b>File</b> menu by simply clicking the file name. You can control the number of files in this list from the
+    <a href="ref-12.htm">Editors preference page</a>.</dd>
+    <dt><b>Exit</b></dt>
+    <dd>Closes and exits the Workbench.</dd>
+  </dl>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-57.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-57.htm
index b0ec663..76761ef 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-57.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-57.htm
@@ -1,119 +1,107 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Edit menu</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-
-<h1 class="Head">Edit menu</h1>
-<p class="Intro"><a name="pgfId-1010738"></a>This menu helps you manipulate
-resources in the editor area.</p>
-<div class="Topic">
-  <a name="elementId-1010741"></a><a name="pgfId-1010746"></a>
-  <h2>Undo</h2>
-  <p class="Para"><a name="pgfId-1010752"></a>This command reverses your most
-  recent editing action.</p>
-</div>
-<div class="Topic">
-  <a name="elementId-1007106"></a><a name="pgfId-1010758"></a>
-  <h2>Redo</h2>
-  <p class="Para"><a name="pgfId-1007117"></a>This command re-applies the editing
-  action that has most recently been reversed by the Undo action.</p>
-</div>
-<div class="Topic">
-  <a name="elementId-1007120"></a><a name="pgfId-1007125"></a>
-  <h2>Cut</h2>
-  <p class="Para"><a name="pgfId-1007131"></a>This command removes the selection
-  and places it on the clipboard.</p>
-</div>
-<div class="Topic">
-  <a name="elementId-1007134"></a><a name="pgfId-1007139"></a>
-  <h2>Copy</h2>
-  <p class="Para"><a name="pgfId-1007145"></a>This command places a copy of the
-  selection on the clipboard.</p>
-</div>
-<div class="Topic">
-  <a name="elementId-1007148"></a><a name="pgfId-1007153"></a>
-  <h2>Paste</h2>
-  <p class="Para"><a name="pgfId-1007159"></a>This command places the text or
-  object on the clipboard at the current cursor location in the currently active
-  view or editor.</p>
-</div>
-<div class="Topic">
-  <a name="elementId-1007162"></a><a name="pgfId-1007167"></a>
-  <h2>Delete</h2>
-  <p class="Para"><a name="pgfId-1007173"></a>This command removes the current
-  selection.</p>
-</div>
-<div class="Topic">
-  <a name="elementId-1007176"></a><a name="pgfId-1007181"></a>
-  <h2>Select All</h2>
-  <p class="Para"><a name="pgfId-1007187"></a>This command selects all text or
-  objects in the currently active view or editor.</p>
-</div>
-<div class="Topic">
-  <a name="elementId-1007190"></a><a name="pgfId-1007195"></a>
-  <h2>Find/Replace</h2>
-  <p class="Para"><a name="pgfId-1007201"></a>This command allows you to search
-  for an expression in the active editor, and optionally replace the expression with a new expression.</p>
-</div>
-<DIV CLASS="Topic">
-<h2>Find Next</h2>
-<P CLASS="Para">
-This command allows you to search for the next occurrence of the current selection, or
-for the next occurrence of the most recent expression found using the Find/Replace action.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>Find Previous</h2>
-<P CLASS="Para">
-This command allows you to search for the previous occurrence of the current selection, or
-for the previous occurrence of the most recent expression found using the Find/Replace action.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>Incremental Find Next</h2>
-<P CLASS="Para">
-This command allows you to search for expressions in the active editor.  As you type the search
-expression, it will incrementally jump to the next exact match in the active editor.  While in this
-mode, the up and down cursor keys can be used to navigate between matches, and the search
-can be cancelled by pressing left or right cursor keys, the enter key, or the escape key.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>Incremental Find Previous</h2>
-<P CLASS="Para">
-This command allows you to search for expressions in the active editor.  As you type the search
-expression, it will incrementally jump to the previous exact match in the active editor.  While in this
-mode, the up and down cursor keys can be used to navigate between matches, and the search
-can be cancelled by pressing left or right cursor keys, the enter key, or the escape key.</P>
-</DIV>
-<div class="Topic">
-  <a name="elementId-1007218"></a><a name="pgfId-1007223"></a>
-  <h2>Add Bookmark</h2>
-  <p class="Para"><a name="pgfId-1007230"></a>This command adds a bookmark in
-  the active file on the line where the cursor is currently displayed.</p>
-</div>
-<DIV CLASS="Topic">
-<h2>Add Task</h2>
-<P CLASS="Para">
-This command adds a task in the active file on the line where the cursor is currently displayed.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>Word Completion</h2>
-<P CLASS="Para">
-This action will attempt to complete the word currently being entered in the active editor.
-</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>Set Encoding</h2>
-<P CLASS="Para">
-This action launches a dialog that allows you to change the file encoding used to read and write the file in the active editor.</P>
-</DIV>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Edit menu</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Edit menu</h1>
+  <p class="Intro"><a name="pgfId-1010738" id="pgfId-1010738"></a>This menu helps you manipulate resources in the
+  editor area.</p>
+  <div class="Topic">
+    <a name="elementId-1010741" id="elementId-1010741"></a><a name="pgfId-1010746" id="pgfId-1010746"></a>
+    <h2>Undo</h2>
+    <p class="Para"><a name="pgfId-1010752" id="pgfId-1010752"></a>This command reverses your most recent editing
+    action.</p>
+  </div>
+  <div class="Topic">
+    <a name="elementId-1007106" id="elementId-1007106"></a><a name="pgfId-1010758" id="pgfId-1010758"></a>
+    <h2>Redo</h2>
+    <p class="Para"><a name="pgfId-1007117" id="pgfId-1007117"></a>This command re-applies the editing action that has
+    most recently been reversed by the Undo action.</p>
+  </div>
+  <div class="Topic">
+    <a name="elementId-1007120" id="elementId-1007120"></a><a name="pgfId-1007125" id="pgfId-1007125"></a>
+    <h2>Cut</h2>
+    <p class="Para"><a name="pgfId-1007131" id="pgfId-1007131"></a>This command removes the selection and places it on
+    the clipboard.</p>
+  </div>
+  <div class="Topic">
+    <a name="elementId-1007134" id="elementId-1007134"></a><a name="pgfId-1007139" id="pgfId-1007139"></a>
+    <h2>Copy</h2>
+    <p class="Para"><a name="pgfId-1007145" id="pgfId-1007145"></a>This command places a copy of the selection on the
+    clipboard.</p>
+  </div>
+  <div class="Topic">
+    <a name="elementId-1007148" id="elementId-1007148"></a><a name="pgfId-1007153" id="pgfId-1007153"></a>
+    <h2>Paste</h2>
+    <p class="Para"><a name="pgfId-1007159" id="pgfId-1007159"></a>This command places the text or object on the
+    clipboard at the current cursor location in the currently active view or editor.</p>
+  </div>
+  <div class="Topic">
+    <a name="elementId-1007162" id="elementId-1007162"></a><a name="pgfId-1007167" id="pgfId-1007167"></a>
+    <h2>Delete</h2>
+    <p class="Para"><a name="pgfId-1007173" id="pgfId-1007173"></a>This command removes the current selection.</p>
+  </div>
+  <div class="Topic">
+    <a name="elementId-1007176" id="elementId-1007176"></a><a name="pgfId-1007181" id="pgfId-1007181"></a>
+    <h2>Select All</h2>
+    <p class="Para"><a name="pgfId-1007187" id="pgfId-1007187"></a>This command selects all text or objects in the
+    currently active view or editor.</p>
+  </div>
+  <div class="Topic">
+    <a name="elementId-1007190" id="elementId-1007190"></a><a name="pgfId-1007195" id="pgfId-1007195"></a>
+    <h2>Find/Replace</h2>
+    <p class="Para"><a name="pgfId-1007201" id="pgfId-1007201"></a>This command allows you to search for an expression
+    in the active editor, and optionally replace the expression with a new expression.</p>
+  </div>
+  <div class="Topic">
+    <h2>Find Next</h2>
+    <p class="Para">This command allows you to search for the next occurrence of the current selection, or for the next
+    occurrence of the most recent expression found using the Find/Replace action.</p>
+  </div>
+  <div class="Topic">
+    <h2>Find Previous</h2>
+    <p class="Para">This command allows you to search for the previous occurrence of the current selection, or for the
+    previous occurrence of the most recent expression found using the Find/Replace action.</p>
+  </div>
+  <div class="Topic">
+    <h2>Incremental Find Next</h2>
+    <p class="Para">This command allows you to search for expressions in the active editor. As you type the search
+    expression, it will incrementally jump to the next exact match in the active editor. While in this mode, the up and
+    down cursor keys can be used to navigate between matches, and the search can be cancelled by pressing left or right
+    cursor keys, the enter key, or the escape key.</p>
+  </div>
+  <div class="Topic">
+    <h2>Incremental Find Previous</h2>
+    <p class="Para">This command allows you to search for expressions in the active editor. As you type the search
+    expression, it will incrementally jump to the previous exact match in the active editor. While in this mode, the up
+    and down cursor keys can be used to navigate between matches, and the search can be cancelled by pressing left or
+    right cursor keys, the enter key, or the escape key.</p>
+  </div>
+  <div class="Topic">
+    <a name="elementId-1007218" id="elementId-1007218"></a><a name="pgfId-1007223" id="pgfId-1007223"></a>
+    <h2>Add Bookmark</h2>
+    <p class="Para"><a name="pgfId-1007230" id="pgfId-1007230"></a>This command adds a bookmark in the active file on
+    the line where the cursor is currently displayed.</p>
+  </div>
+  <div class="Topic">
+    <h2>Add Task</h2>
+    <p class="Para">This command adds a task in the active file on the line where the cursor is currently
+    displayed.</p>
+  </div>
+  <div class="Topic">
+    <h2>Word Completion</h2>
+    <p class="Para">This action will attempt to complete the word currently being entered in the active editor.</p>
+  </div>
+  <div class="Topic">
+    <h2>Set Encoding</h2>
+    <p class="Para">This action launches a dialog that allows you to change the file encoding used to read and write
+    the file in the active editor.</p>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-58.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-58.htm
index a328869..749ab2c 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-58.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-58.htm
@@ -1,109 +1,83 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Navigate menu</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<h1>
-Navigate menu
-</h1>
-<P CLASS="Intro">
-This menu allows you to locate and navigate through resources and other artifacts displayed in the Workbench.</p>
-<DIV CLASS="Topic">
-<h2>
-Go Into</h2>
-<P CLASS="Para">
-This command refocuses the active view so that the current selection is at the root.  This allows web 
-browser style navigation within hierarchies of artifacts.
-</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2 CLASS="Head">
-Go To</H2>
-
-<UL CLASS="UnorderedList">
-<LI CLASS="Item">
-<b>Back</b>: This command displays the hierarchy that was displayed immediately prior to the current display. For example, if
-you Go Into a resource, then the Back command in the resulting display returns the view to the same hierarchy from which you activated the Go Into command. This command is similar to the Back button in an HTML browser.</LI>
-<LI CLASS="Item">
-<b>Forward</b>: This command displays the hierarchy that was displayed immediately after the current display. For example, if you've just selected the Back command, then selecting the Forward command in the resulting display returns the view to the same hierarchy from which you activated the Back command. This command is similar to the Forward button in an HTML browser.</LI>
-<LI CLASS="Item">
-<b>Up one level</b>: This command displays the hierarchy of the parent of the current highest-level resource.</LI>
-  <LI CLASS="Item"><B>Resource</B>: This command allows you to navigate quickly to a resource. For more information
-  see the links to related tasks below.</LI>
-</UL>
-</DIV>
-<DIV CLASS="Topic">
-<H2>Open Hyperlink</H2>
-<P>This command opens one or more hyperlinks at the current caret location. If there's only one link available it directly opens the hyperlink,
- else brings up the chooser showing all the available hyperlinks at that location.</P>
-</DIV>
-<DIV CLASS="Topic">
-<H2>Open Resource</H2>
-<P>This command displays a dialog that lets you select any resource in the
-workspace to open it in an editor. For more information see the links
-to related tasks below.</P>
-</DIV>
-<DIV CLASS="Topic">
-<H2>Show In</H2>
-<P>This sub-menu is used to find and select the currently selected resource in another view.
-If an editor is active, these commands are used to select the resource currently being edited
-in another view.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Next</h2>
-<P CLASS="Para">
-This command navigates to the next item in a list or table in the active view.  For example, when the search results view
-is active, this navigates to the next search result.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Previous</h2>
-<P CLASS="Para">
-This command navigates to the previous item in a list or table in the active view.  For example, when the search results view
-is active, this navigates to the previous search result.</P>
-</DIV>
-
-<DIV CLASS="Topic">
-<h2>Last Edit Position</h2>
-<P CLASS="Para">
-This command allows you to jump the last edit position.</P>
-</DIV>
-
-<DIV CLASS="Topic">
-<h2>Go to Line</h2>
-<P CLASS="Para">
-This command allows you to jump to a specific line in the active editor.</P>
-</DIV>
-
-<DIV CLASS="Topic">
-<h2>
-Back</h2>
-<P CLASS="Para">
-This command navigates to the previous resource that was viewed in an editor.
-Analogous to the <b>Back</b> button on a web browser.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Forward</h2>
-<P CLASS="Para">
-This command navigates to undo the effect of the previous
-<b>Back</b> command.  Analogous to the <b>Forward</b> button on a web browser.</P>
-</DIV>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-46ag.htm">Finding a resource quickly</a>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-dialog-open-resource.htm">Open Resource dialog</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Navigate menu</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1>Navigate menu</h1>
+  <p class="Intro">This menu allows you to locate and navigate through resources and other artifacts displayed in the
+  Workbench.</p>
+  <div class="Topic">
+    <h2>Go Into</h2>
+    <p class="Para">This command refocuses the active view so that the current selection is at the root. This allows
+    web browser style navigation within hierarchies of artifacts.</p>
+  </div>
+  <div class="Topic">
+    <h2 class="Head">Go To</h2>
+    <ul class="UnorderedList">
+      <li class="Item"><b>Back</b>: This command displays the hierarchy that was displayed immediately prior to the
+      current display. For example, if you Go Into a resource, then the Back command in the resulting display returns
+      the view to the same hierarchy from which you activated the Go Into command. This command is similar to the Back
+      button in an HTML browser.</li>
+      <li class="Item"><b>Forward</b>: This command displays the hierarchy that was displayed immediately after the
+      current display. For example, if you've just selected the Back command, then selecting the Forward command in the
+      resulting display returns the view to the same hierarchy from which you activated the Back command. This command
+      is similar to the Forward button in an HTML browser.</li>
+      <li class="Item"><b>Up one level</b>: This command displays the hierarchy of the parent of the current
+      highest-level resource.</li>
+      <li class="Item"><b>Resource</b>: This command allows you to navigate quickly to a resource. For more information
+      see the links to related tasks below.</li>
+    </ul>
+  </div>
+  <div class="Topic">
+    <h2>Open Hyperlink</h2>
+    <p>This command opens one or more hyperlinks at the current caret location. If there's only one link available it
+    directly opens the hyperlink, else brings up the chooser showing all the available hyperlinks at that location.</p>
+  </div>
+  <div class="Topic">
+    <h2>Open Resource</h2>
+    <p>This command displays a dialog that lets you select any resource in the workspace to open it in an editor. For
+    more information see the links to related tasks below.</p>
+  </div>
+  <div class="Topic">
+    <h2>Show In</h2>
+    <p>This sub-menu is used to find and select the currently selected resource in another view. If an editor is
+    active, these commands are used to select the resource currently being edited in another view.</p>
+  </div>
+  <div class="Topic">
+    <h2>Next</h2>
+    <p class="Para">This command navigates to the next item in a list or table in the active view. For example, when
+    the search results view is active, this navigates to the next search result.</p>
+  </div>
+  <div class="Topic">
+    <h2>Previous</h2>
+    <p class="Para">This command navigates to the previous item in a list or table in the active view. For example,
+    when the search results view is active, this navigates to the previous search result.</p>
+  </div>
+  <div class="Topic">
+    <h2>Last Edit Position</h2>
+    <p class="Para">This command allows you to jump the last edit position.</p>
+  </div>
+  <div class="Topic">
+    <h2>Go to Line</h2>
+    <p class="Para">This command allows you to jump to a specific line in the active editor.</p>
+  </div>
+  <div class="Topic">
+    <h2>Back</h2>
+    <p class="Para">This command navigates to the previous resource that was viewed in an editor. Analogous to the
+    <b>Back</b> button on a web browser.</p>
+  </div>
+  <div class="Topic">
+    <h2>Forward</h2>
+    <p class="Para">This command navigates to undo the effect of the previous <b>Back</b> command. Analogous to the
+    <b>Forward</b> button on a web browser.</p>
+  </div>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-46ag.htm">Finding a resource quickly</a>
+  <h3 class="related">Related reference</h3><a href="ref-dialog-open-resource.htm">Open Resource dialog</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-59.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-59.htm
index 300bf34..dae1c42 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-59.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-59.htm
@@ -1,88 +1,63 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Project menu</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Project menu</H1>
-<P CLASS="Para">
-The Project menu allows you to perform actions (builds or compilations) on projects in the Workbench.</P>
-<DIV CLASS="Topic">
-<h2>
-Open Project</h2>
-<P CLASS="Para">
-This command opens the currently selected project or projects.  The selected projects must currently 
-be closed for this command to be available.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Close Project</h2>
-<P CLASS="Para">
-This command closes the currently selected project or projects.  The selected projects must be
-currently open for this command to be available.  Closing a project will remove all of that project's
-state from memory, but the contents on disk are left untouched.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Build All</h2>
-<P CLASS="Para">
-This command performs an incremental build on all projects in the Workbench. That is, it builds 
-(compiles) all resources in the Workbench that are affected by any resource changes since the 
-last incremental build.  This command is only available if auto-build is turned off.  Auto-build is turned
-off via the <strong>Build Automatically</strong> menu option or from the <b>General &gt; Workspace</b> preference page.
-</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Build Project</h2>
-<P CLASS="Para">
-This command performs an incremental build on the currently selected project. That is, it builds 
-(compiles) all resources in the project that are affected by any resource changes since the 
-last build.  This command is only available if auto-build is turned off.  Auto-build is turned
-off via the <strong>Build Automatically</strong> menu option or from the <b>General &gt; Workspace</b> preference page.
-</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Build Working Set</h2>
-<P CLASS="Para">
-This menu allows you to performs an incremental build on a working set. That is, it builds 
-(compiles) all resources in the working set that are affected by any resource changes since the 
-last build.  This command is only available if auto-build is turned off.  Auto-build is turned
-off via the <strong>Build Automatically</strong> menu option or from the <b>General &gt; Workspace</b> preference page.
-</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Clean</h2>
-<P CLASS="Para">
-This command discards all previous build results.  If autobuild is on, then this invokes a full build.
-</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Build Automatically</h2>
-<P CLASS="Para">
-This command allows you to toggle the auto build preference.  The auto-build preference is also located on the <b>General &gt; Workspace</b> preference page.
-</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Properties</h2>
-<P CLASS="Para">
-This command opens a dialog showing the properties of the selected project or of the project that contains the
-selected resource.</P>
-</DIV>
-
-
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Project menu</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Project menu</h1>
+  <p class="Para">The Project menu allows you to perform actions (builds or compilations) on projects in the
+  Workbench.</p>
+  <div class="Topic">
+    <h2>Open Project</h2>
+    <p class="Para">This command opens the currently selected project or projects. The selected projects must currently
+    be closed for this command to be available.</p>
+  </div>
+  <div class="Topic">
+    <h2>Close Project</h2>
+    <p class="Para">This command closes the currently selected project or projects. The selected projects must be
+    currently open for this command to be available. Closing a project will remove all of that project's state from
+    memory, but the contents on disk are left untouched.</p>
+  </div>
+  <div class="Topic">
+    <h2>Build All</h2>
+    <p class="Para">This command performs an incremental build on all projects in the Workbench. That is, it builds
+    (compiles) all resources in the Workbench that are affected by any resource changes since the last incremental
+    build. This command is only available if auto-build is turned off. Auto-build is turned off via the <strong>Build
+    Automatically</strong> menu option or from the <b>General &gt; Workspace</b> preference page.</p>
+  </div>
+  <div class="Topic">
+    <h2>Build Project</h2>
+    <p class="Para">This command performs an incremental build on the currently selected project. That is, it builds
+    (compiles) all resources in the project that are affected by any resource changes since the last build. This
+    command is only available if auto-build is turned off. Auto-build is turned off via the <strong>Build
+    Automatically</strong> menu option or from the <b>General &gt; Workspace</b> preference page.</p>
+  </div>
+  <div class="Topic">
+    <h2>Build Working Set</h2>
+    <p class="Para">This menu allows you to performs an incremental build on a working set. That is, it builds
+    (compiles) all resources in the working set that are affected by any resource changes since the last build. This
+    command is only available if auto-build is turned off. Auto-build is turned off via the <strong>Build
+    Automatically</strong> menu option or from the <b>General &gt; Workspace</b> preference page.</p>
+  </div>
+  <div class="Topic">
+    <h2>Clean</h2>
+    <p class="Para">This command discards all previous build results. If autobuild is on, then this invokes a full
+    build.</p>
+  </div>
+  <div class="Topic">
+    <h2>Build Automatically</h2>
+    <p class="Para">This command allows you to toggle the auto build preference. The auto-build preference is also
+    located on the <b>General &gt; Workspace</b> preference page.</p>
+  </div>
+  <div class="Topic">
+    <h2>Properties</h2>
+    <p class="Para">This command opens a dialog showing the properties of the selected project or of the project that
+    contains the selected resource.</p>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-6.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-6.htm
index 2a9aacf..58860e3 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-6.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-6.htm
@@ -1,40 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Perspectives</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Perspectives</H1>
-
-<P CLASS="Intro">
-A perspective defines the initial set and layout of views in the Workbench
-window. One or more perspectives can exist in a single Workbench window.</p>
-<p>Perspectives can be opened either in the same 
-(existing) Workbench window, hiding the current perspective, or in a new 
-Workbench window</p>
-<p>Perspectives define visible action sets, which you
-can change to customize a perspective. You can save a perspective that you
-build in this manner, making your own custom perspective that you can open again
-later.</p>
-<P CLASS="Para">
-The Workbench defines the <i>Resource</i> perspective by default. This 
-perspective shows views relevant to resource management.
-</P>
-
-<h3 class="related">Related reference</h3>
-    <a href="ref-60.htm">Window Menu</a>
-<br><a href="ref-24.htm">Editor Area</a>
-<br><a href="ref-27.htm">Project Explorer View</a>
-<br><a href="ref-30.htm">Outline View</a>
-<br><a href="ref-31.htm">Tasks View</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Perspectives</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Perspectives</h1>
+  <p class="Intro">A perspective defines the initial set and layout of views in the Workbench window. One or more
+  perspectives can exist in a single Workbench window.</p>
+  <p>Perspectives can be opened either in the same (existing) Workbench window, hiding the current perspective, or in a
+  new Workbench window</p>
+  <p>Perspectives define visible action sets, which you can change to customize a perspective. You can save a
+  perspective that you build in this manner, making your own custom perspective that you can open again later.</p>
+  <p class="Para">The Workbench defines the <i>Resource</i> perspective by default. This perspective shows views
+  relevant to resource management.</p>
+  <h3 class="related">Related reference</h3><a href="ref-60.htm">Window Menu</a><br>
+  <a href="ref-24.htm">Editor Area</a><br>
+  <a href="ref-27.htm">Project Explorer View</a><br>
+  <a href="ref-30.htm">Outline View</a><br>
+  <a href="ref-31.htm">Tasks View</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-60.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-60.htm
index cddb201..2176d7f 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-60.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-60.htm
@@ -1,169 +1,120 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2019. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Window menu</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Window menu</H1>
-<P CLASS="Intro">
-This menu allows you to display, hide, and otherwise manipulate the various views, perspectives, and actions in the Workbench.</p>
-
-<DIV CLASS="Topic">
-<h2>
-New Window</h2>
-<P CLASS="Para">
-This command opens a new Workbench window with the same perspective as the current perspective.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-New Editor</h2>
-<P CLASS="Para">
-This command opens an editor based on the currently active editor.  It will have the same editor type and input as the original.</P>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Open Perspective</h2>
-<P CLASS="Para">
-This command opens a new perspective in this Workbench window.
-This preference can be changed on the <a class="command-link" 
-href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Perspectives)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>General &gt; Perspectives</b></a>
-preference page. All of the perspectives that are open within the Workbench window are
-shown on the shortcut bar.</P>
-<P CLASS="Para">
-The perspectives you will likely want to open are
-listed first. This list is dependent on the current perspective. From the <b>Other...</b> submenu you can open any perspective.</P>
-<P CLASS="Para"><img src="../images/Image207_persp_sel.png" alt="Select Perspective dialog" border="0" ></P>
-<P CLASS="Para"></P>
-</DIV>
-
-<DIV CLASS="Topic">
-<h2>
-Show View</h2>
-<P CLASS="Para">
-This command displays the selected view in the
-current perspective. You can configure how views are opened on the 
-<a class="command-link" 
-href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Perspectives)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>General &gt; Perspectives</b></a> preference page. Views you are likely to want to open are listed
-first. This list is dependent on the current perspective. From the <b>Other...</b> submenu you can open any view. The views
-are sorted into categories in the Show View dialog.</P>
-<P CLASS="Para"><img src="../images/Image208_view_sel.png" alt="Show View Dialog" border="0" ></P>
-</DIV>
-
-<DIV CLASS="Topic">
-  <h2> Customize Perspective</h2>
-</DIV>
-<DIV CLASS="Topic">
-  <P CLASS="Para"> Each perspective includes a predefined set of actions that are 
-    accessible from the menu bar and Workbench toolbar.</P>
-<P CLASS="Para"><img src="../images/Image258_perps_custom.png" alt="Customize Perspective Dialog" border="0" > 
-  </P>
-</DIV>
-
-<DIV CLASS="Topic">
-<h2>
-Save Perspective As</h2>
-<P CLASS="Para">
-This command allows you to save the current perspective,
-creating your own custom perspective. You can open more perspectives of
-this type using the <b>Window &gt; Perspective &gt; Open Perspective &gt; Other</b> menu item once you have
-saved a perspective.</P>
-  <P CLASS="Para"> <img src="../images/Image206_persp_saveas.png" alt="Save Perspective As dialog" border="0" >x</P>
-</DIV>
-
-<DIV CLASS="Topic">
-<h2>
-Reset Perspective</h2>
-<P CLASS="Para">
-This command changes the layout of the current perspective to its original
-configuration.</P>
-</DIV>
-
-<DIV CLASS="Topic">
-<h2>
-Close Perspective</h2>
-<P CLASS="Para">
-This command closes the active perspective.</P>
-</DIV>
-
-<DIV CLASS="Topic">
-<h2>
-Close All Perspectives</h2>
-<P CLASS="Para">
-This command closes all open perspectives in the
-Workbench window.</P>
-</DIV>
-
-<DIV CLASS="Topic"> 
-  <h2> Navigation</h2>
-<P CLASS="Para">
-This submenu contains shortcut keys for navigating between the views, perspectives, and editors in the Workbench window.</P>
-  <UL CLASS="UnorderedList">
-    <LI CLASS="Item"> <b>Show System Menu</b>: Shows the menu that is used 
-      for resizing, closing or pinning the current view or editor.</LI>
-    <LI CLASS="Item"> <b>Show View Menu</b>: Shows the drop down menu that 
-      is available in the toolbar of the active view.</LI>
-    <LI CLASS="Item"> <strong>Maximize active view or editor: </strong>Causes 
-      the active part to take up the entire screen, or if it already is, returns 
-      it to its previous state. </LI>
-    <LI CLASS="Item"> <strong>Minimize active view or editor: </strong>Causes 
-      the active part to be minimized. </LI>
-    <LI><b>Activate Editor</b>: Makes the current editor active.</LI>
-    <LI CLASS="Item"> <b>Next Editor</b>: Activates the next open editor 
-      in the list of most recently used editors.</LI>
-    <LI CLASS="Item"> <b>Previous Editor</b>: Activates the previous open 
-      editor in the list of most recently used editors.</LI>
-    <LI CLASS="Item"> <strong>Switch to editor:</strong> Shows a dialog that allows 
-      switching to opened editors. Shows a dialog that allows switching to opened 
-      editors. </LI>
-    <LI CLASS="Item"> <strong>Quick switch editor:</strong> Shows a searchable 
-	popup that allows switching to a new editor. </LI>
-    <LI><b>Next View</b>: Activates the next open view in the list of most 
-      recently used views.</LI>
-    <LI CLASS="Item"> <b>Previous View</b>: Activates the previous open 
-      view in the list of most recently used editors.</LI>
-    <LI CLASS="Item"> <b>Next Perspective</b>: Activates the next open perspective 
-      in the list of most recently used perspectives.</LI>
-    <LI CLASS="Item"> <b>Previous Perspective</b>: Activates the previous 
-      open perspective in the list of most recently used perspectives.</LI>
-  </UL>
-</DIV>
-<DIV CLASS="Topic"></DIV>
-<DIV CLASS="Topic">
-<h2>
-Working Sets</h2>
-<P CLASS="Para">
-This submenu contains entries to select or edit working sets.
-</P>
-<DIV CLASS="XRefList">
-</DIV>
-</DIV>
-<DIV CLASS="Topic"></DIV>
-<DIV CLASS="Topic">
-<h2>
-Preferences</h2>
-<P CLASS="Para">
-This command allows you to indicate your preferences for using the Workbench. There
-are a wide variety of preferences for configuring the appearance of the Workbench and its views, 
-and for customizing the behavior of all tools that are installed in the Workbench.
-</P>
-<DIV CLASS="XRefList">
-</DIV>
-</DIV>
-
-
-
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2019. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Window menu</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Window menu</h1>
+  <p class="Intro">This menu allows you to display, hide, and otherwise manipulate the various views, perspectives, and
+  actions in the Workbench.</p>
+  <div class="Topic">
+    <h2>New Window</h2>
+    <p class="Para">This command opens a new Workbench window with the same perspective as the current perspective.</p>
+  </div>
+  <div class="Topic">
+    <h2>New Editor</h2>
+    <p class="Para">This command opens an editor based on the currently active editor. It will have the same editor
+    type and input as the original.</p>
+  </div>
+  <div class="Topic">
+    <h2>Open Perspective</h2>
+    <p class="Para">This command opens a new perspective in this Workbench window. This preference can be changed on
+    the <a class="command-link" href=
+    'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Perspectives)")'>
+    <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General &gt; Perspectives</b></a>
+    preference page. All of the perspectives that are open within the Workbench window are shown on the shortcut
+    bar.</p>
+    <p class="Para">The perspectives you will likely want to open are listed first. This list is dependent on the
+    current perspective. From the <b>Other...</b> submenu you can open any perspective.</p>
+    <p class="Para"><img src="../images/Image207_persp_sel.png" alt="Select Perspective dialog" border="0"></p>
+    <p class="Para"></p>
+  </div>
+  <div class="Topic">
+    <h2>Show View</h2>
+    <p class="Para">This command displays the selected view in the current perspective. You can configure how views are
+    opened on the <a class="command-link" href=
+    'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Perspectives)")'>
+    <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General &gt; Perspectives</b></a>
+    preference page. Views you are likely to want to open are listed first. This list is dependent on the current
+    perspective. From the <b>Other...</b> submenu you can open any view. The views are sorted into categories in the
+    Show View dialog.</p>
+    <p class="Para"><img src="../images/Image208_view_sel.png" alt="Show View Dialog" border="0"></p>
+  </div>
+  <div class="Topic">
+    <h2>Customize Perspective</h2>
+  </div>
+  <div class="Topic">
+    <p class="Para">Each perspective includes a predefined set of actions that are accessible from the menu bar and
+    Workbench toolbar.</p>
+    <p class="Para"><img src="../images/Image258_perps_custom.png" alt="Customize Perspective Dialog" border="0"></p>
+  </div>
+  <div class="Topic">
+    <h2>Save Perspective As</h2>
+    <p class="Para">This command allows you to save the current perspective, creating your own custom perspective. You
+    can open more perspectives of this type using the <b>Window &gt; Perspective &gt; Open Perspective &gt; Other</b>
+    menu item once you have saved a perspective.</p>
+    <p class="Para"><img src="../images/Image206_persp_saveas.png" alt="Save Perspective As dialog" border="0">x</p>
+  </div>
+  <div class="Topic">
+    <h2>Reset Perspective</h2>
+    <p class="Para">This command changes the layout of the current perspective to its original configuration.</p>
+  </div>
+  <div class="Topic">
+    <h2>Close Perspective</h2>
+    <p class="Para">This command closes the active perspective.</p>
+  </div>
+  <div class="Topic">
+    <h2>Close All Perspectives</h2>
+    <p class="Para">This command closes all open perspectives in the Workbench window.</p>
+  </div>
+  <div class="Topic">
+    <h2>Navigation</h2>
+    <p class="Para">This submenu contains shortcut keys for navigating between the views, perspectives, and editors in
+    the Workbench window.</p>
+    <ul class="UnorderedList">
+      <li class="Item"><b>Show System Menu</b>: Shows the menu that is used for resizing, closing or pinning the
+      current view or editor.</li>
+      <li class="Item"><b>Show View Menu</b>: Shows the drop down menu that is available in the toolbar of the active
+      view.</li>
+      <li class="Item"><strong>Maximize active view or editor:</strong> Causes the active part to take up the entire
+      screen, or if it already is, returns it to its previous state.</li>
+      <li class="Item"><strong>Minimize active view or editor:</strong> Causes the active part to be minimized.</li>
+      <li><b>Activate Editor</b>: Makes the current editor active.</li>
+      <li class="Item"><b>Next Editor</b>: Activates the next open editor in the list of most recently used
+      editors.</li>
+      <li class="Item"><b>Previous Editor</b>: Activates the previous open editor in the list of most recently used
+      editors.</li>
+      <li class="Item"><strong>Switch to editor:</strong> Shows a dialog that allows switching to opened editors. Shows
+      a dialog that allows switching to opened editors.</li>
+      <li class="Item"><strong>Quick switch editor:</strong> Shows a searchable popup that allows switching to a new
+      editor.</li>
+      <li><b>Next View</b>: Activates the next open view in the list of most recently used views.</li>
+      <li class="Item"><b>Previous View</b>: Activates the previous open view in the list of most recently used
+      editors.</li>
+      <li class="Item"><b>Next Perspective</b>: Activates the next open perspective in the list of most recently used
+      perspectives.</li>
+      <li class="Item"><b>Previous Perspective</b>: Activates the previous open perspective in the list of most
+      recently used perspectives.</li>
+    </ul>
+  </div>
+  <div class="Topic"></div>
+  <div class="Topic">
+    <h2>Working Sets</h2>
+    <p class="Para">This submenu contains entries to select or edit working sets.</p>
+    <div class="XRefList"></div>
+  </div>
+  <div class="Topic"></div>
+  <div class="Topic">
+    <h2>Preferences</h2>
+    <p class="Para">This command allows you to indicate your preferences for using the Workbench. There are a wide
+    variety of preferences for configuring the appearance of the Workbench and its views, and for customizing the
+    behavior of all tools that are installed in the Workbench.</p>
+    <div class="XRefList"></div>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-61.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-61.htm
index 33dfe7b..ab45a69 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-61.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-61.htm
@@ -1,61 +1,40 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Help menu</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<h1>
-Help menu</h1>
-<P CLASS="Para">
-This menu provides help on using the Workbench.</P>
- <h2 CLASS="Head"> Welcome</h2>
-<p CLASS="Head">
-This command will open the welcome content.</p>
-<DIV CLASS="Topic">
-<h2 CLASS="Head">
-Help Contents</h2>
-<P CLASS="Para">
-This command displays the help contents in a help window or external browser.
-The help contents contains help books, topics, and information related to the Workbench and installed
-features.</P>
-<h2 CLASS="Head">
-Search</h2>
-<P CLASS="Para">
-This command displays the help view opened on the Search page.</P>
-<h2 CLASS="Head">
-Dynamic Help</h2>
-<P CLASS="Para">
-This command displays the help view opened to Related Topics page.</P>
-<h2 CLASS="Head"> Key Assist ...</h2>
-  <p CLASS="Head"> This command will display a list of key bindings</p>
-  <h2 CLASS="Head"> Tips and Tricks ...</h2>
-<p CLASS="Head">
-This command will open a list of interesting productivity features that you may not have discovered.</p>
-<h2 CLASS="Head"> Cheat Sheets ...</h2>
-  <p CLASS="Head"> This command will open the cheat sheet selection dialog.</p>
-<h2 CLASS="Head">
-<a NAME="SoftwareUpdates"></a>Check for Updates</h2>
-<P CLASS="Para">
-This command will check for updates to the installed software.</P>
-<h2 CLASS="Head">
-<a NAME="InstallNewSoftware"></a>Install New Software...</h2>
-<P CLASS="Para">
-This command allows you to download and install new software.</P>
-<h2 CLASS="Head">
-About Eclipse SDK</h2>
-<P CLASS="Para">
-This command displays information about the product, installed features, and
-available plug-ins.</P>
-</DIV>
-
-
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Help menu</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1>Help menu</h1>
+  <p class="Para">This menu provides help on using the Workbench.</p>
+  <h2 class="Head">Welcome</h2>
+  <p class="Head">This command will open the welcome content.</p>
+  <div class="Topic">
+    <h2 class="Head">Help Contents</h2>
+    <p class="Para">This command displays the help contents in a help window or external browser. The help contents
+    contains help books, topics, and information related to the Workbench and installed features.</p>
+    <h2 class="Head">Search</h2>
+    <p class="Para">This command displays the help view opened on the Search page.</p>
+    <h2 class="Head">Dynamic Help</h2>
+    <p class="Para">This command displays the help view opened to Related Topics page.</p>
+    <h2 class="Head">Key Assist ...</h2>
+    <p class="Head">This command will display a list of key bindings</p>
+    <h2 class="Head">Tips and Tricks ...</h2>
+    <p class="Head">This command will open a list of interesting productivity features that you may not have
+    discovered.</p>
+    <h2 class="Head">Cheat Sheets ...</h2>
+    <p class="Head">This command will open the cheat sheet selection dialog.</p>
+    <h2 class="Head"><a name="SoftwareUpdates" id="SoftwareUpdates"></a>Check for Updates</h2>
+    <p class="Para">This command will check for updates to the installed software.</p>
+    <h2 class="Head"><a name="InstallNewSoftware" id="InstallNewSoftware"></a>Install New Software...</h2>
+    <p class="Para">This command allows you to download and install new software.</p>
+    <h2 class="Head">About Eclipse SDK</h2>
+    <p class="Para">This command displays information about the product, installed features, and available
+    plug-ins.</p>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-65.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-65.htm
index 63e3864..6de853d 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-65.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-65.htm
@@ -1,50 +1,44 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" type="text/css">
-<title>Project Explorer view icons</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <title>Project Explorer view icons</title>
 </head>
-<body bgcolor="#ffffff">
-
-<h1>Project Explorer view icons</h1>
-
-<p>The following icons can appear in the navigation views:
-</p>
-
-<table border="1" cellspacing="0" cellpadding="4">
-<caption>Project Explorer view icons</caption>
-<thead>
-<tr>
-<th>Icon</th>
-<th>Description</th>
-</tr>
-</thead>
-
-<tbody>
-<tr>
-<td align="center" valign="middle"><img src="../images/prj_obj.svg" alt="Open Project icon"></td>
-<td>Project (open)</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/fldr_obj.svg" alt="Folder icon"></td>
-<td>Folder (open)</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/cprj_obj.svg" alt="Closed Project icon"></td>
-<td>Project (closed)</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/file_obj.svg" alt="File icon"></td>
-<td>Generic File</td>
-</tr>
-</tbody>
-</table>
-
+<body bgcolor="#FFFFFF">
+  <h1>Project Explorer view icons</h1>
+  <p>The following icons can appear in the navigation views:</p>
+  <table border="1" cellspacing="0" cellpadding="4">
+    <caption>
+      Project Explorer view icons
+    </caption>
+    <thead>
+      <tr>
+        <th>Icon</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/prj_obj.svg" alt="Open Project icon"></td>
+        <td>Project (open)</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/fldr_obj.svg" alt="Folder icon"></td>
+        <td>Folder (open)</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/cprj_obj.svg" alt="Closed Project icon"></td>
+        <td>Project (closed)</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/file_obj.svg" alt="File icon"></td>
+        <td>Generic File</td>
+      </tr>
+    </tbody>
+  </table>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-66.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-66.htm
index 08efb81..ce74960 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-66.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-66.htm
@@ -1,104 +1,57 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta name="copyright" content=
-    "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <link rel="STYLESHEET" href="../book.css" type="text/css" />
-    <title>
-      Editor area marker bar
-    </title>
-  </head>
-  <body>
-    <h1>
-      Editor area marker bar
-    </h1>
-    <p>
-      The following markers can appear in the marker bar (to the left of the
-      editor area):
-    </p>
-    <table border="1" cellspacing="0" cellpadding="4">
-      <caption>
-
-        Marker Bar Markers
-      </caption>
-      <thead>
-        <tr>
-          <th>
-            Icon
-          </th>
-          <th>
-            Description
-          </th>
-
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td align="center" valign="middle">
-            <img src="../images/bookmark_obj.svg" alt="Bookmark icon" />
-          </td>
-          <td>
-            Bookmark
-          </td>
-
-        </tr>
-        <tr>
-          <td align="center" valign="middle">
-            <img src="../images/brkp_obj.svg" alt="Breakpoint icon" />
-          </td>
-          <td>
-            Breakpoint
-          </td>
-        </tr>
-
-        <tr>
-          <td align="center" valign="middle">
-            <img src="../images/tasks_tsk.svg" alt="Task marker icon" />
-          </td>
-          <td>
-            Task marker
-          </td>
-        </tr>
-        <tr>
-
-          <td align="center" valign="middle">
-            <img src="../images/searchm_obj.svg" alt="Search result icon" />
-          </td>
-          <td>
-            Search result
-          </td>
-        </tr>
-        <tr>
-          <td align="center" valign="middle">
-
-            <img src="../images/error_obj.svg" alt="Error marker icon" />
-          </td>
-          <td>
-            Error marker
-          </td>
-        </tr>
-        <tr>
-          <td align="center" valign="middle">
-            <img src="../images/warning_obj.svg" alt="Warning marker icon" />
-
-          </td>
-          <td>
-            Warning marker
-          </td>
-        </tr>
-        <tr>
-          <td align="center" valign="middle">
-            <img src="../images/info_obj.svg" alt="Information marker icon" />
-          </td>
-
-          <td>
-            Information marker
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </body>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <link rel="STYLESHEET" href="../book.css" type="text/css" />
+  <title>Editor area marker bar</title>
+</head>
+<body>
+  <h1>Editor area marker bar</h1>
+  <p>The following markers can appear in the marker bar (to the left of the editor area):</p>
+  <table border="1" cellspacing="0" cellpadding="4">
+    <caption>
+      Marker Bar Markers
+    </caption>
+    <thead>
+      <tr>
+        <th>Icon</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/bookmark_obj.svg" alt="Bookmark icon" /></td>
+        <td>Bookmark</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/brkp_obj.svg" alt="Breakpoint icon" /></td>
+        <td>Breakpoint</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/tasks_tsk.svg" alt="Task marker icon" /></td>
+        <td>Task marker</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/searchm_obj.svg" alt="Search result icon" /></td>
+        <td>Search result</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/error_obj.svg" alt="Error marker icon" /></td>
+        <td>Error marker</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/warning_obj.svg" alt="Warning marker icon" /></td>
+        <td>Warning marker</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/info_obj.svg" alt="Information marker icon" /></td>
+        <td>Information marker</td>
+      </tr>
+    </tbody>
+  </table>
+</body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-67.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-67.htm
index a9c757f..87caaaa 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-67.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-67.htm
@@ -1,44 +1,40 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" type="text/css">
-<title>Tasks view</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <title>Tasks view</title>
 </head>
-<body bgcolor="#ffffff">
-
-<h1>Tasks view</h1>
-<p>The following markers can appear in the Tasks view:
-</p>
-
-<table border="1" cellspacing="0" cellpadding="4">
-<caption>Tasks View Icons</caption>
-<thead>
-<tr>
-<th>Icon</th>
-<th>Description</th>
-</tr>
-</thead>
-
-<tbody>
-<tr>
-<td align="center" valign="middle"><img src="../images/ihigh_obj.svg" alt="High priority task icon"></td>
-<td>High priority task</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/ilow_obj.svg" alt="Low priority task icon"></td>
-<td>Low priority task</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/complete_tsk.svg" alt="Completed task icon"></td>
-<td>Completed task</td>
-</tr>
-</tbody>
-</table>
-
+<body bgcolor="#FFFFFF">
+  <h1>Tasks view</h1>
+  <p>The following markers can appear in the Tasks view:</p>
+  <table border="1" cellspacing="0" cellpadding="4">
+    <caption>
+      Tasks View Icons
+    </caption>
+    <thead>
+      <tr>
+        <th>Icon</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/ihigh_obj.svg" alt="High priority task icon"></td>
+        <td>High priority task</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/ilow_obj.svg" alt="Low priority task icon"></td>
+        <td>Low priority task</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/complete_tsk.svg" alt="Completed task icon"></td>
+        <td>Completed task</td>
+      </tr>
+    </tbody>
+  </table>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-68.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-68.htm
index 4add2ca..1d104c1 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-68.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-68.htm
@@ -1,188 +1,165 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" type="text/css">
-<title>Toolbar buttons</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <title>Toolbar buttons</title>
 </head>
-<body bgcolor="#ffffff">
-
-<h1>Toolbar buttons</h1>
-
-<p>The following buttons may appear in the Workbench toolbar, toolbars for views, and the shortcut bar:
-</p>
-
-<table border="1" cellspacing="0" cellpadding="4">
-<thead>
-<tr>
-<th>Button</th>
-<th>Description</th>
-<th>Button</th>
-<th>Description</th>
-</tr>
-</thead>
-
-<tbody>
-<tr>
-<td align="center" valign="middle"><img src="../images/new_persp.svg" alt="New perspective image"></td>
-<td>Open a new perspective</td>
-<td align="center" valign="middle"><img src="../images/save_edit.svg" alt="Save edit image"></td>
-<td>Save the active editor contents</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/saveall_edit.svg" alt="Save all image"></td>
-<td>Save the contents of all editors</td>
-<td align="center" valign="middle"><img src="../images/saveas_edit.svg" alt="Save as image"></td>
-<td>Save editor contents under a new name or location</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/search_src.svg" alt="Open search dialog image"></td>
-<td>Opens the search dialog</td>
-<td align="center" valign="middle"><img src="../images/print_edit.svg" alt="Print editor image"></td>
-<td>Print editor contents</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/new_wiz.svg" alt="New wizard image"></td>
-<td>Open a resource creation wizard</td>
-<td align="center" valign="middle"><img src="../images/newfile_wiz.svg" alt="New file image"></td>
-<td>Open a file creation wizard</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/newfolder_wiz.svg" alt="New folder image"></td>
-<td>Open a folder creation wizard</td>
-<td align="center" valign="middle"><img src="../images/newprj_wiz.svg" alt="New project image"></td>
-<td>Open a project creation wizard</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/import_wiz.svg" alt="Import wizard image"></td>
-<td>Open the import wizard</td>
-<td align="center" valign="middle"><img src="../images/export_wiz.svg" alt="Export wizard image"></td>
-<td>Open the export wizard</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/build_exec.svg" alt="Build image"></td>
-<td>Run incremental build</td>
-<td align="center" valign="middle"><img src="../images/run_exc.svg" alt="Run image"></td>
-<td>Run a program</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/debug_exc.svg" alt="Debug image"></td>
-<td>Debug a program</td>
-<td align="center" valign="middle"><img src="../images/external_tools.svg" alt="Run external tool image"></td>
-<td>Run an external tool or Ant</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/cut_edit.svg" alt="Cut image"></td>
-<td>Cut selection to clipboard</td>
-<td align="center" valign="middle"><img src="../images/copy_edit.svg" alt="Copy image"></td>
-<td>Copy selection to clipboard</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/paste_edit.svg" alt="Paste image"></td>
-<td>Paste selection from clipboard</td>
-<td align="center" valign="middle"><img src="../images/undo_edit.svg" alt="Undo edit image"></td>
-<td>Undo most recent edit</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/redo_edit.svg" alt="Redo edit image"></td>
-<td>Redo most recent undone edit</td>
-<td align="center" valign="middle"><img src="../images/next_nav.svg" alt="Navigate next image"></td>
-<td>Navigate to next item in a list</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/prev_nav.svg" alt="Navigate previous image"></td>
-<td>Navigate to previous item in a list</td>
-<td align="center" valign="middle"><img src="../images/forward_nav.svg" alt="Navigate forwards image"></td>
-<td>Navigate forwards</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/backward_nav.svg" alt="Navigate backwards image"></td>
-<td>Navigate backwards</td>
-<td align="center" valign="middle"><img src="../images/up_nav.svg" alt="Navigate up image"></td>
-<td>Navigate up one level</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/addtsk_tsk.svg" alt="Add bookmark or task image"></td>
-<td>Add bookmark or task</td>
-<td align="center" valign="middle"><img src="../images/view_menu.svg" alt="View menu image"></td>
-<td>Open a view's drop down menu</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/close_view.svg" alt="Close view image"></td>
-<td>Close view or editor</td>
-<td align="center" valign="middle"><img src="../images/pin_editor.svg" alt="Pin editor image"></td>
-<td>Pin editor to prevent automatic reuse</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/filter_ps.svg" alt="Filter tasks or properties image"></td>
-<td>Filter tasks or properties</td>
-<td align="center" valign="middle"><img src="../images/gotoobj_tsk.svg" alt="Goto object image"></td>
-<td>Go to a task, problem, or bookmark in the editor</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/defaults_ps.svg" alt="Restore defaults image"></td>
-<td>Restore default properties</td>
-<td align="center" valign="middle"><img src="../images/tree_mode.svg" alt="Tree mode image"></td>
-<td>Show items as a tree</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/refresh_nav.svg" alt="Refresh image"></td>
-<td>Refresh view contents</td>
-<td align="center" valign="middle"><img src="../images/alpha_mode.svg" alt="Alphabetical order image"></td>
-<td>Sort list in alphabetical order</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/nav_stop.svg" alt="Cancel operation image"></td>
-<td>Cancel a long running operation</td>
-<td align="center" valign="middle"><img src="../images/delete_edit.svg" alt="Delete image"></td>
-<td>Delete selected item or content</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/last_edit_pos.svg" alt="Last edit location image"></td>
-<td>Last edit location</td>
-<td align="center" valign="middle"><img src="../images/mark_occurrences.svg" alt="Toggle Mark Occurrences image"></td>
-<td>Toggle Mark Occurrences</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/block_selection_mode.svg" alt="Toggle Block Selection Mode"></td>
-<td>Toggle Block Selection Mode</td>
-<td align="center" valign="middle"><img src="../images/show_whitespace_chars.svg" alt="Show Whitespace Characters"></td>
-<td>Show Whitespace Characters</td>
-</tr>
-
-<tr>
-<td align="center" valign="middle"><img src="../images/segment_edit.svg" alt="Show source of selected element only image"></td>
-<td>Show source of selected element only</td>
-<td></td>
-<td></td>
-</tr>
-</tbody>
-</table>
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/concepts-18.htm">Toolbars</a>
-
+<body bgcolor="#FFFFFF">
+  <h1>Toolbar buttons</h1>
+  <p>The following buttons may appear in the Workbench toolbar, toolbars for views, and the shortcut bar:</p>
+  <table border="1" cellspacing="0" cellpadding="4">
+    <thead>
+      <tr>
+        <th>Button</th>
+        <th>Description</th>
+        <th>Button</th>
+        <th>Description</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/new_persp.svg" alt="New perspective image"></td>
+        <td>Open a new perspective</td>
+        <td align="center" valign="middle"><img src="../images/save_edit.svg" alt="Save edit image"></td>
+        <td>Save the active editor contents</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/saveall_edit.svg" alt="Save all image"></td>
+        <td>Save the contents of all editors</td>
+        <td align="center" valign="middle"><img src="../images/saveas_edit.svg" alt="Save as image"></td>
+        <td>Save editor contents under a new name or location</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/search_src.svg" alt="Open search dialog image"></td>
+        <td>Opens the search dialog</td>
+        <td align="center" valign="middle"><img src="../images/print_edit.svg" alt="Print editor image"></td>
+        <td>Print editor contents</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/new_wiz.svg" alt="New wizard image"></td>
+        <td>Open a resource creation wizard</td>
+        <td align="center" valign="middle"><img src="../images/newfile_wiz.svg" alt="New file image"></td>
+        <td>Open a file creation wizard</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/newfolder_wiz.svg" alt="New folder image"></td>
+        <td>Open a folder creation wizard</td>
+        <td align="center" valign="middle"><img src="../images/newprj_wiz.svg" alt="New project image"></td>
+        <td>Open a project creation wizard</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/import_wiz.svg" alt="Import wizard image"></td>
+        <td>Open the import wizard</td>
+        <td align="center" valign="middle"><img src="../images/export_wiz.svg" alt="Export wizard image"></td>
+        <td>Open the export wizard</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/build_exec.svg" alt="Build image"></td>
+        <td>Run incremental build</td>
+        <td align="center" valign="middle"><img src="../images/run_exc.svg" alt="Run image"></td>
+        <td>Run a program</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/debug_exc.svg" alt="Debug image"></td>
+        <td>Debug a program</td>
+        <td align="center" valign="middle"><img src="../images/external_tools.svg" alt="Run external tool image"></td>
+        <td>Run an external tool or Ant</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/cut_edit.svg" alt="Cut image"></td>
+        <td>Cut selection to clipboard</td>
+        <td align="center" valign="middle"><img src="../images/copy_edit.svg" alt="Copy image"></td>
+        <td>Copy selection to clipboard</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/paste_edit.svg" alt="Paste image"></td>
+        <td>Paste selection from clipboard</td>
+        <td align="center" valign="middle"><img src="../images/undo_edit.svg" alt="Undo edit image"></td>
+        <td>Undo most recent edit</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/redo_edit.svg" alt="Redo edit image"></td>
+        <td>Redo most recent undone edit</td>
+        <td align="center" valign="middle"><img src="../images/next_nav.svg" alt="Navigate next image"></td>
+        <td>Navigate to next item in a list</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/prev_nav.svg" alt="Navigate previous image"></td>
+        <td>Navigate to previous item in a list</td>
+        <td align="center" valign="middle"><img src="../images/forward_nav.svg" alt="Navigate forwards image"></td>
+        <td>Navigate forwards</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/backward_nav.svg" alt="Navigate backwards image"></td>
+        <td>Navigate backwards</td>
+        <td align="center" valign="middle"><img src="../images/up_nav.svg" alt="Navigate up image"></td>
+        <td>Navigate up one level</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/addtsk_tsk.svg" alt="Add bookmark or task image"></td>
+        <td>Add bookmark or task</td>
+        <td align="center" valign="middle"><img src="../images/view_menu.svg" alt="View menu image"></td>
+        <td>Open a view's drop down menu</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/close_view.svg" alt="Close view image"></td>
+        <td>Close view or editor</td>
+        <td align="center" valign="middle"><img src="../images/pin_editor.svg" alt="Pin editor image"></td>
+        <td>Pin editor to prevent automatic reuse</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/filter_ps.svg" alt=
+        "Filter tasks or properties image"></td>
+        <td>Filter tasks or properties</td>
+        <td align="center" valign="middle"><img src="../images/gotoobj_tsk.svg" alt="Goto object image"></td>
+        <td>Go to a task, problem, or bookmark in the editor</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/defaults_ps.svg" alt="Restore defaults image"></td>
+        <td>Restore default properties</td>
+        <td align="center" valign="middle"><img src="../images/tree_mode.svg" alt="Tree mode image"></td>
+        <td>Show items as a tree</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/refresh_nav.svg" alt="Refresh image"></td>
+        <td>Refresh view contents</td>
+        <td align="center" valign="middle"><img src="../images/alpha_mode.svg" alt="Alphabetical order image"></td>
+        <td>Sort list in alphabetical order</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/nav_stop.svg" alt="Cancel operation image"></td>
+        <td>Cancel a long running operation</td>
+        <td align="center" valign="middle"><img src="../images/delete_edit.svg" alt="Delete image"></td>
+        <td>Delete selected item or content</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/last_edit_pos.svg" alt="Last edit location image"></td>
+        <td>Last edit location</td>
+        <td align="center" valign="middle"><img src="../images/mark_occurrences.svg" alt=
+        "Toggle Mark Occurrences image"></td>
+        <td>Toggle Mark Occurrences</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/block_selection_mode.svg" alt=
+        "Toggle Block Selection Mode"></td>
+        <td>Toggle Block Selection Mode</td>
+        <td align="center" valign="middle"><img src="../images/show_whitespace_chars.svg" alt=
+        "Show Whitespace Characters"></td>
+        <td>Show Whitespace Characters</td>
+      </tr>
+      <tr>
+        <td align="center" valign="middle"><img src="../images/segment_edit.svg" alt=
+        "Show source of selected element only image"></td>
+        <td>Show source of selected element only</td>
+        <td></td>
+        <td></td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-18.htm">Toolbars</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-6a.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-6a.htm
index 4467a7c..1dc1089 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-6a.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-6a.htm
@@ -1,110 +1,81 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Local history</title>
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Local history</H1>
-<p>Local history of a file is maintained when you create or modify a file. Each time you edit and save
-a file, a copy of it is saved. This allows you to compare
-your current file state to a previous state, or replace the file with a previous
-state. Each state in the local
-history is identified by the date and time the file was
-saved.</p>
-<p>Neither projects nor folders have local history.</p>
-<p>Local History is displayed in the History View. Here is a look at what the local history of a Workbench file might look
-like: </p>
-<p><img src="../images/Image273_local_hist.png" alt="Local history dialog" border="0" ></p>
-<P>To view the local history of a file, choose <b>Team &gt; Show Local History</b> from the pop-up
-menu. This will bring up the History view and populate it with the revisions of the selected
-file. You can open different revisions from the table (by using <b>Open</b> from the context menu or 
-by double clicking on a revision), compare them against the latest revision or against a
-previous revisions (by using <b>Compare With Revision</b> from the context menu), and replace the current revision 
-with the contents of a previous revisions (by using <b>Get Contents</b> from the context menu). 
-</P>
-
-<p><i>Note</i>: Projects that are managed by CVS now have the local history revisions displayed
-alongside remote revisions. In order to see the local history for a CVS managed file, select the
-<b>Team &gt; Show History</b> menu item and make sure that the History View is one of the modes capable
-of showing local history. </p>
-
-<h2>Toolbar</h2>
-
-<div class="Topic"> 
-<h3>Refresh</h3>  
-<p class="Para">This command refreshes the contents of the view, 
-fetching the latest history information for the resource from the server.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Link with Editor and Selection</h3>  
-<p class="Para">When enabled, the view will display the history for the resource 
-of the active editor or of the active selection.</p>
-</div> 
-
-<div class="Topic"> 
-<h3>Pin</h3>  
-<p class="Para">When enabled will pin the view and its contents. Any new requests for history
-will open a new instance of the History View.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Group Revisions by Date</h3>  
-<p class="Para">When enabled, all history items will be sorted into one of the following date
-categories: </p>
-<ul>
-<li>Today</li>
-<li>Yesterday</li>
-<li>This Month</li>
-<li>Previous</li>
-</ul>
-
-</div>
-
-<div class="Topic"> 
-<h3>Collapse All</h3>  
-<p class="Para">Will the view is in the Group by Date mode, Collapse All will collapse all of the
-date categories.</p>
-</div>
-
-<div class="Topic"> 
-<h3>Compare Mode</h3>  
-<p class="Para">When enabled, a double click (or a single click depending on your Open Mode strategy set
-in <b>Preferences&gt;General</b>) will open a compare editor. When it is disabled, clicking on a revision
-will open that revision.</p>
-</div>
-
-<h2 class="Para">Context menu </h2>
-     
-<p class="Para">From the context menu of the Local History view you can perform
-the following operations:</p>
-     
-<h3>Open</h3>   
-<p class="Para">This command will open the contents of the selected revision in a read only
-editor. (The editor used is the one that is registered as the default editor for the file type).
-<i>Note</i>: If the revision being opened is the current version of the file, then it will be opened
-in a regular editor.</p>
-
-<h3>Compare Current With Revision/Compare With Each Other</h3>   
-<p class="Para">The compare command differs based on the number of revisions selected in the 
-history view. For a single selection, <b>Compare Current With Revision</b> will the compare the
-current version of the resource with the selected revision. For two selections, <b>Compare with Each
-Other</b> will compare the selected revisions.</p>
-
-<h3>Get Contents</h3>   
-<p class="Para">This command will load the contents of the selected revision
-into the local copy of the file whose history
-is displayed in the view.</p>
-
-<h3 class="related">Related reference</h3>
-    <a href="ref-32a.htm">CVS History view</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Local history</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Local history</h1>
+  <p>Local history of a file is maintained when you create or modify a file. Each time you edit and save a file, a copy
+  of it is saved. This allows you to compare your current file state to a previous state, or replace the file with a
+  previous state. Each state in the local history is identified by the date and time the file was saved.</p>
+  <p>Neither projects nor folders have local history.</p>
+  <p>Local History is displayed in the History View. Here is a look at what the local history of a Workbench file might
+  look like:</p>
+  <p><img src="../images/Image273_local_hist.png" alt="Local history dialog" border="0"></p>
+  <p>To view the local history of a file, choose <b>Team &gt; Show Local History</b> from the pop-up menu. This will
+  bring up the History view and populate it with the revisions of the selected file. You can open different revisions
+  from the table (by using <b>Open</b> from the context menu or by double clicking on a revision), compare them against
+  the latest revision or against a previous revisions (by using <b>Compare With Revision</b> from the context menu),
+  and replace the current revision with the contents of a previous revisions (by using <b>Get Contents</b> from the
+  context menu).</p>
+  <p><i>Note</i>: Projects that are managed by CVS now have the local history revisions displayed alongside remote
+  revisions. In order to see the local history for a CVS managed file, select the <b>Team &gt; Show History</b> menu
+  item and make sure that the History View is one of the modes capable of showing local history.</p>
+  <h2>Toolbar</h2>
+  <div class="Topic">
+    <h3>Refresh</h3>
+    <p class="Para">This command refreshes the contents of the view, fetching the latest history information for the
+    resource from the server.</p>
+  </div>
+  <div class="Topic">
+    <h3>Link with Editor and Selection</h3>
+    <p class="Para">When enabled, the view will display the history for the resource of the active editor or of the
+    active selection.</p>
+  </div>
+  <div class="Topic">
+    <h3>Pin</h3>
+    <p class="Para">When enabled will pin the view and its contents. Any new requests for history will open a new
+    instance of the History View.</p>
+  </div>
+  <div class="Topic">
+    <h3>Group Revisions by Date</h3>
+    <p class="Para">When enabled, all history items will be sorted into one of the following date categories:</p>
+    <ul>
+      <li>Today</li>
+      <li>Yesterday</li>
+      <li>This Month</li>
+      <li>Previous</li>
+    </ul>
+  </div>
+  <div class="Topic">
+    <h3>Collapse All</h3>
+    <p class="Para">Will the view is in the Group by Date mode, Collapse All will collapse all of the date
+    categories.</p>
+  </div>
+  <div class="Topic">
+    <h3>Compare Mode</h3>
+    <p class="Para">When enabled, a double click (or a single click depending on your Open Mode strategy set in
+    <b>Preferences&gt;General</b>) will open a compare editor. When it is disabled, clicking on a revision will open
+    that revision.</p>
+  </div>
+  <h2 class="Para">Context menu</h2>
+  <p class="Para">From the context menu of the Local History view you can perform the following operations:</p>
+  <h3>Open</h3>
+  <p class="Para">This command will open the contents of the selected revision in a read only editor. (The editor used
+  is the one that is registered as the default editor for the file type). <i>Note</i>: If the revision being opened is
+  the current version of the file, then it will be opened in a regular editor.</p>
+  <h3>Compare Current With Revision/Compare With Each Other</h3>
+  <p class="Para">The compare command differs based on the number of revisions selected in the history view. For a
+  single selection, <b>Compare Current With Revision</b> will the compare the current version of the resource with the
+  selected revision. For two selections, <b>Compare with Each Other</b> will compare the selected revisions.</p>
+  <h3>Get Contents</h3>
+  <p class="Para">This command will load the contents of the selected revision into the local copy of the file whose
+  history is displayed in the view.</p>
+  <h3 class="related">Related reference</h3><a href="ref-32a.htm">CVS History view</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-7.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-7.htm
index a569ca1..498586d 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-7.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-7.htm
@@ -1,57 +1,55 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-<meta http-equiv="Content-Style-Type" content="text/css"/>
-<title>Accessibility preferences</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<link rel="STYLESHEET" href="../book.css" type="text/css"/>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <title>Accessibility preferences</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" type="text/css" />
 </head>
-<body bgcolor="#ffffff">
-
-<h1 class="Head">Accessibility preferences</h1>
-
-<p>The following preferences can be changed on the
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.Accessibility)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"/><strong>General &gt; Editors &gt; Text Editors &gt; Accessibility</strong></a> preference page:
-</p>
-
-<table border="1" cellspacing="0" cellpadding="5">
-<thead>
-<tr valign="top">
-<th>Option</th>
-<th>Description</th>
-<th>Default</th>
-</tr>
-</thead>
-<tbody>
-<tr valign="top">
-<td><b>Use custom caret</b></td>
-<td>Replaces the original <i>caret</i> (the marker that indicates where the next character will appear) 
-with a custom caret and shows a different caret for Overwrite and Insert modes.</td>
-<td>On</td>
-</tr>
-<tr valign="top">
-<td><b>Enable thick caret</b></td>
-<td>Replaces the original caret with a more visible, thicker caret.</td>
-<td>On</td>
-</tr>
-<tr valign="top">
-<td><b>Use characters to show changes in vertical ruler</b></td>
-<td>Quick Diff shows line changes in the vertical ruler on the left hand side using colors. 
-Enable this option to show differences additionally with characters.</td>
-<td>Off</td>
-</tr>
-<tr valign="top">
-<td><b>Use saturated colors in overview ruler</b></td>
-<td>Uses saturated colors for annotations in the overview ruler on the right hand side.</td>
-<td>Off</td>
-</tr>
-</tbody>
-</table>
-
-<h3 class="related">Related reference</h3>
-	<a href="../concepts/accessibility/text_editor.htm">Accessibility features in textual editors</a>
-
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Accessibility preferences</h1>
+  <p>The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.Accessibility)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /><strong>General &gt; Editors &gt; Text
+  Editors &gt; Accessibility</strong></a> preference page:</p>
+  <table border="1" cellspacing="0" cellpadding="5">
+    <thead>
+      <tr valign="top">
+        <th>Option</th>
+        <th>Description</th>
+        <th>Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr valign="top">
+        <td><b>Use custom caret</b></td>
+        <td>Replaces the original <i>caret</i> (the marker that indicates where the next character will appear) with a
+        custom caret and shows a different caret for Overwrite and Insert modes.</td>
+        <td>On</td>
+      </tr>
+      <tr valign="top">
+        <td><b>Enable thick caret</b></td>
+        <td>Replaces the original caret with a more visible, thicker caret.</td>
+        <td>On</td>
+      </tr>
+      <tr valign="top">
+        <td><b>Use characters to show changes in vertical ruler</b></td>
+        <td>Quick Diff shows line changes in the vertical ruler on the left hand side using colors. Enable this option
+        to show differences additionally with characters.</td>
+        <td>Off</td>
+      </tr>
+      <tr valign="top">
+        <td><b>Use saturated colors in overview ruler</b></td>
+        <td>Uses saturated colors for annotations in the overview ruler on the right hand side.</td>
+        <td>Off</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="../concepts/accessibility/text_editor.htm">Accessibility features
+  in textual editors</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-70.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-70.htm
index 166eff6..9f2486c 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-70.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-70.htm
@@ -1,692 +1,527 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Import wizard</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Import wizard</H1>
-<P CLASS="Para">
-This wizard helps you import resources into the Workbench.</P>
-<P CLASS="Para">
-When the
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.file.import")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>Import wizard</b></a>
-first comes up, you must choose what type of import to
-do. To assist in locating a particular wizard, 
-the text field can be used to show only the wizards that match the entered text. </P>
-<img src="../images/Image261_import_sel.png" alt="Import wizard" border="0">
-<P CLASS="Para"> </P>
-
-<DIV CLASS="Topic">
-  <h2> Archive File</h2>
-  <p CLASS="Head"> If you choose this option, you will import files from an archive 
-    file.</p>
-  <P><img src="../images/Image263_import_zip.png" alt="Archive file import wizard page" border="0" > 
-  </P>
-<P>
-</P>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-    Import - Archive File Options 
-    </CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para"> Archive File</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The file from which to import. Type in the full path or Browse to select
-the path on the file system.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-&lt;blank&gt;</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Filter Types...</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Dialog to select which file types to import. Use this to restrict the
-import to only certain file types.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Check off all resources for import</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Deselect All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Uncheck all resources.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD COLSPAN="1">
-Folder
-</TD>
-<TD COLSPAN="1">
-The folder into which the resources will be imported. Type the path or
-Browse to select a path in the Workbench.
-</TD>
-<TD COLSPAN="1">
-The folder holding the selected resource
-</TD>
-</TR>
-<TR>
-<TD COLSPAN="1">
-Overwrite existing resources without warning
-</TD>
-<TD COLSPAN="1">
-Determines whether importing a resource should silently overwrite a resource
-which already exists in the Workbench. If this option is off, you will be
-prompted before a given resource is overwritten, in which case you can either
-overwrite the resource, skip it, or cancel the import.
-</TD>
-<TD COLSPAN="1">
-Off
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-</DIV>
-
-<DIV CLASS="Topic">
-  <h2>Checkout projects from CVS</h2>
-  <p CLASS="Head">Import a project from a CVS Repository.</p>
-  <P><img src="../images/Image263_import_cvs.png" alt="CVS project import wizard page" border="0" > 
-  </P>
-<P>
-</P>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-    Import - Checkout projects from CVS Options 
-    </CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Create a new repository location</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Go to the <a href="ref-40.htm">New CVS Repository Location
-wizard</a>.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">&lt;disabled&gt;</P>
-</TD>
-</TR>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Use existing repository location</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Use a previously datafilled CVS location.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>enabled</i></P>
-</TD>
-</TR>
-
-</TBODY>
-</TABLE>
-</DIV>
-
-<DIV CLASS="Topic">
-<h2>
-Existing Project into Workspace</h2>
-<p CLASS="Head">
-Imports a project into this workspace that was previously located in this workspace, or
-that currently exists in another workspace.</p>
-  <P><img src="../images/Image264_existing_project.png" alt="Existing project import wizard page"  border="0" > 
-  </P>
-<P>
-</P>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-Import - Existing Project Options</CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select root directory</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Root directory in the File System to start
-scanning for projects to import. Type in the full path or Browse to
-select the path on the file system.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-&lt;blank&gt;</P>
-</TD>
-</TR>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select archive file</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Archive file to scan for projects to import.
-Type in the full path or Browse to select the archive on the file system.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-&lt;disabled&gt;</P>
-</TD>
-</TR>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Check all of the projects that were found for import.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-</P>
-</TD>
-</TR>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Deselect All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Uncheck all projects.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-</P>
-</TD>
-</TR>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Refresh</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Rescan the selected source for projects to import.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-</P>
-</TD>
-</TR>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Copy projects into workspace</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-When selected this will cause the imorted project to be copied into
-the current workspace.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Off
-</P>
-</TD>
-</TR>
-
-</TBODY>
-</TABLE>
-</DIV>
-
-<DIV CLASS="Topic">
-<h2>File System</h2>
-<p CLASS="Head">
-If you choose this option, you will import files from the file system.</p>
-  <p CLASS="Head"> <img src="../images/Image262_import_file.png" alt="Import file system page" border="0" ></p>
-<p CLASS="Head">
-</p>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-Import - File System Options</CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Directory</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The directory from which to import files. Select a previous path from the
-drop down combo or Browse to select the path in the file system.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-&lt;blank&gt;</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Filter Types</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Dialog to select which file types to import. Use this to
-restrict the import to only certain file types.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Check off all files and folders for import.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Deselect All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Uncheck all resources.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD COLSPAN="1">
-Folder
-</TD>
-<TD COLSPAN="1">
-The folder into which the resources will be imported. Type the path or
-Browse to select a path in the Workbench.
-</TD>
-<TD COLSPAN="1">
-The folder holding the selected resource
-</TD>
-</TR>
-<TR>
-<TD COLSPAN="1">
-Overwrite existing resources without warning
-</TD>
-<TD COLSPAN="1">
-Determines whether importing a resource should silently overwrite a resource
-which already exists in the Workbench. If this option is off, you will be
-prompted before a given resource is overwritten, in which case you can either
-overwrite the resource, skip it, or cancel the import.
-</TD>
-<TD COLSPAN="1">
-Off
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create complete folder structure</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create hierarchy (folder) structure in the Workbench to accommodate the
-resources being imported, and all parent folders of those resources in the file system. </P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Off</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create selected folders only</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create hierarchy (folder) structure in the Workbench to accommodate the
-resources being imported. </P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">On</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create links in workspace</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create links to the original files and folders instead of copying them under the project folder. </P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Off</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create virtual folders</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create hierarchy (folder) structure in the Workbench to accommodate the
-resources being imported. </P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Off, unless the selection is a partial hierarchy, or the 'into folder' field is a virtual folder</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create link location relative to: PROJECT_LOC</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-When the 'Create links in workspace' option is set, the link file and folder locations are automatically set to be relative 
-to a variable instead of being an absolute path</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">On</P>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-</DIV>
-
-
-<DIV CLASS="Topic">
-<h2>
-Preferences</h2>
-<p CLASS="Head">
-Import preferences from the local file system.</p>
-<!-- PWDOC need a new screenshot for the Import preferences wizard -->
-  <p CLASS="Head"> <img src="../images/Image262_import_preferences.png" 
-   alt="Import Preferences wizard page" width="431" height="491" border="0" ></p>
-<p CLASS="Head">
-</p>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-Import - Preferences Options</CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-From preference file</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The file from which to import preferences. Select a previous file from the
-drop down combo or Browse to select the file in the file system.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-&lt;blank&gt;</P>
-</TD>
-</TR>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Import All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Import all of the preferences.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-&lt;checked&gt;</P>
-</TD>
-</TR>
-
-<TR>
-<TD COLSPAN="1">
-<P CLASS="Para">
-Choose specific preferences to import</P>
-</TD>
-<TD COLSPAN="1">
-<P CLASS="Para">
-Choose from the preferences contained in the file, like CVS connection 
-preferences or JRE preferences.</P>
-</TD>
-<TD COLSPAN="1">
-<P CLASS="Para">
-</P>
-</TD>
-</TR>
-
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Check off all files and folders for import.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Deselect All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Uncheck all resources.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-
-
-</TBODY>
-</TABLE>
-</DIV>
-
-
-<DIV CLASS="Topic">
-<h2>
-Team Project Set</h2>
-<p CLASS="Head">
-Imports a description of the repository and version control information for a set of projects.
-This allows you to synchronize correctly with the appropriate project state in your repository.
-</p>
-  <P><img src="../images/Image265_team_project.png" alt="Team project set import wizard page" border="0" > 
-  </P>
-<P>
-</P>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-Import - Team Project Options</CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-File</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The name of the team project set export file</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-&lt;blank&gt;</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-URL</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The URL of the team project set on the web</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-&lt;blank&gt;</P>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-</DIV>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Import wizard</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Import wizard</h1>
+  <p class="Para">This wizard helps you import resources into the Workbench.</p>
+  <p class="Para">When the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.file.import")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg"
+  alt="command link"> <b>Import wizard</b></a> first comes up, you must choose what type of import to do. To assist in
+  locating a particular wizard, the text field can be used to show only the wizards that match the entered
+  text.</p><img src="../images/Image261_import_sel.png" alt="Import wizard" border="0">
+  <p class="Para"></p>
+  <div class="Topic">
+    <h2>Archive File</h2>
+    <p class="Head">If you choose this option, you will import files from an archive file.</p>
+    <p><img src="../images/Image263_import_zip.png" alt="Archive file import wizard page" border="0"></p>
+    <table border="1" cellspacing="0">
+      <caption>
+        Import - Archive File Options
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Archive File</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The file from which to import. Type in the full path or Browse to select the path on the
+            file system.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">&lt;blank&gt;</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Filter Types...</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Dialog to select which file types to import. Use this to restrict the import to only
+            certain file types.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Check off all resources for import</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Deselect All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Uncheck all resources.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="1">Folder</td>
+          <td colspan="1">The folder into which the resources will be imported. Type the path or Browse to select a
+          path in the Workbench.</td>
+          <td colspan="1">The folder holding the selected resource</td>
+        </tr>
+        <tr>
+          <td colspan="1">Overwrite existing resources without warning</td>
+          <td colspan="1">Determines whether importing a resource should silently overwrite a resource which already
+          exists in the Workbench. If this option is off, you will be prompted before a given resource is overwritten,
+          in which case you can either overwrite the resource, skip it, or cancel the import.</td>
+          <td colspan="1">Off</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="Topic">
+    <h2>Checkout projects from CVS</h2>
+    <p class="Head">Import a project from a CVS Repository.</p>
+    <p><img src="../images/Image263_import_cvs.png" alt="CVS project import wizard page" border="0"></p>
+    <table border="1" cellspacing="0">
+      <caption>
+        Import - Checkout projects from CVS Options
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create a new repository location</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Go to the <a href="ref-40.htm">New CVS Repository Location wizard</a>.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">&lt;disabled&gt;</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Use existing repository location</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Use a previously datafilled CVS location.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>enabled</i></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="Topic">
+    <h2>Existing Project into Workspace</h2>
+    <p class="Head">Imports a project into this workspace that was previously located in this workspace, or that
+    currently exists in another workspace.</p>
+    <p><img src="../images/Image264_existing_project.png" alt="Existing project import wizard page" border="0"></p>
+    <table border="1" cellspacing="0">
+      <caption>
+        Import - Existing Project Options
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select root directory</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Root directory in the File System to start scanning for projects to import. Type in the
+            full path or Browse to select the path on the file system.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">&lt;blank&gt;</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select archive file</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Archive file to scan for projects to import. Type in the full path or Browse to select the
+            archive on the file system.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">&lt;disabled&gt;</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Check all of the projects that were found for import.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Deselect All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Uncheck all projects.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Refresh</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Rescan the selected source for projects to import.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Copy projects into workspace</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">When selected this will cause the imorted project to be copied into the current
+            workspace.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Off</p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="Topic">
+    <h2>File System</h2>
+    <p class="Head">If you choose this option, you will import files from the file system.</p>
+    <p class="Head"><img src="../images/Image262_import_file.png" alt="Import file system page" border="0"></p>
+    <p class="Head"></p>
+    <table border="1" cellspacing="0">
+      <caption>
+        Import - File System Options
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Directory</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The directory from which to import files. Select a previous path from the drop down combo
+            or Browse to select the path in the file system.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">&lt;blank&gt;</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Filter Types</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Dialog to select which file types to import. Use this to restrict the import to only
+            certain file types.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Check off all files and folders for import.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Deselect All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Uncheck all resources.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="1">Folder</td>
+          <td colspan="1">The folder into which the resources will be imported. Type the path or Browse to select a
+          path in the Workbench.</td>
+          <td colspan="1">The folder holding the selected resource</td>
+        </tr>
+        <tr>
+          <td colspan="1">Overwrite existing resources without warning</td>
+          <td colspan="1">Determines whether importing a resource should silently overwrite a resource which already
+          exists in the Workbench. If this option is off, you will be prompted before a given resource is overwritten,
+          in which case you can either overwrite the resource, skip it, or cancel the import.</td>
+          <td colspan="1">Off</td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create complete folder structure</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create hierarchy (folder) structure in the Workbench to accommodate the resources being
+            imported, and all parent folders of those resources in the file system.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Off</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create selected folders only</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create hierarchy (folder) structure in the Workbench to accommodate the resources being
+            imported.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">On</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create links in workspace</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create links to the original files and folders instead of copying them under the project
+            folder.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Off</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create virtual folders</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create hierarchy (folder) structure in the Workbench to accommodate the resources being
+            imported.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Off, unless the selection is a partial hierarchy, or the 'into folder' field is a virtual
+            folder</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create link location relative to: PROJECT_LOC</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">When the 'Create links in workspace' option is set, the link file and folder locations are
+            automatically set to be relative to a variable instead of being an absolute path</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">On</p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="Topic">
+    <h2>Preferences</h2>
+    <p class="Head">Import preferences from the local file system.</p>
+    <!-- PWDOC need a new screenshot for the Import preferences wizard -->
+    <p class="Head"><img src="../images/Image262_import_preferences.png" alt="Import Preferences wizard page" width=
+    "431" height="491" border="0"></p>
+    <p class="Head"></p>
+    <table border="1" cellspacing="0">
+      <caption>
+        Import - Preferences Options
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">From preference file</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The file from which to import preferences. Select a previous file from the drop down combo
+            or Browse to select the file in the file system.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">&lt;blank&gt;</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Import All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Import all of the preferences.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">&lt;checked&gt;</p>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="1">
+            <p class="Para">Choose specific preferences to import</p>
+          </td>
+          <td colspan="1">
+            <p class="Para">Choose from the preferences contained in the file, like CVS connection preferences or JRE
+            preferences.</p>
+          </td>
+          <td colspan="1">
+            <p class="Para"></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Check off all files and folders for import.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Deselect All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Uncheck all resources.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="Topic">
+    <h2>Team Project Set</h2>
+    <p class="Head">Imports a description of the repository and version control information for a set of projects. This
+    allows you to synchronize correctly with the appropriate project state in your repository.</p>
+    <p><img src="../images/Image265_team_project.png" alt="Team project set import wizard page" border="0"></p>
+    <table border="1" cellspacing="0">
+      <caption>
+        Import - Team Project Options
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">File</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The name of the team project set export file</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">&lt;blank&gt;</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">URL</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The URL of the team project set on the web</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">&lt;blank&gt;</p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-71.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-71.htm
index 129cbd8..111e932 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-71.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-71.htm
@@ -1,652 +1,496 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Export wizard</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Export wizard</H1>
-<P CLASS="Para">
-This wizard help you export resources from the Workbench.</P>
-<P CLASS="Para">
-When the
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.file.export")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>Export wizard</b></a>
-first comes up, you must choose what type of export to
-do. To assist in locating a particular wizard, 
-the text field can be used to show only the wizards that match the entered text. </P>
-<P CLASS="Para"> <img src="../images/Image264_export_sel.png" alt="Export selection page" border="0"></P>
-
-
-<DIV CLASS="Topic">
-  <h2>Ant Buildfiles</h2>
-  <p CLASS="Head">Generates Ant buildfiles based on the configuration 
-     of the Java projects.</p>
-     <P><img src="../images/Image266_export_ant.png" 
-     alt="ant buildfile export"  border="0"> </P>
-<P>
-</P>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-    Export - Ant Buildfiles Options 
-    </CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-
-<tr>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select the projects to use to generate the buildfiles</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The project (and resources within that project) to use to generate the 
-buildfiles.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Java projects selected.</P>
-</TD>
-</tr>
-<tr>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Check all resources for export.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-N/A</P>
-</TD>
-</tr>
-<tr>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Deselect All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Uncheck all resources.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-N/A</P>
-</TD>
-</tr>
-<tr>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Check projects for Ant compatibility</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Check if the source directories of the projects have cycles or if there are dependencies between them that do not conform with the classpath order and therefore functional Ant buildfiles cannot be created.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-On</P>
-</TD>
-</tr>
-<tr>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create target to compile project using Eclipse compiler</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Add an Ant target to the buildfile that will compile the project using the Eclipse compiler.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-On</P>
-</TD>
-</tr>
-<tr>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Name for Ant buildfile</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The name to use for the generated Ant buildfile.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-build.xml</P>
-</TD>
-</tr>
-<tr>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-JUnit output directory</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The name of the directory where the generated JUnit reports are placed after the build.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-junit</P>
-</TD>
-</tr>
-
-</TBODY>
-</TABLE>
-</DIV> 
-<DIV CLASS="Topic">
-  <h2> Archive File</h2>
-  <p CLASS="Head">Choose this option to export files to an archive file.</p>
-  <P><img src="../images/Image266_export_zip.png" alt="ZIP file export" border="0"> 
-  </P>
-<P>
-</P>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-    Export - Archive File Options 
-    </CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<tr>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select resources to export</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The project (and resources within that project) to export to an archive.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The project holding the selected resource</P>
-</TD>
-</tr>
-<TR>
-<TD COLSPAN="1">
-<P CLASS="Para">
-Filter Types...</P>
-</TD>
-<TD COLSPAN="1">
-<P CLASS="Para"> Dialog to select which file types to export. Use this to 
-            restrict the export to only certain file types.</P>
-</TD>
-<TD COLSPAN="1">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Check off all resources for export.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Deselect All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Uncheck all resources.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-        <TD COLSPAN="1"> Archive File </TD>
-<TD COLSPAN="1">
-The path and name of an archive file into which the resources will be exported. Type the path,
-select a previous path from the drop down list, or Browse to select a path and file name on the file system.
-</TD>
-        <TD COLSPAN="1"> The archive file of the previous export, or &lt;blank&gt;. 
-        </TD>
-</TR>
-<TR>
-        <TD COLSPAN="1"> Zip file</TD>
-<TD COLSPAN="1">
-Export  the file in zip format</TD>
-        <TD COLSPAN="1"> true</TD>
-</TR>
-<TR>
-        <TD COLSPAN="1"> Tar file</TD>
-<TD COLSPAN="1">
-Export  the file in tar format</TD>
-        <TD COLSPAN="1"> true</TD>
-</TR>
-<TR>
-<TD COLSPAN="1">
-Compress the contents of the file
-</TD>
-<TD COLSPAN="1">
-Compresses the contents (resources selected to be exported) in the archive that
-is created.
-</TD>
-<TD COLSPAN="1">
-On
-</TD>
-</TR>
-<TR>
-<TD COLSPAN="1">
-Overwrite existing file without warning
-</TD>
-<TD COLSPAN="1">
-If the specified archive already exists in the file system, you will be prompted
-to overwrite the file. If you do not want to be prompted turn this option
-on.
-</TD>
-<TD COLSPAN="1">
-Off
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create directory structure for files</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create hierarchy (folder) structure in the file system as it exists in the Workbench. </P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Off</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create only selected directories</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create hierarchy (folder) structure in the file system only for selected folders. </P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">On</P>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-</DIV>
-
-
-<DIV CLASS="Topic">
-<h2>File System</h2>
-<p CLASS="Head">
-If you choose this option, you will export files to the file system.</p>
-  <p CLASS="Head"> <img src="../images/Image265_export_file.png" alt="Export file system" border="0" ></p>
-<p CLASS="Head">
-</p>
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-Export - File System Options</CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select resources to export</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The project (and resources within that project) to export to the file
-system.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The project holding the selected resource</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Filter Types...</P>
-</TD>
-        <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para">Dialog 
-            to select which file types to export. Use this to restrict the 
-            export to only certain file types.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Checks off all resources for export.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Deselect All</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Uncheck all resources.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-<i>N/A</i></P>
-</TD>
-</TR>
-<TR>
-<TD COLSPAN="1">
-Directory
-</TD>
-<TD COLSPAN="1">
-The directory on the file system into which the resources will be exported. Type the path,
-select a previous export path from the drop down list, or Browse to select a path.
-</TD>
-<TD COLSPAN="1">
-The directory of the last export, or &lt;blank&gt;
-</TD>
-</TR>
-<TR>
-<TD COLSPAN="1">
-Overwrite existing files without warning
-</TD>
-<TD COLSPAN="1">
-Determines whether exporting a resource should silently overwrite a resource
-which already exists in the file system. If this option is off, you will be
-prompted before a given file is overwritten, in which case you can either
-overwrite the file, skip it, or cancel the export.
-</TD>
-<TD COLSPAN="1">
-Off
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create directory structure for files</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create hierarchy (folder) structure in the file system as it exists in the Workbench. </P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">Off</P>
-</TD>
-</TR>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create only selected directories</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Create hierarchy (folder) structure in the file system only for selected folders. </P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">On</P>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-</DIV>
-
-<h2>Preferences</h2>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Export wizard</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Export wizard</h1>
+  <p class="Para">This wizard help you export resources from the Workbench.</p>
+  <p class="Para">When the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.file.export")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg"
+  alt="command link"> <b>Export wizard</b></a> first comes up, you must choose what type of export to do. To assist in
+  locating a particular wizard, the text field can be used to show only the wizards that match the entered text.</p>
+  <p class="Para"><img src="../images/Image264_export_sel.png" alt="Export selection page" border="0"></p>
+  <div class="Topic">
+    <h2>Ant Buildfiles</h2>
+    <p class="Head">Generates Ant buildfiles based on the configuration of the Java projects.</p>
+    <p><img src="../images/Image266_export_ant.png" alt="ant buildfile export" border="0"></p>
+    <table border="1" cellspacing="0">
+      <caption>
+        Export - Ant Buildfiles Options
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select the projects to use to generate the buildfiles</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The project (and resources within that project) to use to generate the buildfiles.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Java projects selected.</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Check all resources for export.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">N/A</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Deselect All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Uncheck all resources.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">N/A</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Check projects for Ant compatibility</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Check if the source directories of the projects have cycles or if there are dependencies
+            between them that do not conform with the classpath order and therefore functional Ant buildfiles cannot be
+            created.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">On</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create target to compile project using Eclipse compiler</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Add an Ant target to the buildfile that will compile the project using the Eclipse
+            compiler.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">On</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Name for Ant buildfile</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The name to use for the generated Ant buildfile.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">build.xml</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">JUnit output directory</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The name of the directory where the generated JUnit reports are placed after the build.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">junit</p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="Topic">
+    <h2>Archive File</h2>
+    <p class="Head">Choose this option to export files to an archive file.</p>
+    <p><img src="../images/Image266_export_zip.png" alt="ZIP file export" border="0"></p>
+    <table border="1" cellspacing="0">
+      <caption>
+        Export - Archive File Options
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select resources to export</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The project (and resources within that project) to export to an archive.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The project holding the selected resource</p>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="1">
+            <p class="Para">Filter Types...</p>
+          </td>
+          <td colspan="1">
+            <p class="Para">Dialog to select which file types to export. Use this to restrict the export to only
+            certain file types.</p>
+          </td>
+          <td colspan="1">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Check off all resources for export.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Deselect All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Uncheck all resources.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="1">Archive File</td>
+          <td colspan="1">The path and name of an archive file into which the resources will be exported. Type the
+          path, select a previous path from the drop down list, or Browse to select a path and file name on the file
+          system.</td>
+          <td colspan="1">The archive file of the previous export, or &lt;blank&gt;.</td>
+        </tr>
+        <tr>
+          <td colspan="1">Zip file</td>
+          <td colspan="1">Export the file in zip format</td>
+          <td colspan="1">true</td>
+        </tr>
+        <tr>
+          <td colspan="1">Tar file</td>
+          <td colspan="1">Export the file in tar format</td>
+          <td colspan="1">true</td>
+        </tr>
+        <tr>
+          <td colspan="1">Compress the contents of the file</td>
+          <td colspan="1">Compresses the contents (resources selected to be exported) in the archive that is
+          created.</td>
+          <td colspan="1">On</td>
+        </tr>
+        <tr>
+          <td colspan="1">Overwrite existing file without warning</td>
+          <td colspan="1">If the specified archive already exists in the file system, you will be prompted to overwrite
+          the file. If you do not want to be prompted turn this option on.</td>
+          <td colspan="1">Off</td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create directory structure for files</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create hierarchy (folder) structure in the file system as it exists in the Workbench.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Off</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create only selected directories</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create hierarchy (folder) structure in the file system only for selected folders.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">On</p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="Topic">
+    <h2>File System</h2>
+    <p class="Head">If you choose this option, you will export files to the file system.</p>
+    <p class="Head"><img src="../images/Image265_export_file.png" alt="Export file system" border="0"></p>
+    <p class="Head"></p>
+    <table border="1" cellspacing="0">
+      <caption>
+        Export - File System Options
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select resources to export</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The project (and resources within that project) to export to the file system.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The project holding the selected resource</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Filter Types...</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Dialog to select which file types to export. Use this to restrict the export to only
+            certain file types.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Checks off all resources for export.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Deselect All</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Uncheck all resources.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para"><i>N/A</i></p>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="1">Directory</td>
+          <td colspan="1">The directory on the file system into which the resources will be exported. Type the path,
+          select a previous export path from the drop down list, or Browse to select a path.</td>
+          <td colspan="1">The directory of the last export, or &lt;blank&gt;</td>
+        </tr>
+        <tr>
+          <td colspan="1">Overwrite existing files without warning</td>
+          <td colspan="1">Determines whether exporting a resource should silently overwrite a resource which already
+          exists in the file system. If this option is off, you will be prompted before a given file is overwritten, in
+          which case you can either overwrite the file, skip it, or cancel the export.</td>
+          <td colspan="1">Off</td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create directory structure for files</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create hierarchy (folder) structure in the file system as it exists in the Workbench.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Off</p>
+          </td>
+        </tr>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create only selected directories</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Create hierarchy (folder) structure in the file system only for selected folders.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">On</p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <h2>Preferences</h2>
   <p class="Head">Export preferences to the local file system.</p>
-     <p><img src="../images/Image266_export_preferences.png" alt="Preferences export wizard" width="470" height="550" border="0"> </p>
-<p>
-</p>
-<table border="1" cellspacing="0">
-<caption>
-    Export - Preference Options 
+  <p><img src="../images/Image266_export_preferences.png" alt="Preferences export wizard" width="470" height="550"
+  border="0"></p>
+  <table border="1" cellspacing="0">
+    <caption>
+      Export - Preference Options
     </caption>
-<thead>
-<tr>
-<th rowspan="1" colspan="1">
-<p class="Para">
-Option</p>
-</th>
-<th rowspan="1" colspan="1">
-<p class="Para">
-Description</p>
-</th>
-<th rowspan="1" colspan="1">
-<p class="Para">
-Default</p>
-</th>
-</tr>
-</thead>
-<tbody>
-
-<tr>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-Export All</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-Export all of the preferences in this session.</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-&lt;checked&gt;</p>
-</td>
-</tr>
-
-<tr>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-Choose specific preferences to export</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-Select preferences from this session to export, like
-CVS repository preferences.</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-&lt;disabled&gt;</p>
-</td>
-</tr>
-
-<tr>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-Select All</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-Select all of the available preferences.</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-</p>
-</td>
-</tr>
-
-<tr>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-Deselect All</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-Clear all of the available preferences.</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-</p>
-</td>
-</tr>
-
-<tr>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-To preference file</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-A file on the file system to store the preferences.
-Type the file, select a previous export file
-from the drop down list, or Browse to select a file.</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-&lt;blank&gt;</p>
-</td>
-</tr>
-
-<tr>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-Overwrite existing files without warning</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-Overwrite a pre-existing file.</p>
-</td>
-<td rowspan="1" colspan="1" valign="top" align="left">
-<p class="Para">
-&lt;unchecked&gt;</p>
-</td>
-</tr>
-
-
-</tbody>
-</table>
- 
-<DIV CLASS="Topic">
-<h2>
-Team Project Set</h2>
-<p CLASS="Head">
-Exports a description of the repository and version control information for a set of projects.
-This allows you to synchronize those projects correctly in a different workspace.
-</p>
-  <p CLASS="Head"> <img src="../images/Image268_export_team.png" alt="Export team project set page" border="0" ></p>
-<p CLASS="Head">
-</p>
-
-<TABLE BORDER="1" cellspacing="0">
-<CAPTION>
-Export - Team Project Set Options</CAPTION>
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-<TBODY>
-<TR>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-Select projects</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The project(s) to export to the team project set file.</P>
-</TD>
-<TD ROWSPAN="1" COLSPAN="1" valign="top" align="left">
-<P CLASS="Para">
-The selected projects</P>
-</TD>
-</TR>
-<TR>
-<TD COLSPAN="1">
-<P CLASS="Para">
-File name</P>
-</TD>
-<TD COLSPAN="1">
-<P CLASS="Para">
-The path and name of the file to export to.</P>
-</TD>
-<TD COLSPAN="1">
-<P CLASS="Para">
-&lt;blank&gt;</P>
-</TD>
-</TR>
-</TBODY>
-</TABLE>
-</DIV>
-
-<h3 class="related">Related tasks</h3>
-<a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-export-jar.htm">JAR Export Wizard</a><br>
-<a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-export-javadoc.htm">Export Javadoc Wizard</a>
-
-</BODY>
-</HTML>
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Export All</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Export all of the preferences in this session.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">&lt;checked&gt;</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Choose specific preferences to export</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Select preferences from this session to export, like CVS repository preferences.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">&lt;disabled&gt;</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Select All</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Select all of the available preferences.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para"></p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Deselect All</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Clear all of the available preferences.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para"></p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">To preference file</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">A file on the file system to store the preferences. Type the file, select a previous export
+          file from the drop down list, or Browse to select a file.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">&lt;blank&gt;</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Overwrite existing files without warning</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Overwrite a pre-existing file.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">&lt;unchecked&gt;</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <div class="Topic">
+    <h2>Team Project Set</h2>
+    <p class="Head">Exports a description of the repository and version control information for a set of projects. This
+    allows you to synchronize those projects correctly in a different workspace.</p>
+    <p class="Head"><img src="../images/Image268_export_team.png" alt="Export team project set page" border="0"></p>
+    <p class="Head"></p>
+    <table border="1" cellspacing="0">
+      <caption>
+        Export - Team Project Set Options
+      </caption>
+      <thead>
+        <tr>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Option</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Description</p>
+          </th>
+          <th rowspan="1" colspan="1">
+            <p class="Para">Default</p>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">Select projects</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The project(s) to export to the team project set file.</p>
+          </td>
+          <td rowspan="1" colspan="1" valign="top" align="left">
+            <p class="Para">The selected projects</p>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="1">
+            <p class="Para">File name</p>
+          </td>
+          <td colspan="1">
+            <p class="Para">The path and name of the file to export to.</p>
+          </td>
+          <td colspan="1">
+            <p class="Para">&lt;blank&gt;</p>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+  <h3 class="related">Related tasks</h3><a href=
+  "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-export-jar.htm">JAR Export Wizard</a><br>
+  <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-export-javadoc.htm">Export Javadoc Wizard</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-72.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-72.htm
index 62ae5d9..490ce4c 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-72.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-72.htm
@@ -1,45 +1,31 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation, Red Hat, and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<meta http-equiv="Content-Style-Type" content="text/css"/>
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Preferences</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation, Red Hat, and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Preferences</title>
 </head>
 <body>
-
-<h1>Preferences</h1>
-
-<p>Use the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"/>
-<b>Preferences</b></a> dialog pages to set how you want Eclipse to operate. The menu path is "Window &gt; Preferences" on Windows and Linux -
-on macOS the Preferences can be found in the "App" menu.
-</p>
-
-<p>You can browse the Preferences dialog pages by looking through all the titles 
-in the left pane or search a smaller set of titles by using the filter field at 
-the top of the left pane. 
-The results returned by the filter will match both Preference page titles and
-keywords such as "appearance" and "java". 
-However, to find specific functions you may have to search the online help 
-instead.
-</p>
-
-<p>The arrow controls in the upper-right of the right pane 
-<img src="../images/backward_nav.svg" alt="Navigate backwards image"/>
-<img src="../images/forward_nav.svg" alt="Navigate forwards image"/> 
-enable you to navigate through previously viewed pages. 
-To return to a page after viewing several pages, 
-click the drop-down arrow to display a list of your recently viewed 
-preference pages.
-</p> 
-
-<p>Preference pages contributed by plug-ins are included in this dialog.</p> 
-
-<h3 class="related">Related reference</h3>
-<a href="ref-23.htm">Workbench window layout</a>
-
+  <h1>Preferences</h1>
+  <p>Use the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <b>Preferences</b></a> dialog pages
+  to set how you want Eclipse to operate. The menu path is "Window &gt; Preferences" on Windows and Linux - on macOS
+  the Preferences can be found in the "App" menu.</p>
+  <p>You can browse the Preferences dialog pages by looking through all the titles in the left pane or search a smaller
+  set of titles by using the filter field at the top of the left pane. The results returned by the filter will match
+  both Preference page titles and keywords such as "appearance" and "java". However, to find specific functions you may
+  have to search the online help instead.</p>
+  <p>The arrow controls in the upper-right of the right pane <img src="../images/backward_nav.svg" alt=
+  "Navigate backwards image" /> <img src="../images/forward_nav.svg" alt="Navigate forwards image" /> enable you to
+  navigate through previously viewed pages. To return to a page after viewing several pages, click the drop-down arrow
+  to display a list of your recently viewed preference pages.</p>
+  <p>Preference pages contributed by plug-ins are included in this dialog.</p>
+  <h3 class="related">Related reference</h3><a href="ref-23.htm">Workbench window layout</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-9.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-9.htm
index feb6416..3c995ad 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-9.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-9.htm
@@ -1,113 +1,106 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta http-equiv="Content-Style-Type" content="text/css">
-   <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
-   <title>Workspace</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<link REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
+  <title>Workspace</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
 </head>
 <body bgcolor="#FFFFFF">
-
-<h1 CLASS="Head"> Workspace</h1>
-<p CLASS="Head">On the
-
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workspace)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>General &gt; Workspace</strong></a>
-
-  preference page, you can manage 
-  various IDE-specific workspace preferences settings in the Workbench. </p>
-
-<table width="75%" border="1">
-  <tr> 
-    <td><strong>Option</strong></td>
-    <td><strong>Description</strong></td>
-    <td><strong>Default</strong></td>
-  </tr>
-  <tr> 
-    <td>Refresh using native hooks or polling</td>
-    <td>If this option is turned on then the workspace resources will be synchronized 
-        with their corresponding resources in the file system automatically
-        using native refresh providers (on Windows) or a polling mechanism.
-      	<p><strong>Note</strong>: This can potentially be a lengthy operation depending 
-        on the number of resources you have in your workspace.</p></td>
-    <td>Off </td>
-  </tr>
-  <tr> 
-    <td>Refresh on access</td>
-    <td>If this option is turned on then files discovered to be out-of-sync by the workspace, 
-    	for example while accessing the file content by an editor, 
-    	will be automatically asynchronously refreshed.</td>
-    <td>Off </td>
-  </tr>
-  <tr> 
-    <td>Always close unrelated projects without prompt</td>
-    <td>If this option is selected, unrelated projects will be closed without prompt.
-    <br>Uncheck this option if you want to be asked first.
-     </td>
-    <td>Off</td>
-  </tr>
-  <tr> 
-    <td>Workspace save interval (in minutes) </td>
-    <td>This number indicates how often the state of the workspace is automatically 
-      saved to disk.</td>
-    <td>5</td>
-  </tr>
-  <tr> 
-    <td>Workspace title (shown in window title) </td>
-    <td>This string plus " - " will be prepended to the computed title of each workbench window.</td>
-    <td></td>
-  </tr>
-  <tr> 
-    <td>Open referenced projects when a 
-      project is opened</td>
-    <td>If this option is enabled opening 
-      a project will also open and closed projects it references. Select prompt 
+  <h1 class="Head">Workspace</h1>
+  <p class="Head">On the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workspace)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt;
+  Workspace</strong></a> preference page, you can manage various IDE-specific workspace preferences settings in the
+  Workbench.</p>
+  <table width="75%" border="1">
+    <tr>
+      <td><strong>Option</strong></td>
+      <td><strong>Description</strong></td>
+      <td><strong>Default</strong></td>
+    </tr>
+    <tr>
+      <td>Refresh using native hooks or polling</td>
+      <td>
+        If this option is turned on then the workspace resources will be synchronized with their corresponding
+        resources in the file system automatically using native refresh providers (on Windows) or a polling mechanism.
+        <p><strong>Note</strong>: This can potentially be a lengthy operation depending on the number of resources you
+        have in your workspace.</p>
+      </td>
+      <td>Off</td>
+    </tr>
+    <tr>
+      <td>Refresh on access</td>
+      <td>If this option is turned on then files discovered to be out-of-sync by the workspace, for example while
+      accessing the file content by an editor, will be automatically asynchronously refreshed.</td>
+      <td>Off</td>
+    </tr>
+    <tr>
+      <td>Always close unrelated projects without prompt</td>
+      <td>If this option is selected, unrelated projects will be closed without prompt.<br>
+      Uncheck this option if you want to be asked first.</td>
+      <td>Off</td>
+    </tr>
+    <tr>
+      <td>Workspace save interval (in minutes)</td>
+      <td>This number indicates how often the state of the workspace is automatically saved to disk.</td>
+      <td>5</td>
+    </tr>
+    <tr>
+      <td>Workspace title (shown in window title)</td>
+      <td>This string plus " - " will be prepended to the computed title of each workbench window.</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>Open referenced projects when a project is opened</td>
+      <td>If this option is enabled opening a project will also open and closed projects it references. Select prompt
       if you wish to be asked first.</td>
-    <td>Prompt</td>
-  </tr>
-  <tr> 
-    <td>Command for launching system explorer</td>
-    <td>Use this option to specify what system command is executed for <b>Show In &gt; System Explorer</b>.
-    Platform defaults:
-    <ul>
-    	<li>Windows: explorer /E,/select=${selected_resource_loc}</li>
-    	<li>Linux: dbus-send --print-reply --dest=org.freedesktop.FileManager1 /org/freedesktop/FileManager1 org.freedesktop.FileManager1.ShowItems array:string:"${selected_resource_uri}" string:""</li>
-    	<li>Mac: open -R "${selected_resource_loc}"</li>
-    </ul>
-    Supported variables:
-    <ul>
-    	<li>${selected_resource_loc} - absolute path to the resource</li>
-    	<li>${selected_resource_uri} - file: URI for the resource</li>
-    	<li>${selected_resource_parent_loc} - absolute path to the parent directory</li>
-    </ul>
-    For older versions of linux, you can use the nautilus command: <code>nautilus "${selected_resource_parent_loc}"</code>
-    </td>
-    <td>Platform default</td>
-  </tr>
-  <tr>
-    <td>Report unknow project nature as</td>
-    <td>When a project is configured with a nature which is not defined in the Workbench, a marker can be added on the project resource. This preference allows to configure the severity of such marker.</td>
-    <td>Warning</td>
-  <tr> 
-    <td>Text file encoding</td>
-    <td> Use 
-        this option to specify the encoding to use when saving text files in editors.</td>
-    <td>Default</td>
-  </tr>
-  <tr> 
-    <td>New text file line delimiter</td>
-    <td>Use this option to specify the line delimiter to use for new text files.
-        <p><strong>Note:</strong> 
-        This will generally not affect the file line delimiter for<br>
-        existing files.</p></td>
-    <td>Default</td>
-  </tr>
-</table>
+      <td>Prompt</td>
+    </tr>
+    <tr>
+      <td>Command for launching system explorer</td>
+      <td>
+        Use this option to specify what system command is executed for <b>Show In &gt; System Explorer</b>. Platform
+        defaults:
+        <ul>
+          <li>Windows: explorer /E,/select=${selected_resource_loc}</li>
+          <li>Linux: dbus-send --print-reply --dest=org.freedesktop.FileManager1 /org/freedesktop/FileManager1
+          org.freedesktop.FileManager1.ShowItems array:string:"${selected_resource_uri}" string:""</li>
+          <li>Mac: open -R "${selected_resource_loc}"</li>
+        </ul>Supported variables:
+        <ul>
+          <li>${selected_resource_loc} - absolute path to the resource</li>
+          <li>${selected_resource_uri} - file: URI for the resource</li>
+          <li>${selected_resource_parent_loc} - absolute path to the parent directory</li>
+        </ul>For older versions of linux, you can use the nautilus command: <code>nautilus
+        "${selected_resource_parent_loc}"</code>
+      </td>
+      <td>Platform default</td>
+    </tr>
+    <tr>
+      <td>Report unknow project nature as</td>
+      <td>When a project is configured with a nature which is not defined in the Workbench, a marker can be added on
+      the project resource. This preference allows to configure the severity of such marker.</td>
+      <td>Warning</td>
+    </tr>
+    <tr>
+      <td>Text file encoding</td>
+      <td>Use this option to specify the encoding to use when saving text files in editors.</td>
+      <td>Default</td>
+    </tr>
+    <tr>
+      <td>New text file line delimiter</td>
+      <td>
+        Use this option to specify the line delimiter to use for new text files.
+        <p><strong>Note:</strong> This will generally not affect the file line delimiter for<br>
+        existing files.</p>
+      </td>
+      <td>Default</td>
+    </tr>
+  </table>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-antcontentassist.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-antcontentassist.htm
index 02daf17..68554bf 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-antcontentassist.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-antcontentassist.htm
@@ -1,71 +1,62 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Ant Content Assist Preferences</title>
-
-</HEAD>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Ant Content Assist Preferences</title>
+</head>
 <body>
-<h1> Ant Content Assist Preferences</h1>
-<p>
-	The following preferences can be changed on the
-	<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntCodeAssistPreferencePage)")'>
-	<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-	<strong>Ant &gt; Editor &gt; Content Assist</strong></a> preference page.
-</p>
-<table border="1" cellspacing="0" width="80%">
-  <thead>
-  <tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td width="25%"> Insert single proposals automatically</td>
-      <td>This option allows you to automatically insert single proposals.</td>
-      <td width="8%" align="center">On</td>
-    </tr>
-    <tr> 
-      <td width="25%">Provide proposals for user defined tasks (may lock referenced JAR files)</td>
-      <td>This option allows you to provide proposals for user defined tasks.</td>
-      <td width="8%" align="center">On</td>
-    </tr>
-    <tr> 
-      <td width="25%">Enable auto activation</td>
-      <td >This option enables and disables auto activation.</td>
-      <td width="8%" align="center">On</td>
-    </tr>
-    <tr> 
-      <td width="25%">Auto activation delay</td>
-      <td>This option allows you to set the auto activation delay.</td>
-      <td width="8%" align="center">500</td>
-    </tr>
-    <tr> 
-      <td width="25%">Auto activation triggers</td>
-      <td >This option allows you to set the auto activation triggers.</td>
-      <td width="8%" align="center">&lt;${</td>
-    </tr>
-  </tbody>
-</table>
-
-<h3 class="related">Related concepts</h3>
-	<a href="../concepts/concepts-antsupport.htm">Ant support</a> 
-
-<h3 class="related">Related reference</h3>
-	<a href="ref-anteditor.htm">Ant Editor</a><br>
-	<a href="../reference/ref-antprefs.htm">Ant preference page</a><br>
-	<a href="ref-anteditorprefs.htm">Ant editor preferences</a><br>
-	<a href="../reference/ref-antruntimeprefs.htm">Ant runtime preferences</a><br>
-	<a href="../reference/ref-antformatter.htm">Ant formatter preferences</a><br>
-	<a href="../reference/ref-anttemplates.htm">Ant templates preferences</a>
-
+  <h1>Ant Content Assist Preferences</h1>
+  <p>The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntCodeAssistPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Ant &gt; Editor &gt; Content
+  Assist</strong></a> preference page.</p>
+  <table border="1" cellspacing="0" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td width="25%">Insert single proposals automatically</td>
+        <td>This option allows you to automatically insert single proposals.</td>
+        <td width="8%" align="center">On</td>
+      </tr>
+      <tr>
+        <td width="25%">Provide proposals for user defined tasks (may lock referenced JAR files)</td>
+        <td>This option allows you to provide proposals for user defined tasks.</td>
+        <td width="8%" align="center">On</td>
+      </tr>
+      <tr>
+        <td width="25%">Enable auto activation</td>
+        <td>This option enables and disables auto activation.</td>
+        <td width="8%" align="center">On</td>
+      </tr>
+      <tr>
+        <td width="25%">Auto activation delay</td>
+        <td>This option allows you to set the auto activation delay.</td>
+        <td width="8%" align="center">500</td>
+      </tr>
+      <tr>
+        <td width="25%">Auto activation triggers</td>
+        <td>This option allows you to set the auto activation triggers.</td>
+        <td width="8%" align="center">&lt;${</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-antsupport.htm">Ant support</a>
+  <h3 class="related">Related reference</h3><a href="ref-anteditor.htm">Ant Editor</a><br>
+  <a href="../reference/ref-antprefs.htm">Ant preference page</a><br>
+  <a href="ref-anteditorprefs.htm">Ant editor preferences</a><br>
+  <a href="../reference/ref-antruntimeprefs.htm">Ant runtime preferences</a><br>
+  <a href="../reference/ref-antformatter.htm">Ant formatter preferences</a><br>
+  <a href="../reference/ref-anttemplates.htm">Ant templates preferences</a>
 </body>
-</HTML>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-anteditor.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-anteditor.htm
index e3499b0..27ad17d 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-anteditor.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-anteditor.htm
@@ -1,52 +1,38 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Ant editor</title> 
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Ant editor</title>
 </head>
 <body>
-     
-<h1> Ant editor</h1>
-     
-<p>The Ant editor provides specialized features for editor Ant buildfiles. 
-Associated with the editor is a Ant buildfile specific <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-outline.htm">Outline view</a></b> which shows the structure of the Ant build file. 
-It is updated as you edit the buildfile</p>
-
-The editor includes the following features:
-
-<ul>
-  <li>Syntax highlighting</li>
-
-  <li>Content/code assist (including Ant specific templates)</li>
-
-  <li>Annotations</li>
-</ul> 
-<p>
-	The most common way to invoke the Ant editor is to open an Ant buildfile from 
-  	one of the navigation views or <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-package-explorer.htm">Package Explorer</a></b> using pop-up menus or by clicking 
-  	the file (single or double-click depending on your preference settings).
-</p>  
-	<h3 class="related">Related concepts</h3>
-    <a href="../concepts/concepts-antsupport.htm">Ant support</a><br>
-    <a href="../concepts/concepts-exttools.htm">External tools</a>
-
-<h3 class="related">Related tasks</h3>
-	<a href="../tasks/tasks-ant-running.htm">Running Ant buildfiles</a><br>
-	<a href="../tasks/tasks-ant-classpath.htm">Modifying the Ant classpath</a><br>
-	<a href="../tasks/tasks-ant-addtasksandtypes.htm">Adding new Ant tasks and types</a><br>
-	<a href="../tasks/tasks-ant-version.htm">Using a different version of Ant</a>
-
-<h3 class="related">Related reference</h3>
-    <a href="ref-anteditorprefs.htm">Ant editor preferences</a><br>
-    <a href="ref-antcontentassist.htm">Ant content assist preferences</a><br>
-    <a href="ref-anticons.htm">External Tools and Ant icons</a><br>
-    <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-outline.htm">Outline view</a><br>
-    <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-package-explorer.htm">Package Explorer</a>
-
+  <h1>Ant editor</h1>
+  <p>The Ant editor provides specialized features for editor Ant buildfiles. Associated with the editor is a Ant
+  buildfile specific <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-outline.htm">Outline
+  view</a></b> which shows the structure of the Ant build file. It is updated as you edit the buildfile</p>The editor
+  includes the following features:
+  <ul>
+    <li>Syntax highlighting</li>
+    <li>Content/code assist (including Ant specific templates)</li>
+    <li>Annotations</li>
+  </ul>
+  <p>The most common way to invoke the Ant editor is to open an Ant buildfile from one of the navigation views or
+  <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-package-explorer.htm">Package
+  Explorer</a></b> using pop-up menus or by clicking the file (single or double-click depending on your preference
+  settings).</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-antsupport.htm">Ant support</a><br>
+  <a href="../concepts/concepts-exttools.htm">External tools</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-ant-running.htm">Running Ant buildfiles</a><br>
+  <a href="../tasks/tasks-ant-classpath.htm">Modifying the Ant classpath</a><br>
+  <a href="../tasks/tasks-ant-addtasksandtypes.htm">Adding new Ant tasks and types</a><br>
+  <a href="../tasks/tasks-ant-version.htm">Using a different version of Ant</a>
+  <h3 class="related">Related reference</h3><a href="ref-anteditorprefs.htm">Ant editor preferences</a><br>
+  <a href="ref-antcontentassist.htm">Ant content assist preferences</a><br>
+  <a href="ref-anticons.htm">External Tools and Ant icons</a><br>
+  <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-outline.htm">Outline view</a><br>
+  <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-package-explorer.htm">Package Explorer</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-anteditorprefs.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-anteditorprefs.htm
index 0ffe7c0..b6be698 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-anteditorprefs.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-anteditorprefs.htm
@@ -1,189 +1,181 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Ant Editor Preferences</title>
-
-</HEAD>
-<BODY>
-<H1 CLASS="Head">Ant Editor Preferences</H1>
-<p>The following preferences can be changed on the
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntEditorPreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Ant &gt; Editor</strong></a> preference page.</p>
-<h2>Appearance options</h2>
-<table border="1" cellspacing="0" width="80%">
-  <thead>
-  	<tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td> Mark occurrences of the selected element in the current buildfile</td>
-      <td>This option allows you to select elements and mark occurrences in the current buildfile.</td>
-      <td align="center">Off</td>
-    </tr>
-    <tr> 
-      <td>Keep marks when selection changes</td>
-      <td>This option allows you to keep marks when the selection changes.</td>
-      <td align="center">On</td>
-    </tr>
-  </tbody>
-</table>
-
-<h2>Syntax options</h2>
-<p>The Foreground options located on the Syntax tab, allow you to format the font 
-  of comments, constant strings, DTD declarations, processing instructions, tags 
-  and text. The Preview pane allows you to see your changes before you apply them. 
-  </p>
-<table border="1" cellspacing="0" width="80%">
-  <thead>
-  	<tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td>Foreground</td>
-      <td>This table is used to change the foreground colour of the selected element (within the table).</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Colour</td>
-      <td>This option allows you to select a colour to set for the selected foreground element.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Bold</td>
-      <td>This option allows you to set the bold state of the selected foreground element.</td>
-      <td align="center">Off</td>
-    </tr>
-    <tr> 
-      <td>Italic</td>
-      <td>This option allows you to set the italic state of the selected foreground element.</td>
-      <td align="center">Off</td>
-    </tr>
-    <tr> 
-      <td>Preview</td>
-      <td>Shows you a preview of the changes made to the selected foreground element.</td>
-      <td align="center"></td>
-    </tr>
-  </tbody>
-</table>
-<h2>Problems options</h2>
-<p>The Problems options allow you to ignore all buildfile problems or to specify 
-  the specific files that you do not want the Ant Editor to check for problems. 
-  You can also set the severity level for buildfile problems such as task configuration, 
-  an incomplete classpath, property setting tasks, import tasks, and security 
-  problems. </p>
-<table border="1" cellspacing="0" width="80%">
-  <thead>
-  	<tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td>Ignore all buildfile problems</td>
-      <td>This option allows you to ignore all buildfile problems by default.</td>
-      <td align="center">Off</td>
-    </tr>
-    <tr> 
-      <td>Names</td>
-      <td>This option allows you to specify the names of buildfiles that will NOT be checked for problems in the Ant editor.
-      Entries in this field are comma-separated.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Task configuration</td>
-      <td>This option allows you to set the severity for task configuration problems.</td>
-      <td align="center">Ignore</td>
-    </tr>
-    <tr> 
-      <td>Incomplete classpath</td>
-      <td>This option allows you to set the severity for incomplete classpath problems.</td>
-      <td align="center">Warning</td>
-    </tr>
-    <tr> 
-      <td>Property setting tasks</td>
-      <td>This option allows you to set the severity for property setting tasks problems.</td>
-      <td align="center">Ignore</td>
-    </tr>
-    <tr> 
-      <td>Import tasks</td>
-      <td>This option allows you to set the severity for import tasks problems.</td>
-      <td align="center">Warning</td>
-    </tr>
-    <tr> 
-      <td>Security problems</td>
-      <td>This option allows you to set the severity for security problems.</td>
-      <td align="center">Warning</td>
-    </tr>
-  </tbody>
-</table>
-
-<h2>Folding options</h2>
-<p>The Folding options allow you to enable folding when opening a new editor and 
-  to specify which region types should be folded.</p>
-<table border="1" cellspacing="0" width="80%">
-  <thead>
-  	<tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td>Enable folding when opening a new editor</td>
-      <td>This option allows you to always enable folding for any newly created Ant editors.</td>
-      <td align="center">On</td>
-    </tr>
-    <tr> 
-      <td>DTD blocks</td>
-      <td>This option allows you to always have DTD blocks in a buildfile automatically folded when opened in an Ant editor.</td>
-      <td align="center">Off</td>
-    </tr>
-    <tr> 
-      <td>Comments</td>
-      <td>This option allows you to always have comments in a buildfile automatically folded when opened in an Ant editor.</td>
-      <td align="center">Off</td>
-    </tr>
-    <tr> 
-      <td>Defining tasks</td>
-      <td>This option allows you to always have defining tasks in a buildfile automatically folded when opened in an Ant editor.</td>
-      <td align="center">Off</td>
-    </tr>
-    <tr> 
-      <td>Targets</td>
-      <td>This option allows you to always have targets in a buildfile automatically folded when opened in an Ant editor.</td>
-      <td align="center">Off</td>
-    </tr>
-  </tbody>
-</table>
-
-<h3 class="related">Related concepts</h3>
-	<a href="../concepts/concepts-antsupport.htm">Ant support</a> 
-
-<h3 class="related">Related reference</h3>
-	<a href="ref-anteditor.htm">Ant Editor</a><br>
-	<a href="../reference/ref-antprefs.htm">General Ant preferences</a><br>
-	<a href="../reference/ref-antruntimeprefs.htm">Ant runtime preferences</a><br>
-	<a href="../reference/ref-antformatter.htm">Ant formatter preferences</a><br>
-	<a href="../reference/ref-anttemplates.htm">Ant templates preferences</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Ant Editor Preferences</title>
+</head>
+<body>
+  <h1 class="Head">Ant Editor Preferences</h1>
+  <p>The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntEditorPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Ant &gt; Editor</strong></a>
+  preference page.</p>
+  <h2>Appearance options</h2>
+  <table border="1" cellspacing="0" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Mark occurrences of the selected element in the current buildfile</td>
+        <td>This option allows you to select elements and mark occurrences in the current buildfile.</td>
+        <td align="center">Off</td>
+      </tr>
+      <tr>
+        <td>Keep marks when selection changes</td>
+        <td>This option allows you to keep marks when the selection changes.</td>
+        <td align="center">On</td>
+      </tr>
+    </tbody>
+  </table>
+  <h2>Syntax options</h2>
+  <p>The Foreground options located on the Syntax tab, allow you to format the font of comments, constant strings, DTD
+  declarations, processing instructions, tags and text. The Preview pane allows you to see your changes before you
+  apply them.</p>
+  <table border="1" cellspacing="0" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Foreground</td>
+        <td>This table is used to change the foreground colour of the selected element (within the table).</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Colour</td>
+        <td>This option allows you to select a colour to set for the selected foreground element.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Bold</td>
+        <td>This option allows you to set the bold state of the selected foreground element.</td>
+        <td align="center">Off</td>
+      </tr>
+      <tr>
+        <td>Italic</td>
+        <td>This option allows you to set the italic state of the selected foreground element.</td>
+        <td align="center">Off</td>
+      </tr>
+      <tr>
+        <td>Preview</td>
+        <td>Shows you a preview of the changes made to the selected foreground element.</td>
+        <td align="center"></td>
+      </tr>
+    </tbody>
+  </table>
+  <h2>Problems options</h2>
+  <p>The Problems options allow you to ignore all buildfile problems or to specify the specific files that you do not
+  want the Ant Editor to check for problems. You can also set the severity level for buildfile problems such as task
+  configuration, an incomplete classpath, property setting tasks, import tasks, and security problems.</p>
+  <table border="1" cellspacing="0" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Ignore all buildfile problems</td>
+        <td>This option allows you to ignore all buildfile problems by default.</td>
+        <td align="center">Off</td>
+      </tr>
+      <tr>
+        <td>Names</td>
+        <td>This option allows you to specify the names of buildfiles that will NOT be checked for problems in the Ant
+        editor. Entries in this field are comma-separated.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Task configuration</td>
+        <td>This option allows you to set the severity for task configuration problems.</td>
+        <td align="center">Ignore</td>
+      </tr>
+      <tr>
+        <td>Incomplete classpath</td>
+        <td>This option allows you to set the severity for incomplete classpath problems.</td>
+        <td align="center">Warning</td>
+      </tr>
+      <tr>
+        <td>Property setting tasks</td>
+        <td>This option allows you to set the severity for property setting tasks problems.</td>
+        <td align="center">Ignore</td>
+      </tr>
+      <tr>
+        <td>Import tasks</td>
+        <td>This option allows you to set the severity for import tasks problems.</td>
+        <td align="center">Warning</td>
+      </tr>
+      <tr>
+        <td>Security problems</td>
+        <td>This option allows you to set the severity for security problems.</td>
+        <td align="center">Warning</td>
+      </tr>
+    </tbody>
+  </table>
+  <h2>Folding options</h2>
+  <p>The Folding options allow you to enable folding when opening a new editor and to specify which region types should
+  be folded.</p>
+  <table border="1" cellspacing="0" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Enable folding when opening a new editor</td>
+        <td>This option allows you to always enable folding for any newly created Ant editors.</td>
+        <td align="center">On</td>
+      </tr>
+      <tr>
+        <td>DTD blocks</td>
+        <td>This option allows you to always have DTD blocks in a buildfile automatically folded when opened in an Ant
+        editor.</td>
+        <td align="center">Off</td>
+      </tr>
+      <tr>
+        <td>Comments</td>
+        <td>This option allows you to always have comments in a buildfile automatically folded when opened in an Ant
+        editor.</td>
+        <td align="center">Off</td>
+      </tr>
+      <tr>
+        <td>Defining tasks</td>
+        <td>This option allows you to always have defining tasks in a buildfile automatically folded when opened in an
+        Ant editor.</td>
+        <td align="center">Off</td>
+      </tr>
+      <tr>
+        <td>Targets</td>
+        <td>This option allows you to always have targets in a buildfile automatically folded when opened in an Ant
+        editor.</td>
+        <td align="center">Off</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-antsupport.htm">Ant support</a>
+  <h3 class="related">Related reference</h3><a href="ref-anteditor.htm">Ant Editor</a><br>
+  <a href="../reference/ref-antprefs.htm">General Ant preferences</a><br>
+  <a href="../reference/ref-antruntimeprefs.htm">Ant runtime preferences</a><br>
+  <a href="../reference/ref-antformatter.htm">Ant formatter preferences</a><br>
+  <a href="../reference/ref-anttemplates.htm">Ant templates preferences</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-antformatter.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-antformatter.htm
index 48eb4a0..98cc1b6 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-antformatter.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-antformatter.htm
@@ -1,67 +1,58 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Ant Formatter Preferences</title>
-
-</HEAD>
-<BODY>
-<h1>Ant Formatter Preferences</h1>
-<p>
-	The following preferences can be changed on the
-  	<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntCodeFormatterPreferencePage)")'>
-  	<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  	<strong>Ant &gt; Editor &gt; Formatter</strong></a> preference page.
-</p>
-<table border="1" cellspacing="0" style="width: 80%;">
-  <thead>
-  <tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td>Indentation - Tab size</td>
-      <td>This option controls how many spaces are used to display tabs in the Ant editor.</td>
-      <td align="center">4</td>
-    </tr>
-    <tr> 
-      <td>Line Wrapping - Maximum line width</td>
-      <td>This option allows you to set the maximum line width for the Ant editor.</td>
-      <td align="center">80</td>
-    </tr>
-    <tr> 
-      <td>Line Wrapping - Wrap long element tags</td>
-      <td>This option allows you to wrap long element tags. The Preview pane will display a sample buildfile 
-          with this option.</td>
-      <td align="center">Off</td>
-    </tr>
-    <tr> 
-      <td>Line Wrapping - Align final '&gt;' in multi-line element tags</td>
-      <td>This option allows you 
-          to align the final '&gt;' in multi-line element tags. The Preview pane 
-          will display a sample buildfile with this option.</td>
-      <td align="center">Off</td>
-    </tr>
-  </tbody>
-</table>
-
-<h3 class="related">Related concepts</h3>
-	<a href="../concepts/concepts-antsupport.htm">Ant support</a> 
-<h3 class="related">Related reference</h3>
-	<a href="ref-anteditor.htm">Ant Editor</a><br>
-	<a href="../reference/ref-antprefs.htm">General Ant preferences</a><br>
-	<a href="../reference/ref-antruntimeprefs.htm">Ant runtime preferences</a><br>
-	<a href="../reference/ref-anteditorprefs.htm">Ant editor preferences</a><br>
-	<a href="../reference/ref-anttemplates.htm">Ant templates preferences</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Ant Formatter Preferences</title>
+</head>
+<body>
+  <h1>Ant Formatter Preferences</h1>
+  <p>The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntCodeFormatterPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Ant &gt; Editor &gt;
+  Formatter</strong></a> preference page.</p>
+  <table border="1" cellspacing="0" style="width: 80%;">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Indentation - Tab size</td>
+        <td>This option controls how many spaces are used to display tabs in the Ant editor.</td>
+        <td align="center">4</td>
+      </tr>
+      <tr>
+        <td>Line Wrapping - Maximum line width</td>
+        <td>This option allows you to set the maximum line width for the Ant editor.</td>
+        <td align="center">80</td>
+      </tr>
+      <tr>
+        <td>Line Wrapping - Wrap long element tags</td>
+        <td>This option allows you to wrap long element tags. The Preview pane will display a sample buildfile with
+        this option.</td>
+        <td align="center">Off</td>
+      </tr>
+      <tr>
+        <td>Line Wrapping - Align final '&gt;' in multi-line element tags</td>
+        <td>This option allows you to align the final '&gt;' in multi-line element tags. The Preview pane will display
+        a sample buildfile with this option.</td>
+        <td align="center">Off</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-antsupport.htm">Ant support</a>
+  <h3 class="related">Related reference</h3><a href="ref-anteditor.htm">Ant Editor</a><br>
+  <a href="../reference/ref-antprefs.htm">General Ant preferences</a><br>
+  <a href="../reference/ref-antruntimeprefs.htm">Ant runtime preferences</a><br>
+  <a href="../reference/ref-anteditorprefs.htm">Ant editor preferences</a><br>
+  <a href="../reference/ref-anttemplates.htm">Ant templates preferences</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-anticons.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-anticons.htm
index 71e386b..1fa5d15 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-anticons.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-anticons.htm
@@ -1,260 +1,148 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-	<meta http-equiv="Content-Style-Type" content="text/css">
-	<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-    <title>External Tools and Ant icons</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>External Tools and Ant icons</title>
 </head>
 <body>
-	<h1>External Tools and Ant icons</h1>
-    <h2>Objects</h2>
-    <table cellspacing="0" border="1" width="40%">
-      <tbody>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/ant_buildfile.svg"  alt="Ant buildfiles"><br>
-          </td>
-          <td valign="top">
-            Ant buildfiles<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/ant_target_err.svg"  alt="Ant target containing an error"><br>
-          </td>
-          <td valign="top" width="90%">
-            Ant target containing an error<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/ant_target_err.svg"  alt="Invalid project builder"><br>
-          </td>
-          <td valign="top" width="90%">
-            Invalid project builder<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/defaulttarget_obj.svg"  alt="Default target"><br>
-          </td>
-          <td valign="top" width="90%">
-            Default target<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/targetpublic_obj.svg"  alt="Ant target"><br>
-          </td>
-          <td valign="top" width="90%">
-            Public Ant target (target with description)<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/targetinternal_obj.svg"  alt="Ant internal target"><br>
-          </td>
-          <td valign="top" width="90%">
-            Ant internal target (target with no description)<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/jar_l_obj.svg"  alt="Jar file"><br>
-          </td>
-          <td valign="top" width="90%">
-            Jar file<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/property_obj.svg"  alt="Ant property"><br>
-          </td>
-          <td valign="top" width="90%">
-            Ant property<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/task_obj.svg"  alt="Ant task"><br>
-          </td>
-          <td valign="top" width="90%">
-            Ant task<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/type.svg"  alt="Ant type"><br>
-          </td>
-          <td valign="top" width="90%">
-            Ant type<br>
-          </td>
-        </tr>
-         <tr>
-          <td valign="middle" align="center">
-            <img src="../images/import_obj.svg"  alt="Ant import task"><br>
-          </td>
-          <td valign="top" width="90%">
-            Ant import task<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/macrodef_obj.svg"  alt="Ant macrodef task"><br>
-          </td>
-          <td valign="top" width="90%">
-            Ant macrodef task<br>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <br>
-    <h2>
-      Launch configurations
-    </h2>
-    <table cellspacing="0" border="1" width="40%">
-      <tbody>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/external_tools.svg"  alt="Launch external tool"><br>
-          </td>
-          <td valign="top" width="90%">
-            Launch external tool<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/ant_view.svg"  alt="Ant launch configuration"><br>
-          </td>
-          <td valign="top">
-            Ant launch configuration<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/external_tools.svg"  alt="Program launch configuration"><br>
-          </td>
-          <td valign="top" width="90%">
-            Program launch configuration<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/main_tab.svg"  alt="Main tab"><br>
-          </td>
-          <td valign="top" width="90%">
-            Main tab<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/refresh_tab.svg"  alt="Refresh tab"><br>
-          </td>
-          <td valign="top" width="90%">
-            Refresh tab<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/build_tab.svg"  alt="Build tab"><br>
-          </td>
-          <td valign="top" width="90%">
-            Build tab<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/ant_targets.svg"  alt="Targets tab"><br>
-          </td>
-          <td valign="top" width="90%">
-            Targets tab<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/prop_ps.svg"  alt="Properties tab"><br>
-          </td>
-          <td valign="top" width="90%">
-            Properties tab<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/classpath_obj.svg"  alt="Classpath tab"><br>
-          </td>
-          <td valign="top" width="90%">
-            Classpath tab<br>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-   <br>
-    <h2>
-      Ant View
-    </h2>
-    <table cellspacing="0" border="1" width="40%">
-      <tbody>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/ant_view.svg"  alt="Ant view"><br>
-          </td>
-          <td valign="top" width="90%">
-            Ant view<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/add_co.svg"  alt="Add buildfile"><br>
-          </td>
-          <td valign="top" width="90%">
-            Add buildfile<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/search.svg"  alt="Add buildfiles with search"><br>
-          </td>
-          <td valign="top" width="90%">
-            Add buildfiles with search<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/run_exc.svg"  alt="Run selected buildfile or selected target"><br>
-          </td>
-          <td valign="top" width="90%">
-            Run selected buildfile or selected target<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/remove_co.svg"  alt="Remove selected buildfiles"><br>
-          </td>
-          <td valign="top" width="90%">
-            Remove selected buildfiles<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/removeall_co.svg"  alt="Remove all buildfiles"><br>
-          </td>
-          <td valign="top" width="90%">
-            Remove all buildfiles<br>
-          </td>
-        </tr>
-        <tr>
-          <td valign="middle" align="center">
-            <img src="../images/filter_internal_targets.svg"  alt="Hide Internal Targets"><br>
-          </td>
-          <td valign="top" width="90%">
-            Hide Internal Targets<br>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <br>
-  </body>
+  <h1>External Tools and Ant icons</h1>
+  <h2>Objects</h2>
+  <table cellspacing="0" border="1" width="40%">
+    <tbody>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/ant_buildfile.svg" alt="Ant buildfiles"><br></td>
+        <td valign="top">Ant buildfiles<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/ant_target_err.svg" alt=
+        "Ant target containing an error"><br></td>
+        <td valign="top" width="90%">Ant target containing an error<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/ant_target_err.svg" alt=
+        "Invalid project builder"><br></td>
+        <td valign="top" width="90%">Invalid project builder<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/defaulttarget_obj.svg" alt="Default target"><br></td>
+        <td valign="top" width="90%">Default target<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/targetpublic_obj.svg" alt="Ant target"><br></td>
+        <td valign="top" width="90%">Public Ant target (target with description)<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/targetinternal_obj.svg" alt=
+        "Ant internal target"><br></td>
+        <td valign="top" width="90%">Ant internal target (target with no description)<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/jar_l_obj.svg" alt="Jar file"><br></td>
+        <td valign="top" width="90%">Jar file<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/property_obj.svg" alt="Ant property"><br></td>
+        <td valign="top" width="90%">Ant property<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/task_obj.svg" alt="Ant task"><br></td>
+        <td valign="top" width="90%">Ant task<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/type.svg" alt="Ant type"><br></td>
+        <td valign="top" width="90%">Ant type<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/import_obj.svg" alt="Ant import task"><br></td>
+        <td valign="top" width="90%">Ant import task<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/macrodef_obj.svg" alt="Ant macrodef task"><br></td>
+        <td valign="top" width="90%">Ant macrodef task<br></td>
+      </tr>
+    </tbody>
+  </table><br>
+  <h2>Launch configurations</h2>
+  <table cellspacing="0" border="1" width="40%">
+    <tbody>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/external_tools.svg" alt="Launch external tool"><br></td>
+        <td valign="top" width="90%">Launch external tool<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/ant_view.svg" alt="Ant launch configuration"><br></td>
+        <td valign="top">Ant launch configuration<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/external_tools.svg" alt=
+        "Program launch configuration"><br></td>
+        <td valign="top" width="90%">Program launch configuration<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/main_tab.svg" alt="Main tab"><br></td>
+        <td valign="top" width="90%">Main tab<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/refresh_tab.svg" alt="Refresh tab"><br></td>
+        <td valign="top" width="90%">Refresh tab<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/build_tab.svg" alt="Build tab"><br></td>
+        <td valign="top" width="90%">Build tab<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/ant_targets.svg" alt="Targets tab"><br></td>
+        <td valign="top" width="90%">Targets tab<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/prop_ps.svg" alt="Properties tab"><br></td>
+        <td valign="top" width="90%">Properties tab<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/classpath_obj.svg" alt="Classpath tab"><br></td>
+        <td valign="top" width="90%">Classpath tab<br></td>
+      </tr>
+    </tbody>
+  </table><br>
+  <h2>Ant View</h2>
+  <table cellspacing="0" border="1" width="40%">
+    <tbody>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/ant_view.svg" alt="Ant view"><br></td>
+        <td valign="top" width="90%">Ant view<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/add_co.svg" alt="Add buildfile"><br></td>
+        <td valign="top" width="90%">Add buildfile<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/search.svg" alt="Add buildfiles with search"><br></td>
+        <td valign="top" width="90%">Add buildfiles with search<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/run_exc.svg" alt=
+        "Run selected buildfile or selected target"><br></td>
+        <td valign="top" width="90%">Run selected buildfile or selected target<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/remove_co.svg" alt=
+        "Remove selected buildfiles"><br></td>
+        <td valign="top" width="90%">Remove selected buildfiles<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/removeall_co.svg" alt="Remove all buildfiles"><br></td>
+        <td valign="top" width="90%">Remove all buildfiles<br></td>
+      </tr>
+      <tr>
+        <td valign="middle" align="center"><img src="../images/filter_internal_targets.svg" alt=
+        "Hide Internal Targets"><br></td>
+        <td valign="top" width="90%">Hide Internal Targets<br></td>
+      </tr>
+    </tbody>
+  </table><br>
+</body>
 </html>
-
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-antprefs.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-antprefs.htm
index 4905792..a297bf1 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-antprefs.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-antprefs.htm
@@ -1,81 +1,80 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>General Ant Preferences</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>General Ant Preferences</title>
 </head>
 <body>
-
-<h1>General Ant Preferences</h1>
-
-<p>
-	You can change the following preferences on the
-	<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntPreferencePage)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>Ant</strong></a> preference page.
-</p>
-
-<table border="1" cellspacing="0" cellpadding="5" width="80%">
-	<thead>
-		<tr>
-			<th width="25%">Option</th>
-			<th>Description</th>
-			<th width="8%">Default</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr >
-			<td>Names</td>
-			<td>Configures the buildfiles that Ant's "-find" emulation searches for.</td>
-			<td align="center">build.xml</td>
-		</tr>
-		<tr >
-			<td>Separate JRE Timeout</td>
-			<td>The time in milliseconds to wait for communication with the Java virtual machine when running an Ant build in a separate Java runtime environment.</td>
-			<td align="center">20000</td>
-		</tr>
-		<tr >
-			<td>Documentation URL</td>
-			<td>Enables you to browse for the applicable documentation URL.</td>
-			<td align="center"><a href="http://ant.apache.org/manual" target="_blank">http://ant.apache.org/manual</a></td>
-		</tr>
-		<tr >
-            <td>Always run new Ant configurations in the same JRE as the workspace</td>
-            <td>Allows you to automatically always have all new Ant launch configurations set to run in the same JRE as the workspace.</td>
-            <td align="center">Off</td>
-        </tr>
-		<tr >
-			<td>Warn when tools.jar is not on the classpath</td>
-			<td>Displays a warning when tools.jar is not on the classpath.</td>
-			<td align="center">On</td>
-		</tr>
-		<tr >
-			<td>Show error dialog when Ant build fails</td>
-			<td>Displays an error message when the Ant build fails.</td>
-			<td align="center">On</td>
-		</tr>
-		<tr >
-			<td>Create problem markers from <code>javac</code> results</td>
-			<td>Create warning and error markers from the build results of an Ant <code>javac</code> task. Marker creation requires that a console is allocated for the build and that the <code>listfiles</code> attribute of the <code>javac</code> task be set to true.</td>
-			<td align="center">Off</td>
-		</tr>
-		<tr >
-			<td>Ant Color Options</td>
-			<td>Configures the colors of the Ant build output.</td>
-			<td align="center">Varies by Ant output</td>
-		</tr>
-	</tbody>
-</table>
-<h3 class="related">Related concepts</h3>
-	<a href="../concepts/concepts-antsupport.htm">Ant support</a>
-
-<h3 class="related">Related reference</h3>
-	<a href="../reference/ref-antruntimeprefs.htm">Ant runtime preferences</a><br>
-	<a href="../reference/ref-anteditorprefs.htm">Ant editor preferences</a><br>
-	<a href="../reference/ref-antformatter.htm">Ant formatter preferences</a><br>
-	<a href="../reference/ref-anttemplates.htm">Ant templates preferences</a>
-
+  <h1>General Ant Preferences</h1>
+  <p>You can change the following preferences on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>Ant</strong></a> preference
+  page.</p>
+  <table border="1" cellspacing="0" cellpadding="5" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Names</td>
+        <td>Configures the buildfiles that Ant's "-find" emulation searches for.</td>
+        <td align="center">build.xml</td>
+      </tr>
+      <tr>
+        <td>Separate JRE Timeout</td>
+        <td>The time in milliseconds to wait for communication with the Java virtual machine when running an Ant build
+        in a separate Java runtime environment.</td>
+        <td align="center">20000</td>
+      </tr>
+      <tr>
+        <td>Documentation URL</td>
+        <td>Enables you to browse for the applicable documentation URL.</td>
+        <td align="center"><a href="http://ant.apache.org/manual" target="_blank">http://ant.apache.org/manual</a></td>
+      </tr>
+      <tr>
+        <td>Always run new Ant configurations in the same JRE as the workspace</td>
+        <td>Allows you to automatically always have all new Ant launch configurations set to run in the same JRE as the
+        workspace.</td>
+        <td align="center">Off</td>
+      </tr>
+      <tr>
+        <td>Warn when tools.jar is not on the classpath</td>
+        <td>Displays a warning when tools.jar is not on the classpath.</td>
+        <td align="center">On</td>
+      </tr>
+      <tr>
+        <td>Show error dialog when Ant build fails</td>
+        <td>Displays an error message when the Ant build fails.</td>
+        <td align="center">On</td>
+      </tr>
+      <tr>
+        <td>Create problem markers from <code>javac</code> results</td>
+        <td>Create warning and error markers from the build results of an Ant <code>javac</code> task. Marker creation
+        requires that a console is allocated for the build and that the <code>listfiles</code> attribute of the
+        <code>javac</code> task be set to true.</td>
+        <td align="center">Off</td>
+      </tr>
+      <tr>
+        <td>Ant Color Options</td>
+        <td>Configures the colors of the Ant build output.</td>
+        <td align="center">Varies by Ant output</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-antsupport.htm">Ant support</a>
+  <h3 class="related">Related reference</h3><a href="../reference/ref-antruntimeprefs.htm">Ant runtime
+  preferences</a><br>
+  <a href="../reference/ref-anteditorprefs.htm">Ant editor preferences</a><br>
+  <a href="../reference/ref-antformatter.htm">Ant formatter preferences</a><br>
+  <a href="../reference/ref-anttemplates.htm">Ant templates preferences</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-antruntimeprefs.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-antruntimeprefs.htm
index baaf743..f071f02 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-antruntimeprefs.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-antruntimeprefs.htm
@@ -1,204 +1,195 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Ant Runtime Preferences</title>
-
-</HEAD>
-<BODY>
-<h1>Ant Runtime Preferences</h1>
-<p>
-	The following preferences can be changed on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntRuntimePreferencePage)")'>
-	<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-	<strong>Ant &gt; Runtime</strong></a> preference page.
-</p>
-<h2>Classpath options</h2>
-<p>
-	On the Classpath tab you can add additional classes defining tasks and types to the Ant classpath. New tasks and types
-	can be added to either the Ant Home or the Global Entries section(s). The Contributed Entries section cannot be modified.
-	</p>
-<table border="1" cellspacing="0" width="80%">
-  <thead>
-  	<tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td>Add Jars...</td>
-      <td>Allows you to add a <code>jar</code> file from the current workspace to the Ant classpath for the Ant Home and / or Global sections.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Add External Jars...</td>
-      <td>Allows you to add a <code>jar</code> file from the local filesystem to the Ant classpath for the Ant Home and / or Global sections.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Add Folder...</td>
-      <td>Allows you to add a folder from the local filesystem to the Ant classpath for the Ant Home and / or Global sections.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Add Variable...</td>
-      <td>Allows you to add a new classpath variable to the Ant Home and / or Global sections.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Ant Home</td>
-      <td>Allows you to add a new folder to the Ant Home location.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Remove</td>
-      <td>Allows you to remove the selected entry element(s) from the Ant classpath for the Ant Home and / or Global sections.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Up</td>
-       <td>Allows you to move the selected entry element up one space in its listing.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Down</td>
-      <td>Allows you to move the selected entry element down one space in its listing.</td>
-      <td align="center"></td>
-    </tr>
-  </tbody>
-</table>
-
-<h2>Tasks options</h2>
-<p>
-	On the Tasks tab you can add tasks defined in one of the classes on the Ant classpath.
-</p>
-<table border="1" cellspacing="0" width="80%">
-  <thead>
-  	<tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td>Add Task...</td>
-      <td>Allows you to add a new Ant task definition to the runtime.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Edit Task...</td>
-      <td>Allows you to edit an existing Ant task. <br><br>
-      Note: you can only edit tasks that are not contributed (i.e. yellow decorated tasks are contributed 
-      and cannot be edited).</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Remove</td>
-      <td>Allows you to remove an existing Ant task from the runtime. <br><br>
-      Note: you can only remove tasks that are not contributed (i.e. yellow decorated tasks are contributed 
-      and cannot be removed).</td>
-      <td align="center"></td>
-    </tr>
-  </tbody>
-</table>
-
-<h2>Types options</h2>
-<p>
-	On the Types tab you can add types defined in one of the classes on the classpath.
-</p>
-<table border="1" cellspacing="0" width="80%">
-  <thead>
-  	<tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td>Add Type...</td>
-      <td>Allows you to add a new type defined in one of the classes on the Ant classpath.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Edit Type...</td>
-      <td>Allows you to edit an existing type.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Remove</td>
-      <td>Allows you to remove an existing type.</td>
-      <td align="center"></td>
-    </tr>
-  </tbody>
-</table>
-
-<h2>Properties options</h2>
-<p>
-	On the Properties tab you can add properties and property files that will be passed into Ant.
-</p>
-<table border="1" cellspacing="0" width="80%">
-  <thead>
-  	<tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td>Add Property...</td>
-      <td>Allows you to add a new Ant property to the runtime.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Edit Property...</td>
-      <td>Allows you to edit an existing Ant property. <br><br>
-      Note: you can only edit properties that are not contributed (i.e. yellow decorated properties are contributed 
-      and cannot be edited).</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Remove</td>
-      <td>Allows you to remove an existing Ant property from the runtime. <br><br>
-      Note: you can only remove properties that are not contributed (i.e. yellow decorated properties are contributed 
-      and cannot be removed).</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Add Files...</td>
-      <td>Allows you to add a <code>*.properties</code> file from the workspace to be used in the runtime.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Add External...</td>
-      <td>Allows you to add a <code>*.properties</code> file from the local filesystem to be used in the runtime.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Remove</td>
-      <td>Allows you to remove an existing <code>*.properties</code> file from the runtime.</td>
-      <td align="center"></td>
-    </tr>
-  </tbody>
-</table>
-
-<h3 class="related">Related concepts</h3>
-	<a href="../concepts/concepts-antsupport.htm">Ant support</a>
-
-<h3 class="related">Related reference</h3>
-	<a href="../reference/ref-antprefs.htm">General Ant preferences</a><br>
-	<a href="../reference/ref-anteditorprefs.htm">Ant editor preferences</a><br>
-	<a href="../reference/ref-antformatter.htm">Ant formatter preferences</a><br>
-	<a href="../reference/ref-anttemplates.htm">Ant templates preferences</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Ant Runtime Preferences</title>
+</head>
+<body>
+  <h1>Ant Runtime Preferences</h1>
+  <p>The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntRuntimePreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Ant &gt; Runtime</strong></a>
+  preference page.</p>
+  <h2>Classpath options</h2>
+  <p>On the Classpath tab you can add additional classes defining tasks and types to the Ant classpath. New tasks and
+  types can be added to either the Ant Home or the Global Entries section(s). The Contributed Entries section cannot be
+  modified.</p>
+  <table border="1" cellspacing="0" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Add Jars...</td>
+        <td>Allows you to add a <code>jar</code> file from the current workspace to the Ant classpath for the Ant Home
+        and / or Global sections.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Add External Jars...</td>
+        <td>Allows you to add a <code>jar</code> file from the local filesystem to the Ant classpath for the Ant Home
+        and / or Global sections.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Add Folder...</td>
+        <td>Allows you to add a folder from the local filesystem to the Ant classpath for the Ant Home and / or Global
+        sections.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Add Variable...</td>
+        <td>Allows you to add a new classpath variable to the Ant Home and / or Global sections.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Ant Home</td>
+        <td>Allows you to add a new folder to the Ant Home location.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Remove</td>
+        <td>Allows you to remove the selected entry element(s) from the Ant classpath for the Ant Home and / or Global
+        sections.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Up</td>
+        <td>Allows you to move the selected entry element up one space in its listing.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Down</td>
+        <td>Allows you to move the selected entry element down one space in its listing.</td>
+        <td align="center"></td>
+      </tr>
+    </tbody>
+  </table>
+  <h2>Tasks options</h2>
+  <p>On the Tasks tab you can add tasks defined in one of the classes on the Ant classpath.</p>
+  <table border="1" cellspacing="0" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Add Task...</td>
+        <td>Allows you to add a new Ant task definition to the runtime.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Edit Task...</td>
+        <td>Allows you to edit an existing Ant task.<br>
+        <br>
+        Note: you can only edit tasks that are not contributed (i.e. yellow decorated tasks are contributed and cannot
+        be edited).</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Remove</td>
+        <td>Allows you to remove an existing Ant task from the runtime.<br>
+        <br>
+        Note: you can only remove tasks that are not contributed (i.e. yellow decorated tasks are contributed and
+        cannot be removed).</td>
+        <td align="center"></td>
+      </tr>
+    </tbody>
+  </table>
+  <h2>Types options</h2>
+  <p>On the Types tab you can add types defined in one of the classes on the classpath.</p>
+  <table border="1" cellspacing="0" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Add Type...</td>
+        <td>Allows you to add a new type defined in one of the classes on the Ant classpath.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Edit Type...</td>
+        <td>Allows you to edit an existing type.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Remove</td>
+        <td>Allows you to remove an existing type.</td>
+        <td align="center"></td>
+      </tr>
+    </tbody>
+  </table>
+  <h2>Properties options</h2>
+  <p>On the Properties tab you can add properties and property files that will be passed into Ant.</p>
+  <table border="1" cellspacing="0" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Add Property...</td>
+        <td>Allows you to add a new Ant property to the runtime.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Edit Property...</td>
+        <td>Allows you to edit an existing Ant property.<br>
+        <br>
+        Note: you can only edit properties that are not contributed (i.e. yellow decorated properties are contributed
+        and cannot be edited).</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Remove</td>
+        <td>Allows you to remove an existing Ant property from the runtime.<br>
+        <br>
+        Note: you can only remove properties that are not contributed (i.e. yellow decorated properties are contributed
+        and cannot be removed).</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Add Files...</td>
+        <td>Allows you to add a <code>*.properties</code> file from the workspace to be used in the runtime.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Add External...</td>
+        <td>Allows you to add a <code>*.properties</code> file from the local filesystem to be used in the
+        runtime.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Remove</td>
+        <td>Allows you to remove an existing <code>*.properties</code> file from the runtime.</td>
+        <td align="center"></td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-antsupport.htm">Ant support</a>
+  <h3 class="related">Related reference</h3><a href="../reference/ref-antprefs.htm">General Ant preferences</a><br>
+  <a href="../reference/ref-anteditorprefs.htm">Ant editor preferences</a><br>
+  <a href="../reference/ref-antformatter.htm">Ant formatter preferences</a><br>
+  <a href="../reference/ref-anttemplates.htm">Ant templates preferences</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-anttemplates.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-anttemplates.htm
index 59ebe1c..3b4f9d7 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-anttemplates.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-anttemplates.htm
@@ -1,85 +1,77 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Ant Templates Preference</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Ant Templates Preference</title>
 </head>
 <body>
-
-<h1>Ant Templates Preferences</h1>
-
-<p>
-	The following preferences can be changed on the 
-	<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.TemplatesPreferencePage)")'>
-	<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>Ant &gt; Editor &gt; Templates</strong></a>
-    preference page.
-</p>
-<p> 
-	You can use the Templates preferences to create, edit, remove, import existing templates, restore removed templates and revert 
-    to the default templates. The preview pane enables you to see what your new or 
-    edited template will look like before applying your changes.
-</p>
-<table border="1" cellspacing="0" width="80%">
-  <thead>
-  	<tr> 
-      <th width="25%">Option</th>
-      <th>Description</th>
-      <th width="8%">Default</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr> 
-      <td>New...</td>
-      <td>Allows you to add a new template.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Edit...</td>
-      <td>Allows you to edit an existing template. Changes to a template can be viewed in the Preview Pane before they are applied.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Remove</td>
-      <td>Allows you to remove and existing template. A removed template can be restored by using Restore Removed or by re-importing the template (if
-      it was imported initially).</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Restore Removed</td>
-      <td>Allows you to add a new classpath variable to the Ant Home and / or Global sections.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Revert to Default</td>
-      <td>Allows you to revert changes to a selected template back to their factory defaults</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Import...</td>
-      <td>Allows you to import template(s) from a selected <code>*.xml</code> file.</td>
-      <td align="center"></td>
-    </tr>
-    <tr> 
-      <td>Export...</td>
-       <td>Allows you to export the currently selected set of templates to an <code>xml</code> file in the local filesystem.</td>
-      <td align="center"></td>
-    </tr>
-  </tbody>
-</table>
-
-<h3 class="related">Related concepts</h3>
-	<a href="../concepts/concepts-antsupport.htm">Ant support</a>
-
-<h3 class="related">Related reference</h3>
-	<a href="ref-anteditor.htm">Ant Editor preferences</a><br>
-	<a href="../reference/ref-antprefs.htm">General Ant preferences</a><br>
-	<a href="../reference/ref-anteditorprefs.htm">Ant editor preferences</a><br>
-	<a href="../reference/ref-antformatter.htm">Ant formatter preferences</a><br>
-	<a href="../reference/ref-antruntimeprefs.htm">Ant runtime preferences</a>
-
+  <h1>Ant Templates Preferences</h1>
+  <p>The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.TemplatesPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>Ant &gt; Editor &gt;
+  Templates</strong></a> preference page.</p>
+  <p>You can use the Templates preferences to create, edit, remove, import existing templates, restore removed
+  templates and revert to the default templates. The preview pane enables you to see what your new or edited template
+  will look like before applying your changes.</p>
+  <table border="1" cellspacing="0" width="80%">
+    <thead>
+      <tr>
+        <th width="25%">Option</th>
+        <th>Description</th>
+        <th width="8%">Default</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>New...</td>
+        <td>Allows you to add a new template.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Edit...</td>
+        <td>Allows you to edit an existing template. Changes to a template can be viewed in the Preview Pane before
+        they are applied.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Remove</td>
+        <td>Allows you to remove and existing template. A removed template can be restored by using Restore Removed or
+        by re-importing the template (if it was imported initially).</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Restore Removed</td>
+        <td>Allows you to add a new classpath variable to the Ant Home and / or Global sections.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Revert to Default</td>
+        <td>Allows you to revert changes to a selected template back to their factory defaults</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Import...</td>
+        <td>Allows you to import template(s) from a selected <code>*.xml</code> file.</td>
+        <td align="center"></td>
+      </tr>
+      <tr>
+        <td>Export...</td>
+        <td>Allows you to export the currently selected set of templates to an <code>xml</code> file in the local
+        filesystem.</td>
+        <td align="center"></td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-antsupport.htm">Ant support</a>
+  <h3 class="related">Related reference</h3><a href="ref-anteditor.htm">Ant Editor preferences</a><br>
+  <a href="../reference/ref-antprefs.htm">General Ant preferences</a><br>
+  <a href="../reference/ref-anteditorprefs.htm">Ant editor preferences</a><br>
+  <a href="../reference/ref-antformatter.htm">Ant formatter preferences</a><br>
+  <a href="../reference/ref-antruntimeprefs.htm">Ant runtime preferences</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-antview.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-antview.htm
index 653eb15..3fd2114b 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-antview.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-antview.htm
@@ -1,137 +1,147 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Ant View</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>    
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Ant View</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
 </head>
 <body>
-	<h1> Ant View</h1>
-	<p>
-		The Ant view provides a place to view Ant buildfiles and makes it
-		easy to execute a buildfile or a given target within a buildfile. You can add files
-		to the view and expand buildfiles to reveal the targets defined within them.
-	</p>    
-	<p>
-		The pop-up menu for this view also allows you to open an editor on a
-		buildfile, execute the selected target or buildfile, and configure the launch
-		configuration used when executing.
-	</p>
-	<p>
-		Like other views in the Workbench, the Ant view has its own
-      	toolbar. Toolbar buttons are provided for adding buildfiles to the view and for
- 		executing them.
- 	</p>
-	<p>
-		To add the Ant view to the current perspective, click
-		<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ant.ui.views.AntView)")'>
-		<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-		<b>Window &gt; Show View &gt; Other... &gt; Ant &gt; Ant</b></a>.
-	</p>    
-	<table border="1" cellpadding="5" cellspacing="0" summary="The commands available in the Ant View">
-		<caption>Ant View Commands</caption>
-  		<thead>
-		    <tr>
-		      <th width="1%" colspan="1" rowspan="1"> <p> Command </p></th>
-		      <th width="20%" colspan="1" rowspan="1"> <p> Name </p></th>
-		      <th colspan="1" rowspan="1"> <p> Description </p></th>
-		      <th width="15%" colspan="1" rowspan="1"> <p> Availability </p></th>
-		    </tr>
-  		</thead>
-  		<tbody>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/add_co.svg" alt="Add Buildfiles view and context menu command"></td>
-		      <td colspan="1" valign="top" align="left">Add Buildfiles</td>
-		      <td colspan="1" valign="top" align="left">Allows you to add buildfile(s) to the view.</td>
-		      <td colspan="1" valign="top" align="left">View action and context menu</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/search.svg" alt="Add Buildfiles with Search view toolbar command"></td>
-		      <td colspan="1" valign="top" align="left">Add Buildfile with Search</td>
-		      <td colspan="1" valign="top" align="left">Allows you to add buildfile(s) to the view using searching tools.</td>
-		      <td colspan="1" valign="top" align="left">View action</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/filter_internal_targets.svg" alt="Hide Internal Targets view toolbar command"></td>
-		      <td colspan="1" valign="top" align="left">Hide Internal Targets</td>
-		      <td colspan="1" valign="top" align="left">Allows you to hide / filter all internal targets from the view.</td>
-		      <td colspan="1" valign="top" align="left">View action</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/run_exc.svg" alt="Run Selected Target view toolbar command"></td>
-		      <td colspan="1" valign="top" align="left">Run Selected Target</td>
-		      <td colspan="1" valign="top" align="left">Allows you to run the selected target in the view.</td>
-		      <td colspan="1" valign="top" align="left">View action</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/remove_co.svg" alt="Remove Selected Buildfile view toolbar and context menu command"></td>
-		      <td colspan="1" valign="top" align="left">Remove Selected Buildfile</td>
-		      <td colspan="1" valign="top" align="left">Allows you to remove the selected buildfile from the view.</td>
-		      <td colspan="1" valign="top" align="left">View action and context menu</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/removeall_co.svg" alt="Remove All Buildfiles view toolbar and context menu command"></td>
-		      <td colspan="1" valign="top" align="left">Remove All Buildfiles</td>
-		      <td colspan="1" valign="top" align="left">Allows you to quickly remove all buildfiles from the view.</td>
-		      <td colspan="1" valign="top" align="left">View action and context menu</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"></td>
-		      <td colspan="1" valign="top" align="left">Open With &gt;</td>
-		      <td colspan="1" valign="top" align="left">Allows you to open an editor on the selected buildfile.</td>
-		      <td colspan="1" valign="top" align="left">Context menu</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/refresh_tab.svg" alt="Refresh Buildfiles context menu command"></td>
-		      <td colspan="1" valign="top" align="left">Refresh Buildfiles</td>
-		      <td colspan="1" valign="top" align="left">Refreshes the contents of the view to reflect the current state of all the represented buildfiles.</td>
-		      <td colspan="1" valign="top" align="left">Context menu</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/ant_view.svg" alt="Run As &gt; Ant Build context menu command"></td>
-		      <td colspan="1" valign="top" align="left">Run As &gt; Ant Build</td>
-		      <td colspan="1" valign="top" align="left">Launches an Ant build for the selected buildfile or for a specific selected target of the buildfile in Run mode.</td>
-		      <td colspan="1" valign="top" align="left">Context menu</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/ant_view.svg" alt="Run As &gt; Ant Build... context menu command"></td>
-		      <td colspan="1" valign="top" align="left">Run As &gt; Ant Build...</td>
-		      <td colspan="1" valign="top" align="left">Brings up the launch configuration dialog to edit the configuration associated with the selected buildfile in Run mode.</td>
-		      <td colspan="1" valign="top" align="left">Context menu</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/ant_view.svg" alt="Debug As &gt; Ant Build context menu command"></td>
-		      <td colspan="1" valign="top" align="left">Debug As &gt; Ant Build</td>
-		      <td colspan="1" valign="top" align="left">Launches an Ant build for the selected buildfile or for a specific selected target of the buildfile in Debug mode.</td>
-		      <td colspan="1" valign="top" align="left">Context menu</td>
-		    </tr>
-		    <tr>
-		      <td colspan="1" valign="top" align="left"><img src="../images/ant_view.svg" alt="Debug As &gt; Ant Build... context menu command"></td>
-		      <td colspan="1" valign="top" align="left">Debug As &gt; Ant Build...</td>
-		      <td colspan="1" valign="top" align="left">Brings up the launch configuration dialog to edit the configuration associated with the selected buildfile in Debug mode.</td>
-		      <td colspan="1" valign="top" align="left">Context menu</td>
-		    </tr>
-  		</tbody>
-	</table>
-
-<h3 class="related">Related concepts</h3>
-	<a href="../concepts/concepts-antsupport.htm">Ant support</a><br>
-	<a href="../concepts/concepts-exttools.htm">External tools</a>
-
-<h3 class="related">Related tasks</h3>
-	<a href="../tasks/tasks-ant-running.htm">Running Ant buildfiles</a><br>
-	<a href="../tasks/tasks-ant-classpath.htm">Modifying the Ant classpath</a><br>
-	<a href="../tasks/tasks-ant-addtasksandtypes.htm">Adding new Ant tasks and types</a><br>
-	<a href="../tasks/tasks-ant-version.htm">Using a different version of Ant</a>
-
-<h3 class="related">Related reference</h3>
-	<a href="ref-antruntimeprefs.htm">Ant runtime preferences</a><br>
-	<a href="ref-anteditor.htm">Ant Editor</a><br>
-	<a href="ref-anticons.htm">External Tools and Ant icons</a>
-
+  <h1>Ant View</h1>
+  <p>The Ant view provides a place to view Ant buildfiles and makes it easy to execute a buildfile or a given target
+  within a buildfile. You can add files to the view and expand buildfiles to reveal the targets defined within
+  them.</p>
+  <p>The pop-up menu for this view also allows you to open an editor on a buildfile, execute the selected target or
+  buildfile, and configure the launch configuration used when executing.</p>
+  <p>Like other views in the Workbench, the Ant view has its own toolbar. Toolbar buttons are provided for adding
+  buildfiles to the view and for executing them.</p>
+  <p>To add the Ant view to the current perspective, click <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ant.ui.views.AntView)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window &gt; Show View &gt; Other...
+  &gt; Ant &gt; Ant</b></a>.</p>
+  <table border="1" cellpadding="5" cellspacing="0" summary="The commands available in the Ant View">
+    <caption>
+      Ant View Commands
+    </caption>
+    <thead>
+      <tr>
+        <th width="1%" colspan="1" rowspan="1">
+          <p>Command</p>
+        </th>
+        <th width="20%" colspan="1" rowspan="1">
+          <p>Name</p>
+        </th>
+        <th colspan="1" rowspan="1">
+          <p>Description</p>
+        </th>
+        <th width="15%" colspan="1" rowspan="1">
+          <p>Availability</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/add_co.svg" alt=
+        "Add Buildfiles view and context menu command"></td>
+        <td colspan="1" valign="top" align="left">Add Buildfiles</td>
+        <td colspan="1" valign="top" align="left">Allows you to add buildfile(s) to the view.</td>
+        <td colspan="1" valign="top" align="left">View action and context menu</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/search.svg" alt=
+        "Add Buildfiles with Search view toolbar command"></td>
+        <td colspan="1" valign="top" align="left">Add Buildfile with Search</td>
+        <td colspan="1" valign="top" align="left">Allows you to add buildfile(s) to the view using searching
+        tools.</td>
+        <td colspan="1" valign="top" align="left">View action</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/filter_internal_targets.svg" alt=
+        "Hide Internal Targets view toolbar command"></td>
+        <td colspan="1" valign="top" align="left">Hide Internal Targets</td>
+        <td colspan="1" valign="top" align="left">Allows you to hide / filter all internal targets from the view.</td>
+        <td colspan="1" valign="top" align="left">View action</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/run_exc.svg" alt=
+        "Run Selected Target view toolbar command"></td>
+        <td colspan="1" valign="top" align="left">Run Selected Target</td>
+        <td colspan="1" valign="top" align="left">Allows you to run the selected target in the view.</td>
+        <td colspan="1" valign="top" align="left">View action</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/remove_co.svg" alt=
+        "Remove Selected Buildfile view toolbar and context menu command"></td>
+        <td colspan="1" valign="top" align="left">Remove Selected Buildfile</td>
+        <td colspan="1" valign="top" align="left">Allows you to remove the selected buildfile from the view.</td>
+        <td colspan="1" valign="top" align="left">View action and context menu</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/removeall_co.svg" alt=
+        "Remove All Buildfiles view toolbar and context menu command"></td>
+        <td colspan="1" valign="top" align="left">Remove All Buildfiles</td>
+        <td colspan="1" valign="top" align="left">Allows you to quickly remove all buildfiles from the view.</td>
+        <td colspan="1" valign="top" align="left">View action and context menu</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"></td>
+        <td colspan="1" valign="top" align="left">Open With &gt;</td>
+        <td colspan="1" valign="top" align="left">Allows you to open an editor on the selected buildfile.</td>
+        <td colspan="1" valign="top" align="left">Context menu</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/refresh_tab.svg" alt=
+        "Refresh Buildfiles context menu command"></td>
+        <td colspan="1" valign="top" align="left">Refresh Buildfiles</td>
+        <td colspan="1" valign="top" align="left">Refreshes the contents of the view to reflect the current state of
+        all the represented buildfiles.</td>
+        <td colspan="1" valign="top" align="left">Context menu</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/ant_view.svg" alt=
+        "Run As &gt; Ant Build context menu command"></td>
+        <td colspan="1" valign="top" align="left">Run As &gt; Ant Build</td>
+        <td colspan="1" valign="top" align="left">Launches an Ant build for the selected buildfile or for a specific
+        selected target of the buildfile in Run mode.</td>
+        <td colspan="1" valign="top" align="left">Context menu</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/ant_view.svg" alt=
+        "Run As &gt; Ant Build... context menu command"></td>
+        <td colspan="1" valign="top" align="left">Run As &gt; Ant Build...</td>
+        <td colspan="1" valign="top" align="left">Brings up the launch configuration dialog to edit the configuration
+        associated with the selected buildfile in Run mode.</td>
+        <td colspan="1" valign="top" align="left">Context menu</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/ant_view.svg" alt=
+        "Debug As &gt; Ant Build context menu command"></td>
+        <td colspan="1" valign="top" align="left">Debug As &gt; Ant Build</td>
+        <td colspan="1" valign="top" align="left">Launches an Ant build for the selected buildfile or for a specific
+        selected target of the buildfile in Debug mode.</td>
+        <td colspan="1" valign="top" align="left">Context menu</td>
+      </tr>
+      <tr>
+        <td colspan="1" valign="top" align="left"><img src="../images/ant_view.svg" alt=
+        "Debug As &gt; Ant Build... context menu command"></td>
+        <td colspan="1" valign="top" align="left">Debug As &gt; Ant Build...</td>
+        <td colspan="1" valign="top" align="left">Brings up the launch configuration dialog to edit the configuration
+        associated with the selected buildfile in Debug mode.</td>
+        <td colspan="1" valign="top" align="left">Context menu</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-antsupport.htm">Ant support</a><br>
+  <a href="../concepts/concepts-exttools.htm">External tools</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-ant-running.htm">Running Ant buildfiles</a><br>
+  <a href="../tasks/tasks-ant-classpath.htm">Modifying the Ant classpath</a><br>
+  <a href="../tasks/tasks-ant-addtasksandtypes.htm">Adding new Ant tasks and types</a><br>
+  <a href="../tasks/tasks-ant-version.htm">Using a different version of Ant</a>
+  <h3 class="related">Related reference</h3><a href="ref-antruntimeprefs.htm">Ant runtime preferences</a><br>
+  <a href="ref-anteditor.htm">Ant Editor</a><br>
+  <a href="ref-anticons.htm">External Tools and Ant icons</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-capabilitiespref.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-capabilitiespref.htm
index 5136646..413c911 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-capabilitiespref.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-capabilitiespref.htm
@@ -1,41 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Capabilities</title>
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<h2>Capabilities</h2>
-<P CLASS="Para">The
-
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.sdk.capabilities)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>General &gt; Capabilities</strong></a>
-
-  preference page allows you to enable or disable 
-  various product components such as Java development and plug-in development. By 
-  default, the page only shows general categories of behavior.  If you would like
-  configure fine-grained capabilities you should use the &quot;Advanced&quot; dialog.</P>
-<P CLASS="Para"><strong>Note:</strong> Some capability selections have dependencies 
-  on other capabilities, disabling a required capability while leaving dependant 
-  capabilities enabled will only result in them becoming re-enabled. This is the 
-  case when deselecting Java development and Core Team Support.</P>
-
-<p>When attempting to enable an action after its capability has been disabled 
-  or has yet to be enabled in the preferences page, a <strong>Confirm 
-  Enablement </strong>prompt will appear verifying that you do indeed want to 
-  enable the required capability. Click <strong>Details</strong> to display a 
-  description of the capability.</p>
-  
-<P CLASS="Para"><strong>Note:</strong> This dialog only appears if the 
-  "Prompt when enabling capabilities" preference has not been disabled.</P>
-  
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Capabilities</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h2>Capabilities</h2>
+  <p class="Para">The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.sdk.capabilities)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg"
+  alt="command link"> <strong>General &gt; Capabilities</strong></a> preference page allows you to enable or disable
+  various product components such as Java development and plug-in development. By default, the page only shows general
+  categories of behavior. If you would like configure fine-grained capabilities you should use the "Advanced"
+  dialog.</p>
+  <p class="Para"><strong>Note:</strong> Some capability selections have dependencies on other capabilities, disabling
+  a required capability while leaving dependant capabilities enabled will only result in them becoming re-enabled. This
+  is the case when deselecting Java development and Core Team Support.</p>
+  <p>When attempting to enable an action after its capability has been disabled or has yet to be enabled in the
+  preferences page, a <strong>Confirm Enablement</strong> prompt will appear verifying that you do indeed want to
+  enable the required capability. Click <strong>Details</strong> to display a description of the capability.</p>
+  <p class="Para"><strong>Note:</strong> This dialog only appears if the "Prompt when enabling capabilities" preference
+  has not been disabled.</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm
index e75c385..865de3b 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm
@@ -1,131 +1,97 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2006, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Working with cheat sheets</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2006, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Working with cheat sheets</title>
 </head>
 <body>
-
-<h1>Working with cheat sheets</h1>
-
-<P CLASS="Para">Eclipse provides cheat sheets to guide you through some of its 
-  application development processes. Each cheat sheet is designed to help you 
-  complete some task, and it lists the sequence of steps required to help you 
-  achieve that goal. As you progress from one step to the next, the cheat sheet 
-  will automatically launch the required tools for you. If there is a manual step 
-  in the process, the step will tell you to perform the task and click a button 
-  in the cheat sheet to move on to the next step. Also, relevant help information 
-  to guide you through a task is retrieved in a single click so that lengthy documentation 
-  searches will no longer be required. </P>
-<P CLASS="Para">A <a href="ref-composite-cheatsheets.htm">composite cheat sheet</a> 
-is another kind of cheat sheet that provides guidance for larger tasks or a group of related tasks.</P>
-<h3>Launching a cheat sheet</h3>
-<p>To launch a cheat sheet from the Workbench</p>
-<ol>
-  <li>Select
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>Help &gt; Cheat Sheets</strong></a> from the menu bar.
-  If this command is not in the menu, it can be added from <b>Window &gt;
-  Customize Perspective &gt; Commands</b>, and check <b>Cheat Sheets</b>.
-  <img src="../images/image92-opencheat.png" alt="Accessing Cheat sheet via Help menu" border="0"></li> 
-  <li>The available cheat sheets are listed, select one and click <strong>OK</strong>. 
-  Alternatively if you know the location of a cheat sheet content file on your 
-  file system or on the web you can enter its path.</li>
-</ol>
-<p>The cheat sheet opens as a view. At any time, only one cheat sheet is open 
-  and active. When you launch a cheat sheet, any opened cheat sheet is closed 
-  before the new one is opened. The completion status of closed cheat sheet is 
+  <h1>Working with cheat sheets</h1>
+  <p class="Para">Eclipse provides cheat sheets to guide you through some of its application development processes.
+  Each cheat sheet is designed to help you complete some task, and it lists the sequence of steps required to help you
+  achieve that goal. As you progress from one step to the next, the cheat sheet will automatically launch the required
+  tools for you. If there is a manual step in the process, the step will tell you to perform the task and click a
+  button in the cheat sheet to move on to the next step. Also, relevant help information to guide you through a task is
+  retrieved in a single click so that lengthy documentation searches will no longer be required.</p>
+  <p class="Para">A <a href="ref-composite-cheatsheets.htm">composite cheat sheet</a> is another kind of cheat sheet
+  that provides guidance for larger tasks or a group of related tasks.</p>
+  <h3>Launching a cheat sheet</h3>
+  <p>To launch a cheat sheet from the Workbench</p>
+  <ol>
+    <li>Select <a class="command-link" href=
+    'javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet")'><img src=
+    "PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Help &gt; Cheat Sheets</strong></a>
+    from the menu bar. If this command is not in the menu, it can be added from <b>Window &gt; Customize Perspective
+    &gt; Commands</b>, and check <b>Cheat Sheets</b>. <img src="../images/image92-opencheat.png" alt=
+    "Accessing Cheat sheet via Help menu" border="0"></li>
+    <li>The available cheat sheets are listed, select one and click <strong>OK</strong>. Alternatively if you know the
+    location of a cheat sheet content file on your file system or on the web you can enter its path.</li>
+  </ol>
+  <p>The cheat sheet opens as a view. At any time, only one cheat sheet is open and active. When you launch a cheat
+  sheet, any opened cheat sheet is closed before the new one is opened. The completion status of closed cheat sheet is
   saved.</p>
-<p>The cheat sheet has a toolbar at the top right edge. These icons appear in 
-  the toolbar:</p>
-<ul>
-  <li>
-  <img src="../images/collapse_expand_all.svg" alt="Collapse button" border="0">Collapses 
-    all the expanded steps except the current step or expands steps to the last 
-    expanded state. Click to toggle between these two states. </li>
-  <li>
-  <img src="../images/view_menu.svg" alt="Select button" border="0">Allows 
-    you to select and open another cheat sheet. The completion status of the active 
-    cheat sheet is saved. Then, the active cheat sheet is closed and the selected 
-    cheat sheet is opened. </li>
-  <li>
-  <img src="../images/thin_min_view.svg" alt="Hide button" border="0">Hides 
-    the cheat sheet. </li>
-  <li>
-  <img src="../images/maximize.svg" alt="Save button" border="0">Maximizes the cheat sheet.<br>
-  </li>
-</ul>
-<p>Note that some cheat sheets can also be launched from the welcome page by 
-first selecting <b>Tutorials </b>and then selecting one of the tutorials.<br>
-  </p>
-<h3>Starting the cheat sheet</h3>
-<p> Each cheat sheet has a list of steps and it always begins with an Introduction 
-  step. When you launch a fresh cheat sheet, the Introduction step is expanded 
-  so that you can read a brief description of the cheat sheet. To start working 
-  with the cheat sheet, click <strong> Click to Begin</strong> <strong>
-<img src="../images/start_ccs_task.svg" alt="Click to Begin button" border="0"> 
-  </strong>in that step. The next step is expanded and highlighted. You should 
-  also see one or more actions buttons, such as <strong>Click to Perform </strong><strong>
-<img src="../images/start_task.svg" alt="Click to Perform button" border="0"></strong> 
-  in the highlighted step. You can now begin working through the tasks using the 
-  cheat sheet. At any time, the only highlighted step in the cheat sheet is the 
-  current step. </p>
-<h3>Restarting the cheat sheet</h3>
-<p>Any time after starting a cheat sheet, you can restart from the first step 
-  by clicking <strong>Click to Restart </strong><strong>
-<img src="../images/return_to_start.svg" alt="Click to Restart button" border="0"></strong> 
-  in the Introduction step. If you have already created some artifacts, you will 
-  have to manually clean up the workspace before restarting the cheat sheet.</p>
-<h3>Progressing through the steps</h3>
-<p>In the current step, when you click <strong>Click to Perform 
-<img src="../images/start_task.svg" alt="Click to Perform button" border="0"></strong>, 
-  a tool (which can be a wizard), will be launched and you will be required to 
-  work with that tool. When you finish working with that tool, the next step is 
-  automatically highlighted and it becomes the current step. When the current 
-  step is a manual task, you will need to perform the work and click <strong>Click 
-  to Complete </strong><strong>
-<img src="../images/complete_task.svg" alt="Click to Complete button" border="0"></strong> 
-  to move to the next step. A check mark <strong>
-<img src="../images/complete_status.svg" alt="Check mark icon" border="0"></strong> 
-  appears in the left margin of each completed step.</p>
-<h3>Getting help information for tasks</h3>
-<p>To get step-by-step instructions for that step, click the help link <strong>
-<img src="../images/linkto_help.svg" alt="Help Link Icon" border="0"></strong> 
-  in the step before you click <strong>Click to Perform</strong> <strong>
-<img src="../images/start_task.svg" alt="Click to Perform button" border="0"></strong>, 
-  and the step-by-step instructions on how to work with that tool will be displayed 
-  in the Help window. </p>
-<p>Additional help for entry fields in the tool or wizard may be available by 
-  focusing on the field (use the <strong>Tab</strong> key to position to that 
-  entry) and pressing <strong>F1</strong>.</p>
-<h3>Skipping a step</h3>
-<p>If a current step has a <strong>Click to Skip</strong> option<strong> 
-<img src="../images/skip_status.svg" alt="Click to Skip button" border="0"></strong>, 
-  then it is an optional step. You must click <strong>Click to Skip</strong> <strong>
-<img src="../images/skip_status.svg" alt="Click to Skip button" border="0"></strong> 
-  to skip the current step, when you do, the step will have the skip mark <strong>
-<img src="../images/skip_status.svg" alt="Skip mark icon" border="0"></strong> 
-  in the left margin. If the task does not present <strong>Click to Skip</strong>, 
-  you must perform that step and you cannot skip it.</p>
-<h3>Redoing a step </h3>
-<p>You can redo any step that you may have completed or skipped in the current 
-  cheat sheet. To redo the step, expand the step by clicking its expand icon 
-  and then clicking <strong>Click to Redo</strong>.
-  After redoing a step, the cheat sheet will continue from the redo step.</p>
-<h3>Closing the cheat sheet</h3>
-<p>When you finish the last step in a cheat sheet, it automatically restarts. 
-  You can also close the active cheat sheet by clicking the close icon <strong>
-<img src="../images/close_view.svg" alt="Close icon" border="0"></strong> 
-  in the cheat sheet's toolbar. The active cheat sheet saves its completion status 
-  when it is closed so that you can continue where you left off at a later time.</p>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-composite-cheatsheets.htm">Working with composite cheat sheets</a>
-
+  <p>The cheat sheet has a toolbar at the top right edge. These icons appear in the toolbar:</p>
+  <ul>
+    <li><img src="../images/collapse_expand_all.svg" alt="Collapse button" border="0">Collapses all the expanded steps
+    except the current step or expands steps to the last expanded state. Click to toggle between these two states.</li>
+    <li><img src="../images/view_menu.svg" alt="Select button" border="0">Allows you to select and open another cheat
+    sheet. The completion status of the active cheat sheet is saved. Then, the active cheat sheet is closed and the
+    selected cheat sheet is opened.</li>
+    <li><img src="../images/thin_min_view.svg" alt="Hide button" border="0">Hides the cheat sheet.</li>
+    <li><img src="../images/maximize.svg" alt="Save button" border="0">Maximizes the cheat sheet.<br></li>
+  </ul>
+  <p>Note that some cheat sheets can also be launched from the welcome page by first selecting <b>Tutorials</b> and
+  then selecting one of the tutorials.<br></p>
+  <h3>Starting the cheat sheet</h3>
+  <p>Each cheat sheet has a list of steps and it always begins with an Introduction step. When you launch a fresh cheat
+  sheet, the Introduction step is expanded so that you can read a brief description of the cheat sheet. To start
+  working with the cheat sheet, click <strong>Click to Begin</strong> <strong><img src="../images/start_ccs_task.svg"
+  alt="Click to Begin button" border="0"></strong> in that step. The next step is expanded and highlighted. You should
+  also see one or more actions buttons, such as <strong>Click to Perform</strong> <strong><img src=
+  "../images/start_task.svg" alt="Click to Perform button" border="0"></strong> in the highlighted step. You can now
+  begin working through the tasks using the cheat sheet. At any time, the only highlighted step in the cheat sheet is
+  the current step.</p>
+  <h3>Restarting the cheat sheet</h3>
+  <p>Any time after starting a cheat sheet, you can restart from the first step by clicking <strong>Click to
+  Restart</strong> <strong><img src="../images/return_to_start.svg" alt="Click to Restart button" border="0"></strong>
+  in the Introduction step. If you have already created some artifacts, you will have to manually clean up the
+  workspace before restarting the cheat sheet.</p>
+  <h3>Progressing through the steps</h3>
+  <p>In the current step, when you click <strong>Click to Perform <img src="../images/start_task.svg" alt=
+  "Click to Perform button" border="0"></strong>, a tool (which can be a wizard), will be launched and you will be
+  required to work with that tool. When you finish working with that tool, the next step is automatically highlighted
+  and it becomes the current step. When the current step is a manual task, you will need to perform the work and click
+  <strong>Click to Complete</strong> <strong><img src="../images/complete_task.svg" alt="Click to Complete button"
+  border="0"></strong> to move to the next step. A check mark <strong><img src="../images/complete_status.svg" alt=
+  "Check mark icon" border="0"></strong> appears in the left margin of each completed step.</p>
+  <h3>Getting help information for tasks</h3>
+  <p>To get step-by-step instructions for that step, click the help link <strong><img src="../images/linkto_help.svg"
+  alt="Help Link Icon" border="0"></strong> in the step before you click <strong>Click to Perform</strong>
+  <strong><img src="../images/start_task.svg" alt="Click to Perform button" border="0"></strong>, and the step-by-step
+  instructions on how to work with that tool will be displayed in the Help window.</p>
+  <p>Additional help for entry fields in the tool or wizard may be available by focusing on the field (use the
+  <strong>Tab</strong> key to position to that entry) and pressing <strong>F1</strong>.</p>
+  <h3>Skipping a step</h3>
+  <p>If a current step has a <strong>Click to Skip</strong> option <strong><img src="../images/skip_status.svg" alt=
+  "Click to Skip button" border="0"></strong>, then it is an optional step. You must click <strong>Click to
+  Skip</strong> <strong><img src="../images/skip_status.svg" alt="Click to Skip button" border="0"></strong> to skip
+  the current step, when you do, the step will have the skip mark <strong><img src="../images/skip_status.svg" alt=
+  "Skip mark icon" border="0"></strong> in the left margin. If the task does not present <strong>Click to
+  Skip</strong>, you must perform that step and you cannot skip it.</p>
+  <h3>Redoing a step</h3>
+  <p>You can redo any step that you may have completed or skipped in the current cheat sheet. To redo the step, expand
+  the step by clicking its expand icon and then clicking <strong>Click to Redo</strong>. After redoing a step, the
+  cheat sheet will continue from the redo step.</p>
+  <h3>Closing the cheat sheet</h3>
+  <p>When you finish the last step in a cheat sheet, it automatically restarts. You can also close the active cheat
+  sheet by clicking the close icon <strong><img src="../images/close_view.svg" alt="Close icon" border="0"></strong> in
+  the cheat sheet's toolbar. The active cheat sheet saves its completion status when it is closed so that you can
+  continue where you left off at a later time.</p>
+  <h3 class="related">Related reference</h3><a href="ref-composite-cheatsheets.htm">Working with composite cheat
+  sheets</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-composite-cheatsheets.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-composite-cheatsheets.htm
index a706cc9..c81ae5f 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-composite-cheatsheets.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-composite-cheatsheets.htm
@@ -1,104 +1,78 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2006, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Working with composite cheat sheets</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2006, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Working with composite cheat sheets</title>
 </head>
 <body>
-
-<h1>Working with composite cheat sheets</h1>
-
-<P CLASS="Para">Composite cheat sheets provide guidance through a complex 
-problem by breaking that problem into a set of smaller tasks. Each task consists 
-of a series of steps which must be performed in order. Composite cheat sheets 
-are launched in the cheat sheet view and show two panels which will be side by 
-side or one above the other depending on the relative height and width of the 
-view.</P>
-<P CLASS="Para">
-<img border="0" src="../images/cheatsheet_composite_running.png" alt="Picture of a composite cheat sheet"></P>
-<P CLASS="Para"></P>
-<P CLASS="Para">The panel which appears on the left or on top (depending on the 
-view orientation) is called the task explorer and shows all of the tasks which 
-need to be completed and their state. The lower or right panel is called the 
-task detail panel and shows the task which is selected in the explorer.</P>
-<h3>Launching a composite cheat sheet</h3>
-<p>Composite cheat sheets are launched in the same way as any other
-<a href="ref-cheatsheets.htm">cheat sheet</a> by selecting 
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>Help &gt; Cheat Sheets</strong></a> from the menu bar.
-  If this command is not in the menu, it can be added from <b>Window &gt;
-  Customize Perspective &gt; Commands</b>, and check <b>Cheat Sheets</b>.
-  </p>
-<h3>The task explorer</h3>
-<p>The task explorer is the tree view which shows the tasks and groups of tasks 
-in a composite cheat sheet. Each task will also have an overlay image at the 
-lower right corner it it is in progress, has been completed or has been skipped. 
-Selecting a task in the task explorer will cause that task to be displayed in 
-the task detail pane. Right clicking on a task in the task explorer brings up a 
-context menu which depending on the state of the task will allow the task to be 
-started, skipped or reset.</p>
-<h3>The task detail pane</h3>
-<p>The task detail pane will show different contents depending on the kind of 
-task and whether it has been started. A cheat sheet task which has not been 
-started will show a description and a button to start the task (or if it cannot 
-be started the reason why not). When in progress a cheat sheet task will show a 
-cheatsheet, and when it has been completed it will show a link to the next task.</p>
-<h3>Task groups</h3>
-<p>There are three kinds of task groups, &quot;set&quot;, &quot;sequence&quot; and &quot;choice&quot;. A 
-sequence represents a set of subtasks that must be performed in order, a set 
-represents a set of subtasks that can be performed in any order, a choice 
-represents a set of tasks only one of which should be performed. A set or 
-sequence is complete when all of its subtasks have been completed. A choice is 
-complete when one of its subtasks has been completed. </p>
-<h3>Cheat sheet tasks</h3>
-<p>A cheat sheet task represents a single
-<a href="ref-cheatsheets.htm">cheat sheet</a>. When a cheat sheet task is first 
-visited the task detail pane shows a description of the task and gives the 
-option to start working on the task and possibly to skip the task. The picture 
-below also shows the images for task sets, sequences and choices. Note that some 
-images are shown in gray, that is because these tasks cannot yet be started 
-because prerequisite tasks have not been completed.</p>
-<p>
-<img border="0" src="../images/cheatsheet_composite_start.png" alt="Picture of a composite cheat sheet"></p>
-<h3>Task dependencies</h3>
-<p>A composite cheat sheet may have dependencies which require one task to be 
-completed before another can be started. An example of where this might happen 
-would be if one task created a project and a second task uses that project. In 
-this case the first task must be completed or skipped before the second task can 
-start.</p>
-<h3>Skipping tasks</h3>
-<p>The author of a composite cheat sheet can choose to make a task or task group 
-optional. If a task is optional it can be skipped, either by right clicking on 
-that task in the task explorer and selecting skip from the context menu, or by 
-clicking on the &quot;Skip this task&quot; hyperlink in the task detail pane. 
-Skipping a task will allow tasks which depend on this task to be started.<br>
-</p>
-<h3>Order of task completion</h3>
-<p>The task detail area will provide hyperlinks which will walk through the 
-tasks in order. It is also possible to perform tasks out of order by selecting 
-the task in the task explorer and starting work on that task. This is useful if 
-you want to go directly to a task of interest without working through all 
-earlier tasks.</p>
-<h3>Restarting tasks</h3>
-<p>Right clicking on the root node in the task explorer shows a menu item 
-&quot;Restart all tasks&quot;. If selected this will reset the state of every task in the 
-composite cheat sheet. Use this only if you want to reset all tasks. The context 
-menu for any other task will have a menu option to reset an individual task. Any 
-tasks which depend on this task will also be reset, and for task groups all 
-subtasks will also be reset.</p>
-<h3>Closing the composite cheat sheet</h3>
-<p>A composite cheat sheet is closed if the cheat sheet view is closed, if 
-Eclipse is closed or if another cheat sheet is opened. The state of each task is 
-saved so that when the composite cheat sheet is reopened its state will be 
-restored.</p>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-cheatsheets.htm">Working with cheat sheets</a>
-
+  <h1>Working with composite cheat sheets</h1>
+  <p class="Para">Composite cheat sheets provide guidance through a complex problem by breaking that problem into a set
+  of smaller tasks. Each task consists of a series of steps which must be performed in order. Composite cheat sheets
+  are launched in the cheat sheet view and show two panels which will be side by side or one above the other depending
+  on the relative height and width of the view.</p>
+  <p class="Para"><img border="0" src="../images/cheatsheet_composite_running.png" alt=
+  "Picture of a composite cheat sheet"></p>
+  <p class="Para"></p>
+  <p class="Para">The panel which appears on the left or on top (depending on the view orientation) is called the task
+  explorer and shows all of the tasks which need to be completed and their state. The lower or right panel is called
+  the task detail panel and shows the task which is selected in the explorer.</p>
+  <h3>Launching a composite cheat sheet</h3>
+  <p>Composite cheat sheets are launched in the same way as any other <a href="ref-cheatsheets.htm">cheat sheet</a> by
+  selecting <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet")'><img src=
+  "PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Help &gt; Cheat Sheets</strong></a> from
+  the menu bar. If this command is not in the menu, it can be added from <b>Window &gt; Customize Perspective &gt;
+  Commands</b>, and check <b>Cheat Sheets</b>.</p>
+  <h3>The task explorer</h3>
+  <p>The task explorer is the tree view which shows the tasks and groups of tasks in a composite cheat sheet. Each task
+  will also have an overlay image at the lower right corner it it is in progress, has been completed or has been
+  skipped. Selecting a task in the task explorer will cause that task to be displayed in the task detail pane. Right
+  clicking on a task in the task explorer brings up a context menu which depending on the state of the task will allow
+  the task to be started, skipped or reset.</p>
+  <h3>The task detail pane</h3>
+  <p>The task detail pane will show different contents depending on the kind of task and whether it has been started. A
+  cheat sheet task which has not been started will show a description and a button to start the task (or if it cannot
+  be started the reason why not). When in progress a cheat sheet task will show a cheatsheet, and when it has been
+  completed it will show a link to the next task.</p>
+  <h3>Task groups</h3>
+  <p>There are three kinds of task groups, "set", "sequence" and "choice". A sequence represents a set of subtasks that
+  must be performed in order, a set represents a set of subtasks that can be performed in any order, a choice
+  represents a set of tasks only one of which should be performed. A set or sequence is complete when all of its
+  subtasks have been completed. A choice is complete when one of its subtasks has been completed.</p>
+  <h3>Cheat sheet tasks</h3>
+  <p>A cheat sheet task represents a single <a href="ref-cheatsheets.htm">cheat sheet</a>. When a cheat sheet task is
+  first visited the task detail pane shows a description of the task and gives the option to start working on the task
+  and possibly to skip the task. The picture below also shows the images for task sets, sequences and choices. Note
+  that some images are shown in gray, that is because these tasks cannot yet be started because prerequisite tasks have
+  not been completed.</p>
+  <p><img border="0" src="../images/cheatsheet_composite_start.png" alt="Picture of a composite cheat sheet"></p>
+  <h3>Task dependencies</h3>
+  <p>A composite cheat sheet may have dependencies which require one task to be completed before another can be
+  started. An example of where this might happen would be if one task created a project and a second task uses that
+  project. In this case the first task must be completed or skipped before the second task can start.</p>
+  <h3>Skipping tasks</h3>
+  <p>The author of a composite cheat sheet can choose to make a task or task group optional. If a task is optional it
+  can be skipped, either by right clicking on that task in the task explorer and selecting skip from the context menu,
+  or by clicking on the "Skip this task" hyperlink in the task detail pane. Skipping a task will allow tasks which
+  depend on this task to be started.<br></p>
+  <h3>Order of task completion</h3>
+  <p>The task detail area will provide hyperlinks which will walk through the tasks in order. It is also possible to
+  perform tasks out of order by selecting the task in the task explorer and starting work on that task. This is useful
+  if you want to go directly to a task of interest without working through all earlier tasks.</p>
+  <h3>Restarting tasks</h3>
+  <p>Right clicking on the root node in the task explorer shows a menu item "Restart all tasks". If selected this will
+  reset the state of every task in the composite cheat sheet. Use this only if you want to reset all tasks. The context
+  menu for any other task will have a menu option to reset an individual task. Any tasks which depend on this task will
+  also be reset, and for task groups all subtasks will also be reset.</p>
+  <h3>Closing the composite cheat sheet</h3>
+  <p>A composite cheat sheet is closed if the cheat sheet view is closed, if Eclipse is closed or if another cheat
+  sheet is opened. The state of each task is saved so that when the composite cheat sheet is reopened its state will be
+  restored.</p>
+  <h3 class="related">Related reference</h3><a href="ref-cheatsheets.htm">Working with cheat sheets</a>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm
index 1064441..798834d 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-content-type.htm
@@ -1,69 +1,52 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<link rel="STYLESHEET" href="../book.css" type="text/css">
-<title>Content Types preference page</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <title>Content Types preference page</title>
 </head>
-<body bgcolor="#ffffff">
-
-<h1 class="Head">Content Types preference page</h1>
-
-<p class="Para">The <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.ContentTypes)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>General &gt; Content Types</strong></a>
-  preference page enables you to edit content types and their associated file names, editors and character sets.
-  You can also associate arbitrary file names or file extensions with content types. 
-  A <i>content type</i> acts as a description 
-  of a certain class of files (for instance, XML files). Eclipse uses this description 
-  in various scenarios, such as editor look-ups and file comparisons.
-</p>
-
-<p class="Para">To access the <b>Content Types</b> preference page, select <strong>General &gt; Content Types</strong>. 
-</p>
-
-<h2>Manage content type definitions</h2>
-<p class="Para">You can define new content types from this preference page. On the right
-of the tree showing all content types, click on <b>Add Root...</b> or <b>Add Child...</b>
-(in case a content type is already selected) to define a new content type. You'll then be asked for the name.
-</p>
-<p>Content types that were created manually from the preference page are stored in the user data area.</p>
-<p>Content types that were created manually can be removed thanks to the <b>Remove</b> button. Removing a content
-type definition also removes all children content type definitions. Content type that were defined by plug-ins cannot
-be removed.</p>
-
-<h2>Associating content types with file name or extension</h2>
-<p class="Para">By selecting a content type in the topmost tree, you can alter 
-  the file names and extensions that are associated with it. 
-</p>
-
-<p class="note"><strong>Note:</strong> 
-  Certain name specification will show a "lock" icon. An item is locked if it is one of 
-  the associations provided by the plug-in that declares the content type. In 
-  other words, you can remove only user-contributed associations.
-</p>
-
-<p class="Para">Adding an association is as simple as clicking <strong>Add...</strong>. 
-  A dialog prompts you to enter the file name or extension.
-</p>
-
-<h2>Associating editors with content types</h2>
-<p class="Para">The second list below the content types tree shows the editors that are directly
-declared as suitable to open the given content type. Editors associated with parent content types
-are also valid editors for the children content type, although they are not shown there.
-</p>
-<p>For any content type, you can declare a new editor association using the <b>Add...</b> button
-besides the list of editors. This button will let you pick a new editor to associate with the
-selected content type.</p>
-<p>Those user-defined editor associations are stored in the user data area.</p>
-<p>Editor associations defined manually can be removed thanks to the <b>Remove</b> button. Editor associations
-that were defined by a plug-in are locked and cannot be removed.</p>
-
-<h2>Define default encoding for content type</h2>
-<p class="Para">You 
-  can also set the default encoding for a given content type. To do this, simply 
-  enter the encoding name in the provided field and click <strong>Update</strong>.
-</p>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Content Types preference page</h1>
+  <p class="Para">The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.ContentTypes)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>General &gt; Content
+  Types</strong></a> preference page enables you to edit content types and their associated file names, editors and
+  character sets. You can also associate arbitrary file names or file extensions with content types. A <i>content
+  type</i> acts as a description of a certain class of files (for instance, XML files). Eclipse uses this description
+  in various scenarios, such as editor look-ups and file comparisons.</p>
+  <p class="Para">To access the <b>Content Types</b> preference page, select <strong>General &gt; Content
+  Types</strong>.</p>
+  <h2>Manage content type definitions</h2>
+  <p class="Para">You can define new content types from this preference page. On the right of the tree showing all
+  content types, click on <b>Add Root...</b> or <b>Add Child...</b> (in case a content type is already selected) to
+  define a new content type. You'll then be asked for the name.</p>
+  <p>Content types that were created manually from the preference page are stored in the user data area.</p>
+  <p>Content types that were created manually can be removed thanks to the <b>Remove</b> button. Removing a content
+  type definition also removes all children content type definitions. Content type that were defined by plug-ins cannot
+  be removed.</p>
+  <h2>Associating content types with file name or extension</h2>
+  <p class="Para">By selecting a content type in the topmost tree, you can alter the file names and extensions that are
+  associated with it.</p>
+  <p class="note"><strong>Note:</strong> Certain name specification will show a "lock" icon. An item is locked if it is
+  one of the associations provided by the plug-in that declares the content type. In other words, you can remove only
+  user-contributed associations.</p>
+  <p class="Para">Adding an association is as simple as clicking <strong>Add...</strong>. A dialog prompts you to enter
+  the file name or extension.</p>
+  <h2>Associating editors with content types</h2>
+  <p class="Para">The second list below the content types tree shows the editors that are directly declared as suitable
+  to open the given content type. Editors associated with parent content types are also valid editors for the children
+  content type, although they are not shown there.</p>
+  <p>For any content type, you can declare a new editor association using the <b>Add...</b> button besides the list of
+  editors. This button will let you pick a new editor to associate with the selected content type.</p>
+  <p>Those user-defined editor associations are stored in the user data area.</p>
+  <p>Editor associations defined manually can be removed thanks to the <b>Remove</b> button. Editor associations that
+  were defined by a plug-in are locked and cannot be removed.</p>
+  <h2>Define default encoding for content type</h2>
+  <p class="Para">You can also set the default encoding for a given content type. To do this, simply enter the encoding
+  name in the provided field and click <strong>Update</strong>.</p>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-cvs-decorations.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-cvs-decorations.htm
index 0c372c4..fe542f8 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-cvs-decorations.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-cvs-decorations.htm
@@ -1,71 +1,62 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>CVS Label Decorations</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">CVS Label Decorations</H1>
-<P CLASS="Para"> Label Decorations are used by CVS to show important synchronization 
-  information about workspace resources. Decorations can affect the text or the 
-  icon of the label associated with a resource. The text decorators are configurable 
-  on the <a href="../tasks/tasks-107b.htm">CVS Label Decorations Preference page</a> which can also be used to indicate 
-  which icons are to be enabled. Here is a description of the icons used by CVS.</P>
-<table width="94%" border="1">
-  <tr>
-    <td align="center"><strong>Decoration</strong></td>
-    <td><strong>Resource type</strong></td>
-    <td><strong>Description</strong></td>
-  </tr>
-  <tr> 
-    <td width="14%" align="center"><img src="../images/version_controlled.svg" alt="Version control icon" ></td>
-    <td width="22%">Any</td>
-    <td width="64%">Indicates that the resource is under version control.</td>
-  </tr>
-  <tr> 
-    <td align="center"><img src="../images/dirty_ov.svg" alt="Outgoing icon" ></td>
-    <td>Any</td>
-    <td>Indicates that the resource or one of its children contains outgoing changes.</td>
-  </tr>
-  <tr> 
-    <td align="center"><img src="../images/edited_ov.svg" alt="Edit local icon" ></td>
-    <td>File</td>
-    <td>Indicates that the project containing the file has been configured to 
-      use watch/edit and the file is being edited locally.</td>
-  </tr>
-  <tr> 
-    <td align="center"><img src="../images/merged_ov.svg" alt="Merge conflict icon" ></td>
-    <td>File</td>
-    <td>Indicates that the file contains a merge conflict which has not yet been 
-      resolved. The conflict is considered resolved once the file is modified 
-      and saved.</td>
-  </tr>
-  <tr> 
-    <td align="center"><img src="../images/no_remotedir_ov.svg" alt="No remote folder icon" ></td>
-    <td>Project or Folder</td>
-    <td>Indicates that the folder is under version control but does not correspond 
-      to an existing remote directory but is instead most likely a module defined 
-      in the CVSROOT/modules file.</td>
-  </tr>
-  <tr> 
-    <td align="center"><img src="../images/question_ov.svg" alt="Not under version control icon" ></td>
-    <td>File or Folder</td>
-    <td>Indicates that the resource is not under version control.</td>
-  </tr>
-</table>
-<P CLASS="Para"><em>Note</em>: Resources that are ignored by CVS will not be decorated 
-  by any of the above CVS decorations.</P>
-<h3 class="related">Related concepts</h3> 
-<a href="../concepts/cdecorations.htm">Label Decorations</a>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-107b.htm">Enabling the CVS resource decorations</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>CVS Label Decorations</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">CVS Label Decorations</h1>
+  <p class="Para">Label Decorations are used by CVS to show important synchronization information about workspace
+  resources. Decorations can affect the text or the icon of the label associated with a resource. The text decorators
+  are configurable on the <a href="../tasks/tasks-107b.htm">CVS Label Decorations Preference page</a> which can also be
+  used to indicate which icons are to be enabled. Here is a description of the icons used by CVS.</p>
+  <table width="94%" border="1">
+    <tr>
+      <td align="center"><strong>Decoration</strong></td>
+      <td><strong>Resource type</strong></td>
+      <td><strong>Description</strong></td>
+    </tr>
+    <tr>
+      <td width="14%" align="center"><img src="../images/version_controlled.svg" alt="Version control icon"></td>
+      <td width="22%">Any</td>
+      <td width="64%">Indicates that the resource is under version control.</td>
+    </tr>
+    <tr>
+      <td align="center"><img src="../images/dirty_ov.svg" alt="Outgoing icon"></td>
+      <td>Any</td>
+      <td>Indicates that the resource or one of its children contains outgoing changes.</td>
+    </tr>
+    <tr>
+      <td align="center"><img src="../images/edited_ov.svg" alt="Edit local icon"></td>
+      <td>File</td>
+      <td>Indicates that the project containing the file has been configured to use watch/edit and the file is being
+      edited locally.</td>
+    </tr>
+    <tr>
+      <td align="center"><img src="../images/merged_ov.svg" alt="Merge conflict icon"></td>
+      <td>File</td>
+      <td>Indicates that the file contains a merge conflict which has not yet been resolved. The conflict is considered
+      resolved once the file is modified and saved.</td>
+    </tr>
+    <tr>
+      <td align="center"><img src="../images/no_remotedir_ov.svg" alt="No remote folder icon"></td>
+      <td>Project or Folder</td>
+      <td>Indicates that the folder is under version control but does not correspond to an existing remote directory
+      but is instead most likely a module defined in the CVSROOT/modules file.</td>
+    </tr>
+    <tr>
+      <td align="center"><img src="../images/question_ov.svg" alt="Not under version control icon"></td>
+      <td>File or Folder</td>
+      <td>Indicates that the resource is not under version control.</td>
+    </tr>
+  </table>
+  <p class="Para"><em>Note</em>: Resources that are ignored by CVS will not be decorated by any of the above CVS
+  decorations.</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/cdecorations.htm">Label Decorations</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-107b.htm">Enabling the CVS resource decorations</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-decorations.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-decorations.htm
index 63c3356..711a1ee 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-decorations.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-decorations.htm
@@ -1,34 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Label Decorations</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Label Decorations</H1>
-<P CLASS="Para">
-Label Decorations allow additional information to be displayed in an item's
-label and icon.</P>
-<P CLASS="Para">
-The
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Decorators)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Appearance &gt; Label Decorations</strong></a>
-
-preference page provides a description of each decoration
-and allows the selection of which decorations are visible.</P>
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/cdecorations.htm">Label Decorations</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Label Decorations</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Label Decorations</h1>
+  <p class="Para">Label Decorations allow additional information to be displayed in an item's label and icon.</p>
+  <p class="Para">The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Decorators)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Appearance &gt;
+  Label Decorations</strong></a> preference page provides a description of each decoration and allows the selection of
+  which decorations are visible.</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/cdecorations.htm">Label Decorations</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-dialog-open-resource.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-dialog-open-resource.htm
index 5f563fc..5451309 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-dialog-open-resource.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-dialog-open-resource.htm
@@ -1,166 +1,96 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html lang="en">
-  <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-    <title>
-      Open Resource
-    </title>
-  </head>
-  <body>
-    <h1>
-      Open Resource
-    </h1>
-    <p>
-      This dialog allows you to browse the workbench for a file to open in an editor
-    </p>
-    <ul>
-      <li>
-        <strong>Select an item to open</strong>: In this field, type the first few
-        characters of the name of the file you want to select.
-        <p>The following pattern kinds are supported:</p>
-        <br>
-        <strong>Wildcards</strong>:<br>
-        <ul>
-          <li>
-            &quot;*&quot; for any string and &quot;?&quot; for any character
-          </li>
-          <li>
-            terminating &quot;&lt;&quot; or &quot; &quot; (space)
-            to prevent the automatic prefix matching, e.g. &quot;M*file&lt;&quot;
-            to match <code>Makefile</code> and <code>MockFile</code> but not <code>MakeTheFiles</code>
-          </li>
-        </ul>
-        <strong>Camel case</strong>:<br>
-        <ul>
-          <li>
-            &quot;CS&quot; for file names containing &quot;C&quot; and &quot;S&quot;
-            as upper-case letters in camel-case notation, e.g. <code>CreateStuff.java</code>
-          </li>
-          <li>
-            &quot;CreSNo&quot; for file names containing &quot;Cre&quot;, &quot;S&quot;,
-            and &quot;No&quot; as parts in camel-case notation, e.g.
-            <code>CreateStuffNow.jsp</code>
-          </li>
-          <li>
-              terminating &quot;&lt;&quot; or &quot; &quot; (space) to fix the number of camel-case parts,
-              e.g. &quot;CreS&lt;&quot;
-              matches &quot;CreateStuff.java&quot;, but not
-              &quot;CreateStuffNow.jsp&quot; nor &quot;Createstuff.txt&quot;.
-          </li>
-        </ul>
-        <strong>Folder prefixes</strong>:<br>
-        <p>
-        Both pattern kinds also support <strong>folder prefixes</strong>.
-        If the pattern contains a /, the part before the last / is used to match a path in the workspace, e.g.
-        &quot;org.eclipse.ui/plugin.xml&quot;.<br>
-        Or a bit more complex: &quot;*/ui&lt;/pack*.html&quot; matches e.g. files called &quot;package.html&quot;
-        in a folder named &quot;ui&quot; (but not in folders like &quot;uitools&quot; or &quot;*/ui/internal&quot;).
-        </p>
-        <br>
-        <strong>Relative paths</strong>:<br>
-        <p>
-        For example, "./Mak" matches all files starting with "Mak" in the folder of the active editor or selection, while
-        "../Mak" matches such files in the parent folder.
-        </p>
-        <br>
-      </li>
-      <li>
-        <strong>Matching items</strong>: This list displays matches for the pattern you type in the <strong>Select an item to open</strong> field.
-        <ul>
-          <li>Recently opened files show up in a history section at the top of the list.</li>
-          <li>If the pattern matches many files with the same name, the files that are closer to
-              the currently edited or selected resource are shown on top of the matching items list.</li>
-        </ul>
-      </li>
-    </ul>
-    
-    <p>
-    The <b>Open</b> button opens the file with the default editor for the chosen file.
-    A different editor can be selected in the context menu on a file or in the <b>Open With</b> drop-down button.
-    </p>
-    
-    <p>
-    The <b>Show In</b> drop-down button can be used to show the chosen file in a view.
-    </p>
-    
-    <p>
-      The behavior of the <strong>Open Resource</strong> dialog can be further customized using the dialog menu:
-    </p>
-    <table border="1" cellspacing="0" cellpadding="5" summary="Open resource options">
-      <caption>
-        Open Resource Options
-      </caption>
-      <thead>
-        <tr>
-          <th>
-            <p>
-              Option
-            </p>
-          </th>
-          <th>
-            <p>
-              Description
-            </p>
-          </th>
-          <th>
-            <p>
-              Default
-            </p>
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-
-        <tr>
-          <td valign="top">
-            Show Status Line
-          </td>
-          <td valign="top">
-            When selected, the <strong>Open Resource</strong> dialog shows an additional bar at the bottom of the dialog which displays the
-            full path of the selected file.
-          </td>
-          <td valign="top">
-            Show status line
-          </td>
-        </tr>
-      
-        <tr>
-          <td valign="top">
-            Show Derived Resources
-          </td>
-          <td valign="top">
-            When selected, the <strong>Open Resource</strong> dialog also shows derived resources.
-          </td>
-          <td valign="top">
-            Do not show derived resources
-          </td>
-        </tr>
-      
-        <tr>
-          <td valign="top">
-            Working Set actions
-          </td>
-          <td valign="top">
-            The search scope can be restricted by selecting one or more working sets
-            or the global Window Working Set.
-          </td>
-          <td valign="top">
-            Show all files in the workspace.
-          </td>
-        </tr>
-        
-      </tbody>
-    </table>
-    
-    <h3 class="related">Related tasks</h3>
-      <a href="../tasks/tasks-46.htm">Opening Resources</a>
-    <h3 class="related">Related reference</h3>
-      <a href="../concepts/cworkset.htm">Working sets</a><br>
-      <a href="../reference/ref-58.htm">Navigate actions</a>
-
-  </body>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Open Resource</title>
+</head>
+<body>
+  <h1>Open Resource</h1>
+  <p>This dialog allows you to browse the workbench for a file to open in an editor</p>
+  <ul>
+    <li>
+      <strong>Select an item to open</strong>: In this field, type the first few characters of the name of the file you
+      want to select.
+      <p>The following pattern kinds are supported:</p><br>
+      <strong>Wildcards</strong>:<br>
+      <ul>
+        <li>"*" for any string and "?" for any character</li>
+        <li>terminating "&lt;" or " " (space) to prevent the automatic prefix matching, e.g. "M*file&lt;" to match
+        <code>Makefile</code> and <code>MockFile</code> but not <code>MakeTheFiles</code></li>
+      </ul><strong>Camel case</strong>:<br>
+      <ul>
+        <li>"CS" for file names containing "C" and "S" as upper-case letters in camel-case notation, e.g.
+        <code>CreateStuff.java</code></li>
+        <li>"CreSNo" for file names containing "Cre", "S", and "No" as parts in camel-case notation, e.g.
+        <code>CreateStuffNow.jsp</code></li>
+        <li>terminating "&lt;" or " " (space) to fix the number of camel-case parts, e.g. "CreS&lt;" matches
+        "CreateStuff.java", but not "CreateStuffNow.jsp" nor "Createstuff.txt".</li>
+      </ul><strong>Folder prefixes</strong>:<br>
+      <p>Both pattern kinds also support <strong>folder prefixes</strong>. If the pattern contains a /, the part before
+      the last / is used to match a path in the workspace, e.g. "org.eclipse.ui/plugin.xml".<br>
+      Or a bit more complex: "*/ui&lt;/pack*.html" matches e.g. files called "package.html" in a folder named "ui" (but
+      not in folders like "uitools" or "*/ui/internal").</p><br>
+      <strong>Relative paths</strong>:<br>
+      <p>For example, "./Mak" matches all files starting with "Mak" in the folder of the active editor or selection,
+      while "../Mak" matches such files in the parent folder.</p><br>
+    </li>
+    <li>
+      <strong>Matching items</strong>: This list displays matches for the pattern you type in the <strong>Select an
+      item to open</strong> field.
+      <ul>
+        <li>Recently opened files show up in a history section at the top of the list.</li>
+        <li>If the pattern matches many files with the same name, the files that are closer to the currently edited or
+        selected resource are shown on top of the matching items list.</li>
+      </ul>
+    </li>
+  </ul>
+  <p>The <b>Open</b> button opens the file with the default editor for the chosen file. A different editor can be
+  selected in the context menu on a file or in the <b>Open With</b> drop-down button.</p>
+  <p>The <b>Show In</b> drop-down button can be used to show the chosen file in a view.</p>
+  <p>The behavior of the <strong>Open Resource</strong> dialog can be further customized using the dialog menu:</p>
+  <table border="1" cellspacing="0" cellpadding="5" summary="Open resource options">
+    <caption>
+      Open Resource Options
+    </caption>
+    <thead>
+      <tr>
+        <th>
+          <p>Option</p>
+        </th>
+        <th>
+          <p>Description</p>
+        </th>
+        <th>
+          <p>Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td valign="top">Show Status Line</td>
+        <td valign="top">When selected, the <strong>Open Resource</strong> dialog shows an additional bar at the bottom
+        of the dialog which displays the full path of the selected file.</td>
+        <td valign="top">Show status line</td>
+      </tr>
+      <tr>
+        <td valign="top">Show Derived Resources</td>
+        <td valign="top">When selected, the <strong>Open Resource</strong> dialog also shows derived resources.</td>
+        <td valign="top">Do not show derived resources</td>
+      </tr>
+      <tr>
+        <td valign="top">Working Set actions</td>
+        <td valign="top">The search scope can be restricted by selecting one or more working sets or the global Window
+        Working Set.</td>
+        <td valign="top">Show all files in the workspace.</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-46.htm">Opening Resources</a>
+  <h3 class="related">Related reference</h3><a href="../concepts/cworkset.htm">Working sets</a><br>
+  <a href="../reference/ref-58.htm">Navigate actions</a>
+</body>
 </html>
-
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-error_log_view.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-error_log_view.htm
index d25c886..a6743d3 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-error_log_view.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-error_log_view.htm
@@ -2,43 +2,53 @@
 "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Error Log</title>
-<script language="JavaScript" type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<link href="../book.css" rel="stylesheet" type="text/css">
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <title>Error Log</title>
+  <script language="JavaScript" type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+  <link href="../book.css" rel="stylesheet" type="text/css">
 </head>
-
 <body>
-<h1>Error Log</h1>
-<p>The <strong>Error Log</strong> view captures all the warnings and errors logged by plug-ins. The underlying log file is a <em>.log</em> file stored in the <em>.metadata</em> subdirectory of the workspace. The <strong>Error Log</strong> view is available under <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.pde.runtime.LogView)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="Open the Log view">
-<strong>Window &gt; Show View &gt; Error Log</strong>
-</a>. </p>
-<p><img src="../images/error_log.png" alt="Error Log" ></p>
-
-<h2>Event Sorting</h2>
-<p>Events in the log view can be sorted by <strong>Message</strong>, <strong>Plug-in ID</strong> or <strong>Date</strong> in ascending or descending order. Simply click on the column header that you want the sorting to be based on. The down arrow in the column header indicates descending order; while, the up arrow indicates an ascending order.</p>
-
-<h2>Event Grouping</h2>
-<p>Events in the log view can be grouped by <strong>Session</strong> or <strong>Plug-in ID</strong>. Simply click on the chevron from the view's toolbar and select <strong>Group By</strong>. </p>
-
-<h2>Event Filtering</h2>
-<p>You can filter the view to show events of a particular type or session. Also, you can limit the number of entries in the view. Filtering options are available under <strong>Filters...</strong> from the view's toolbar drop down menu. </p>
-
-<h2>Import and Export Logs</h2>
-<p>To <strong>import</strong> an arbitrary <em>.log</em> file into the view, press the <strong>Import Log</strong> toolbar button or select <strong>Import Log...</strong> from the context menu.  Then, choose a <em>.log</em> file from the file system. </p>
-<p>To <strong>export</strong> the current log view content into a file, press the <strong>Export Log</strong> toolbar button or select <strong>Export Log...</strong> from the context menu. Then, enter a file name. </p>
-
-<h2>Clear and Delete Logs</h2>
-<p>To <strong>clear</strong> the view log content without deleting the underlying <em>.log</em> file, press the <strong>Clear Log</strong> toolbar button or select <strong>Clear Log Viewer</strong> from the context menu. </p>
-<p>To permanently <strong>delete</strong> the underlying <em>.log</em> file, press the <strong>Delete Log</strong> toolbar button or select <strong>Delete Log</strong> from the context menu. </p>
-
-<h2>Event Details</h2>
-<p>Full details about a particular event can be viewed in the <strong>Event Details</strong> dialog by double-clicking on a particular entry or selecting <strong>Event Details</strong> from the context menu of that entry. You can view the <strong>Date</strong>, <strong>Severity</strong>, <strong>Message</strong>, <strong>Exception Stack Trace</strong> (if available) and <strong>Session Data</strong> of each event. </p>
-<p><img src="../images/error_log_details.png" alt="Error Log Details" ></p>
-<p>You can  navigate from one entry to the next via the <strong>Up</strong> and <strong>Down</strong> arrow buttons. </p>
-<p>To copy the error to the clipboard, press the button with the clipboard image. </p>
-
+  <h1>Error Log</h1>
+  <p>The <strong>Error Log</strong> view captures all the warnings and errors logged by plug-ins. The underlying log
+  file is a <em>.log</em> file stored in the <em>.metadata</em> subdirectory of the workspace. The <strong>Error
+  Log</strong> view is available under <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.pde.runtime.LogView)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="Open the Log view"> <strong>Window &gt; Show View &gt;
+  Error Log</strong></a> .</p>
+  <p><img src="../images/error_log.png" alt="Error Log"></p>
+  <h2>Event Sorting</h2>
+  <p>Events in the log view can be sorted by <strong>Message</strong>, <strong>Plug-in ID</strong> or
+  <strong>Date</strong> in ascending or descending order. Simply click on the column header that you want the sorting
+  to be based on. The down arrow in the column header indicates descending order; while, the up arrow indicates an
+  ascending order.</p>
+  <h2>Event Grouping</h2>
+  <p>Events in the log view can be grouped by <strong>Session</strong> or <strong>Plug-in ID</strong>. Simply click on
+  the chevron from the view's toolbar and select <strong>Group By</strong>.</p>
+  <h2>Event Filtering</h2>
+  <p>You can filter the view to show events of a particular type or session. Also, you can limit the number of entries
+  in the view. Filtering options are available under <strong>Filters...</strong> from the view's toolbar drop down
+  menu.</p>
+  <h2>Import and Export Logs</h2>
+  <p>To <strong>import</strong> an arbitrary <em>.log</em> file into the view, press the <strong>Import Log</strong>
+  toolbar button or select <strong>Import Log...</strong> from the context menu. Then, choose a <em>.log</em> file from
+  the file system.</p>
+  <p>To <strong>export</strong> the current log view content into a file, press the <strong>Export Log</strong> toolbar
+  button or select <strong>Export Log...</strong> from the context menu. Then, enter a file name.</p>
+  <h2>Clear and Delete Logs</h2>
+  <p>To <strong>clear</strong> the view log content without deleting the underlying <em>.log</em> file, press the
+  <strong>Clear Log</strong> toolbar button or select <strong>Clear Log Viewer</strong> from the context menu.</p>
+  <p>To permanently <strong>delete</strong> the underlying <em>.log</em> file, press the <strong>Delete Log</strong>
+  toolbar button or select <strong>Delete Log</strong> from the context menu.</p>
+  <h2>Event Details</h2>
+  <p>Full details about a particular event can be viewed in the <strong>Event Details</strong> dialog by
+  double-clicking on a particular entry or selecting <strong>Event Details</strong> from the context menu of that
+  entry. You can view the <strong>Date</strong>, <strong>Severity</strong>, <strong>Message</strong>, <strong>Exception
+  Stack Trace</strong> (if available) and <strong>Session Data</strong> of each event.</p>
+  <p><img src="../images/error_log_details.png" alt="Error Log Details"></p>
+  <p>You can navigate from one entry to the next via the <strong>Up</strong> and <strong>Down</strong> arrow
+  buttons.</p>
+  <p>To copy the error to the clipboard, press the button with the clipboard image.</p>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-exttoolsprefs.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-exttoolsprefs.htm
index 927b42e..0e7f704 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-exttoolsprefs.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-exttoolsprefs.htm
@@ -1,36 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>External Tools</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-External Tools</H1>
-<P CLASS="Intro">
-
-The following preferences can be changed on the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.externaltools.ExternalToolsPreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Run/Debug &gt; External Tools</strong></a> preference page.</p>
-<P>You can configure whether or not you are prompted before external tool project builders are migrated.
-</P>
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/concepts-antsupport.htm">Ant support</a>
-
-<h3 class="related">Related reference</h3>
-<a href="../reference/ref-antprefs.htm">Ant preference page</a><br>
-<a href="../reference/ref-antruntimeprefs.htm">Ant runtime preference page</a><br>
-<a href="../reference/ref-anteditorprefs.htm">Ant editor preference page</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>External Tools</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">External Tools</h1>
+  <p class="Intro">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.externaltools.ExternalToolsPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Run/Debug &gt; External
+  Tools</strong></a> preference page.</p>
+  <p>You can configure whether or not you are prompted before external tool project builders are migrated.</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/concepts-antsupport.htm">Ant support</a>
+  <h3 class="related">Related reference</h3><a href="../reference/ref-antprefs.htm">Ant preference page</a><br>
+  <a href="../reference/ref-antruntimeprefs.htm">Ant runtime preference page</a><br>
+  <a href="../reference/ref-anteditorprefs.htm">Ant editor preference page</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-fonts.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-fonts.htm
index 8b44915..1e0c14b 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-fonts.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-fonts.htm
@@ -1,47 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Colors and Fonts</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Colors and Fonts</H1>
-<P CLASS="Para"> Many of the fonts and colors and used by eclipse components can be set using the 
-  
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.ColorsAndFonts)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>General &gt; Appearance &gt; Colors and Fonts</strong></a>
-  
-  preference page.</P>
-<P CLASS="Para"> A tree is used to navigate among and show a short preview of 
-  the various colors and fonts. The current face (but not size) of any font is 
-  previewed in its label. Colors are previewed in the icon associated with its 
-  label. Additionally, some categories (Workbench in particular) provide a more 
-  detailed preview of their contributions. This preview is shown below the description 
-  area if available.</P>
-<P CLASS="Para"> Font settings can be changed either by selecting the font from 
-  the list and clicking <strong>Use System Font </strong> to choose the Operating 
-  System font setting or by clicking <strong>Change </strong>to open up a font 
-  selection dialog. <strong>Reset</strong> can be used to return to the default 
-  value.</P>
-<P CLASS="Para"> Color settings can be changed by clicking <strong>color</strong> 
-  to the right of the tree area when a color is selected. <strong>Reset</strong> 
-  can be used to return to the default value.</P>
-
-<p>The Colors and Fonts text field can be used to filter the contents. Simply 
-  type in an entry and any matching results will remain in the tree view.</p>
-<p>Descriptions and previews are provided when the Workbench colors and font settings 
-  are selected.</p>
-
-<h3 class="related">Related tasks</h3><a href="../tasks/tasks-20.htm">Changing fonts and colors</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Colors and Fonts</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Colors and Fonts</h1>
+  <p class="Para">Many of the fonts and colors and used by eclipse components can be set using the <a class=
+  "command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.ColorsAndFonts)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Appearance &gt;
+  Colors and Fonts</strong></a> preference page.</p>
+  <p class="Para">A tree is used to navigate among and show a short preview of the various colors and fonts. The
+  current face (but not size) of any font is previewed in its label. Colors are previewed in the icon associated with
+  its label. Additionally, some categories (Workbench in particular) provide a more detailed preview of their
+  contributions. This preview is shown below the description area if available.</p>
+  <p class="Para">Font settings can be changed either by selecting the font from the list and clicking <strong>Use
+  System Font</strong> to choose the Operating System font setting or by clicking <strong>Change</strong> to open up a
+  font selection dialog. <strong>Reset</strong> can be used to return to the default value.</p>
+  <p class="Para">Color settings can be changed by clicking <strong>color</strong> to the right of the tree area when a
+  color is selected. <strong>Reset</strong> can be used to return to the default value.</p>
+  <p>The Colors and Fonts text field can be used to filter the contents. Simply type in an entry and any matching
+  results will remain in the tree view.</p>
+  <p>Descriptions and previews are provided when the Workbench colors and font settings are selected.</p>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-20.htm">Changing fonts and colors</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-globalizationprefs.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-globalizationprefs.htm
index a242ee4..b9f0c6b 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-globalizationprefs.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-globalizationprefs.htm
@@ -1,63 +1,51 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2014. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Globalization Preferences</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2014. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Globalization Preferences</title>
 </head>
 <body>
-
-<h1>Globalization Preferences</h1>
-
-<p>On the
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Globalization)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Globalization</strong></a>
-preference page, you can set various parameters affecting the rendering of your data.
-</p>
-<p>Note that for new values to take effect, you must restart Eclipse.</p>
-
-<h2>Unicode locale extensions</h2>
-
-<p>Specifies various regional or cultural preferences (such as calendar type, currency, etc.) as detailed at
-<a href="http://userguide.icu-project.org/locale#TOC-Keywords" target="_blank">http://userguide.icu-project.org/locale#TOC-Keywords</a>.<br>
-The standard for keywords and values that can be used in this field is detailed in
-<a href="http://www.unicode.org/reports/tr35/#Key_And_Type_Definitions_">http://www.unicode.org/reports/tr35/#Key_And_Type_Definitions_</a>.
-</p>
-
-<p>Sample value: <code>fr@collation=phonebook;calendar=islamic-civil</code></p>
-
-<h2>Graphical layout direction</h2>
-
-<p>Sets the global layout direction for graphical user interface (GUI) elements.</p>
-
-<ul>
-	<li><em>OS Default</em> - default flow of GUI elements as determined by the operating system</li>
-	<li><em>Left to right</em> - flow of GUI elements is from left to right. This is a standard appearance for GUIs presented in English or any Latin script based language.</li>
-	<li><em>Right to left</em> - flow of GUI elements is from right to left. This is a standard appearance for GUIs presented in Arabic or Hebrew languages.</li>
-</ul>
-
-<h2>Enable bidirectional support</h2>
-
-<p>If this option is unchecked (default value), Eclipse doesn't modify the display of bidirectional text and provides the default operating system behavior.
-</p>
-
-<p>If bidirectional support is enabled (checked):</p>
-
-<ul>
-	<li>Eclipse will assure proper display of structured text such as file paths, URLs, etc.</li>
-	<li>In addition, you can choose the preferred text direction for unstructured text:
-	<ul>
-		<li><em>Contextual</em> - text direction depends on the given text</li>
-		<li><em>Left to right</em> - left to right text direction</li>
-		<li><em>Right to left</em> - right to left text direction</li>
-		<li><em>OS Default</em> - default text direction provided by the operating system</li>
-	</ul>
-	</li>
-</ul>
-
+  <h1>Globalization Preferences</h1>
+  <p>On the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Globalization)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt;
+  Globalization</strong></a> preference page, you can set various parameters affecting the rendering of your data.</p>
+  <p>Note that for new values to take effect, you must restart Eclipse.</p>
+  <h2>Unicode locale extensions</h2>
+  <p>Specifies various regional or cultural preferences (such as calendar type, currency, etc.) as detailed at <a href=
+  "http://userguide.icu-project.org/locale#TOC-Keywords" target=
+  "_blank">http://userguide.icu-project.org/locale#TOC-Keywords</a>.<br>
+  The standard for keywords and values that can be used in this field is detailed in <a href=
+  "http://www.unicode.org/reports/tr35/#Key_And_Type_Definitions_">http://www.unicode.org/reports/tr35/#Key_And_Type_Definitions_</a>.</p>
+  <p>Sample value: <code>fr@collation=phonebook;calendar=islamic-civil</code></p>
+  <h2>Graphical layout direction</h2>
+  <p>Sets the global layout direction for graphical user interface (GUI) elements.</p>
+  <ul>
+    <li><em>OS Default</em> - default flow of GUI elements as determined by the operating system</li>
+    <li><em>Left to right</em> - flow of GUI elements is from left to right. This is a standard appearance for GUIs
+    presented in English or any Latin script based language.</li>
+    <li><em>Right to left</em> - flow of GUI elements is from right to left. This is a standard appearance for GUIs
+    presented in Arabic or Hebrew languages.</li>
+  </ul>
+  <h2>Enable bidirectional support</h2>
+  <p>If this option is unchecked (default value), Eclipse doesn't modify the display of bidirectional text and provides
+  the default operating system behavior.</p>
+  <p>If bidirectional support is enabled (checked):</p>
+  <ul>
+    <li>Eclipse will assure proper display of structured text such as file paths, URLs, etc.</li>
+    <li>In addition, you can choose the preferred text direction for unstructured text:
+      <ul>
+        <li><em>Contextual</em> - text direction depends on the given text</li>
+        <li><em>Left to right</em> - left to right text direction</li>
+        <li><em>Right to left</em> - right to left text direction</li>
+        <li><em>OS Default</em> - default text direction provided by the operating system</li>
+      </ul>
+    </li>
+  </ul>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-keybindings.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-keybindings.htm
index 3b38f42..8f7ad70 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-keybindings.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-keybindings.htm
@@ -1,536 +1,428 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<TITLE>
-List of key bindings
-</TITLE>
-
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<h1>List of key bindings</h1>
-The list of available key bindings in Eclipse depends on many factors, including
-what view or editor is selected, whether a dialog is open, what plug-ins are
-installed, and what operating and windowing system is being used.  At any
-time, you can obtain a list of available key bindings using Key Assist 
-(<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.showKeyAssist")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>Help &gt; Key Assist...</b></a>
-or Ctrl+Shift+L).  The following tables list some 
-popular key bindings available in the Eclipse SDK.
-
-<h3><strong>File actions</strong></h3>
-
-<table width="75%" border="1">
-  <tr> 
-    <td class="xl29" height="86">New</td>
-    <td class="xl29" style="border-left: medium none; width: 269pt;">Create a 
-      Java element or a new resource. Configure which elements are shown in the 
-      submenu in Window &gt; Perspective &gt; Customize Perspective. In a Java perspective, by 
-      default action for creating a project, package, class, interface , source 
-      folder, scrapbook, file and folder are available.</td>
-    <td class="xl29" style="border-left: medium none; width: 110pt;">Ctrl + N</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Close</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Close 
-      the current editor. If the editor contains unsaved data, a save request 
-      dialog will be shown.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + F4</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Close 
-      All</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Close all editors. 
-	If editor contains unsaved data, a save request dialog will be shown.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Shift + F4</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Save</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Save 
-      the content of the current editor. Disabled if the editor does not contain 
-      unsaved changes.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + S</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Save 
-      As</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Save 
-      the content of the current editor under a new name.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;"></td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Save 
-      All</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Save 
-      the content of all editors with unsaved changes. Disabled if no editor contains 
-      unsaved changes.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Shift + S</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Print</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Prints 
-      the content of the current editor. Enabled when an editor has the focus.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + P</td>
-  </tr>
-  <tr> 
-    <td class="xl27" style="border-top: medium none; height: 51.75pt; width: 126pt;" height="69">Properties</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 269pt;">Opens 
-      the property pages of the select elements. Opened on Java projects the Java 
-      Build Path page and the Javadoc Location page are available. For JAR archives, 
-      configure the JAR's Source Attachment and Javadoc Location here.</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt 
-      + Enter</td>
-  </tr>
-</table>
-<h3><strong>Edit actions</strong></h3>
-<table width="75%" border="1">
-  <tr> 
-    <td class="xl29" height="18">Undo</td>
-    <td class="xl29" style="border-left: medium none; width: 269pt;">Revert the 
-      last change in the editor</td>
-    <td class="xl29" style="border-left: medium none; width: 110pt;">Ctrl + Z</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Redo</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Revert 
-      an undone change</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Y</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Cut</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Copies 
-      the currently selected text or element to the clipboard and removes the 
-      element. On elements, the remove is not performed before the clipboard is 
-      pasted.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + X</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Copy</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Copies 
-      the currently selected text or elements to the clipboard</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + C</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Paste</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Paste 
-      the current content as text to the editor, or as a sibling or child element 
-      to the a currently selected element.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + V</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Delete</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Delete 
-      the current text or element selection.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Delete</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Select 
-      All</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Select 
-      all the editor content..</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + A</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Find 
-      / Replace</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Open 
-      the Find / Replace dialog. Editor only.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + F</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Find 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>List of key bindings</title>
+  <link rel="stylesheet" type="text/css" href="../book.css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1>List of key bindings</h1>The list of available key bindings in Eclipse depends on many factors, including what
+  view or editor is selected, whether a dialog is open, what plug-ins are installed, and what operating and windowing
+  system is being used. At any time, you can obtain a list of available key bindings using Key Assist ( <a class=
+  "command-link" href='javascript:executeCommand("org.eclipse.ui.window.showKeyAssist")'><img src=
+  "PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Help &gt; Key Assist...</b></a> or
+  Ctrl+Shift+L). The following tables list some popular key bindings available in the Eclipse SDK.
+  <h3><strong>File actions</strong></h3>
+  <table width="75%" border="1">
+    <tr>
+      <td class="xl29" height="86">New</td>
+      <td class="xl29" style="border-left: medium none; width: 269pt;">Create a Java element or a new resource.
+      Configure which elements are shown in the submenu in Window &gt; Perspective &gt; Customize Perspective. In a
+      Java perspective, by default action for creating a project, package, class, interface , source folder, scrapbook,
+      file and folder are available.</td>
+      <td class="xl29" style="border-left: medium none; width: 110pt;">Ctrl + N</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Close</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Close the current
+      editor. If the editor contains unsaved data, a save request dialog will be shown.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + F4</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Close All</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Close all editors. If
+      editor contains unsaved data, a save request dialog will be shown.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Shift + F4</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Save</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Save the content of the
+      current editor. Disabled if the editor does not contain unsaved changes.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + S</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Save As</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Save the content of the
+      current editor under a new name.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;"></td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Save All</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Save the content of all
+      editors with unsaved changes. Disabled if no editor contains unsaved changes.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Shift + S</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Print</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Prints the content of
+      the current editor. Enabled when an editor has the focus.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + P</td>
+    </tr>
+    <tr>
+      <td class="xl27" style="border-top: medium none; height: 51.75pt; width: 126pt;" height="69">Properties</td>
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 269pt;">Opens the property
+      pages of the select elements. Opened on Java projects the Java Build Path page and the Javadoc Location page are
+      available. For JAR archives, configure the JAR's Source Attachment and Javadoc Location here.</td>
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt + Enter</td>
+    </tr>
+  </table>
+  <h3><strong>Edit actions</strong></h3>
+  <table width="75%" border="1">
+    <tr>
+      <td class="xl29" height="18">Undo</td>
+      <td class="xl29" style="border-left: medium none; width: 269pt;">Revert the last change in the editor</td>
+      <td class="xl29" style="border-left: medium none; width: 110pt;">Ctrl + Z</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Redo</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Revert an undone
+      change</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Y</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Cut</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Copies the currently
+      selected text or element to the clipboard and removes the element. On elements, the remove is not performed
+      before the clipboard is pasted.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + X</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Copy</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Copies the currently
+      selected text or elements to the clipboard</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + C</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Paste</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Paste the current
+      content as text to the editor, or as a sibling or child element to the a currently selected element.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + V</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Delete</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Delete the current text
+      or element selection.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Delete</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Select All</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Select all the editor
+      content..</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + A</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Find / Replace</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Open the Find / Replace
+      dialog. Editor only.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + F</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Find Next</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Finds the next
+      occurrence of the currently selected text. Editor only.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + K</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Find Previous</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Finds the previous
+      occurrence of the currently selected text. Editor only.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Shift + K</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Incremental Find
       Next</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Finds 
-      the next occurrence of the currently selected text. Editor only.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + K</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Find 
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts the incremental
+      find mode. After invocation, enter the search text as instructed in the status bar. Editor only.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + J</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Incremental Find
       Previous</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Finds 
-      the previous occurrence of the currently selected text. Editor only.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Shift + K</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Incremental 
-      Find Next</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts 
-      the incremental find mode. After invocation, enter the search text as instructed 
-      in the status bar. Editor only.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + J</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Incremental 
-      Find Previous</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts 
-      the incremental find mode. After invocation, enter the search text as instructed 
-      in the status bar. Editor only.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Shift + J</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Add 
-      Task</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Add 
-      a user defined task to the current text selection or selected element.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt 
-      + Enter</td>
-  </tr>
-  <tr> 
-    <td rowspan="4" class="xl27" style="border-top: medium none; height: 127.5pt; width: 126pt;" height="170">Expand 
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts the incremental
+      find mode. After invocation, enter the search text as instructed in the status bar. Editor only.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Shift + J</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Add Task</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Add a user defined task
+      to the current text selection or selected element.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt + Enter</td>
+    </tr>
+    <tr>
+      <td rowspan="4" class="xl27" style="border-top: medium none; height: 127.5pt; width: 126pt;" height="170">Expand
       Selection to</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 269pt;">Enclosing 
-      Element: Selects the enclosing expression, block, method in the code. This 
-      action is aware of the Java syntax. It may not function properly when the 
-      code has syntax errors. (Arrow Up).</td>
-    <td rowspan="4" class="xl27" style="border-top: medium none; width: 110pt;">Alt 
-      + Shift + Arrow Keys</td>
-  </tr>
-  <tr> 
-    <td class="xl28" style="border-left: medium none; height: 25.5pt; width: 269pt;" height="34">Next 
-      Element: Selects the current and next element. (Arrow Right)</td>
-  </tr>
-  <tr> 
-    <td class="xl28" style="border-left: medium none; height: 25.5pt; width: 269pt;" height="34">Previous 
-      Element: Selects the current and the previous element (Arrow Left)</td>
-  </tr>
-  <tr> 
-    <td class="xl28" style="border-left: medium none; height: 25.5pt; width: 269pt;" height="34">Restore 
-      Last Selection: After an invocation of Expand Selection to restore the previous selection. (Arrow Down)</td>
-  </tr>
-  <tr> 
-    <td class="xl25" height="51">Show Tooltip 
-      Description</td>
-    <td class="xl25" style="border-left: medium none; width: 269pt;">Shows the 
-      value of a hover that would appear at the current cursor location. The dialog 
-      shown is scrollable and does not shorten descriptions.</td>
-    <td class="xl25" style="border-left: medium none; width: 110pt;">F2</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 89.25pt; width: 126pt;" height="119">Content 
-      Assist</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Opens 
-      a context assist dialog at the current cursor position to bring up Java 
-      code assist proposals and templates. See the Templates preference page for 
-      available templates (Java &gt; Editor &gt; 
-      Templates) and go to the Editor preference page (Java &gt; Editor &gt; Code Assist) for configuring the behavior of 
-      code assist.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Space</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Quick 
-      Fix</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">If 
-      the cursor is located at a location with problem indication this opens a 
-      context assist dialog at the current cursor to present possible corrections.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + 1</td>
-  </tr>
-  <tr> 
-    <td class="xl27" style="border-top: medium none; height: 51.75pt; width: 126pt;" height="69">Parameter 
-      Hints</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 269pt;">If 
-      the cursor is located at the parameter specification for method reference, 
-      this actions shows a hover with parameter types information.The parameter 
-      at the current cursor location is shown in bold.</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Shift + Space</td>
-  </tr>
-</table>
-<h3><strong>Navigate actions</strong></h3>
-<table width="75%" border="1">
-  <tr> 
-    <td class="xl29" height="35">Open</td>
-    <td class="xl29" style="border-left: medium none; width: 269pt;">Tries to 
-      resolve the element referenced at the current code selection and opens the 
-      file declaring the reference.</td>
-    <td class="xl29" style="border-left: medium none; width: 110pt;">F3</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 63.75pt; width: 126pt;" height="85">Open 
-      Type Hierarchy</td>
-    <td class="xl26" style="width: 269pt;">Tries to resolve the element referenced 
-      at the current code selection and opens the element in the Type Hierarchy 
-      view. Invoked on elements, opens the type hierarchy of the element. Supported 
-      in the Java editor and views showing Java elements.</td>
-    <td class="xl25" style="border-top: medium none; width: 110pt;">F4</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 102pt; width: 126pt;" height="136">Open 
-      External Javadoc</td>
-    <td class="xl25" style="border-left: medium none; width: 269pt;">Opens the 
-      Javadoc documentation of the currently selected element or text selection. 
-      The location of the Javadoc of a JAR or a project is specified in the Javadoc 
-      Location property page on projects or JARs. Note that this external Javadoc 
-      documentation may not be up to date with the Javadoc specified in the current 
-      code. You can create Javadoc documentation for source files in a Java project 
-      using the Javadoc export wizard.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Shift 
-      + F2</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Open 
-      Type</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Brings 
-      up the Open Type selection dialog to open a type in the editor.The Open 
-      Type selection dialog shows all types existing in the workspace.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Shift + T</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 51pt; width: 126pt;" height="68">Open 
-      Type In Hierarchy</td>
-    <td class="xl26" style="width: 269pt;">Brings up the Open Type selection dialog 
-      to open a type in the editor and the Type Hierarchy view. The Open Type 
-      selection dialog shows all types that exist in the workspace.</td>
-    <td class="xl25" style="border-top: medium none; width: 110pt;">Ctrl + Shift 
-      + H</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Show 
-      Outline</td>
-    <td class="xl25" style="border-left: medium none; width: 269pt;">Opens the 
-      lightweight outliner for the currently selected type.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + O</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Go 
-      to Next Problem</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Selects 
-      the next problem. Supported in the Java editor.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + . (Period)</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Go 
-      to Previous Problem</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Selects 
-      the previous problem. Supported in the Java editor.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + , (Comma)</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Go 
-      to Last Edit Location</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Reveal 
-      the location where the last edit occurred.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Q</td>
-  </tr>
-  <tr> 
-    <td class="xl27" style="border-top: medium none; height: 26.25pt; width: 126pt;" height="36">Go 
-      to Line</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 269pt;">Opens 
-      an a dialog which allows entering the line number to which the editor should 
-      jump to. Editor only.</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + L</td>
-  </tr>
-</table>
-<h3><strong>Search actions</strong></h3>
-<table width="75%" border="1">
-  <tr> 
-    <td class="xl29" height="18">Search...</td>
-    <td class="xl29" style="border-left: medium none; width: 269pt;">Opens the 
-      search dialog</td>
-    <td class="xl29" style="border-left: medium none; width: 110pt;">Ctrl + H</td>
-  </tr>
-  <tr> 
-    <td class="xl27" style="border-top: medium none; height: 26.25pt; width: 126pt;" height="35">Occurrences 
-      in File</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 269pt;">Finds 
-      all occurrences of the selected Java element in its file</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Shift + U</td>
-  </tr>
-</table>
-<h3><strong>Project actions</strong></h3>
-<table width="75%" border="1">
-  <tr> 
-    <td class="xl28" height="70">Build All</td>
-    <td class="xl28" style="border-left: medium none; width: 269pt;">Builds the 
-      all projects in the workspace. This is an incremental build, means that 
-      the builder analyzes the changes since the last time of build and minimizes 
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 269pt;">Enclosing Element:
+      Selects the enclosing expression, block, method in the code. This action is aware of the Java syntax. It may not
+      function properly when the code has syntax errors. (Arrow Up).</td>
+      <td rowspan="4" class="xl27" style="border-top: medium none; width: 110pt;">Alt + Shift + Arrow Keys</td>
+    </tr>
+    <tr>
+      <td class="xl28" style="border-left: medium none; height: 25.5pt; width: 269pt;" height="34">Next Element:
+      Selects the current and next element. (Arrow Right)</td>
+    </tr>
+    <tr>
+      <td class="xl28" style="border-left: medium none; height: 25.5pt; width: 269pt;" height="34">Previous Element:
+      Selects the current and the previous element (Arrow Left)</td>
+    </tr>
+    <tr>
+      <td class="xl28" style="border-left: medium none; height: 25.5pt; width: 269pt;" height="34">Restore Last
+      Selection: After an invocation of Expand Selection to restore the previous selection. (Arrow Down)</td>
+    </tr>
+    <tr>
+      <td class="xl25" height="51">Show Tooltip Description</td>
+      <td class="xl25" style="border-left: medium none; width: 269pt;">Shows the value of a hover that would appear at
+      the current cursor location. The dialog shown is scrollable and does not shorten descriptions.</td>
+      <td class="xl25" style="border-left: medium none; width: 110pt;">F2</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 89.25pt; width: 126pt;" height="119">Content Assist</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Opens a context assist
+      dialog at the current cursor position to bring up Java code assist proposals and templates. See the Templates
+      preference page for available templates (Java &gt; Editor &gt; Templates) and go to the Editor preference page
+      (Java &gt; Editor &gt; Code Assist) for configuring the behavior of code assist.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Space</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Quick Fix</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">If the cursor is
+      located at a location with problem indication this opens a context assist dialog at the current cursor to present
+      possible corrections.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + 1</td>
+    </tr>
+    <tr>
+      <td class="xl27" style="border-top: medium none; height: 51.75pt; width: 126pt;" height="69">Parameter Hints</td>
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 269pt;">If the cursor is
+      located at the parameter specification for method reference, this actions shows a hover with parameter types
+      information.The parameter at the current cursor location is shown in bold.</td>
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Shift +
+      Space</td>
+    </tr>
+  </table>
+  <h3><strong>Navigate actions</strong></h3>
+  <table width="75%" border="1">
+    <tr>
+      <td class="xl29" height="35">Open</td>
+      <td class="xl29" style="border-left: medium none; width: 269pt;">Tries to resolve the element referenced at the
+      current code selection and opens the file declaring the reference.</td>
+      <td class="xl29" style="border-left: medium none; width: 110pt;">F3</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 63.75pt; width: 126pt;" height="85">Open Type
+      Hierarchy</td>
+      <td class="xl26" style="width: 269pt;">Tries to resolve the element referenced at the current code selection and
+      opens the element in the Type Hierarchy view. Invoked on elements, opens the type hierarchy of the element.
+      Supported in the Java editor and views showing Java elements.</td>
+      <td class="xl25" style="border-top: medium none; width: 110pt;">F4</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 102pt; width: 126pt;" height="136">Open External
+      Javadoc</td>
+      <td class="xl25" style="border-left: medium none; width: 269pt;">Opens the Javadoc documentation of the currently
+      selected element or text selection. The location of the Javadoc of a JAR or a project is specified in the Javadoc
+      Location property page on projects or JARs. Note that this external Javadoc documentation may not be up to date
+      with the Javadoc specified in the current code. You can create Javadoc documentation for source files in a Java
+      project using the Javadoc export wizard.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Shift + F2</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Open Type</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Brings up the Open Type
+      selection dialog to open a type in the editor.The Open Type selection dialog shows all types existing in the
+      workspace.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Shift + T</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 51pt; width: 126pt;" height="68">Open Type In
+      Hierarchy</td>
+      <td class="xl26" style="width: 269pt;">Brings up the Open Type selection dialog to open a type in the editor and
+      the Type Hierarchy view. The Open Type selection dialog shows all types that exist in the workspace.</td>
+      <td class="xl25" style="border-top: medium none; width: 110pt;">Ctrl + Shift + H</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 25.5pt; width: 126pt;" height="34">Show Outline</td>
+      <td class="xl25" style="border-left: medium none; width: 269pt;">Opens the lightweight outliner for the currently
+      selected type.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + O</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Go to Next
+      Problem</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Selects the next
+      problem. Supported in the Java editor.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + . (Period)</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Go to Previous
+      Problem</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Selects the previous
+      problem. Supported in the Java editor.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + , (Comma)</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Go to Last Edit
+      Location</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Reveal the location
+      where the last edit occurred.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Q</td>
+    </tr>
+    <tr>
+      <td class="xl27" style="border-top: medium none; height: 26.25pt; width: 126pt;" height="36">Go to Line</td>
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 269pt;">Opens an a dialog which
+      allows entering the line number to which the editor should jump to. Editor only.</td>
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + L</td>
+    </tr>
+  </table>
+  <h3><strong>Search actions</strong></h3>
+  <table width="75%" border="1">
+    <tr>
+      <td class="xl29" height="18">Search...</td>
+      <td class="xl29" style="border-left: medium none; width: 269pt;">Opens the search dialog</td>
+      <td class="xl29" style="border-left: medium none; width: 110pt;">Ctrl + H</td>
+    </tr>
+    <tr>
+      <td class="xl27" style="border-top: medium none; height: 26.25pt; width: 126pt;" height="35">Occurrences in
+      File</td>
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 269pt;">Finds all occurrences
+      of the selected Java element in its file</td>
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Shift + U</td>
+    </tr>
+  </table>
+  <h3><strong>Project actions</strong></h3>
+  <table width="75%" border="1">
+    <tr>
+      <td class="xl28" height="70">Build All</td>
+      <td class="xl28" style="border-left: medium none; width: 269pt;">Builds the all projects in the workspace. This
+      is an incremental build, means that the builder analyzes the changes since the last time of build and minimizes
       the number of changed files.</td>
-    <td class="xl28" style="border-left: medium none; width: 110pt;">Ctrl + B</td>
-  </tr>
-</table>
-<h3><strong>Source actions</strong></h3>
-<table width="75%" border="1">
-  <tr> 
-    <td class="xl29" height="18">Comment</td>
-    <td class="xl29" style="border-left: medium none; width: 269pt;">Comments 
-      out all lines containing the current selection.</td>
-    <td class="xl29" style="border-left: medium none; width: 110pt;">Ctrl + /</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Uncomment</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Uncomments 
-      all lines containing the current selection.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + \</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">
-	Indent</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">
-	Indent current line.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">
-	Ctrl + I</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Shift 
-      Right</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Increments 
-      the level of indentation of the currently select lines. Only activated when 
-      the selection covers multiple lines or a single whole line.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Tab</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Shift 
-      Left</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Decrements 
-      the level of indentation of the currently select lines. Only activated when 
-      the selection covers multiple lines or a single whole line.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Shift 
-      + Tab</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 51pt; width: 126pt;" height="68">Format</td>
-    <td class="xl24" style="border-top: medium none; border-left: medium none; width: 269pt;">Uses 
-      the code formatter to format the current text selection. The formatting 
-      options are configured on the Code Formatter preference page (Java &gt; Code Formatter)</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Shift + F</td>
-  </tr>
-  <tr> 
-    <td class="xl27" style="border-top: medium none; height: 140.25pt; width: 126pt;" height="187">Organize 
+      <td class="xl28" style="border-left: medium none; width: 110pt;">Ctrl + B</td>
+    </tr>
+  </table>
+  <h3><strong>Source actions</strong></h3>
+  <table width="75%" border="1">
+    <tr>
+      <td class="xl29" height="18">Comment</td>
+      <td class="xl29" style="border-left: medium none; width: 269pt;">Comments out all lines containing the current
+      selection.</td>
+      <td class="xl29" style="border-left: medium none; width: 110pt;">Ctrl + /</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Uncomment</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Uncomments all lines
+      containing the current selection.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + \</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 12.75pt; width: 126pt;" height="17">Indent</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Indent current
+      line.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + I</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Shift Right</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Increments the level of
+      indentation of the currently select lines. Only activated when the selection covers multiple lines or a single
+      whole line.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Tab</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Shift Left</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Decrements the level of
+      indentation of the currently select lines. Only activated when the selection covers multiple lines or a single
+      whole line.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Shift + Tab</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 51pt; width: 126pt;" height="68">Format</td>
+      <td class="xl24" style="border-top: medium none; border-left: medium none; width: 269pt;">Uses the code formatter
+      to format the current text selection. The formatting options are configured on the Code Formatter preference page
+      (Java &gt; Code Formatter)</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Shift + F</td>
+    </tr>
+    <tr>
+      <td class="xl27" style="border-top: medium none; height: 140.25pt; width: 126pt;" height="187">Organize
       Imports</td>
-    <td class="xl31" style="border-left: medium none; width: 269pt;">Organizes 
-      the import declarations in the compilation unit currently open or selected. 
-      Unnecessary import declarations are removed, and required import declarations 
-      are ordered as specified in the Organize Import preference page (Java &gt; Organize Import). Organize import can be 
-      executed on incomplete source and will prompt you when a referenced type 
-      name can not be mapped uniquely to a type in the current project. You can 
-      also organize multiple compilation units by invoking the action on a package 
-      or selecting a set of compilation units.</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl 
-      + Shift + O</td>
-  </tr>
-  <tr> 
-    <td class="xl27" height="120">Add Import</td>
-    <td class="xl26" style="width: 269pt;">Creates an import declaration for a 
-      type reference currently selected. If the type reference if qualified, the 
-      qualification will be removed if possible. If the referenced type name can 
-      not be mapped uniquely to a type of the current project you will be prompted 
-      to specify the correct type. Add Import tries to follow the import order 
-      as specified in the Organize Import preference page.</td>
-    <td class="xl27" style="width: 110pt;">Ctrl + Shift + M</td>
-  </tr>
-</table>
-<h3><strong>Refactor actions</strong></h3>
-<table width="75%" border="1">
-  <tr> 
-    <td class="xl29" height="52">Undo</td>
-    <td class="xl29" style="border-left: medium none; width: 269pt;">Does an Undo 
-      of the last refactoring. The refactoring undo buffer is only valid as long 
-      as no other source changes than refactoring have been performed.</td>
-    <td class="xl29" style="border-left: medium none; width: 110pt;">Alt + Shift 
-      + Z</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Redo</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Does 
-      a Redo of the last undone refactoring. The refactoring undo/redo buffer 
-      is only valid as long as no other source changes than refactoring have been 
+      <td class="xl31" style="border-left: medium none; width: 269pt;">Organizes the import declarations in the
+      compilation unit currently open or selected. Unnecessary import declarations are removed, and required import
+      declarations are ordered as specified in the Organize Import preference page (Java &gt; Organize Import).
+      Organize import can be executed on incomplete source and will prompt you when a referenced type name can not be
+      mapped uniquely to a type in the current project. You can also organize multiple compilation units by invoking
+      the action on a package or selecting a set of compilation units.</td>
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Ctrl + Shift + O</td>
+    </tr>
+    <tr>
+      <td class="xl27" height="120">Add Import</td>
+      <td class="xl26" style="width: 269pt;">Creates an import declaration for a type reference currently selected. If
+      the type reference if qualified, the qualification will be removed if possible. If the referenced type name can
+      not be mapped uniquely to a type of the current project you will be prompted to specify the correct type. Add
+      Import tries to follow the import order as specified in the Organize Import preference page.</td>
+      <td class="xl27" style="width: 110pt;">Ctrl + Shift + M</td>
+    </tr>
+  </table>
+  <h3><strong>Refactor actions</strong></h3>
+  <table width="75%" border="1">
+    <tr>
+      <td class="xl29" height="52">Undo</td>
+      <td class="xl29" style="border-left: medium none; width: 269pt;">Does an Undo of the last refactoring. The
+      refactoring undo buffer is only valid as long as no other source changes than refactoring have been
       performed.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt 
-      + Shift + Y</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 89.25pt; width: 126pt;" height="119">Rename</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts 
-      the Rename refactoring dialog: Renames the selected element and (if enabled) 
-      corrects all references to the elements (also in other files). Is available 
-      on methods, fields, local variables, method parameters, types, compilation 
-      units, packages, source folders, projects and on a text selection resolving 
-      to one of these element types.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt 
-      + Shift + R</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 102pt; width: 126pt;" height="136">Move</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts 
-      the Move refactoring dialog: Moves the selected elements and (if enabled) 
-      corrects all references to the elements (also in other files). Can be applied 
-      to one instance method (which can be moved to a component), one or more 
-      static methods, static fields, types, compilation units, packages, source 
-      folders and projects and on a text selection resolving to one of these element 
-      types.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt 
-      + Shift + V</td>
-  </tr>
-  <tr> 
-    <td class="xl25" style="border-top: medium none; height: 51pt; width: 126pt;" height="68">Inline</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts 
-      the Inline refactoring dialog. Inlines local variables, methods or constants. 
-      This refactoring is available on methods, static final fields and text selections 
-      that resolve to methods, static final fields or local variables.</td>
-    <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt 
-      + Shift + I</td>
-  </tr>
-  <tr> 
-    <td class="xl27" style="border-top: medium none; height: 89.25pt; width: 126pt;" height="119">Extract 
-      Method</td>
-    <td class="xl24" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts 
-      the Extract Method refactoring dialog. Creates a new method containing the 
-      statements or expression currently selected and replaces the selection with 
-      a reference to the new method. You can use Expand Selection from the Edit menu to get a 
-	  valid selection range. This feature is useful for cleaning up lengthy, cluttered, or overly-complicated methods.</td>
-    <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt 
-      + Shift + M</td>
-  </tr>
-  <tr class="xl30"> 
-    <td class="xl25" height="102">Extract 
-      Local Variable</td>
-    <td class="xl30" style="width: 269pt;">Starts the Extract Variable refactoring 
-      dialog. Creates a new variable assigned to the expression currently selected 
-      and replaces the selection with a reference to the new variable. This refactoring 
-      is available on text selections that resolve to local variables. You can 
-      use Expand Selection from the Edit menu to get a valid selection range.</td>
-    <td class="xl25" style="width: 110pt;">Alt + Shift + L</td>
-  </tr>
-</table>
-<p><strong>Related information</strong></p>
-<p>
-<a href="../concepts/accessibility/navigation.htm">
-Navigating the user interface using the keyboard</a><br>
-<a href="../concepts/accessibility/keyboardshortcuts.htm">
-Keys and accessibility for the workbench</a></p>
-</BODY>
-</HTML>
+      <td class="xl29" style="border-left: medium none; width: 110pt;">Alt + Shift + Z</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 38.25pt; width: 126pt;" height="51">Redo</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Does a Redo of the last
+      undone refactoring. The refactoring undo/redo buffer is only valid as long as no other source changes than
+      refactoring have been performed.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt + Shift + Y</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 89.25pt; width: 126pt;" height="119">Rename</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts the Rename
+      refactoring dialog: Renames the selected element and (if enabled) corrects all references to the elements (also
+      in other files). Is available on methods, fields, local variables, method parameters, types, compilation units,
+      packages, source folders, projects and on a text selection resolving to one of these element types.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt + Shift + R</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 102pt; width: 126pt;" height="136">Move</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts the Move
+      refactoring dialog: Moves the selected elements and (if enabled) corrects all references to the elements (also in
+      other files). Can be applied to one instance method (which can be moved to a component), one or more static
+      methods, static fields, types, compilation units, packages, source folders and projects and on a text selection
+      resolving to one of these element types.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt + Shift + V</td>
+    </tr>
+    <tr>
+      <td class="xl25" style="border-top: medium none; height: 51pt; width: 126pt;" height="68">Inline</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts the Inline
+      refactoring dialog. Inlines local variables, methods or constants. This refactoring is available on methods,
+      static final fields and text selections that resolve to methods, static final fields or local variables.</td>
+      <td class="xl25" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt + Shift + I</td>
+    </tr>
+    <tr>
+      <td class="xl27" style="border-top: medium none; height: 89.25pt; width: 126pt;" height="119">Extract Method</td>
+      <td class="xl24" style="border-top: medium none; border-left: medium none; width: 269pt;">Starts the Extract
+      Method refactoring dialog. Creates a new method containing the statements or expression currently selected and
+      replaces the selection with a reference to the new method. You can use Expand Selection from the Edit menu to get
+      a valid selection range. This feature is useful for cleaning up lengthy, cluttered, or overly-complicated
+      methods.</td>
+      <td class="xl27" style="border-top: medium none; border-left: medium none; width: 110pt;">Alt + Shift + M</td>
+    </tr>
+    <tr class="xl30">
+      <td class="xl25" height="102">Extract Local Variable</td>
+      <td class="xl30" style="width: 269pt;">Starts the Extract Variable refactoring dialog. Creates a new variable
+      assigned to the expression currently selected and replaces the selection with a reference to the new variable.
+      This refactoring is available on text selections that resolve to local variables. You can use Expand Selection
+      from the Edit menu to get a valid selection range.</td>
+      <td class="xl25" style="width: 110pt;">Alt + Shift + L</td>
+    </tr>
+  </table>
+  <p><strong>Related information</strong></p>
+  <p><a href="../concepts/accessibility/navigation.htm">Navigating the user interface using the keyboard</a><br>
+  <a href="../concepts/accessibility/keyboardshortcuts.htm">Keys and accessibility for the workbench</a></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-large-file-associations.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-large-file-associations.htm
index 87c3fc7..0817467 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-large-file-associations.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-large-file-associations.htm
@@ -1,62 +1,48 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) Simeon Andreev and others 2022. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Large File Associations</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Large File Associations</H1>
-<P CLASS="Intro">
-On the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.LargeFileAssociations)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Editors &gt; Large File Associations</strong></a>
-
-preference page, you can specify which editors
-are used to open large files. You can associate file extension types
-and file sizes to an editor. Upon opening a file with the given extension,
-if the file is above the specified size, the associated editor will be used to open the file.
-When multiple pairs of editor and file size are specified for the extension of the file, the pair with the largest matching file size applies.</p>
-<DIV CLASS="Topic">
-<h2>
-File types list</h2>
-<UL CLASS="UnorderedList">
-    <LI CLASS="Item"> <strong>Add...</strong>: Adds a new file
-      extension to the list of associated file types. In the resulting <b>Add File Type dialog</b>, 
-      type the file extension (e.g. simply &quot;xml&quot; or as a pattern &quot;*.txt&quot;).</LI>
-    <LI CLASS="Item"><strong> Remove</strong>: Removes the selected file
-      type from the list, along with all its associated editors and sizes.</LI>
-</UL>
-</DIV>
-<DIV CLASS="Topic">
-<h2>
-Associated editors list</h2>
-  <UL CLASS="UnorderedList">
-    <LI CLASS="Item"> <strong>Add...</strong>: Adds a new editor and file size to the
-      list of editors associated with the file type selected above. You can
-      choose to be asked for an editor, upon opening a large file of the selected type.
-      Or, you can choose the editor with which to open the file type beforehand.
-      When choosing an editor in advance (by enabling and clicking the <b>Choose Editor</b> link),
-      you can choose an editor to launch either inside
-      the Workbench (internal) or outside the Workbench (external); click <b>Browse</b>
-      in the now open <b>Editor Selection</b> dialog  to locate an editor yourself
-      if the editor you want is not displayed in  the list.</LI>
-    <LI CLASS="Item"> <strong>Edit...</strong>: Edit the selected editor
-      and file size for the file type selected above. When editting an association
-      which specifies an editor, you can click on the editor link to change the associated editor.</LI>
-    <LI CLASS="Item"> <strong>Remove</strong>: Removes the association between
-      an editor, file size and the file type selected above.</LI>
-  </UL>
-</DIV>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) Simeon Andreev and others 2022. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Large File Associations</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Large File Associations</h1>
+  <p class="Intro">On the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.LargeFileAssociations)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Editors &gt; Large
+  File Associations</strong></a> preference page, you can specify which editors are used to open large files. You can
+  associate file extension types and file sizes to an editor. Upon opening a file with the given extension, if the file
+  is above the specified size, the associated editor will be used to open the file. When multiple pairs of editor and
+  file size are specified for the extension of the file, the pair with the largest matching file size applies.</p>
+  <div class="Topic">
+    <h2>File types list</h2>
+    <ul class="UnorderedList">
+      <li class="Item"><strong>Add...</strong>: Adds a new file extension to the list of associated file types. In the
+      resulting <b>Add File Type dialog</b>, type the file extension (e.g. simply "xml" or as a pattern "*.txt").</li>
+      <li class="Item"><strong>Remove</strong>: Removes the selected file type from the list, along with all its
+      associated editors and sizes.</li>
+    </ul>
+  </div>
+  <div class="Topic">
+    <h2>Associated editors list</h2>
+    <ul class="UnorderedList">
+      <li class="Item"><strong>Add...</strong>: Adds a new editor and file size to the list of editors associated with
+      the file type selected above. You can choose to be asked for an editor, upon opening a large file of the selected
+      type. Or, you can choose the editor with which to open the file type beforehand. When choosing an editor in
+      advance (by enabling and clicking the <b>Choose Editor</b> link), you can choose an editor to launch either
+      inside the Workbench (internal) or outside the Workbench (external); click <b>Browse</b> in the now open
+      <b>Editor Selection</b> dialog to locate an editor yourself if the editor you want is not displayed in the
+      list.</li>
+      <li class="Item"><strong>Edit...</strong>: Edit the selected editor and file size for the file type selected
+      above. When editting an association which specifies an editor, you can click on the editor link to change the
+      associated editor.</li>
+      <li class="Item"><strong>Remove</strong>: Removes the association between an editor, file size and the file type
+      selected above.</li>
+    </ul>
+  </div>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-linkhandlersprefs.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-linkhandlersprefs.htm
index 48118da..380a2e9 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-linkhandlersprefs.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-linkhandlersprefs.htm
@@ -1,56 +1,81 @@
-
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-    <head>
-        <meta name="copyright" content="Copyright (c) SAP SE and others 2018. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <meta http-equiv="Content-Style-Type" content="text/css">
-        <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-        <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-        <title>Link Handlers</title>
-    </head>
-    <body>
-        <h1>Link Handlers</h1>
-        <h2>Definition</h2>
-        <p>A link handler defines how your application deals with hyperlinks, or simply links.</p>
-        <p>Plug-ins can contribute link handlers for custom URL schemes using the extension point <code>org.eclipse.urischeme.uriSchemeHandlers</code>.</p>
-        
-        <h2>Use</h2>
-        <p>You can add link handlers only by installing software into your application.</p>
-        <p>Link handlers can be enabled or disabled in the preference dialog. To do this, open the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.General.LinkHandlers)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>General &gt; Link Handlers</strong></a> preference page and select the relevant option.</p>
-        <p>The workbench will automatically try to enable link handlers at startup. If you do not want a link handler to be enabled you can manually disable it afterwards. In this case the workbench will no longer automatically registered this link handler again (for the same workspace).
-        
-        <h2>Introduction</h2>
-        <p>Links are best known from the web where clicking on a links navigates the user to another web page. But the concept of links is also usefull for other use-case, for example file sharing. Here, a user uploads a file to a file hosting service and grants access to others by sending a link to that shared document through e-mail. When choosing such a link, the web browser, or another locally installed application will open this link.</p>
-        <h3>Sample</h3>
-        <p>The URL of each link consists of a scheme, host, and path: <code>https://www.eclipse.org/downloads</code></p>
-        <p>In this URL, the scheme is "https", the host name is "www.eclipse.org", and the path is "downloads". This URL addresses a hypertext document using the "https" URL scheme.</p>
-        <p>Choosing such a link, typically a web browser is opened. The web browser then downloads and displays the relevant document.</p>
-        
-        <h2>URL Schemes</h2>
-        <p>Link handlers incorporate the concept of custom URL schemes into this application. Different URL schemes have different meanings and need different handling. A link handler can handle specific URL schemes.</p>
-        <p>When a user clicks a link containing an URL scheme, which is enabled, the operating system will start the corresponding application or set the corresponding window to the foreground - if the application is already running. Link handling is specific to the URL scheme - it may open a file in an editor, open a dialog, install new software, clone a repository, or result in something else.</p>
-        <p>The <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.General.LinkHandlers)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>Link Handlers</strong></a> preference page provides a list of URL schemes which the applicaiton can handle. For each scheme, a description further explains the URL scheme. A checkbox shows if handling of this URL scheme is enabled or disabled. If handling is disabled, the list will also display if this URL scheme is handled by another application or not.</p>
-
-        <h3>Examples of Eclipse-related URL schemes and how they are handled</h3>
-        <ul>
-        <li><strong>eclipse+command://</strong> URL scheme handler makes the application start a command.
-           <br>Such URLs have the form <code>eclipse+command://commandId?param1Id=value&amp;param2Id=value</code>.
-           <br>For example, to open a preference page: <code>eclipse+command://org.eclipse.ui.window.preferences?preferencePageId=org.eclipse.ui.browser.preferencePage</code>.
-        </li>
-        <li><strong>eclipse+mpc://</strong> URL scheme handler makes the application which has Marketplace Client plugin installed start the installation dialog for the given marketplace entry.
-           <br>Such URLs have the form <code>eclipse+mpc://marketplaceCatalogPath/marketplaceEntryId</code>.
-           <br>For example, <code>eclipse+mpc://marketplace.eclipse.org/install/1640500</code>.
-        </li>
-        </ul>
-
-        <h3>Note</h3>
-        <ul>
-        <li>The internal Web browser automatically checks available Link Handlers when processing links and use suitable one to open referenced URL inside the current application.</li>
-        <li>The enabled state of each URL scheme is not persisted in the preference store, but it is directly registered in the operating system. Therefore, this page does not take part in the export and import of preferences and does not provide a "Restore Defaults" button.</li>
-        <li>For the "macOS" and "Linux" operating system: If an URL scheme is handled by another application (Eclipse-based or not), it <strong>cannot</strong> be enabled directly. Handling of this URL scheme must first be disabled in the other application, before it can be enabled in the current application.</li>
-        <li>When multiple Eclipse-based applications are running at the same time, the operating system may set a window to the foreground, which cannot handle the link. In such cases, ensure that only the expected Eclipse-based application is running.</li>
-        <li>In rare cases (e.g. PDE development) the path to the application launcher can not be determined from the <code>eclipse.launcher</code> or <code>eclipse.home.location</code> system properties. The preference page will then show an error message and will not allow any interaction.</li>
-        </ul>
-    </body>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) SAP SE and others 2018. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Link Handlers</title>
+</head>
+<body>
+  <h1>Link Handlers</h1>
+  <h2>Definition</h2>
+  <p>A link handler defines how your application deals with hyperlinks, or simply links.</p>
+  <p>Plug-ins can contribute link handlers for custom URL schemes using the extension point
+  <code>org.eclipse.urischeme.uriSchemeHandlers</code>.</p>
+  <h2>Use</h2>
+  <p>You can add link handlers only by installing software into your application.</p>
+  <p>Link handlers can be enabled or disabled in the preference dialog. To do this, open the <a class="command-link"
+  href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.General.LinkHandlers)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>General &gt; Link
+  Handlers</strong></a> preference page and select the relevant option.</p>
+  <p>The workbench will automatically try to enable link handlers at startup. If you do not want a link handler to be
+  enabled you can manually disable it afterwards. In this case the workbench will no longer automatically registered
+  this link handler again (for the same workspace).</p>
+  <h2>Introduction</h2>
+  <p>Links are best known from the web where clicking on a links navigates the user to another web page. But the
+  concept of links is also usefull for other use-case, for example file sharing. Here, a user uploads a file to a file
+  hosting service and grants access to others by sending a link to that shared document through e-mail. When choosing
+  such a link, the web browser, or another locally installed application will open this link.</p>
+  <h3>Sample</h3>
+  <p>The URL of each link consists of a scheme, host, and path: <code>https://www.eclipse.org/downloads</code></p>
+  <p>In this URL, the scheme is "https", the host name is "www.eclipse.org", and the path is "downloads". This URL
+  addresses a hypertext document using the "https" URL scheme.</p>
+  <p>Choosing such a link, typically a web browser is opened. The web browser then downloads and displays the relevant
+  document.</p>
+  <h2>URL Schemes</h2>
+  <p>Link handlers incorporate the concept of custom URL schemes into this application. Different URL schemes have
+  different meanings and need different handling. A link handler can handle specific URL schemes.</p>
+  <p>When a user clicks a link containing an URL scheme, which is enabled, the operating system will start the
+  corresponding application or set the corresponding window to the foreground - if the application is already running.
+  Link handling is specific to the URL scheme - it may open a file in an editor, open a dialog, install new software,
+  clone a repository, or result in something else.</p>
+  <p>The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.General.LinkHandlers)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"><strong>Link Handlers</strong></a>
+  preference page provides a list of URL schemes which the applicaiton can handle. For each scheme, a description
+  further explains the URL scheme. A checkbox shows if handling of this URL scheme is enabled or disabled. If handling
+  is disabled, the list will also display if this URL scheme is handled by another application or not.</p>
+  <h3>Examples of Eclipse-related URL schemes and how they are handled</h3>
+  <ul>
+    <li><strong>eclipse+command://</strong> URL scheme handler makes the application start a command.<br>
+    Such URLs have the form <code>eclipse+command://commandId?param1Id=value&amp;param2Id=value</code>.<br>
+    For example, to open a preference page:
+    <code>eclipse+command://org.eclipse.ui.window.preferences?preferencePageId=org.eclipse.ui.browser.preferencePage</code>.</li>
+    <li><strong>eclipse+mpc://</strong> URL scheme handler makes the application which has Marketplace Client plugin
+    installed start the installation dialog for the given marketplace entry.<br>
+    Such URLs have the form <code>eclipse+mpc://marketplaceCatalogPath/marketplaceEntryId</code>.<br>
+    For example, <code>eclipse+mpc://marketplace.eclipse.org/install/1640500</code>.</li>
+  </ul>
+  <h3>Note</h3>
+  <ul>
+    <li>The internal Web browser automatically checks available Link Handlers when processing links and use suitable
+    one to open referenced URL inside the current application.</li>
+    <li>The enabled state of each URL scheme is not persisted in the preference store, but it is directly registered in
+    the operating system. Therefore, this page does not take part in the export and import of preferences and does not
+    provide a "Restore Defaults" button.</li>
+    <li>For the "macOS" and "Linux" operating system: If an URL scheme is handled by another application (Eclipse-based
+    or not), it <strong>cannot</strong> be enabled directly. Handling of this URL scheme must first be disabled in the
+    other application, before it can be enabled in the current application.</li>
+    <li>When multiple Eclipse-based applications are running at the same time, the operating system may set a window to
+    the foreground, which cannot handle the link. In such cases, ensure that only the expected Eclipse-based
+    application is running.</li>
+    <li>In rare cases (e.g. PDE development) the path to the application launcher can not be determined from the
+    <code>eclipse.launcher</code> or <code>eclipse.home.location</code> system properties. The preference page will
+    then show an error message and will not allow any interaction.</li>
+  </ul>
+</body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-net-preferences.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-net-preferences.htm
index ffd5b79..350637e 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-net-preferences.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-net-preferences.htm
@@ -1,96 +1,91 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>Network Connections</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">Network Connections</H1>
-<p class="Head">The following sections describe the preferences available on the
-  
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.net.NetPreferences)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>General &gt; Network Connections</strong></a>
-  
-  preference page.</p>
-
-<TABLE border="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH> <P class="Para">Option</P></TH>
-      <TH> <P class="Para">Description</P></TH>
-      <TH> <P class="Para">Default</P></TH>
-    </TR>
-  </THEAD>
-  <TR> 
-    <TD valign="top" align="left"><NOBR>Active Provider</NOBR></TD>
-    <TD valign="top" align="left">Specifies the settings profile to be used when opening connections.
-    Choosing the <strong>Direct</strong> provider causes all the connections to be opened without the use
-    of a proxy server. Selecting <strong>Manual</strong> causes settings defined in Eclipse to be used. On some
-    platforms there is also a <strong>Native</strong> provider available, selecting this one causes
-    settings that were discovered in the OS to be used.</TD>
-    <TD valign="top" align="left"><NOBR>Native (if present)</NOBR><BR><nobr>Manual (otherwise)</nobr></TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Proxy entries</TD>
-    <TD valign="top" align="left">The table displays entries that are available for all 
-    providers. Checkboxes in the first column of the table indicate entries to be used for the
-    currently selected provider.</TD>
-    <TD></TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">Proxy bypass</TD>
-    <TD valign="top" align="left">Use this table to specify, either by name or pattern,
-    which hosts should not use any proxy. A direct connection will always be used for matching hosts.
-     Checkboxes in the first column of the table indicate entries to be used for the currently selected provider.</TD>
-    <TD></TD>
-  </TR>
-</TABLE>
-
-<h3>Proxy entries</h3>
-<p>When using <strong>Manual</strong> proxy provider there are three predefined schemas to set
-settings for: HTTP, HTTPS and SOCKS<a href="#SOCKS"> [1]</a>. Configuration for each schema is displayed
-in the <strong>Proxy entries</strong> table. To edit settings for a particular schema double-click
-the entry or select the entry and click <strong>Edit...</strong> button. If <strong>Port</strong>
-field is left blank default port number will be used. Following table lists default port numbers for
-each of the predefined schemas.</p> 
-
-<TABLE border="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH> <P class="Para">Schema</P></TH>
-      <TH> <P class="Para">Default Port</P></TH>
-    </TR>
-  </THEAD>
-<TR> 
-    <TD valign="top" align="left">HTTP</TD>
-    <TD>80</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">SSL</TD>
-    <TD>443</TD>
-  </TR>
-  <TR> 
-    <TD valign="top" align="left">SOCKS</TD>
-    <TD>1080</TD>
-  </TR>
-</TABLE>
-
-<p><a name="SOCKS"></a>
-1. The SOCKS proxy support in Java 1.4 had certain limitations. Due to these limitations,
-the setting of the SOCKS system properties is not performed when a 1.4 VM is used. The SOCKS proxy
-may still be used by some tooling when running on a 1.4 VM (e.g. CVS). However, users should use a 1.5 (or 5.0)
-VM if they require full SOCKS proxy support.
-</p>
-
-<h3 class="related">Related reference</h3>
-<A href="ref-ssh2-preferences.htm">SSH2 Preferences</A>
-
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Network Connections</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Network Connections</h1>
+  <p class="Head">The following sections describe the preferences available on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.net.NetPreferences)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg"
+  alt="command link"> <strong>General &gt; Network Connections</strong></a> preference page.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th>
+          <p class="Para">Option</p>
+        </th>
+        <th>
+          <p class="Para">Description</p>
+        </th>
+        <th>
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <td valign="top" align="left"><nobr>Active Provider</nobr></td>
+      <td valign="top" align="left">Specifies the settings profile to be used when opening connections. Choosing the
+      <strong>Direct</strong> provider causes all the connections to be opened without the use of a proxy server.
+      Selecting <strong>Manual</strong> causes settings defined in Eclipse to be used. On some platforms there is also
+      a <strong>Native</strong> provider available, selecting this one causes settings that were discovered in the OS
+      to be used.</td>
+      <td valign="top" align="left"><nobr>Native (if present)</nobr><br>
+      <nobr>Manual (otherwise)</nobr></td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Proxy entries</td>
+      <td valign="top" align="left">The table displays entries that are available for all providers. Checkboxes in the
+      first column of the table indicate entries to be used for the currently selected provider.</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">Proxy bypass</td>
+      <td valign="top" align="left">Use this table to specify, either by name or pattern, which hosts should not use
+      any proxy. A direct connection will always be used for matching hosts. Checkboxes in the first column of the
+      table indicate entries to be used for the currently selected provider.</td>
+      <td></td>
+    </tr>
+  </table>
+  <h3>Proxy entries</h3>
+  <p>When using <strong>Manual</strong> proxy provider there are three predefined schemas to set settings for: HTTP,
+  HTTPS and SOCKS <a href="#SOCKS">[1]</a>. Configuration for each schema is displayed in the <strong>Proxy
+  entries</strong> table. To edit settings for a particular schema double-click the entry or select the entry and click
+  <strong>Edit...</strong> button. If <strong>Port</strong> field is left blank default port number will be used.
+  Following table lists default port numbers for each of the predefined schemas.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th>
+          <p class="Para">Schema</p>
+        </th>
+        <th>
+          <p class="Para">Default Port</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <td valign="top" align="left">HTTP</td>
+      <td>80</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">SSL</td>
+      <td>443</td>
+    </tr>
+    <tr>
+      <td valign="top" align="left">SOCKS</td>
+      <td>1080</td>
+    </tr>
+  </table>
+  <p><a name="SOCKS"></a> 1. The SOCKS proxy support in Java 1.4 had certain limitations. Due to these limitations, the
+  setting of the SOCKS system properties is not performed when a 1.4 VM is used. The SOCKS proxy may still be used by
+  some tooling when running on a 1.4 VM (e.g. CVS). However, users should use a 1.5 (or 5.0) VM if they require full
+  SOCKS proxy support.</p>
+  <h3 class="related">Related reference</h3><a href="ref-ssh2-preferences.htm">SSH2 Preferences</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-p2-autoupdate.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-p2-autoupdate.htm
index cee6f62..a8b2eac 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-p2-autoupdate.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-p2-autoupdate.htm
@@ -1,81 +1,87 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Automatic updates</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Automatic Updates</H1>
-<P CLASS="Intro"> The following preferences can be changed on the
-
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.internal.p2.ui.sdk.scheduler.AutomaticUpdatesPreferencePage)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>Install/Update &gt; Automatic Updates</strong></a> preference page:</p> 
-<TABLE BORDER="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Option</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Description</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Default</P></TH>
-    </TR>
-  </THEAD>
-  <TBODY>
-    <tr> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Automatically find new updates and notify me</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          When selected, the system will automatically search for updates, 
-          as defined by the update schedule</p></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Off</P></TD>
-    </tr>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Update Schedule</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Look for updates on each startup, or once a day or some day a week, 
-          at a predefined time.</p></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          On startup</P></TD>
-    </TR>
-    <TR> 
-      <TD height="23" COLSPAN="1" ROWSPAN="1" align="left" valign="top"> <P CLASS="Para"> 
-          Download Options</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          This option allows you to choose between having Eclipse search for updates 
-          and notifying you of them once they are available or having Eclipse 
-          automatically download new updates and asking you to install them.</p>
-      </TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Search and notify</P></TD>
-    </TR>
-    <TR> 
-      <TD height="23" COLSPAN="1" ROWSPAN="1" align="left" valign="top"> <P CLASS="Para"> 
-          When updates are found</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-      	  Choose to be notified about new updates only once, or to receive reminders
-      	  until the updates are installed.</p>
-      </TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Notify once</P></TD>
-    </TR>
-  </TBODY>
-</TABLE>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-120.htm">Updating the installation</a><br>
-<a href="../tasks/tasks-124.htm">Installing new software</a>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-61.htm">Help Menu</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Automatic updates</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Automatic Updates</h1>
+  <p class="Intro">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.internal.p2.ui.sdk.scheduler.AutomaticUpdatesPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Install/Update &gt; Automatic
+  Updates</strong></a> preference page:</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Automatically find new updates and notify me</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">When selected, the system will automatically search for updates, as defined by the update
+          schedule</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Off</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Update Schedule</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Look for updates on each startup, or once a day or some day a week, at a predefined time.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">On startup</p>
+        </td>
+      </tr>
+      <tr>
+        <td height="23" colspan="1" rowspan="1" align="left" valign="top">
+          <p class="Para">Download Options</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This option allows you to choose between having Eclipse search for updates and notifying you
+          of them once they are available or having Eclipse automatically download new updates and asking you to
+          install them.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Search and notify</p>
+        </td>
+      </tr>
+      <tr>
+        <td height="23" colspan="1" rowspan="1" align="left" valign="top">
+          <p class="Para">When updates are found</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Choose to be notified about new updates only once, or to receive reminders until the updates
+          are installed.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Notify once</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-120.htm">Updating the installation</a><br>
+  <a href="../tasks/tasks-124.htm">Installing new software</a>
+  <h3 class="related">Related reference</h3><a href="ref-61.htm">Help Menu</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-p2-installupdate.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-p2-installupdate.htm
index f8af0e1..1561841 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-p2-installupdate.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-p2-installupdate.htm
@@ -1,67 +1,68 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Install/Update</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Install/Update</H1>
-<P CLASS="Intro"> The following preferences can be changed on the
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>Install/Update</strong></a> preference page:</p> 
-<TABLE BORDER="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Option</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Description</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Default</P></TH>
-    </TR>
-  </THEAD>
-  <TBODY>
-    <tr> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Browsing for updates</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-      	This option allows you to configure what software versions are shown in the
-      	<b>Available Updates</b> wizard.  You can select to show only the 
-      	latest version of an update, or all versions of updates that are available.</P>
-	  </TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Show latest</P></TD>
-    </tr>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          When software selected for an install wizard may not be compatible</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          This preference allows you to configure how incompatibilities are reported.
-          If you attempt to update, uninstall, or install software that is
-          not compatible with the software you already have installed, you can elect
-          to open a wizard to edit your software selections, or you can just have the 
-          problem reported in the error log without opening the wizard. By
-          default you will be prompted about what you want to do in this situation.</p></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Ask me</P></TD>
-    </TR>
-  </TBODY>
-</TABLE>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-120.htm">Updating the installation</a><br>
-<a href="../tasks/tasks-124.htm">Installing new software</a>
-
-<h3 class="related">Related reference</h3>
-    <a HREF="ref-net-preferences.htm">Network Connections</a>
-<br><a HREF="ref-61.htm">Help Menu</a>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Install/Update</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Install/Update</h1>
+  <p class="Intro">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Install/Update</strong></a>
+  preference page:</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Browsing for updates</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This option allows you to configure what software versions are shown in the <b>Available
+          Updates</b> wizard. You can select to show only the latest version of an update, or all versions of updates
+          that are available.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Show latest</p>
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">When software selected for an install wizard may not be compatible</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This preference allows you to configure how incompatibilities are reported. If you attempt to
+          update, uninstall, or install software that is not compatible with the software you already have installed,
+          you can elect to open a wizard to edit your software selections, or you can just have the problem reported in
+          the error log without opening the wizard. By default you will be prompted about what you want to do in this
+          situation.</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Ask me</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-120.htm">Updating the installation</a><br>
+  <a href="../tasks/tasks-124.htm">Installing new software</a>
+  <h3 class="related">Related reference</h3><a href="ref-net-preferences.htm">Network Connections</a><br>
+  <a href="ref-61.htm">Help Menu</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-p2-siteprefs.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-p2-siteprefs.htm
index e23820f..d4ab8e7 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-p2-siteprefs.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-p2-siteprefs.htm
@@ -1,70 +1,56 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Available Software Sites</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">
-Available Software Sites</H1>
-<P CLASS="Intro"> The following preferences can be changed on the
-
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.internal.p2.ui.sdk.SitesPreferencePage)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>Install/Update &gt; Available Software Sites</strong></a> preference page:</p> 
-<TABLE BORDER="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Button</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Description</P></TH>
-    </TR>
-  </THEAD>
-  <TBODY>
- <TR>
-<TH align="left">
-<span style="font-weight: 400">Add/Edit/Remove</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Add, edit or remove a software site.</span></TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Test Connection</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Tests to see if it is possible to connect to the 
-selected software site.</span></TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Disable/Enable</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Allows a software site to be disabled so that the
-update system will not try to find software on the site when updating or installing
-software.</span></TH>
-</TR>
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Import/Export</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Import or export the list of software sites from a file.</span></TH>
-</TR>
-  </TBODY>
-</TABLE>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-128.htm">Working with the Available Software sites</a><br>
-<a href="../tasks/tasks-122.htm">Scheduling automatic updates</a>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-61.htm">Help Menu</a>
-
-
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Available Software Sites</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Available Software Sites</h1>
+  <p class="Intro">The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.internal.p2.ui.sdk.SitesPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Install/Update &gt; Available
+  Software Sites</strong></a> preference page:</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Button</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th align="left"><span style="font-weight: 400">Add/Edit/Remove</span></th>
+        <th align="left"><span style="font-weight: 400">Add, edit or remove a software site.</span></th>
+      </tr>
+      <tr>
+        <th align="left"><span style="font-weight: 400">Test Connection</span></th>
+        <th align="left"><span style="font-weight: 400">Tests to see if it is possible to connect to the selected
+        software site.</span></th>
+      </tr>
+      <tr>
+        <th align="left"><span style="font-weight: 400">Disable/Enable</span></th>
+        <th align="left"><span style="font-weight: 400">Allows a software site to be disabled so that the update system
+        will not try to find software on the site when updating or installing software.</span></th>
+      </tr>
+      <tr>
+        <th align="left"><span style="font-weight: 400">Import/Export</span></th>
+        <th align="left"><span style="font-weight: 400">Import or export the list of software sites from a
+        file.</span></th>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-128.htm">Working with the Available Software
+  sites</a><br>
+  <a href="../tasks/tasks-122.htm">Scheduling automatic updates</a>
+  <h3 class="related">Related reference</h3><a href="ref-61.htm">Help Menu</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-p2-trust.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-p2-trust.htm
index cec6a85..b1f0c6f 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-p2-trust.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-p2-trust.htm
@@ -1,56 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) Red Hat Inc. and others 2022. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Trust</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head">Trusting p2 installations</H1>
-
-<P CLASS="Intro">
-Installing artifacts is by nature a security risk as it will then allow the artifacts to
-execute potentially malicious code. To mitigate this risk, p2 does verify artifact <b>signatures</b>
-during installations and warns of any discrepancy.
-</P>
-
-<h2>Unsigned artifacts warning</h2>
-
-<p>If some artifacts have no digital signatures attached (using <code>jarsigner</code> or PGP signing technologies),
-the <em>Unsigned artifacts</em> dialog pops-up to warn that there is no signature for those artifacts.</p>
-<p>An artifact without a signature can easily be tampered so that the artifact being installed contains different content
-as what's expected during installation. So artifacts without signatures are a security thread and installating them
-is a risky action, much care should be taken before approving such installation.</p>
-<p>The pop-up allows to abort installation, or to take the risk of installing an installed artifact and continue installation.</p>
-
-<h2>Trust Dialog</h2>
-
-<p>One of the main goal of signatures is to match a signer identity to an artifact, so that in order to trust an artifact,
-a user can simply decide whether they trust the signer. It's usually an easier decision to take.</p>
-<p>Sometimes, all artifacts have a signature but the identity of the signer is not know whether it can be trusted or not.
-The strategy to decide whether a signer can be trusted or not is up to the user; different users can have different workflows to decide
-whether to trust a signer or not.</p>
-<p>In such case, the <em>Trust</em> dialog shows the list of certificates or PGP public keys along with extra information
-to let user define whether those can be trusted (Is the key itself trust? If yes, do I trust the signer?...).</p>
-<p>If all artifacts are signed by at least 1 trusted key or certificate, installation will continue; otherwise it's aborted.</p>
-
-<h2>Trust Preference Page</h2>
-
-<p><a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.internal.p2.ui.sdk.scheduler.AutomaticUpdatesPreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Install/Update &gt; Trust</strong></a> preference page
-lists all the PGP public keys that are considered as already trusted and allows to add or remove some.</p>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-120.htm">Updating the installation</a><br>
-<a href="../tasks/tasks-124.htm">Installing new software</a>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-61.htm">Help Menu</a>
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) Red Hat Inc. and others 2022. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Trust</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Trusting p2 installations</h1>
+  <p class="Intro">Installing artifacts is by nature a security risk as it will then allow the artifacts to execute
+  potentially malicious code. To mitigate this risk, p2 does verify artifact <b>signatures</b> during installations and
+  warns of any discrepancy.</p>
+  <h2>Unsigned artifacts warning</h2>
+  <p>If some artifacts have no digital signatures attached (using <code>jarsigner</code> or PGP signing technologies),
+  the <em>Unsigned artifacts</em> dialog pops-up to warn that there is no signature for those artifacts.</p>
+  <p>An artifact without a signature can easily be tampered so that the artifact being installed contains different
+  content as what's expected during installation. So artifacts without signatures are a security thread and
+  installating them is a risky action, much care should be taken before approving such installation.</p>
+  <p>The pop-up allows to abort installation, or to take the risk of installing an installed artifact and continue
+  installation.</p>
+  <h2>Trust Dialog</h2>
+  <p>One of the main goal of signatures is to match a signer identity to an artifact, so that in order to trust an
+  artifact, a user can simply decide whether they trust the signer. It's usually an easier decision to take.</p>
+  <p>Sometimes, all artifacts have a signature but the identity of the signer is not know whether it can be trusted or
+  not. The strategy to decide whether a signer can be trusted or not is up to the user; different users can have
+  different workflows to decide whether to trust a signer or not.</p>
+  <p>In such case, the <em>Trust</em> dialog shows the list of certificates or PGP public keys along with extra
+  information to let user define whether those can be trusted (Is the key itself trust? If yes, do I trust the
+  signer?...).</p>
+  <p>If all artifacts are signed by at least 1 trusted key or certificate, installation will continue; otherwise it's
+  aborted.</p>
+  <h2>Trust Preference Page</h2>
+  <p><a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.internal.p2.ui.sdk.scheduler.AutomaticUpdatesPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>Install/Update &gt;
+  Trust</strong></a> preference page lists all the PGP public keys that are considered as already trusted and allows to
+  add or remove some.</p>
+  <h3 class="related">Related tasks</h3><a href="../tasks/tasks-120.htm">Updating the installation</a><br>
+  <a href="../tasks/tasks-124.htm">Installing new software</a>
+  <h3 class="related">Related reference</h3><a href="ref-61.htm">Help Menu</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-regex-find-replace.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-regex-find-replace.htm
index 4a0dc61..12d2b2c 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-regex-find-replace.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-regex-find-replace.htm
@@ -1,167 +1,85 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en">
-  <head>
-    <meta name="copyright" content=
-    "Copyright (c) IBM Corporation and others 2008, 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <title>
-      Supported Regular Expressions
-    </title>
-    <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type=
-    "text/css" />
-  </head>
-  <body>
-    <h1 class="Head">
-      Supported Regular Expressions
-    </h1>
-    <p>
-      When searching for text you can use the regular expressions as defined by
-      the <a href=
-      "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/regex/Pattern.html">Pattern
-      class</a>.<br />
-      Additionally, \R can be used to match any form of line delimiter (Unix,
-      Windows, Classic Mac OS). Note that \R does not work in character groups ([]).
-    </p>
-
-    <p>
-      The replace string allows the following constructs:
-    </p>
-    <table border="1" cellpadding="5" summary=
-    "supported constructs in the replace field">
-      <tbody>
-        <tr>
-          <td>
-            $i
-          </td>
-          <td>
-
-            inserts <a href=
-            "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/regex/Pattern.html#cg">
-            capturing group</a> i.
-          </td>
-        </tr>
-        <tr>
-          <td>
-            \i
-          </td>
-
-          <td>
-            inserts <a href=
-            "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/regex/Pattern.html#cg">
-            capturing group</a> i (same as $i).
-          </td>
-        </tr>
-        <tr>
-          <td>
-            \<i>x</i>
-
-          </td>
-          <td>
-            quotes character <i>x</i> (unless \<i>x</i> has a special meaning)
-          </td>
-        </tr>
-        <tr>
-
-          <td>
-            \R
-          </td>
-          <td>
-            inserts the default line delimiter of the document
-          </td>
-        </tr>
-        <tr>
-          <td>
-            \x<i>hh</i>
-
-          </td>
-          <td>
-            inserts the hexadecimal character <i>hh</i>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            \u<i>hhhh</i>
-
-          </td>
-          <td>
-            inserts the Unicode character <i>hhhh</i>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            \n
-          </td>
-
-          <td>
-            inserts a newline character (usually, you should use \R instead)
-          </td>
-        </tr>
-        <tr>
-          <td>
-            \r
-          </td>
-          <td>
-            inserts a carriage-return character (usually, you should use \R
-            instead)
-          </td>
-
-        </tr>
-        <tr>
-          <td>
-            \t
-          </td>
-          <td>
-            inserts a tab character
-          </td>
-        </tr>
-        <tr>
-
-          <td>
-            \f
-          </td>
-          <td>
-            inserts a form-feed character
-          </td>
-        </tr>
-        <tr>
-          <td>
-            \a
-          </td>
-
-          <td>
-            inserts an alert (beep) character
-          </td>
-        </tr>
-        <tr>
-          <td>
-            \e
-          </td>
-          <td>
-            inserts an escape character
-          </td>
-
-        </tr>
-        <tr>
-          <td>
-            \c<i>X</i>
-          </td>
-          <td>
-            inserts the control character for <i>X</i>
-
-          </td>
-        </tr>
-        <tr>
-          <td>
-            \C
-          </td>
-          <td>
-            retains the casing of the match (all lower case, all upper case,
-            capitalized) for the rest of the replace string
-          </td>
-        </tr>
-
-      </tbody>
-    </table>
-  </body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <title>Supported Regular Expressions</title>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
+</head>
+<body>
+  <h1 class="Head">Supported Regular Expressions</h1>
+  <p>When searching for text you can use the regular expressions as defined by the <a href=
+  "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/regex/Pattern.html">Pattern class</a>.<br />
+  Additionally, \R can be used to match any form of line delimiter (Unix, Windows, Classic Mac OS). Note that \R does
+  not work in character groups ([]).</p>
+  <p>The replace string allows the following constructs:</p>
+  <table border="1" cellpadding="5" summary="supported constructs in the replace field">
+    <tbody>
+      <tr>
+        <td>$i</td>
+        <td>inserts <a href=
+        "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/regex/Pattern.html#cg">capturing
+        group</a> i.</td>
+      </tr>
+      <tr>
+        <td>\i</td>
+        <td>inserts <a href=
+        "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/regex/Pattern.html#cg">capturing
+        group</a> i (same as $i).</td>
+      </tr>
+      <tr>
+        <td>\<i>x</i></td>
+        <td>quotes character <i>x</i> (unless \<i>x</i> has a special meaning)</td>
+      </tr>
+      <tr>
+        <td>\R</td>
+        <td>inserts the default line delimiter of the document</td>
+      </tr>
+      <tr>
+        <td>\x<i>hh</i></td>
+        <td>inserts the hexadecimal character <i>hh</i></td>
+      </tr>
+      <tr>
+        <td>\u<i>hhhh</i></td>
+        <td>inserts the Unicode character <i>hhhh</i></td>
+      </tr>
+      <tr>
+        <td>\n</td>
+        <td>inserts a newline character (usually, you should use \R instead)</td>
+      </tr>
+      <tr>
+        <td>\r</td>
+        <td>inserts a carriage-return character (usually, you should use \R instead)</td>
+      </tr>
+      <tr>
+        <td>\t</td>
+        <td>inserts a tab character</td>
+      </tr>
+      <tr>
+        <td>\f</td>
+        <td>inserts a form-feed character</td>
+      </tr>
+      <tr>
+        <td>\a</td>
+        <td>inserts an alert (beep) character</td>
+      </tr>
+      <tr>
+        <td>\e</td>
+        <td>inserts an escape character</td>
+      </tr>
+      <tr>
+        <td>\c<i>X</i></td>
+        <td>inserts the control character for <i>X</i></td>
+      </tr>
+      <tr>
+        <td>\C</td>
+        <td>retains the casing of the match (all lower case, all upper case, capitalized) for the rest of the replace
+        string</td>
+      </tr>
+    </tbody>
+  </table>
+</body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-search.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-search.htm
index 7e64087..7a97a0c 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-search.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-search.htm
@@ -1,79 +1,93 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en"><head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"><title>Search</title></head>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Search</title>
+</head>
 <body>
-
-<h1>Search</h1>
-<p> The
-
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.search.preferences.SearchPreferencePage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Search</strong></a>
-preference page allows you to set preferences for searches. 
-</p>
-<TABLE BORDER="1" cellspacing="0">
-  <THEAD>
-    <TR> 
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Option</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Description</P></TH>
-      <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Default</P></TH>
-    </TR>
-  </THEAD>
-  <TBODY>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Reuse editors to show matches</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          This option allows you to keep using the same editor for search 
-          results to reduce the number of open editors.</P></TD>
-      <TD> On</TD>
-    </TR>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Bring Search view to front after search</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          This option will display the search view at the front after performing 
-          a search. </P></TD>
-      <TD> On</TD>
-    </TR>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Ignore potential matches</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Select this option if you only want to see exact matches.</P></TD>
-      <TD> Off</TD>
-    </TR>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Emphasize potential matches</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          This option allows you to highlight potential matches in the Search 
-          view. If the Search engine isn't 100% sure about the match then it is 
-          considered a potential match. </P></TD>
-      <TD> On</TD>
-    </TR>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Foreground color for potential matches</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          This option allows you to select the foreground color for potential 
-          matches.</P></TD>
-      <TD></TD>
-    </TR>
-    <TR> 
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          Default perspective for the Search view</P></TD>
-      <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> 
-          This option allows you to define which perspective should be brought 
-          to the front when there are new search results.</P></TD>
-      <TD>None</TD>
-    </TR>
-  </TBODY>
-</TABLE>
-</body></html>
\ No newline at end of file
+  <h1>Search</h1>
+  <p>The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.search.preferences.SearchPreferencePage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt;
+  Search</strong></a> preference page allows you to set preferences for searches.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Reuse editors to show matches</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This option allows you to keep using the same editor for search results to reduce the number
+          of open editors.</p>
+        </td>
+        <td>On</td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Bring Search view to front after search</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This option will display the search view at the front after performing a search.</p>
+        </td>
+        <td>On</td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Ignore potential matches</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Select this option if you only want to see exact matches.</p>
+        </td>
+        <td>Off</td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Emphasize potential matches</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This option allows you to highlight potential matches in the Search view. If the Search
+          engine isn't 100% sure about the match then it is considered a potential match.</p>
+        </td>
+        <td>On</td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Foreground color for potential matches</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This option allows you to select the foreground color for potential matches.</p>
+        </td>
+        <td></td>
+      </tr>
+      <tr>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">Default perspective for the Search view</p>
+        </td>
+        <td rowspan="1" colspan="1" valign="top" align="left">
+          <p class="Para">This option allows you to define which perspective should be brought to the front when there
+          are new search results.</p>
+        </td>
+        <td>None</td>
+      </tr>
+    </tbody>
+  </table>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-options.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-options.htm
index 3220dde..246bc7d 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-options.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-options.htm
@@ -1,51 +1,37 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>Secure storage runtime options</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">Secure storage runtime options</H1>
-
-<h4>Changing location of secure storage</h4>
-
-<p>By default, secure storage is located in your home directory. On Windows that typically resolves to 
-<i>&quot;C:\Documents and Settings\&lt;user_name&gt;\.eclipse\org.eclipse.equinox.security&quot;</i>. This location is selected 
-to allow multiple Eclipse-based applications to share the same secure storage.</p>
-
-<p>If you would like to modify the location of the default secure storage, you can use the 
-&quot;-eclipse.keyring &lt;file_path&gt;&quot; runtime option. The &lt;file_path&gt; is a path to the file which is used 
-to persist the secure storage data.</p>
-
-<p>The current location of the default secure storage can be found on the 
-   <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>General &gt; Security &gt; Secure Storage</strong></a> 
-preferences page.</p>
-
-<h4>Password file</h4>
-
-<p>The password provider mechanism can be bypassed if you specify the
-&quot;-eclipse.password &lt;file path&gt;&quot; runtime option. In this case the contents of the file you specified 
-as the argument will be used as a master password. While this option is valuable in some circumstances 
-(such as headless applications), the protection of the password file becomes a consideration. The password file 
-can be protected by the operating system access rights and/or by placing it on a removable storage, 
-such as a USB key.</p>
-
-<h3 class="related">Related concepts</h3>
-      <A href="ref-securestorage-start.htm">Secure storage</A>
-  <br><A href="ref-securestorage-works.htm">How secure storage works</A>
-  <br><A href="ref-securestorage-recovery.htm">Password recovery</A>
-  <br><A href="ref-securestorage-passwd.htm">Life of a master password</A>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-securestorage-prefs.htm">Secure storage preference page</a>
-
-</BODY>
-</HTML>
\ No newline at end of file
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Secure storage runtime options</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Secure storage runtime options</h1>
+  <h4>Changing location of secure storage</h4>
+  <p>By default, secure storage is located in your home directory. On Windows that typically resolves to
+  <i>"C:\Documents and Settings\&lt;user_name&gt;\.eclipse\org.eclipse.equinox.security"</i>. This location is selected
+  to allow multiple Eclipse-based applications to share the same secure storage.</p>
+  <p>If you would like to modify the location of the default secure storage, you can use the "-eclipse.keyring
+  &lt;file_path&gt;" runtime option. The &lt;file_path&gt; is a path to the file which is used to persist the secure
+  storage data.</p>
+  <p>The current location of the default secure storage can be found on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Security &gt;
+  Secure Storage</strong></a> preferences page.</p>
+  <h4>Password file</h4>
+  <p>The password provider mechanism can be bypassed if you specify the "-eclipse.password &lt;file path&gt;" runtime
+  option. In this case the contents of the file you specified as the argument will be used as a master password. While
+  this option is valuable in some circumstances (such as headless applications), the protection of the password file
+  becomes a consideration. The password file can be protected by the operating system access rights and/or by placing
+  it on a removable storage, such as a USB key.</p>
+  <h3 class="related">Related concepts</h3><a href="ref-securestorage-start.htm">Secure storage</a><br>
+  <a href="ref-securestorage-works.htm">How secure storage works</a><br>
+  <a href="ref-securestorage-recovery.htm">Password recovery</a><br>
+  <a href="ref-securestorage-passwd.htm">Life of a master password</a>
+  <h3 class="related">Related reference</h3><a href="ref-securestorage-prefs.htm">Secure storage preference page</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-passwd.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-passwd.htm
index 39abe66..c750346 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-passwd.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-passwd.htm
@@ -1,55 +1,42 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>Life of a master password</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">Life of a master password</H1>
-
-<p>The &quot;master&quot; password is used to encrypt and decrypt data stored by the secure storage. 
-The master passwords are specific to providers: each provider has a separate master password.</p> 
-
-<p>The life of a master password begins when a password provider is asked for it for a first time. 
-Depending on the provider, it will either generate a master password behind the scenes, or will ask you 
-for some input. The same master password is then used for all subsequent use of this password provider.</p>
-
-<p align="center"><img alt="Lifecycle of a master password." src="../images/equinox_secure_storage_pswd.svg"></p>
-<p align="center"><b>Picture 1. Lifecycle of a master password.</b></p>
-
-<p>Once the master password is obtained from the password provider, it is cached in memory until 
-the application is closed or the password cache is cleared using the 
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>General &gt; Security &gt; Secure Storage</b></a> preference page.</p>
-
-<p>The master password can be changed using the 
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>Secure Storage</b></a> preference page. Depending on 
-the provider, the password change operation might require some input from you or might happen completely 
-behind the scenes.</p>
-
-<p>In case the master password is lost, it can be recovered if password recovery questions and answers were 
-specified. The password recovery allows working around both human and machine problems. For instance, if 
-a UI prompt was used to enter a password and the user forgot the password. If an operating system integration 
-module was used, the operating system might have been re-installed or an entry deleted in the system keyring 
-that was used for the master password.</p>
-
-<h3 class="related">Related concepts</h3>
-      <A href="ref-securestorage-start.htm">Secure storage</A>
-  <br><A href="ref-securestorage-works.htm">How secure storage works</A>
-
-<h3 class="related">Related reference</h3>
-      <a href="ref-securestorage-prefs.htm">Secure storage preference page</a>
-  <br><a href="ref-securestorage-options.htm">Secure storage runtime options</a>
-
-
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Life of a master password</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Life of a master password</h1>
+  <p>The "master" password is used to encrypt and decrypt data stored by the secure storage. The master passwords are
+  specific to providers: each provider has a separate master password.</p>
+  <p>The life of a master password begins when a password provider is asked for it for a first time. Depending on the
+  provider, it will either generate a master password behind the scenes, or will ask you for some input. The same
+  master password is then used for all subsequent use of this password provider.</p>
+  <p align="center"><img alt="Lifecycle of a master password." src="../images/equinox_secure_storage_pswd.svg"></p>
+  <p align="center"><b>Picture 1. Lifecycle of a master password.</b></p>
+  <p>Once the master password is obtained from the password provider, it is cached in memory until the application is
+  closed or the password cache is cleared using the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General &gt; Security &gt; Secure
+  Storage</b></a> preference page.</p>
+  <p>The master password can be changed using the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Secure Storage</b></a> preference
+  page. Depending on the provider, the password change operation might require some input from you or might happen
+  completely behind the scenes.</p>
+  <p>In case the master password is lost, it can be recovered if password recovery questions and answers were
+  specified. The password recovery allows working around both human and machine problems. For instance, if a UI prompt
+  was used to enter a password and the user forgot the password. If an operating system integration module was used,
+  the operating system might have been re-installed or an entry deleted in the system keyring that was used for the
+  master password.</p>
+  <h3 class="related">Related concepts</h3><a href="ref-securestorage-start.htm">Secure storage</a><br>
+  <a href="ref-securestorage-works.htm">How secure storage works</a>
+  <h3 class="related">Related reference</h3><a href="ref-securestorage-prefs.htm">Secure storage preference
+  page</a><br>
+  <a href="ref-securestorage-options.htm">Secure storage runtime options</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-prefs.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-prefs.htm
index f6250a1..6cb58db 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-prefs.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-prefs.htm
@@ -1,97 +1,66 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>Secure storage preference page</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">Secure storage preference page</H1>
-
-<p>The <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Security &gt; Secure Storage</strong></a> preference page is used to manage storage of
-encrypted information such as passwords. Typically you will have no reason to
-alter the preferences on this page. The options here are mostly for troubleshooting,
-and, to a lesser degree, for system administrators and power users.</p>
-
-<h2>Password options</h2>
-
-<p>The <b>Password</b> tab combines functionality related to the master password 
-lifecycle and password providers.</p> 
-
-<p>The <b>Clear Passwords</b> button clears cached master passwords from memory. 
-This is analogous to logging out of the secure storage. Note that some password providers obtain 
-credentials from the operating system automatically. To prevent them from doing so, you'll need to log out 
-from the operating system account.</p>
-
-<p>The <b>Master password providers</b> section contains a list of currently available password providers. 
-By default, the enabled provider with the highest priority is used to encrypt data added to secure storage. 
-The priority range is from 0 to 10, with 10 being the highest. A password provider can be disabled it if malfunctions, 
-or if you prefer a lower priority password provider.</p> 
-
-<p>Note that data can only be decrypted by the same provider that encrypted the data. 
-This means that changes to the list of the password providers affect only new entries. 
-The password provider for existing entries can only be overwritten by the application storing the data.</p>
-
-<p>By default all password providers are enabled.</p>
-
-<p>Each password provider that has been used at least once will have a master password associated with it. 
-Use the <b>Change Password...</b> button can to change the master password of the selected 
-password provider.</p> 
-
-<p>The <b>Recover Password...</b> button opens the password recovery dialog. Use this option if you
-have forgotten the master password and have configured password recovery questions.
-The button will be disabled if the password recovery setup was cancelled 
-when the master password was created. Note that the answers for the password recovery questions have to be entered 
-exactly as they were specified during the password recovery setup. Answers are case-sensitive and white space 
-inside answers are significant.</p>
-
-<h2>Contents options</h2>
-
-<p>The <b>Contents</b> tab displays contents of the default secure storage.</p>
-
-<p>Secure storage is organized as a tree where nodes represent context of the information and values are associated 
-with each node. Selecting a node in the tree will display a table of values associated with that node. Values stored in 
-a non-encrypted form will be displayed; the encrypted values will be shown as &quot;*********&quot;.</p> 
-
-<p>At the bottom of this tab, you will find the actual file location used to persist secure storage data.</p>
-
-<p>To force changes to the contents of secure storage to be saved, click <b>Save</b>.</p>
-
-<p>To delete stored data to recover from an error or to reflect a change in the setup, 
-click <b>Delete</b>. This will delete <b>all</b> of the contents of secure storage. 
-In some cases, other parts of the application may depend on the contents of secure storage that you deleted.  
-To avoid unexpected errors, it is highly recommended to restart the application after secure storage has been deleted.</p>
-
-<h2>Advanced options</h2>
-
-<p>The <b>Advanced</b> tab of the preferences page offers some extra tweaks to secure storage.</p>
-
-<p>The encryption algorithm used by secure storage can be modified from this page. 
-The drop-down list displays the discovered algorithms that are provided by the Java virtual machine 
-which are compatible with secure storage.</p> 
-
-<p>Changes in the encryption algorithm are only applied to data stored after the change. If you 
-have already created a secure storage it would have to be deleted and re-created to use the newly selected encryption 
-algorithm.</p>
-
-<p>Note that the list of available algorithm might be different for different Java virtual machines and could 
-be extended by providing custom algorithms using the Java security provider mechanism.</p>
-
-<h3 class="related">Related concepts</h3>
-      <A href="ref-securestorage-start.htm">Secure storage</A>
-  <br><A href="ref-securestorage-works.htm">How secure storage works</A>
-  <br><A href="ref-securestorage-recovery.htm">Password recovery</A>
-  <br><A href="ref-securestorage-passwd.htm">Life of a master password</A>
-
-<h3 class="related">Related reference</h3>
-<a href="ref-securestorage-options.htm">Secure storage runtime options</a>
-
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Secure storage preference page</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Secure storage preference page</h1>
+  <p>The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Security &gt;
+  Secure Storage</strong></a> preference page is used to manage storage of encrypted information such as passwords.
+  Typically you will have no reason to alter the preferences on this page. The options here are mostly for
+  troubleshooting, and, to a lesser degree, for system administrators and power users.</p>
+  <h2>Password options</h2>
+  <p>The <b>Password</b> tab combines functionality related to the master password lifecycle and password
+  providers.</p>
+  <p>The <b>Clear Passwords</b> button clears cached master passwords from memory. This is analogous to logging out of
+  the secure storage. Note that some password providers obtain credentials from the operating system automatically. To
+  prevent them from doing so, you'll need to log out from the operating system account.</p>
+  <p>The <b>Master password providers</b> section contains a list of currently available password providers. By
+  default, the enabled provider with the highest priority is used to encrypt data added to secure storage. The priority
+  range is from 0 to 10, with 10 being the highest. A password provider can be disabled it if malfunctions, or if you
+  prefer a lower priority password provider.</p>
+  <p>Note that data can only be decrypted by the same provider that encrypted the data. This means that changes to the
+  list of the password providers affect only new entries. The password provider for existing entries can only be
+  overwritten by the application storing the data.</p>
+  <p>By default all password providers are enabled.</p>
+  <p>Each password provider that has been used at least once will have a master password associated with it. Use the
+  <b>Change Password...</b> button can to change the master password of the selected password provider.</p>
+  <p>The <b>Recover Password...</b> button opens the password recovery dialog. Use this option if you have forgotten
+  the master password and have configured password recovery questions. The button will be disabled if the password
+  recovery setup was cancelled when the master password was created. Note that the answers for the password recovery
+  questions have to be entered exactly as they were specified during the password recovery setup. Answers are
+  case-sensitive and white space inside answers are significant.</p>
+  <h2>Contents options</h2>
+  <p>The <b>Contents</b> tab displays contents of the default secure storage.</p>
+  <p>Secure storage is organized as a tree where nodes represent context of the information and values are associated
+  with each node. Selecting a node in the tree will display a table of values associated with that node. Values stored
+  in a non-encrypted form will be displayed; the encrypted values will be shown as "*********".</p>
+  <p>At the bottom of this tab, you will find the actual file location used to persist secure storage data.</p>
+  <p>To force changes to the contents of secure storage to be saved, click <b>Save</b>.</p>
+  <p>To delete stored data to recover from an error or to reflect a change in the setup, click <b>Delete</b>. This will
+  delete <b>all</b> of the contents of secure storage. In some cases, other parts of the application may depend on the
+  contents of secure storage that you deleted. To avoid unexpected errors, it is highly recommended to restart the
+  application after secure storage has been deleted.</p>
+  <h2>Advanced options</h2>
+  <p>The <b>Advanced</b> tab of the preferences page offers some extra tweaks to secure storage.</p>
+  <p>The encryption algorithm used by secure storage can be modified from this page. The drop-down list displays the
+  discovered algorithms that are provided by the Java virtual machine which are compatible with secure storage.</p>
+  <p>Changes in the encryption algorithm are only applied to data stored after the change. If you have already created
+  a secure storage it would have to be deleted and re-created to use the newly selected encryption algorithm.</p>
+  <p>Note that the list of available algorithm might be different for different Java virtual machines and could be
+  extended by providing custom algorithms using the Java security provider mechanism.</p>
+  <h3 class="related">Related concepts</h3><a href="ref-securestorage-start.htm">Secure storage</a><br>
+  <a href="ref-securestorage-works.htm">How secure storage works</a><br>
+  <a href="ref-securestorage-recovery.htm">Password recovery</a><br>
+  <a href="ref-securestorage-passwd.htm">Life of a master password</a>
+  <h3 class="related">Related reference</h3><a href="ref-securestorage-options.htm">Secure storage runtime options</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-recovery.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-recovery.htm
index fc2cde1..acb7513 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-recovery.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-recovery.htm
@@ -1,39 +1,31 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>Password recovery</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">Password recovery</H1>
-
-<p>When the secure storage is used for the first time, it will generate a master password used to encrypt 
-data. This same master password will be required to retrieve data from secure storage in future. 
-In case the master password becomes unavailable, secure storage provides optional support for password recovery. 
-If the master password is lost or forgotten, providing exactly the same answers to the questions will recover 
-the master password and will allow data to be retrieved from secure storage. This can help prevent data loss 
-in case you forget or lose your master password.</p>
-
-<p>Pick password recovery questions that will be easy for you to answer, but hard for other people to guess. 
-For example, consider asking about a memorable date, a place you liked when you were a child, or your favorite quote. 
-The strength of secure storage is determined by its weakest link; don't use answers that are very short or 
-easy to guess.</p>
-
-<h3 class="related">Related concepts</h3>
-      <A href="ref-securestorage-start.htm">Secure storage</A>
-  <br><A href="ref-securestorage-works.htm">How secure storage works</A>
-  <br><A href="ref-securestorage-passwd.htm">Life of a master password</A>
-
-<h3 class="related">Related reference</h3>
-      <a href="ref-securestorage-prefs.htm">Secure storage preference page</a>
-  <br><a href="ref-securestorage-options.htm">Secure storage runtime options</a>
-
-
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Password recovery</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Password recovery</h1>
+  <p>When the secure storage is used for the first time, it will generate a master password used to encrypt data. This
+  same master password will be required to retrieve data from secure storage in future. In case the master password
+  becomes unavailable, secure storage provides optional support for password recovery. If the master password is lost
+  or forgotten, providing exactly the same answers to the questions will recover the master password and will allow
+  data to be retrieved from secure storage. This can help prevent data loss in case you forget or lose your master
+  password.</p>
+  <p>Pick password recovery questions that will be easy for you to answer, but hard for other people to guess. For
+  example, consider asking about a memorable date, a place you liked when you were a child, or your favorite quote. The
+  strength of secure storage is determined by its weakest link; don't use answers that are very short or easy to
+  guess.</p>
+  <h3 class="related">Related concepts</h3><a href="ref-securestorage-start.htm">Secure storage</a><br>
+  <a href="ref-securestorage-works.htm">How secure storage works</a><br>
+  <a href="ref-securestorage-passwd.htm">Life of a master password</a>
+  <h3 class="related">Related reference</h3><a href="ref-securestorage-prefs.htm">Secure storage preference
+  page</a><br>
+  <a href="ref-securestorage-options.htm">Secure storage runtime options</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-start.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-start.htm
index 085e6f9..79c694f 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-start.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-start.htm
@@ -1,76 +1,70 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>Secure storage</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">Secure storage</H1>
-
-<p>The secure storage saves data in an encrypted form. On some operating systems, 
-it uses your operating system account information to provide a single sign-on experience.</p> 
-
-<p>The secure storage itself does not contain encryption code. It uses algorithms 
-supplied by the Java virtual machine and/or the operating system.</p>
-
-<h3>Frequently asked questions</h3>
-<ul>
-<li><h4>What encryption is used?</h4>
-<p>By default, the 56-bit DES algorithm is requested from the Java virtual machine.</p> 
-<p>The 
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Security &gt; Secure Storage</strong></a> 
-preference page allows you to change the encryption algorithm. Note that the new algorithm 
-will be applied to newly created secure storages only. The list of compatible algorithms depends on the Java 
-virtual machine running this application.</p>
-</li>
-<li><h4>How do I change a password?</h4>
-<p>You can change password via the <b>Change Password...</b> button on the 
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Security &gt; Secure Storage</strong></a> preference page.</p>
-</li>
-</ul>
-
-<h2>Resolving problems</h2>
-
-<ul>
-<li><h4>Lost secure storage password or invalid secure storage password</h4>
-
-<p>If you have specified password recovery questions/answers, you can use the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Security &gt; Secure Storage</strong></a> preference page to 
-recover the master password. After the master password has been recovered, it is strongly 
-recommended that you change the master password using the <b>Change Password...</b> button on 
-the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Security &gt; Secure Storage</strong></a> preference page.</p>
-<p>The recovered password is not displayed, but stored in the memory cache until the application is closed.</p>
-</li>
-<li><h4>If all else fails</h4>
-<p>If you have a problem with secure storage that you can not find a workaround for, the secure storage can be deleted 
-using the <b>Delete</b> button on the <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<strong>General &gt; Security &gt; Secure Storage</strong></a> preference page. This, of course, will delete all the contents 
-of the secure storage. It is highly recommended that you restart the application after secure storage has been deleted.</p>
-</li>
-</ul>
-
-<h3 class="related">Related concepts</h3>
-      <A href="ref-securestorage-works.htm">How secure storage works</A>
-  <br><A href="ref-securestorage-recovery.htm">Password recovery</A>
-  <br><A href="ref-securestorage-passwd.htm">Life of a master password</A>
-
-<h3 class="related">Related reference</h3>
-      <a href="ref-securestorage-prefs.htm">Secure storage preference page</a>
-  <br><a href="ref-securestorage-options.htm">Secure storage runtime options</a>
-
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Secure storage</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Secure storage</h1>
+  <p>The secure storage saves data in an encrypted form. On some operating systems, it uses your operating system
+  account information to provide a single sign-on experience.</p>
+  <p>The secure storage itself does not contain encryption code. It uses algorithms supplied by the Java virtual
+  machine and/or the operating system.</p>
+  <h3>Frequently asked questions</h3>
+  <ul>
+    <li>
+      <h4>What encryption is used?</h4>
+      <p>By default, the 56-bit DES algorithm is requested from the Java virtual machine.</p>
+      <p>The <a class="command-link" href=
+      'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
+      <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Security &gt;
+      Secure Storage</strong></a> preference page allows you to change the encryption algorithm. Note that the new
+      algorithm will be applied to newly created secure storages only. The list of compatible algorithms depends on the
+      Java virtual machine running this application.</p>
+    </li>
+    <li>
+      <h4>How do I change a password?</h4>
+      <p>You can change password via the <b>Change Password...</b> button on the <a class="command-link" href=
+      'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
+      <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Security &gt;
+      Secure Storage</strong></a> preference page.</p>
+    </li>
+  </ul>
+  <h2>Resolving problems</h2>
+  <ul>
+    <li>
+      <h4>Lost secure storage password or invalid secure storage password</h4>
+      <p>If you have specified password recovery questions/answers, you can use the <a class="command-link" href=
+      'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
+      <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Security &gt;
+      Secure Storage</strong></a> preference page to recover the master password. After the master password has been
+      recovered, it is strongly recommended that you change the master password using the <b>Change Password...</b>
+      button on the <a class="command-link" href=
+      'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
+      <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Security &gt;
+      Secure Storage</strong></a> preference page.</p>
+      <p>The recovered password is not displayed, but stored in the memory cache until the application is closed.</p>
+    </li>
+    <li>
+      <h4>If all else fails</h4>
+      <p>If you have a problem with secure storage that you can not find a workaround for, the secure storage can be
+      deleted using the <b>Delete</b> button on the <a class="command-link" href=
+      'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.equinox.security.ui.storage)")'>
+      <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Security &gt;
+      Secure Storage</strong></a> preference page. This, of course, will delete all the contents of the secure storage.
+      It is highly recommended that you restart the application after secure storage has been deleted.</p>
+    </li>
+  </ul>
+  <h3 class="related">Related concepts</h3><a href="ref-securestorage-works.htm">How secure storage works</a><br>
+  <a href="ref-securestorage-recovery.htm">Password recovery</a><br>
+  <a href="ref-securestorage-passwd.htm">Life of a master password</a>
+  <h3 class="related">Related reference</h3><a href="ref-securestorage-prefs.htm">Secure storage preference
+  page</a><br>
+  <a href="ref-securestorage-options.htm">Secure storage runtime options</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-works.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-works.htm
index d0c98e9..f3f339d 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-works.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-securestorage-works.htm
@@ -1,51 +1,40 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>How secure storage works</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">How secure storage works</H1>
-
-<p>Let's consider a concrete example of CVS integration. When you specify a password for a CVS connection, 
-the application offers you an option to save your user name and password using secure storage.</p>
-
-<p align="center"><img alt="Schema of secure storage encrypting data" src="../images/equinox_secure_storage_start.svg"><br>
-</p>
-<p align="center"><b>Picture 1. How secure storage works.</b></p>
-
-<p>Your CVS password is passed as data to secure storage. Secure storage uses a &quot;master&quot; password 
-to encrypt it and store the encrypted CVS password in a file on disk.</p>
-
-<p>The master password is obtained from a password provider module. The master passwords 
-are obtained in a &quot;lazy&quot; fashion, only when they are about to be used. Password providers can use 
-different techniques:</p>
-<ul>
-<li>on <i>Windows</i>, the master password is generated as a random value that is encrypted based on your 
-Windows login information and stored in secure storage;</li>
-<li>on <i>macOS</i>, the master password is initially created as a random value that is stored in 
-the OS keyring;</li>
-<li>the default password provider simply prompts you for a password;</li>
-<li>other password providers might be supplied in your application.</li>
-</ul>
-
-<p>When data is saved with secure storage, the password provider is selected based on the priorities from 
-the list of enabled password providers. Only that provider can be used in future to decrypt the data.</p>
-
-<h3 class="related">Related concepts</h3>
-      <A href="ref-securestorage-start.htm">Secure storage</A>
-  <br><A href="ref-securestorage-recovery.htm">Password recovery</A>
-  <br><A href="ref-securestorage-passwd.htm">Life of a master password</A>
-
-<h3 class="related">Related reference</h3>
-      <a href="ref-securestorage-prefs.htm">Secure storage preference page</a>
-  <br><a href="ref-securestorage-options.htm">Secure storage runtime options</a>
-
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>How secure storage works</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">How secure storage works</h1>
+  <p>Let's consider a concrete example of CVS integration. When you specify a password for a CVS connection, the
+  application offers you an option to save your user name and password using secure storage.</p>
+  <p align="center"><img alt="Schema of secure storage encrypting data" src=
+  "../images/equinox_secure_storage_start.svg"><br></p>
+  <p align="center"><b>Picture 1. How secure storage works.</b></p>
+  <p>Your CVS password is passed as data to secure storage. Secure storage uses a "master" password to encrypt it and
+  store the encrypted CVS password in a file on disk.</p>
+  <p>The master password is obtained from a password provider module. The master passwords are obtained in a "lazy"
+  fashion, only when they are about to be used. Password providers can use different techniques:</p>
+  <ul>
+    <li>on <i>Windows</i>, the master password is generated as a random value that is encrypted based on your Windows
+    login information and stored in secure storage;</li>
+    <li>on <i>macOS</i>, the master password is initially created as a random value that is stored in the OS
+    keyring;</li>
+    <li>the default password provider simply prompts you for a password;</li>
+    <li>other password providers might be supplied in your application.</li>
+  </ul>
+  <p>When data is saved with secure storage, the password provider is selected based on the priorities from the list of
+  enabled password providers. Only that provider can be used in future to decrypt the data.</p>
+  <h3 class="related">Related concepts</h3><a href="ref-securestorage-start.htm">Secure storage</a><br>
+  <a href="ref-securestorage-recovery.htm">Password recovery</a><br>
+  <a href="ref-securestorage-passwd.htm">Life of a master password</a>
+  <h3 class="related">Related reference</h3><a href="ref-securestorage-prefs.htm">Secure storage preference
+  page</a><br>
+  <a href="ref-securestorage-options.htm">Secure storage runtime options</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-ssh2-preferences.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-ssh2-preferences.htm
index b9b470f..dd3fd32 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-ssh2-preferences.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-ssh2-preferences.htm
@@ -1,50 +1,41 @@
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css"><LINK rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<TITLE>SSH2</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
-<H1 class="Head">SSH2</H1>
-<p class="Head">The preferences on the
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jsch.ui.SSHPreferences)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>General &gt; Network Connections &gt; SSH2</strong></a>
-  preferences page are divided into 4 groups.</p>
-
-<table border="1" cellspacing="0" width="100%">
-  <tbody><tr> 
-    <td align="left" valign="middle" width="17%">General</td>
-    <td align="left" valign="middle" width="83%"> Use the options in this tab 
-      group to configure where the ssh key directory is and what keys are to be 
-      sent to a server when connecting.</td>
-  </tr>
-  
-  <tr> 
-    <td align="left" valign="middle">Key Management</td>
-    <td align="left" valign="top"> Use the options in this tab group to create, 
-      manage and export keys.</td>
-  </tr>
-  <tr>
-    <td align="left" valign="middle">Known Hosts</td>
-    <td align="left" valign="top">Use the options in this tab group to manage 
-      the keys for the known hosts.</td>
-  </tr>
-  <tr>
-    <td align="left" valign="middle">Authentication Methods</td>
-    <td align="left" valign="top">Use the options in this tab group to manage the authentication methods.</td>
-  </tr>
-  </tbody>
-</table>
-
-<h3 class="related">Related reference</h3>
-  <A href="ref-net-preferences.htm">Network Connections Preferences</A>
-
-</BODY>
-</HTML>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>SSH2</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">SSH2</h1>
+  <p class="Head">The preferences on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jsch.ui.SSHPreferences)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Network
+  Connections &gt; SSH2</strong></a> preferences page are divided into 4 groups.</p>
+  <table border="1" cellspacing="0" width="100%">
+    <tbody>
+      <tr>
+        <td align="left" valign="middle" width="17%">General</td>
+        <td align="left" valign="middle" width="83%">Use the options in this tab group to configure where the ssh key
+        directory is and what keys are to be sent to a server when connecting.</td>
+      </tr>
+      <tr>
+        <td align="left" valign="middle">Key Management</td>
+        <td align="left" valign="top">Use the options in this tab group to create, manage and export keys.</td>
+      </tr>
+      <tr>
+        <td align="left" valign="middle">Known Hosts</td>
+        <td align="left" valign="top">Use the options in this tab group to manage the keys for the known hosts.</td>
+      </tr>
+      <tr>
+        <td align="left" valign="middle">Authentication Methods</td>
+        <td align="left" valign="top">Use the options in this tab group to manage the authentication methods.</td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="ref-net-preferences.htm">Network Connections Preferences</a>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-startup-workspaces.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-startup-workspaces.htm
index 7cd8b68..3c439e5 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-startup-workspaces.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-startup-workspaces.htm
@@ -1,50 +1,92 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) Eric Rizzo and others 2000, 2014. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Startup and Shutdown, Workspaces</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head"> Startup and Shutdown, Workspaces </H1>
-<P CLASS="Para"> The
-
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Startup.Workspaces)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>General &gt; Startup and Shutdown &gt; Workspaces</strong></a>
-
-  preference page allows configuration of the workspace prompting during IDE startup.</P>
-
-
-<table BORDER="1" CELLSPACING="0">
-  <tr>
-    <th> <div CLASS="Para">Option</div></th>
-    <th> <div CLASS="Para">Description</div></th>
-    <th> <div CLASS="Para">Default</div></th>
-  </tr>
-  <tr>
-    <td> <div CLASS="Para">Prompt for workspace on startup</div></td>
-    <td> <div CLASS="Para">If this option is turned on then the workbench will
-        prompt you each time it is started for what workspace to use.</div></td>
-    <td> <div CLASS="Para">On</div></td>
-  </tr>
-  <tr>
-    <td> <div CLASS="Para">Number of recent workspaces to remember</div></td>
-    <td> <div CLASS="Para">The maximum number of recently-used workspaces that will be remembered and presented in the "Workspace Launcher" dialog.</div></td>
-    <td> <div CLASS="Para">5</div></td>
-  </tr>
-  <tr>
-    <td> <div CLASS="Para">Recent workspaces</div></td>
-    <td> <div CLASS="Para">The list of recently used workspaces that are presented in the "Workspace Launcher" dialog.</div></td>
-    <td> <div CLASS="Para">&lt;none&gt;</div></td>
-  </tr>
-</table>
-
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) Eric Rizzo and others 2000, 2014. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Startup and Shutdown, Workspaces</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Startup and Shutdown, Workspaces</h1>
+  <p class="Para">The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Startup.Workspaces)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Startup and
+  Shutdown &gt; Workspaces</strong></a> preference page allows configuration of the workspace prompting during IDE
+  startup.</p>
+  <table border="1" cellspacing="0">
+    <tr>
+      <th>
+        <div class="Para">
+          Option
+        </div>
+      </th>
+      <th>
+        <div class="Para">
+          Description
+        </div>
+      </th>
+      <th>
+        <div class="Para">
+          Default
+        </div>
+      </th>
+    </tr>
+    <tr>
+      <td>
+        <div class="Para">
+          Prompt for workspace on startup
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          If this option is turned on then the workbench will prompt you each time it is started for what workspace to
+          use.
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          On
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <div class="Para">
+          Number of recent workspaces to remember
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          The maximum number of recently-used workspaces that will be remembered and presented in the "Workspace
+          Launcher" dialog.
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          5
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <div class="Para">
+          Recent workspaces
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          The list of recently used workspaces that are presented in the "Workspace Launcher" dialog.
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          &lt;none&gt;
+        </div>
+      </td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-startup.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-startup.htm
index 49d9d31..489185c 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-startup.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-startup.htm
@@ -1,64 +1,109 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Startup and Shutdown</title>
-
-</HEAD>
-<BODY BGCOLOR="#ffffff">
-<H1 CLASS="Head"> Startup and Shutdown </H1>
-<P CLASS="Para"> The
-
-  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Startup)")'>
-  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-  <strong>General &gt; Startup and Shutdown</strong></a>
-
-  preference page allows the selection
-  of plug-ins to be automatically activated during workbench startup.</P>
-
-
-<P CLASS="Para">Normally plug-ins are not activated until they are needed.
-However some plug-ins may specify that they wish to be activated during startup.
-This preference page allows the selection of which of these plug-ins will
-actually be activated during startup.</P>
-
-<table BORDER="1" CELLSPACING="0">
-  <tr>
-    <th> <div CLASS="Para">Option</div></th>
-    <th> <div CLASS="Para">Description</div></th>
-    <th> <div CLASS="Para">Default</div></th>
-  </tr>
-  <tr>
-    <td> <div CLASS="Para">Refresh workspace on startup</div></td>
-    <td> <div CLASS="Para">If this option is turned on then the workbench will
-        synchronize its contents with the file system on startup.</div></td>
-    <td> <div CLASS="Para">Off</div></td>
-  </tr>
-  <tr>
-    <td> <div CLASS="Para">Show Problems view decorations on startup</div></td>
-    <td> <div CLASS="Para">If this option is turned on then the Problems 
-    view icon will show an errors/warnings overlay after startup,
-    independently if the Problems view is on top of the view stack or not.</div></td>
-    <td> <div CLASS="Para">Off</div></td>
-  </tr>
-  <tr>
-    <td> <div CLASS="Para">Confirm exit when closing last window</div></td>
-    <td> <div CLASS="Para">If this option is turned on then the workbench will
-        ask if you wish to exit when closing the last window if.</div></td>
-    <td> <div CLASS="Para">On</div></td>
-  </tr>
-  <tr>
-    <td> <div CLASS="Para">Plug-ins activated on startup</div></td>
-    <td> <div CLASS="Para">This option allows you to select which available plug-ins
-        should be activated on startup.</div></td>
-    <td> <div CLASS="Para"></div></td>
-  </tr>
-</table>
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html lang="en">
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <title>Startup and Shutdown</title>
+</head>
+<body bgcolor="#FFFFFF">
+  <h1 class="Head">Startup and Shutdown</h1>
+  <p class="Para">The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Startup)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General &gt; Startup and
+  Shutdown</strong></a> preference page allows the selection of plug-ins to be automatically activated during workbench
+  startup.</p>
+  <p class="Para">Normally plug-ins are not activated until they are needed. However some plug-ins may specify that
+  they wish to be activated during startup. This preference page allows the selection of which of these plug-ins will
+  actually be activated during startup.</p>
+  <table border="1" cellspacing="0">
+    <tr>
+      <th>
+        <div class="Para">
+          Option
+        </div>
+      </th>
+      <th>
+        <div class="Para">
+          Description
+        </div>
+      </th>
+      <th>
+        <div class="Para">
+          Default
+        </div>
+      </th>
+    </tr>
+    <tr>
+      <td>
+        <div class="Para">
+          Refresh workspace on startup
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          If this option is turned on then the workbench will synchronize its contents with the file system on startup.
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          Off
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <div class="Para">
+          Show Problems view decorations on startup
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          If this option is turned on then the Problems view icon will show an errors/warnings overlay after startup,
+          independently if the Problems view is on top of the view stack or not.
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          Off
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <div class="Para">
+          Confirm exit when closing last window
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          If this option is turned on then the workbench will ask if you wish to exit when closing the last window if.
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          On
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <div class="Para">
+          Plug-ins activated on startup
+        </div>
+      </td>
+      <td>
+        <div class="Para">
+          This option allows you to select which available plug-ins should be activated on startup.
+        </div>
+      </td>
+      <td>
+        <div class="Para"></div>
+      </td>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-templates-view.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-templates-view.htm
index 7d6a53e..72cf059 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-templates-view.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-templates-view.htm
@@ -1,25 +1,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Templates view</title>
-<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2008, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <title>Templates view</title>
+  <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
 </head>
 <body>
-<h1>Templates view</h1>
-<p>This view allows to work with the templates of the currently active editor. The contents of this view is editor-specific and not all editors provide templates.</p>
-<p>In the example below, we see the Templates view showing the templates for a Java source file:</p>
-<p>
-<img src="../images/ref-templates-view.png" alt="Picture of the Templates view showing the templates for the Java editor" border="0" >
-</p>
-
-<p CLASS="Head">
-To add the Templates view to the current perspective, click
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.texteditor.TemplatesView)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>Window &gt; Show View &gt; Other... &gt; General &gt; Templates</b></a>.
-</p>
-
+  <h1>Templates view</h1>
+  <p>This view allows to work with the templates of the currently active editor. The contents of this view is
+  editor-specific and not all editors provide templates.</p>
+  <p>In the example below, we see the Templates view showing the templates for a Java source file:</p>
+  <p><img src="../images/ref-templates-view.png" alt=
+  "Picture of the Templates view showing the templates for the Java editor" border="0"></p>
+  <p class="Head">To add the Templates view to the current perspective, click <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.texteditor.TemplatesView)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window &gt; Show View &gt; Other...
+  &gt; General &gt; Templates</b></a>.</p>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-texteditorprefs.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-texteditorprefs.htm
index 9810fcc..5622eb3 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-texteditorprefs.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-texteditorprefs.htm
@@ -1,351 +1,248 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta name="copyright" content=
-    "Copyright (c) IBM Corporation and others 2000, 2018. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <title>
-      Text Editors preference page
-    </title>
-    <script language="JavaScript" src=
-    "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript">
-</script>
-    <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
-    <style type="text/css">
-/*<![CDATA[*/
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2018. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <title>Text Editors preference page</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
+  <style type="text/css">
+  /*<![CDATA[*/
     table.c3 {width: 100%;}
     td.c2 {vertical-align: top;}
     td.c1 {vertical-align: top; width: 25%;}
     /*]]>*/
-    </style>
-  </head>
-  <body>
-    <h1 class="Head">
-      Text Editors preference page
-    </h1>
-    <p>
-      The following preferences can be changed on the <a class="command-link"
-      href=
-      'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.GeneralTextEditor)")'>
-      <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt=
-      "command link" /> <strong>General &gt; Editors &gt; Text
-      Editors</strong></a> preference page.
-    </p>
-    <h2>
-      Appearance options
-    </h2>
-    <table border="1" cellspacing="0" class="c3">
-
-      <tbody>
-        <tr>
-          <th width="25%">
-            <div class="Para">
-              Option
-            </div>
-          </th>
-          <th>
-            <div class="Para">
-
-              Description
-            </div>
-          </th>
-          <th>
-            <div class="Para">
-              Default
-            </div>
-          </th>
-        </tr>
-        <tr>
-
-          <td align="left" valign="top">
-            <div class="Para">
-              Undo history size<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option allows you to set the size of the undo history for
-              text editors.
-            </div>
-
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              200
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-
-            <div class="Para">
-              Displayed tab width<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option allows you to set the displayed tab width for text
-              editors.
-            </div>
-          </td>
-
-          <td align="left" valign="top">
-            <div class="Para">
-              4
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Insert spaces for tabs<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option allows you to insert space characters in place of tab
-              characters.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              Off
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Remove multiple spaces on backspace/delete<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option allows you to set whether hitting backspace or
-              delete in text editors deletes only 1 space character
-              (if <code>off</code>) or deletes as many space characters as
-              defined in <em>Display tab width</em> (if <code>on</code>).
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              Off
-            </div>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Highlight current line<br />
-
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option controls whether or the current line is highlighted
-              or not.<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-
-            On<br />
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Show print margin<br />
-            </div>
-
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              This option controls whether the print margin is visible or not.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              Off
-            </div>
-
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Print margin column<br />
-            </div>
-          </td>
-
-          <td align="left" valign="top">
-            <div class="Para">
-              This option allows you to set the print margin column position.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              80
-            </div>
-          </td>
-
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Allow editors to override the margin column<br />
-            </div>
-          </td>
-
-          <td align="left" valign="top">
-            <div class="Para">
-              This option tells whether editors are allowed to override the print margin column.
-            </div>
-          </td>
-          <td align="left" valign="top">
-            <div class="Para">
-              false
-            </div>
-          </td>
-
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-            <div class="Para">
-              Show line numbers<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-
-            This option controls whether or not line numbers are shown on the
-            left side of the text editor.<br />
-          </td>
-          <td align="left" valign="top">
-            Off<br />
-          </td>
-        </tr>
-        <tr>
-          <td align="left" valign="top">
-
-            <div class="Para">
-              Show range indicator<br />
-            </div>
-          </td>
-          <td align="left" valign="top">
-            This option controls whether or not range indicators are shown in
-            the text editor.<br />
-          </td>
-          <td align="left" valign="top">
-
-            On<br />
-          </td>
-        </tr>
-        <tr>
-          <td class="c1">
-            Show whitespace characters<br />
-          </td>
-          <td class="c2">
-
-            This option controls whether to display whitespace characters in
-            text editors.<br />
-          </td>
-          <td class="c2">
-            Off<br />
-          </td>
-        </tr>
-        <tr>
-          <td class="c1">
-            Show affordance in hover on how to make it sticky<br />
-          </td>
-          <td class="c2">
-            This option controls whether to show an affordance in the hover on
-            how to make it sticky.<br />
-          </td>
-          <td class="c2">
-
-            On<br />
-          </td>
-        </tr>
-        <tr>
-          <td class="c1">
-
-            Enable drag and drop of text<br />
-          </td>
-          <td class="c2">
-            This option controls whether text drag and drop is enabled.<br />
-          </td>
-          <td class="c2">
-            On<br />
-
-          </td>
-        </tr>
-        <tr>
-          <td class="c1">
-            Warn before editing a derived file<br />
-          </td>
-          <td class="c2">
-            This option controls whether to warn if a derived file is going to
-            be edited.<br />
-
-          </td>
-          <td class="c2">
-            On<br />
-          </td>
-        </tr>
-        <tr>
-          <td class="c1">
-            Smart caret positioning at line start and end<br />
-
-          </td>
-          <td class="c2">
-            This option controls whether the editor automatically positions the
-            caret and the start or end of a line.<br />
-          </td>
-          <td class="c2">
-            On<br />
-          </td>
-        </tr>
-        <tr>
-          <td class="c1">
-            Show code minings for problem annotations:<br />
-          </td>
-          <td class="c2">
-            This option controls for which sevirities the
-						problem markers should be displayed as code minings
-						in text editors.<br />
-          </td>
-          <td class="c2">
-            None<br />
-          </td>
-        </tr>
-        <tr>
-          <td class="c1">
-            Maximum annotations shown<br />
-          </td>
-          <td class="c2">
-            This option controls the maximum number of problem
-            annotations to show as code mining (too high number
-            can have negative impact on performance).<br />
-          </td>
-          <td class="c2">
-            100<br />
-          </td>
-        </tr>
-        <tr>
-          <td class="c2" width="25%">
-            Appearance color options<br />
-          </td>
-          <td class="c2">
-
-            This option controls various appearance colors.<br />
-          </td>
-          <td class="c2">
-            <br />
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <h3 class="related">Related reference</h3>
-    <a href="../concepts/concepts-6.htm">Editor</a><br />
-  </body>
+  </style>
+</head>
+<body>
+  <h1 class="Head">Text Editors preference page</h1>
+  <p>The following preferences can be changed on the <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.GeneralTextEditor)")'>
+  <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>General &gt; Editors &gt;
+  Text Editors</strong></a> preference page.</p>
+  <h2>Appearance options</h2>
+  <table border="1" cellspacing="0" class="c3">
+    <tbody>
+      <tr>
+        <th width="25%">
+          <div class="Para">
+            Option
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Description
+          </div>
+        </th>
+        <th>
+          <div class="Para">
+            Default
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Undo history size<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option allows you to set the size of the undo history for text editors.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            200
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Displayed tab width<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option allows you to set the displayed tab width for text editors.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            4
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Insert spaces for tabs<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option allows you to insert space characters in place of tab characters.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            Off
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Remove multiple spaces on backspace/delete<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option allows you to set whether hitting backspace or delete in text editors deletes only 1 space
+            character (if <code>off</code>) or deletes as many space characters as defined in <em>Display tab
+            width</em> (if <code>on</code>).
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            Off
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Highlight current line<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option controls whether or the current line is highlighted or not.<br />
+          </div>
+        </td>
+        <td align="left" valign="top">On<br /></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Show print margin<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option controls whether the print margin is visible or not.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            Off
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Print margin column<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option allows you to set the print margin column position.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            80
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Allow editors to override the margin column<br />
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            This option tells whether editors are allowed to override the print margin column.
+          </div>
+        </td>
+        <td align="left" valign="top">
+          <div class="Para">
+            false
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Show line numbers<br />
+          </div>
+        </td>
+        <td align="left" valign="top">This option controls whether or not line numbers are shown on the left side of
+        the text editor.<br /></td>
+        <td align="left" valign="top">Off<br /></td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          <div class="Para">
+            Show range indicator<br />
+          </div>
+        </td>
+        <td align="left" valign="top">This option controls whether or not range indicators are shown in the text
+        editor.<br /></td>
+        <td align="left" valign="top">On<br /></td>
+      </tr>
+      <tr>
+        <td class="c1">Show whitespace characters<br /></td>
+        <td class="c2">This option controls whether to display whitespace characters in text editors.<br /></td>
+        <td class="c2">Off<br /></td>
+      </tr>
+      <tr>
+        <td class="c1">Show affordance in hover on how to make it sticky<br /></td>
+        <td class="c2">This option controls whether to show an affordance in the hover on how to make it
+        sticky.<br /></td>
+        <td class="c2">On<br /></td>
+      </tr>
+      <tr>
+        <td class="c1">Enable drag and drop of text<br /></td>
+        <td class="c2">This option controls whether text drag and drop is enabled.<br /></td>
+        <td class="c2">On<br /></td>
+      </tr>
+      <tr>
+        <td class="c1">Warn before editing a derived file<br /></td>
+        <td class="c2">This option controls whether to warn if a derived file is going to be edited.<br /></td>
+        <td class="c2">On<br /></td>
+      </tr>
+      <tr>
+        <td class="c1">Smart caret positioning at line start and end<br /></td>
+        <td class="c2">This option controls whether the editor automatically positions the caret and the start or end
+        of a line.<br /></td>
+        <td class="c2">On<br /></td>
+      </tr>
+      <tr>
+        <td class="c1">Show code minings for problem annotations:<br /></td>
+        <td class="c2">This option controls for which sevirities the problem markers should be displayed as code
+        minings in text editors.<br /></td>
+        <td class="c2">None<br /></td>
+      </tr>
+      <tr>
+        <td class="c1">Maximum annotations shown<br /></td>
+        <td class="c2">This option controls the maximum number of problem annotations to show as code mining (too high
+        number can have negative impact on performance).<br /></td>
+        <td class="c2">100<br /></td>
+      </tr>
+      <tr>
+        <td class="c2" width="25%">Appearance color options<br /></td>
+        <td class="c2">This option controls various appearance colors.<br /></td>
+        <td class="c2"><br /></td>
+      </tr>
+    </tbody>
+  </table>
+  <h3 class="related">Related reference</h3><a href="../concepts/concepts-6.htm">Editor</a><br />
+</body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-tracing_preference_page.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-tracing_preference_page.htm
index cc2198e..aa442e2 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-tracing_preference_page.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-tracing_preference_page.htm
@@ -1,34 +1,30 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2019. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>Tracing</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2019. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Tracing</title>
 </head>
 <body>
-
-<h1>Tracing</h1>
-
-<p>The <a class="command-link" 
-href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.trace.tracingPage)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> 
-<strong>General &gt; Tracing</strong></a> preference page allows you to modify the tracing options of plug-ins dynamically.</p>
-
-<p>Plug-ins may provide OSGi tracing options that write out additional logging information when the appropriate flag is set.  You
-can set tracing options using a <em>.options</em> file.  However, any changes to the flags require a restart.</p>
-
-<p>If a plug-in supports changing tracing options dynamically (without restarting) they will be listed on this preference page.  The
-changes will be made once <strong>OK</strong> is pressed.</p>
-
-<p>The <strong>Tracing output</strong> settings allow more control over where tracing messages are put.  A different output file
-can be chosen.  A new file will be created each time the plug-in is started.  If the maximum number of trace files stored has been
-reached, the oldest file will be deleted.  Setting a maximum trace file size prevents excessively large log files from being created.</p>
-
-<p>Not all plug-ins will write their trace messages to the output file.  Some plug-ins instead write to console output or
-perform other tasks.</p>
-
+  <h1>Tracing</h1>
+  <p>The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.trace.tracingPage)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg"
+  alt="command link"> <strong>General &gt; Tracing</strong></a> preference page allows you to modify the tracing
+  options of plug-ins dynamically.</p>
+  <p>Plug-ins may provide OSGi tracing options that write out additional logging information when the appropriate flag
+  is set. You can set tracing options using a <em>.options</em> file. However, any changes to the flags require a
+  restart.</p>
+  <p>If a plug-in supports changing tracing options dynamically (without restarting) they will be listed on this
+  preference page. The changes will be made once <strong>OK</strong> is pressed.</p>
+  <p>The <strong>Tracing output</strong> settings allow more control over where tracing messages are put. A different
+  output file can be chosen. A new file will be created each time the plug-in is started. If the maximum number of
+  trace files stored has been reached, the oldest file will be deleted. Setting a maximum trace file size prevents
+  excessively large log files from being created.</p>
+  <p>Not all plug-ins will write their trace messages to the output file. Some plug-ins instead write to console output
+  or perform other tasks.</p>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-uiresponsiveness_preference_page.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-uiresponsiveness_preference_page.htm
index 6bbb3a3..09c9df8 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-uiresponsiveness_preference_page.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-uiresponsiveness_preference_page.htm
@@ -1,55 +1,41 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2014, 2019. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
-<title>UI Responsiveness Monitoring</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2014, 2019. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>UI Responsiveness Monitoring</title>
 </head>
 <body>
-
-<h1>UI Responsiveness Monitoring</h1>
-
-<p>Sometimes you may encounter a long pause when the GUI does not redraw or respond to typing or
-mouse actions. Determining causes of such a UI freeze in most cases requires capturing stack traces
-of Eclipse threads. In case you are experiencing UI freezes and want to report the problem to
-the correct Eclipse project, you can enable <strong>UI Responsiveness Monitoring</strong>, which
-will automatically detect UI freezes, capture stack traces, and write warning or error messages
-containing the collected information to the Eclipse error log.</p>
-
-<p>The 
-<a class="command-link" 
-href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.monitoring.page)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> 
-<strong>General &gt; UI Responsiveness Monitoring</strong></a> preference page allows you to enable automatic
-detection of UI freezes and to modify parameters affecting freeze detection and logging.</p>
-
-<p>UI freezes longer than the warning threshold value entered in the preference page are logged to
-the Eclipse error log as warnings. The logged messages include one or more stack traces of
-the UI thread. Longer UI freezes are logged as errors and include stack traces of all threads.
-Please keep in mind that capturing stack traces of all threads involves extra
-overhead, so setting the error threshold below 1 second is not recommended.</p>
-
-<p>A UI freeze is logged at the end of the freeze or after the deadlock threshold has
-expired, whichever comes first. The latter condition facilitates logging of indefinite
-UI freezes caused by deadlocks. If Eclipse becomes completely unresponsive don't kill it until
-the deadlock threshold expires. The message containing stack traces of all threads will be written
-to the Eclipse error log.</p>
-
-<p>Logging of UI freezes is affected by two filters. One filter is used to avoid logging of
-UI freezes matching a specific pattern. A UI freeze is ignored if a stack trace of the UI thread
-contains at least one stack frame matching the filter. Another filter is used to avoid logging of
-non-UI threads with trivial stacks. The stack of a non-UI thread is not included in the logged
-message if all its stack frames match the filter. To add a stack frame to a filter, click
-the corresponding <strong>Add Filter...</strong> button and type the fully qualified method name
-of a stack frame to use as a filter.</p>
-
-<p>Please file bugs for the UI freezes you encounter, describe what you were doing at the time and
-include the messages and the stack traces from the error log related to the freezes. This way
-the corresponding Eclipse project can work on the UI freeze and improve your user experience
-with Eclipse.</p>
-
+  <h1>UI Responsiveness Monitoring</h1>
+  <p>Sometimes you may encounter a long pause when the GUI does not redraw or respond to typing or mouse actions.
+  Determining causes of such a UI freeze in most cases requires capturing stack traces of Eclipse threads. In case you
+  are experiencing UI freezes and want to report the problem to the correct Eclipse project, you can enable <strong>UI
+  Responsiveness Monitoring</strong>, which will automatically detect UI freezes, capture stack traces, and write
+  warning or error messages containing the collected information to the Eclipse error log.</p>
+  <p>The <a class="command-link" href=
+  'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.monitoring.page)")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg"
+  alt="command link"> <strong>General &gt; UI Responsiveness Monitoring</strong></a> preference page allows you to
+  enable automatic detection of UI freezes and to modify parameters affecting freeze detection and logging.</p>
+  <p>UI freezes longer than the warning threshold value entered in the preference page are logged to the Eclipse error
+  log as warnings. The logged messages include one or more stack traces of the UI thread. Longer UI freezes are logged
+  as errors and include stack traces of all threads. Please keep in mind that capturing stack traces of all threads
+  involves extra overhead, so setting the error threshold below 1 second is not recommended.</p>
+  <p>A UI freeze is logged at the end of the freeze or after the deadlock threshold has expired, whichever comes first.
+  The latter condition facilitates logging of indefinite UI freezes caused by deadlocks. If Eclipse becomes completely
+  unresponsive don't kill it until the deadlock threshold expires. The message containing stack traces of all threads
+  will be written to the Eclipse error log.</p>
+  <p>Logging of UI freezes is affected by two filters. One filter is used to avoid logging of UI freezes matching a
+  specific pattern. A UI freeze is ignored if a stack trace of the UI thread contains at least one stack frame matching
+  the filter. Another filter is used to avoid logging of non-UI threads with trivial stacks. The stack of a non-UI
+  thread is not included in the logged message if all its stack frames match the filter. To add a stack frame to a
+  filter, click the corresponding <strong>Add Filter...</strong> button and type the fully qualified method name of a
+  stack frame to use as a filter.</p>
+  <p>Please file bugs for the UI freezes you encounter, describe what you were doing at the time and include the
+  messages and the stack traces from the error log related to the freezes. This way the corresponding Eclipse project
+  can work on the UI freeze and improve your user experience with Eclipse.</p>
 </body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-workspaceswitch.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-workspaceswitch.htm
index 62134d0..85a6b67 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-workspaceswitch.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-workspaceswitch.htm
@@ -1,60 +1,32 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta name="copyright" content=
-    "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <title>
-      Switching workspaces
-    </title>
-    <script language="JavaScript" src=
-    "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript">
-</script>
-    <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type=
-    "text/css" />
-
-  </head>
-  <body>
-    <h1>
-      Switching workspaces
-    </h1>
-    <p>
-      The current workspace for Eclipse can be switched by using the
-      <strong>File-&gt;Switch Workspace</strong> command. If you have already
-      switched your workspace previously the previous workspaces will be
-      available for selection in the Switch Workspace menu.
-    </p>
-
-    <p>
-      The Switch Workspace --&gt; Other.. menu item will open the switch
-      workspace dialog. The dialog will allow you to browse for or manually
-      enter a new workspace location. The combo will also allow you to select
-      your previously selected workspaces.
-    </p>
-    <p>
-      <img src="../images/switch_workspace.png" width="438" height="274" alt=
-      "Picture of the workspace switcher dialog" />
-    </p>
-    <h2>
-      Settings Transfers
-    </h2>
-
-    <p>
-      When you switch your workspace you can select settings than will be
-      transferred to the new workspace. These settings are supplied by the
-      org.eclipse.ui.preferenceTransfer extension.
-    </p>
-    <p>
-      The SDK supplies transfers for:
-    </p>
-    <ul>
-      <li>Workspace Layout: Opened views, their size, and selected
-      perspectives.
-      </li>
-      <li>Working Sets: The user defined working sets.
-      </li>
-
-    </ul>
-  </body>
+<head>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <title>Switching workspaces</title>
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
+</head>
+<body>
+  <h1>Switching workspaces</h1>
+  <p>The current workspace for Eclipse can be switched by using the <strong>File-&gt;Switch Workspace</strong> command.
+  If you have already switched your workspace previously the previous workspaces will be available for selection in the
+  Switch Workspace menu.</p>
+  <p>The Switch Workspace --&gt; Other.. menu item will open the switch workspace dialog. The dialog will allow you to
+  browse for or manually enter a new workspace location. The combo will also allow you to select your previously
+  selected workspaces.</p>
+  <p><img src="../images/switch_workspace.png" width="438" height="274" alt=
+  "Picture of the workspace switcher dialog" /></p>
+  <h2>Settings Transfers</h2>
+  <p>When you switch your workspace you can select settings than will be transferred to the new workspace. These
+  settings are supplied by the org.eclipse.ui.preferenceTransfer extension.</p>
+  <p>The SDK supplies transfers for:</p>
+  <ul>
+    <li>Workspace Layout: Opened views, their size, and selected perspectives.</li>
+    <li>Working Sets: The user defined working sets.</li>
+  </ul>
+</body>
 </html>
diff --git a/bundles/org.eclipse.platform.doc.user/reference/welcome_preferences.htm b/bundles/org.eclipse.platform.doc.user/reference/welcome_preferences.htm
index 6d17ea2..9db67e5 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/welcome_preferences.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/welcome_preferences.htm
@@ -1,162 +1,104 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
 <head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2006, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-<title>Customize Welcome Dialog</title>
+  <meta name="copyright" content=
+  "Copyright (c) IBM Corporation and others 2006, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
+  <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script>
+  <title>Customize Welcome Dialog</title>
 </head>
 <body>
-
-<h1>Customize Welcome Dialog</h1>
-
-<P CLASS="Para">
-The Customize Welcome dialog which is opened using the "customize page" button above the Welcome screen allows you to modify the welcome appearance and
-content. You can select an overall theme, decide which pages will be available,
-and configure the order, layout, and visibility of the items within pages.
-</P>
-
-<p>
-<em>Note: The customize page button will only appear when the product is configured to use the
-Universal Welcome</em>.
-</p>
-
-<TABLE BORDER="1" cellspacing="0">
-<THEAD>
-<TR>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Option</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Description</P>
-</TH>
-<TH ROWSPAN="1" COLSPAN="1">
-<P CLASS="Para">
-Default</P>
-</TH>
-</TR>
-</THEAD>
-
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Home Page Theme</span></TH>
-<TH align="left">
-<span style="font-weight: 400">This option will change the overall appearance of welcome.</span>
-</TH>
-<TH align="left">
-<span style="font-weight: 400">Circles</span></TH>
-</TR>
-
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Root Pages</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Select the welcome pages you would like to see in welcome.</span>
-</TH>
-<TH align="left">
-<span style="font-weight: 400">Overview, Tutorials, Samples, What's New</span></TH>
-</TR>
-
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Apply settings to all products sharing this workbench</span></TH>
-<TH align="left">
-<span style="font-weight: 400">If you have multiple products sharing the same eclipse
-workbench, using this option will cause the changes for all of them, as opposed to
-only the currently running product.</span>
-</TH>
-<TH align="left">
-<span style="font-weight: 400">Off</span></TH>
-</TR>
-
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Save As...</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Converts the current preferences in this page to XML
-content compatible with the <code>introData.xml</code> format used to define the
-defaults for a product's welcome configuration. This is meant for product
-developers and assemblers, and is not needed by end users.</span>
-</TH>
-<TH align="left">
-<span style="font-weight: 400">N/A</span></TH>
-</TR>
-
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Available Extensions</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Items in this container will not be shown in the
-selected welcome page.</span>
-</TH>
-<TH align="left">
-<span style="font-weight: 400">N/A</span></TH>
-</TR>
-
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Left Column</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Items that should appear in the left half of the selected
-welcome page, arranged vertically from top to bottom. The bottom containers are explained
-below the table.</span>
-</TH>
-<TH align="left">
-<span style="font-weight: 400">N/A</span></TH>
-</TR>
-
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Right Column</span></TH>
-<TH align="left">
-<span style="font-weight: 400">Items that should appear in the right half of the selected
-welcome page, arranged vertically from top to bottom. The bottom containers are explained
-below the table.</span>
-</TH>
-<TH align="left">
-<span style="font-weight: 400">N/A</span></TH>
-</TR>
-
-<TR>
-<TH align="left">
-<span style="font-weight: 400">Importance</span></TH>
-<TH align="left">
-<span style="font-weight: 400">
-The importance is shown as an icon next to the item, and determines the item's
-importance relative to others. Themes may use this information to present the items
-differently, depending on their importance. To change the importance, click on the
-icon and a drop down menu will appear. The possible settings are:
-</span>
-<ul>
-<li><span style="font-weight: 400"><b>low</b> - The item will not be emphasized.</span></li>
-<li><span style="font-weight: 400"><b>medium</b> - The item will be given some emphasis.</span></li>
-<li><span style="font-weight: 400"><b>high</b> - The item will be strongly emphasized.</span></li>
-<li><span style="font-weight: 400"><b>new</b> - The item is new and will be presented as such.</span></li>
-<li><span style="font-weight: 400"><b>callout</b> - The item is of a different nature, or is special in some way (e.g. a video/animation)</span></li>
-</ul>
-</TH>
-<TH align="left">
-<span style="font-weight: 400">low</span></TH>
-</TR>
-</TABLE>
-
-<p>
-For each page, there are four quadrants in which to place items; two for each column.
-The quadrants will be separated in the presentation, and are used to classify
-distinct groups of items that should be kept separate from each other. If you do not
-want to separate items into four quadrants and only have columns, place all items
-in the top two quadrants.
-</p>
-
-<h3 class="related">Related concepts</h3>
-<a href="../concepts/welcome.htm">Welcome</a>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/welcome.htm">Customizing Welcome</a>
-
+  <h1>Customize Welcome Dialog</h1>
+  <p class="Para">The Customize Welcome dialog which is opened using the "customize page" button above the Welcome
+  screen allows you to modify the welcome appearance and content. You can select an overall theme, decide which pages
+  will be available, and configure the order, layout, and visibility of the items within pages.</p>
+  <p><em>Note: The customize page button will only appear when the product is configured to use the Universal
+  Welcome</em>.</p>
+  <table border="1" cellspacing="0">
+    <thead>
+      <tr>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Option</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Description</p>
+        </th>
+        <th rowspan="1" colspan="1">
+          <p class="Para">Default</p>
+        </th>
+      </tr>
+    </thead>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Home Page Theme</span></th>
+      <th align="left"><span style="font-weight: 400">This option will change the overall appearance of
+      welcome.</span></th>
+      <th align="left"><span style="font-weight: 400">Circles</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Root Pages</span></th>
+      <th align="left"><span style="font-weight: 400">Select the welcome pages you would like to see in
+      welcome.</span></th>
+      <th align="left"><span style="font-weight: 400">Overview, Tutorials, Samples, What's New</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Apply settings to all products sharing this workbench</span></th>
+      <th align="left"><span style="font-weight: 400">If you have multiple products sharing the same eclipse workbench,
+      using this option will cause the changes for all of them, as opposed to only the currently running
+      product.</span></th>
+      <th align="left"><span style="font-weight: 400">Off</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Save As...</span></th>
+      <th align="left"><span style="font-weight: 400">Converts the current preferences in this page to XML content
+      compatible with the <code>introData.xml</code> format used to define the defaults for a product's welcome
+      configuration. This is meant for product developers and assemblers, and is not needed by end users.</span></th>
+      <th align="left"><span style="font-weight: 400">N/A</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Available Extensions</span></th>
+      <th align="left"><span style="font-weight: 400">Items in this container will not be shown in the selected welcome
+      page.</span></th>
+      <th align="left"><span style="font-weight: 400">N/A</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Left Column</span></th>
+      <th align="left"><span style="font-weight: 400">Items that should appear in the left half of the selected welcome
+      page, arranged vertically from top to bottom. The bottom containers are explained below the table.</span></th>
+      <th align="left"><span style="font-weight: 400">N/A</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Right Column</span></th>
+      <th align="left"><span style="font-weight: 400">Items that should appear in the right half of the selected
+      welcome page, arranged vertically from top to bottom. The bottom containers are explained below the
+      table.</span></th>
+      <th align="left"><span style="font-weight: 400">N/A</span></th>
+    </tr>
+    <tr>
+      <th align="left"><span style="font-weight: 400">Importance</span></th>
+      <th align="left">
+        <span style="font-weight: 400">The importance is shown as an icon next to the item, and determines the item's
+        importance relative to others. Themes may use this information to present the items differently, depending on
+        their importance. To change the importance, click on the icon and a drop down menu will appear. The possible
+        settings are:</span>
+        <ul>
+          <li><span style="font-weight: 400"><b>low</b> - The item will not be emphasized.</span></li>
+          <li><span style="font-weight: 400"><b>medium</b> - The item will be given some emphasis.</span></li>
+          <li><span style="font-weight: 400"><b>high</b> - The item will be strongly emphasized.</span></li>
+          <li><span style="font-weight: 400"><b>new</b> - The item is new and will be presented as such.</span></li>
+          <li><span style="font-weight: 400"><b>callout</b> - The item is of a different nature, or is special in some
+          way (e.g. a video/animation)</span></li>
+        </ul>
+      </th>
+      <th align="left"><span style="font-weight: 400">low</span></th>
+    </tr>
+  </table>
+  <p>For each page, there are four quadrants in which to place items; two for each column. The quadrants will be
+  separated in the presentation, and are used to classify distinct groups of items that should be kept separate from
+  each other. If you do not want to separate items into four quadrants and only have columns, place all items in the
+  top two quadrants.</p>
+  <h3 class="related">Related concepts</h3><a href="../concepts/welcome.htm">Welcome</a>
+  <h3 class="related">Related tasks</h3><a href="../tasks/welcome.htm">Customizing Welcome</a>
 </body>
 </html>