[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master e646242 4/4: Some editing fixes in Tramp
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master e646242 4/4: Some editing fixes in Tramp |
Date: |
Wed, 14 Oct 2015 18:16:35 +0000 |
branch: master
commit e646242e13cd41742a3ff2acb7a0c3eec4e874e9
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Some editing fixes in Tramp
* lisp/net/tramp-gvfs.el:
* doc/misc/tramp.texi: "customer option" -> "custom option".
* lisp/net/tramp.el (tramp-completion-function-alist): Fix docstring.
---
doc/misc/tramp.texi | 18 +++++++++---------
lisp/net/tramp-gvfs.el | 4 ++--
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 ac2e74e..8658f6f 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
variable @var{tramp-adb-program} must point to its absolute path.
@value{tramp} does not connect Android devices to @command{adb},
-unless the customer option @option{tramp-adb-connect-if-not-connected}
+unless the custom option @option{tramp-adb-connect-if-not-connected}
is address@hidden If there is exactly one Android device connected
to @command{adb}, a host name is not needed in the remote file name.
The default @value{tramp} name to be used is @address@hidden, , ,}},
@@ -1098,7 +1098,7 @@ FUSE, it also needs the SYNCE-GVFS plugin.
@vindex tramp-gvfs-methods
@defopt tramp-gvfs-methods
-This customer option, a list, defines the external methods which shall
+This custom option, a list, defines the external methods which shall
be used with address@hidden Per default, these are @option{dav},
@option{davs}, @option{obex}, @option{sftp} and @option{synce}. Other
possible values are @option{ftp} and @option{smb}.
@@ -1371,7 +1371,7 @@ bastion host.
@vindex tramp-default-proxies-alist
@defopt tramp-default-proxies-alist
In order to specify multiple hops, it is possible to define a proxy
-host to pass through, via the customer option
+host to pass through, via the custom option
@option{tramp-default-proxies-alist}. This variable keeps a list of
triples (@var{host} @var{user} @var{proxy}).
@@ -1486,7 +1486,7 @@ Sometimes they offer limited features only, like running
@command{rbash}
@vindex tramp-restricted-shell-hosts-alist
@defopt tramp-restricted-shell-hosts-alist
-This customer option keeps a list of regular expressions, which denote
+This custom option keeps a list of regular expressions, which denote
hosts running a registered shell like @command{rbash}. Those hosts
can be used as proxies only.
@@ -1827,7 +1827,7 @@ remote file access.
@vindex tramp-own-remote-path
@defopt tramp-remote-path
When @value{tramp} connects to the remote host, it searches for the
-programs that it can use. The customer option
+programs that it can use. The custom option
@option{tramp-remote-path} controls the directories searched on the
remote host.
@@ -2631,7 +2631,7 @@ changes, which would be invisible otherwise
(@pxref{Connection caching}).
@vindex tramp-completion-reread-directory-timeout
@defopt tramp-completion-reread-directory-timeout
-This customer option defines the number of seconds since last remote
+This custom option defines the number of seconds since last remote
command before rereading a directory contents. A value of 0 would
require an immediate reread during file name completion, @code{nil}
means to use always cached values for the directory contents.
@@ -2672,7 +2672,7 @@ remotehost, /path}} would be sufficient from now on.
@vindex tramp-save-ad-hoc-proxies
@defopt tramp-save-ad-hoc-proxies
-This customer option controls whether ad-hoc definitions are kept
+This custom option controls whether ad-hoc definitions are kept
persistently in @option{tramp-default-proxies-alist}. That means,
those definitions are available also for future @value{emacsname}
sessions.
@@ -3704,8 +3704,8 @@ all hops, like @address@hidden, bird,
bastion|address@hidden, /opt/news/etc}}.
Alternatively, if you save only the abbreviated multi-hop file name
address@hidden@trampfn{ssh, news, news.my.domain, /opt/news/etc}}, the
-customer option @code{tramp-save-ad-hoc-proxies} must be set to a to a
address@hidden@trampfn{ssh, news, news.my.domain, /opt/news/etc}}, the custom
+option @code{tramp-save-ad-hoc-proxies} must be set to a to a
address@hidden value.
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index b909142..463b997 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -47,7 +47,7 @@
;; discovered during development time, is given in respective
;; comments.
-;; The customer option `tramp-gvfs-methods' contains the list of
+;; The custom option `tramp-gvfs-methods' contains the list of
;; supported connection methods. Per default, these are "dav",
;; "davs", "obex", "sftp" and "synce". Note that with "obex" it might
;; be necessary to pair with the other bluetooth device, if it hasn't
@@ -81,7 +81,7 @@
;; "synce" method), or from the zeroconf daemon (for the "dav",
;; "davs", and "sftp" methods). The zeroconf daemon is pre-configured
;; to discover services in the "local" domain. If another domain
-;; shall be used for discovering services, the customer option
+;; shall be used for discovering services, the custom option
;; `tramp-gvfs-zeroconf-domain' can be set accordingly.
;; Restrictions:
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index df64f49..15af0b5 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:
* `tramp-parse-netrc' for \"~/.netrc\" like files.
* `tramp-parse-putty' for PuTTY registered sessions.
-FUNCTION can also be a customer defined function. For more details see
+FUNCTION can also be a user defined function. For more details see
the info pages.")
(defconst tramp-echo-mark-marker "_echo"