Index: sites/default/default.settings.php
===================================================================
RCS file: /cvs/drupal/drupal/sites/default/default.settings.php,v
retrieving revision 1.44
diff -u -9 -p -r1.44 default.settings.php
--- sites/default/default.settings.php	7 Apr 2010 15:07:59 -0000	1.44
+++ sites/default/default.settings.php	20 May 2010 20:29:49 -0000
@@ -253,18 +253,29 @@ ini_set('session.gc_maxlifetime', 200000
 
 /**
  * Set session cookie lifetime (in seconds), i.e. the time from the session is
  * created to the cookie expires, i.e. when the browser is expected to discard
  * the cookie. The value 0 means "until the browser is closed".
  */
 ini_set('session.cookie_lifetime', 2000000);
 
 /**
+ * If you encounter a situation where users post a large amount of text, and
+ * the result is stripped out upon viewing but can still be edited, Drupal's
+ * output filter may not have sufficient memory to process it. If you
+ * experience this issue, you may wish to uncomment the following two lines
+ * and increase the limits of these variables. For more information, see
+ * http://php.net/manual/en/pcre.configuration.php.
+ */
+# ini_set('pcre.backtrack_limit', 200000);
+# ini_set('pcre.recursion_limit', 200000);
+
+/**
  * Drupal automatically generates a unique session cookie name for each site
  * based on on its full domain name. If you have multiple domains pointing at
  * the same Drupal site, you can either redirect them all to a single domain
  * (see comment in .htaccess), or uncomment the line below and specify their
  * shared base domain. Doing so assures that users remain logged in as they
  * cross between your various domains.
  */
 # $cookie_domain = 'example.com';
 
@@ -387,18 +398,31 @@ ini_set('session.cookie_lifetime', 20000
  * empty will have the effect of disabling IP blocking on your site.
  *
  * Remove the leading hash signs to enable.
  */
 # $conf['blocked_ips'] = array(
 #   'a.b.c.d',
 # );
 
 /**
+ * Page caching:
+ *
+ * To use a caching backend that does not use the database for page cache,
+ * set cache_inc to the file which provides this backend and set
+ * page_cache_without_database to TRUE. For additional speedup,
+ * page_cache_invoke_hooks can be set to FALSE to skip calling hook_boot and
+ * hook_exit which are the only hooks fired during serving a cached page.
+ */
+# $conf['cache_inc'] = DRUPAL_ROOT . '/sites/all/modules/memcache/memcache.inc';
+# $conf['page_cache_without_database'] = TRUE;
+# $conf['page_cache_invoke_hooks'] = FALSE;
+
+/**
  * Authorized file system operations:
  *
  * The Update manager module included with Drupal provides a mechanism for
  * site administrators to securely install missing updates for the site
  * directly through the web user interface by providing either SSH or FTP
  * credentials. This allows the site to update the new files as the user who
  * owns all the Drupal files, instead of as the user the webserver is running
  * as. However, some sites might wish to disable this functionality, and only
  * update the code directly via SSH or FTP themselves. This setting completely