Clarification in Tramp manual

* doc/misc/tramp.texi: Harmonize "Git" spelling.
(Frequently Asked Questions): Describe Emacs version mismatch.
This commit is contained in:
Michael Albinus 2020-10-01 14:23:20 +02:00
parent 8fbaca7d41
commit 2af6b3147d

View file

@ -383,7 +383,7 @@ After one of the above commands, @file{~/emacs/tramp} will
containing the latest version of @value{tramp}. containing the latest version of @value{tramp}.
@noindent @noindent
To fetch updates from the repository, use git pull: To fetch updates from the repository, use @code{git pull}:
@example @example
@group @group
@ -1687,9 +1687,9 @@ Integration for LXD containers. A container is accessed via
@item magit-tramp @item magit-tramp
@cindex method @option{git} @cindex method @option{git}
@cindex @option{git} method @cindex @option{git} method
Browsing git repositories with @code{magit}. A versioned file is Browsing Git repositories with @code{magit}. A versioned file is
accessed via @file{@trampfn{git,rev@@root-dir,/path/to/file}}. accessed via @file{@trampfn{git,rev@@root-dir,/path/to/file}}.
@samp{rev} is a git revision, and @samp{root-dir} is a virtual host @samp{rev} is a Git revision, and @samp{root-dir} is a virtual host
name for the root directory, specified in name for the root directory, specified in
@code{magit-tramp-hosts-alist}. @code{magit-tramp-hosts-alist}.
@ -4646,6 +4646,18 @@ path, or somewhere else entirely (including locally). @pxref{Renaming
remote files}. remote files}.
@item
I get a warning @samp{Tramp has been compiled with Emacs a.b, this is Emacs c.d}
@value{tramp} comes with compatibility code for different Emacs
versions. When you see this warning, you don't use the Emacs built-in
version of @value{tramp}. In case you have installed @value{tramp}
from GNU ELPA, you must delete and reinstall it.
@ifset installchapter
In case you have installed it from its Git repository, @ref{Recompilation}.
@end ifset
@item @item
How to disable other packages from calling @value{tramp}? How to disable other packages from calling @value{tramp}?