Commit Graph

1498 Commits

Author SHA1 Message Date
Aymeric Augustin a0a6112afc [1.6.x] Fixed typo. Refs #21836.
Backport of 8e1fc03 from master
2014-01-26 09:30:27 +01:00
Chris Jerdonek a21fc1c086 [1.6.x] Fixed #21836 -- Improved transaction docs about autocommit mode
Clarified that queries in autocommit mode are committed immediately
only if a transaction has not already been started. Added to the
main transaction docs that Django's TestCase class implicitly wraps
its tests in transactions.

Backport of 798fd59f from master.
2014-01-25 21:21:30 +01:00
Baptiste Mispelon 6bf05c0267 [1.6.x] Always use parentheses when documenting a method with no arguments.
Backport of 05d36dc06e from master.
2014-01-22 23:00:06 +01:00
Baptiste Mispelon 6bca149af5 [1.6.x] Don't show `self` in the list of arguments of a method.
This is consistent with Python's official documentation
and it's a sphinx recommendation too[1].

[1] http://sphinx-doc.org/markup/desc.html#dir-method

Refs #21855.

Backport of 79e1d6ebd7 from master.
2014-01-22 22:59:55 +01:00
Tim Graham 8eca53f0be [1.6.x] Fixed #20834 -- Described how caching of user permissions works.
Thanks Giggaflop and Jennifer Casavantes.

Backport of 5f9790072d from master
2014-01-22 13:09:44 -05:00
Tim Graham f7c2852f30 [1.6.x] Fixed #21726 -- Clarified that password should not be included in REQUIRED_FIELDS.
Thanks russellm for the report.

Backport of 6f06c749b7 from master
2014-01-22 10:19:02 -05:00
Tim Graham b63dad3f45 [1.6.x] Fixed #21727 -- Added some links to help clarify topics/auth/default.txt
Thanks daGrevis for the suggestion.

Backport of d35f2bfd5b from master
2014-01-16 07:17:42 -05:00
Tim Graham f8d93f2c71 [1.6.x] Fixed #21747 -- Added {% elif %} to template topics guide.
Thanks gcc for the suggestion.

Backport of 9e5033b302 from master
2014-01-16 07:09:15 -05:00
Claude Paroz 5d99cd6877 [1.6.x] Fixed #21730 -- Removed superfluous db_index in custom auth docs
Thanks rafalp for the report.
Backport of c717ebbfec from master.
2014-01-04 16:13:21 +01:00
Tim Graham 2206321ff9 [1.6.x] Fixed a sentence in the session security docs; thanks claudep.
Backport of 4d27d311f6 from master
2014-01-03 12:04:18 -05:00
Frank Tobia 5dcb287060 [1.6.x] Fixed typos. Changed grammar.
Backport of 6dd8631617 from master
2014-01-02 16:25:51 -05:00
Tim Graham a228545026 [1.6.x] Fixed #21484 -- Documented that SQL logging does not include "framework level" queries.
Backport of 4d8d76e7a8 from master
2013-12-31 13:03:25 -05:00
Tim Graham a05ca51c08 [1.6.x] Fixed #19395 -- Added a simple example logging config.
Thanks ken.nelson at maclaren.com.

Backport of 69f0249d7b from master
2013-12-31 10:23:11 -05:00
Tim Graham f82eb49301 [1.6.x] Fixed #21701 -- Improved testing doc titles and added testing/tools.txt.
Thanks cjerdonek for the suggestion.

Backport of 9953e98e6a from master
2013-12-31 08:32:58 -05:00
Tim Graham 2d554d29f2 [1.6.x] Fixed #21708 -- Added some headings to separate unrelated topics.
Thanks ashley at ashleymills.com for the suggestion.

Backport of 270f7e2167 from master
2013-12-30 17:57:44 -05:00
Tim Graham 3b79fbabcd [1.6.x] Fixed #21650 -- Corrected bad advice for plural translation.
Thanks nedbatchelder and claudep.

Backport of 85270ef3f5 from master
2013-12-27 10:02:41 -05:00
Tim Graham f3a9a76123 [1.6.x] Fixed #21582 -- Corrected URL namespace example.
Thanks oubiga for the report.

