Merge branch '2.5' into 2.6

* 2.5: Updating the installer docs to exactly match that repository's README - see #4533 Add command to make symfony.phar executable. fixed little typo
symfony · Dec 4, 2014 · f587903 · f587903
2 parents cd29dde + 5edaca0
commit f587903
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -33,6 +33,7 @@ On **Linux** and **Mac OS X** systems, execute the following console commands:
 
     $ curl -LsS http://symfony.com/installer > symfony.phar
     $ sudo mv symfony.phar /usr/local/bin/symfony
+    $ chmod a+x /usr/local/bin/symfony
 
 .. note::
 
@@ -43,6 +44,7 @@ On **Linux** and **Mac OS X** systems, execute the following console commands:
 
         $ php -r "readfile('http://symfony.com/installer');" > symfony.phar
         $ sudo mv symfony.phar /usr/local/bin/symfony
+        $ chmod a+x /usr/local/bin/symfony
 
 After installing the Symfony installer, you'll have to open a new console window
 to be able to execute the new ``symfony`` command:

diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst
@@ -406,7 +406,7 @@ transchoice
 
 .. code-block:: jinja
 
-    {{ message|transchoice(count, arguments, domai, locale) }}
+    {{ message|transchoice(count, arguments, domain, locale) }}
 
 ``message``
     **type**: ``string``