diff --git a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/debug/ref-debug.htm b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/debug/ref-debug.htm
index f8dd925..6a5cd09 100644
--- a/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/debug/ref-debug.htm
+++ b/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/debug/ref-debug.htm
@@ -62,10 +62,8 @@
           </td>
 
           <td colspan="1" valign="top" align="left">
-            <p>
               This option controls if a program will suspend if an uncaught
               exception is thrown.
-            </p>
             <p>
               For example if you try to call a method on a null object and a
               NullPointerException is thrown, with this option on your program
@@ -95,7 +93,7 @@
             Suspend for breakpoints during evaluations
           </td>
           <td colspan="1" valign="top" align="left">
-            This options controls if breakpoints will suspend during an
+            This option controls if breakpoints will suspend during an
             evaluation of code containing a breakpoint. For more information
             about evaluations go <a href=
             "../../../../tasks/task-evaluating_expressions.htm">here</a>
@@ -153,7 +151,7 @@
             Show error when hot code replace fails
           </td>
           <td colspan="1" valign="top" align="left">
-            This option controls if the user will be presented with an error
+            This option controls if you will be presented with an error
             dialog when a hot code replace fails
           </td>
 
@@ -166,9 +164,9 @@
             Show error when hot code replace is not supported
           </td>
           <td colspan="1" valign="top" align="left">
-            This option controls if the user will be presented with an error
-            dialog when hot code replace is not supported, and the user has
-            made and saved changes to currently running code
+            This option controls if you will be presented with an error
+            dialog when hot code replace is not supported. This can happen after you have
+            made and saved changes to currently running code.
           </td>
 
           <td colspan="1" valign="top" align="left">
@@ -180,7 +178,7 @@
             Show error when obsolete methods remain after hot code replace
           </td>
           <td colspan="1" valign="top" align="left">
-            This option controls if the user will be presented with an error
+            This option controls if you will be presented with an error
             dialog when a hot code replace completed, but there were obsolete
             methods left over
           </td>
@@ -238,7 +236,7 @@
             attributes
           </td>
           <td colspan="1" valign="top" align="left">
-            This option controls if the user will be notified if they try to
+            This option controls if you will be notified when you try to
             set a line breakpoint on a line that has invalid line information
           </td>
 
@@ -248,10 +246,10 @@
         </tr>
         <tr>
           <td colspan="1" valign="top" align="left">
-            Prompt for confirmation when deleting a conditrional breakpoint from the editor
+            Prompt for confirmation when deleting a conditional breakpoint from editor
           </td>
           <td colspan="1" valign="top" align="left">
-            This option controls if clients should be prompted when trying to remove a breakpoint with a condition from the editor
+            This option controls if you should be asked whether you really want to remove a breakpoint with a condition from the editor
           </td>
           <td colspan="1" valign="top" align="left">
             On
@@ -262,7 +260,18 @@
             Do not install breakpoints from unrelated projects
           </td>
           <td colspan="1" valign="top" align="left">
-            This option controls if breakpoints should not be installed from unrelated projects
+            Multiple versions of the same Java type can be available in a workspace, and each version can
+            have breakpoints configured at different source locations. When debugging, JDT tries to
+            determine the "right" set of breakpoints to install in the target VM. This analysis
+            now uses Java project dependencies by default.
+            <p>
+            To always install all enabled breakpoints, you can disable this option.
+            </p>
+            <p>
+            Note that not all projects use explicit Java project dependencies. E.g. OSGi bundles
+            typically use a dynamically computed classpath where project dependencies are computed
+            by PDE.
+            </p>
           </td>
           <td colspan="1" valign="top" align="left">
             On