Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity
6,932 Commits 26 Branches 382 Tags
Commit Graph

163 Commits

Author SHA1 Message Date
Russell Keith-Magee
91e16bdcb7 [1.0.X] Fixed #11253 -- Normalized the way the docs refer to TestCase.assert* methods. Thanks to SmileyChris for the report and patch. 
Merge of r11051 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:17:45 +00:00
Russell Keith-Magee
c77f83ceae [1.0.X] Fixed #11322 -- Clarified docs regarding middleware processing. Thanks the Michael Malone for the patch. 
Merge of r11048 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:16:13 +00:00
Russell Keith-Magee
82ffb6747f [1.0.X] Fixed #11318 -- Grammar correction in modelform docs. Thanks to seemant for the report. 
Merge of r11047 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:15:27 +00:00
Russell Keith-Magee
9029db7b79 [1.0.X] Fixed #11278 -- Clarified query documentation regarding bulk assignment of m2m values. Thanks to zgoda for the patch. 
Merge of r11045 and r11054 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:14:21 +00:00
Russell Keith-Magee
58e4a9d938 [1.0.X] Fixed #11272 -- Made some clarifications to the overview and tutorial. Thanks to jjinux for the review notes. 
Merge of r11044 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 14:13:50 +00:00
Karen Tracey
a44960b083 [1.0.X] Fixed #11335 -- Corrected model reference in generic views doc. Thanks oyvind. 
r11028 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-17 20:02:17 +00:00
Russell Keith-Magee
9d7e51d957 [1.0.X] Fixed #10336 -- Added improved documentation of generic views. Thanks to Jacob and Adrian for the original text (from the DjangoBook), and Ramiro for doing the work of porting the docs. 
Merge of r11025 and r11026 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11027 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-17 14:19:54 +00:00
Russell Keith-Magee
40bcd34fab [1.0.X] Fixed #9919 -- Added note on the need to mark transactions as dirty when using raw SQL. 
Merge of r11022 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-17 13:54:43 +00:00
Russell Keith-Magee
922aed5465 [1.0.X] Fixed #10845 -- Clarified the examples for using ModelForms with fields or exclude specified. Thanks to Andrew Durdin for the suggestion. 
Merge of r10972 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-10 12:54:15 +00:00
Karen Tracey
18feaead04 [1.0.X] Fixed #11215 -- Replaced erroneous catch with except in testing doc. Thanks jgomo3. 
r10845 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-27 16:06:35 +00:00
Brian Rosner
82f9f74821 [1.0.X] Fixed #8857 -- Corrected ref in modelforms documentation and added ref to file upload documentation in form documentation. Thanks Kyle Fox and prairiedogg. 
Backport of [10837] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-24 06:48:43 +00:00
Karen Tracey
24108801b6 [1.0.X] Fixed #11188 -- Removed incorrect doc note about step being unsupported when slicing query sets. 
r10835 from trunk.  Also updated svnmerge metadata for some other recent commits.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-23 13:06:26 +00:00
Karen Tracey
ad2efbdd61 [1.0.X] Fixed #11138 -- Corrected the description of behavior related to the max_num parameter for model formsets. 
r10819 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-18 16:02:43 +00:00
Karen Tracey
efbe48cfcb [1.0.X] Fixed #10400: Added a note in the file uploads doc about the correct form type needed for file uploads to work. Thanks claudep and timo. 
r10816 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 18:47:32 +00:00
Karen Tracey
65966cebd3 [1.0.X] Fixed #10817 -- Corrected some grammar in the forms doc. Thanks nickretallack@gmail.com. 
r10814 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 18:11:58 +00:00
Karen Tracey
fc24a69028 [1.0.X] Fixed #10855: Reference doc on creating superusers in the tutorial at the point where an account is needed, so that readers who neglected to create one earlier (or who forgot the password) don't get stuck or think they have to start all over. Thanks cwolf127 and timo. 
r10810 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 17:57:41 +00:00
Karen Tracey
e6a6ce4f07 [1.0.X] Fixed #11106 -- Corrected typo in models doc. Thanks mnieber. 
r10797 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 16:22:44 +00:00
Karen Tracey
ebd74921bb [1.0.X] Fixed #11128 -- Misc. fixes and improvements to the model forms doc. Thanks Ramiro and Alex. 
r10795 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 16:15:16 +00:00
Russell Keith-Magee
f5dcd07977 [1.0.X] 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. 
Merge of r10791 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-16 06:27:44 +00:00
Jacob Kaplan-Moss
91a17a843f [1.0.X] Fixed #10795: added a link to model formsets docs from the formsets docs. Backport of [10774] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 02:15:53 +00:00
Jacob Kaplan-Moss
ce369dce13 [1.0.X] Fixed #10273: added an explanation of SetPasswordForm and UserChangeForm to the docs. Thanks, Tarken. Backport of [10772] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 02:03:35 +00:00
Jacob Kaplan-Moss
cefeb13f91 [1.0.X] Fixed #10272: documented the signatures for the contrib.auth views. Thanks, Idan Gazit. Backport of [10770] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 02:01:54 +00:00
Jacob Kaplan-Moss
da4ddabbe5 [1.0.X] Fixed #11063: updated install docs to mention mod_wsgi instead of mod_python. Backport of [10745] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-12 17:25:07 +00:00
Russell Keith-Magee
7bcbc99b9e [1.0.X] Fixed #9493 -- Corrected error handling of formsets that violate unique constraints across the component forms. Thanks to Alex Gaynor for the patch. 
Merge of r10682 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 16:04:59 +00:00
Russell Keith-Magee
6e1869c46b [1.0.X] 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. 
Merge of r10655 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 07:44:39 +00:00
Russell Keith-Magee
5f730ded91 [1.0.X] Fixed #10954 -- Corrected error in docs example describing extending the JSON serializer. Thanks to Glenn for the report. 
Merge of r10654 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 07:43:55 +00:00
Russell Keith-Magee
33eca69b95 [1.0.X] Fixed #10779 -- Corrected description of an example in the files docs. Thanks to timo for the patch. 
Merge of r10567 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-16 13:29:31 +00:00
Russell Keith-Magee
b8abb9b872 [1.0.X] Fixed #10822 -- Corrected minor typo in i18n docs. Thanks to prairiedogg for the report. 
Merge of r10561 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-16 13:27:46 +00:00
Jacob Kaplan-Moss
597102199e [1.0.X] Fixed a whole bunch of small docs typos, errors, and ommissions. Backport of the parts of r10371 that apply to the 1.0 docs. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-03 18:37:43 +00:00
Jacob Kaplan-Moss
f770cf5c5a [1.0.X] Fixed #10031: updated SQLite database docs to more strongly indicate the problems with versions before 3.3.6. Thanks, ramiro. Backport of r10311 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 02:37:04 +00:00
Jacob Kaplan-Moss
a9017a1e5a [1.0.X] A whole lotta documentation fixes, backported from r10303 on trunk. 
I got my commit message cut off the first try, but luckily I get to still thank Kevin Kubasik for rolling all these fixes up into a single easy patch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 00:08:34 +00:00
Jacob Kaplan-Moss
97b22bde3c Made a bunch of edits to docs/topics/cache.txt, mostly based on stuff from the Django Book. Backport of [10055] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 23:54:13 +00:00
James Bennett
76fd191bfd [1.0.X] Fixed #9012: Changed inappropriate title of models documentation. Backport of [10276] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 18:15:01 +00:00
James Bennett
8c776637b2 [1.0.X] Fixed #10306: Corrected form action in auth login example. Backport of [10269] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 17:01:42 +00:00
Gary Wilson Jr
24a359f078 [1.0.X]: Fixed #10120 -- Added a return to a doc example, patch from andrews. 
Backport of r10265 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 16:52:47 +00:00
Gary Wilson Jr
b3b541b68e [1.0.X]: Fixed #10553 -- Corrected several uses of URLconf in documentation and comments, according to the Django style guide. Based on patch from rduffield. 
Backport of r10256 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 16:09:22 +00:00
Gary Wilson Jr
46e37d20d4 [1.0.X]: Fixed #9914 -- Fixed field class name in models docs, patch from timo. 
Backport of r10200 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-30 18:44:35 +00:00
Malcolm Tredinnick
dce8fdbc68 [1.0.X] Made a couple of cross-references in the model fields documentaiton consistent. 
Backport of r10007 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-24 23:02:36 +00:00
Russell Keith-Magee
17401448b2 [1.0.X] Fixed #10503 -- Clarified docs on the operation of the noop option to {% trans %}. Thanks to liangent for the report. 
Merge of r10151 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-24 12:09:56 +00:00
Russell Keith-Magee
ade3dcb494 [1.0.X] Fixed #10437 -- Corrected typo in Widget media example. Thanks to Manuel Saelices. 
Merge of r10149 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-24 12:04:43 +00:00
Russell Keith-Magee
c2e4e54eb6 [1.0.X] Fixed #10570 -- Grammar fix for Manager docs. Thanks to adamv. 
Merge of r10147 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-24 12:01:23 +00:00
Malcolm Tredinnick
4d6763128f [1.0.X] 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.

