summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
authorajacoutot <ajacoutot@openbsd.org>2014-03-26 23:03:59 +0000
committerajacoutot <ajacoutot@openbsd.org>2014-03-26 23:03:59 +0000
commite631ba14cc12bd46f8e1d454ede4c4246b98bbf6 (patch)
tree66ec67efd1a8426d3012f76dda8fb511bab69c22 /usr.sbin/sysmerge/sysmerge.8
parentPreviously, C-t (transpose two chars) did not behave the same as (diff)
downloadwireguard-openbsd-e631ba14cc12bd46f8e1d454ede4c4246b98bbf6.tar.xz
wireguard-openbsd-e631ba14cc12bd46f8e1d454ede4c4246b98bbf6.zip
login.conf(5) is not special anymore.
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r--usr.sbin/sysmerge/sysmerge.85
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index 6f67c9f260f..3cbc690ad58 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.44 2014/01/28 09:42:42 ajacoutot Exp $
+.\" $OpenBSD: sysmerge.8,v 1.45 2014/03/26 23:03:59 ajacoutot Exp $
.\"
.\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@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: January 28 2014 $
+.Dd $Mdocdate: March 26 2014 $
.Dt SYSMERGE 8
.Os
.Sh NAME
@@ -106,7 +106,6 @@ It automatically installs missing files and binaries,
and updates files differing only by CVS Id.
Files whose reference sources have matching CVS Id are skipped from comparison.
.Pa /etc/fbtab ,
-.Pa /etc/login.conf ,
.Pa /etc/sysctl.conf ,
and
.Pa /etc/ttys