3 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index be12b11ab..26b7251bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
    - jmc@cvs.openbsd.org 2005/12/16 18:14:40
      [ssh.1]
      signpost the protocol sections;
+   - stevesk@cvs.openbsd.org 2005/12/17 21:13:05
+     [ssh_config.5 session.c]
+     spelling: fowarding, fowarded
 
 20051219
  - (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac
@@ -3490,4 +3493,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.4036 2005/12/20 05:12:24 dtucker Exp $
+$Id: ChangeLog,v 1.4037 2005/12/20 05:14:15 dtucker Exp $
diff --git a/session.c b/session.c
index 8d186dd7d..8826fabaa 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.189 2005/12/12 13:46:18 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.190 2005/12/17 21:13:05 stevesk Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1869,7 +1869,7 @@ session_x11_req(Session *s)
 
         if (s->auth_proto != NULL || s->auth_data != NULL) {
                 error("session_x11_req: session %d: "
-                    "x11 fowarding already active", s->self);
+                    "x11 forwarding already active", s->self);
                 return 0;
         }
         s->single_connection = packet_get_char();
diff --git a/ssh_config.5 b/ssh_config.5
index 50df0d432..56fc65ed0 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.69 2005/12/08 21:37:50 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.70 2005/12/17 21:13:05 stevesk Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -285,7 +285,7 @@ will continue without connecting to a master instance.
 X11 and
 .Xr ssh-agent 1
 forwarding is supported over these multiplexed connections, however the
-display and agent fowarded will be the one belonging to the master
+display and agent forwarded will be the one belonging to the master
 connection i.e. it is not possible to forward multiple displays or agents.
 .Pp
 Two additional options allow for opportunistic multiplexing: try to use a