2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 52660e2be..85a2545cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,9 @@
    - dtucker@cvs.openbsd.org 2005/10/30 08:29:29
      [canohost.c sshd.c]
      Check for connections with IP options earlier and drop silently.  ok djm@
+   - jmc@cvs.openbsd.org 2005/10/30 08:43:47
+     [ssh_config.5]
+     remove trailing whitespace;
 
 20051102
  - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@@ -3201,4 +3204,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.3943 2005/11/05 04:13:24 djm Exp $
+$Id: ChangeLog,v 1.3944 2005/11/05 04:13:49 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index fcbf1e594..13cdee88b 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.63 2005/10/30 01:23:19 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.64 2005/10/30 08:43:47 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -263,7 +263,7 @@ with
 set to
 .Dq no
 (the default).
-These sessions will try to reuse the master instance's network connection 
+These sessions will try to reuse the master instance's network connection
 rather than initiating new ones, but will fall back to connecting normally
 if the control socket does not exist, or is not listening.
 .Pp