diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2012-02-03 20:45:45 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2012-02-03 20:45:45 +0000 |
| commit | 6ecadcbdd2d2d34948e6482bfffe2c818887b39e (patch) | |
| tree | 263e83715ed9ee02a989227166840b9b525d9202 /docs/ref/templates | |
| parent | 00227b65296da44404b2b6c60a753142a967e46d (diff) | |
Made a bunch more edits up until [17418]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/templates')
| -rw-r--r-- | docs/ref/templates/builtins.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 85d43ceb51..afee499830 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -2232,7 +2232,7 @@ This template tag works on links prefixed with ``http://``, ``https://``, or It also supports domain-only links ending in one of the original top level domains (``.com``, ``.edu``, ``.gov``, ``.int``, ``.mil``, ``.net``, and -``.org``). For example, ``djangoproject.com`` gets converted too. +``.org``). For example, ``djangoproject.com`` gets converted. .. versionchanged:: 1.4 @@ -2240,7 +2240,7 @@ Until Django 1.4, only the ``.com``, ``.net`` and ``.org`` suffixes were supported for domain-only links. Links can have trailing punctuation (periods, commas, close-parens) and leading -punctuation (opening parens) and ``urlize`` will still do the right thing. +punctuation (opening parens), and ``urlize`` will still do the right thing. Links generated by ``urlize`` have a ``rel="nofollow"`` attribute added to them. |