Skip to content

Commit 4067220

Browse files
author
Dan
committed
Updated documentation
1 parent 1e1df90 commit 4067220

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

doc/advanced.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Use of an available SSH agent can also be disabled.
5656

5757
For large number of hosts, it is recommended that private keys are provided programmatically and use of SSH agent is disabled via ``allow_agent=False`` as above.
5858

59-
If the number of hosts is large enough, available connections to the system SSH may be exhausted which will stop the client from working on a subset of hosts.
59+
If the number of hosts is large enough, available connections to the system SSH agent may be exhausted which will stop the client from working on a subset of hosts.
6060

6161
This is a limitation of the underlying SSH client used by ``ParallelSSH``.
6262

@@ -100,7 +100,7 @@ Proxy host can be configured as follows in the simplest case:
100100
.. code-block:: python
101101
102102
hosts = [<..>]
103-
client = ParallelSSHClient(hosts, proxy_host=bastion)
103+
client = ParallelSSHClient(hosts, proxy_host='bastion')
104104
105105
Configuration for the proxy host's user name, port, password and private key can also be provided, separate from target host user name.
106106

@@ -110,19 +110,19 @@ Configuration for the proxy host's user name, port, password and private key can
110110
111111
hosts = [<..>]
112112
client = ParallelSSHClient(hosts, user='target_host_user',
113-
proxy_host=bastion, proxy_user='my_proxy_user',
113+
proxy_host='bastion', proxy_user='my_proxy_user',
114114
proxy_port=2222,
115115
proxy_pkey=load_private_key('proxy.key'))
116116
117117
Where ``proxy.key`` is a filename containing private key to use for proxy host authentication.
118118

119-
In the above example, connection to the target host is made via ``my_proxy_user@bastion`` -> ``target_host_user@<host>``.
119+
In the above example, connections to the target hosts are made via ``my_proxy_user@bastion:2222`` -> ``target_host_user@<host>``.
120120

121121
.. note::
122122

123123
Proxy host connections are asynchronous and use the SSH protocol's native TCP tunneling - aka local port forward. No external commands or processes are used for the proxy connection, unlike the `ProxyCommand` directive in OpenSSH and other utilities.
124124

125-
While the connections initiated by ``ParallelSSH`` are asynchronous, the connections from proxy host -> target hosts may not be, depending on SSH server implementation. If only one proxy host is used to connect to a large number of target hosts and proxy SSH server connections are *not* asynchronous, this may adversely impact performance on the proxy host.
125+
While connections initiated by ``ParallelSSH`` are asynchronous, connections from proxy host -> target hosts may not be, depending on SSH server implementation. If only one proxy host is used to connect to a large number of target hosts and proxy SSH server connections are *not* asynchronous, this may adversely impact performance on the proxy host.
126126

127127
Per-Host Configuration
128128
***********************
@@ -157,7 +157,7 @@ In the above example, ``host1`` will use user name ``user1`` and private key fro
157157
Per-Host Command substitution
158158
******************************
159159

160-
For cases where different commands should be run each host, or the same command with different arguments, functionality exists to provide per-host command arguments for substitution.
160+
For cases where different commands should be run on each host, or the same command with different arguments, functionality exists to provide per-host command arguments for substitution.
161161

162162
The ``host_args`` keyword parameter to :py:func:`run_command <pssh.pssh_client.ParallelSSHClient.run_command>` can be used to provide arguments to use to format the command string.
163163

@@ -201,7 +201,7 @@ See :py:func:`run_command API documentation <pssh.pssh_client.ParallelSSHClient.
201201
202202
.. note::
203203
204-
With a PTY, stdout and stderr output is combined into stdout.
204+
With a PTY, the default, stdout and stderr output is combined into stdout.
205205
206206
Without a PTY, separate output is given for stdout and stderr, although some programs and server configurations require a PTY.
207207
@@ -253,7 +253,7 @@ Disabling use of pseudo terminal emulation
253253
254254
By default, ``ParallelSSH`` uses the user's configured shell to run commands with. As a shell is used by default, a pseudo terminal (`PTY`) is also requested by default.
255255
256-
For cases where use of a `PTY` is not wanted, such as having separate stdout and stderr outputs, or the remote command is a daemon that needs to fork and detach itself or when use of a shell is explicitly disabled, use of PTY can also be disabled.
256+
For cases where use of a `PTY` is not wanted, such as having separate stdout and stderr outputs, the remote command is a daemon that needs to fork and detach itself or when use of a shell is explicitly disabled, use of PTY can also be disabled.
257257
258258
The following example prints to stderr with PTY disabled.
259259

doc/quickstart.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ The helper function :py:func:`load_private_key <pssh.utils.load_private_key>` is
143143
Host Logger
144144
------------
145145

146-
There is a built in host logger that can be enabled to automatically log output from remote hosts. This requires the ``consume_output`` flag to be enabled on :py:func:`join <pssh.pssh_client.join`.
146+
There is a built in host logger that can be enabled to automatically log output from remote hosts. This requires the ``consume_output`` flag to be enabled on :py:func:`join <pssh.pssh_client.ParallelSSHClient.join>`.
147147

148148
The helper function ``pssh.utils.enable_host_logger`` will enable host logging to standard output, for example:
149149

0 commit comments

Comments
 (0)