diff --git a/org.eclipse.jdt.core/buildnotes_jdt-core.html b/org.eclipse.jdt.core/buildnotes_jdt-core.html
index 6f7abed..117cbd0 100644
--- a/org.eclipse.jdt.core/buildnotes_jdt-core.html
+++ b/org.eclipse.jdt.core/buildnotes_jdt-core.html
@@ -53,7 +53,7 @@
 Added a new preference to force the formatter to try to keep nested expressions on one line.
 <p>
 This new preference is controlled with the option:</p>
-<code>DefaultCodeFormatterConstants.FORMATTER_KEEP_NESTED_EXPRESSIONS_ON_ONE_LINE</code>
+<code>DefaultCodeFormatterConstants.FORMATTER_WRAP_OUTER_EXPRESSIONS_WHEN_NESTED</code>
 <pre>
 /**
  * FORMATTER / Option to wrap outer expressions in nested expressions
@@ -85,7 +85,7 @@
  *
  * Important notes:
  * 1. This new behavior is automatically activated (ie. the default value for this preference is {@link #TRUE}).
- *    If the backward compatibility regarding previous versions formatter behavior (ie. before 3.6 version) is necessary,
+ *    If the backward compatibility regarding previous versions' formatter behavior (ie. before 3.6 version) is necessary,
  *    then the preference needs to be set to {@link #FALSE} to retrieve the previous formatter behavior.
  * 2. The new strategy currently only applies to nested method calls, but might be extended to other nested expressions in future versions
  * 
diff --git a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java
index a1cd81b..9cce6d9 100644
--- a/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java
+++ b/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java
@@ -3533,7 +3533,7 @@
 	 * <p><b><u>Important notes</u></b>:</p>
 	 * <ol>
 	 * <li>This new behavior is automatically activated (ie. the default value for this preference is {@link #TRUE}).
-	 * If the backward compatibility regarding previous versions formatter behavior (ie. before 3.6 version) is necessary,
+	 * If the backward compatibility regarding previous versions' formatter behavior (ie. before 3.6 version) is necessary,
 	 * then the preference needs to be set to {@link #FALSE} to retrieve the previous formatter behavior.</li>
 	 * <li>The new strategy currently only applies to nested method calls, but might be extended to other nested expressions in future versions</li>
 	 * </ol>