Skip to content
Snippets Groups Projects
Commit 4914b65a authored by Vladimir Pelipenko's avatar Vladimir Pelipenko
Browse files

MAGETWO-40680: Update README.md with new content

parent 6fdf6651
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 19 deletions
README.md
+ 19
− 19
View file @ 4914b65a
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
<h2>Welcome</h2> <h2>Welcome</h2>
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results. Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v1.0/install-gde/bk-install-guide.html" target="_blank">guide</a>. The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html" target="_blank">guide</a>.
<h2>New to Magento? Need some help?</h2> <h2>New to Magento? Need some help?</h2>
If you're not sure about the following, you probably need a little help before you start installing the Magento software: If you're not sure about the following, you probably need a little help before you start installing the Magento software:
* Is the Magento software <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_magento-installed.html">installed already</a>? * Is the Magento software <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_magento-installed.html">installed already</a>?
* What's a <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_login.html">terminal, command prompt, or Secure Shell (ssh)</a>? * What's a <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_login.html">terminal, command prompt, or Secure Shell (ssh)</a>?
* Where's my <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_login.html">Magento server</a> and how do I access it? * Where's my <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_login.html">Magento server</a> and how do I access it?
* What's <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_software.html">PHP</a>? * What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">PHP</a>?
* What's <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_software.html">Apache</a>? * What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">Apache</a>?
* What's <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_software.html">MySQL</a>? * What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">MySQL</a>?
<h2>Step 1: Verify your prerequisites</h2> <h2>Step 1: Verify your prerequisites</h2>
...@@ -30,16 +30,16 @@ Use the following table to verify you have the correct prerequisites to install ...@@ -30,16 +30,16 @@ Use the following table to verify you have the correct prerequisites to install
<td>Apache 2.2 or 2.4</td> <td>Apache 2.2 or 2.4</td>
<td>Ubuntu: <code>apache2 -v</code><br> <td>Ubuntu: <code>apache2 -v</code><br>
CentOS: <code>httpd -v</code></td> CentOS: <code>httpd -v</code></td>
<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/apache.html">Apache</a></td> <td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/apache.html">Apache</a></td>
</tr> </tr>
<tr> <tr>
<td>PHP 5.5.x or 5.6.x</td> <td>PHP 5.5.x or 5.6.x</td>
<td><code>php -v</code></td> <td><code>php -v</code></td>
<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td> <td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
</tr> </tr>
<tr><td>MySQL 5.6.x</td> <tr><td>MySQL 5.6.x</td>
<td><code>mysql -u [root user name] -p</code></td> <td><code>mysql -u [root user name] -p</code></td>
<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/mysql.html">MySQL</a></td> <td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/mysql.html">MySQL</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -48,16 +48,16 @@ Use the following table to verify you have the correct prerequisites to install ...@@ -48,16 +48,16 @@ Use the following table to verify you have the correct prerequisites to install
After verifying your prerequisites, perform the following tasks in order to prepare to install the Magento software. After verifying your prerequisites, perform the following tasks in order to prepare to install the Magento software.
1. <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-install">Install Composer</a> 1. <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/composer-clone.html#instgde-prereq-compose-install">Install Composer</a>
2. <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-clone">Clone the Magento repository</a> 2. <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/composer-clone.html#instgde-prereq-compose-clone">Clone the Magento repository</a>
<h2>Step 3: Install and verify the installation</h2> <h2>Step 3: Install and verify the installation</h2>
1. <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/prepare-install.html">Update installation dependencies</a> 1. <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/prepare-install.html">Update installation dependencies</a>
2. Install Magento: 2. Install Magento:
* <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html">Install Magento software using the web interface</a> * <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/install-web.html">Install Magento software using the web interface</a>
* <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-cli.html">Install Magento software using the command line</a> * <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/install-cli.html">Install Magento software using the command line</a>
2. <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/verify.html">Verify the installation</a> 2. <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/verify.html">Verify the installation</a>
<h2>Contributing to the Magento 2 code base</h2> <h2>Contributing to the Magento 2 code base</h2>
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions. Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
...@@ -68,7 +68,7 @@ To learn about issues, click [here][2]. To open an issue, click [here][3]. ...@@ -68,7 +68,7 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
To suggest documentation improvements, click [here][4]. To suggest documentation improvements, click [here][4].
[1]: <http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html> [1]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/CONTRIBUTING.html>
[2]: <http://devdocs.magento.com/guides/v1.0/contributor-guide/CONTRIBUTING.html#report> [2]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/CONTRIBUTING.html#report>
[3]: <https://github.com/magento/magento2/issues> [3]: <https://github.com/magento/magento2/issues>
[4]: <http://devdocs.magento.com> [4]: <http://devdocs.magento.com>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment