Change wording of indentation coding standards
Update wording of the indentation coding standards documentation
[Doc] corrects number_format argument namming
fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy
bug #1211 fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy (fabpot)

This PR was merged into the master branch.

Discussion
----------

fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy

fixes #896

Commits
-------

f27d4a1 fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy
minor #1210 [Doc] corrects number_format argument namming (nicolas-bastien)

This PR was merged into the master branch.

Discussion
----------

[Doc] corrects number_format argument namming

last argument is for thousand separator not decimal

Commits
-------

fc1950d [Doc] corrects number_format argument namming
minor #1203 Change wording of indentation coding standards (mdavis1982)

This PR was merged into the master branch.

Discussion
----------

Change wording of indentation coding standards

The documentation says to use indentation consistent with the main language of the **File**. But in a Twig template, that language is going to be Twig. This PR changes the wording to indicate that the indentation rules inside tags should be consistent with the main language of the **Project** Twig is being used within.

```
| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets | none
```

Commits
-------

435e3b2 Update wording of the indentation coding standards documentation
09b58e1 Change wording of indentation coding standards
added the starts with, ends with, and matches operators
feature #1209 added the starts with, ends with, and matches operators (fabpot)

This PR was merged into the master branch.

Discussion
----------

added the starts with, ends with, and matches operators

Adds three new operators:

 * `ends with`
 * `starts with`
 * `matches`

I've not added the `contains` operator as it would be equivalent with the existing `in` one.

TODO:

 * [x] add docs
 * [x] fix on PHP 5.2.

Commits
-------

b66181d added the starts with, ends with, and matches operators
Revert "fixed some unit tests"

This reverts commit 120518d80336efdb1641f9e61f5c2b46d13988de.
Revert "renamed an internal variable"

This reverts commit a176fadc042bbfa09b0f304bef9ec89850f6e06f.
Revert "added an exception when a macro re-uses the same argument name twice"

This reverts commit b7a54b01017becf7f3b90beadc71536b58e2299a.
Revert "updated CHANGELOG"

This reverts commit 7ffca6c735bec4d37186ed10162134c978160f17.

Conflicts:
	CHANGELOG
Revert "merged branch hason/macros (PR #1139)"

This reverts commit 03926034c452bbf7f3bcc14dd167acf39bb33818, reversing
changes made to 730aa25bedeee922c361640f6e4c01e4e6bac998.

Conflicts:
	CHANGELOG
	doc/tags/macro.rst
	doc/templates.rst
	lib/Twig/ExpressionParser.php
feature #1215 Macros changes removal (fabpot)

This PR was merged into the master branch.

Discussion
----------

Macros changes removal

This PR reverts the changes made to macros in 1.14.

The initial PR looked massive and I was not comfortable with the changes, but I merged it anyways. But the latest PR about fixes some bugs in the implementation -- and adding some more changes (#1213) really scares me.

So, instead of continuing doing big changes, I prefer to revert everything for now, release 1.14 and give more time for these changes to mature and eventually be merged again.

Commits
-------

74586e9 Revert "merged branch hason/macros (PR #1139)"
bf40fa3 Revert "updated CHANGELOG"
c3e05f3 Revert "added an exception when a macro re-uses the same argument name twice"
524e406 Revert "renamed an internal variable"
60b575f Revert "fixed some unit tests"
prepared the 1.14.0 release
bumped version to 1.14.1-DEV
Update grammar of internals.rst

Some changes that I think help the docs read easier.
minor #1220 Update grammar of internals.rst (steveoliver)

This PR was merged into the master branch.

Discussion
----------

Update grammar of internals.rst

Fabien,

Here are some changes that I think help the Internals docs page read easier.

Commits
-------

6c80601 Update grammar of internals.rst
Do not repeat dirname function execution in writing cache files