diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_scalability_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_scalability_preferences.png
index 529f94196c8..b65bd010f7d 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_scalability_preferences.png and b/doc/org.eclipse.cdt.doc.user/images/editor_scalability_preferences.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
index bd2fb26d32c..82d858c09b3 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
@@ -63,6 +63,17 @@
 			<td headers="option"><strong>Disable content assist auto-activation</strong></td>
 			<td headers="description">If enabled, content assist will not be activated automatically on trigger sequences, like '.', '::' or '->'.</td>
 		</tr>
+		<tr>
+			<td headers="option"><strong>Skip trivial expressions in initializer lists</strong></td>
+			<td headers="description">If enabled, trivial initializers in initializer lists are skipped while parsing. 
+			This improves parsing and indexing performance when very large initializer lists are present.</td>
+		</tr>
+		<tr>
+			<td headers="option"><strong>Maximum number of trivial expressions in initializer lists to parse</strong></td>
+			<td headers="description">Specifies the maximum number of trivial initializers in initializer lists to parse. 
+			Any trivial initializer-clauses beyond that number are skipped. 
+			This option is only available if <i>Skip trivial expressions in initializer lists</i> is enabled.</td>
+		</tr>
 	</tbody>
 </table>