From e3263085f5eeecb9b446d96ce85a3738d67579e0 Mon Sep 17 00:00:00 2001 From: John Bafford Date: Sun, 26 May 2013 15:10:33 -0400 Subject: [PATCH 1/2] Minor fixes to contributing code docs --- contributing/code/patches.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst index 0e26b62c18c..3e3d34cb022 100644 --- a/contributing/code/patches.rst +++ b/contributing/code/patches.rst @@ -34,7 +34,7 @@ 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`_. @@ -42,7 +42,7 @@ Set up your user information with your real name and a working email address: .. 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 @@ -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 @@ -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]". From 7fcbed10bc20afb4dc2338801510e0e1174c0d3c Mon Sep 17 00:00:00 2001 From: John Bafford Date: Mon, 27 May 2013 11:08:26 -0400 Subject: [PATCH 2/2] Remove oxford comma per request --- contributing/code/patches.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst index 3e3d34cb022..1ab3fa08fc0 100644 --- a/contributing/code/patches.rst +++ b/contributing/code/patches.rst @@ -52,7 +52,7 @@ 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 + This will return either "false", "input" or "true"; "true" and "false" being the wrong values. Change it to "input" by typing: .. code-block:: bash pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy