diff --git a/cookbook/composer.rst b/cookbook/composer.rst index 212fa78f632..8c2afeeb16b 100644 --- a/cookbook/composer.rst +++ b/cookbook/composer.rst @@ -14,29 +14,17 @@ following sections. Install Composer on Linux and Mac OS X -------------------------------------- -To install Composer on Linux or Mac OS X, execute the following two commands: +#. Run the installer as described in `the official Composer documentation`_; +#. Execute the following command to move the ``composer.phar`` to a directory that is in your path: -.. code-block:: bash + .. code-block:: bash - $ curl -sS https://getcomposer.org/installer | php - $ sudo mv composer.phar /usr/local/bin/composer - -.. note:: - - If you don't have ``curl`` installed, you can also just download the - ``installer`` file manually at https://getcomposer.org/installer and - then run: - - .. code-block:: bash - - $ php installer - $ sudo mv composer.phar /usr/local/bin/composer + $ sudo mv composer.phar /usr/local/bin/composer Install Composer on Windows --------------------------- -Download the installer from `getcomposer.org/download`_, execute it and follow -the instructions. +Download the installer from `getcomposer.org`_, execute it and follow the instructions. Learn more ---------- @@ -44,5 +32,6 @@ Learn more Read the `Composer documentation`_ to learn more about its usage and features. .. _`Composer`: https://getcomposer.org/ -.. _`getcomposer.org/download`: https://getcomposer.org/download .. _`Composer documentation`: https://getcomposer.org/doc/00-intro.md +.. _`getcomposer.org`: https://getcomposer.org/Composer-Setup.exe +.. _the official Composer documentation: https://getcomposer.org/download