246 Commits

Author SHA1 Message Date
Justin Bronn
9ccf1d087e [1.2.X] Fixed #14133 -- Updated Windows installation instructions for GeoDjango, now recommend the OSGeo4W installer for spatial libraries.
Backport of r15872 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 20:12:38 +00:00
Justin Bronn
64c83ac6fb [1.2.X] Use Sphinx :download: directives for spatial database template creation scripts instead of linking to geodjango.org.
Backport of r15854 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 16:52:53 +00:00
Gabriel Hurley
e9857ed5b1 [1.2.X] Fixed #15592 -- corrected an missing backtick in the syndication docs. Thanks to bradley.ayers for the report and patch.
Backport of [15793] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 17:22:35 +00:00
Gabriel Hurley
a9a85d7cfa [1.2.X] Fixed #15504 -- Cleaned up contrib.syndication and contrib.utils.feedgenerator docs. Corrected numerous reST problems, removed duplicate method declarations, corrected method signatures, etc. Thanks to slinkp for the report.
Backport of [15739] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 22:22:03 +00:00
Gabriel Hurley
a5f71e1264 [1.2.X] Fixed #15365 -- Added a warning to the contrib.markup docs reminding users that the marked up output will not be escaped.
Backport of [15673] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 05:40:55 +00:00
Simon Meers
f87936fa89 [1.2.X] Fixed #15375 -- clarified apparent contradiction in Form Wizard documentation. Thanks to codysomerville for the report.
Backport of r15633 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-23 09:44:40 +00:00
Luke Plant
e89c471ebb [1.2.X] Removed example CSRF jQuery code from release notes, replacing with link to improved code in the CSRF docs
Backport of [15628] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-22 11:30:10 +00:00
Luke Plant
31d0f2fa29 [1.2.X] Fixed #11058 - list_display_links doesn't allow callables not defined in the model
Thanks to dvine for the report and julien for the patch.

Backport of [15619] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 21:20:41 +00:00
Luke Plant
25c217bc17 [1.2.X] Fixed #14835 -- Corrected a lack of indentation in the reST markup for docs/ref/contrib/admin/index.txt and reflowed the text accordingly.
Thanks to cogat for the report.

Backport of [14830] from trunk - approximate, because other changes have
made it very hard to do exactly.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 21:04:25 +00:00
Ramiro Morales
d65ca449ac [1.2.X] Expanded InlineModelAdmin documentation a bit. Partial backport of [14882].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-20 15:27:01 +00:00
Gabriel Hurley
95a6d5a2ef [1.2.X] Fixed #14820 -- Added more information to the generic relation docs regarding different choices for storing PK references for a GenericForeignKey. Thanks to mrmachine for the all the work on the patch.
Backport of [15545] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-16 00:21:27 +00:00
Timo Graham
fe21117cc3 [1.2.X] Fixed "the the" typos.
Backport of r15536 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 23:25:46 +00:00
Ramiro Morales
7520dbd5a5 [1.2.X] Fixed a couple of documentation typos.
Backport of [15534] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 15:04:26 +00:00
Justin Bronn
4bcc5012b1 [1.2.X] Updated GeoDjango installation docs and spatial database template script for latest Ubuntu/Debian packages.
Backport of r15520 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-13 01:54:31 +00:00
Luke Plant
cfaac48710 [1.2.X] Fixed #15284 - improved example jQuery code for adding X-CSRF-Token
Using the ajaxSend event is better than beforeSend, because the beforeSend
callback can have only one value, which makes it painful if it is needed by
multiple bits of javascript.

Thanks to LukeMaurer for report and initial patch.

