summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris Beaven <smileychris@gmail.com>2011-06-27 03:32:10 +0000
committerChris Beaven <smileychris@gmail.com>2011-06-27 03:32:10 +0000
commit0e27c4921048250c668dcb06e010a137de6f66e0 (patch)
tree88c2eefa4eea47b04ac390477ad372e912276bcd /docs
parentbda5ed5700445a6c916d2ac7c45db1ed1897a974 (diff)
More accurate documentation for how the urlize template works. Refs #9189.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/templates/builtins.txt14
1 files changed, 9 insertions, 5 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 7cbbeb3188..ed0092f9ca 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -2162,12 +2162,16 @@ urlize
Converts URLs in text into clickable links.
-Only works for .com, .net, and .org top level domains.
+Works on links prefixed with ``http://``, ``https://``, or ``www.``. For
+example, ``http://goo.gl/aia1t`` will get converted but ``goo.gl/aia1t``
+won't.
-Works on links beginning with ``http://``, ``https://``, or ``www.`` and
-ending with ``.org``, ``.net`` or ``.com``. Links can have trailing punctuation
-(periods, commas, close-parens) and leading punctuation (opening parens) and
-``urlize`` will still do the right thing.
+Also works on domain-only links ending in one of the common ``.com``, ``.net``,
+or ``.org`` top level domains. For example, ``djangoproject.com`` will still
+get converted.
+
+Links can have trailing punctuation (periods, commas, close-parens) and leading
+punctuation (opening parens) and ``urlize`` will still do the right thing.
Links generated by ``urlize`` have a ``rel="nofollow"`` attribute added
to them.