diff --git a/src/etc/etc.alpha/login.conf b/src/etc/etc.alpha/login.conf
index 58c8b629..019c86a8 100644
--- a/src/etc/etc.alpha/login.conf
+++ b/src/etc/etc.alpha/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
+# $OpenBSD: login.conf,v 1.7 2019/06/02 06:46:17 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.amd64/login.conf b/src/etc/etc.amd64/login.conf
index 7224b1dc..72ea8b39 100644
--- a/src/etc/etc.amd64/login.conf
+++ b/src/etc/etc.amd64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.10 2019/05/02 08:35:10 ajacoutot Exp $
+# $OpenBSD: login.conf,v 1.11 2019/06/02 06:46:17 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.arm64/login.conf b/src/etc/etc.arm64/login.conf
index 1723ff09..05c2e49e 100644
--- a/src/etc/etc.arm64/login.conf
+++ b/src/etc/etc.arm64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.3 2019/01/24 13:14:10 kettenis Exp $
+# $OpenBSD: login.conf,v 1.4 2019/06/02 06:46:17 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.armv7/login.conf b/src/etc/etc.armv7/login.conf
index 58c8b629..019c86a8 100644
--- a/src/etc/etc.armv7/login.conf
+++ b/src/etc/etc.armv7/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
+# $OpenBSD: login.conf,v 1.7 2019/06/02 06:46:17 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.hppa/login.conf b/src/etc/etc.hppa/login.conf
index ccead3de..c1b5455b 100644
--- a/src/etc/etc.hppa/login.conf
+++ b/src/etc/etc.hppa/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.8 2019/02/19 01:51:31 jsg Exp $
+# $OpenBSD: login.conf,v 1.9 2019/06/02 06:46:17 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.i386/login.conf b/src/etc/etc.i386/login.conf
index 974c78d6..83610e6e 100644
--- a/src/etc/etc.i386/login.conf
+++ b/src/etc/etc.i386/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.7 2017/02/06 18:11:33 sthen Exp $
+# $OpenBSD: login.conf,v 1.8 2019/06/02 06:46:18 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.landisk/login.conf b/src/etc/etc.landisk/login.conf
index 58c8b629..1e65a4a4 100644
--- a/src/etc/etc.landisk/login.conf
+++ b/src/etc/etc.landisk/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
+# $OpenBSD: login.conf,v 1.7 2019/06/02 06:46:18 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.loongson/login.conf b/src/etc/etc.loongson/login.conf
index d97b6a8c..c14dabd1 100644
--- a/src/etc/etc.loongson/login.conf
+++ b/src/etc/etc.loongson/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.7 2017/08/16 18:06:55 deraadt Exp $
+# $OpenBSD: login.conf,v 1.8 2019/06/02 06:46:18 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.luna88k/login.conf b/src/etc/etc.luna88k/login.conf
index 58c8b629..1e65a4a4 100644
--- a/src/etc/etc.luna88k/login.conf
+++ b/src/etc/etc.luna88k/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.6 2017/02/06 18:11:33 sthen Exp $
+# $OpenBSD: login.conf,v 1.7 2019/06/02 06:46:18 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.macppc/login.conf b/src/etc/etc.macppc/login.conf
index 78600882..3c56b2fc 100644
--- a/src/etc/etc.macppc/login.conf
+++ b/src/etc/etc.macppc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.7 2017/02/06 18:11:33 sthen Exp $
+# $OpenBSD: login.conf,v 1.8 2019/06/02 06:46:18 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.octeon/login.conf b/src/etc/etc.octeon/login.conf
index d97b6a8c..c14dabd1 100644
--- a/src/etc/etc.octeon/login.conf
+++ b/src/etc/etc.octeon/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.7 2017/08/16 18:06:55 deraadt Exp $
+# $OpenBSD: login.conf,v 1.8 2019/06/02 06:46:18 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.sgi/login.conf b/src/etc/etc.sgi/login.conf
index d97b6a8c..c14dabd1 100644
--- a/src/etc/etc.sgi/login.conf
+++ b/src/etc/etc.sgi/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.7 2017/08/16 18:06:55 deraadt Exp $
+# $OpenBSD: login.conf,v 1.8 2019/06/02 06:46:18 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\
diff --git a/src/etc/etc.sparc64/login.conf b/src/etc/etc.sparc64/login.conf
index b059738e..afad47a2 100644
--- a/src/etc/etc.sparc64/login.conf
+++ b/src/etc/etc.sparc64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.9 2019/02/19 01:51:31 jsg Exp $
+# $OpenBSD: login.conf,v 1.10 2019/06/02 06:46:18 jmc Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -8,7 +8,7 @@
 # Standard authentication styles:
 #
 # passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
+# chpass	Do not authenticate, but change user's password (change
 #		the YP password if the user has one, else change the
 #		local password)
 # lchpass	Do not login; change user's local password instead
@@ -33,7 +33,7 @@ auth-ftp-defaults:auth-ftp=passwd:
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
+# to read something like: (enables passwd, "myauth", and activ)
 #	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
@@ -55,7 +55,7 @@ default:\
 #
 # Settings used by /etc/rc and root
 # This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
+# Be sure to reset these values to system defaults in the default class!
 #
 daemon:\
 	:ignorenologin:\