---------------------
PatchSet 445 
Date: 2000/07/16 00:33:59
Author: hno
Branch: hno-devel
Tag: (none) 
Log:
merged changes from devel

Members: 
	src/cf.data.pre:1.1.1.3.10.6.2.10->1.1.1.3.10.6.2.11 
	src/cf_gen_defines:1.1.4.1.2.1->1.1.4.1.2.2 

Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cf.data.pre,v
retrieving revision 1.1.1.3.10.6.2.10
retrieving revision 1.1.1.3.10.6.2.11
diff -u -r1.1.1.3.10.6.2.10 -r1.1.1.3.10.6.2.11
--- squid/src/cf.data.pre	15 Jul 2000 20:52:06 -0000	1.1.1.3.10.6.2.10
+++ squid/src/cf.data.pre	16 Jul 2000 00:33:59 -0000	1.1.1.3.10.6.2.11
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.1.1.3.10.6.2.10 2000/07/15 20:52:06 hno Exp $
+# $Id: cf.data.pre,v 1.1.1.3.10.6.2.11 2000/07/16 00:33:59 hno Exp $
 #
 #
 # SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -837,13 +837,10 @@
 TYPE: string
 LOC: Config.Log.referer
 DEFAULT: none
+IFDEF: USE_REFERER_LOG
 DOC_START
-	If configured with the "--enable-referer_log" configure
-	option, Squid will write the Referer field from HTTP
-	requests to the filename specified here.  By default
-	referer_log is disabled.
-
-referer_log none
+	Squid will write the Referer field from HTTP requests to the
+	filename specified here.  By default referer_log is disabled.
 DOC_END
 
 
Index: squid/src/cf_gen_defines
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cf_gen_defines,v
retrieving revision 1.1.4.1.2.1
retrieving revision 1.1.4.1.2.2
diff -u -r1.1.4.1.2.1 -r1.1.4.1.2.2
--- squid/src/cf_gen_defines	12 Jun 2000 10:26:06 -0000	1.1.4.1.2.1
+++ squid/src/cf_gen_defines	16 Jul 2000 00:33:59 -0000	1.1.4.1.2.2
@@ -17,6 +17,7 @@
 	define["USE_USERAGENT_LOG"]="--enable-useragent-log"
 	define["USE_WCCP"]="--enable-wccp"
 	define["USE_UNLINKD"]="--enable-unlinkd"
+	define["USE_REFERER_LOG"]="--enable-referer-log"
 }
 /^IFDEF:/ {
 	print "{\"" $2 "\", \"" (define[$2] != "" ? define[$2] : ("-D" $2)) "\", "