diff --git a/ChangeLog b/ChangeLog
index 740e62d75020e9cc1755b42373568873753795be..a6cb8a4b4caf78cace3d2624180c8045f5d33392 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-21  Ernesto Baschny  <ernst@cron-it.de>
+
+	* Follow-up to issue #11103: Cleanup of _.htaccess and references to misc/advanced.htaccess in config_default
+
 2011-01-21  Francois Suter  <francois.suter@typo3.org>
 
 	* Fixed bug #17024: CSH not rendered properly in select-type fields with renderMode = checkbox
diff --git a/_.htaccess b/_.htaccess
index 7c2e3cbdf5e0b5338a27a923b8a2a513f24dc272..3051d92a0038d57408be749a1ce01290e1b202bc 100644
--- a/_.htaccess
+++ b/_.htaccess
@@ -1,58 +1,50 @@
 #####
 # 
-# Example .htaccess file
+# Example .htaccess file for TYPO3 CMS - for use with Apache Webserver
 # 
 # This file includes settings for the following configuration options:
 # 
 # - Compression via TYPO3
 # - Settings for mod_rewrite (URL-Rewriting)
 # - PHP optimisation
-# - Compression using Apache
 # - Miscellaneous
 # 
-# If you want to use it, you have to copy it to the root folder of your
-# TYPO3 installation and rename it to '.htaccess'.
-# (To make .htaccess files work you might need to adjust the 'AllowOverride'
-# directive in your Apache configuration file.)
+# If you want to use it, you have to copy it to the root folder of your TYPO3 installation (if its
+# not there already) and rename it to '.htaccess'. To make .htaccess files work, you might need to
+# adjust the 'AllowOverride' directive in your Apache configuration file.
 # 
-# IMPORTANT: You may need to change this file depending on your TYPO3
-# installation!
-# Lines starting with a # are treated as comment and ignored by the web
-# server.
+# IMPORTANT: You may need to change this file depending on your TYPO3 installation!
+#
+# Lines starting with a # are treated as comment and ignored by the web server.
 # 
-# You should change every occurance of TYPO3root/ to the location where you
-# have your website in. For example:
+# You should change every occurance of TYPO3root/ to the location where you have your website in.
+# For example:
 # If you have your website located at http://mysite.com/
 # then your TYPO3root/ is just empty (remove 'TYPO3root/')
 # If you have your website located at http://mysite.com/some/path/
 # then your TYPO3root/ is some/path/ (search and replace)
 # 
-# You can also use this configuration in your httpd.conf, but then you have
-# to modify some lines, see the comments (search for 'httpd.conf')
-# 
-# Using rewriting in your httpd.conf is much faster.
+# You can also use this configuration in your httpd.conf, but then you have to modify some lines,
+# see the comments (search for 'httpd.conf')
 # 
-# Questions about this file go to the matching Install mailing list,
-# see http://typo3.org/documentation/mailing-lists/
+# Questions about this file go to the matching Install mailing list, see
+# http://typo3.org/documentation/mailing-lists/
 # 
 ####
 
 
 ### Begin: Compression via TYPO3 ###
 
-# Allow compressed .js and .css files
-# Uncomment the following lines, if you have
-# ['BE']['compressionLevel'] set.
-
-# If the Apache modules mod_gzip or mod_deflate are activated, you should
-# use their compression functions instead.
-# You find an example configuration below.
+# Compressing resource files will save bandwidth and so improve loading speed especially for users
+# with slower internet connections. TYPO3 can compress the .js and .css files for you.
+# 1) Uncomment the following lines and
+# 2) Set $TYPO3_CONF_VARS['BE']['compressionLevel'] = '9'
 
 #<FilesMatch "\.js\.gzip$">
-#  AddType "text/javascript" .gzip
+#	AddType "text/javascript" .gzip
 #</FilesMatch>
 #<FilesMatch "\.css\.gzip$">
-#  AddType "text/css" .gzip
+#	AddType "text/css" .gzip
 #</FilesMatch>
 #AddEncoding gzip .gzip
 
@@ -61,23 +53,20 @@
 
 ### Begin: Settings for mod_rewrite ###
 
+# You need rewriting, if you use a URL-Rewriting extension (RealURL, CoolUri, SimulateStatic).
+
 <IfModule mod_rewrite.c>
 
 # Enable URL rewriting
 RewriteEngine On
 
