fix typos.

ok jmc@

9 files changed, 22 insertions, 22 deletions

diff --git a/usr.sbin/smtpd/ioev.c b/usr.sbin/smtpd/ioev.c
index c1d6736cb8b..802cd7098e4 100644
--- a/usr.sbin/smtpd/ioev.c
+++ b/usr.sbin/smtpd/ioev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioev.c,v 1.18 2014/04/19 17:36:54 gilles Exp $	*/
+/*	$OpenBSD: ioev.c,v 1.19 2014/07/08 07:59:31 sobrado Exp $	*/
 /*      
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -161,7 +161,7 @@ io_set_linger(int fd, int linger)
 
 /*
  * Event framing must not rely on an io pointer to refer to the "same" io
- * throughout the frame, beacuse this is not always the case:
+ * throughout the frame, because this is not always the case:
  *
  * 1) enter(addr0) -> free(addr0) -> leave(addr0) = SEGV
  * 2) enter(addr0) -> free(addr0) -> malloc == addr0 -> leave(addr0) = BAD!
@@ -203,7 +203,7 @@ io_frame_leave(struct io *io)
 	 * the response in the output buffer and goes to write mode.
 	 * There, the write event is set and will be triggered in the next
 	 * event frame.  In most case, the write call could be done
-	 * immediatly as part of the last read frame, thus avoiding to go
+	 * immediately as part of the last read frame, thus avoiding to go
 	 * through the event loop machinery. So, as an optimisation, we
 	 * could detect that case here and force an event dispatching.
 	 */
diff --git a/usr.sbin/smtpd/ioev.h b/usr.sbin/smtpd/ioev.h
index 91767d77419..cc0e42c1f52 100644
--- a/usr.sbin/smtpd/ioev.h
+++ b/usr.sbin/smtpd/ioev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioev.h,v 1.3 2013/01/26 09:37:23 gilles Exp $	*/
+/*	$OpenBSD: ioev.h,v 1.4 2014/07/08 07:59:31 sobrado Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -19,7 +19,7 @@
 
 enum {
 	IO_CONNECTED = 0, 	/* connection successful	*/
-	IO_TLSREADY,		/* TLS started succesfully	*/
+	IO_TLSREADY,		/* TLS started successfully	*/
 	IO_TLSVERIFIED,		/* XXX - needs more work	*/
 	IO_DATAIN,		/* new data in input buffer	*/
 	IO_LOWAT,		/* output queue running low	*/
@@ -48,7 +48,7 @@ struct io {
 	int		 state;
 	struct event	 ev;
 	void		*ssl;
-	const char	*error; /* only valid immediatly on callback */
+	const char	*error; /* only valid immediately on callback */
 };
 
 void io_set_blocking(int, int);
diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c
index 0eecd8767f4..c5ec554fe86 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mda.c,v 1.106 2014/04/30 09:17:29 gilles Exp $	*/
+/*	$OpenBSD: mda.c,v 1.107 2014/07/08 07:59:31 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -239,7 +239,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
 
 			/* start queueing delivery headers */
 			if (e->sender[0])
-				/* XXX: remove exising Return-Path, if any */
+				/* XXX: remove existing Return-Path, if any */
 				n = iobuf_fqueue(&s->iobuf,
 				    "Return-Path: %s\nDelivered-To: %s\n",
 				    e->sender, e->rcpt ? e->rcpt : e->dest);
diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index 2d3d8bee021..5cbefcbc13c 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mta.c,v 1.187 2014/05/20 18:47:01 eric Exp $	*/
+/*	$OpenBSD: mta.c,v 1.188 2014/07/08 07:59:31 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -892,7 +892,7 @@ mta_query_source(struct mta_relay *relay)
 	if (relay->sourcetable == NULL) {
 		/*
 		 * This is a recursive call, but it only happens once, since
-		 * another source will not be queried immediatly.
+		 * another source will not be queried immediately.
 		 */
 		mta_relay_ref(relay);
 		mta_on_source(relay, mta_source(NULL));
