summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.54
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ca87fda0..2a43234ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,9 @@
40 - dtucker@cvs.openbsd.org 2006/03/30 11:40:21 40 - dtucker@cvs.openbsd.org 2006/03/30 11:40:21
41 [auth.c monitor.c] 41 [auth.c monitor.c]
42 Prevent duplicate log messages when privsep=yes; ok djm@ 42 Prevent duplicate log messages when privsep=yes; ok djm@
43 - jmc@cvs.openbsd.org 2006/03/31 09:09:30
44 [ssh_config.5]
45 kill trailing whitespace;
43 46
4420060326 4720060326
45 - OpenBSD CVS Sync 48 - OpenBSD CVS Sync
@@ -4489,4 +4492,4 @@
4489 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4492 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4490 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4493 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4491 4494
4492$Id: ChangeLog,v 1.4298 2006/03/31 12:14:23 djm Exp $ 4495$Id: ChangeLog,v 1.4299 2006/03/31 12:14:41 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 9c621336e..a1c2a5fbe 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
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.90 2006/03/30 10:41:25 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.91 2006/03/31 09:09:30 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -550,7 +550,7 @@ Additionally, any identities represented by the authentication agent
550will be used for authentication. 550will be used for authentication.
551.Pp 551.Pp
552The file name may use the tilde 552The file name may use the tilde
553syntax to refer to a user's home directory or one of the following 553syntax to refer to a user's home directory or one of the following
554escape characters: 554escape characters:
555.Ql %d 555.Ql %d
556(local user's home directory), 556(local user's home directory),