2 files changed, 12 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 68f748f595e..ded23868c79 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-06  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Frequently Asked Questions): Mention HISTFILE
+        setting in ~/.ssh/environment.
+
 2014-05-02  Stephen Berman  <stephen.berman@gmx.net>
 
         * todo-mode.texi: Update, improve exposition, add cross
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index c0a6156a4cf..292a1e47452 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3351,6 +3351,13 @@ if [ "$@{HISTSIZE-unset@}" != "unset" ] ; then
 fi
 @end example
 
+Furthermore, if you use an @option{ssh}-based method, you could add
+the following line to your @file{~/.ssh/environment} file:
+
+@example
+HISTFILE=/dev/null
+@end example
+
 
 @item There are longish file names to type.  How to shorten this?