summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh.127
1 files changed, 19 insertions, 8 deletions
diff --git a/ssh.1 b/ssh.1
index da64b7198..dd01b9787 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.356 2015/03/03 06:48:58 djm Exp $ 36.\" $OpenBSD: ssh.1,v 1.357 2015/05/06 05:45:17 dtucker Exp $
37.Dd $Mdocdate: March 3 2015 $ 37.Dd $Mdocdate: May 6 2015 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -584,9 +584,9 @@ of SSH as a secure transport for other applications (eg.\&
584.Xr sftp 1 ) . 584.Xr sftp 1 ) .
585The subsystem is specified as the remote command. 585The subsystem is specified as the remote command.
586.It Fl T 586.It Fl T
587Disable pseudo-tty allocation. 587Disable pseudo-terminal allocation.
588.It Fl t 588.It Fl t
589Force pseudo-tty allocation. 589Force pseudo-terminal allocation.
590This can be used to execute arbitrary 590This can be used to execute arbitrary
591screen-based programs on a remote machine, which can be very useful, 591screen-based programs on a remote machine, which can be very useful,
592e.g. when implementing menu services. 592e.g. when implementing menu services.
@@ -876,15 +876,26 @@ option can be used to control logins to machines whose
876host key is not known or has changed. 876host key is not known or has changed.
877.Pp 877.Pp
878When the user's identity has been accepted by the server, the server 878When the user's identity has been accepted by the server, the server
879either executes the given command, or logs into the machine and gives 879either executes the given command in a non-interactive session or,
880the user a normal shell on the remote machine. 880if no command has been specified, logs into the machine and gives
881the user a normal shell as an interactive session.
881All communication with 882All communication with
882the remote command or shell will be automatically encrypted. 883the remote command or shell will be automatically encrypted.
883.Pp 884.Pp
884If a pseudo-terminal has been allocated (normal login session), the 885If an interactive session is requested
886.Nm
887by default will only request a pseudo-terminal (pty) for interactive
888sessions when the client has one.
889The flags
890.Fl T
891and
892.Fl t
893can be used to override this behaviour.
894.Pp
895If a pseudo-terminal has been allocated the
885user may use the escape characters noted below. 896user may use the escape characters noted below.
886.Pp 897.Pp
887If no pseudo-tty has been allocated, 898If no pseudo-terminal has been allocated,
888the session is transparent and can be used to reliably transfer binary data. 899the session is transparent and can be used to reliably transfer binary data.
889On most systems, setting the escape character to 900On most systems, setting the escape character to
890.Dq none 901.Dq none