summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-01-18 14:22:52 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-01-18 14:22:52 -0800
commit9a7922a727007ade0b8748b38930f8e01a74729e (patch)
tree275fad559ef5ad4a2687181f5ff971a7ea53922a
parente64295c899aeca6138c9e176bf538a32504f2e96 (diff)
parentec34b865fe6791a4929888c29261957054424a08 (diff)
Merge branch '2.0' into 2.1
-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