Merge branch '3.4' into 4.3

* 3.4:
  Backported #12892 changes to 3.4
  some spelling updates

Author: javiereguiluz

contributing/documentation/overview.rst

@@ -292,7 +292,7 @@ Why Do my Changes Take so Long to Be Reviewed and/or Merged?
 
 Please be patient. It can take up to several days before your pull request can
 be fully reviewed. After merging the changes, it could take again several hours
-before your changes appear on the ``symfony.com`` website.
+before your changes appear on the Symfony website.
 
 Why Should I Use the Oldest Maintained Branch Instead of the Master Branch?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

create_framework/introduction.rst

@@ -63,7 +63,7 @@ Before You Start
 Reading about how to create a framework is not enough. You will have to follow
 along and actually type all the examples included in this tutorial. For that,
 you need a recent version of PHP (5.5.9 or later is good enough), a web server
-(like Apache, NGINX or PHP's built-in web server), a good knowledge of PHP and
+(like Apache, nginx or PHP's built-in web server), a good knowledge of PHP and
 an understanding of Object Oriented programming.
 
 Ready to go? Read on!

setup/built_in_web_server.rst

@@ -13,7 +13,7 @@ How to Use PHP's built-in Web Server
 The PHP CLI SAPI comes with a `built-in web server`_. It can be used to run your
 PHP applications locally during development, for testing or for application
 demonstrations. This way, you don't have to bother configuring a full-featured
-web server such as :doc:`Apache or Nginx </setup/web_server_configuration>`.
+web server such as :doc:`Apache or nginx </setup/web_server_configuration>`.
 
 .. caution::
 

setup/symfony_server.rst

@@ -133,7 +133,7 @@ to override:
 Running Commands with Different PHP Versions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When running different PHP versions it's useful to use the main ``symfony``
+When running different PHP versions, it is useful to use the main ``symfony``
 command as a wrapper for the ``php`` command. This allows you to always select
 the most appropriate PHP version according to the project which is running the
 commands. It also loads the env vars automatically, which is important when
@@ -148,20 +148,6 @@ running non-Symfony commands:
     # (or the default PHP version if the project didn't select one)
     $ symfony php -r "..."
 
-If you are using this wrapper frequently, consider aliasing the ``php`` command
-to it:
-
-.. code-block:: terminal
-
-    $ cd ~/.symfony/bin
-    $ cp symfony php
-    # now you can run "php ..." and the "symfony" command will be executed instead
-
-    # other PHP commands can be wrapped too using this trick
-    $ cp symfony php-config
-    $ cp symfony pear
-    $ cp symfony pecl
-
 Local Domain Names
 ------------------