more e-mail -> email

8 files changed, 21 insertions, 21 deletions

diff --git a/share/man/man8/starttls.8 b/share/man/man8/starttls.8
index d74823a4bb9..82ab8851265 100644
--- a/share/man/man8/starttls.8
+++ b/share/man/man8/starttls.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: starttls.8,v 1.21 2015/08/14 14:03:27 millert Exp $
+.\" $OpenBSD: starttls.8,v 1.22 2015/12/24 16:54:37 mmcc Exp $
 .\"
 .\" Copyright (c) 2001 Jose Nazario <jose@monkey.org>
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 14 2015 $
+.Dd $Mdocdate: December 24 2015 $
 .Dt STARTTLS 8
 .Os
 .Sh NAME
@@ -257,7 +257,7 @@ therefore still of value even with TLS at the MTA level.
 Because TLS can only authenticate at the server level, true
 end-to-end authentication of the mail message cannot be performed with
 only the use of STARTLS on the server.
-The use of S/MIME or PGP e-mail and trustworthy key hierarchies can guarantee
+The use of S/MIME or PGP email and trustworthy key hierarchies can guarantee
 full confidentiality and integrity of the entire message path.
 .Pp
 Furthermore, if a mail message traverses more than just the starting and
diff --git a/sys/dev/usb/umcs.h b/sys/dev/usb/umcs.h
index 193a74cd812..0ad3eb91028 100644
--- a/sys/dev/usb/umcs.h
+++ b/sys/dev/usb/umcs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: umcs.h,v 1.2 2015/11/07 19:06:05 miod Exp $ */
+/* $OpenBSD: umcs.h,v 1.3 2015/12/24 16:54:37 mmcc Exp $ */
 /* $NetBSD: umcs.h,v 1.1 2014/03/16 09:34:45 martin Exp $ */
 
 /*-
@@ -158,7 +158,7 @@
 
 
 /*
- * THIS ONE IS UNDOCUMENTED IN FULL DATASHEET, but e-mail from tech support
+ * THIS ONE IS UNDOCUMENTED IN FULL DATASHEET, but email from tech support
  * confirms, that it is register for GPIO_0 and GPIO_1 data input/output.
  * Chips has 2 GPIO, but first one (lower bit) MUST be used by device
  * authors as "number of port" indicator, grounded (0) for two-port
diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1
index b58e85178a9..9873e3968d8 100644
--- a/usr.bin/cvs/cvs.1
+++ b/usr.bin/cvs/cvs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cvs.1,v 1.127 2011/03/26 20:47:57 jmc Exp $
+.\"	$OpenBSD: cvs.1,v 1.128 2015/12/24 16:54:37 mmcc Exp $
 .\"
 .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
 .\" Copyright (c) 2004-2008 Xavier Santolaria <xsa@openbsd.org>
@@ -24,7 +24,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 26 2011 $
+.Dd $Mdocdate: December 24 2015 $
 .Dt CVS 1
 .Os
 .Sh NAME
@@ -678,7 +678,7 @@ command lists the users with edition rights on a file.
 For that, pseudo-lock mode must be enabled (see the
 .Ic watch
 command).
-The e-mail address of the user editing the file, the timestamp
+The email address of the user editing the file, the timestamp
 when the edition first started, the host from where the edition
 has been requested and the path to the edited file are listed.
 .Bd -literal -offset indent
diff --git a/usr.bin/openssl/ca.c b/usr.bin/openssl/ca.c
index 8727d9c3389..ba7b9413c2e 100644
--- a/usr.bin/openssl/ca.c
+++ b/usr.bin/openssl/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.19 2015/10/17 15:00:11 doug Exp $ */
+/* $OpenBSD: ca.c,v 1.20 2015/12/24 16:54:37 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1681,7 +1681,7 @@ again2:
 	if (verbose)
 		BIO_printf(bio_err, "The subject name appears to be ok, checking data base for clashes\n");
 
-	/* Build the correct Subject if no e-mail is wanted in the subject */
+	/* Build the correct Subject if no email is wanted in the subject */
 	/*
 	 * and add it later on because of the method extensions are added
 	 * (altName)
diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1
index dc593f42e74..c6cca39cd76 100644
--- a/usr.bin/openssl/openssl.1
+++ b/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.29 2015/09/21 13:13:06 bcook Exp $
+.\" $OpenBSD: openssl.1,v 1.30 2015/12/24 16:54:37 mmcc Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: September 21 2015 $
+.Dd $Mdocdate: December 24 2015 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -819,7 +819,7 @@ in the
 section).
 .It Fl noemailDN
 The DN of a certificate can contain the EMAIL field if present in the
-request DN, however it is good policy just having the e-mail set into
+request DN, however it is good policy just having the email set into
 the
 .Em altName
 extension of the certificate.
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.