2 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9609b4d61..14eb11514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20080612
+ - (dtucker) OpenBSD CVS Sync
+   - jmc@cvs.openbsd.org 2008/06/11 07:30:37
+     [sshd.8]
+     kill trailing whitespace;
+
 20080611
  - (djm) [channels.c configure.ac]
    Do not set SO_REUSEADDR on wildcard X11 listeners (X11UseLocalhost=no)
@@ -4159,4 +4165,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4967 2008/06/11 20:05:12 djm Exp $
+$Id: ChangeLog,v 1.4968 2008/06/12 18:32:00 dtucker Exp $
diff --git a/sshd.8 b/sshd.8
index 0ae02ea3e..fdbe7abfa 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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: sshd.8,v 1.244 2008/06/10 23:06:19 djm Exp $
-.Dd $Mdocdate: June 10 2008 $
+.\" $OpenBSD: sshd.8,v 1.245 2008/06/11 07:30:37 jmc Exp $
+.Dd $Mdocdate: June 11 2008 $
 .Dt SSHD 8
 .Os
 .Sh NAME
@@ -532,7 +532,7 @@ This option is automatically disabled if
 is enabled.
 .It Cm from="pattern-list"
 Specifies that in addition to public key authentication, either the canonical
-name of the remote host or its IP address must be present in the 
+name of the remote host or its IP address must be present in the
 comma-separated list of patterns.
 See
 .Sx PATTERNS