Index: lib/TWiki.cfg
===================================================================
--- lib/TWiki.cfg	(revisión: 1799)
+++ lib/TWiki.cfg	(copia de trabajo)
@@ -1,6 +1,10 @@
 # Module of TWiki Collaboration Platform, http://TWiki.org/
 #
-# Configuration file for TWiki, held in 'lib' directory.
+# Configuration file for TWiki, held in 'lib' directory. You can edit
+# this file directly to set your configuration, but in general it's better
+# to leave this file untouched and create a new file called "LocalSite.cfg"
+# (which TWiki will read if it exists). That way, there is no risk of your
+# settings being overwritten when you upgrade.
 #
 # See 'setlib.cfg' in 'bin' directory to configure non-standard location
 # for 'lib' directory or Perl modules.
@@ -22,7 +26,9 @@
 # Notes:
 # - Latest version at http://twiki.org/
 # - Installation instructions in $dataDir/TWiki/TWikiDocumentation.txt
-# - Customize variables in TWiki.cfg when installing TWiki.
+# - Customize variables in LocalSite.cfg and possibly TWiki.cfg when
+#   installing TWiki. LocalSite.cfg contains commonly changed settings,
+#   TWiki.cfg contains less commonly changed configurable settings
 # - Optionally create a new plugin or customize DefaultPlugin.pm for
 #   custom extensions of rendering rules.
 # - Upgrading TWiki is easy as long as you only customize DefaultPlugin.pm.
@@ -55,10 +61,18 @@
 
 # variables that need to be changed when installing on a new server:
 # ==================================================================
-# ---- Windows paths should normally be written as "c:/foo" not "c:\foo" 
-# ---- (which doesn't do what you may think it does).  You can use '\' 
-# ---- without problems inside single quotes, e.g. 'c:\foo'.
-#                   URL for TWiki host :    (e.g. "http://myhost.com:123")
+# Variables that WILL need to be changed when installing on a new server.
+# These variables can be set here, but it's better to copy and paste them
+# to a local file in the same directory called "LocalSite.cfg", which will
+# be read by TWiki if it exists. That way, there is no risk of their being
+# overwritten when you upgrade.
+
+# NOTE: If your server is running Microsoft Windows, paths should normally
+# be written as "c:/foo" not "c:\foo" (which doesn't do what you may think
+# it does).  You can use '\' without problems inside single quotes, e.g.
+# 'c:\foo'.
+
+# URL for TWiki host (e.g. "http://myhost.com:123")
 $defaultUrlHost   = "http://your.domain.com";
 #                   %SCRIPTURLPATH% : cgi-bin URL path for TWiki:
 $scriptUrlPath    = "/twiki/bin";
@@ -78,6 +92,9 @@
 $logDir           = "$dataDir";
 
 
+# include local site configuration, if it exists
+do "LocalSite.cfg";
+
 # FIGURE OUT THE OS WE'RE RUNNING UNDER - from CGI.pm
 # ==================================================================
 # Some systems support the $^O variable.  If not