1
0
mirror of https://github.com/django/django.git synced 2025-10-10 23:39:11 +00:00

2377 Commits

Author SHA1 Message Date
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
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
d4e44699aa [1.0.X] Fixed #10846: Corrected typo in modwsgi.txt and updated reference to deployment in The Django Book. Thanks timo.
r10812 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 18:06:12 +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
e2189f6d24 [1.0.X] Fixed #10925 -- Clarified the location of some code referenced in the tutorial. Thanks rm and timo.
r10808 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 17:45:12 +00:00
Karen Tracey
509dfdd3a7 [1.0.X] Fixed #11031 -- Added doc for some additional roles needed when testing Oracle. Thanks JirkaV and Matt Boersma.
r10805 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 17:28:34 +00:00