diff --git a/docs/settings.txt b/docs/settings.txt
index 62d890afe7f..9e1c6b529ba 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -729,6 +729,10 @@ TIME_ZONE
 Default: ``'America/Chicago'``
 
 A string representing the time zone for this installation. `See available choices`_.
+(Note that list of available choices lists more than one on the same line;
+you'll want to use just one of the choices for a given time zone. For instance,
+one line says ``'Europe/London GB GB-Eire'``, but you should use the first bit
+of that -- ``'Europe/London'`` -- as your ``TIME_ZONE`` setting.)
 
 Note that this is the time zone to which Django will convert all dates/times --
 not necessarily the timezone of the server. For example, one server may serve