Backport of [15515] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15517 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 23:39:39 +00:00
Alex Gaynor
818e70344e [1.2.X] Fixed a security issue in the CSRF componenent. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 02:07:05 +00:00
Timo Graham
f6606da3e8 [1.2.X] Fixed #15208 - Document ModelAdmin.formfield_for_choice_field; thanks julien.
Backport of r15399 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-02 20:57:33 +00:00
Justin Bronn
86b0d5c1eb [1.2.X] Fixed example use of deprecated function in GeoDjango tutorial.
Backport of r15358 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-29 08:11:28 +00:00
Ramiro Morales
e501f50237 [1.2.X] Fixed #13307 -- Enhanced the generic inlines documentation by mentioning the concrete Generic{Tabular,Stacked}Inline classes that should be used. Thanks loki77 for the report.
Backport of [15124] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 23:06:07 +00:00
Timo Graham
b0ce5fce73 [1.2.X] Fixed #13837 - Add geodjango packages for Ubuntu 10.04; thanks muanis and zerok for the patch.
Backport of r15075 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 00:13:13 +00:00
Timo Graham
c0335a30bc [1.2.X] Fixed #12642 - Add docs for has_[add|change|delete]_permission ModelAdmin methods. Thanks to MadeR for the report and for the wiki contributors from which I took language for this patch.
Backport of r15066 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 13:41:57 +00:00
Timo Graham
89cb543f9e [1.2.X] Fixed #14000 - Remove versionadded/changed tags for 1.0. thanks ramiro!
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 00:46:36 +00:00
Timo Graham
ba7a151804 [1.2.X] Fixed #14956 - typo in messages docs. thanks alexarsh for the report.
Backport of r15049 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-25 20:27:21 +00:00
Russell Keith-Magee
c1376c81a7 [1.2.X] Added some reST markup to avoid a warning during docs compilation.
Backport of r15022 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 16:03:33 +00:00
Justin Bronn
a60d85aa1a [1.2.X] Fixed #14439 -- Improved documentation for running the GeoDjango test suite.
Backport of r15015 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 00:42:11 +00:00
Jannis Leidel
69edfc7531 [1.2.X] Fixed #14805 -- Capitalize "Google" in sitemaps docs. Thanks, Adam.
Backport from trunk (r14884).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:56:38 +00:00
Timo Graham
f1a9a8bb41 [1.2.X] Fixed #11470 - add documentation for ModelAdmin.message_user. thanks adamv.
Backport of r14868 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-11 13:58:11 +00:00
Simon Meers
65b26b30a7 [1.2.X] Fixed #12812 -- added warning about cyclic imports in contrib.comments. Thanks to Beetle_B, bjourne and philgyford for the reports, and Russ for the wording.
Backport of r14810 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 11:38:26 +00:00
Gabriel Hurley
a647d0b8ba [1.2.X] Fixed #14804 -- Metadata improvement, broken link fix, and alphabetization of template filters in contrib.humanize reference docs. Thanks to adamv for the patch.
Backport of [14746] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-29 05:33:06 +00:00
Gabriel Hurley
76a51a3f04 [1.2.X] Replaced an unnecessary UTF8 character in the admindocs docs. Thanks to Luke Plant for the report.
Backport of [14646] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 11:11:39 +00:00
Luke Plant
077d04b7fe [1.2.X] Fixed a garbage character that was somehow introduced into some backported docs.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 01:56:34 +00:00
Gabriel Hurley
7509bdf86b [1.2.X] Fixed #12975 -- Moved the docs for contrib.admindocs out of the template docs and into their own reference section, and significantly improved the documentation of what admindocs can do. Thanks to jabapyth for the report, and whiteinge for the patch.
Backport of [14484] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 09:23:12 +00:00
Gabriel Hurley
969ac914ff [1.2.X] Fixed #10904 -- Corrected inappropriate usage of the term "absolute URL" throughout the docs. Replaced with the (RFC 2396-compliant) terms "absolute path reference" or "absolute path" as appropriate for the context. Thanks to sharan666 for the report, and Malcolm, Chris, and dwillis for their work in supplying a solution and patch.
Backport of [14482] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 01:44:32 +00:00
Gabriel Hurley
d269738f41 [1.2.X] Fixed #14526 -- Updated wording regarding the minimum Python version required for GeoDjango. Thanks to PaulM for the report.
Backport of [14335] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14336 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 22:29:53 +00:00
Ramiro Morales
af3de6a712 [1.2.X] Fixed #14173 -- Added sections about contrib apps-provided commands to django-admin.py docs.
Added documentation about changepassword, pointers to GeoDjango and sitemaps
commands, grouped them by app.

