New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple template engines docs #3845

Merged
merged 5 commits into from Jan 10, 2015

Conversation

Projects
None yet
3 participants
@aaugustin
Member

aaugustin commented Jan 5, 2015

No description provided.

@aaugustin aaugustin force-pushed the aaugustin:multiple-template-engines-docs branch Jan 5, 2015

@timgraham

This comment has been minimized.

Member

timgraham commented Jan 8, 2015

I hope to review this tomorrow. If you have a chance to remove the code changes you already committed, that would be great.

@aaugustin aaugustin force-pushed the aaugustin:multiple-template-engines-docs branch Jan 8, 2015

@aaugustin

This comment has been minimized.

Member

aaugustin commented Jan 8, 2015

@timgraham done. This is still missing some documentation for django.template.Engine.

@aaugustin aaugustin force-pushed the aaugustin:multiple-template-engines-docs branch Jan 8, 2015

@carljm

View changes

docs/topics/templates.txt Outdated
tags and filters available for a given site. See
:doc:`/ref/contrib/admin/admindocs`.
If request is provided, it must be a :class:`~django.http.HttpRequest`.
Then the engine must make it available in the template as well as the CSRF

This comment has been minimized.

@carljm

carljm Jan 9, 2015

Member

"in the template context"?

This comment has been minimized.

@aaugustin
@carljm

This comment has been minimized.

Member

carljm commented Jan 9, 2015

I gave this a fairly quick read-through, and didn't see anything obviously problematic. I didn't review thoroughly.

@aaugustin aaugustin force-pushed the aaugustin:multiple-template-engines-docs branch Jan 10, 2015

@aaugustin

This comment has been minimized.

Member

aaugustin commented Jan 10, 2015

Here's the remainder of the documentation (blocker for the 1.8 alpha release).

@timgraham @carljm I didn't modify the commits you already reviewed. I'll squash later. c97575f rewrites some parts of 4b3a38f.

@timgraham

View changes

docs/topics/templates.txt Outdated
~~~~~~
:class:`django.template.Engine` encapsulates an instance of the Django
template system. The main reason for instanciating an

This comment has been minimized.

@timgraham

timgraham Jan 10, 2015

Member

instantiating

This comment has been minimized.

@aaugustin
@timgraham

View changes

docs/ref/templates/api.txt Outdated
Here's what each of the default processors does:
.. _context-processors:

This comment has been minimized.

@timgraham

timgraham Jan 10, 2015

Member

Please move this above the "Built-in template context processors"

aaugustin added some commits Jan 3, 2015

Moved doc on the DTL's syntax to the ref/ section.
This makes room for a more general introduction about templating.

Updated some links to point to the new location, but kept those that
didn't talk specifically about the DTL.
Updated custom template tags how-to.
Accounted for multiple template engines and made a few small fixes.
Updated templates API reference.
Accounted for multiple template engines and made a few small fixes.

@aaugustin aaugustin force-pushed the aaugustin:multiple-template-engines-docs branch to f01306a Jan 10, 2015

@aaugustin aaugustin merged commit f01306a into django:master Jan 10, 2015

@aaugustin aaugustin deleted the aaugustin:multiple-template-engines-docs branch Jan 10, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment