diff --git a/topics/basics/faq.md b/topics/basics/faq.md
index 129dcec19..35485c0c7 100644
--- a/topics/basics/faq.md
+++ b/topics/basics/faq.md
@@ -86,7 +86,6 @@ This FAQ is a topical index of questions that have been asked (and answered) on
 ## Custom Languages
 *  [How do I provide auto-popup code completion in my language?](https://intellij-support.jetbrains.com/hc/en-us/community/posts/206139359-Autopopup-code-completion-in-custom-language)
 *  [How to make a closing brace unindent?](https://intellij-support.jetbrains.com/hc/en-us/community/posts/206797085-Custom-Language-How-to-make-a-closing-brace-unindent-)
-*  [How to automatically insert closing quotes?](https://intellij-support.jetbrains.com/hc/en-us/community/posts/206144059-How-the-insertion-of-closing-quote-works-in-Javascript-plugin-)
 *  [How do I enable debugging for my custom language which is compiled into Java?](https://intellij-support.jetbrains.com/hc/en-us/community/posts/206786875-Debugging-custom-languages-)
 *  [How do I generate virtual Java classes mirroring the classes of my language?](https://intellij-support.jetbrains.com/hc/en-us/community/posts/206143749-Custom-languages-masquarding-as-a-java-source-file-within-IntelliJ)
 
diff --git a/topics/reference_guide/custom_language_support/additional_minor_features.md b/topics/reference_guide/custom_language_support/additional_minor_features.md
index cceb8712e..96be3b50f 100644
--- a/topics/reference_guide/custom_language_support/additional_minor_features.md
+++ b/topics/reference_guide/custom_language_support/additional_minor_features.md
@@ -29,6 +29,13 @@ Certain types of braces can be marked as structural.
 Structural braces have higher priority than regular braces: they are matched with each other even if there are unmatched braces of different types between them.
 An opening non-structural brace is not matched with a closing one if one of them is inside a pair of matched structural braces and another is outside.
 
+### Quote Handling
+
+EP: `com.intellij.lang.quoteHandler`
+
+To support _Insert pair quote_ feature, provide [`QuoteHandler`](upsource:///platform/lang-impl/src/com/intellij/codeInsight/editorActions/QuoteHandler.java).
+In most cases, [`SimpleTokenSetQuoteHandler`](upsource:///platform/lang-impl/src/com/intellij/codeInsight/editorActions/SimpleTokenSetQuoteHandler.java) base implementation will be suitable.
+
 ### Comment Code
 
 EP: `com.intellij.lang.commenter`