summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-12-05 00:55:25 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-12-05 00:55:25 -0800
commitfa46310344375ef5c114cbb94d4acea39ac29239 (patch)
tree4d74de9694db1c199cd9301a27c48b4d4137cf0c /lisp/net
parentc3c9e25e5d2c222d9f79a503c714b48c06078c08 (diff)
downloademacs-fa46310344375ef5c114cbb94d4acea39ac29239.tar.gz
emacs-fa46310344375ef5c114cbb94d4acea39ac29239.tar.bz2
emacs-fa46310344375ef5c114cbb94d4acea39ac29239.zip
Spelling fixes.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/netrc.el2
-rw-r--r--lisp/net/network-stream.el2
-rw-r--r--lisp/net/tramp-gvfs.el2
-rw-r--r--lisp/net/tramp.el4
-rw-r--r--lisp/net/xesam.el4
5 files changed, 7 insertions, 7 deletions
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index b04863b5fc0..80836b03978 100644
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -237,7 +237,7 @@ MODE can be \"login\" or \"password\", suitable for passing to
;;;###autoload
(defun netrc-credentials (machine &rest ports)
"Return a user name/password pair.
-Port specifications will be prioritised in the order they are
+Port specifications will be prioritized in the order they are
listed in the PORTS list."
(let ((list (netrc-parse))
found)
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index e27b4541ab5..9c07953c9c9 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -115,7 +115,7 @@ values:
capability command, and should return the command to switch on
STARTTLS if the server supports STARTTLS, and nil otherwise.
-:always-query-capabilies says whether to query the server for
+:always-query-capabilities says whether to query the server for
capabilities, even if we're doing a `plain' network connection.
:client-certificate should either be a list where the first
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index df841bade79..27dff3aa8d9 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -188,7 +188,7 @@
;; STRING stable_name
;; STRING x_content_types Since GVFS 1.0 only !!!
;; STRING icon
-;; STRING prefered_filename_encoding
+;; STRING preferred_filename_encoding
;; BOOLEAN user_visible
;; ARRAY BYTE fuse_mountpoint
;; STRUCT mount_spec
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c89b61c2eb1..2848211fae9 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -298,8 +298,8 @@ shouldn't return t when it isn't."
(search-forward-regexp "Missing ControlMaster argument" nil t))))
(defcustom tramp-default-method
- ;; An external copy method seems to be preferred, because it is much
- ;; more performant for large files, and it hasn't too serious delays
+ ;; An external copy method seems to be preferred, because it performs
+ ;; much better for large files, and it hasn't too serious delays
;; for small files. But it must be ensured that there aren't
;; permanent password queries. Either a password agent like
;; "ssh-agent" or "Pageant" shall run, or the optional
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index ab817a43885..279ea54e4cc 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -279,8 +279,8 @@ fields are supported.")
(defun xesam-dbus-call-method (&rest args)
"Apply a D-Bus method call.
-`dbus-call-method' is to be preferred, because it is more
-performant. If the target D-Bus service is owned by Emacs, this
+`dbus-call-method' is preferred, because it performs better.
+If the target D-Bus service is owned by Emacs, this
is not applicable, and `dbus-call-method-non-blocking' must be
used instead. ARGS are identical to the argument list of both
functions."