diff options
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 5 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 3cbc690ad58..ac8d3cd9170 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.45 2014/03/26 23:03:59 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.46 2014/07/10 11:00:03 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: March 26 2014 $ +.Dd $Mdocdate: July 10 2014 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -169,7 +169,6 @@ The following files will always be skipped from comparison: .Pa /var/db/locate.database , .Pa /var/db/sysmerge/etcsum , .Pa /var/db/sysmerge/xetcsum , -.Pa /var/games/tetris.scores , .Pa /var/mail/root . .Pp The diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index f27e88fe000..83c237c7da7 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.133 2014/03/27 07:27:04 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.134 2014/07/10 11:00:03 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -218,7 +218,6 @@ sm_populate() { /etc/myname /var/db/locate.database /var/db/sysmerge/{etc,xetc}sum - /var/games/tetris.scores /var/mail/root" CF_FILES="/etc/mail/localhost.cf /etc/mail/sendmail.cf /etc/mail/submit.cf" for cf in ${CF_FILES}; do |