Backport of 025ec2e7fe from master
2013-12-26 20:06:29 -05:00
Tim Graham 62f282a265 [1.6.x] Fixed #21629 -- Added instructions for loading MySQL time zone definitions.
Thanks Aymeric for the suggestion.

Backport of d8d83777eb from master
2013-12-26 15:50:49 -05:00
Tim Graham 438f9edff6 [1.6.x] Fixed #21585 -- Updated some links to 3rd party database projects.
Thanks graeme.perrow at sap.com for the original report.

Backport of 23d9f517dc from master
2013-12-18 18:50:36 -05:00
Tianyi Wang 60517c9c09 [1.6.x] Fixed #21625 -- incorrect documentation for DiscoverRunner.build_suite
Backport of b62031441b from master.
2013-12-18 14:30:20 +01:00
Baptiste Mispelon 5192713285 [1.6.x] Added internal link to i18n documentation.
Backport of e904d421d0 from master.
2013-12-15 01:51:21 +01:00
Alasdair Nicol 15ab4936d7 [1.6.x] Fixed #21539 -- Added example of modelformset_factory's form argument
Backport of 1fa681ee11 from master
2013-12-14 16:36:21 -05:00
Chris Jerdonek ad8a7819f2 [1.6.x] Fixed #21614 -- improved docs on configuring email for development.
Backport of d599b590eb from master
2013-12-14 11:21:22 -05:00
johannes-gehrs eb4079597d [1.6.x] Fixed #21580 -- Clarified why render() does not return a TemplateResponse object.
Backport of f685f94c98 from master
2013-12-13 18:59:27 -05:00
Ben Spaulding de1d5d5df5 [1.6.x] Fixed #21594 -- Added note about model formsets deleting objects.
This behavior has been fixed in 65e03a424e. refs #10284.
2013-12-11 14:39:29 -05:00
Christian Schmitt d6d700fc6d [1.6.x] Fixed #21560 -- Added missing 'slug' field in example code.
Backport of 744aac6dac from master
2013-12-10 07:25:43 -05:00
Claude Paroz ef9832f148 [1.6.x] Updated a bunch of hyperlinks in documentation
Backport of 626bdf648 from master.
2013-12-08 18:48:30 +01:00
Ramiro Morales c8cf49e5c4 [1.6.x] Added link to localized formatting doc from main index.
abb04f1f3f from master.
2013-12-04 10:28:43 -03:00
Tim Graham 3f8583a2c8 [1.6.x] Added a warning regarding risks in serving user uploaded media.
Thanks Preston Holmes for the draft text.

Backport of df6760f12c from master
2013-12-02 13:49:47 -05:00
Loic Bistuer a0ab432f2f [1.6.x] Improved docs for ModelFormSet.clean().
Backport of 033b26173b from master
2013-11-22 19:50:46 -05:00
mlissner 4212ae6fef [1.6.x] Noted that localmem is the default cache.
Backport of c456ea4ec8 from master
2013-11-22 19:39:54 -05:00
Aymeric Augustin 1eddca0a52 [1.6.x] Fixed #21487 -- Session cannot store tzinfo instances anymore.
Thanks filipp for the report.
2013-11-22 15:32:22 +01:00
Baptiste Mispelon 20e322f4bf [1.6.x] Added more examples to the get_object_or_404 documentation.
Backport of ebfa508fa3 from master.
2013-11-19 19:56:06 +01:00
Tim Graham 44469af34b [1.6.x] Fixed typo in topics/http/sessions.txt.
Backport of 9348fc5628 from master
2013-11-18 19:11:33 -05:00
Dominic Rodger a9c50fccf2 [1.6.x] Fixed #20852 - Fixed incorrectly generated left quotes in docs.
Sphinx generates left single quotes for apostrophes after
code markup, when right single quotes are required. The
easiest way to fix this is just by inserting the unicode
character for a right single quote.

Instances of the problem were found by looking for
">‘" in the generated HTML.

Backport of c33d1ca1d9 from master.
2013-11-18 16:03:00 +01:00
Tim Graham e8dea1f35c [1.6.x] Fixed #21440 -- Typo #2 in topics/http/shortcuts.txt
Thanks alasdair.