-# If you use an URL-Rewriting extension (RealURL, CoolUri, SimulateStatic),
-# then you have to enable the next line.
-#
-# You have to change this path, if your TYPO3 installation is located
-# in a subdirectory of the website root.
-# 
-# If you place this in httpd.conf, you cannot use this directive in any case!
+# Change this path, if your TYPO3 installation is located in a subdirectory of the website root.
 #RewriteBase /
 
-# Rule for versioned static files (see $TYPO3_CONF_VARS[BE][versionNumberInFilename]
-# and $TYPO3_CONF_VARS[FE][versionNumberInFilename])
-# IMPORTANT: This rule has to be the very first rule in order to work! 
+# Rule for versioned static files, configured through:
+# - $TYPO3_CONF_VARS['BE']['versionNumberInFilename']
+# - $TYPO3_CONF_VARS['FE']['versionNumberInFilename']
+# IMPORTANT: This rule has to be the very first RewriteCond in order to work!
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule ^(.+)\.(\d+)\.(php|js|css|png|jpg|gif|gzip)$ $1.$3 [L]
@@ -87,39 +76,20 @@ RewriteRule ^(.+)\.(\d+)\.(php|js|css|png|jpg|gif|gzip)$ $1.$3 [L]
 # RewriteRule ^/TYPO3root/(typo3/|t3lib/|fileadmin/|typo3conf/|typo3temp/|uploads/|favicon\.ico) - [L]
 RewriteRule ^(typo3/|t3lib/|fileadmin/|typo3conf/|typo3temp/|uploads/|favicon\.ico) - [L]
 
-# Redirect http://mysite/typo3 to http://mysite/typo3/index_re.php
-# and stop the rewrite processing.
+# Redirect http://example.com/typo3 to http://example.com/typo3/index_re.php and stop the rewrite processing.
 # For httpd.conf, use this line instead of the next one:
 # RewriteRule ^/TYPO3root/typo3$ /TYPO3root/typo3/index.php [L]
 RewriteRule ^typo3$ typo3/index_re.php [L]
 
 # If the file/symlink/directory does not exist => Redirect to index.php.
-# Important note: If you copy/paste this into httpd.conf instead
-# of .htaccess, you need to add '%{DOCUMENT_ROOT}' left to each
-# '%{REQUEST_FILENAME}' part.
+# For httpd.conf, you need to prefix each '%{REQUEST_FILENAME}' with '%{DOCUMENT_ROOT}'.
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_FILENAME} !-l
 
 # Main URL rewriting.
-
-# If you use Windows and SimulateStaticDocuments does not work, try adding
-# a slash (/) right before 'index.php' below.
-
-# The example shows how to rewrite only *.html and *.pdf files to
-# index.php.
-# This may be helpful when using an extension that can generate PDF files
-# on the fly.
-# Example: RewriteRule .*\.(html|pdf)$ index.php [L]
-
-# For httpd.conf, use this line instead of the next one that has no '#':
+# For httpd.conf, use this line instead of the next one:
 # RewriteRule .* /TYPO3root/index.php [L]
-
-# For use with the RealURL extension, you might need to remove the
-# RewriteBase directive some lines above and use this line instead of the
-# next one:
-# RewriteRule .* /index.php [L]
-
 RewriteRule .* index.php [L]
 
 </IfModule>
@@ -129,8 +99,7 @@ RewriteRule .* index.php [L]
 
 ### Begin: PHP optimisation ###
 
-# If you do not change the following settings, the default values will
-# be used.
+# If you do not change the following settings, the default values will be used.
 
 # TYPO3 works fine with register_globals turned off.
 # This is highly recommended, if your web server has it turned on.
@@ -139,45 +108,6 @@ RewriteRule .* index.php [L]
 ### End: PHP optimisation ###
 
 
