diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsProvider.java b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsProvider.java
index 7ea36976b846..6844105de30b 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsProvider.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsProvider.java
@@ -19,7 +19,7 @@ package com.intellij.application.options.editor;
 import com.intellij.openapi.options.UnnamedConfigurable;
 
 /**
- * Register implementation of this interface in the plugin.xml:
+ * Register implementation of this interface in the plugin.xml to provide additional options in Editor | Auto Import section:
  * <p/>
  * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
  * &nbsp;&nbsp;&lt;autoImportOptionsProvider instance="class-name"/&gt;<br>
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsProviderEP.java b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsProviderEP.java
index 69a22851460e..879c3fee3323 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsProviderEP.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsProviderEP.java
@@ -19,6 +19,14 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.options.AbstractConfigurableEP;
 
 /**
+ * Register implementation of {@link AutoImportOptionsProvider} in the plugin.xml to provide additional options in Editor | Auto Import section:
+ * <p/>
+ * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
+ * &nbsp;&nbsp;&lt;autoImportOptionsProvider instance="class-name"/&gt;<br>
+ * &lt;/extensions&gt;
+ * <p>
+ * A new instance of the specified class will be created each time then the Settings dialog is opened
+ *
  * @author nik
  */
 public class AutoImportOptionsProviderEP extends AbstractConfigurableEP<AutoImportOptionsProvider> {
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProvider.java b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProvider.java
index 262c50ec45ba..57c04e59c7e8 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProvider.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProvider.java
@@ -23,7 +23,7 @@ package com.intellij.application.options.editor;
 import com.intellij.openapi.options.UnnamedConfigurable;
 
 /**
- * Register implementation of this interface in the plugin.xml:
+ * Register implementation of this interface in the plugin.xml to provide additional options in Editor | Code Folding section:
  * <p/>
  * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
  * &nbsp;&nbsp;&lt;codeFoldingOptionsProvider instance="class-name"/&gt;<br>
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProviderEP.java b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProviderEP.java
index 331c9813cbed..6f31a3f331de 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProviderEP.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingOptionsProviderEP.java
@@ -19,6 +19,14 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.options.AbstractConfigurableEP;
 
 /**
+ * Register implementation of {@link CodeFoldingOptionsProvider} in the plugin.xml to provide additional options in Editor | Code Folding section:
+ * <p/>
+ * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
+ * &nbsp;&nbsp;&lt;codeFoldingOptionsProvider instance="class-name"/&gt;<br>
+ * &lt;/extensions&gt;
+ * <p>
+ * A new instance of the specified class will be created each time then the Settings dialog is opened
+
  * @author nik
  */
 public class CodeFoldingOptionsProviderEP extends AbstractConfigurableEP<CodeFoldingOptionsProvider> {
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java
index 409f23d540cb..984ea42c7623 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java
@@ -37,7 +37,7 @@ import java.awt.event.ActionListener;
 import java.util.List;
 
 /**
- * To provide an additional settings editor register implementation of {@link com.intellij.openapi.options.UnnamedConfigurable} in the plugin.xml:
+ * To provide additional options in Editor | Appearance section register implementation of {@link com.intellij.openapi.options.UnnamedConfigurable} in the plugin.xml:
  * <p/>
  * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
  * &nbsp;&nbsp;&lt;editorAppearanceConfigurable instance="class-name"/&gt;<br>
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurableEP.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurableEP.java
index c4424f8a9b12..2aaef3f00350 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurableEP.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurableEP.java
@@ -19,6 +19,15 @@ import com.intellij.openapi.options.AbstractConfigurableEP;
 import com.intellij.openapi.options.UnnamedConfigurable;
 
 /**
+ * To provide additional options in Editor | Appearance section register implementation of
+ * {@link com.intellij.openapi.options.UnnamedConfigurable} in the plugin.xml:
+ * <p/>
+ * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
+ * &nbsp;&nbsp;&lt;editorAppearanceConfigurable instance="class-name"/&gt;<br>
+ * &lt;/extensions&gt;
+ * <p>
+ * A new instance of the specified class will be created each time then the Settings dialog is opened
+ *
  * @author nik
  */
 public class EditorAppearanceConfigurableEP extends AbstractConfigurableEP<UnnamedConfigurable> {
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsProvider.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsProvider.java
index 79a50589ac50..b4dd79918d81 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsProvider.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsProvider.java
@@ -23,7 +23,7 @@ package com.intellij.application.options.editor;
 import com.intellij.openapi.options.SearchableConfigurable;
 
 /**
- * Register implementation of this interface in the plugin.xml:
+ * Register implementation of this interface in the plugin.xml to provide sub-section of Editor section in the Settings dialog:
  * <p/>
  * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
  * &nbsp;&nbsp;&lt;editorOptionsProvider instance="class-name"/&gt;<br>
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsProviderEP.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsProviderEP.java
index 6d9ea8c8260a..e74f823d8dd5 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsProviderEP.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorOptionsProviderEP.java
@@ -19,6 +19,14 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.options.AbstractConfigurableEP;
 
 /**
+ * Register implementation of {@link EditorOptionsProvider} in the plugin.xml to provide sub-section of Editor section in the Settings dialog:
+ * <p/>
+ * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
+ * &nbsp;&nbsp;&lt;editorOptionsProvider instance="class-name"/&gt;<br>
+ * &lt;/extensions&gt;
+ * <p>
+ * A new instance of the specified class will be created each time then the Settings dialog is opened
+ *
  * @author nik
  */
 public class EditorOptionsProviderEP extends AbstractConfigurableEP<EditorOptionsProvider> {
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java
index 1212010995a1..62a83ec2cbdf 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java
@@ -37,7 +37,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * To provide an additional settings editor register implementation of {@link com.intellij.openapi.options.UnnamedConfigurable} in the plugin.xml:
+ * To provide additional options in Editor | Smart Keys section register implementation of {@link com.intellij.openapi.options.UnnamedConfigurable} in the plugin.xml:
  * <p/>
  * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
  * &nbsp;&nbsp;&lt;editorSmartKeysConfigurable instance="class-name"/&gt;<br>
diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurableEP.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurableEP.java
index 2f73f5072ce0..6525aa098168 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurableEP.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurableEP.java
@@ -19,6 +19,15 @@ import com.intellij.openapi.options.AbstractConfigurableEP;
 import com.intellij.openapi.options.UnnamedConfigurable;
 
 /**
+ * To provide additional options in Editor | Smart Keys section register implementation of
+ * {@link com.intellij.openapi.options.UnnamedConfigurable} in the plugin.xml:
+ * <p/>
+ * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
+ * &nbsp;&nbsp;&lt;editorSmartKeysConfigurable instance="class-name"/&gt;<br>
+ * &lt;/extensions&gt;
+ * <p>
+ * A new instance of the specified class will be created each time then the Settings dialog is opened
+ *
  * @author nik
  */
 public class EditorSmartKeysConfigurableEP extends AbstractConfigurableEP<UnnamedConfigurable> {
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ErrorOptionsProvider.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ErrorOptionsProvider.java
index 41efb0477c82..48922f6a5d11 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ErrorOptionsProvider.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ErrorOptionsProvider.java
@@ -23,7 +23,7 @@ package com.intellij.profile.codeInspection.ui;
 import com.intellij.openapi.options.UnnamedConfigurable;
 
 /**
- * Register implementation of this interface in the plugin.xml:
+ * Register implementation of this interface in the plugin.xml to provide additional options in Editor | "Error highlighting" section:
  * <p/>
  * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
  * &nbsp;&nbsp;&lt;errorOptionsProvider instance="class-name"/&gt;<br>
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ErrorOptionsProviderEP.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ErrorOptionsProviderEP.java
index b272a7677620..b26310556fb2 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ErrorOptionsProviderEP.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ErrorOptionsProviderEP.java
@@ -19,6 +19,14 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.options.AbstractConfigurableEP;
 
 /**
+ * Register implementation of {@link ErrorOptionsProvider} in the plugin.xml to provide additional options in Editor | "Error highlighting" section:
+ * <p/>
+ * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
+ * &nbsp;&nbsp;&lt;errorOptionsProvider instance="class-name"/&gt;<br>
+ * &lt;/extensions&gt;
+ * <p>
+ * A new instance of the specified class will be created each time then the Settings dialog is opened
+ *
  * @author nik
  */
 public class ErrorOptionsProviderEP extends AbstractConfigurableEP<ErrorOptionsProvider> {
diff --git a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
index 4b13600db805..baf6dab0a496 100644
--- a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
@@ -28,7 +28,7 @@ import java.awt.*;
 import java.util.List;
 
 /**
- * To provide an additional settings editor register implementation of {@link com.intellij.openapi.options.SearchableConfigurable} in the plugin.xml:
+ * To provide additional options in General section register implementation of {@link com.intellij.openapi.options.SearchableConfigurable} in the plugin.xml:
  * <p/>
  * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
  * &nbsp;&nbsp;&lt;generalOptionsProvider instance="class-name"/&gt;<br>
diff --git a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurableEP.java b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurableEP.java
index 2638855cf174..dd63f535adf3 100644
--- a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurableEP.java
+++ b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurableEP.java
@@ -19,6 +19,14 @@ import com.intellij.openapi.options.AbstractConfigurableEP;
 import com.intellij.openapi.options.SearchableConfigurable;
 
 /**
+ * To provide additional options in General section register implementation of {@link com.intellij.openapi.options.SearchableConfigurable} in the plugin.xml:
+ * <p/>
+ * &lt;extensions defaultExtensionNs="com.intellij"&gt;<br>
+ * &nbsp;&nbsp;&lt;generalOptionsProvider instance="class-name"/&gt;<br>
+ * &lt;/extensions&gt;
+ * <p>
+ * A new instance of the specified class will be created each time then the Settings dialog is opened
+ *
  * @author nik
  */
 public class GeneralSettingsConfigurableEP extends AbstractConfigurableEP<SearchableConfigurable> {