From a73588aa58156460b75fde0d083443028e5f100e Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sat, 1 Dec 2007 16:58:52 +0000 Subject: [PATCH] Edited docs/serialization.txt changes from [6645] git-svn-id: http://code.djangoproject.com/svn/django/trunk@6787 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/defaultfilters.py | 2 +- docs/serialization.txt | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index f2be64ef1d..ac92bef6cf 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -696,7 +696,7 @@ filesizeformat.is_safe = True def pluralize(value, arg=u's'): """ - Returns a plural suffix if the value is not 1. By default, 's' is used as + Returns a plural suffix if the value is not 1. By default, 's' is used as the suffix: * If value is 0, vote{{ value|pluralize }} displays "0 votes". diff --git a/docs/serialization.txt b/docs/serialization.txt index cf8b196931..dff33f219f 100644 --- a/docs/serialization.txt +++ b/docs/serialization.txt @@ -135,8 +135,8 @@ For example:: json_serializer = serializers.get_serializer("json")() json_serializer.serialize(queryset, ensure_ascii=False, stream=response) -Django ships with a copy of simplejson_ in the source. Be aware, that if -you're using that for serializing directly that not all Django output can be +The Django source code includes the simplejson_ module. Be aware that if +you're serializing using that module directly, not all Django output can be passed unmodified to simplejson. In particular, `lazy translation objects`_ need a `special encoder`_ written for them. Something like this will work:: @@ -151,8 +151,3 @@ need a `special encoder`_ written for them. Something like this will work:: .. _lazy translation objects: ../i18n/#lazy-translation .. _special encoder: http://svn.red-bean.com/bob/simplejson/tags/simplejson-1.7/docs/index.html - -Writing custom serializers -`````````````````````````` - -XXX ...