From 410473acf0d0463c5c7d38db972a1440064a3b95 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Fri, 10 Mar 2006 18:40:31 +0000
Subject: [PATCH] Add note about 'audit' group. Add note about the '_dhcp'
 user.

While one is expected to run mergemaster -p before installworld, make
a note of the points where this will actively fail due to the addition of
users/groups.
---
 UPDATING | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/UPDATING b/UPDATING
index 78f569ddaa9e..d2b0f976d007 100644
--- a/UPDATING
+++ b/UPDATING
@@ -32,6 +32,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW:
 	for Linux apps because it will pull in 3dfx.ko and linux.ko through
 	its dependencies.
 
+20060204:
+	The 'audit' group was added to support the new auditing functionality
+	in the base system.  Be sure to follow the directions for updating,
+	including the requirement to run mergemaster -p.
+
 20060201:
 	The kernel ABI to file system modules was changed on i386.
 	Please make sure that your kernel and modules are in sync.
@@ -168,6 +173,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW:
 	must now run devd.  Also, DNS updating was lost so you will need
 	to find a workaround if you use this feature.
 
+	The '_dhcp' user was added to support the OpenBSD dhclient.  Be
+	sure to run mergemaster -p (like you are supposed to do every time
+	anyway).
+
 20050605:
 	if_bridge was added to the tree. This has changed struct ifnet.
 	Please recompile userland and all network related modules.