This is an automated email from the ASF dual-hosted git repository.
lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new a556102 Fixed some typos and phrasing in documentation
a556102 is described below
commit a556102691da64f279eef398c301a46d7d0b2dd2
Author: Lyor Goldstein <lgoldst...@apache.org>
AuthorDate: Sun Oct 13 08:00:04 2019 +0300
Fixed some typos and phrasing in documentation
---
docs/client-setup.md | 8 ++++----
docs/commands.md | 4 ++--
.../org/apache/sshd/client/session/AbstractClientSession.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/client-setup.md b/docs/client-setup.md
index 1c8d36a..93292b5 100644
--- a/docs/client-setup.md
+++ b/docs/client-setup.md
@@ -188,7 +188,7 @@ identification will ever be received since the multiplexor
does not know how to
## Keeping the session alive while no traffic
-The client-side implementation has a 2 builtin mechanisms for maintaining the
session alive as far as the **server** is concerned
+The client-side implementation supports several mechanisms for maintaining the
session alive as far as the **server** is concerned
regardless of the user's own traffic:
* Sending `SSH_MSG_IGNORE` messages every once in a while.
@@ -222,9 +222,9 @@ regardless of the user's own traffic:
**Note(s):**
-* Both options are disabled by default - they need to be activated explicitly.
+* Mechanisms are disabled by default - they need to be activated explicitly.
-* Both options can be activated either on the `SshClient` (for **global**
setup) and/or
+* Mechanisms can be activated either on the `SshClient` (for **global** setup)
and/or
the `ClientSession` (for specific session configuration).
* The `keepalive@,,,,` mechanism **supersedes** the other mechanisms if
activated.
@@ -246,7 +246,7 @@ the `ClientSession` (for specific session configuration).
## Running a command or opening a shell
When running a command or opening a shell, there is an extra concern regarding
the PTY configuration and/or the
-reported environment variables. By default, unless specific instructions are
provided the code uses some internal
+reported environment variables. By default, unless specific instructions are
provided, the code uses some internal
defaults - which however, might not be adequate for the specific client/server.
```java
diff --git a/docs/commands.md b/docs/commands.md
index 10ef2d4..14dc478 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -50,7 +50,7 @@ remain active afterwards...).
* it down when the command is destroyed
*/
SftpSubsystemFactory factory = new SftpSubsystemFactory.Builder()
- .withExecutorService(new NoCloseExecutor(mySuperDuperExecutorService))
+ .withExecutorServiceProvider(() -> new
NoCloseExecutor(mySuperDuperExecutorService))
.build();
SshServer sshd = SshServer.setupDefaultServer();
sshd.setSubsystemFactories(Collections.<NamedFactory<Command>>singletonList(factory));
@@ -64,7 +64,7 @@ If a single `CloseableExecutorService` is shared between
several services, it ne
CloseableExecutorService sharedService = ...obtain/create an instance...;
SftpSubsystemFactory factory = new SftpSubsystemFactory.Builder()
- .withExecutorService(ThreadUtils.noClose(sharedService))
+ .withExecutorServiceProvider(() -> ThreadUtils.noClose(sharedService))
.build();
ChannelAgentForwarding forward = new
ChannelAgentForwarding(ThreadUtils.noClose(sharedService));
diff --git
a/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
b/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
index 38d854c..099ef8d 100644
---
a/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
+++
b/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
@@ -467,7 +467,7 @@ public abstract class AbstractClientSession extends
AbstractSession implements C
signalExtraServerVersionInfo(serverVersion, ident);
- // Now that we have the server's identity reported see if have delayed
any of out duties...
+ // Now that we have the server's identity reported see if have delayed
any of our duties...
if (!sendImmediateClientIdentification) {
sendClientIdentification();
// if client identification not sent then KEX-INIT was not sent
either
