Fixed some typos and syntax errors in the Twig reference #4469
Conversation
javiereguiluz
commented
Nov 15, 2014
| Q | A |
|---|---|
| Doc fix? | yes |
| New docs? | no |
| Applies to | all |
| Fixed tickets | - |
| @@ -539,7 +539,7 @@ format_file_from_text | |||
| ``text`` | |||
| **type**: ``string`` | |||
|
|
|||
| Uses `|format_file <format_file>` to improve the output of default PHP errors. | |||
| Uses :ref:`|format_file <format_file>`_ to improve the output of default PHP errors. | |||
| @@ -91,7 +91,7 @@ controller | |||
| **type**: ``array`` **default**: ``[]`` | |||
|
|
|||
| Returns an instance of ``ControllerReference`` to be used with functions like | |||
| :ref:`render() <reference-twig-function-render>` and `render_esi() <render_esi>`. | |||
| :ref:`render() <reference-twig-function-render>` and :ref:`render_esi() <render_esi>`. | |||
There was a problem hiding this comment.
You will have to add a label before the "render_esi" headline like this:
.. _reference-twig-function-render-esi:and then change the referenced label name here accordingly.
|
How does this work together with #4432 ? Are there some conflicts? |
|
I don't think so. But we could merge one first and rebase the other one to ensure that nothing goes wrong. |
|
@javiereguiluz could you please rebase? |
|
@wouterj I don't know how to do it because I deleted my forked repo, that's why this PR shows |
|
@javiereguiluz What you can do is basically (assumed that this repo is your local $ git fetch upstream +refs/pull/4469/head
$ git checkout -b <branch-name> FETCH_HEADYou can then create a new pull request based on this new branch. |
|
@xabbuh I'm afraid that I destroyed everything: local repo, fork on GitHub, everything! I'll do a new PR. |
|
@javiereguiluz you can create a new local repo without issue. Just clone the repo again. The command given by @xabbuh gets the PR content from the symfony/symfony-docs repo on github (upstream refers to the symfony repo, not your deleted fork) |
|
Closed in favor of #4954 |