diff options
author | Christopher Baines <mail@cbaines.net> | 2016-02-07 21:19:28 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2016-02-07 21:19:28 +0000 |
commit | 8a563e44d42731143f4356edcad0d7469a56ea24 (patch) | |
tree | 4641e9608e76b130ea6afe467a30202494ef0eeb /paramiko/config.py | |
parent | bbf74c0dbf66c463bd68bd30abcd338796152354 (diff) | |
parent | 31b2fd0709f259961253b9cdc875ce7827abaa68 (diff) | |
download | python-paramiko-8a563e44d42731143f4356edcad0d7469a56ea24.tar python-paramiko-8a563e44d42731143f4356edcad0d7469a56ea24.tar.gz |
Merge tag 'upstream/1.16.0'
Upstream version 1.16.0
Diffstat (limited to 'paramiko/config.py')
-rw-r--r-- | paramiko/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/config.py b/paramiko/config.py index 233a87d..0b1345f 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -53,7 +53,7 @@ class SSHConfig (object): """ Read an OpenSSH config from the given file object. - :param file file_obj: a file-like object to read the config file from + :param file_obj: a file-like object to read the config file from """ host = {"host": ['*'], "config": {}} for line in file_obj: @@ -98,7 +98,7 @@ class SSHConfig (object): The host-matching rules of OpenSSH's ``ssh_config`` man page are used: For each parameter, the first obtained value will be used. The - configuration files contain sections separated by ``Host'' + configuration files contain sections separated by ``Host`` specifications, and that section is only applied for hosts that match one of the patterns given in the specification. |