summaryrefslogtreecommitdiff
path: root/docs/unicode.txt
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-07-04 12:48:12 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-07-04 12:48:12 +0000
commite7427cb22f21a520b117b84b02e44fbaf628ce3e (patch)
tree3890cda22a6409a06057d05fbe47b545642003d5 /docs/unicode.txt
parentfbd938180209b99caee4de8bcf02240bef64d449 (diff)
Fixed some ReST errors.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/unicode.txt')
-rw-r--r--docs/unicode.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/unicode.txt b/docs/unicode.txt
index 2313c28c98..e0d7ab94e1 100644
--- a/docs/unicode.txt
+++ b/docs/unicode.txt
@@ -47,7 +47,8 @@ rendering or anywhere else -- you have two choices for encoding those strings.
You can use Unicode strings, or you can use normal strings (sometimes called
"bytestrings") that are encoded using UTF-8.
-.. warning::
+.. admonition:: Warning
+
A bytestring does not carry any information with it about its encoding.
For that reason, we have to make an assumption, and Django assumes that all
bytestrings are in UTF-8.
@@ -141,6 +142,8 @@ Normally, you'll only need to use ``smart_unicode()``. Call it as early as
possible on any input data that might be either Unicode or a bytestring, and
from then on, you can treat the result as always being Unicode.
+.. _lazy translation: ../i18n/#lazy-translation
+
URI and IRI handling
~~~~~~~~~~~~~~~~~~~~
@@ -260,7 +263,7 @@ something like "Jack visited Paris & Orléans". (In fact, the ``iri_to_uri()``
call isn't strictly necessary in the above example, because all the
non-ASCII characters would have been removed in quoting in the first line.)
-.. _above: uri_and_iri_
+.. _above: `URI and IRI handling`_
The database API
================