Backport of d011714002 from master
2013-11-15 10:22:51 -05:00
Tim Graham f2b5e9d5bb [1.6.x] Fixed #21440 -- Typo in topics/http/shortcuts.txt
Thanks olof.bjarnason at gmail.com for the report.

Backport of 6e9e6ca071 from master
2013-11-15 07:10:47 -05:00
Bernardo Pires 4aed1ee339 [1.6.x] Fixed #21372 -- Corrected docs regarding translating LANGUAGES.
Corrected LANGUAGES documentation on how to translate language
names. Now using django.utils.translation.ugettext_lazy instead
of a dummy gettext() function.

Thanks to Salvatore for the report.

Backport of 8bc350b385 from master.
2013-11-10 00:02:13 +01:00
Cody Scott 82e756da83 [1.6.x] Noted that .clear() will delete intermediary models
Backport of a8e84521c4 from master
2013-11-08 19:25:21 -05:00
Tom Scholl c9917f4c83 [1.6.x] Fixed docs for EmailMessage extra_headers attribute
The EmailMessage documentation describes the initialization parameters
and states they 'can be set at any time prior to calling the send()
method.'. However, the 'headers' parameter's corresponding attribute is
called 'extra_headers'.

Backport of cab72a439b from master
2013-11-08 18:39:53 -05:00
Claude Paroz 3c8879f092 [1.6.x] Removed obsolete locale restriction admonition
Refs #14461. Thanks Ramiro Morales for pointing this.
Backport of b780d03d62 from master.
2013-11-08 16:53:12 +01:00
Sylvain Bellemare b3da4cc092 [1.6.x] Removed no longer relevant word
Backport of 3935b0f263 from master
2013-11-07 09:32:26 -05:00
Claude Paroz 66bf6b3f85 [1.6.x] Fixed #21373 -- Typo fixed in i18n docs
Thanks rpq at winscores.com for the report.
Backport of 88b9d4ff3a from master.
2013-11-02 19:15:20 +01:00
Tim Graham 33503c57ef [1.6.x] Fixed spelling ("dependant" -> "dependent")
Dependent means reliant on.
A dependant is a person like a child or spouse.

Thanks Andrew Wilcox for the report.

Backport of 090315f5df from master
2013-11-01 21:32:05 -04:00
Sylvain Bellemare 35fd14cf42 [1.6.x] Fixed typo -- "a" user, not "an" user
Backport of c7dabe49dd from master
2013-11-01 19:28:19 -04:00
Tim Graham 1cdf7f83ff [1.6.x] Fixed #21294 -- Clarified the logout next_page argument.
Thanks wim at go2people.nl for the report.

Backport of 51e6575472 from master
2013-10-30 09:26:35 -04:00
Antoine Catton 142757c61e [1.6.x] Documented the limitation on sep argument to Signer
Co-Authored-By: Gavin Wahl <gwahl@fusionbox.com>

Backport of e9a356a695 from master
2013-10-30 08:27:19 -04:00
Tim Graham 747f77552a [1.6.x] Fixed #21325 -- Added missing argument to permission_required decorator.
Backport of cc2049cdd7 from master
2013-10-25 17:37:39 -04:00
Tim Graham 4499dc81e2 [1.6.x] Fixed #21304 -- Typo in docs/topics/testing/advanced.txt
Thanks joao at silvaneves.org for the report.

Backport of 9704c49d59 from master
2013-10-22 12:06:16 -04:00
Tim Graham 86373dc63e [1.6.x] Added docs for the hasher's iteration count changes.
Backport of 28b70425af from master.
2013-10-21 20:33:27 +02:00
Tim Graham 5bb975a139 [1.6.x] Added a warning regarding session security and subdomains.
Backport of a3372f67cb from master
2013-10-18 09:44:29 -04:00
Tianyi Wang 1241a2cc10 [1.6.x] Improvement on InlineFormSet doc, refs #21006
Backport of 944a2bb7c1 from master
2013-10-15 09:58:51 -04:00
Tianyi Wang ecfd958c84 [1.6.x] Fixed #21006 -- Added example code for overriding methods on an InlineFormSet.
Thanks treysta at gmail.com for the suggestion.

