summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
authorajacoutot <ajacoutot@openbsd.org>2016-05-14 14:44:35 +0000
committerajacoutot <ajacoutot@openbsd.org>2016-05-14 14:44:35 +0000
commit433f4746dfa7d5fd8b79f90f4a6c1b6aa5d5e7ec (patch)
treee074d6ab596be272916cf66e3b0fc3c45682cbb8 /usr.sbin/sysmerge/sysmerge.8
parentRevert previous commit. Converting bcopy into memcpy is never safe when (diff)
downloadwireguard-openbsd-433f4746dfa7d5fd8b79f90f4a6c1b6aa5d5e7ec.tar.xz
wireguard-openbsd-433f4746dfa7d5fd8b79f90f4a6c1b6aa5d5e7ec.zip
Remove handling of /etc/examples/ files by sysmerge(8). Getting regular messages
about pkg.conf isn't really that helpful and if a big syntax change comes along well we have current.html. it was disabled during p2k16 and no one complained so far discussed with and ok deraadt@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r--usr.sbin/sysmerge/sysmerge.810
1 files changed, 2 insertions, 8 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index eaf193410f7..872e9c920b5 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.76 2016/04/27 21:04:34 ajacoutot Exp $
+.\" $OpenBSD: sysmerge.8,v 1.77 2016/05/14 14:44:35 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: April 27 2016 $
+.Dd $Mdocdate: May 14 2016 $
.Dt SYSMERGE 8
.Os
.Sh NAME
@@ -42,12 +42,6 @@ with at a later date.
Should any problems occur,
such as a failure to upgrade a file,
the user will be notified and will have to deal with the issue by hand.
-.Nm
-will also compare the checksum of each file stored under
-.Pa /etc/examples
-against the previous one then warn if it does not match and the
-corresponding file exists under
-.Pa /etc .
.Pp
By default (if
.Fl d