From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 21 Oct 2008 12:09:36 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1386^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28b98fecc6403ef7c7335b1b0a30a1e71f85cd34;p=thirdparty%2Fsquid.git

Merge from trunk
---

28b98fecc6403ef7c7335b1b0a30a1e71f85cd34
diff --cc src/Makefile.am
index 6c1ca95ba1,b8f679b507..f534cecbc1
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1041,10 -1006,9 +1006,10 @@@ DEFAULT_HTTP_PORT	= @CACHE_HTTP_PORT
  DEFAULT_ICP_PORT	= @CACHE_ICP_PORT@
  DEFAULT_PREFIX		= $(prefix)
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
 +DEFAULT_CONFIG_DIR	= $(sysconfdir)
  DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
  DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_LOG_PREFIX	= $(localstatedir)/logs
+ DEFAULT_LOG_PREFIX	= @DEFAULT_LOG_DIR@
  DEFAULT_CACHE_LOG       = $(DEFAULT_LOG_PREFIX)/cache.log
  DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
  DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
diff --cc src/cf.data.pre
index 588f04a151,bc52abcad0..32c70a68d6
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@@ -4817,19 -4827,9 +4827,19 @@@ DOC_STAR
  
  	Successful negotiations are not logged. Only failures
  	have meaning to indicate that Squid may need an upgrade
- 	of is error page translations.
+ 	of its error page translations.
  DOC_END
  
 +NAME: err_page_stylesheet
 +TYPE: string
 +LOC: Config.errorStylesheet
 +DEFAULT: @DEFAULT_CONFIG_DIR@/errorpage.css
 +DOC_START
 +	CSS Stylesheet to pattern the display of Squid default error pages.
 +
 +	For information on CSS see http://www.w3.org/Style/CSS/
 +DOC_END
 +
  NAME: err_html_text
  TYPE: eol
  LOC: Config.errHtmlText