Backport of 9bfe66164e from master
2013-10-15 07:36:37 -04:00
Sorcha Bowler 07ebd23254 [1.6.x] Fixed #21223 -- Added form.id_for_label to topic guide.
Thanks ebertti at yahoo.com.br for the suggestion.

Backport of 018e2c055a from master
2013-10-14 18:43:29 -04:00
Loic Bistuer 8222a48253 [1.6.x] Clarfied the ModelForm docs with respect to generated vs. declared fields.
The ModelForm docs suggested that fields defined declaratively override
default fields generated from the form Meta.

This is conceptually wrong, especially with inheritance in mind. Meta is
usually defined on the topmost ModelForm subclass, while fields can come
from anywhere in the MRO, especially base classes; therefore we suggested
that something defined in a base class override something from a subclass.

This patch rephrases the docs around the idea that Meta is used to generate
*missing* fields.

Refs #8620, #19617.

Thanks @mjtamlyn and @timgraham for the review.

Backport of 54cd930baf from master
2013-10-14 10:55:41 -04:00
Bouke Haarsma e3c8db61f3 [1.6.x] Fixed #21264 -- Incorrect RST usage in docs
Backport of 8fc63087f6 from master
2013-10-14 08:15:50 -04:00
Aymeric Augustin ddff6522fa [1.6.x] Fixed #19560 -- Identified field in warning for naive datetime.
Thanks gcc for the report and vajrasky for the patch.

Backport of 570d9c2678 from master.
2013-10-13 11:58:12 +02:00
Tim Graham 8f5d3d16cb [1.6.x] Fixed #15582 -- Documented how TransactionTestCase.multi_db affects fixtures.
Thanks slinkp for the suggestion.

Backport of dd839a2dfd from master
2013-10-11 20:12:52 -04:00
Cody Scott f787869d8c [1.6.x] Minor edits to docs/topics/db/queries.txt.
Backport of 8bfc7cc64c from master
2013-10-11 15:35:48 -04:00
Cody Scott 2069dfeaef [1.6.x] Small improvements to docs/topics/db/models.txt
Backport of 695bc0d191 from master
2013-10-10 20:57:16 -04:00
Claude Paroz 7a58fde7a6 [1.6.x] Fixed grammar/typos in auth customization docs
Backport of 1b9c72fc4f from master.
2013-10-09 16:22:36 +02:00
Dan Loewenherz af46932b57 [1.6.x] Fix grammatical errors in email documentation
Backport of 43f213e475 from master
2013-10-08 20:30:43 -04:00
Russell Keith-Magee 1ab84b6c65 [1.6.x] Fixed #21164 -- Added documentation for issue with test users.
The package renaming restores the older package names (which were also the
documented package names). This doesn't affect test discovery because the
module in question doesn't contain any tests.

Thanks to Carl for the design discussion.

Backport of ddb5385 from master.
2013-10-08 10:37:48 +08:00
Ramiro Morales 563b5c2000 [1.6.x] Re-added link to SQLite notes from DB section of install doc.
67f5dffbec from master.
2013-10-07 07:42:28 -03:00
Tim Graham 06b149e220 [1.6.x] Fixed #10913 -- Documented how related_name affects QuerySet filtering
Thanks neithere for the suggestion.

Backport of 75bb6ba966 from master
2013-10-02 12:13:44 -04:00
Tim Graham 9b89fcc0b0 [1.6.x] Clarified session replay attack differences with cookie backend.
Backport of 00a0d3de02 from master
2013-10-02 10:15:36 -04:00
Aymeric Augustin 0d74bdaf0c Fixed #21134 -- Prevented queries in broken transactions.
Backport of 728548e4 from master.

Squashed commit of the following:

commit 63ddb271a44df389b2c302e421fc17b7f0529755
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Sep 29 22:51:00 2013 +0200

    Clarified interactions between atomic and exceptions.

commit 2899ec299228217c876ba3aa4024e523a41c8504
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Sep 22 22:45:32 2013 +0200

    Fixed TransactionManagementError in tests.

    Previous commit introduced an additional check to prevent running
    queries in transactions that will be rolled back, which triggered a few
    failures in the tests. In practice using transaction.atomic instead of
    the low-level savepoint APIs was enough to fix the problems.

