From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 28 Apr 2008 19:40:43 +0000 (+0000)
Subject: * tramp.texi (Frequently Asked Questions): Explain, how to disable
X-Git-Tag: emacs-pretest-23.0.90~5978
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=586b90f1ff736f76d689639f04605e7626087b20;p=emacs.git

* tramp.texi (Frequently Asked Questions): Explain, how to disable
Tramp via `tramp-mode'.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 90ec902d468..bc24cccaa6a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.texi (Frequently Asked Questions): Explain, how to disable
+	Tramp via `tramp-mode'.
+
 2008-04-27  Carsten Dominik  <dominik@sam.science.uva.nl>
 
 	* org.texi: Massive changes, in many parts of the file.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 39caec1fa26..b0728d1047f 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3085,6 +3085,9 @@ How can I disable @value{tramp}?
 
 Shame on you, why did you read until now?
 
+@itemize @minus
+
+@item
 @ifset emacs
 If you just want to have @value{ftppackagename} as default remote
 files access package, you should apply the following code:
@@ -3094,12 +3097,28 @@ files access package, you should apply the following code:
 @end lisp
 @end ifset
 
+@item
+In order to disable
+@ifset emacs
+@value{tramp} (and @value{ftppackagename}),
+@end ifset
+@ifset xemacs
+@value{tramp},
+@end ifset
+you must set @code{tramp-mode} to @code{nil}:
+
+@lisp
+(setq tramp-mode nil)
+@end lisp
+
+@item
 Unloading @value{tramp} can be achieved by applying @kbd{M-x
 tramp-unload-tramp}.
 @ifset emacs
 This resets also the @value{ftppackagename} plugins.
 @end ifset
 @end itemize
+@end itemize
 
 
 @c For the developer