summaryrefslogtreecommitdiff
path: root/docs
Commit message (Expand)AuthorAgeFilesLines
* Clarified some text in the introArmin Ronacher2013-05-201-2/+2
* Documented loop.depth and added loop.depth0.Armin Ronacher2013-05-201-0/+6
* Removed mention of speedup module and rewrote docs for markupsafe dependencyArmin Ronacher2013-05-192-47/+5
* Merge pull request #112 from Cito/masterArmin Ronacher2013-05-191-0/+4
|\
| * Add a note about the else statement.Christoph Zwerschke2012-03-211-0/+4
* | Merge remote-tracking branch 'Talksum/distribute_required'Armin Ronacher2013-05-191-3/+24
|\ \
| * | adding explicit mention of distribute prerequisite at runtimeMike Chesnut2012-12-181-3/+6
* | | Whitespace normalizationArmin Ronacher2013-05-191-2/+2
* | | Flask -> Jinja2Armin Ronacher2013-05-191-1/+1
* | | Merge pull request #104 from njl/fix-issue-77Armin Ronacher2013-05-191-3/+19
|\ \ \
| * | | Fixes issue #77 by adding explanation to docsNed Jackson Lovely2012-03-121-3/+19
* | | | Merge pull request #94 from florentx/patch-1Armin Ronacher2013-05-191-2/+2
|\ \ \ \
| * | | | typoFlorent Xicluna2012-02-051-1/+1
| * | | | Fix the Mako-like environment.Florent Xicluna2012-02-051-1/+1
* | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2013-05-191-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #149 from dmedvinsky/patch-1Armin Ronacher2013-05-191-1/+1
| |\ \ \ \ \
| | * | | | | Fix typo in `include` documentationDmitry Medvinsky2012-09-211-1/+1
| | | |_|/ / | | |/| | |
* | | | | | Merge remote-tracking branch 'kristi/master'Armin Ronacher2013-05-191-5/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Document the {%+ manual disable lstrip_blocks featureKristi Tsukida2012-07-121-1/+9
| * | | | | document `lstrip_blocks`Kristi Tsukida2012-07-101-2/+30
| |/ / / /
* | | | | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2013-05-192-1/+5
|\ \ \ \ \
| * \ \ \ \ Merge pull request #159 from myle/patch-1Armin Ronacher2013-05-191-0/+4
| |\ \ \ \ \
| | * | | | | Update docs/templates.rstDimitris Leventeas2012-11-011-0/+4
| | |/ / / /
| * | | | | Merge pull request #141 from dgilman/patch-1Armin Ronacher2013-05-191-1/+1
| |\ \ \ \ \
| | * | | | | Fix FAQ typoDavid Gilman2012-07-211-1/+1
| | |/ / / /
* | | | | | Merge remote-tracking branch 'wking/keep-trailing-newline'Armin Ronacher2013-05-191-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add `keep_trailing_newline` to configure final endline strippingW. Trevor King2013-01-111-1/+3
| |/ / / /
* | | | | Merge branch 'master' into sprint-branchArmin Ronacher2013-05-182-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge pull request #163 from kuyan/patch-1Armin Ronacher2013-05-181-1/+1
| |\ \ \ \ \
| | * | | | | Fixed typoNatan L2012-11-221-1/+1
| | |/ / / /
| * | | | | Merge pull request #188 from lemonad/masterArmin Ronacher2013-05-181-1/+1
| |\ \ \ \ \
| | * | | | | Fixed typos: overriden to overriddenJonas Nockert2013-02-231-1/+1
| | |/ / / /
* | | | | | Merge branch 'master' into sprint-branchArmin Ronacher2013-05-181-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed improperly closed tag in menu example in tricks.rstEugene Kalinin2013-05-141-1/+1
* | | | | | Trash debugsupport.Cory Benfield2013-05-181-24/+0
* | | | | | update docs / changelog about python requirement, add myself to AUTHORSThomas Waldmann2013-05-181-6/+8
|/ / / / /
* | | | | Merge pull request #177 from sakti/patch-1Armin Ronacher2013-04-121-1/+1
|\ \ \ \ \
| * | | | | fix typo swtich -> switchSakti Dwi Cahyono2013-02-151-1/+1
| |/ / / /
* | | | | Merge pull request #171 from mgorny/masterArmin Ronacher2013-04-121-7/+9
|\ \ \ \ \
| * | | | | Fix jinjaext compatibility with Python 3.Michał Górny2013-01-131-7/+9
| |/ / / /
* | | | | correct typoJet Sun2013-02-201-1/+1
|/ / / /
* | | | Improve whitespace docs to reflect reality.Paul McMillan2012-07-041-4/+5
| |_|/ |/| |
* | | Fix typos.Christoph Zwerschke2012-03-131-2/+2
* | | Distinguish ext folder from ext namespace.Ron DuPlain2012-03-131-7/+10
| |/ |/|
* | Merge pull request #81 from obeattie/docs-fixRon DuPlain2012-03-091-1/+1
|\ \ | |/ |/|
| * Small typo fix to extension docsOliver Beattie2011-12-151-1/+1
* | Merge branch 'master' of github.com:mitsuhiko/jinja2Armin Ronacher2011-12-152-2/+2
|\ \ | |/
| * Minor type: s/of/or/jmoore2011-12-142-2/+2
* | Fixed a bug in the i18n extraction option handling and added a silent option.Armin Ronacher2011-12-152-1/+10
|/
* Added a dict iteration example. This fixes #64Armin Ronacher2011-10-061-2/+16