Merge branch 'master' of github.com:Codeception/codeception.github.com

DavertMik · DavertMik · commit 0c39697631f9 · 2016-12-21T19:58:19.000+02:00
diff --git a/changelog.markdown b/changelog.markdown
@@ -20,23 +20,17 @@ This should help you next time you get messed with YAML formatting.
 
 * Gherkin improvements:
   * multiple step definitions per method allowed (Fixes [#3670](https://github.com/Codeception/Codeception/issues/3670)).  
-  * regex validation for Gherkin steps; throws exception if invalid regex passed. Fixes [#3676](https://github.com/Codeception/Codeception/issues/3676)  
-
-  * escaped strings can now be passed into placeholders. Fixes [#3676](https://github.com/Codeception/Codeception/issues/3676).  
+  * regex validation for Gherkin steps; throws exception if invalid regex passed. Fixes [#3676](https://github.com/Codeception/Codeception/issues/3676)
+  * escaped strings can now be passed into placeholders. Fixes [#3676](https://github.com/Codeception/Codeception/issues/3676).
   * currency chars supported in placeholders:
-
-```
-@When I have :money in my wallet
-```
-
+  
   $,€,£ and other signs can be used before or after a number inside Gherkin scenario. This char will be ignored inside a PHP variable, so you receive only number.
 
 ```gherkin
-When I have 100$ in my wallet => $num === 100
-And I have $100 in my wallet => $num === 100
+When I have 100$ => $num === 100
+And I have $100 => $num === 100
 ```
 
-
 * Codeception is tested with latest verision of HHVM
 * Extensions loader refactored:
   * Extensions can be **enabled for suite** in suite config.
diff --git a/docs/07-AdvancedUsage.md b/docs/07-AdvancedUsage.md
@@ -256,6 +256,7 @@ These examples can be written using Doctrine-style annotation syntax as well:
 You can also use the `@dataprovider` annotation for creating dynamic examples, using a protected method for providing example data:
 {% highlight php %}
 
+<?php
    /**
     * @dataprovider pageProvider
     */
@@ -590,7 +591,7 @@ Codeception reorders tests so dependent tests always will executed after the tes
 
 The interactive console was added to try Codeception commands before executing them inside a test.
 
-![console](http://img267.imageshack.us/img267/204/003nk.png)
+![console](http://codeception.com/images/console.png)
 
 You can run the console with the following command:
 
diff --git a/docs/08-Customization.md b/docs/08-Customization.md
@@ -106,9 +106,7 @@ For instance, you can enable the Logger extension to log the test execution with
 extensions:
     enabled:
         - Codeception\Extension\RunFailed # default extension
-        - Codeception\Extension\Logger # enabled extension
-    config:
-        Codeception\Extension\Logger:
+        - Codeception\Extension\Logger: # enabled extension
             max_files: 5 # logger configuration
 
 {% endhighlight %}
@@ -193,7 +191,7 @@ Extensions have some basic methods you can use:
 Once you've implemented a simple extension class, you can require it in `tests/_bootstrap.php`,
 load it with Composer's autoloader defined in `composer.json`, or store the class inside `tests/_support`dir.
 
-You can then enable it in `codeception.yml`:
+You can then enable it in `codeception.yml`
 
 {% highlight yaml %}
 
@@ -202,6 +200,8 @@ extensions:
 
 {% endhighlight %}
 
+Extensions can also be enabled per suite inside suite configs (like `acceptance.suite.yml`) and for a specific environment. 
+
 ### Configuring Extension
 
 In the extension, you can access the currently passed options via the `options` property.
diff --git a/docs/12-ContinuousIntegration.md b/docs/12-ContinuousIntegration.md
@@ -88,7 +88,7 @@ Jenkins should locate `report.html` at `tests/_output/`. Now Jenkins will displa
 
 ## TeamCity
 
-![TeamCity](https://codeception.com/images/teamcity.png)
+![TeamCity](http://codeception.com/images/teamcity.png)
 
 TeamCity is a hotsed solution from JetBrains. The setup of it can be a bit tricky as TeamCity uses its own reporter format for parsing test results. PHPUnit since verison 5.x has integrated support for this format, so does Codeception. What we need to do is to configure Codeception to use custom reporter. By default there is `--report` option which provides an alternative output. You can change the reporter class in `codeception.yml` configuration:
 
@@ -108,15 +108,15 @@ After you create build project you should define build step with Codeception whi
 
 {% endhighlight %}
 
-![build step](https://codeception.com/images/teamcity/build.png)
+![build step](http://codeception.com/images/teamcity/build.png)
 
 Once you execute your first build you should see detailed report inside TeamCity interface:
 
-![report](https://codeception.com/images/teamcity/report.png)
+![report](http://codeception.com/images/teamcity/report.png)
 
 ## TravisCI
 
-![Travis CI](https://codeception.com/images/travis.png)
+![Travis CI](http://codeception.com/images/travis.png)
 
 Travis CI is popular service CI with good GitHub integration. Codeception is self-tested with Travis CI. There nothing specifal about configuration. Just add to the bottom line of travis configuration:
 
