Skip to content

Minor fixes to contributing code docs #2665

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2013
Merged

Minor fixes to contributing code docs #2665

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e326308
Minor fixes to contributing code docs
jbafford May 26, 2013
7fcbed1
Remove oxford comma per request
jbafford May 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions contributing/code/patches.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ Set up your user information with your real name and a working email address:

.. tip::

If your IDE creates configuration files inside project's directory,
If your IDE creates configuration files inside the project's directory,
you can use global ``.gitignore`` file (for all projects) or
``.git/info/exclude`` file (per project) to ignore them. See
`Github's documentation`_.

.. tip::

Windows users: when installing Git, the installer will ask what to do with
line endings and suggests to replace all Lf by CRLF. This is the wrong
line endings, and suggests replacing all LF with CRLF. This is the wrong
setting if you wish to contribute to Symfony! Selecting the as-is method is
your best choice, as git will convert your line feeds to the ones in the
repository. If you have already installed Git, you can check the value of
Expand All @@ -52,8 +52,8 @@ Set up your user information with your real name and a working email address:

$ git config core.autocrlf

This will return either "false", "input" or "true", "true" and "false" being
the wrong values. Set it to another value by typing:
This will return either "false", "input" or "true"; "true" and "false" being
the wrong values. Change it to "input" by typing:

.. code-block:: bash

Expand Down Expand Up @@ -344,7 +344,7 @@ because you want early feedback on your work, add an item to todo-list:
.. code-block:: text

- [ ] finish the code
- [ ] gather feedback my changes
- [ ] gather feedback for my changes

As long as you have items in the todo-list, please prefix the pull request
title with "[WIP]".
Expand Down