i18n: merged to [905] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@910 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/views/defaults.py

@@ -10,8 +10,12 @@ def shortcut(request, content_type_id, object_id):
         obj = content_type.get_object_for_this_type(pk=object_id)
     except ObjectDoesNotExist:
         raise Http404, "Content type %s object %s doesn't exist" % (content_type_id, object_id)
-    if not hasattr(obj, 'get_absolute_url'):
+    try:
+        absurl = obj.get_absolute_url()
+    except AttributeError:
         raise Http404, "%s objects don't have get_absolute_url() methods" % content_type.name
+    if absurl.startswith('http://'):
+        return httpwrappers.HttpResponseRedirect(absurl)
     object_domain = None
     if hasattr(obj, 'get_site_list'):
         site_list = obj.get_site_list()
@@ -27,8 +31,8 @@ def shortcut(request, content_type_id, object_id):
     except sites.SiteDoesNotExist:
         pass
     if not object_domain:
-        return httpwrappers.HttpResponseRedirect(obj.get_absolute_url())
+        return httpwrappers.HttpResponseRedirect(absurl)
-    return httpwrappers.HttpResponseRedirect('http://%s%s' % (object_domain, obj.get_absolute_url()))
+    return httpwrappers.HttpResponseRedirect('http://%s%s' % (object_domain, absurl))
 
 def page_not_found(request):
     """

docs/django-admin.txt

@@ -112,6 +112,11 @@ them to standard output, but it won't stop the server.
 You can run as many servers as you want, as long as they're on separate ports.
 Just execute ``django-admin.py runserver`` more than once.
 
+Note that the default IP address, 127.0.0.1, is not accessible from other
+machines on your network. To make your development server viewable to other
+machines on the network, use its own IP address (e.g. ``192.168.2.1``) or
+``0.0.0.0``.
+
 Examples:
 ~~~~~~~~~
 

docs/settings.txt

@@ -400,7 +400,7 @@ Default: ``False``
 
 Whether to prepend the "www." subdomain to URLs that don't have it. This is
 only used if ``CommonMiddleware`` is installed (see the `middleware docs`_).
-See also ``PREPEND_WWW``.
+See also ``APPEND_SLASH``.
 
 SECRET_KEY
 ----------

docs/templates.txt

@@ -224,6 +224,13 @@ Here are some tips for working with inheritance:
       if you want to add to the contents of a parent block instead of
       completely overriding it.
 
+Finally, note that you can't define multiple ``{% block %}`` tags with the same
+name in the same template. This limitation exists because a block tag works in
+"both" directions. That is, a block tag doesn't just provide a hole to fill --
+it also defines the content that fills the hole in the *parent*. If there were
+two similarly-named ``{% block %}`` tags in a template, that template's parent
+wouldn't know which one of the blocks' content to use.
+
 Using the built-in reference
 ============================