Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet. ProtocolKeepAlives is now just a compatibility alias for ServerAliveInterval.
author: Colin Watson <cjwatson@debian.org> 2004-03-01 02:25:32 +0000
committer: Colin Watson <cjwatson@debian.org> 2004-03-01 02:25:32 +0000
commit: ea8116a11e3de70036dbc665ccb0d486cf89cac9 (patch)
tree: d73ccdff78d8608e156465af42e6a1b3527fb2d6 /nchan.ms
parent: e39b311381a5609cc05acf298c42fba196dc524b (diff)
parent: f5bda272678ec6dccaa5f29379cf60cb855018e8 (diff)
1 files changed, 4 insertions, 4 deletions
diff --git a/nchan.ms b/nchan.ms
index 2d080228c..57576017b 100644
--- a/nchan.ms
+++ b/nchan.ms
@@ -1,8 +1,8 @@
-.\"     $OpenBSD: nchan.ms,v 1.7 2001/01/29 01:58:17 niklas Exp $
+.\"     $OpenBSD: nchan.ms,v 1.8 2003/11/21 11:57:03 djm Exp $
+.\"
 .\"
-.\" 
 .\" Copyright (c) 1999 Markus Friedl.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -11,7 +11,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
author	Colin Watson <cjwatson@debian.org>	2004-03-01 02:25:32 +0000
committer	Colin Watson <cjwatson@debian.org>	2004-03-01 02:25:32 +0000
commit	ea8116a11e3de70036dbc665ccb0d486cf89cac9 (patch)
tree	d73ccdff78d8608e156465af42e6a1b3527fb2d6 /nchan.ms
parent	e39b311381a5609cc05acf298c42fba196dc524b (diff)
parent	f5bda272678ec6dccaa5f29379cf60cb855018e8 (diff)

diff --git a/nchan.ms b/nchan.ms index 2d080228c..57576017b 100644 --- a/nchan.ms +++ b/nchan.ms
@@ -1,8 +1,8 @@
1	.\" $OpenBSD: nchan.ms,v 1.7 2001/01/29 01:58:17 niklas Exp $	1	.\" $OpenBSD: nchan.ms,v 1.8 2003/11/21 11:57:03 djm Exp $
		2	.\"
2	.\"	3	.\"
3	.\"
4	.\" Copyright (c) 1999 Markus Friedl. All rights reserved.	4	.\" Copyright (c) 1999 Markus Friedl. All rights reserved.
5	.\"	5	.\"
6	.\" Redistribution and use in source and binary forms, with or without	6	.\" Redistribution and use in source and binary forms, with or without
7	.\" modification, are permitted provided that the following conditions	7	.\" modification, are permitted provided that the following conditions
8	.\" are met:	8	.\" are met:
@@ -11,7 +11,7 @@
11	.\" 2. Redistributions in binary form must reproduce the above copyright	11	.\" 2. Redistributions in binary form must reproduce the above copyright
12	.\" notice, this list of conditions and the following disclaimer in the	12	.\" notice, this list of conditions and the following disclaimer in the
13	.\" documentation and/or other materials provided with the distribution.	13	.\" documentation and/or other materials provided with the distribution.
14	.\"	14	.\"
15	.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR	15	.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
16	.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	16	.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
17	.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.	17	.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.