Merge branch '2.x' into 3.x

* 2.x:
  Fix a typo in api.rst
  Fix a typo advanced.rst
This commit is contained in:
Fabien Potencier
2021-11-29 09:51:28 +01:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -527,7 +527,7 @@ The ``Project_Set_Node`` class itself is quite short::
}
}
The compiler implements a fluid interface and provides methods that helps the
The compiler implements a fluid interface and provides methods that help the
developer generate beautiful and readable PHP code:
* ``subcompile()``: Compiles a node.
+1 -1
View File
@@ -177,7 +177,7 @@ Namespaced templates can be accessed via the special
$twig->render('@admin/index.html', []);
``\Twig\Loader\FilesystemLoader`` support absolute and relative paths. Using relative
``\Twig\Loader\FilesystemLoader`` supports absolute and relative paths. Using relative
paths is preferred as it makes the cache keys independent of the project root
directory (for instance, it allows warming the cache from a build server where
the directory might be different from the one used on production servers)::