1 files changed, 11 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index 1c889b6c4..34fe635e4 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.349 2014/08/30 15:33:50 sobrado Exp $
+.\" $OpenBSD: ssh.1,v 1.350 2014/10/08 22:20:25 djm Exp $
-.Dd $Mdocdate: August 30 2014 $
+.Dd $Mdocdate: October 8 2014 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Sh SYNOPSIS
 .Nm ssh
 .Bk -words
-.Op Fl 1246AaCfgKkMNnqsTtVvXxYy
+.Op Fl 1246AaCfgGKkMNnqsTtVvXxYy
 .Op Fl b Ar bind_address
 .Op Fl c Ar cipher_spec
 .Op Fl D Oo Ar bind_address : Oc Ns Ar port
@@ -251,6 +251,14 @@ then a client started with
 .Fl f
 will wait for all remote port forwards to be successfully established
 before placing itself in the background.
+.It Fl G
+Causes
+.Nm
+to print its configuration after evaluating
+.Cm Host
+and
+.Cm Match
+blocks and exit.
 .It Fl g
 Allows remote hosts to connect to local forwarded ports.
 If used on a multiplexed connection, then this option must be specified

diff --git a/ssh.1 b/ssh.1 index 1c889b6c4..34fe635e4 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.349 2014/08/30 15:33:50 sobrado Exp $	36	.\" $OpenBSD: ssh.1,v 1.350 2014/10/08 22:20:25 djm Exp $
37	.Dd $Mdocdate: August 30 2014 $	37	.Dd $Mdocdate: October 8 2014 $
38	.Dt SSH 1	38	.Dt SSH 1
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -43,7 +43,7 @@
43	.Sh SYNOPSIS	43	.Sh SYNOPSIS
44	.Nm ssh	44	.Nm ssh
45	.Bk -words	45	.Bk -words
46	.Op Fl 1246AaCfgKkMNnqsTtVvXxYy	46	.Op Fl 1246AaCfgGKkMNnqsTtVvXxYy
47	.Op Fl b Ar bind_address	47	.Op Fl b Ar bind_address
48	.Op Fl c Ar cipher_spec	48	.Op Fl c Ar cipher_spec
49	.Op Fl D Oo Ar bind_address : Oc Ns Ar port	49	.Op Fl D Oo Ar bind_address : Oc Ns Ar port
@@ -251,6 +251,14 @@ then a client started with
251	.Fl f	251	.Fl f
252	will wait for all remote port forwards to be successfully established	252	will wait for all remote port forwards to be successfully established
253	before placing itself in the background.	253	before placing itself in the background.
		254	.It Fl G
		255	Causes
		256	.Nm
		257	to print its configuration after evaluating
		258	.Cm Host
		259	and
		260	.Cm Match
		261	blocks and exit.
254	.It Fl g	262	.It Fl g
255	Allows remote hosts to connect to local forwarded ports.	263	Allows remote hosts to connect to local forwarded ports.
256	If used on a multiplexed connection, then this option must be specified	264	If used on a multiplexed connection, then this option must be specified