1 files changed, 5 insertions, 6 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 78a542dc0..36b1af195 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.154 2011/09/09 00:43:00 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.157 2012/06/29 13:57:25 naddy Exp $
-.Dd $Mdocdate: September 9 2011 $
+.Dd $Mdocdate: June 29 2012 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -612,7 +612,7 @@ offers many different identities.
 The default is
 .Dq no .
 .It Cm IdentityFile
-Specifies a file from which the user's DSA, ECDSA or DSA authentication
+Specifies a file from which the user's DSA, ECDSA or RSA authentication
 identity is read.
 The default is
 .Pa ~/.ssh/identity
@@ -793,9 +793,8 @@ Multiple algorithms must be comma-separated.
 The default is:
 .Bd -literal -offset indent
 hmac-md5,hmac-sha1,umac-64@openssh.com,
-hmac-ripemd160,hmac-sha1-96,hmac-md5-96,
+hmac-sha2-256,hmac-sha2-512,hmac-ripemd160,
-hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,
+hmac-sha1-96,hmac-md5-96
-hmac-sha2-512-96
 .Ed
 .It Cm NoHostAuthenticationForLocalhost
 This option can be used if the home directory is shared across machines.

diff --git a/ssh_config.5 b/ssh_config.5 index 78a542dc0..36b1af195 100644 --- a/ssh_config.5 +++ b/ssh_config.5
@@ -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_config.5,v 1.154 2011/09/09 00:43:00 djm Exp $	36	.\" $OpenBSD: ssh_config.5,v 1.157 2012/06/29 13:57:25 naddy Exp $
37	.Dd $Mdocdate: September 9 2011 $	37	.Dd $Mdocdate: June 29 2012 $
38	.Dt SSH_CONFIG 5	38	.Dt SSH_CONFIG 5
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -612,7 +612,7 @@ offers many different identities.
612	The default is	612	The default is
613	.Dq no .	613	.Dq no .
614	.It Cm IdentityFile	614	.It Cm IdentityFile
615	Specifies a file from which the user's DSA, ECDSA or DSA authentication	615	Specifies a file from which the user's DSA, ECDSA or RSA authentication
616	identity is read.	616	identity is read.
617	The default is	617	The default is
618	.Pa ~/.ssh/identity	618	.Pa ~/.ssh/identity
@@ -793,9 +793,8 @@ Multiple algorithms must be comma-separated.
793	The default is:	793	The default is:
794	.Bd -literal -offset indent	794	.Bd -literal -offset indent
795	hmac-md5,hmac-sha1,umac-64@openssh.com,	795	hmac-md5,hmac-sha1,umac-64@openssh.com,
796	hmac-ripemd160,hmac-sha1-96,hmac-md5-96,	796	hmac-sha2-256,hmac-sha2-512,hmac-ripemd160,
797	hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,	797	hmac-sha1-96,hmac-md5-96
798	hmac-sha2-512-96
799	.Ed	798	.Ed
800	.It Cm NoHostAuthenticationForLocalhost	799	.It Cm NoHostAuthenticationForLocalhost
801	This option can be used if the home directory is shared across machines.	800	This option can be used if the home directory is shared across machines.