-### Begin: Compression using Apache ###
-
-# With the following settings you can make Apache compress text files,
-# which will save bandwidth and so improve loading speed especially for
-# users with slower internet connections.
-
-# Compressing files for Apache 1.3
-#<IfModule mod_gzip.c>
-#mod_gzip_on Yes
-# There is a problem with Internet Explorer and mod_gzip on Apache servers.
-#mod_gzip_item_exclude file \.css$
-#mod_gzip_item_exclude file \.js$
-# The size of images generally won't be reduced enough that it's worth
-# compressing them.
-#mod_gzip_item_exclude file \.png$
-#mod_gzip_item_exclude file \.gif$
-#mod_gzip_item_exclude file \.jpg$
-#mod_gzip_item_exclude file \.jpeg$
-#</IfModule>
-
-# Compressing files for Apache 2.x
-#<IfModule mod_deflate.c>
-# Compress HTML, Text, CSS, JavaScript and XML files.
-#AddOutputFilterByType DEFLATE text/plain text/html text/xml
-#AddOutputFilterByType DEFLATE text/css text/javascript
-#AddOutputFilterByType DEFLATE application/xml application/xhtml+xml
-#AddOutputFilterByType DEFLATE application/rss+xml
-#AddOutputFilterByType DEFLATE application/javascript application/x-javascript
-# Needed for compatibility with Netscape 4.x, which only supports compression
-# for HTML files, and for Netscape 4.06-4.08, which support no compression.
-#BrowserMatch ^Mozilla/4 gzip-only-text/html
-#BrowserMatch ^Mozilla/4.0[678] no-gzip
-# Activate compression again for MSIE, which masquerades as Netscape.
-# There compression works correctly.
-#BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-#</IfModule>
-
-### End: Compression using Apache ###
-
 
 ### Begin: Miscellaneous ###
 
