Index: django/conf/project_template/settings.py
===================================================================
--- django/conf/project_template/settings.py	(revisión: 4391)
+++ django/conf/project_template/settings.py	(copia de trabajo)
@@ -18,6 +18,7 @@
 
 # Local time zone for this installation. All choices can be found here:
 # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
+# Windows users: Make sure you set your system's timezone unless you want to get into trouble.
 TIME_ZONE = 'America/Chicago'
 
 # Language code for this installation. All choices can be found here:
Index: docs/settings.txt
===================================================================
--- docs/settings.txt	(revisión: 4391)
+++ docs/settings.txt	(copia de trabajo)
@@ -822,6 +822,12 @@
 environment variable, and it'll be up to you to ensure your processes are
 running in the correct environment.
 
+Note to Windows Users: If you are running Django on a Windows box make sure that
+you set this variable to the timezone of your computer unless you want to get in
+trouble, you can read more about that in this `bug report (#2315)`_
+
+.. _bug report (#2315): http://code.djangoproject.com/ticket/2315
+
 URL_VALIDATOR_USER_AGENT
 ------------------------