* New upstream release:

  - Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative
    paths.
  - Include a language tag when sending a protocol 2 disconnection
    message.
  - Make logging of certificates used for user authentication more clear
    and consistent between CAs specified using TrustedUserCAKeys and
    authorized_keys.

1 files changed, 5 insertions, 9 deletions

diff --git a/ssh_config.5 b/ssh_config.5
index 91c0e1bb0..45496cfbc 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.129 2010/03/05 10:28:21 djm Exp $
-.Dd $Mdocdate: March 5 2010 $
+.\" $OpenBSD: ssh_config.5,v 1.130 2010/03/26 01:06:13 dtucker Exp $
+.Dd $Mdocdate: March 26 2010 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -144,8 +144,8 @@ Valid arguments are
 If set to
 .Dq yes ,
 passphrase/password querying will be disabled.
-In addition, the 
-.Cm ServerAliveInterval 
+In addition, the
+.Cm ServerAliveInterval
 option will be set to 300 seconds by default.
 This option is useful in scripts and other batch jobs where no user
 is present to supply the password,
@@ -785,11 +785,7 @@ This allows a client to prefer one method (e.g.\&
 over another method (e.g.\&
 .Cm password )
 The default for this option is:
-.Do gssapi-with-mic ,
-hostbased,
-publickey,
-keyboard-interactive,
-password
+.Do gssapi-with-mic,hostbased,publickey,keyboard-interactive,password
 .Dc .
 .It Cm Protocol
 Specifies the protocol versions