Commit Graph

389 Commits

Author SHA1 Message Date
Russell Keith-Magee 1ca9e95d4e Fixed #15062 -- Documented the fact that managers must be able to be shallow copied. Thanks to Ian Clelland for the report, and Łukasz Rekucki for the help diagnosing the problem.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 06:44:23 +00:00
Timo Graham 07ef43082d Fixed #15002 - Fix title casing to conform to style guidelines. thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:29:17 +00:00
Luke Plant 5a36b43c27 Some small fixes to DB optimization docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 15:47:46 +00:00
Timo Graham f2c4c63cdc Fixed #14997 - A typo in "Overriding delete". thanks phunehehe for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 13:09:20 +00:00
Timo Graham 08cec1f508 Fixed #12313 - Add a note that QuerySet.delete() doesn't necessarily call obj.delete(). thanks FunkyELF for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 23:46:06 +00:00
Timo Graham 2ea93f9327 Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 00:37:14 +00:00
Karen Tracey b1f6a4d66f Fixed #10154: Allow combining F expressions with timedelta values.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 03:34:04 +00:00
Chris Beaven 3ae9117c46 Fixes #7817 and #9456.
- The include tag now has a 'with' option to include to provide extra context
  vairables to the included template.

- The include tag now has an 'only' option to exclude the current context
  when rendering the included template.

- The with tag now accepts multiple variable assignments.

- The with, include and blocktrans tags now use a new keyword argument format
  for variable assignments (e.g. `{% with foo=1 bar=2 %}`).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 02:50:26 +00:00
