diff --git a/Documentation/faq/index.rst b/Documentation/faq/index.rst
index 1d8302c177..d111001ae7 100644
--- a/Documentation/faq/index.rst
+++ b/Documentation/faq/index.rst
@@ -8,6 +8,65 @@ FAQ
 NSH Tricks
 ==========
 
+How to increase the command line length?
+----------------------------------------
+
+You can increase the Max command line length from 64 to other value,
+this way:
+
+Application Configuration  --->
+        NSH Library  --->
+            Command Line Configuration  --->
+                (64) Max command line length
+
+How do I enable editing support on the command line?
+----------------------------------------------------
+
+You need to change Command Line Editor from "Minimal readline" to
+"Command Line Editor", this way:
+
+    Application Configuration  --->
+        NSH Library  --->
+            Command Line Configuration  --->
+                Command Line Editor (Command Line Editor)  --->
+
+How to enable command line history?
+-----------------------------------
+
+You need to enable these options in the menuconfig:
+
+    Application Configuration  --->
+        System Libraries and NSH Add-Ons  --->
+            -*- readline() Support  --->
+                [*]     Command line history
+                (80)      Command line history length
+                (16)      Command line history records
+
+Note: If you are using the "Command Line Editor" instead of the "readline"
+then you need to use this other option:
+
+    Application Configuration  --->
+        System Libraries and NSH Add-Ons  --->
+            -*- EMACS-like Command Line Editor  --->
+                	[*]   Command line history
+                	(80)    Command line history length
+                	(16)    Command line history records
+
+How to enable autocomplete on the command line?
+-----------------------------------------------
+
+You need to enable these options in the menuconfig:
+
+    Application Configuration  --->
+        System Libraries and NSH Add-Ons  --->
+            -*- readline() Support  --->
+                [*]     Tab completion
+                (64)      Maximum built-in matches
+                (64)      Maximum external command matches
+
+Note: autocomplete is not enabled when "Command Line Editor" instead of the
+"readline".
+
 How to interrupt an NSH Application using Ctrl^C ?
 --------------------------------------------------