- markus@cvs.openbsd.org 2001/05/19 16:46:19

     [ssh.1 sshd.8]
     document MACs defaults with .Dq

diff --git a/ChangeLog b/ChangeLog
index 9df02f9531b46df1216d99a0597d2e4356e9b4a0..da786334ac2c8f48a514719a0b9e731def5bcf5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
      change preferredauthentication order to               
         publickey,hostbased,password,keyboard-interactive  
      document that hostbased defaults to no, document order
+   - markus@cvs.openbsd.org 2001/05/19 16:46:19
+     [ssh.1 sshd.8]                            
+     document MACs defaults with .Dq           
 
 20010528
  - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c

diff --git a/ssh.1 b/ssh.1
index da1a4c7bdc34445fde393ceeb341c8316735b684..437484961fe4681e87c5e150a5b1226c5523fab3 100644 (file)
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (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.112 2001/05/19 16:32:16 markus Exp $
+.\" $OpenBSD: ssh.1,v 1.113 2001/05/19 16:46:19 markus Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -898,11 +898,7 @@ The MAC algorithm is used in protocol version 2
 for data integrity protection.
 Multiple algorithms must be comma-separated.
 The default is
-.Pp
-.Bd -literal
-  ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-ripemd160@openssh.com,
-    hmac-sha1-96,hmac-md5-96''
-.Ed
+.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
 .It Cm NumberOfPasswordPrompts
 Specifies the number of password prompts before giving up.
 The argument to this keyword must be an integer.

diff --git a/sshd.8 b/sshd.8
index 27eb0d6bf225fa1ac8dd02fdc54f4631ff560a3c..26201528ccb5e7b6e92e48f72d4d5b0d615fac6a 100644 (file)
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
 .\" (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: sshd.8,v 1.122 2001/05/19 16:08:43 markus Exp $
+.\" $OpenBSD: sshd.8,v 1.123 2001/05/19 16:46:19 markus Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -586,11 +586,7 @@ The MAC algorithm is used in protocol version 2
 for data integrity protection.
 Multiple algorithms must be comma-separated.
 The default is
-.Pp
-.Bd -literal
-  ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-ripemd160@openssh.com,
-    hmac-sha1-96,hmac-md5-96''
-.Ed
+.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
 .It Cm MaxStartups
 Specifies the maximum number of concurrent unauthenticated connections to the
 .Nm