2386 Commits

Author SHA1 Message Date
Russell Keith-Magee
0056d79c4e [1.0.X] Fixed #11229 -- Updated the mod_wsgi deployment documentation to avoid references to mod_python and techniques that are not recommended or required for mod_wsgi. Thanks to Graham Dumpleton for the suggestion and guidance.
Merge of r11249 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-16 23:54:04 +00:00
Russell Keith-Magee
ab3b5b2380 [1.0.X] Fixed #10908 -- Clarified the procedure for creating test users in the testing docs. Thanks to gruszczy and timo.
Merge of r11248 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-16 23:49:27 +00:00
Russell Keith-Magee
1c908784e6 [1.0.X] Fixed #11235 -- Added a missing clause from some sample SQL in the queryset docs.
Merge of r11239 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:24:49 +00:00
Russell Keith-Magee
c7289a0402 [1.0.X] Fixed #11364 -- Modified the jsi18n example to use the {% url %} tag rather than a placeholder. Thanks to jcassee for the suggestion.
Merge of r11237 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:21:19 +00:00
Russell Keith-Magee
500202337e [1.0.X] Fixed #11374 -- Modified the documentation for forms.BooleanField to allow for the fact that it can be rendered using widgets other than a checkbox. Thanks to lygaret for the patch.
Merge of r11236 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:17:29 +00:00
Russell Keith-Magee
ca3bd9ffb7 [1.0.X] Fixed #11469 -- Removed suspicion that Django developers have trouble counting to four. Thanks to msgre for the report.
Merge of r11235 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:14:04 +00:00
Russell Keith-Magee
fcbd3bcec9 [1.0.X] Fixed #10287 -- Added better examples in the docs of formset validation. Thanks to Andrew Badr for the text.
Merge of r11234 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-15 14:11:06 +00:00
Russell Keith-Magee
558e4e9482 [1.0.X] Fixed #11438 -- Corrected some bad grammar in the custom fields docs. Thanks to thepointer for the report.
Merge of r11220 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-11 16:09:18 +00:00
Russell Keith-Magee
5c2518539c [1.0.X] Fixed #11453 -- Added note on customizing SERVER_EMAIL for error reporting. Thanks to seveas for the suggestion and draft text.
Merge of r11219 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-11 16:06:59 +00:00
Russell Keith-Magee
7cfee7925a [1.0.X] Fixed #11450 -- Corrected markup problem in contenttype docs. Thanks to seveas for the report.
Merge of r11218 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-11 15:48:38 +00:00
Russell Keith-Magee
667042a060 [1.0.X] Fixed #11454 -- Corrected mismatched parenthesis in admin docs. Thanks to seveas for the report.
Merge of r11217 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11222 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-11 15:45:55 +00:00
Russell Keith-Magee
63a7b95693 [1.0.X] Fixed #9669 -- Corrected an answer in the admin FAQ that is wrong in a post-newforms-admin world. Thanks to Alex for the report.
Merge of r11175 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 14:16:21 +00:00
Russell Keith-Magee
7b5869e140 [1.0.X] Fixed #9607 -- Added documentation for the `extra` argument in test client methods. Thanks to jroes for the report and patch.
Merge of r11173 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 07:47:05 +00:00
Russell Keith-Magee
40f24b4635 [1.0.X] Fixed #10426 -- Added note on language variables required for Apache to survive non-ASCII file uploads. Thanks to daybreaker for the report, and david for the draft text.
Merge of r11170 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 07:23:37 +00:00
Russell Keith-Magee
c05f4d5a22 [1.0.X] Fixed #11417 -- Corrected typo in MySQL collation notes. Thanks to vorushin for the report.
Merge of r11169 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 07:20:36 +00:00
Russell Keith-Magee
df2011c61b [1.0.X] Added a Sphinx anchor that somehow got omitted from r11102.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 06:25:42 +00:00
Russell Keith-Magee
45411379b4 [1.0.X] Fixed #10604 -- Added note on the limitation of ungettext, especially as relating to the {% blocktrans %} tag. Thanks to bartTC for the report, and Ramiro Morales for the patch.
Merge of r11164 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 06:15:48 +00:00
Russell Keith-Magee
9219741ee7 [1.0.X] Fixed #11413 -- Added notes on the cycle and firstof tag detailing that variables output by those tags will not be escaped by default. Thanks to krystal for the report and draft patch.
Merge of r11163 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 06:12:50 +00:00
Russell Keith-Magee
4aca3be925 [1.0.X] Fixed #10539 -- Updated Sphinx configuration to accommodate 0.6 while retaining compatibility with 0.4 and 0.5. Thanks to Ramiro Morales for the patch.
Merge of r11162 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-03 06:09:57 +00:00
Russell Keith-Magee
8d25e8f828 [1.0.X] Made some small improvements to docs/topics/http/sessions.txt
Merge of r10839 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-25 05:56:43 +00:00
Karen Tracey
7c8a6605ea [1.0.X] Fixed #10741: Updated instructions on the best gettext package to get for Windows. Thanks Ramiro.
r11103 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-24 23:40:00 +00:00
Russell Keith-Magee
b287f8a96f [1.0.X] Fixed #8861 -- Added note on the availability of ModelForm.instance. Thanks to Ramiro Morales for the patch.
Merge of r11097 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-24 14:23:24 +00:00
Russell Keith-Magee
60ec0bdec2 [1.0.X] Fixed #10415 -- Added documentation for features added in r7627 and r7630; extensibility points for the ModelAdmin?? and AdminSite??. Thanks to Ramiro Morales for the draft text.
Merge of r11095 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-24 14:21:19 +00:00
Russell Keith-Magee
e717ddc0da [1.0.X] Fixed #11354 -- Remove stray whitespace in queryset docs. Thanks to flebel for the report.
Merge of r11094 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-24 14:20:38 +00:00
Russell Keith-Magee
589d96ce4a [1.0.X] Fixed #11356 -- Added links to the growing collection of 3rd party database backends that are available. Thank to Nathan Auch for the draft text.
Merge of r11093 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-24 14:19:44 +00:00
Karen Tracey
75de41f910 [1.0.X] Fixed #11344 -- Made a couple of minor clarifications to the mod_wsgi deployment doc. Thanks nartzpod and achew22.
r11079 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-19 01:38:53 +00:00
Russell Keith-Magee
0c24c3ee17 [1.0.X] Fixed #11221 -- Replaced a reference to a non-existent URL with an actual explanation of sequences. Thanks to Rob Hudson for the report, and SmileyChris for the patch.
Merge of r11053 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 14:18:43 +00:00
Russell Keith-Magee
527609ccc9 [1.0.X] Fixed #10978 -- Clarified that the include statement is part of the urlpattern definition. Thanks to swatermasysk for the suggestion.
Merge of r11052 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11064 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 14:18:13 +00:00
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
7cebfa1c49 [1.0.X] Fixed #11119 -- Corrected spelling error in 1.0 porting guide.
Merge of r11050 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 14:17:13 +00:00
Russell Keith-Magee
5301334f15 [1.0.X] Fixed #11141 -- Corrected a code example in the admin docs. Thanks to jodal for the report, and SmileyChris for the patch.
Merge of r11049 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 14:16: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
7ccd095755 [1.0.X] Fixed #11312 -- Fixed the default value given for DEFAULT_FILE_STORAGE in the docs. THanks to x00nix@gmail.com for the patch.
Merge of r11046 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 14:14:52 +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
7cccaaaf70 [1.0.X] Fixed #11339 -- Corrected typo in FAQ. Thanks Kellen.
r11041 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 12:42:57 +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
e63e0bb400 [1.0.X] Fixed #11328 -- Added missing imports in the sample urls.py from Tutorial 3. Thanks to marcalj for the report.
Merge of r11021 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-17 13:52:05 +00:00
Russell Keith-Magee
3f28be2b65 [1.0.X] Fixed #11056 -- Corrected reference to File class in storage docs. Thanks to wam for the report.
Merge of r10970 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-10 13:00:28 +00:00
Russell Keith-Magee
a7f109d50f [1.0.X] Fixed #10801 -- Reverted a portion of [10371]. Practicality beats purity in this case. Thanks to bruce@z2a.org for the report. Refs #9771.
Merge of r10973 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-10 12:57:06 +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
Russell Keith-Magee
383c46dc8d [1.0.X] Fixed #10981 -- Clarified documentation regarding lazy cross-application relationships. Thanks to Ramiro for the suggestion.
Merge of r10971 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-10 12:51:35 +00:00
Karen Tracey
e2e092cff9 [1.0.X] Fixed #11204 -- Corrected typo in the pluralize doc. Thanks martin and SmileyChris.
r10849 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-27 16:28:38 +00:00
Karen Tracey
28380f48ca [1.0.X] Fixed #11209 -- Added a note to doc on connection.queries that the logged sql may not inlude parameter quoting.
r10847 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-27 16:21:49 +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
Karen Tracey
b9db62ee60 [1.0.X] Fixed #11205 -- Made the links to the str method description look the same as the links to the unicode method description in the tutorial part 1. Having one be fully qualified while the other was not was odd-looking.
r10843 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-26 16:48:49 +00:00
Karen Tracey
f37a02ec03 [1.0.X] Fixed #11202 -- Removed mod_python information from FAQ, as it is no longer the recommended deployment option, in favor of more general pointers to the docs and wiki where deployment is discussed in depth.
r10841 from trunk.  Also updated svnmerge-integrated to indicate r10837 has been merged to the branch.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-26 16:33:10 +00:00