Ticket #4133: dashes.diff
| File dashes.diff, 7.7 kB (added by Gary Wilson <gary.wilson@gmail.com>, 2 years ago) |
|---|
-
docs/api_stability.txt
old new 100 100 101 101 .. _caching: ../cache/ 102 102 .. _custom template tags and libraries: ../templates_python/ 103 .. _database lookup: ../db _api/103 .. _database lookup: ../db-api/ 104 104 .. _django-admin utility: ../django-admin/ 105 105 .. _fastcgi integration: ../fastcgi/ 106 106 .. _flatpages: ../flatpages/ 107 107 .. _generic views: ../generic_views/ 108 108 .. _internationalization: ../i18n/ 109 109 .. _legacy database integration: ../legacy_databases/ 110 .. _model definition: ../model _api/110 .. _model definition: ../model-api/ 111 111 .. _mod_python integration: ../modpython/ 112 112 .. _redirects: ../redirects/ 113 113 .. _request/response objects: ../request_response/ -
docs/authentication.txt
old new 144 144 Raises ``django.contrib.auth.models.SiteProfileNotAvailable`` if the current site 145 145 doesn't allow profiles. 146 146 147 .. _Django model: ../model _api/147 .. _Django model: ../model-api/ 148 148 .. _DEFAULT_FROM_EMAIL: ../settings/#default-from-email 149 149 150 150 Manager functions … … 757 757 The only thing this does is create those extra permissions when you run 758 758 ``syncdb``. 759 759 760 .. _model Meta attribute: ../model _api/#meta-options760 .. _model Meta attribute: ../model-api/#meta-options 761 761 762 762 API reference 763 763 ------------- -
docs/db-api.txt
old new 6 6 database-abstraction API that lets you create, retrieve, update and delete 7 7 objects. This document explains that API. 8 8 9 .. _`data models`: ../model _api/9 .. _`data models`: ../model-api/ 10 10 11 11 Throughout this reference, we'll refer to the following models, which comprise 12 12 a weblog application:: … … 85 85 unless you explicitly specify ``primary_key=True`` on a field. See the 86 86 `AutoField documentation`_.) 87 87 88 .. _AutoField documentation: ../model _api/#autofield88 .. _AutoField documentation: ../model-api/#autofield 89 89 90 90 Explicitly specifying auto-primary-key values 91 91 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ … … 1801 1801 programming languages or database frameworks; there's nothing Django-specific 1802 1802 about your database. 1803 1803 1804 .. _Executing custom SQL: ../model _api/#executing-custom-sql1804 .. _Executing custom SQL: ../model-api/#executing-custom-sql -
docs/faq.txt
old new 512 512 As explained in the `SQL initial data file`_ documentation, this SQL file can 513 513 contain arbitrary SQL, so you can make any sorts of changes you need to make. 514 514 515 .. _SQL initial data file: ../model _api/#providing-initial-sql-data515 .. _SQL initial data file: ../model-api/#providing-initial-sql-data 516 516 517 517 Why is Django leaking memory? 518 518 ----------------------------- -
docs/flatpages.txt
old new 84 84 `django/contrib/flatpages/models.py`_. You can access flatpage objects via the 85 85 `Django database API`_. 86 86 87 .. _Django model: ../model _api/87 .. _Django model: ../model-api/ 88 88 .. _django/contrib/flatpages/models.py: http://code.djangoproject.com/browser/django/trunk/django/contrib/flatpages/models.py 89 .. _Django database API: ../db _api/89 .. _Django database API: ../db-api/ 90 90 91 91 Flatpage templates 92 92 ================== -
docs/forms.txt
old new 691 691 document for more details). 692 692 693 693 .. _`generic views`: ../generic_views/ 694 .. _`models API`: ../model _api/694 .. _`models API`: ../model-api/ 695 695 .. _settings: ../settings/ -
docs/generic_views.txt
old new 71 71 ``extra_context`` that is always fresh you need to wrap it in a function or 72 72 lambda that returns the QuerySet. 73 73 74 .. _database API docs: ../db _api/74 .. _database API docs: ../db-api/ 75 75 76 76 "Simple" generic views 77 77 ====================== -
docs/i18n.txt
old new 175 175 verbose_name = _('my thing') 176 176 verbose_name_plural = _('mythings') 177 177 178 .. _Django models: ../model _api/178 .. _Django models: ../model-api/ 179 179 180 180 Pluralization 181 181 ~~~~~~~~~~~~~ -
docs/redirects.txt
old new 66 66 `django/contrib/redirects/models.py`_. You can access redirect 67 67 objects via the `Django database API`_. 68 68 69 .. _Django model: ../model _api/69 .. _Django model: ../model-api/ 70 70 .. _django/contrib/redirects/models.py: http://code.djangoproject.com/browser/django/trunk/django/contrib/redirects/models.py 71 .. _Django database API: ../db _api/71 .. _Django database API: ../db-api/ -
docs/serialization.txt
old new 27 27 (Actually, the second argument can be any iterator that yields Django objects, 28 28 but it'll almost always be a QuerySet). 29 29 30 .. _QuerySet: ../db _api/#retrieving-objects30 .. _QuerySet: ../db-api/#retrieving-objects 31 31 32 32 You can also use a serializer object directly:: 33 33 -
docs/settings.txt
old new 874 874 The string to use as the ``User-Agent`` header when checking to see if URLs 875 875 exist (see the ``verify_exists`` option on URLField_). 876 876 877 .. _URLField: ../model _api/#urlfield877 .. _URLField: ../model-api/#urlfield 878 878 879 879 USE_ETAGS 880 880 --------- -
docs/sites.txt
old new 276 276 ones), put ``objects = models.Manager()`` in your model, before you define 277 277 ``CurrentSiteManager``. 278 278 279 .. _manager: ../model _api/#managers280 .. _manager documentation: ../model _api/#managers279 .. _manager: ../model-api/#managers 280 .. _manager documentation: ../model-api/#managers 281 281 282 282 How Django uses the sites framework 283 283 =================================== -
docs/syndication_feeds.txt
old new 159 159 {{ obj.description }} 160 160 161 161 .. _chicagocrime.org: http://www.chicagocrime.org/ 162 .. _object-relational mapper: ../db _api/162 .. _object-relational mapper: ../db-api/ 163 163 .. _Django templates: ../templates/ 164 164 165 165 A complex example -
docs/tutorial01.txt
old new 577 577 When you're comfortable with the API, read `part 2 of this tutorial`_ to get 578 578 Django's automatic admin working. 579 579 580 .. _Database API reference: ../db _api/580 .. _Database API reference: ../db-api/ 581 581 .. _part 2 of this tutorial: ../tutorial02/ -
docs/tutorial04.txt
old new 219 219 If you'd like to know more about how that works, The Django database API 220 220 documentation `explains the lazy nature of QuerySet objects`_. 221 221 222 .. _explains the lazy nature of QuerySet objects: ../db _api/#querysets-are-lazy222 .. _explains the lazy nature of QuerySet objects: ../db-api/#querysets-are-lazy 223 223 224 224 In previous parts of the tutorial, the templates have been provided with a context 225 225 that contains the ``poll`` and ``latest_poll_list`` context variables. However,
