diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 17:07:17 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 17:07:17 -0800 |
| commit | e3ab8b1de45548f7e9c1fa49e9eac4069cf2346b (patch) | |
| tree | 340e8224b087611a881bd3805d3e73796719f204 /paramiko/config.py | |
| parent | 07ff30537a225f9b9c2c31eaf9b376d412907c37 (diff) | |
| parent | 886e04b2c3668e40af22c5cfef4c476b9e92b87b (diff) | |
| download | paramiko-e3ab8b1de45548f7e9c1fa49e9eac4069cf2346b.tar.gz | |
Merge branch '1.14' into 1.15
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 233a87d9..0b1345fd 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. |