commit 4a639b059ea80aeb78f7f160a7d4b9f609b9c238
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Tue Sep 24 22:24:17 2013 +0200

    Allowed nesting constraint_checks_disabled inside atomic.

    Since MySQL handles transactions loosely, this isn't a problem.

commit 2a4ab1cb6e83391ff7e25d08479e230ca564bfef
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sat Sep 21 18:43:12 2013 +0200

    Prevented running queries in transactions that will be rolled back.

    This avoids a counter-intuitive behavior in an edge case on databases
    with non-atomic transaction semantics.

    It prevents using savepoint_rollback() inside an atomic block without
    calling set_rollback(False) first, which is backwards-incompatible in
    tests.

    Refs #21134.

commit 8e3db393853c7ac64a445b66e57f3620a3fde7b0
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Sep 22 22:14:17 2013 +0200

    Replaced manual savepoints by atomic blocks.

    This ensures the rollback flag is handled consistently in internal APIs.
2013-09-30 10:14:22 +02:00
Tim Graham d1047c8b4c [1.6.x] Fixed #21116 -- Made usage of manage.py in docs more consistent.
Thanks daniel.quattro at gmail.com for the report.

d1c9802811 from master.
2013-09-25 21:11:17 -03:00
Tim Graham d30d66b907 [1.6.x] Fixed #21137 -- Corrected ULRconf include example.
Thanks marfire for the report.

Backport of 77f6b468e5 from master
2013-09-24 09:41:39 -04:00
Tim Graham 34f4053409 [1.6.x] Removed implication that six is part of Python stdlib.
Backport of 45969bdeb5 from master
2013-09-23 18:30:18 -04:00
Daley Chetwynd 5e549e7efe [1.6.x] Fixed #20830 -- Clarified that Django uses a customized version of six.
Thanks glarrain for the suggestion.

Backport of a53caf28bf from master
2013-09-23 11:07:36 -04:00
Ramiro Morales b2876c0c91 [1.6.x] A few doc additions for changes from d228c1192e.
ce0c5c38ea from master.
2013-09-22 13:54:54 -03:00
Ramiro Morales aef809f90c [1.6.x] Reference Meta.index_together in DB performance guide.
9dc45efeba from master.
2013-09-22 13:54:02 -03:00
Michael DiBernardo bb8a087949 [1.6.x] Fixed #21137 -- Documented best practice for URLconfs with repeated pattern prefixes.
Backport of 222460a994 from master
2013-09-21 18:18:16 -04:00
Aymeric Augustin 0ad178c43d [1.6.x] Clarified why one must not catch database errors inside atomic.
Backport of 4db2752 from master.
2013-09-20 21:57:39 +02:00
Markus Amalthea Magnuson 9888bb28ee [1.6.x] Added missing "in" in sentence.
Backport of 2c5c422d34 from master
2013-09-19 13:29:48 -04:00
Ramiro Morales c0625a74ce [1.6.x] Reworded a paragraph in the logging docs.
9d12f68a53 from master.
2013-09-16 17:52:13 -03:00
Tim Graham b05639dcac [1.6.x] Fixed #20887 -- Added a warning to GzipMiddleware in light of BREACH.
Thanks EvilDMP for the report and Russell Keith-Magee
for the draft text.

Backport of da843e7dba from master
2013-09-11 08:18:48 -04:00
Kevin Christopher Henry 4f0ea1aca4 [1.6.x] Documentation -- Improved description of cache arguments
- Fixed some grammar and formatting mistakes
- Added the type and default for CULL_FREQUENCY
- Made the note on culling the entire cache more precise. (It's actually
  slower on the filesystem backend.)

Backport of 5eca021d48 from master
2013-09-11 07:43:24 -04:00
Aymeric Augustin f9f792eb04 [1.6.x] Took advantage of django.utils.six.moves.urllib.*.
Backport of 6a6428a36 from master.
2013-09-10 21:29:31 +02:00
e0ne 276e053803 [1.6.x] Fixed #16895 -- Warned about cost of QuerySet ordering
Thanks outofculture at gmail.com for the suggestion.

