more e-mail -> email

3 files changed, 8 insertions, 8 deletions

diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 8eb7eb52dfc..5e3c3dceb6a 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: adduser.8,v 1.43 2014/10/01 09:56:36 mpi Exp $
+.\"	$OpenBSD: adduser.8,v 1.44 2015/12/24 16:54:37 mmcc Exp $
 .\"
 .\" Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $From: adduser.8,v 1.12 1996/08/28 17:54:13 adam Exp $
-.Dd $Mdocdate: October 1 2014 $
+.Dd $Mdocdate: December 24 2015 $
 .Dt ADDUSER 8
 .Os
 .Sh NAME
@@ -241,7 +241,7 @@ Login names may not be longer than 31 characters.
 .\" world; people have done this and it works, but you will have problems
 .\" with any precompiled programs, or source that assumes the 8-character
 .\" name limit and NIS. The NIS protocol mandates an 8-character username.
-If you need a longer login name for e-mail addresses,
+If you need a longer login name for email addresses,
 you can define an alias in
 .Pa /etc/mail/aliases .
 .It Sy fullname
diff --git a/usr.sbin/smtpd/bounce.c b/usr.sbin/smtpd/bounce.c
index 387f901b58b..38ab5b5aac8 100644
--- a/usr.sbin/smtpd/bounce.c
+++ b/usr.sbin/smtpd/bounce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bounce.c,v 1.70 2015/12/14 10:31:25 sunil Exp $	*/
+/*	$OpenBSD: bounce.c,v 1.71 2015/12/24 16:54:37 mmcc Exp $	*/
 
 /*
  * Copyright (c) 2009 Gilles Chehade <gilles@poolp.org>
@@ -340,7 +340,7 @@ bounce_duration(long long int d)
 
 #define NOTICE_INTRO							    \
 	"    Hi!\n\n"							    \
-	"    This is the MAILER-DAEMON, please DO NOT REPLY to this e-mail.\n"
+	"    This is the MAILER-DAEMON, please DO NOT REPLY to this email.\n"
 
 const char *notice_error =
     "    An error has occurred while attempting to deliver a message for\n"
diff --git a/usr.sbin/snmpd/snmpd.conf.5 b/usr.sbin/snmpd/snmpd.conf.5
index e85fce1012b..f4c399f4990 100644
--- a/usr.sbin/snmpd/snmpd.conf.5
+++ b/usr.sbin/snmpd/snmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpd.conf.5,v 1.33 2015/07/18 16:30:57 reyk Exp $
+.\" $OpenBSD: snmpd.conf.5,v 1.34 2015/12/24 16:54:37 mmcc Exp $
 .\"
 .\" Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 18 2015 $
+.Dd $Mdocdate: December 24 2015 $
 .Dt SNMPD.CONF 5
 .Os
 .Sh NAME
@@ -140,7 +140,7 @@ By default
 is created and no other sockets are created.
 .It Ic system contact Ar string
 Specify the name or description of the system contact, typically a
-name or an e-mail address.
+name or an email address.
 The default value is
 .Ar root@hostname
 using the hostname of the local machine.