- stevesk@cvs.openbsd.org 2005/12/17 21:13:05

     [ssh_config.5 session.c]
     spelling: fowarding, fowarded

diff --git a/ChangeLog b/ChangeLog
index 71ea49f6e30f47c5e0e3b19791a81549dcabf729..0e31d7ee0fa7ef9bd1f79ba54cd0b52c1c50692e 100644 (file)
--- 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

diff --git a/session.c b/session.c
index 8d186dd7d4b4eb25d00545070725592200fc4550..8826fabaa401ba21670e19b909a97548b62bf607 100644 (file)
--- 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 50df0d432df3d12ebd3d0de94fd5a3ede7dde3a8..56fc65ed029025b84bb51af45c310c78296e0b54 100644 (file)
--- 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