diff options
| author | Luke Plant <L.Plant.98@cantab.net> | 2008-05-22 19:24:25 +0000 |
|---|---|---|
| committer | Luke Plant <L.Plant.98@cantab.net> | 2008-05-22 19:24:25 +0000 |
| commit | 23e474510aeb36274dc9af1ddac6f4a2e02ef495 (patch) | |
| tree | e514b2b2c22ebfe6ca74005f0e77537c56632b75 /docs | |
| parent | 5b33adeafcabcc28dc6cab28ea80d0bc5fe445f4 (diff) | |
Reverted mistaken r7545
r7545 was a mistake due to not accounting for r7078
Thanks Ramiro Morales for catching this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/model-api.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/model-api.txt b/docs/model-api.txt index 554291396c..4ed4ede97a 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -1372,10 +1372,9 @@ link. Fieldsets with the ``wide`` style will be given extra horizontal space. ``description`` ~~~~~~~~~~~~~~~ -A string of optional extra text to be displayed at the top of each -fieldset, under the heading of the fieldset. If you want this to -include HTML, use ``django.utils.safestring.mark_safe`` so the HTML -will not be escaped. +A string of optional extra text to be displayed at the top of each fieldset, +under the heading of the fieldset. It's used verbatim, so you can use any HTML +and you must escape any special HTML characters (such as ampersands) yourself. ``js`` ------ |