Merge from trunk

diff --cc src/Makefile.am
index 6c1ca95ba1ca134658412de5160c582523dc43a4,b8f679b507ecaab8e89f97081085573c7e81671a..f534cecbc1938cb86988fcd635a5a20b308b19a1
--- 1/src/Makefile.am
--- 2/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 588f04a151a9a0f7d80dc551d0096d99b04cd638,bc52abcad0b25e6eb20525cc2bcacfcbb55af440..32c70a68d6faa96cb7d5d268ad02b10c3fbdbd76
--- 1/src/cf.data.pre
--- 2/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

diff --cc src/errorpage.cc
Simple merge

diff --cc src/structs.h
Simple merge