Merged from trunk.

[thirdparty/squid.git] / src / cf.data.pre

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 91ad7d58622cca8acd4a38bf0921891e7fb77d74..4192bf37655a54823746fe556ce2bf11aad89154 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -2312,7 +2312,7 @@ DOC_END
 NAME: access_log cache_access_log
 TYPE: access_log
 LOC: Config.Log.accesslogs
-DEFAULT: @DEFAULT_ACCESS_LOG@ squid
+DEFAULT_IF_NONE: @DEFAULT_ACCESS_LOG@ squid
 DOC_START
        These files log client request activities. Has a line every HTTP or
        ICP request. The format is:
@@ -2353,7 +2353,7 @@ DOC_END
 
 NAME: cache_log
 TYPE: string
-DEFAULT: @DEFAULT_CACHE_LOG@
+DEFAULT_IF_NONE: @DEFAULT_CACHE_LOG@
 LOC: Config.Log.log
 DOC_START
        Cache logging file. This is where general information about
@@ -4800,16 +4800,6 @@ DOC_START
        of is 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