From a81295ffd8dd615ccc6dc7079f9541cbafe63d77 Mon Sep 17 00:00:00 2001 From: Henry Snoek Date: Sat, 21 May 2016 13:18:37 +0200 Subject: [PATCH 1/4] 6555 link to Download instructions page for Linux / Unix / OSX installation, link to Windows executable --- cookbook/composer.rst | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/cookbook/composer.rst b/cookbook/composer.rst index 212fa78f632..2420ae0cf57 100644 --- a/cookbook/composer.rst +++ b/cookbook/composer.rst @@ -14,28 +14,18 @@ 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 following the Download page instructions from https://getcomposer.org/download. + +After this you can run this command to move composer.phar to a directory that is in your path: .. 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 - Install Composer on Windows --------------------------- -Download the installer from `getcomposer.org/download`_, execute it and follow +Download the installer from https://getcomposer.org/Composer-Setup.exe, execute it and follow the instructions. Learn more @@ -44,5 +34,4 @@ 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 From 9ea6493190ea010a9b5e5f2246349f665fbe7a24 Mon Sep 17 00:00:00 2001 From: Henry Snoek Date: Sat, 21 May 2016 14:09:43 +0200 Subject: [PATCH 2/4] 6555 code review changes --- cookbook/composer.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cookbook/composer.rst b/cookbook/composer.rst index 2420ae0cf57..516a432cda3 100644 --- a/cookbook/composer.rst +++ b/cookbook/composer.rst @@ -14,9 +14,8 @@ following sections. Install Composer on Linux and Mac OS X -------------------------------------- -Run the installer following the Download page instructions from https://getcomposer.org/download. - -After this you can run this command to move composer.phar to a directory that is in your path: +#. 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 @@ -25,8 +24,7 @@ After this you can run this command to move composer.phar to a directory that is Install Composer on Windows --------------------------- -Download the installer from https://getcomposer.org/Composer-Setup.exe, execute it and follow -the instructions. +Download the installer from `getcomposer.org`_, execute it and follow the instructions. Learn more ---------- @@ -35,3 +33,5 @@ Read the `Composer documentation`_ to learn more about its usage and features. .. _`Composer`: https://getcomposer.org/ .. _`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 From 4ffdece12b1b7e1361905073c0cd945fa176a6e9 Mon Sep 17 00:00:00 2001 From: Henry Snoek Date: Sat, 21 May 2016 15:04:29 +0200 Subject: [PATCH 3/4] 6555 indent code-block, add semi-colon at list item end --- cookbook/composer.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbook/composer.rst b/cookbook/composer.rst index 516a432cda3..29147ba9a8f 100644 --- a/cookbook/composer.rst +++ b/cookbook/composer.rst @@ -14,12 +14,12 @@ following sections. Install Composer on Linux and Mac OS X -------------------------------------- -#. Run the installer as described in `the official Composer documentation`_. +#. 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 - - $ sudo mv composer.phar /usr/local/bin/composer + .. code-block:: bash + + $ sudo mv composer.phar /usr/local/bin/composer Install Composer on Windows --------------------------- From 744a4c37e91d19daa4dab498c9ec8d3e2a9067c6 Mon Sep 17 00:00:00 2001 From: Henry Snoek Date: Sat, 21 May 2016 15:32:07 +0200 Subject: [PATCH 4/4] 6555 fix indent --- cookbook/composer.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbook/composer.rst b/cookbook/composer.rst index 29147ba9a8f..8c2afeeb16b 100644 --- a/cookbook/composer.rst +++ b/cookbook/composer.rst @@ -17,9 +17,9 @@ Install Composer on Linux and Mac OS X #. 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 - - $ sudo mv composer.phar /usr/local/bin/composer + .. code-block:: bash + + $ sudo mv composer.phar /usr/local/bin/composer Install Composer on Windows ---------------------------