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
Adrian Holovaty
267122978f
[1.0.X] Merged trunk changes [9850], [9851], [9852], [9853]
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-21 08:54:32 +00:00
Gary Wilson Jr
910aa0ea28
[1.0.X] Auth-related doc cleanups:
...
* Added to documentation of missing characters from `allowed_chars` in `make_random_password`.
* Fixed several long lines and word wraps.
* Added a reference link to the "How to log a user in" section and made a later reference to this section an actual link using the `:ref:` directive.
* Turned a command line code example into a code block.
* Added attribute reference link for a ``request.META`` mention.
* Added `code-block:: html` directives for HTML examples.
* Corrected reference links for all the `auth.views` functions.
* Added a few function signatures and documentation of optional parameters that were missing for some of the the `auth.views` functions (refs #10272 ).
Backport of r9835 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-16 05:14:18 +00:00
Gary Wilson Jr
b09a197a3e
[1.0.X] A few minor wording, whitespace, punctuation, and link changes for the middleware documentation.
...
Backport of r9833 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-15 05:47:30 +00:00
Russell Keith-Magee
2dce7064f4
[1.0.X] Fixed #8638 -- Added documentation on how to redirect email to a dummy server for testing purposes. Thanks to Rob Hudson and Marc Fargas for their work on the draft for this change.
...
Merge of r9793 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-29 23:40:57 +00:00
Ian Kelly
f6cacacbff
[1.0.X] Refs #9935 : Added a note in the documentation to the effect that Django currently requires a 4.X release of cx_Oracle. Backport of [9709] from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-01-06 18:25:52 +00:00
Adrian Holovaty
fd9ddb2dc1
[1.0.X] Merged [9682], [9683] and [9684] from trunk. These were changes dealing with documenting and adding a helpful error message for the quirk of admin users needing 'change user' permission to add users. Refs #9866
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-26 06:02:44 +00:00
Gary Wilson Jr
1d37663aef
[1.0.X] Fixed #9884 -- Corrected template example in model forms documentation, thanks bradmontgomery.
...
Backport of r9676 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-23 05:22:10 +00:00
Gary Wilson Jr
47de671948
[1.0.X] Fixed #9896 -- Corrected a couple uses of `formset.forms`, thanks aglzen.
...
Backport of r9672 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-23 00:15:03 +00:00
Gary Wilson Jr
518e19a363
[1.0.X] Fixed #9780 -- Fixed an undefined internal link in the model forms documentation, thanks ramiro.
...
Backport of r9670 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-23 00:03:19 +00:00
Gary Wilson Jr
6c3a98ab3a
[1.0.X] Fixed #9904 -- Corrected name of storage method in files documentation.
...
Backport of r9668 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-22 23:24:34 +00:00
Karen Tracey
26554aa6b2
[1.0.X] Fixed #9898 -- Added a missing 'e' to 'one'. Thanks gizzywump. Also Americanized specialised while in the area, per contributing's guideline.
...
r9662 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-21 04:23:35 +00:00
James Bennett
1a12506846
[1.0.X] Clarify install docs to point at new FAQ items about Python 3.0. Was [9360] in trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 22:49:16 +00:00
James Bennett
707d144c30
[1.0.X] Fixed #9783 ; clarified install docs and FAQ to explain that Django does not yet work with Python 3.0. Was [9628] in trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 22:42:10 +00:00
Adrian Holovaty
3988cb2d27
[1.0.X] Did some much-needed rewriting/editing in the formsets section of docs/topics/forms/modelsforms.txt. 'It self' is not two words. Backport of [9616]
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 04:20:54 +00:00
Brian Rosner
7edf9149d7
[1.0.X] Improved the model formset and inline formset documentation to be more explicit and handle some cases that were never addressed before.
...
Backport of r9614 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 00:36:25 +00:00
Gary Wilson Jr
89f2a5892d
[1.0.X] Fixed #9718 -- Removed a reference to oldforms FormWrapper? object in the user authentication docs.
...
Backport of r9595 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 05:29:43 +00:00
Malcolm Tredinnick
500021a923
[1.0.X] Fixed #9740 -- Updated and correct usage of max_entries in cache documentation.
...
Backport of r9556 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-03 05:53:26 +00:00
Malcolm Tredinnick
931d96e065
[1.0.X] Added a short note to the modelforms documentation linking between
...
save(commit=False) and using force_insert or force_update on the Model.save()
call. Refs #8672 .
Backport of r9539 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-02 06:00:44 +00:00
Karen Tracey
7f06c373d2
[1.0.X] Fixed #9618 : Corrected an error in some example code in the forms documentation. Thanks matthijs.
...
r9517 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-21 16:26:08 +00:00
Adrian Holovaty
cc0e00ebbe
[1.0.X] Removed 'Most Web sites wouldn't be complete without a way to upload files' sentence from file-uploads.txt in docs. I beg to differ. (Same as [9487] on trunk)
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-18 06:37:50 +00:00
Malcolm Tredinnick
f42df5fc3f
[1.0.X] Fixed #9472 -- Fixed a couple of URL patterns to be more consistent (and remove a misleading initial slash). Thanks, daveyjoe.
...
Backport of r9471 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-16 09:38:40 +00:00
Malcolm Tredinnick
c0feb2fad9
[1.0.x] Fixed #9477 -- Removed and edited a bunch of references to "development
...
version". Some were replaced with versionadded or versionchanged directives.
Other, more minor ones, were removed altogether.
Based on a patch from James Bennett.
Backport of r9454 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-15 05:56:01 +00:00
Malcolm Tredinnick
51dabd2819
[django-1.0.X] Fixed #9377 -- Clarified when cmemcached support was included in Django.
...
Backport of r9435 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-14 08:07:39 +00:00
Malcolm Tredinnick
1b68c6a50f
[django-1.0.X] Fixed #9531 -- Fixed some awkward wording in the docs. Thanks, gsf.
...
Backport of r9434 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-14 08:07:11 +00:00
Malcolm Tredinnick
539d947ad4
[django-1.0.X] Fixed #9594 -- Typo fix in the testing example.
...
Backport of r9429 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-14 07:43:26 +00:00
Karen Tracey
1ea0057296
[1.0.X] Fixed #9567 - Removed an extraneous 'are'.
...
[9390] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-11 03:00:27 +00:00
Karen Tracey
55943c0975
[1.0.X] Fixed #9497 - Doc typos. Many thanks ramiro.
...
[9330] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-02 20:53:47 +00:00
Karen Tracey
f1eb098d96
[1.0.X] Fixed #9495 -- Corrected typo in urls doc. Thanks seemant.
...
[9328] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-02 04:23:28 +00:00
Karen Tracey
daf875259d
[1.0.X] Fixed #9374 -- Added missing close paren in serialization doc. Thanks jordy.
...
[9318] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 20:17:10 +00:00
Karen Tracey
19d164e051
[1.0.X] Fixed #9441 -- Corrected typo in file upload settings doc. Thanks gsf.
...
[9316] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 19:47:09 +00:00
Karen Tracey
d6a1e2ef7a
[1.0.X] Fixed #9487 -- Corrected several links into the Python docs that were broken by the recent Python docs refactor.
...
[9312] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-01 19:05:46 +00:00
James Bennett
d2f6a84668
[1.0.X] Remove obsolete reference to "development version" in autoescaping docs.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-26 03:10:48 +00:00
Malcolm Tredinnick
13d810efe4
[1.0.X] Fixed #9432 -- Revived documentation of ~Q usage.
...
Backport of r9267 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:30:04 +00:00
Malcolm Tredinnick
8613e6c53e
[1.0.X] Fixed #9430 -- Fixed documentation references to the HttpResponse
...
classes for returning HTTP status codes other than 200.
Backport of r9266 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:29:27 +00:00
Malcolm Tredinnick
f0ba276fd6
[1.0.X] Fixed #9325 -- Typo fix in the forms documentation.
...
Backport of r9215 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9216 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-09 09:21:22 +00:00
Malcolm Tredinnick
742ff0800b
[1.0.X] Fixed #9215 -- Added a view/template example of using pagination.
...
Based on a patch from shacker and Matt Dennenbaum.
Backport of r9193 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9196 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 11:58:40 +00:00
Malcolm Tredinnick
fb4f82f2ea
Reverted r9186 -- Committed to the wrong branch (it's a feature addition).
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 09:04:55 +00:00
Malcolm Tredinnick
ed48b0b37e
Fixed #5888 -- Added methods to the test client to support HEAD, PUT, DELETE
...
and OPTIONS support. Thanks Scott Barr and Leah Culver.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 08:47:05 +00:00
Malcolm Tredinnick
6a30f5a2ea
[1.0.X] Fixed #7011 -- Clarified what User.is_active really means in the documentation.
...
Backport of r9176 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 11:26:59 +00:00
Malcolm Tredinnick
378dadc210
[1.0.X] Fixed #6979 -- Fixed the documentation cross-reference between the
...
TIME_ZONE setting and manual settings configuration.
Backport of r9175 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 11:25:45 +00:00
Malcolm Tredinnick
f4a57bedd8
[1.0.X] Fixed #8768 -- Clarified that ugettext_lazy() results are unicode
...
proxies and can't be used as bytestrings.
Still a number of markup changes to be made in this file (and in this
changeset). That's intentional for now, since I'm going to rewrite the file
later this week.
Backport of r9168 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 08:48:17 +00:00
Malcolm Tredinnick
82a01a63a6
[1.0.X] Fixed #8184 -- Added a note to the documentation for reverse() that all
...
views must be importable for URL reversing to work correctly.
Backport of r9167 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 08:46:54 +00:00
Malcolm Tredinnick
6f0bcd23e6
[1.0.X] Fixed #9047 -- Marked up django.core.urlresolvers.reverse() properly in
...
the docs. It now appears in the index.
Backport of r9163 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 08:42:45 +00:00
Karen Tracey
48f4388c8b
[1.0.X] Fixed #9212 : Added code to check the xgettext version, and if it is lower than 0.15, undo an incorrect encoding to utf-8 done by xgettext. This bug was fixed in xgettext 0.15, but the most-easily-installed Windows gettext binaries are older (0.13.1), so we work around it.
...
Backport of r9155 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 01:38:22 +00:00
Malcolm Tredinnick
5da08047b9
[1.0.X] Changed the "write your own settings" recommendation to mention that Django
...
uses tuples, but not making it a recommendation. That might head off the endless
tuples vs. lists debates.
Fixed #8846 .
Backport of r9146 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 09:00:07 +00:00
Malcolm Tredinnick
ee9c6ae269
[1.0.X] Fixed a typo and clarified how django.core.mail.outbox works in the testing framework. Fixed #9237 .
...
Backport of r9140 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:41:15 +00:00
Malcolm Tredinnick
f9e78ed612
[1.0.X] Fixed #9301 -- Correct a markup typo in the docs.
...
Backport of r9132 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:22:25 +00:00