Adrian Holovaty 99742d8d73 Fixed it's -> its in multi-db.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-16 22:37:29 +00:00
Timo Graham dc2a3f8280 Fixed #14848 - change example verbose name to match convention. thanks madisv for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-14 23:43:36 +00:00
Simon Meers ffa4badbd8 Fixed #14841 -- added xrefs to topics/db/models. Thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 23:52:23 +00:00
Timo Graham 111ed0195e Fixed #14120 - Document get() in Making Queries - thanks danielr and adamv for work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 22:32:01 +00:00
Gabriel Hurley 3abcd9d3e2 Fixed #14767 -- Reflowed paragraphs and cleaned up some markup/links in the topics/db/optimizations docs. Thanks to adamv for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-24 11:52:15 +00:00
Alex Gaynor 274aba3b9b Fixed #11108 -- added ModelAdmin.delete_model, a hook with which to perform custom pre-post delete behavior. Thanks to Florian Apolloner for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 19:00:40 +00:00
Gabriel Hurley a56e47400f Fixed #14727 -- Corrected three minor issues in the docs. Thanks to OldTroll for the report and the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 10:49:42 +00:00
Carl Meyer 616b30227d Fixed #7539, #13067 -- Added on_delete argument to ForeignKey to control cascade behavior. Also refactored deletion for efficiency and code clarity. Many thanks to Johannes Dollinger and Michael Glassford for extensive work on the patch, and to Alex Gaynor, Russell Keith-Magee, and Jacob Kaplan-Moss for review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 16:46:42 +00:00
Ramiro Morales 7a5c54e9b7 Fixed typo in raw SQL docs example.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 05:04:05 +00:00
Gabriel Hurley 63046ec1ee Fixed #14624 -- Updated a few outdated references to CacheMiddleware in the transactions topic guide. Thanks to quinode for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 09:19:53 +00:00
Alex Gaynor cf03598eec Fixed #14629 -- corrected a misspelling and poor wording in the docs. Thanks to OldTroll for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 03:26:17 +00:00
Gabriel Hurley 9962f352bf Fixed #14578 -- Corrected a typo in the Models topic docs. Thanks to tobych for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 01:55:58 +00:00
Alex Gaynor cad4feabad Fixed #14534 -- updated an out of date link in the docs. Thanks to d0ugal for the report and Frank Wiles for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-22 21:20:00 +00:00
Alex Gaynor 27db9378cf Fixed #10771 -- added support for using the transaction management functions as context managers in Python 2.5 and above. Thanks to Jacob for help with the docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14288 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 19:38:15 +00:00
Gabriel Hurley 7baee5b953 Fixed #14426 -- Removed "mysite" import statements from examples that might teach people "bad habits" in regards to creating reusable apps.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 00:10:22 +00:00
Gabriel Hurley cf9249746a Fixes #13538 -- Clarified query examples with more explicit import statements and model vs. instance differentiation. Thanks to yipengh87@gmail.com and kmtracey for the report, and timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:20:56 +00:00
Russell Keith-Magee a904e55859 Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:12:50 +00:00
Malcolm Tredinnick 767cf13d76 The optimization docs were a little too enthusiastic in recommending
defer() and only() usage. Disk access patterns affect when this is a
good idea, so this patch adds a note about the trade-offs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:08:17 +00:00
Malcolm Tredinnick 7c075440ea Add intro-user-level documentation about calling model methods from views.
Patch from timo and shacker. Fixed #10903.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:34:11 +00:00
Luke Plant 20fb7c7858 Fixed #13759 - Multi-db docs have an example that isn't syntax highlighting
Thanks to Tim Hatch for report and patch.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 10:24:18 +00:00
Jacob Kaplan-Moss 728effcfbd Fixed #14141: docs now use the :doc: construct for links between documents.
Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-19 19:27:44 +00:00
Russell Keith-Magee 2dc2ed87e5 Fixed #11800 -- Updated Sphinx metadata in queryset docs. Thanks to timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:26:07 +00:00
Russell Keith-Magee 5dee1066a5 Fixed #13718 -- Corrected typo in model docs. Thanks to gvkalra for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 02:43:35 +00:00
Jacob Kaplan-Moss 099c6b8710 Fixed #13746: made the dumdata help message a bit clearer. Thanks, PaulM.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13469 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-04 19:08:14 +00:00
Luke Plant 2cf21d994d Small corrections/improvements to DB optimization docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-05 16:26:12 +00:00
Russell Keith-Magee a193f355a8 Fixed #13532 -- Corrected and clarified examples in F() docs. Thanks to erw for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-14 01:51:14 +00:00
Russell Keith-Magee b34edc76eb Fixed #12678 -- Corrected a few references to Queryset into QuerySet. Thanks to ChrisMorgan for the report, and timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 13:14:19 +00:00
Russell Keith-Magee 9320c866ff Fixed #13316 -- Added clarifying note about cross-database relations.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 07:44:06 +00:00
Russell Keith-Magee 6b1a2a8e44 Fixed #13428 -- Corrected the allow_relation behavior of and example router. Thanks to jcd for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-08 07:41:22 +00:00
Luke Plant f7814cdfe6 Fixed #13035 - Incorrect documentation regarding admin and default managers
Thanks to rasca for report and gabrielhurley for patch



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 11:52:32 +00:00
Luke Plant 671f848dd1 Fixed #13268 - 'ForeignKeyField' in topics/db/queries.txt
Thanks piquadrat for report and patch.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12928 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 10:54:59 +00:00
Justin Bronn e07570f10e Fixed #13263 -- Corrected field name typo in queries documentation examples. Thanks, RicherPots for bug report and gabrielhurley for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 15:57:00 +00:00
Justin Bronn 459c71e332 Fixed #12930, #12832, #11538 -- Refactored and merged the GeoDjango documentation into the rest of the Django docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 20:14:53 +00:00
Russell Keith-Magee f74b9aec10 Refs #12767 -- Modified the multi-db docs to remove the implication that contrib.auth can be easily put on a separate database.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-10 12:35:55 +00:00
Russell Keith-Magee b50a35a669 Fixed #12941 -- Added documentation for the connections dictionary. Thanks to atlithorn@gmail.com for the report, and Alex Gaynor for the original text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 03:19:26 +00:00
Russell Keith-Magee 6f9ba54bf5 Fixed #12519 -- Corrected documentation on .raw() queries. Thanks to boralyl for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 13:57:02 +00:00
Russell Keith-Magee 841210b308 Fixed #12880 -- Added some missing sphinx directives for module references. Thanks to psagers for the report, and timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 13:55:37 +00:00
Russell Keith-Magee c306b78150 Fixed #12859 -- Clarified the documentation on using multiple tables with .update() calls. Thanks to dwillis for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12515 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:20:27 +00:00
Justin Bronn 7ca3e8fecf Updated patch applied in r12504. Refs #12806.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 06:04:06 +00:00
Justin Bronn c4699b0b8a Fixed #12806 -- Added an implementation of `RawQuerySet.__getitem__`. Thanks, Bruno Renié.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 05:22:12 +00:00
Justin Bronn 9810178706 Fixed #12688 -- Removed typo in manager docs. Thanks, orokusaki for the report and timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 02:35:47 +00:00
Jannis Leidel 0d37cfdc05 Fixed #12897 - Typo in multi-db docs. Thanks fgutierrez.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12456 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:37:19 +00:00
Russell Keith-Magee 7856a759d0 Fixed #12715 -- Clarified the docs on the usage of database routers, especially regarding the default routing scheme. Thanks to Chris Curvey for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 03:04:24 +00:00
Russell Keith-Magee c8873bbba7 Made the database master router tolerant of router definitions that omit individual routing methods.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-27 07:56:53 +00:00
Russell Keith-Magee 89f81810ed Removed some stray content from the multi-db docs. Thanks to Yuri Baburov for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-25 12:29:56 +00:00
Russell Keith-Magee 14116bc53e Fixed #12672 -- Added the ability to configure which applications are available on which database.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-25 12:23:30 +00:00
Russell Keith-Magee dbad025637 Fixed #12668 -- Corrected some typos in the multi-db docs. Thanks to mattimustang for the eagle eyes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-23 04:32:34 +00:00
Russell Keith-Magee 1b3dc8ad9a Fixed #12540, #12541 -- Added database routers, allowing for configurable database use behavior in a multi-db setup, and improved error checking for cross-database joins.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-22 14:30:06 +00:00
Jannis Leidel 2187fa3ea4 Added versionchanged directive to docs introduced in r12139.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:29:30 +00:00
Luke Plant 2e9518bb39 Created a 'DB optimization' topic, with cross-refs to relevant sections.
Also fixed #10291, which was related, and cleaned up some inconsistent doc labels.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-16 03:13:16 +00:00
Jannis Leidel 9614b0190f Fixed #11794 - Typo in model manager documentation. Thanks, timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12221 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-12 23:36:43 +00:00
Adrian Holovaty e1e4050347 Fixed #12297 -- Fixed typo in docs/topics/db/queries.txt. Thanks, bertil and timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 21:28:37 +00:00
Adrian Holovaty 34db1d6474 Fixed #11794 -- Removed an unnecessary literary flourish in docs/topics/db/managers.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:51:32 +00:00
Adrian Holovaty 74f88194c3 Fixed #12345 -- Fixed bug in db/models.txt.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:50:28 +00:00
Adrian Holovaty 457df03c99 Fixed #12084 -- Documented the fact that QuerySet.update() returns the number of affected rows. Thanks, timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-10 18:36:45 +00:00
Jannis Leidel 058343c5e8 Minor formatting fixes for [12139]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 21:07:32 +00:00
Jannis Leidel bacfe3f3e8 Fixed #9638 - Added %(app_label)s to the related_name format string for abstract models.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 20:03:52 +00:00
Adrian Holovaty 88265d4a73 Fixed #12497 -- Fixed Sphinx errors in docs. Thanks, ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 19:11:41 +00:00
Adrian Holovaty bf2283d47d Edited docs/topics/db/multi-db.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 17:09:20 +00:00
Adrian Holovaty 4a6c746977 Removed ridiculous extra space around the title in docs/topics/db/aggregation.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 17:08:52 +00:00
Russell Keith-Magee 96848352f9 Added `using` to the list of documented arguments for save() on a model; updated the docs to suggest using ``*args, **kwargs`` when implementing model save methods. Thanks to Jeff Croft for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-08 00:17:33 +00:00
Russell Keith-Magee b7fa3e8c35 Added docs on how syncdb and other management commands interact with multi-db.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-07 11:37:49 +00:00
Gary Wilson Jr adb74a8f2e Fixed several broken and redirecting URLs in the documentation (fixes #12219, refs #12427).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 06:37:26 +00:00
Russell Keith-Magee 7626f851e3 Fixed #12447 -- Corrected a bad example in the multi-db docs. Thanks to Bryan Veloso for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-25 10:26:36 +00:00
Russell Keith-Magee c8f22aef23 Fixed #12426 -- Corrected typo in multi-db docs. Thanks to btbytes for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-24 03:21:13 +00:00
Russell Keith-Magee 0f2f08a7d7 Documentation markup fixes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 16:10:48 +00:00
Russell Keith-Magee ff60c5f9de Fixed #1142 -- Added multiple database support.
This monster of a patch is the result of Alex Gaynor's 2009 Google Summer of Code project.
Congratulations to Alex for a job well done.

Big thanks also go to:
 * Justin Bronn for keeping GIS in line with the changes,
 * Karen Tracey and Jani Tiainen for their help testing Oracle support
 * Brett Hoerner, Jon Loyens, and Craig Kimmerer for their feedback.
 * Malcolm Treddinick for his guidance during the GSoC submission process.
 * Simon Willison for driving the original design process
 * Cal Henderson for complaining about ponies he wanted.

... and everyone else too numerous to mention that helped to bring this feature into fruition.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 15:18:51 +00:00
Russell Keith-Magee 79d6e402e3 Fixed #12409 -- Corrected some documentation typos in the docs on raw querysets. Also added a missing __init__.py file. Thanks to Alex Gaynor for the reports.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-21 01:53:39 +00:00
Jacob Kaplan-Moss 20ad30713e Fixed #11863: added a `Model.objects.raw()` method for executing raw SQL queries and yield models.
See `docs/topics/db/raw.txt` for details.

Thanks to seanoc for getting the ball rolling, and to Russ for wrapping things up.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-20 02:46:58 +00:00
James Bennett 4a2a0b0e21 Fixed #11931: Removed mention of nonexistent get_sql() method for arguments to limit_choices_to. Since the correct reference involves undocumented ORM internals, this simply removes the reference entirely in favor of publicly-documented use of Q objects.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-23 23:40:12 +00:00
Russell Keith-Magee b836ed4666 Made correction to documentation change from [11045].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11054 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 13:44:26 +00:00
Russell Keith-Magee 3db96017ba Fixed #11278 -- Clarified query documentation regarding bulk assignment of m2m values. Thanks to zgoda for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 13:32:48 +00:00
Russell Keith-Magee 992ded1ad1 Fixed #9919 -- Added note on the need to mark transactions as dirty when using raw SQL.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-17 13:47:39 +00:00
Karen Tracey e258961e4f Fixed #11188 -- Removed incorrect doc note about step being unsupported when slicing query sets.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-23 12:58:31 +00:00
Karen Tracey 5a5842ccf2 Fixed #11137 -- Add missing base class in proxy model extra managers doc. Thanks ekarulf.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-18 15:36:18 +00:00
Karen Tracey 2cbec63f0b Fixed #11106 -- Corrected typo in models doc. Thanks mnieber.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 16:20:11 +00:00
Russell Keith-Magee 975ec181ea Fixed #9206 -- Added documentation on savepoints, and how to use them to recover from errors in PostgreSQL. Thanks to Richard Davies for the draft text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-16 06:23:06 +00:00
Russell Keith-Magee 87d3ff731b Fixed #9206 -- Clarified documentation of transaction handling in raw SQL, and error recovery for Postgres. Thanks to Richard Davies for the suggestion and draft text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-02 07:40:25 +00:00
Malcolm Tredinnick 1aa0d1b4a6 Fixed #10490 -- Small wording correction in the docs. Thanks, matehat.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-12 02:00:36 +00:00
Jacob Kaplan-Moss c6c25adf6d Fixed a whole bunch of small docs typos, errors, and ommissions.
Fixes #8358, #8396, #8724, #9043, #9128, #9247, #9267, #9267, #9375, #9409, #9414, #9416, #9446, #9454, #9464, #9503, #9518, #9533, #9657, #9658, #9683, #9733, #9771, #9835, #9836, #9837, #9897, #9906, #9912, #9945, #9986, #9992, #10055, #10084, #10091, #10145, #10245, #10257, #10309, #10358, #10359, #10424, #10426, #10508, #10531, #10551, #10635, #10637, #10656, #10658, #10690, #10699, #19528.

Thanks to all the respective authors of those tickets.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-03 18:30:54 +00:00
James Bennett 83c6f8d4e2 Fixed #9012: Changed inappropriate title of models documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31 18:14:12 +00:00
Gary Wilson Jr 7372ea159a Fixed #10389, #10501, #10502, #10540, #10562, #10563, #10564, #10565, #10568, #10569, #10614, #10617, #10619 -- Fixed several typos as well as a couple minor issues in the docs, patches from timo, nih, bthomas, rduffield, UloPe, and sebleier@gmail.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-31 07:01:01 +00:00
Gary Wilson Jr 1e214534e7 Fixed #9914 -- Fixed field class name in models docs, patch from timo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-30 18:40:59 +00:00
Malcolm Tredinnick 6fa30faa79 Fixed #10574 -- Documented interaction between annotations and order_by.
In the future, I'd like to fix this properly, but the current behavior
has the advantage of being consistent across the board (and changing it
everywhere is backwards-incompatible with documented functionality).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-25 09:05:38 +00:00
Russell Keith-Magee 01757192e6 Fixed #10570 -- Grammar fix for Manager docs. Thanks to adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-24 11:40:12 +00:00
Jacob Kaplan-Moss 4246c832b6 Added 1.1 beta release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-23 23:25:03 +00:00
Malcolm Tredinnick 96d5d434fa Added some documentation explaining "managed=False" vs. "proxy=True".
These features look similar, but they're not identical. They can't be merged
into one (without requiring at least two Meta parameters anyway), so we've made
them have APIs that match their natural use-cases most easily.

Anyway, the documentation explains both the details and gives some simple to
follow rules.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-19 09:04:19 +00:00
Malcolm Tredinnick 61a2708c41 Fixed #10356 -- Added pure-Python inheritance for models (a.k.a proxy models).
Large portions of this are needed for #5420, so I implemented it fully.
Thanks to Ryan Kelly for an initial patch to get this started.

Refs #5420.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-18 09:47:08 +00:00
Malcolm Tredinnick 24b9c65d3f Documented patterns for adding extra managers to model subclasses.
This seems to have been a source of confusion, so now we have some explicit
examples. Fixed #9676.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-15 03:42:31 +00:00
Malcolm Tredinnick 292f503845 Clarified and expanded documentation for Manager.use_for_related_fields.
This is for Manager subclasses that are default managers, but only
sometimes.  The general rule is: "don't use it." If you really need it,
read the instructions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-15 03:42:08 +00:00
Malcolm Tredinnick 5fb6667036 Fixed #3460 -- Added an ability to enable true autocommit for psycopg2 backend.
Ensure to read the documentation before blindly enabling this: requires some
code audits first, but might well be worth it for busy sites.

Thanks to nicferrier, iamseb and Richard Davies for help with this patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-11 07:06:50 +00:00
Malcolm Tredinnick 98710a5a28 Made a couple of cross-references in the model fields documentaiton consistent.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-09 03:33:54 +00:00
Malcolm Tredinnick 7197a4dcb7 Made it explicit if you accidentally override a Field from a parent model.
This was always not working reliably (model initialization and serialization
were two of the problems). Now, it's an explicit error. Also, documented.

Fixed #10252.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04 10:39:29 +00:00
Malcolm Tredinnick 5e8ddd59e2 Minor update to documentation for many-to-many filter() calls.
Removed a potential ambiguity when describing how multiple conditions in one
filter() call are handled.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-03 01:40:47 +00:00
Russell Keith-Magee 86a048b4e0 Fixed #10344 -- Corrected some typos in the aggregation docs. Thanks to ewoudenberg for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 22:51:14 +00:00
Russell Keith-Magee 542709d0d1 Fixed #10182 -- Corrected realiasing and the process of evaluating values() for queries with aggregate clauses. This means that aggregate queries can now be used as subqueries (such as in an __in clause). Thanks to omat for the report.
This involves a slight change to the interaction of annotate() and values() clauses that specify a list of columns. See the docs for details.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-23 14:47:59 +00:00
Russell Keith-Magee 0c2a5ebe97 Fixed #9347 -- Added an entry in the field reference for the verbose_name option. Thanks to marcoberi for the suggestion, and timo for the eventual patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 06:10:29 +00:00
Russell Keith-Magee b1d487e0f8 Fixed #10118 -- Clarified the error message raised when accessing a subclass model that doesn't exist. Thanks to peterbraden@peterbraden.co.uk for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-22 06:07:47 +00:00
Russell Keith-Magee 322a6a9d1d Fixed #10303 -- Corrected a contradiction in the docs regarding the capabilities of the .update() clause that was introduced by the documentation for F() expressions. Thanks to gluckj for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-19 22:45:48 +00:00
Russell Keith-Magee fffade6633 Fixed #10187 -- Added documentation on how to import F() objects. Thanks to trigeek38 for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-03 23:13:02 +00:00
Russell Keith-Magee cf37e4624a Fixed #7210 -- Added F() expressions to query language. See the documentation for details on usage.
Many thanks to:
    * Nicolas Lara, who worked on this feature during the 2008 Google Summer of Code.
    * Alex Gaynor for his help debugging and fixing a number of issues.
    * Malcolm Tredinnick for his invaluable review notes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-29 10:46:36 +00:00
Russell Keith-Magee f5ed27cf1f Fixed #10052 -- Added import line for other aggregates used in examples. Thanks to Tyler Brownell <tyler@bluefoxstudio.ca> for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-23 11:12:06 +00:00
Russell Keith-Magee f9f9d703cf Fixed #10042 -- YAADT (Aggregation Docs Typo).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-16 00:02:35 +00:00
Russell Keith-Magee b3dd0b5dcc Fixed #10039 -- More typos in aggregation docs. Seriously, people, now you're just making me look bad :-) Thanks to ElliottM, and to Erich Holscher for a separate report that I've piggybacked on this checkin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-15 23:15:32 +00:00
Russell Keith-Magee bf710bd005 Fixed #10035 -- Corrected more typos in the aggregation docs. Thanks to Ivan Sagalaev for his eagle eyes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-15 22:33:55 +00:00
Russell Keith-Magee d55b361ac4 Corrected another typo in aggregation docs. Thanks to Ivan Sagalaev for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-15 22:26:00 +00:00
Russell Keith-Magee 14d15093bc Corrected typo in aggregation docs. Thanks to Ivan Sagalaev for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-15 14:07:53 +00:00
Russell Keith-Magee 79fa78cc80 Corrected a copy-and-paste typo in a heading of the aggregation docs. Thanks to Eivind Uggedal for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9744 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-15 12:35:41 +00:00
Russell Keith-Magee cc4e4d9aee Fixed #3566 -- Added support for aggregation to the ORM. See the documentation for details on usage.
Many thanks to:
 * Nicolas Lara, who worked on this feature during the 2008 Google Summer of Code.
 * Alex Gaynor for his help debugging and fixing a number of issues.
 * Justin Bronn for his help integrating with contrib.gis.
 * Karen Tracey for her help with cross-platform testing.
 * Ian Kelly for his help testing and fixing Oracle support.
 * Malcolm Tredinnick for his invaluable review notes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9742 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-15 11:06:34 +00:00
Malcolm Tredinnick c57fe6c3ec Fixed #9432 -- Revived documentation of ~Q usage.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9267 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:25:32 +00:00
Malcolm Tredinnick 93aec4e44a Fixed #9301 -- Correct a markup typo in the docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:18:08 +00:00
Malcolm Tredinnick e9f647e11f Fixed #9234 -- Typo fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-29 04:09:39 +00:00
Russell Keith-Magee 54f962c0bf Fixed #8967: Added documentation for the 'through' option on a many-to-many field in the fields reference documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-22 11:07:35 +00:00
Russell Keith-Magee bc75e912a4 Fixed #9046: Corrected a typo in the m2m intermediate docs. Thanks to djoume for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-14 07:52:45 +00:00
Gary Wilson Jr 165b55828a Fixed #8924 -- Corrected a couple typos in queries documentation, thanks arien.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-07 18:46:11 +00:00
Adrian Holovaty a0875bcc89 Fixed #8883 -- Fixed some glitches in model reference. Thanks, arien
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-06 16:51:24 +00:00
Jacob Kaplan-Moss 7b0b992a87 Fixed #8849: added some more "new in 1.0" flags. Thanks, ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-03 20:55:04 +00:00
Malcolm Tredinnick f31425e8e2 Fixed #7154 -- Inherit all model managers from abstract base classes.
Also added documentation describing how manager inheritance works (and when
manager aren't inherited). Based on some patches from sebastian_noack and
emulbreh.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-02 09:04:54 +00:00
Jacob Kaplan-Moss 64a9469127 Fixed #8753: converted "new in ..." callouts to proper Sphinx "versionadded/versionchanged" directives. Thanks to Marc Fargas for all the heavy lifting here.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-02 03:40:42 +00:00
Brian Rosner 502fc3ae56 Fixed #8759 -- Corrected a typo in example code. Thanks James Tauber for the find.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-01 23:06:39 +00:00
Jacob Kaplan-Moss 3a18002bbd Fixed #8210 and #8664: moved `USStateField` and `PhoneNumberField` to `django.contrib.localflavor.us`. This is a backwards-incompatible change, albeit a minor one; just add an aditional `import` and go on your way.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-01 22:15:35 +00:00
James Bennett a72eae0be7 Fixed #8728: Corrected some broken links in the documentation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-01 09:45:30 +00:00
James Bennett f88fb967bd Fixed #8705: Corrected some formatting issues in models documentation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-01 09:35:07 +00:00
James Bennett b085ccce6c Fixed #8730: Incorporated (with minor changes) additions/enhancements to one-to-one docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-09-01 09:32:41 +00:00
James Bennett 78ca7a6c07 Fixed #8533: restored model inheritance docs, and updated one-to-one docs to match
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31 10:13:32 +00:00
James Bennett 6ba55eee30 Fixed #8679: use full signature of Model.save() in docs and remove no-longer-used 'raw' argument
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-31 08:55:08 +00:00
James Bennett 5f3a182357 Fixed #8693: Fixed formatting of the "null" argument for model fields
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8737 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-30 05:38:07 +00:00
Jacob Kaplan-Moss 018057d8d1 Fixed a bad link in topics/db/models.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25 19:29:10 +00:00
Jacob Kaplan-Moss a169884505 Fixed #8539: fixed PEP references. Thanks, carljm.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25 19:28:57 +00:00
Jacob Kaplan-Moss 97bc872755 Fixed a handful of typo/markup problems in the docs. Patch from Daniel Roseman.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25 15:51:13 +00:00
Jacob Kaplan-Moss 97cb07c3a1 Massive reorganization of the docs. See the new docs online at http://docs.djangoproject.com/.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-23 22:25:40 +00:00