summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-01-18 14:22:43 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-01-18 14:22:43 -0800
commitfd62d87c6f04c5266e73ad50a97d4689f7f1892c (patch)
treea19b2393b9342aea22e421372b3840572e50cb0e
parente237f370d604c47ad6c82263adb5673c24065b5a (diff)
parent31dc2ae40cbcc7583542152343b2ba1aff1595c7 (diff)
Merge branch '1.17' into 1.18
-rw-r--r--paramiko/channel.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py
index 52b5d849..69db0107 100644
--- a/paramiko/channel.py
+++ b/paramiko/channel.py
@@ -155,7 +155,7 @@ class Channel (ClosingContextManager):
after creating a client channel, to ask the server to provide some
basic terminal semantics for a shell invoked with `invoke_shell`.
It isn't necessary (or desirable) to call this method if you're going
- to exectue a single command with `exec_command`.
+ to execute a single command with `exec_command`.
:param str term: the terminal type to emulate (for example, ``'vt100'``)
:param int width: width (in characters) of the terminal screen