summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh.16
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f2190e585..58f2379ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,10 @@
41 [ssh_config.5] 41 [ssh_config.5]
42 mention '%%' escape sequence in HostName directives and how it may 42 mention '%%' escape sequence in HostName directives and how it may
43 be used to specify IPv6 link-local addresses 43 be used to specify IPv6 link-local addresses
44 - djm@cvs.openbsd.org 2014/07/03 05:38:17
45 [ssh.1]
46 document that -g will only work in the multiplexed case if applied to
47 the mux master
44 48
4520140702 4920140702
46 - OpenBSD CVS Sync 50 - OpenBSD CVS Sync
diff --git a/ssh.1 b/ssh.1
index 6c7569377..5e8ebeae7 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.345 2014/04/19 18:42:19 tedu Exp $ 36.\" $OpenBSD: ssh.1,v 1.346 2014/07/03 05:38:17 djm Exp $
37.Dd $Mdocdate: April 19 2014 $ 37.Dd $Mdocdate: July 3 2014 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -250,6 +250,8 @@ will wait for all remote port forwards to be successfully established
250before placing itself in the background. 250before placing itself in the background.
251.It Fl g 251.It Fl g
252Allows remote hosts to connect to local forwarded ports. 252Allows remote hosts to connect to local forwarded ports.
253If used on a multiplexed connection, then this option must be specified
254on the master process.
253.It Fl I Ar pkcs11 255.It Fl I Ar pkcs11
254Specify the PKCS#11 shared library 256Specify the PKCS#11 shared library
255.Nm 257.Nm