From 4e22083bf705285ca9c19949ed678defd6501998 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 13 Jun 2017 15:20:43 +0200
Subject: [PATCH] Minor tweaks in Tramp manual

* doc/misc/trampver.texi: Add prefixwithspace flag.

* doc/misc/tramp.texi (Password handling): Harmonize example.
(File name completion): Use prefixwithspace flag.
(Frequently Asked Questions): Explain `tramp-histfile-override'.
---
 doc/misc/tramp.texi    | 24 ++++++++++++++++++------
 doc/misc/trampver.texi |  2 ++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 38b63715b51..a42dc6ed3c0 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -1507,7 +1507,7 @@ The port can take any @value{tramp} method (@pxref{Inline methods},
 file name syntax, must be appended to the machine and login items:
 
 @example
-machine melancholia#4711 port davs login daniel%DOMAIN password geheim
+machine melancholia#4711 port davs login daniel%BIZARRE password geheim
 @end example
 
 @vindex auth-source-debug
@@ -2276,7 +2276,7 @@ in @file{.emacs}.
 @xref{Completion Options, , , emacs}.
 @end ifinfo
 
-For example, type @kbd{C-x C-f @value{prefix}s @key{TAB}},
+For example, type @kbd{C-x C-f @value{prefixwithspace} s @key{TAB}},
 @value{tramp} completion choices show up as
 
 @example
@@ -3160,10 +3160,22 @@ then set them with a hook as follows:
 @item
 Why is @file{~/.sh_history} file on the remote host growing?
 
-Due to @command{ksh} saving tilde expansions triggered by
-@value{tramp}, the history file is probably growing rapidly.  To fix,
-turn off saving history by putting this shell code in the
-@file{.kshrc} file:
+Due to the remote shell saving tilde expansions triggered by
+@value{tramp}, the history file is probably growing rapidly.
+@value{tramp} can suppress this behaviour with the user option
+@code{tramp-histfile-override}.  When set to @code{t}, environment
+variable @env{HISTFILE} is unset, and environment variables
+@env{HISTFILESIZE} @env{HISTSIZE} are set to 0.
+
+Alternatively, @code{tramp-histfile-override} could be a string.
+Environment variable @env{HISTFILE} is set to this file name then.  Be
+careful when setting to @file{/dev/null}; this might result in
+undesired results when using @command{bash} as remote shell.
+
+Another approach is to disable @value{tramp}'s handling of the
+@env{HISTFILE} at all by setting @code{tramp-histfile-override} to
+@code{nil}.  In this case, saving history could be turned off by
+putting this shell code in the @file{.bashrc} or @file{.kshrc} file:
 
 @example
 @group
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 70701aa3589..f1cb60b9d25 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -27,6 +27,7 @@
 
 @ifset unified
 @set prefix             /
+@set prefixwithspace    /
 @set prefixhop
 @set postfix            :
 @set postfixhop         :
@@ -36,6 +37,7 @@
 
 @ifset separate
 @set prefix             /[
+@set prefixwithspace    / [
 @set prefixhop          [
 @set postfix            ]
 @set postfixhop         /
-- 
2.39.2