summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-02-19 22:08:17 +1100
committerDarren Tucker <dtucker@zip.com.au>2007-02-19 22:08:17 +1100
commitbf6b328f27ec0e99fbcd5a22f1eab139be0a1fc0 (patch)
tree1d44a87345f2db846e94ec1485bc6c1160244d80
parente42bd24b22bdce7e58b517d0b797d1d66bbec52b (diff)
- jmc@cvs.openbsd.org 2007/01/10 13:23:22
[ssh_config.5] do not use a list for SYNOPSIS; this is actually part of a larger report sent by eric s. raymond and forwarded by brad, but i only read half of it. spotted by brad.
-rw-r--r--ChangeLog10
-rw-r--r--ssh_config.58
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 481bcfddf..fa869b11f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
120070219
2 - (dtucker) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2007/01/10 13:23:22
4 [ssh_config.5]
5 do not use a list for SYNOPSIS;
6 this is actually part of a larger report sent by eric s. raymond
7 and forwarded by brad, but i only read half of it. spotted by brad.
8
120070128 920070128
2 - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52) 10 - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52)
3 when closing a tty session when a background process still holds tty 11 when closing a tty session when a background process still holds tty
@@ -2692,4 +2700,4 @@
2692 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2700 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2693 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2701 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2694 2702
2695$Id: ChangeLog,v 1.4609 2007/01/28 23:16:28 djm Exp $ 2703$Id: ChangeLog,v 1.4610 2007/02/19 11:08:17 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 20c58934a..c1ad53dcf 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.97 2006/07/27 08:00:50 jmc Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.98 2007/01/10 13:23:22 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
@@ -42,10 +42,8 @@
42.Nm ssh_config 42.Nm ssh_config
43.Nd OpenSSH SSH client configuration files 43.Nd OpenSSH SSH client configuration files
44.Sh SYNOPSIS 44.Sh SYNOPSIS
45.Bl -tag -width Ds -compact 45.Nm ~/.ssh/config
46.It Pa ~/.ssh/config 46.Nm /etc/ssh/ssh_config
47.It Pa /etc/ssh/ssh_config
48.El
49.Sh DESCRIPTION 47.Sh DESCRIPTION
50.Xr ssh 1 48.Xr ssh 1
51obtains configuration data from the following sources in 49obtains configuration data from the following sources in