Backport of r10058 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-15 03:46:26 +00:00
Malcolm Tredinnick
8a0a17628b [1.0.X] 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.

Backport of r10057 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-15 03:45:56 +00:00
Malcolm Tredinnick
79f53b4f20 [1.0.X] 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.

Backport of r9974 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-04 10:40:50 +00:00
Malcolm Tredinnick
9e6d32edde [1.0.X] 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.

Backport of r9958 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-03 01:44:26 +00:00
Malcolm Tredinnick
1a5588fceb [1.0.X] Small edit to the caching docs. 
Turns out, super-lightning is not faster than normal lightning. :-)

Backport of r9949 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-02 05:47:25 +00:00
James Bennett
9b5b2ee2f3 [1.0.X] Fixed #10377: Added clearer warning to database notes for cx_Oracle 5.0. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-28 06:05:44 +00:00
Russell Keith-Magee
16f05e78f1 [1.0.X] 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. 
Merge of r9865 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-22 07:19:26 +00:00
Russell Keith-Magee
1bd70b4e22 [1.0.X] 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. 
Merge of r9859 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-22 06:43:35 +00:00
Russell Keith-Magee
429b57d642 [1.0.X] Fixed #10298 -- Corrected the example for the get_list_or_404 shortcut. Thanks to Dagur for the report. 
Merge of r9857 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-22 06:39:55 +00:00