diff options
| author | Georg Bauer <gb@hugo.westfalen.de> | 2005-10-17 15:44:09 +0000 |
|---|---|---|
| committer | Georg Bauer <gb@hugo.westfalen.de> | 2005-10-17 15:44:09 +0000 |
| commit | 7a0e8a24921a28cff20ba77bd4022cd573557d83 (patch) | |
| tree | 528d49fa1cf19fd974395781492c7c22f1eeef12 /docs | |
| parent | 714a32aa49ad41b1a6ad03e219c2e849aab8b83b (diff) | |
| parent | 63a3c72e19758995c7933be0644b33ff6a5d9837 (diff) | |
i18n: merged to [905] from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/django-admin.txt | 5 | ||||
| -rw-r--r-- | docs/settings.txt | 2 | ||||
| -rw-r--r-- | docs/templates.txt | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/docs/django-admin.txt b/docs/django-admin.txt index ba9bb1403f..0faabbfcca 100644 --- a/docs/django-admin.txt +++ b/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: ~~~~~~~~~ diff --git a/docs/settings.txt b/docs/settings.txt index ce971318f0..4fd4959bf1 100644 --- a/docs/settings.txt +++ b/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 ---------- diff --git a/docs/templates.txt b/docs/templates.txt index 843ed0cbaa..215b663634 100644 --- a/docs/templates.txt +++ b/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 ============================ |