Skip to content

Commit

Permalink
Merge branch '1.1'
Browse files Browse the repository at this point in the history
* 1.1:
  [Documentation] Fix typo
  • Loading branch information
pamil committed Jan 31, 2018
2 parents 15fff47 + fe6872b commit 213c59d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions docs/contributing/code/patches.rst
Expand Up @@ -10,7 +10,7 @@ Step 1: Setup your Environment
Install the Software Stack
~~~~~~~~~~~~~~~~~~~~~~~~~~

Before working on Sylius, setup a Symfony friendly environment with the following
Before working on Sylius, set a Symfony friendly environment up with the following
software:

* Git
Expand All @@ -20,12 +20,12 @@ software:
Configure Git
~~~~~~~~~~~~~

Set up your user information with your real name and a working email address:
Set your user information up with your real name and a working email address:

.. code-block:: bash
$ git config --global user.name "Your Name"
$ git config --global user.email you@example.com
$ git config --global user.email "you@example.com"
.. tip::

Expand All @@ -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 the project's directory,
If your IDE creates configuration files inside the directory of the project,
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 replacing all LF with CRLF. This is the wrong
line endings, and will suggest replacing all LF with CRLF. This is the wrong
setting if you wish to contribute to Sylius. 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 Down Expand Up @@ -91,7 +91,7 @@ Step 2: Work on your Patch
The License
~~~~~~~~~~~

Before you start, you must know that all the patches you are going to submit
Before you start, you must know that all patches you are going to submit
must be released under the *MIT license*, unless explicitly specified in your
commits.

Expand Down Expand Up @@ -122,7 +122,7 @@ topic branch, starting from the previously chosen base branch:
Use a descriptive name for your branch (``issue_XXX`` where ``XXX`` is the
GitHub issue number is a good convention for bug fixes).

The above checkout commands automatically switch the code to the newly created
The above checkout command automatically switches the code to the newly created
branch (check the branch you are working on with ``git branch``).

Work on your Patch
Expand Down

0 comments on commit 213c59d

Please sign in to comment.