Skip to content
This repository has been archived by the owner on Apr 16, 2022. It is now read-only.

Add support for the Twig highlighting language #31

Merged
merged 1 commit into from
Nov 4, 2015

Conversation

wouterj
Copy link
Contributor

@wouterj wouterj commented Nov 3, 2015

No description provided.

@stof
Copy link
Contributor

stof commented Nov 3, 2015

👍

@fabpot
Copy link
Owner

fabpot commented Nov 4, 2015

Thank you @wouterj.

@fabpot fabpot merged commit bdd51eb into fabpot:master Nov 4, 2015
fabpot added a commit that referenced this pull request Nov 4, 2015
This PR was merged into the 1.0-dev branch.

Discussion
----------

Add support for the Twig highlighting language

Commits
-------

bdd51eb Add support for the Twig highlighting language
@fabpot
Copy link
Owner

fabpot commented Nov 4, 2015

1.0.9 released

@wouterj wouterj deleted the patch-2 branch November 4, 2015 15:04
wouterj added a commit to symfony/symfony-docs that referenced this pull request Nov 7, 2015
This PR was merged into the 2.3 branch.

Discussion
----------

Use Twig highlighter instead of Jinja

Pygments 2 supports the Twig highlighting language, which is (of course) closer to Twig than Jinja is.

Previously, we reverted one occurence of Twig in #5378 , because people might use older versions locally. I no longer think this is a good reason:

 * They can update the versions, Pygments 2 isn't that new
 * Now we have platform.sh and travis, building locally isn't recommended/required anymore (if it ever was)

| Q | A
| --- | ---
| Doc fix? | yes
| New docs? | no
| Applies to | 2.3+
| Fixed ticket | -

This requires fabpot/sphinx-php#31 to be merged first. (and Pygments 2 to be available on symfony.com's server, but I think it already is /cc @javiereguiluz )

Commits
-------

d116232 Fix formatting
57c2d4b Use Twig highlighter instead of Jinja
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants