diff --git a/docs/_includes/links/examples.rst b/docs/_includes/links/examples.rst index 407e2eaa..013ba910 100644 --- a/docs/_includes/links/examples.rst +++ b/docs/_includes/links/examples.rst @@ -34,10 +34,10 @@ Official Laravel Documentation -.. |ext_lnk_example_magento_documentation| raw:: html +.. |ext_lnk_example_magento2_documentation| raw:: html - - Official Magento Documentation + + Official Magento 2 Documentation .. |ext_lnk_example_phalcon_documentation| raw:: html diff --git a/docs/examples/setup-magento.rst b/docs/examples/setup-magento2.rst similarity index 91% rename from docs/examples/setup-magento.rst rename to docs/examples/setup-magento2.rst index e9480486..933c06a5 100644 --- a/docs/examples/setup-magento.rst +++ b/docs/examples/setup-magento2.rst @@ -2,16 +2,16 @@ .. _example_setup_magento: -************* -Setup Magento -************* +**************** +Setup Magento 2 +**************** -This example will use ``git`` and ``composer`` to install Magento from within the Devilbox PHP container. +This example will use ``git`` and ``composer`` to install Magento 2 from within the Devilbox PHP container. -After completing the below listed steps, you will have a working Magento setup ready to be +After completing the below listed steps, you will have a working Magento 2 setup ready to be served via http and https. -.. seealso:: |ext_lnk_example_magento_documentation| +.. seealso:: |ext_lnk_example_magento2_documentation| **Table of Contents** @@ -43,7 +43,7 @@ It will be ready in eight simple steps: 1. Enter the PHP container 2. Create a new VirtualHost directory -3. Install Magento via ``git`` and ``composer`` +3. Install Magento 2 via ``git`` and ``composer`` 4. Symlink webroot directory 5. Add MySQL database 6. Setup DNS record @@ -82,24 +82,24 @@ The vhost directory defines the name under which your project will be available. .. seealso:: :ref:`env_tld_suffix` -3. Install Magento ------------------- +3. Install Magento 2 +-------------------- -Navigate into your newly created vhost directory and install Magento with ``git``. +Navigate into your newly created vhost directory and install Magento 2 with ``git``. .. code-block:: bash devilbox@php-7.1.20 in /shared/httpd $ cd my-magento - # Download Magento with git + # Download Magento 2 via git devilbox@php-7.1.20 in /shared/httpd/my-magento $ git clone https://github.com/magento/magento2 # Checkout the latest stable git tag devilbox@php-7.1.20 in /shared/httpd/my-magento $ cd magento2 - devilbox@php-7.1.20 in /shared/httpd/my-magento $ git checkout 2.2.5 + devilbox@php-7.1.20 in /shared/httpd/my-magento/magento2 $ git checkout 2.2.5 # Install dependencies with Composer - devilbox@php-7.1.20 in /shared/httpd/my-magento $ composer install + devilbox@php-7.1.20 in /shared/httpd/my-magento/magento2 $ composer install How does the directory structure look after installation: diff --git a/docs/index.rst b/docs/index.rst index 32bf40f3..a78ad282 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -151,7 +151,7 @@ host is ready to be served with your custom domain. examples/setup-drupal examples/setup-joomla examples/setup-laravel - examples/setup-magento + examples/setup-magento2 examples/setup-phalcon examples/setup-photon-cms examples/setup-presta-shop