Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork5.2k
[Contributing] Several tweaks#4793
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
xelaris commentedJan 8, 2015
| Q | A |
|---|---|
| Doc fix? | yes |
| New docs? | yes |
| Applies to | 2.3+ |
| Fixed tickets |
| In this example, the **basefork** should be ``symfony/symfony-docs`` and | ||
| the **base** branch should be the ``2.3``, which is the branch that you selected | ||
| to base your changes on. The **head fork** should be your forked copy | ||
| of ``symfony-docs`` and the **compare** branch should be ``improve_install_chapter``, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
these changes are done to match the image
👍 thanks@xelaris! |
Thanks for the review@javiereguiluz. The commit has been updated. I think using |
| * ``{# ... #}`` (twig); | ||
| * ``<!-- ... -->`` (xml/html); | ||
| * ``; ...`` (ini); | ||
| * ``...`` (text); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I would not use semicolons here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
same here :)
| @@ -136,7 +136,7 @@ changes and push them: | |||
| # ... do your changes | |||
| $ git push | |||
| $ git push origin improve_install_chapter | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
you can ommit both, as the current branch is selected by default and the origin repo also. People have different namings, so this can cause many problems. (e.g. I call this repo origin and my fork wouterj)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
You are right, since it's related to thefirst contribution and following the previous steps,git push is enough.
My thought while adding this was: ifpush.default is set tomatching all the local branches are pushed to their matching ones on the remote. Anyway I will revert this change, since it's an edge case.
| * ``// ...`` (php) | ||
| * ``# ...`` (yaml/bash) | ||
| * ``{# ... #}`` (twig) | ||
| * ``<!-- ... -->`` (xml/html) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
maybe add a note that the HTML commit is also used when writing PHP template (i.e. thehtml+php format)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Something like
To fold HTML in PHP templates (
html+phpformat) use the HTML comment, no PHP tag with comment.
?
@wouterj I reverted to a horizontal list |
@xelaris Sorry for the delay. This looks good to me and I labeled it as finished. |
These are great! Thanks Alexander! |
This PR was merged into the 2.3 branch.Discussion----------[Contributing] Several tweaks| Q | A| ------------- | ---| Doc fix? | yes| New docs? | yes| Applies to | 2.3+| Fixed tickets |Commits-------8be88af [Contributing] Several tweaks
* 2.3: (23 commits) Update configuration.rst Update configuration.rst Readability [#4875] Minor language tweaks [#4779] Minor tweaks to a huge PR Fixed some of the comments [#4793] Very minor tweak that sounds more natural [config][translator] use the new fallbacks option. Linked "logrotate" to its official website Minor rewording Added a note about log file sizes and the use of logrotate Use snake_case for template names Made http cache chapter best-practices-compatible and lots of other fixes Made propel chapter best-practices-compatible and lots of other fixes Made testing chapter best-practices-compatible and lots of other fixes Made validation chapter best-practices-compatible Remove usage of first person Updated as per feedback. Updated as per feedback Fix typos ...Conflicts:book/forms.rstbook/testing.rstcookbook/logging/monolog.rstreference/configuration/framework.rst
* 2.6: (32 commits) Update configuration.rst Update configuration.rst Readability [#4875] Minor language tweaks [#4779] Minor tweaks to a huge PR [#4724] Minor language tweaks and cross-link to form theming document the validation payload option Fixed some of the comments [#4793] Very minor tweak that sounds more natural [#4732] Tweaking language, clarifying purpose of disabling form and that you can disable CSRF on 1 form [#4732] Tweaking language, clarifying purpose of disabling form and that you can disable CSRF on 1 form [config][translator] use the new fallbacks option. add missing reference options and descriptions Linked "logrotate" to its official website Minor rewording Added a note about log file sizes and the use of logrotate Use snake_case for template names Fixed minor grammar issues Made http cache chapter best-practices-compatible and lots of other fixes Made propel chapter best-practices-compatible and lots of other fixes ...
* 2.7: (38 commits) Update configuration.rst Update configuration.rst Readability [#4875] Minor language tweaks [#4779] Minor tweaks to a huge PR [#4724] Minor language tweaks and cross-link to form theming [Serializer] Fix CS document the validation payload option Fixed some of the comments [#4793] Very minor tweak that sounds more natural [#4732] Tweaking language, clarifying purpose of disabling form and that you can disable CSRF on 1 form [#4732] Tweaking language, clarifying purpose of disabling form and that you can disable CSRF on 1 form [config][translator] use the new fallbacks option. add missing reference options and descriptions Linked "logrotate" to its official website Minor rewording Added a note about log file sizes and the use of logrotate Use snake_case for template names Fixed minor grammar issues Made http cache chapter best-practices-compatible and lots of other fixes ...