summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
authorajacoutot <ajacoutot@openbsd.org>2014-07-15 09:27:04 +0000
committerajacoutot <ajacoutot@openbsd.org>2014-07-15 09:27:04 +0000
commitb1ef1542d1b97943f366120cd793c8bd963eb800 (patch)
tree36efa73550be24265fcd0c2e975624ac986a7d67 /usr.sbin/sysmerge/sysmerge.8
parentfolded back into 4.4BSD.dist (diff)
downloadwireguard-openbsd-b1ef1542d1b97943f366120cd793c8bd963eb800.tar.xz
wireguard-openbsd-b1ef1542d1b97943f366120cd793c8bd963eb800.zip
/var/db/sysmerge -> /usr/share/sysmerge
ok deraadt@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r--usr.sbin/sysmerge/sysmerge.812
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index f5830524a10..3bcbc255c0f 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.49 2014/07/13 07:12:41 ajacoutot Exp $
+.\" $OpenBSD: sysmerge.8,v 1.50 2014/07/15 09:27:04 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: July 13 2014 $
+.Dd $Mdocdate: July 15 2014 $
.Dt SYSMERGE 8
.Os
.Sh NAME
@@ -175,9 +175,9 @@ The following files will always be skipped from comparison:
.Pa /etc/motd ,
.Pa /etc/myname ,
.Pa /var/db/locate.database ,
-.Pa /var/db/sysmerge/etcsum ,
-.Pa /var/db/sysmerge/examplessum ,
-.Pa /var/db/sysmerge/xetcsum ,
+.Pa /usr/share/sysmerge/etcsum ,
+.Pa /usr/share/sysmerge/examplessum ,
+.Pa /usr/share/sysmerge/xetcsum ,
.Pa /var/mail/root .
.Pp
The
@@ -195,7 +195,7 @@ and they are offered for comparison only if they really differ.
.It Ev DBDIR
Directory in which checksum files are stored.
If unset, this defaults to
-.Pa /var/db/sysmerge .
+.Pa /usr/share/sysmerge .
.It Ev DESTDIR
Directory in which to merge and install files.
If unset, this defaults to