Bump __FreeBSD_version for the pf install and write comments to UPDATING.

Approved by:	bms(mentor)

2 files changed, 12 insertions, 1 deletions

diff --git a/UPDATING b/UPDATING
index ad75f3e..7afcf4b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 5.x IS SLOW:
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20040308:
+	The packet filter (pf) is now installed with the base system. Make
+	sure to run mergemaster -p before installworld to create required
+	user accounts. If you do not want to build pf with your system you
+	can use the NO_PF knob in make.conf.
+	Also note that pf requires "options PFIL_HOOKS" in the kernel. The
+	pf system consists of the following three devices:
+	device		pf		# required
+	device		pflog		# optional
+	device		pfsync		# optional
+
 20040303:
 	If you are having trouble with the libc_r -> libpthread transition
 	(see the 20040130 entry), place the following lines at the top of
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 8b0ba98..4be1950 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -59,7 +59,7 @@
  * scheme is:  <major><two digit minor><0 if release branch, otherwise 1>xx
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 502105	/* Master, propagated to newvers */
+#define __FreeBSD_version 502106	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>