2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b3d777ac4..991eb8c93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,9 @@
    - jmc@cvs.openbsd.org 2008/10/09 06:54:22
      [ssh.c]
      add -y to usage();
+   - stevesk@cvs.openbsd.org 2008/10/10 04:55:16
+     [scp.c]
+     spelling in comment; ok djm@
 
 20080906
  - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4793,4 +4796,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.5112 2008/11/03 08:23:28 djm Exp $
+$Id: ChangeLog,v 1.5113 2008/11/03 08:23:45 djm Exp $
diff --git a/scp.c b/scp.c
index 9f8b7a192..323747806 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.163 2008/06/13 18:55:22 dtucker Exp $ */
+/* $OpenBSD: scp.c,v 1.164 2008/10/10 04:55:16 stevesk Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -434,7 +434,7 @@ main(int argc, char **argv)
         }
         /*
          * Finally check the exit status of the ssh process, if one was forked
-         * and no error has occured yet
+         * and no error has occurred yet
          */
         if (do_cmd_pid != -1 && errs == 0) {
                 if (remin != -1)