--- src/cf.data.pre.config	Thu Oct 25 20:24:54 2001
+++ src/cf.data.pre	Wed Nov 14 21:46:00 2001
@@ -226,6 +226,11 @@
 
 	NOTE, tcp_incoming_address has been removed.  You can now
 	specify IP addresses on the 'http_port' line.
+NOCOMMENT_START
+udp_outgoing_address ::
+udp_incoming_address ::
+tcp_outgoing_address ::
+NOCOMMENT_END
 DOC_END
 
 COMMENT_START
@@ -1937,10 +1942,10 @@
 
 NOCOMMENT_START
 #Recommended minimum configuration:
-acl all src 0.0.0.0/0.0.0.0
+# acl all src 0.0.0.0/0.0.0.0
 acl manager proto cache_object
-acl localhost src 127.0.0.1/255.255.255.255
-acl to_localhost dst 127.0.0.0/8
+acl localhost src ::ffff:127.0.0.1 ::1
+acl to_localhost dst ::ffff:127.0.0.1/104 ::1
 acl SSL_ports port 443 563
 acl Safe_ports port 80		# http
 acl Safe_ports port 21		# ftp
@@ -1953,6 +1958,16 @@
 acl Safe_ports port 591		# filemaker
 acl Safe_ports port 777		# multiling http
 acl CONNECT method CONNECT
+
+#
+# IPv6 acl processing. Note the different definition of 'all'
+#
+acl all src ::/0
+acl sitelocalsrc src fec0::/48
+acl linklocalsrc src fe80::/64
+acl globaldst dst 3ffe::/16 2000::/3
+acl ipv4src src ::ffff:0:0/96
+acl ipv4dst dst ::ffff:0:0/96
 NOCOMMENT_END
 DOC_END
 
@@ -3095,6 +3125,9 @@
 	Use this option to define your WCCP ``home'' router for
 	Squid.   Setting the 'wccp_router' to 0.0.0.0 (the default)
 	disables WCCP.
+NOCOMMENT_START
+wccp_router ::
+NOCOMMENT_END
 DOC_END
 
 NAME: wccp_version