diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/META-INF/MANIFEST.MF b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/META-INF/MANIFEST.MF
index ef9f7f2b2eb..a477bc87951 100644
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/META-INF/MANIFEST.MF
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.doc.user; singleton:=true
-Bundle-Version: 3.15.2500.qualifier
+Bundle-Version: 3.15.2600.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml
index 8c17c24b90d..5ee141e0647 100644
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.doc.user</artifactId>
-  <version>3.15.2500-SNAPSHOT</version>
+  <version>3.15.2600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-folding.htm b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-folding.htm
index 088a5ecc0d2..68baab4a99f 100644
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-folding.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/reference/preferences/java/editor/ref-preferences-folding.htm
@@ -91,6 +91,17 @@ <h1>Java Editor Folding Preferences</h1>
 			<p>On</p>
 			</td>
 		</tr>
+		<tr>
+			<td valign="top">
+			<p>Custom Folding regions</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, custom folding regions are folded when opening a new editor.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
 		<tr>
 			<td valign="top">
 			<p>Extended folding (experimental) \ Activate feature</p>
@@ -102,8 +113,45 @@ <h1>Java Editor Folding Preferences</h1>
 			<p>Off</p>
 			</td>
 		</tr>
+		<tr>
+			<td valign="top">
+			<p>Custom folding regions \ Enable folding of custom regions</p>
+			</td>
+			<td valign="top">
+			<p>If enabled, custom regions can be folded in the editor.</p>
+			</td>
+			<td valign="top">
+			<p>Off</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Custom folding regions \ Text marking start of region</p>
+			</td>
+			<td valign="top">
+			<p>Comments starting with the content of this option indicate the start of custom folding regions.</p>
+			</td>
+			<td valign="top">
+			<p>region</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+			<p>Custom folding regions \ Text marking end of region</p>
+			</td>
+			<td valign="top">
+			<p>Comments starting with the content of this option indicate the end of custom folding regions.</p>
+			</td>
+			<td valign="top">
+			<p>endregion</p>
+			</td>
+		</tr>
 	</tbody>
 </table>
+<p>
+Custom folding regions allow creating regions to fold using a marker text for the start and end of the region in a comment.
+Leaving the fields for the start or end markers empty disables this feature.
+</p>
 <h3 class="related">Related References</h3>
 <a href="../ref-preferences-editor.htm">Java Editor preference page</a>
 </body>