aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorMichael Albinus2019-04-13 12:34:13 +0200
committerMichael Albinus2019-04-13 12:34:13 +0200
commit181e0c09672175f167b12f1a1ed8f8d488c2a487 (patch)
tree8b702a2f5c6b63ba531e803f7820afcf4730b118 /doc/misc
parentbfa9e7452cd28704ef97f2df9a85af66b47ad220 (diff)
downloademacs-181e0c09672175f167b12f1a1ed8f8d488c2a487.tar.gz
emacs-181e0c09672175f167b12f1a1ed8f8d488c2a487.zip
* doc/misc/tramp.texi: Fix minor glitches.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/tramp.texi25
1 files changed, 12 insertions, 13 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index e376fc7495e..3dfd5224ecd 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2,9 +2,8 @@
2@setfilename ../../info/tramp.info 2@setfilename ../../info/tramp.info
3@c %**start of header 3@c %**start of header
4@include docstyle.texi 4@include docstyle.texi
5@c In the Tramp repository, the version number is auto-frobbed from 5@c In the Tramp GIT, the version number is auto-frobbed from tramp.el,
6@c configure.ac, so you should edit that file and run 6@c and the bug report address is auto-frobbed from configure.ac.
7@c "autoconf && ./configure" to change the version number.
8@include trampver.texi 7@include trampver.texi
9@settitle @value{tramp} @value{trampver} User Manual 8@settitle @value{tramp} @value{trampver} User Manual
10@c %**end of header 9@c %**end of header
@@ -52,7 +51,7 @@ editing package for Emacs.
52 51
53@value{tramp} stands for ``Transparent Remote (file) Access, Multiple 52@value{tramp} stands for ``Transparent Remote (file) Access, Multiple
54Protocol''. This package provides remote file editing, similar to 53Protocol''. This package provides remote file editing, similar to
55Ange FTP. 54Ange FTP@.
56 55
57The difference is that Ange FTP uses FTP to transfer files between the 56The difference is that Ange FTP uses FTP to transfer files between the
58local and the remote host, whereas @value{tramp} uses a combination of 57local and the remote host, whereas @value{tramp} uses a combination of
@@ -968,7 +967,7 @@ after a predefined timeout.
968@cindex @option{ftp} method 967@cindex @option{ftp} method
969 968
970When @value{tramp} uses @option{ftp}, it forwards requests to whatever 969When @value{tramp} uses @option{ftp}, it forwards requests to whatever
971ftp program is specified by Ange FTP. This external program must be 970ftp program is specified by Ange FTP@. This external program must be
972capable of servicing requests from @value{tramp}. 971capable of servicing requests from @value{tramp}.
973 972
974@item @option{smb} 973@item @option{smb}
@@ -1092,8 +1091,8 @@ numbers are not applicable to Android devices connected through USB@.
1092The program @command{rclone} allows to access different system 1091The program @command{rclone} allows to access different system
1093storages in the cloud, see @url{https://rclone.org/} for a list of 1092storages in the cloud, see @url{https://rclone.org/} for a list of
1094supported systems. If the @command{rclone} program isn't found in 1093supported systems. If the @command{rclone} program isn't found in
1095your @env{PATH} environment variable, you can tell Tramp its absolute 1094your @env{PATH} environment variable, you can tell @value{tramp} its
1096path via the user option @code{tramp-rclone-program}. 1095absolute path via the user option @code{tramp-rclone-program}.
1097 1096
1098A system storage must be configured via the @command{rclone config} 1097A system storage must be configured via the @command{rclone config}
1099command, outside Emacs. If you have configured a storage in 1098command, outside Emacs. If you have configured a storage in
@@ -1108,7 +1107,7 @@ User names are part of the @command{rclone} configuration, and not
1108needed in the remote file name. If a user name is contained in the 1107needed in the remote file name. If a user name is contained in the
1109remote file name, it is ignored. 1108remote file name, it is ignored.
1110 1109
1111Internally, Tramp mounts the remote system storage at location 1110Internally, @value{tramp} mounts the remote system storage at location
1112@file{/tmp/tramp.rclone.storage}, with @file{storage} being the name 1111@file{/tmp/tramp.rclone.storage}, with @file{storage} being the name
1113of the configured system storage. 1112of the configured system storage.
1114 1113
@@ -1538,8 +1537,8 @@ Host host.other.domain
1538@end group 1537@end group
1539@end example 1538@end example
1540 1539
1541@code{nc} is BSD's netcat program, which establishes HTTP tunnels. Any 1540@code{nc} is BSD's netcat program, which establishes HTTP tunnels.
1542other program with such a feature could be used as well. 1541Any other program with such a feature could be used as well.
1543 1542
1544In the example, opening @file{@trampfn{ssh,host.your.domain,}} passes 1543In the example, opening @file{@trampfn{ssh,host.your.domain,}} passes
1545the HTTP proxy server @samp{proxy.your.domain} on port 3128. 1544the HTTP proxy server @samp{proxy.your.domain} on port 3128.
@@ -1615,7 +1614,7 @@ Integration for LXD containers. A container is accessed via
1615@cindex method @option{git} 1614@cindex method @option{git}
1616@cindex @option{git} method 1615@cindex @option{git} method
1617Browing git repositories with @code{magit}. A versioned file is accessed via 1616Browing git repositories with @code{magit}. A versioned file is accessed via
1618@file{@trampfn{git,rev@@root-dir,/path/to/file}}. @samp{rev} is a git 1617@file{@trampfn{git,rev@@root-dir,/path/to/file}}. @samp{rev} is a git
1619revision, and @samp{root-dir} is a virtual host name for the root 1618revision, and @samp{root-dir} is a virtual host name for the root
1620directory, specified in @code{magit-tramp-hosts-alist}. 1619directory, specified in @code{magit-tramp-hosts-alist}.
1621 1620
@@ -2642,7 +2641,7 @@ names. Beside the @code{default} value, @var{syntax} can be
2642@item @code{simplified} 2641@item @code{simplified}
2643@cindex simplified syntax 2642@cindex simplified syntax
2644 2643
2645The remote file name syntax is similar to the syntax used by Ange FTP. 2644The remote file name syntax is similar to the syntax used by Ange FTP@.
2646A remote file name has the form 2645A remote file name has the form
2647@code{@value{prefix}user@@host@value{postfix}path/to/file}. The 2646@code{@value{prefix}user@@host@value{postfix}path/to/file}. The
2648@code{user@@} part is optional, and the method is determined by 2647@code{user@@} part is optional, and the method is determined by
@@ -4372,7 +4371,7 @@ handlers.
4372@vindex non-essential 4371@vindex non-essential
4373Sometimes, it is not convenient to open a new connection to a remote 4372Sometimes, it is not convenient to open a new connection to a remote
4374host, including entering the password and alike. For example, this is 4373host, including entering the password and alike. For example, this is
4375nasty for packages providing file name completion. Such a package 4374nasty for packages providing file name completion. Such a package
4376could signal to @value{tramp}, that they don't want it to establish a 4375could signal to @value{tramp}, that they don't want it to establish a
4377new connection. Use the variable @code{non-essential} temporarily and 4376new connection. Use the variable @code{non-essential} temporarily and
4378bind it to non-@code{nil} value. 4377bind it to non-@code{nil} value.