Deleted Added
full compact
freebsd-update.conf (256281) freebsd-update.conf (258121)
1# $FreeBSD: stable/10/etc/freebsd-update.conf 196392 2009-08-19 20:47:31Z simon $
1# $FreeBSD: stable/10/etc/freebsd-update.conf 258121 2013-11-14 09:14:33Z glebius $
2
3# Trusted keyprint. Changing this is a Bad Idea unless you've received
4# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
5# change it and explaining why.
6KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
7
8# Server or server pool from which to fetch updates. You can change
9# this to point at a specific server if you want, but in most cases

--- 20 unchanged lines hidden (view full) ---

30
31# Paths which start with anything matching an entry in an UpdateIfUnmodified
32# statement will only be updated if the contents of the file have not been
33# modified by the user (unless changes are merged; see below).
34UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
35
36# When upgrading to a new FreeBSD release, files which match MergeChanges
37# will have any local changes merged into the version from the new release.
2
3# Trusted keyprint. Changing this is a Bad Idea unless you've received
4# a PGP-signed email from <security-officer@FreeBSD.org> telling you to
5# change it and explaining why.
6KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
7
8# Server or server pool from which to fetch updates. You can change
9# this to point at a specific server if you want, but in most cases

--- 20 unchanged lines hidden (view full) ---

30
31# Paths which start with anything matching an entry in an UpdateIfUnmodified
32# statement will only be updated if the contents of the file have not been
33# modified by the user (unless changes are merged; see below).
34UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
35
36# When upgrading to a new FreeBSD release, files which match MergeChanges
37# will have any local changes merged into the version from the new release.
38MergeChanges /etc/ /var/named/etc/ /boot/device.hints
38MergeChanges /etc/ /boot/device.hints
39
40### Default configuration options:
41
42# Directory in which to store downloaded updates and temporary
43# files used by FreeBSD Update.
44# WorkDir /var/db/freebsd-update
45
46# Destination to send output of "freebsd-update cron" if an error

--- 30 unchanged lines hidden ---
39
40### Default configuration options:
41
42# Directory in which to store downloaded updates and temporary
43# files used by FreeBSD Update.
44# WorkDir /var/db/freebsd-update
45
46# Destination to send output of "freebsd-update cron" if an error

--- 30 unchanged lines hidden ---