diff --git a/usr.sbin/smtpd/scheduler.c b/usr.sbin/smtpd/scheduler.c
index e9052e59566..9301a4259fb 100644
--- a/usr.sbin/smtpd/scheduler.c
+++ b/usr.sbin/smtpd/scheduler.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scheduler.c,v 1.45 2014/05/20 18:47:01 eric Exp $	*/
+/*	$OpenBSD: scheduler.c,v 1.46 2014/07/08 07:59:31 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -530,7 +530,7 @@ scheduler_timeout(int fd, short event, void *p)
 	left &= batch.mask;
 	left &= ~batch.type;
 
-	/* We can still schedule something immediatly. */
+	/* We can still schedule something immediately. */
 	if (left)
 		goto again;
 
diff --git a/usr.sbin/smtpd/scheduler_ramqueue.c b/usr.sbin/smtpd/scheduler_ramqueue.c
index fad0ce745b5..ffb05415a9c 100644
--- a/usr.sbin/smtpd/scheduler_ramqueue.c
+++ b/usr.sbin/smtpd/scheduler_ramqueue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scheduler_ramqueue.c,v 1.38 2014/04/19 13:51:24 gilles Exp $	*/
+/*	$OpenBSD: scheduler_ramqueue.c,v 1.39 2014/07/08 07:59:31 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
@@ -288,7 +288,7 @@ scheduler_ram_update(struct scheduler_info *si)
 
 	/*
 	 * If the envelope was removed while inflight,  schedule it for
-	 * removal immediatly.
+	 * removal immediately.
 	 */
 	if (evp->flags & RQ_ENVELOPE_REMOVED) {
 		TAILQ_INSERT_TAIL(&ramqueue.q_removed, evp, entry);
@@ -409,7 +409,7 @@ scheduler_ram_release(int type, uint64_t holdq, int n)
 		evp->holdq = 0;
 
 		/* When released, all envelopes are put in the pending queue
-		 * and will be rescheduled immediatly.  As an optimization,
+		 * and will be rescheduled immediately.  As an optimization,
 		 * we could just schedule them directly.
 		 */
 		evp->state = RQ_EVPSTATE_PENDING;
diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c
index 5ecb84b53e1..e53ef4382c0 100644
--- a/usr.sbin/smtpd/smtp.c
+++ b/usr.sbin/smtpd/smtp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtp.c,v 1.137 2014/04/29 19:13:13 reyk Exp $	*/
+/*	$OpenBSD: smtp.c,v 1.138 2014/07/08 07:59:31 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -359,7 +359,7 @@ smtp_collect(void)
 
 	if (env->sc_flags & SMTPD_SMTP_DISABLED) {
 		log_warnx("warn: smtp: "
-		    "fd exaustion over, re-enabling incoming connections");
+		    "fd exhaustion over, re-enabling incoming connections");
 		env->sc_flags &= ~SMTPD_SMTP_DISABLED;
 		smtp_resume();
 	}
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 55dff532287..6f94ff7fd7a 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtp_session.c,v 1.212 2014/07/04 15:24:46 eric Exp $	*/
+/*	$OpenBSD: smtp_session.c,v 1.213 2014/07/08 07:59:31 sobrado Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -995,7 +995,7 @@ smtp_command(struct smtp_session *s, char *line)
 	case CMD_HELO:
 	case CMD_EHLO:
 		if (s->phase != PHASE_INIT) {
-			smtp_reply(s, "503 %s %s: Already indentified",
+			smtp_reply(s, "503 %s %s: Already identified",
 			    esc_code(ESC_STATUS_PERMFAIL, ESC_INVALID_COMMAND),
 			    esc_description(ESC_INVALID_COMMAND));
 			break;
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 7522ec8f376..2e9f6e7fd33 100644
--- a/usr.sbin/smtpd/smtpd.conf.5
+++ b/usr.sbin/smtpd/smtpd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smtpd.conf.5,v 1.119 2014/06/07 07:53:32 jmc Exp $
+.\"	$OpenBSD: smtpd.conf.5,v 1.120 2014/07/08 07:59:31 sobrado Exp $
 .\"
 .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -17,7 +17,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.Dd $Mdocdate: June 7 2014 $
+.Dd $Mdocdate: July 8 2014 $
 .Dt SMTPD.CONF 5
 .Os
 .Sh NAME
@@ -893,7 +893,7 @@ the first line is used as the server name.
 Otherwise, the server name is derived from the local hostname returned by
 .Xr gethostname 3 ,
 either directly if it is a fully qualified domain name,
-or by retreiving the associated canonical name through
+or by retrieving the associated canonical name through
 .Xr getaddrinfo 3 .
 .It Pa /var/spool/smtpd/
 Spool directories for mail during processing.