diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-12-03 02:59:56 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-12-03 02:59:56 +0000 |
| commit | 07ddd56872e70e76e13eb0b118c7b6503d5d821f (patch) | |
| tree | e1e2eb0ab912b1b26246b4736ad114cc4541ad9c /docs/unicode.txt | |
| parent | 79653a414857e4f93918051843afbc1f7c9a7f99 (diff) | |
queryset-refactor: Merged from trunk up to [6856].
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6857 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. |