Merge pull request #71 from ifdattic/patch-2

Fix typos

guides/1.gherkin.rst

@@ -167,7 +167,7 @@ use of a template with placeholders:
 
 The Scenario Outline steps provide a template which is never directly run. A
 Scenario Outline is run once for each row in the Examples section beneath it
-(except from the first header row).
+(except for the first header row).
 
 The Scenario Outline uses placeholders, which are contained within
 ``< >`` in the Scenario Outline's steps. For example:
@@ -195,7 +195,7 @@ So when running the first row of our example:
 
 .. code-block:: gherkin
 
-    Scenario Outline: controlling order
+    Scenario Outline: Eating
       Given there are <start> cucumbers
       When I eat <eat> cucumbers
       Then I should have <left> cucumbers
@@ -208,7 +208,7 @@ The scenario that is actually run is:
 
 .. code-block:: gherkin
 
-    Scenario Outline: controlling order
+    Scenario: Eating
       # <start> replaced with 12:
       Given there are 12 cucumbers
       # <eat> replaced with 5:
@@ -287,7 +287,7 @@ use cases, givens are your preconditions.
 
 .. tip::
 
-    It's ok to call into the layer "inside" the UI layer here (in symfony: talk
+    It's OK to call into the layer "inside" the UI layer here (in Symfony: talk
     to the models).
 
 .. sidebar:: Using Givens as Data Fixtures
@@ -485,7 +485,7 @@ three double-quote marks (``"""``), placed on their own line:
 .. note::
 
     The inspiration for PyString comes from Python where ``"""`` is used to
-    delineate docstrings, much in the way ``/* ... */`` is used for multiline
+    delineate docstrings, much in the way ``/** ... */`` is used for multiline
     docblocks in PHP.
 
 .. sidebar:: Matching PyStrings in your Step Definition

guides/2.definitions.rst

@@ -115,11 +115,11 @@ method as an argument value. In the example above,
 ``FeatureContext::someMethod()`` will be called three times, each time with
 a different argument:
 
-#. ``$context->someMethod( $methodArgument = 'string1' );``.
+#. ``$context->someMethod($methodArgument = 'string1');``.
 
-#. ``$context->someMethod( $methodArgument = 'some other string' );``.
+#. ``$context->someMethod($methodArgument = 'some other string');``.
 
-#. ``$context->someMethod( $methodArgument = '25' );``.
+#. ``$context->someMethod($methodArgument = '25');``.
 
 .. note::
 
@@ -296,7 +296,7 @@ execution.
 Undefined Steps
 ~~~~~~~~~~~~~~~
 
-When Behat cannot find a matching definition, the step are marked as
+When Behat cannot find a matching definition, the step is marked as
 **undefined**, and all subsequent steps in the scenarios are **skipped**.
 
 Let's pretend we have an empty context class:
@@ -720,8 +720,8 @@ via a comma-delimited list of the column headers prefixed with ``table:``:
     behavior. Also, they are inherently hard to debug because of their
     highly dynamic nature.
 
-Browse your steps dictionnary
------------------------------
+Browse your steps dictionary
+----------------------------
 
 As your set of features will grow, there's a good chance that the amount of
 different steps that you'll have at your disposal to describe new scenarios will also grow.
@@ -730,7 +730,7 @@ Behat provides a command line option ``--definitions`` or simply ``-d`` to easil
 in order to reuse them or adapt them (introducing new placeholders for example).
 
 For example, when using the Mink context provided by the Mink extension, you'll have access to its
-step dictionnary by running:
+step dictionary by running:
 
 .. code-block:: console
 
@@ -778,4 +778,4 @@ You can also search for a specific pattern by running:
 
     #...
 
-That's it, you can now search and browse your whole step dictionnary.
+That's it, you can now search and browse your whole step dictionary.