Backport of cbf08c6b0c from master
2013-09-09 09:49:15 -04:00
Tim Graham c03848b540 [1.6.x] Fixed #21068 -- Added some docs for DiscoverRunner
Thanks jcd.

Backport of e4b012feeb from master
2013-09-07 16:11:03 -04:00
Tim Graham 2ab2d0fb25 [1.6.x] Fixed a link in topics/testing/overview.txt
Backport of 0c295a7718 from master
2013-09-06 17:41:43 -04:00
Tim Graham da44a8bdc2 [1.6.x] Fixed #20646 -- Clarified the use of AbstractBaseUser.REQUIRED_FIELDS
Thanks craigbruce.

Backport of db3de52807 from master
2013-09-06 16:06:46 -04:00
Eric Boersma 180b9955cc [1.6.x] Fixed #21035 -- Changed docs to treat the acronym SQL phonetically.
The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.

Backport of 4d13cc56de from master
2013-09-05 20:16:14 -04:00
Aymeric Augustin 115318051c [1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0.
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py

Backport of 365c3e8b from master.
2013-09-03 07:34:45 -05:00
Tim Graham c0fb6bdde3 [1.6.x] Fixed #21002 -- Documented JSON session serialization requires string keys
Thanks jeroen.pulles at redslider.net for the report.

Backport of 3baf1d1042 from master
2013-09-03 07:49:59 -04:00
Loic Bistuer 64383e8349 [1.6.x] Made the doc about translating string literals in templates more prominent.
Backport of 9885f07757 from master
2013-08-31 08:00:33 -04:00
Phaneendra Chiruvella 68eca2b36f [1.6.x] Minor spelling correction in ModelForms docs
Backport of 2fbf949760 from master
2013-08-28 07:12:38 -04:00
Krzysztof Jurewicz 544a190ebf [1.6.x] Fixed #20981 -- Noted the default value of disable_existing_loggers.
Backport of 095643e691 from master
2013-08-27 10:27:44 -04:00
Jan Böcker c4e2e4f630 [1.6.x] Fixed typo in docs/topics/conditional-view-processing.txt
Backport of 5fd2c979cb from master
2013-08-27 09:22:31 -04:00
Ramiro Morales 2a166623a6 [1.6.x] Typos introduced in 57c82f909b. 2013-08-22 22:33:59 -03:00
Tim Graham 5f061986b9 [1.6.x] Fixed #20922 -- Allowed customizing the serializer used by contrib.sessions
Added settings.SESSION_SERIALIZER which is the import path of a serializer
to use for sessions.

Thanks apollo13, carljm, shaib, akaariai, charettes, and dstufft for reviews.

Backport of b0ce6fe656 from master
2013-08-22 17:55:01 -04:00
Kevin Christopher Henry bf9382fb02 [1.6.x] Documentation -- Clarified use of 'view' in test client introduction.
Backport of 2e926b041c from master
2013-08-22 09:39:14 -04:00
Ramiro Morales 26a4c83598 [1.6.x] Made description of LANGUAGE_CODE setting more clear.
297f5af222 from master.
2013-08-22 08:29:59 -03:00
Tim Graham 43f12f368b [1.6.x] Fixed #20890 -- Added missing import in class-based view docs.
Thanks André Augusto.

Backport of ab680725bf from master
2013-08-10 18:08:27 -04:00
Leandro Regueiro 4c90081b5b [1.6.x] Added section labels in cache docs
Backport of 709cd2c4b7 from master
2013-08-06 11:56:31 -04:00
Tim Graham 06f484dcf9 [1.6.x] Fixed #20862 -- Updated startproject MIDDLEWARE_CLASSES in docs.
Thanks Keryn Knight.

Backport of 26c4bd38ac from master
2013-08-05 08:16:56 -04:00
Justin Michalicek 77293f9354 [1.6.x] Fixed #20855 -- Added documentation of current_app and extra_context params to django.contrib.auth views
refs #5298 and refs #8342

Backport of 61ecb5f48a from master
2013-08-04 08:05:36 -04:00
Alasdair Nicol ccef8b2aa2 [1.6.x] Added missing request argument to example in URL dispatcher docs
Backport of a0c58113b9 from master
2013-08-03 19:36:15 -04:00