Backport of [14327] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 16:43:42 +00:00
Gabriel Hurley
9dfdcf86be [1.2.X] Fixed #14426 -- Removed "mysite" import statements from examples that might teach people "bad habits" in regards to creating reusable apps.
Thanks to idahogray for assisting with the patch (and sorry for forgetting the attribution in the patch on trunk).

Backport of [14270] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 00:11:51 +00:00
Gabriel Hurley
d0a056bcff [1.2.X] Fixed #14376 -- added docs for previously undocumented Brazilian localflavor fields. Thanks to henriquebastos for the report and patch.
Backport of [14229] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 09:31:59 +00:00
Justin Bronn
4ed10675f9 [1.2.X] Enabled area calculations for geography columns.
Backport of r14189 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 17:27:07 +00:00
Justin Bronn
cc1a41f3de [1.2.X] Updated version of PostGIS in GeoDjango install docs.
Backport of r14150 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 22:24:59 +00:00
Russell Keith-Magee
9584b77c35 [1.2.X] 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
Backport of r14069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:25:01 +00:00
Russell Keith-Magee
9ad73135c0 [1.2.X] Fixed #14383 -- Corrected the capitalization of reStructuredText. Thanks to timo for the patch.
Backport of r14017 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:46:03 +00:00
Russell Keith-Magee
36167517aa [1.2.X] Fixed #14221 -- Cleaned up some text in the GIS tutorial. Thanks to Grant <renderbox@gmail.com> for the report.
Backport of r14006 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 14:16:50 +00:00
Luke Plant
12187bfd26 [1.2.X] Fixed #14386, #8960, #10235, #10909, #10608, #13845, #14377 - standardize Site/RequestSite usage in various places.
Many thanks to gabrielhurley for putting most of this together.  Also to
bmihelac, arthurk, qingfeng, hvendelbo, petr.pulc@s-cape.cz, Hraban for
reports and some initial patches.

The patch also contains some whitespace/PEP8 fixes.

Backport of [13980] from trunk. Some items could be considered features
(i.e.  supporting RequestSite in various contrib apps), others are definite
bugs, but it was much more robust to backport all these tightly related
changes together.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-05 20:31:02 +00:00
Luke Plant
cb00181854 [1.2.X] Fixed #11358: Don't include private flatpages in sitemap. Thanks dburke and mlavin.
Backport of [13734] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-05 19:41:48 +00:00
Russell Keith-Magee
c868c368eb [1.2.X] Refactored markup documentation to give it it's own home.
Backport of r13647 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 02:44:24 +00:00
Russell Keith-Magee
35411fd7da [1.2.X] Fixed #14116 -- Added a flag to enable CSRF checks in the test client. Thanks to jon@licq.org for the suggestion.
Backport of r13640 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-27 13:58:36 +00:00
Karen Tracey
188c6b3e9a [1.2.X] Fixed #14172: Corrected misspelling of explicitly. Thanks 3point2.
r13638 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-26 11:10:45 +00:00
Russell Keith-Magee
e47520b8ba [1.2.X] Fixed #14112 -- Various Markup fixes for the docs. Thanks to ramiro for the patch.
Backport of r13628 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 08:08:46 +00:00
Jacob Kaplan-Moss
936203434e [1.2.X] Fixed #14141: docs now use the :doc: construct for links between documents.
Thanks, Ramiro Morales.

Backport of [13608] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-19 19:31:56 +00:00
Karen Tracey
653da2dceb [1.2.X] Fixed #14100: Corrected spelling error in description of user_email. Thanks tom_simpson.
r13574 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-12 10:50:22 +00:00