1 files changed, 7 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 532bb191a..585a36878 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,8 +34,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_config.5,v 1.98 2007/01/10 13:23:22 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.102 2007/08/15 12:13:41 stevesk Exp $
-.Dd September 25, 1999
+.Dd $Mdocdate: August 15 2007 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -393,7 +393,7 @@ data).
 Specifies whether
 .Xr ssh 1
 should terminate the connection if it cannot set up all requested
-dynamic, local, and remote port forwardings.
+dynamic, tunnel, local, and remote port forwardings.
 The argument must be
 .Dq yes
 or
@@ -668,7 +668,10 @@ The MAC algorithm is used in protocol version 2
 for data integrity protection.
 Multiple algorithms must be comma-separated.
 The default is:
-.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
+.Bd -literal -offset indent
+hmac-md5,hmac-sha1,umac-64@openssh.com,
+hmac-ripemd160,hmac-sha1-96,hmac-md5-96
+.Ed
 .It Cm NoHostAuthenticationForLocalhost
 This option can be used if the home directory is shared across machines.
 In this case localhost will refer to a different machine on each of

diff --git a/ssh_config.5 b/ssh_config.5 index 532bb191a..585a36878 100644 --- a/ssh_config.5 +++ b/ssh_config.5
@@ -34,8 +34,8 @@
34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36	.\"	36	.\"
37	.\" $OpenBSD: ssh_config.5,v 1.98 2007/01/10 13:23:22 jmc Exp $	37	.\" $OpenBSD: ssh_config.5,v 1.102 2007/08/15 12:13:41 stevesk Exp $
38	.Dd September 25, 1999	38	.Dd $Mdocdate: August 15 2007 $
39	.Dt SSH_CONFIG 5	39	.Dt SSH_CONFIG 5
40	.Os	40	.Os
41	.Sh NAME	41	.Sh NAME
@@ -393,7 +393,7 @@ data).
393	Specifies whether	393	Specifies whether
394	.Xr ssh 1	394	.Xr ssh 1
395	should terminate the connection if it cannot set up all requested	395	should terminate the connection if it cannot set up all requested
396	dynamic, local, and remote port forwardings.	396	dynamic, tunnel, local, and remote port forwardings.
397	The argument must be	397	The argument must be
398	.Dq yes	398	.Dq yes
399	or	399	or
@@ -668,7 +668,10 @@ The MAC algorithm is used in protocol version 2
668	for data integrity protection.	668	for data integrity protection.
669	Multiple algorithms must be comma-separated.	669	Multiple algorithms must be comma-separated.
670	The default is:	670	The default is:
671	.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .	671	.Bd -literal -offset indent
		672	hmac-md5,hmac-sha1,umac-64@openssh.com,
		673	hmac-ripemd160,hmac-sha1-96,hmac-md5-96
		674	.Ed
672	.It Cm NoHostAuthenticationForLocalhost	675	.It Cm NoHostAuthenticationForLocalhost
673	This option can be used if the home directory is shared across machines.	676	This option can be used if the home directory is shared across machines.
674	In this case localhost will refer to a different machine on each of	677	In this case localhost will refer to a different machine on each of