diff --git a/t3lib/config_default.php b/t3lib/config_default.php
index 1ed09987461dbfc24c2be7a499b4143f5793d134..85c5f0b66571bd9c16a7c5bca3c58f7f4b370ff1 100644
--- a/t3lib/config_default.php
+++ b/t3lib/config_default.php
@@ -211,7 +211,7 @@ $TYPO3_CONF_VARS = array(
 		'adminOnly' => 0,						// <p>Integer (-1, 0, 1, 2)</p><dl><dt>-1</dt><dd>total shutdown for maintenance purposes</dd><dt>0</dt><dd>normal operation, everyone can login (default)</dd><dt>1</dt><dd>only admins can login</dd><dt>2</dt><dd>only admins and regular CLI users can login</dd></dl>
 		'disable_exec_function' => FALSE,		// Boolean: Don't use exec() function (except for ImageMagick which is disabled by <a href="#GFX-im">[GFX][im]</a>=0). If set, all fileoperations are done by the default PHP-functions. This is nescessary under Windows! On Unix the system commands by exec() can be used, unless this is disabled.
 		'usePHPFileFunctions' => TRUE,			// Boolean: If set, all fileoperations are done by the default PHP-functions. Default on Unix is using the system commands by exec(). You need to set this flag under safe_mode.
-		'compressionLevel' => 0,				// Determines output compression of BE output. Makes output smaller but slows down the page generation depending on the compression level. Requires a) zlib in your PHP installation and b) special rewrite rules for .css.gzip and .js.gzip (please see misc/advanced.htacces for an example). Range 1-9, where 1 is least compression and 9 is greatest compression. 'true' as value will set the compression based on the PHP default settings (usually 5). Suggested and most optimal value is 5.
+		'compressionLevel' => 0,				// Determines output compression of BE output. Makes output smaller but slows down the page generation depending on the compression level. Requires a) zlib in your PHP installation and b) special rewrite rules for .css.gzip and .js.gzip (please see _.htacces for an example). Range 1-9, where 1 is least compression and 9 is greatest compression. 'true' as value will set the compression based on the PHP default settings (usually 5). Suggested and most optimal value is 5.
 		'maxFileSize' => '10240',				// Integer: If set this is the max filesize in KB's for file operations in the backend. Can be overridden through $TCA per table field separately.
 		'forceCharset' => '-1',					// String: Normally the charset of the backend users language selection is used. If you set this value to a charset found in t3lib/csconvtbl/ (or "utf-8") the backend (and database) will ALWAYS use this charset. Always use a lowercase value. NOTICE: This option is deprecated since TYPO3 4.5, and will be removed in 4.7. Please use proper tools to set your installation to native UTF-8.
 		'installToolPassword' => '',			// String: This is the md5-hashed password for the Install Tool. Set this to '' and access will be totally denied. PLEASE consider to externally password protect the typo3/install/ folder, eg. with a .htaccess file.
@@ -479,7 +479,7 @@ $TYPO3_CONF_VARS = array(
 		'flexformForceCDATA' => 0,				// Boolean:  If set, will add CDATA to Flexform XML. Some versions of libxml have a bug that causes HTML entities to be stripped from any XML content and this setting will avoid the bug by adding CDATA.
 		'explicitConfirmationOfTranslation' => FALSE,	// If set, then the diff-data of localized records is not saved automatically when updated but requires that a translator clicks the special finish_translation/save/close button that becomes available.
 		'elementVersioningOnly' => TRUE,		// If true, only element versioning is allowed in the backend (see option newPagesVersioningType). Setting this flag is recommended for new installations of TYPO3 4.2+ since "page" and "branch" versioning types are known for the drawbacks of loosing ids and "element" type versions supports moving now. Please note that "page" and "branch" types are deprecated since TYPO3 4.2 and will be unsupported in TYPO3 4.6. Thus, this option will be removed in TYPO3 4.6.
-		'versionNumberInFilename' => FALSE,	// <p>Boolean: If true, included CSS and JS files will have the timestamp embedded in the filename, ie. filename.1269312081.js. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). IMPORTANT: this feature requires extra .htaccess rules to work (please refer to misc/advanced.htaccess or the _.htaccess file from the dummy package)</p><p>If false the filemtime will be appended as a query-string.</p>
+		'versionNumberInFilename' => FALSE,	// <p>Boolean: If true, included CSS and JS files will have the timestamp embedded in the filename, ie. filename.1269312081.js. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). IMPORTANT: this feature requires extra .htaccess rules to work (please refer to _.htaccess or the _.htaccess file from the dummy package)</p><p>If false the filemtime will be appended as a query-string.</p>
 		'spriteIconGenerator_handler' => '',	// String: Used to register own/other spriteGenerating Handler, they have to implement the interface t3lib_spritemanager_SpriteIconGenerator. If set to "t3lib_spritemanager_SpriteBuildingHandler" icons from extensions will automatically merged into sprites.
 		'allowDonateWindow' => TRUE,			// Boolean: Defines whether to display a TYPO3 donate window to admin users that have been working with the system for more than three months.
 		'debug' => FALSE,			// Boolean: If set, the loginrefresh is disabled and pageRenderer is set to debug mode. Use this to debug the backend only!
@@ -564,7 +564,7 @@ $TYPO3_CONF_VARS = array(
 		'eID_include' => array(),				// Array of key/value pairs where key is "tx_[ext]_[optional suffix]" and value is relative filename of class to include. Key is used as "?eID=" for index_ts.php to include the code file which renders the page from that point. (Useful for functionality that requires a low initialization footprint, eg. frontend ajax applications)
 		'disableNoCacheParameter' => FALSE,		// Boolean: If set, the no_cache request parameter will become ineffective. This is currently still an experimental feature and will require a website only with plugins that don't use this parameter. However, using "&amp;no_cache=1" should be avoided anyway because there are better ways to disable caching for a certain part of the website (see COA_INT/USER_INT documentation in TSref).
 		'workspacePreviewLogoutTemplate' => '',	// If set, points to an HTML file relative to the TYPO3_site root which will be read and outputted as template for this message. Example: fileadmin/templates/template_workspace_preview_logout.html. Inside you can put the marker %1$s to insert the URL to go back to. Use this in &lt;a href="%1$s"&gt;Go back...&lt;/a&gt; links
-		'versionNumberInFilename' => 'querystring',	// String: embed,querystring,''. Allows to automatically include a version number (timestamp of the file) to referred CSS and JS filenames on the rendered page. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). Set to 'embed' will have the timestamp embedded in the filename, ie. filename.1269312081.js. IMPORTANT: 'embed' requires extra .htaccess rules to work (please refer to misc/advanced.htaccess or the _.htaccess file from the dummy package)<p>Set to 'querystring' (default setting) to append the version number as a query parameter (doesn't require mod_rewrite). Set to '' will turn this functionality off (behaves like TYPO3 &lt; v4.4).</p>
+		'versionNumberInFilename' => 'querystring',	// String: embed,querystring,''. Allows to automatically include a version number (timestamp of the file) to referred CSS and JS filenames on the rendered page. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). Set to 'embed' will have the timestamp embedded in the filename, ie. filename.1269312081.js. IMPORTANT: 'embed' requires extra .htaccess rules to work (please refer to _.htaccess or the _.htaccess file from the dummy package)<p>Set to 'querystring' (default setting) to append the version number as a query parameter (doesn't require mod_rewrite). Set to '' will turn this functionality off (behaves like TYPO3 &lt; v4.4).</p>
 		'XCLASS' => array(),					// See 'Inside TYPO3' document for more information.
 	),
 	'MAIL' => array(		// Mail configurations to tune how t3lib_mail classes will send their mails.