From 1a81258f4ee82e1f9d9d48a2ed93b93d6ce0485d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 20 Apr 2004 20:13:32 +1000 Subject: - jmc@cvs.openbsd.org 2004/04/19 16:12:14 [ssh_config.5] kill whitespace at eol; --- ChangeLog | 5 ++++- ssh_config.5 | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0dfc4bebc..45c1ba5e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,9 @@ [ssh.1 ssh_config.5] document strict permission checks on ~/.ssh/config; prompted by, with & ok jmc@ + - jmc@cvs.openbsd.org 2004/04/19 16:12:14 + [ssh_config.5] + kill whitespace at eol; - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for above change 20040419 @@ -1018,4 +1021,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3325 2004/04/20 10:12:53 djm Exp $ +$Id: ChangeLog,v 1.3326 2004/04/20 10:13:32 djm Exp $ diff --git a/ssh_config.5 b/ssh_config.5 index 75637e316..df479c63a 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -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_config.5,v 1.30 2004/04/19 13:02:40 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.31 2004/04/19 16:12:14 jmc Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -410,7 +410,7 @@ identities will be tried in sequence. Specifies that .Nm ssh should only use the authentication identity files configured in the -.Nm +.Nm files, even if the .Nm ssh-agent -- cgit v1.2.3