diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-09-05 07:16:38 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-09-05 07:16:38 +0000 |
| commit | c016ca8342ebf178d170b35c8ffbc20aa0e93f97 (patch) | |
| tree | e02e5a1d268a019ccead9e9d5a48a05237b04ece /usr.sbin/sysmerge/sysmerge.8 | |
| parent | update libnet to 1.27; various bugfixes and improvements: (diff) | |
| download | wireguard-openbsd-c016ca8342ebf178d170b35c8ffbc20aa0e93f97.tar.xz wireguard-openbsd-c016ca8342ebf178d170b35c8ffbc20aa0e93f97.zip | |
/etc/{hosts,myname} are going away from etc.tgz.
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index f1d1ea2196e..b4ad5a79bd9 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.63 2014/08/30 14:44:20 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.64 2014/09/05 07:16:38 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: August 30 2014 $ +.Dd $Mdocdate: September 5 2014 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -114,13 +114,14 @@ against their target on the system (@sample). .Pp Files can be excluded from comparison by listing them in .Pa /etc/sysmerge.ignore . -The following files will always be skipped from comparison: +The following files will always be skipped from direct comparison: .Pa /etc/*.db , +.Pa /etc/group, .Pa /etc/localtime , .Pa /etc/mail/*.db , +.Pa /etc/master.passwd , .Pa /etc/passwd , .Pa /etc/motd , -.Pa /etc/myname , .Pa /var/db/locate.database , .Pa /usr/share/sysmerge/etcsum , .Pa /usr/share/sysmerge/examplessum , |