diff options
| author | Jeremy Dunck <jdunck@gmail.com> | 2007-12-01 22:12:44 +0000 |
|---|---|---|
| committer | Jeremy Dunck <jdunck@gmail.com> | 2007-12-01 22:12:44 +0000 |
| commit | 23384af79b2f43f08e8395d0a84a57c2a98df392 (patch) | |
| tree | 77e45f0e0fc6cb9b3380982313f45febf2ebf6f0 /docs/unicode.txt | |
| parent | 85ce45bc441e4ace2fba83bc2d2432e22ec9da94 (diff) | |
gis: Merged 6672-6783 vis svnmerge from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/unicode.txt')
| -rw-r--r-- | docs/unicode.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/unicode.txt b/docs/unicode.txt index a0e2648f57..a2c4e7fbe6 100644 --- a/docs/unicode.txt +++ b/docs/unicode.txt @@ -136,7 +136,7 @@ for converting back and forth between Unicode and bytestrings. * ``smart_str(s, encoding='utf-8', strings_only=False, errors='strict')`` is essentially the opposite of ``smart_unicode()``. It forces the first argument to a bytestring. The ``strings_only`` parameter has the same - behaviour as for ``smart_unicode()`` and ``force_unicode()``. This is + behavior as for ``smart_unicode()`` and ``force_unicode()``. This is slightly different semantics from Python's builtin ``str()`` function, but the difference is needed in a few places within Django's internals. |