diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-01-08 21:36:22 +0000 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-01-08 21:36:22 +0000 |
| commit | 62766f42482f5071e7af1a806ae5c287f2332921 (patch) | |
| tree | c7496e80109f21c709cfcf1a9af6149fca490958 /docs | |
| parent | 19c544ff4250720558119084a60daa6363f45919 (diff) | |
Reverted parts of r17359 that could cause false positives in URL detection, especially on file names.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/templates/builtins.txt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 698b3c654d..85d43ceb51 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -2226,15 +2226,13 @@ urlize Converts URLs in text into clickable links. -This template tag works on several kinds of links: +This template tag works on links prefixed with ``http://``, ``https://``, or +``www.``. For example, ``http://goo.gl/aia1t`` will get converted but +``goo.gl/aia1t`` won't. -- links prefixed with ``http://``, ``https://``, or ``www.``. For example, - ``http://goo.gl/aia1t`` will get converted but ``goo.gl/aia1t`` won't. -- domain-only links ending in one of the original top level domains - (``.com``, ``.edu``, ``.gov``, ``.int``, ``.mil``, ``.net``, and - ``.org``). For example, ``djangoproject.com`` also gets converted. -- domain-only links ending in a dot followed by two letters. This covers - most country codes. For example, ``djangocon.eu`` still gets converted. +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. .. versionchanged:: 1.4 |