Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/tags/capture.md
	src/Fenom.php

docs/install.md

@@ -1,7 +1,7 @@
 Installation
 ============
 
-For installation use [composer](http://getcompoer.org). Add in your `composer.json` requirements:
+For installation use [composer](http://getcomposer.org). Add in your `composer.json` requirements:
 ```json
 {
     "require": {

docs/syntax.md

@@ -196,7 +196,7 @@ but if use single quote any template expressions will be on display as it is
 {funct arg=($a.d.c|count+4)/3}
 ```
 
-### Ignoring temaplate code
+### Ignoring template code
 
 В шаблонизаторе Fenom используются фигурные скобки для отделения HTML от кода Fenom.
 Если требуется вывести текст, содержащий фигурные скобки, помните о следующих возможностях:

docs/tags/extends.md

@@ -60,7 +60,7 @@ Planned. Not supported yet. Feature #5.
 {/block}
 ```
 
-### Perfomance
+### Performance
 
 Алгоритм реализации наследования шаблонов может работать в разных режимах, в зависимости от условий.
 Каждый режим имеет свою производительность.

docs/tags/if.md

@@ -6,7 +6,7 @@ Tag {if} [RU]
 ```smarty
 {if <expression>}
    {* ...code... *}
-{elseif <expresion>}
+{elseif <expression>}
    {* ...code... *}
 {else}
    {* ...code... *}
@@ -16,7 +16,7 @@ Tag {if} [RU]
 ### {if}
 
 ```smarty
-{if <expresion>}
+{if <expression>}
     {*...some code...*}
 {/if}
 ```
@@ -26,9 +26,9 @@ Tag {if} [RU]
 ### {elseif}
 
 ```smarty
-{if <expresion1>}
+{if <expression1>}
     {*...some code...*}
-{elseif <expresion2>}
+{elseif <expression2>}
     {*...some code...*}
 {/if}
 ```
@@ -38,7 +38,7 @@ Tag {if} [RU]
 ### {else}
 
 ```smarty
-{if <expresion>}
+{if <expression>}
     {*...some code...*}
 {else}
     {*...some code...*}

src/Fenom/Compiler.php

@@ -564,7 +564,7 @@ class Compiler {
 
     public static function tagParent($tokens, Scope $scope) {
         if(empty($scope->tpl->_extends)) {
-            throw new InvalidUsageException("Tag {parent} may be declared in childs");
+            throw new InvalidUsageException("Tag {parent} may be declared in children");
         }
     }
 

src/Fenom/Render.php

@@ -57,7 +57,7 @@ class Render extends \ArrayObject {
     protected $_depends = array();
 
     /**
-     * @var int tempalte options (see Fenom options)
+     * @var int template options (see Fenom options)
      */
     protected $_options = 0;
 

src/Fenom/Tokenizer.php

@@ -101,7 +101,7 @@ class Tokenizer {
             \T_LOGICAL_AND => 1, \T_LOGICAL_OR => 1,  \T_LOGICAL_XOR => 1, \T_METHOD_C => 1, \T_NAMESPACE => 1,  \T_NS_C => 1,
             \T_NEW => 1,         \T_PRINT => 1,       \T_PRIVATE => 1, \T_PUBLIC => 1,      \T_PROTECTED => 1,   \T_REQUIRE => 1,
             \T_REQUIRE_ONCE => 1,\T_RETURN => 1,      \T_RETURN => 1,  \T_STRING => 1,      \T_SWITCH => 1,      \T_THROW => 1,
-            \T_TRAIT => 1,       \T_TRAIT_C => 1,     \T_TRY => 1,     \T_UNSET => 1,       \T_UNSET => 1,       \T_VAR => 1,
+            \T_TRAIT => 1,       \T_TRAIT_C => 1,     \T_TRY => 1,     \T_UNSET => 1,       \T_VAR => 1,
             \T_WHILE => 1,       \T_YIELD => 1,       \T_USE => 1
         ),
         self::MACRO_INCDEC => array(