diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2009-12-29 02:53:26 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2009-12-29 02:53:26 +0000 |
| commit | 8c62b72c060128c66726f211e2d40434a7d6f8bf (patch) | |
| tree | 5ef8bf66c3fe0199586a47d5d664f936077c87dc /docs | |
| parent | 5559eb56febc5075a13beaea300e4ba803604ff2 (diff) | |
[soc2009/model-validation] Fixed some merge issues from [12014].
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@12016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/models/querysets.txt | 11 | ||||
| -rw-r--r-- | docs/ref/templates/builtins.txt | 10 |
2 files changed, 0 insertions, 21 deletions
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 2dbe8f03b0..e261e3bbe2 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1147,17 +1147,6 @@ more overall work (an additional query) than simply using .. _field-lookups: -``exists()`` -~~~~~~~~~~~~ - -.. versionadded:: 1.2 - -Returns ``True`` if the :class:`QuerySet` contains any results, and ``False`` -if not. This tries to perform the query in the simplest and fastest way -possible, but it *does* execute nearly the same query. This means that calling -:meth:`QuerySet.exists()` is faster that ``bool(some_query_set)``, but not by -a large degree. - Field lookups ------------- diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index fb8b847608..b7afa15f7f 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -65,16 +65,6 @@ Forgeries <ref-contrib-csrf>`. .. templatetag:: cycle -csrf_token -~~~~~~~~~~ - -.. versionadded:: 1.1.2 - -In the Django 1.1.X series, this is a no-op tag that returns an empty string for -future compatibility purposes. In Django 1.2 and later, it is used for CSRF -protection, as described in the documentation for :ref:`Cross Site Request -Forgeries <ref-contrib-csrf>`. - cycle ~~~~~ |