aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus2015-10-14 20:16:14 +0200
committerMichael Albinus2015-10-14 20:16:14 +0200
commite646242e13cd41742a3ff2acb7a0c3eec4e874e9 (patch)
treed1cda3ab358d744861a9d35666780b817d62b179 /lisp/net
parent8318dec8e167a3c688534e3f9faff862b7e374ac (diff)
downloademacs-e646242e13cd41742a3ff2acb7a0c3eec4e874e9.tar.gz
emacs-e646242e13cd41742a3ff2acb7a0c3eec4e874e9.zip
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.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp-gvfs.el4
-rw-r--r--lisp/net/tramp.el2
2 files changed, 3 insertions, 3 deletions
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
488FUNCTION can also be a customer defined function. For more details see 488FUNCTION can also be a user defined function. For more details see
489the info pages.") 489the info pages.")
490 490
491(defconst tramp-echo-mark-marker "_echo" 491(defconst tramp-echo-mark-marker "_echo"