diff options
| -rw-r--r-- | doc/misc/tramp.texi | 18 | ||||
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 4 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index ac2e74ed50a..8658f6f81a7 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi | |||
| @@ -1015,7 +1015,7 @@ program is not found via the @env{PATH} environment variable, the | |||
| 1015 | variable @var{tramp-adb-program} must point to its absolute path. | 1015 | variable @var{tramp-adb-program} must point to its absolute path. |
| 1016 | 1016 | ||
| 1017 | @value{tramp} does not connect Android devices to @command{adb}, | 1017 | @value{tramp} does not connect Android devices to @command{adb}, |
| 1018 | unless the customer option @option{tramp-adb-connect-if-not-connected} | 1018 | unless the custom option @option{tramp-adb-connect-if-not-connected} |
| 1019 | is non-@code{nil}. If there is exactly one Android device connected | 1019 | is non-@code{nil}. If there is exactly one Android device connected |
| 1020 | to @command{adb}, a host name is not needed in the remote file name. | 1020 | to @command{adb}, a host name is not needed in the remote file name. |
| 1021 | The default @value{tramp} name to be used is @file{@trampfn{adb, , ,}}, | 1021 | The default @value{tramp} name to be used is @file{@trampfn{adb, , ,}}, |
| @@ -1098,7 +1098,7 @@ FUSE, it also needs the SYNCE-GVFS plugin. | |||
| 1098 | 1098 | ||
| 1099 | @vindex tramp-gvfs-methods | 1099 | @vindex tramp-gvfs-methods |
| 1100 | @defopt tramp-gvfs-methods | 1100 | @defopt tramp-gvfs-methods |
| 1101 | This customer option, a list, defines the external methods which shall | 1101 | This custom option, a list, defines the external methods which shall |
| 1102 | be used with GVFS@. Per default, these are @option{dav}, | 1102 | be used with GVFS@. Per default, these are @option{dav}, |
| 1103 | @option{davs}, @option{obex}, @option{sftp} and @option{synce}. Other | 1103 | @option{davs}, @option{obex}, @option{sftp} and @option{synce}. Other |
| 1104 | possible values are @option{ftp} and @option{smb}. | 1104 | possible values are @option{ftp} and @option{smb}. |
| @@ -1371,7 +1371,7 @@ bastion host. | |||
| 1371 | @vindex tramp-default-proxies-alist | 1371 | @vindex tramp-default-proxies-alist |
| 1372 | @defopt tramp-default-proxies-alist | 1372 | @defopt tramp-default-proxies-alist |
| 1373 | In order to specify multiple hops, it is possible to define a proxy | 1373 | In order to specify multiple hops, it is possible to define a proxy |
| 1374 | host to pass through, via the customer option | 1374 | host to pass through, via the custom option |
| 1375 | @option{tramp-default-proxies-alist}. This variable keeps a list of | 1375 | @option{tramp-default-proxies-alist}. This variable keeps a list of |
| 1376 | triples (@var{host} @var{user} @var{proxy}). | 1376 | triples (@var{host} @var{user} @var{proxy}). |
| 1377 | 1377 | ||
| @@ -1486,7 +1486,7 @@ Sometimes they offer limited features only, like running @command{rbash} | |||
| 1486 | 1486 | ||
| 1487 | @vindex tramp-restricted-shell-hosts-alist | 1487 | @vindex tramp-restricted-shell-hosts-alist |
| 1488 | @defopt tramp-restricted-shell-hosts-alist | 1488 | @defopt tramp-restricted-shell-hosts-alist |
| 1489 | This customer option keeps a list of regular expressions, which denote | 1489 | This custom option keeps a list of regular expressions, which denote |
| 1490 | hosts running a registered shell like @command{rbash}. Those hosts | 1490 | hosts running a registered shell like @command{rbash}. Those hosts |
| 1491 | can be used as proxies only. | 1491 | can be used as proxies only. |
| 1492 | 1492 | ||
| @@ -1827,7 +1827,7 @@ remote file access. | |||
| 1827 | @vindex tramp-own-remote-path | 1827 | @vindex tramp-own-remote-path |
| 1828 | @defopt tramp-remote-path | 1828 | @defopt tramp-remote-path |
| 1829 | When @value{tramp} connects to the remote host, it searches for the | 1829 | When @value{tramp} connects to the remote host, it searches for the |
| 1830 | programs that it can use. The customer option | 1830 | programs that it can use. The custom option |
| 1831 | @option{tramp-remote-path} controls the directories searched on the | 1831 | @option{tramp-remote-path} controls the directories searched on the |
| 1832 | remote host. | 1832 | remote host. |
| 1833 | 1833 | ||
| @@ -2631,7 +2631,7 @@ changes, which would be invisible otherwise (@pxref{Connection caching}). | |||
| 2631 | 2631 | ||
| 2632 | @vindex tramp-completion-reread-directory-timeout | 2632 | @vindex tramp-completion-reread-directory-timeout |
| 2633 | @defopt tramp-completion-reread-directory-timeout | 2633 | @defopt tramp-completion-reread-directory-timeout |
| 2634 | This customer option defines the number of seconds since last remote | 2634 | This custom option defines the number of seconds since last remote |
| 2635 | command before rereading a directory contents. A value of 0 would | 2635 | command before rereading a directory contents. A value of 0 would |
| 2636 | require an immediate reread during file name completion, @code{nil} | 2636 | require an immediate reread during file name completion, @code{nil} |
| 2637 | means to use always cached values for the directory contents. | 2637 | means to use always cached values for the directory contents. |
| @@ -2672,7 +2672,7 @@ remotehost, /path}} would be sufficient from now on. | |||
| 2672 | 2672 | ||
| 2673 | @vindex tramp-save-ad-hoc-proxies | 2673 | @vindex tramp-save-ad-hoc-proxies |
| 2674 | @defopt tramp-save-ad-hoc-proxies | 2674 | @defopt tramp-save-ad-hoc-proxies |
| 2675 | This customer option controls whether ad-hoc definitions are kept | 2675 | This custom option controls whether ad-hoc definitions are kept |
| 2676 | persistently in @option{tramp-default-proxies-alist}. That means, | 2676 | persistently in @option{tramp-default-proxies-alist}. That means, |
| 2677 | those definitions are available also for future @value{emacsname} | 2677 | those definitions are available also for future @value{emacsname} |
| 2678 | sessions. | 2678 | sessions. |
| @@ -3704,8 +3704,8 @@ all hops, like @file{@trampfn{ssh, bird, | |||
| 3704 | bastion|ssh@value{postfixhop}news.my.domain, /opt/news/etc}}. | 3704 | bastion|ssh@value{postfixhop}news.my.domain, /opt/news/etc}}. |
| 3705 | 3705 | ||
| 3706 | Alternatively, if you save only the abbreviated multi-hop file name | 3706 | Alternatively, if you save only the abbreviated multi-hop file name |
| 3707 | @file{@trampfn{ssh, news, news.my.domain, /opt/news/etc}}, the | 3707 | @file{@trampfn{ssh, news, news.my.domain, /opt/news/etc}}, the custom |
| 3708 | customer option @code{tramp-save-ad-hoc-proxies} must be set to a to a | 3708 | option @code{tramp-save-ad-hoc-proxies} must be set to a to a |
| 3709 | non-@code{nil} value. | 3709 | non-@code{nil} value. |
| 3710 | 3710 | ||
| 3711 | 3711 | ||
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index b90914256ab..463b99785f7 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | ;; discovered during development time, is given in respective | 47 | ;; discovered during development time, is given in respective |
| 48 | ;; comments. | 48 | ;; comments. |
| 49 | 49 | ||
| 50 | ;; The customer option `tramp-gvfs-methods' contains the list of | 50 | ;; The custom option `tramp-gvfs-methods' contains the list of |
| 51 | ;; supported connection methods. Per default, these are "dav", | 51 | ;; supported connection methods. Per default, these are "dav", |
| 52 | ;; "davs", "obex", "sftp" and "synce". Note that with "obex" it might | 52 | ;; "davs", "obex", "sftp" and "synce". Note that with "obex" it might |
| 53 | ;; be necessary to pair with the other bluetooth device, if it hasn't | 53 | ;; be necessary to pair with the other bluetooth device, if it hasn't |
| @@ -81,7 +81,7 @@ | |||
| 81 | ;; "synce" method), or from the zeroconf daemon (for the "dav", | 81 | ;; "synce" method), or from the zeroconf daemon (for the "dav", |
| 82 | ;; "davs", and "sftp" methods). The zeroconf daemon is pre-configured | 82 | ;; "davs", and "sftp" methods). The zeroconf daemon is pre-configured |
| 83 | ;; to discover services in the "local" domain. If another domain | 83 | ;; to discover services in the "local" domain. If another domain |
| 84 | ;; shall be used for discovering services, the customer option | 84 | ;; shall be used for discovering services, the custom option |
| 85 | ;; `tramp-gvfs-zeroconf-domain' can be set accordingly. | 85 | ;; `tramp-gvfs-zeroconf-domain' can be set accordingly. |
| 86 | 86 | ||
| 87 | ;; Restrictions: | 87 | ;; Restrictions: |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index df64f49e1e6..15af0b548ae 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -485,7 +485,7 @@ names from FILE for completion. The following predefined FUNCTIONs exists: | |||
| 485 | * `tramp-parse-netrc' for \"~/.netrc\" like files. | 485 | * `tramp-parse-netrc' for \"~/.netrc\" like files. |
| 486 | * `tramp-parse-putty' for PuTTY registered sessions. | 486 | * `tramp-parse-putty' for PuTTY registered sessions. |
| 487 | 487 | ||
| 488 | FUNCTION can also be a customer defined function. For more details see | 488 | FUNCTION can also be a user defined function. For more details see |
| 489 | the info pages.") | 489 | the info pages.") |
| 490 | 490 | ||
| 491 | (defconst tramp-echo-mark-marker "_echo" | 491 | (defconst tramp-echo-mark-marker "_echo" |