summaryrefslogtreecommitdiff
path: root/docs/ref/unicode.txt
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2012-11-20 07:15:16 -0500
committerTim Graham <timograham@gmail.com>2012-11-22 16:08:51 -0500
commit0e3690d2309e64ce7b7ae4938d41544c25f29870 (patch)
tree5696720106b83e1f2a5a580513dbe2d4d68ac6ca /docs/ref/unicode.txt
parent891c5306242760c8bb494412b9f8f86762664427 (diff)
Fixed #18974 - Warned against using models.permalink
Thanks dstufft for the draft patch.
Diffstat (limited to 'docs/ref/unicode.txt')
-rw-r--r--docs/ref/unicode.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/unicode.txt b/docs/ref/unicode.txt
index ffab647379..784ff33398 100644
--- a/docs/ref/unicode.txt
+++ b/docs/ref/unicode.txt
@@ -262,11 +262,11 @@ Taking care in ``get_absolute_url()``
URLs can only contain ASCII characters. If you're constructing a URL from
pieces of data that might be non-ASCII, be careful to encode the results in a
-way that is suitable for a URL. The ``django.db.models.permalink()`` decorator
-handles this for you automatically.
+way that is suitable for a URL. The :func:`~django.core.urlresolvers.reverse`
+function handles this for you automatically.
-If you're constructing a URL manually (i.e., *not* using the ``permalink()``
-decorator), you'll need to take care of the encoding yourself. In this case,
+If you're constructing a URL manually (i.e., *not* using the ``reverse()``
+function), you'll need to take care of the encoding yourself. In this case,
use the ``iri_to_uri()`` and ``urlquote()`` functions that were documented
above_. For example::