diff --git a/README.md b/README.md
index fe58c2f3ca..a5b7346c04 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 - Search functionality.
 - Geo-location support.
 - Supports multiple languages
+- External editor support - open notes in your favorite external editor with one click in Joplin.
 
 # Importing
 
diff --git a/readme/faq.md b/readme/faq.md
index 5367d0c0c2..059ff89442 100644
--- a/readme/faq.md
+++ b/readme/faq.md
@@ -1,3 +1,32 @@
+# Clicking 'Edit in External Editor' does nothing! / I want to change the editor!
+
+The editor command (may include arguments) defines which editor will be used to open a note. If none is provided it will try to auto-detect the default editor. If this does nothing or you want to change it for Joplin, you need to configure it in Settings -> Text editor command.
+
+Some example configurations are: (comments after #)
+
+Linux/Mac:
+
+```bash
+subl -n       # Opens Sublime (subl) in a new window (-n)
+code -n       # Opens Visual Studio Code (code) in a new window (-n)
+gedit --new-window    # Opens gedit (Gnome Text Editor) in a new window
+xterm -e vim  # Opens a new terminal and opens vim. Can be replaced with an
+              # alternative terminal (gnome-terminal, terminator, etc.) 
+              # or terminal text-editor (emacs, nano, etc.)
+open -a <application> # Mac only: opens a GUI application
+```
+
+Windows:
+
+```bash
+subl.exe -n   # Opens Sublime (subl) in a new window (-n)
+code.exe -n   # Opens Visual Studio Code in a new window (-n)
+notepad.exe   # Opens Notepad in a new window
+notepad++.exe --openSession   # Opens Notepad ++ in new window
+```
+
+Note that the path to directory with your editor executable must exist in your PATH variable ([Windows](https://www.computerhope.com/issues/ch000549.htm), [Linux/Mac](https://opensource.com/article/17/6/set-path-linux)) If not, the full path to the executable must be provided.
+
 # When I open a note in vim, the cursor is not visible
 
 It seems to be due to the setting `set term=ansi` in .vimrc. Removing it should fix the issue. See https://github.com/laurent22/joplin/issues/147 for more information.
@@ -57,4 +86,4 @@ As of now, Joplin is not compatible with the Nginx WebDAV server: https://github
 
 # Why is it named Joplin?
 
-The name comes from the composer and pianist [Scott Joplin](https://en.wikipedia.org/wiki/Scott_Joplin), which I often listen to. His name is also easy to remember and type so it fell like a good choice. And, to quote a user on Hacker News, "though Scott Joplin's ragtime musical style has a lot in common with some very informal music, his own approach was more educated, sophisticated, and precise. Every note was in its place for a reason, and he was known to prefer his pieces to be performed exactly as written. So you could say that compared to the people who came before him, his notes were more organized".
\ No newline at end of file
+The name comes from the composer and pianist [Scott Joplin](https://en.wikipedia.org/wiki/Scott_Joplin), which I often listen to. His name is also easy to remember and type so it fell like a good choice. And, to quote a user on Hacker News, "though Scott Joplin's ragtime musical style has a lot in common with some very informal music, his own approach was more educated, sophisticated, and precise. Every note was in its place for a reason, and he was known to prefer his pieces to be performed exactly as written. So you could say that compared to the people who came before him, his notes were more organized".