-
+{:.bs-callout .bs-callout-warning}
+You can no longer run `dev/tools/cron.sh` because the script has been removed.
-You can no longer run dev/tools/cron.sh because the script has been removed.
+{:.bs-callout .bs-callout-info}
Magento depends on proper cron job configuration for many important system functions, including indexing. Failure to set it up properly means Magento won't function as expected.
-
UNIX systems schedule tasks to be performed by particular users using a *crontab*, which is a file that contains instructions to the cron daemon that tell the daemon in effect to "run this command at this time on this date". Each user has its own crontab, and commands in any given crontab are executed as the user who owns it.
diff --git a/_includes/config/es-elasticsearch-magento.md b/_includes/config/es-elasticsearch-magento.md
index 079d0ecd305..fd1cc1a49f5 100644
--- a/_includes/config/es-elasticsearch-magento.md
+++ b/_includes/config/es-elasticsearch-magento.md
@@ -1,6 +1,4 @@
-
-
-This section discusses the minimum settings you must choose to test Elasticsearch with Magento 2. For additional details about configuring Elasticsearch, see the [{{site.data.var.ee}} User Guide](http://docs.magento.com/m2/ee/user_guide/catalog/search-elasticsearch.html){:target="_blank"}.
+This section discusses the minimum settings you must choose to test Elasticsearch with Magento 2. For additional details about configuring Elasticsearch, see the [{{site.data.var.ee}} User Guide](http://docs.magento.com/m2/ee/user_guide/catalog/search-elasticsearch.html).
To configure Magento to use Elasticsearch:
@@ -8,7 +6,8 @@ To configure Magento to use Elasticsearch:
2. Click **Stores** > Settings > **Configuration** > **Catalog** > **Catalog** > **Catalog Search**.
3. From the **Search Engine** list, click **Elasticsearch** or **Elasticsearch 5.0+** as the following figure shows. (The **Elasticsearch 5.0+** option is not available for Magento 2.1.)
- 
+ {:width="650px"}
+
4. The following table discusses only the configuration options required to test the connection with Magento.
Unless you changed Elasticsearch server settings, the defaults should work. Skip to the next step.
@@ -80,13 +79,13 @@ To refresh the cache using the Admin:
2. Select the checkbox next to Page Cache.
3. From the Actions list in the upper right, click Refresh.
The following figure shows an example.
-
+ {:width="600px"}
-To clean the cache using the command line, use the `magento cache:clean` command.
+To clean the cache using the command line, use the [`magento cache:clean`]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-cache.html#config-cli-subcommands-cache-clean) command.
To reindex using the command line:
-1. Log in to your Magento server as, or switch to, the Magento file system owner.
+1. Log in to your Magento server as, or switch to, the [Magento file system owner]({{ page.baseurl }}/install-gde/prereq/apache-user.html).
2. Enter any of the following commands:
Enter the following command to reindex the catalog search index only:
@@ -99,6 +98,5 @@ To reindex using the command line:
3. Wait while the reindexing completes.
-
+ {:width="650px"}
+
4. The following table discusses only the configuration options required to test the connection with Magento.
Unless you changed Elasticsearch server settings, the defaults should work. Skip to the next step.
@@ -80,13 +79,13 @@ To refresh the cache using the Admin:
2. Select the checkbox next to Page Cache.
3. From the Actions list in the upper right, click Refresh.The following figure shows an example.
-
+ {:width="600px"}
-To clean the cache using the command line, use the `magento cache:clean` command.
+To clean the cache using the command line, use the [`magento cache:clean`]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-cache.html#config-cli-subcommands-cache-clean) command.
To reindex using the command line:
-1. Log in to your Magento server as, or switch to, the Magento file system owner.
+1. Log in to your Magento server as, or switch to, the [Magento file system owner]({{ page.baseurl }}/install-gde/prereq/apache-user.html).
2. Enter any of the following commands:
Enter the following command to reindex the catalog search index only:
@@ -99,6 +98,5 @@ To reindex using the command line:
3. Wait while the reindexing completes.
-
-
+{:.bs-callout .bs-callout-info}
+Unlike the cache, indexers are updated by a cron job. Make sure [cron is enabled]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-cron.html) before you start using Elasticsearch.
diff --git a/_includes/config/es-verify-proxy.md b/_includes/config/es-verify-proxy.md
index 711943a2b01..4b145a95aab 100644
--- a/_includes/config/es-verify-proxy.md
+++ b/_includes/config/es-verify-proxy.md
@@ -1,5 +1,3 @@
-Unlike the cache, indexers are updated by a cron job. Make sure cron is enabled before you start using Elasticsearch.
-
-
## Verify communication is secure {#es-ws-secure-verify}
This section discusses two ways to verify that HTTP Basic authentication is working:
@@ -11,46 +9,58 @@ This section discusses two ways to verify that HTTP Basic authentication is work
Enter the following command:
- curl -i http://:/_cluster/health
+```bash
+curl -i http://:/_cluster/health
+```
For example, if you enter the command on the Elasticsearch server and your proxy uses port 8080:
- curl -i http://localhost:8080/_cluster/health
+```bash
+curl -i http://localhost:8080/_cluster/health
+```
The following message displays to indicate authentication failed:
- HTTP/1.1 401 Unauthorized
- Date: Tue, 23 Feb 2016 20:35:29 GMT
- Content-Type: text/html
- Content-Length: 194
- Connection: keep-alive
- WWW-Authenticate: Basic realm="Restricted"
+```terminal
+HTTP/1.1 401 Unauthorized
+Date: Tue, 23 Feb 2016 20:35:29 GMT
+Content-Type: text/html
+Content-Length: 194
+Connection: keep-alive
+WWW-Authenticate: Basic realm="Restricted"
-
- 401 Authorization Required
-
- 401 Authorization Required
+
+ : http://:/_cluster/health
+```bash
+curl -i -u : http://:/_cluster/health
+```
For example:
- curl -i -u magento_elasticsearch:mypassword http://localhost:8080/_cluster/health
+```bash
+curl -i -u magento_elasticsearch:mypassword http://localhost:8080/_cluster/health
+```
This time the command succeeds with a message similar to the following:
- HTTP/1.1 200 OK
- Date: Tue, 23 Feb 2016 20:38:03 GMT
- Content-Type: application/json; charset=UTF-8
- Content-Length: 389
- Connection: keep-alive
+```terminal
+HTTP/1.1 200 OK
+Date: Tue, 23 Feb 2016 20:38:03 GMT
+Content-Type: application/json; charset=UTF-8
+Content-Length: 389
+Connection: keep-alive
- {"cluster_name":"elasticsearch","status":"yellow","timed_out":false,"number_of_nodes":1,"number_of_data_nodes":1,"active_primary_shards":5,"active_shards":5,"relocating_shards":0,"initializing_shards":0,"unassigned_shards":5,"delayed_unassigned_shards":0,"number_of_pending_tasks":0,"number_of_in_flight_fetch":0,"task_max_waiting_in_queue_millis":0,"active_shards_percent_as_number":50.0}
+{"cluster_name":"elasticsearch","status":"yellow","timed_out":false,"number_of_nodes":1,"number_of_data_nodes":1,"active_primary_shards":5,"active_shards":5,"relocating_shards":0,"initializing_shards":0,"unassigned_shards":5,"delayed_unassigned_shards":0,"number_of_pending_tasks":0,"number_of_in_flight_fetch":0,"task_max_waiting_in_queue_millis":0,"active_shards_percent_as_number":50.0}
+```
### Configure HTTP Basic authentication in the Magento Admin
@@ -58,4 +68,4 @@ Perform the same tasks as discussed in [Configure Magento to use Elasticsearch](
Click **Test Connection** to make sure it works and then click **Save Config**.
-You must flush the Magento cache and reindex before you continue.
\ No newline at end of file
+You must flush the Magento cache and reindex before you continue.
diff --git a/_includes/config/es-webserver-overview.md b/_includes/config/es-webserver-overview.md
index 04859d94325..9be99a43a18 100644
--- a/_includes/config/es-webserver-overview.md
+++ b/_includes/config/es-webserver-overview.md
@@ -1,14 +1,11 @@
-
401 Authorization Required
401 Authorization Required
-
## Overview of secure web server communication {#es-ws-secure-over}
-This topic discusses an example of securing communication between your web server and Elasticsearch using a combination of Transport Layer Security (TLS) encryption and HTTP Basic authentication. You can optionally configure other types of authentication as well; we provide references for that information.
+This topic discusses an example of securing communication between your web server and Elasticsearch using a combination of Transport Layer Security (TLS) encryption and [HTTP basic authentication](http://tools.ietf.org/html/rfc2617). You can optionally configure other types of authentication as well; we provide references for that information.
(An older term, Secure Sockets Layer (SSL), is frequently used interchangeably with TLS. In this topic, we refer to *TLS*.)
-
-
+{:.bs-callout .bs-callout-warning}
+Unless otherwise noted, all commands in this topic must be entered as a user with `root` privileges.
### Recommendations
@@ -27,13 +24,13 @@ See one of the following resources:
* Apache
- * Apache 2.4 strong encryption how-to
- * Apache 2.2 SSL/TLS page
- * How To Create a SSL Certificate on Apache for Ubuntu 14.04 (Digitalocean tutorial)
- * Setting up an SSL secured Webserver with CentOS (CentOS wiki)
+ * [Apache 2.4 strong encryption how-to](https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html)
+ * [Apache 2.2 SSL/TLS page](https://httpd.apache.org/docs/2.2/en/ssl/)
+ * [How To Create a SSL Certificate on Apache for Ubuntu 14.04 (Digitalocean tutorial)](https://www.digitalocean.com/community/tutorials/how-to-create-a-ssl-certificate-on-apache-for-ubuntu-14-04)
+ * [Setting up an SSL secured Webserver with CentOS (CentOS wiki)](https://wiki.centos.org/HowTos/Https)
-* nginx
+* Nginx
- * nginx SSL termination
- * How To Create an SSL Certificate on Nginx for Ubuntu 14.04 (Digitalocean tutorial)
- * Nginx SSL Certificate Installation (digicert)
\ No newline at end of file
+ * [Nginx SSL termination](https://www.nginx.com/resources/admin-guide/nginx-ssl-termination/)
+ * [How To Create an SSL Certificate on Nginx for Ubuntu 14.04 (Digitalocean tutorial)](https://www.digitalocean.com/community/tutorials/how-to-create-an-ssl-certificate-on-nginx-for-ubuntu-14-04)
+ * [Nginx SSL Certificate Installation (digicert)](https://www.digicert.com/ssl-certificate-installation-nginx.htm)
diff --git a/_includes/config/install-java.md b/_includes/config/install-java.md
index 828b9013687..0759a553015 100644
--- a/_includes/config/install-java.md
+++ b/_includes/config/install-java.md
@@ -1,31 +1,28 @@
-Unless otherwise noted, all commands in this topic must be entered as a user with root privileges.
-
-### Install the Java Software Development Kit (JDK) {#prereq-java}
+### Install the Java Software Development Kit (JDK) {#prereq-java}
To determine if Java is already installed, enter the following command:
java -version
-If the message `java: command not found` displays, you must install the Java SDK as discussed in the next section.
+If the message `java: command not found` displays, you must install the Java SDK as discussed in the next section.
See one of the following sections:
-* Install the latest JDK on CentOS
-* Install the latest JDK on Ubuntu
+* [Install the latest JDK on CentOS](#install-prereq-java-centos)
+* [Install the latest JDK on Ubuntu](#install-prereq-java-ubuntu)
-#### Install the JDK on CentOS {#install-prereq-java-centos}
+#### Install the JDK on CentOS {#install-prereq-java-centos}
-See this article on digitalocean.
+See [this article on digitalocean](https://www.digitalocean.com/community/tutorials/how-to-install-java-on-centos-and-fedora#install-oracle-java-8).
Be sure to install the JDK and *not* the JRE.
yum -y install java-1.7.0-openjdk
-
-
+{:.bs-callout .bs-callout-info}
+Java version 7 might not be available for all operating systems. For example, you can [search the list of available packages for Ubuntu](http://packages.ubuntu.com/).
-#### Install the JDK on Ubuntu {#install-prereq-java-ubuntu}
+#### Install the JDK on Ubuntu {#install-prereq-java-ubuntu}
To install JDK 1.8 on Ubuntu, enter the following commands as a user with `root` privileges:
@@ -33,4 +30,4 @@ To install JDK 1.8 on Ubuntu, enter the following commands as a user with `root`
apt-get -y update
apt-get install -y oracle-java8-installer
-For other options, see Oracle documentation.
\ No newline at end of file
+For other options, see [Oracle documentation](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html).
diff --git a/_includes/config/install-java8.md b/_includes/config/install-java8.md
index 0a36ffdafc2..be258663c7f 100644
--- a/_includes/config/install-java8.md
+++ b/_includes/config/install-java8.md
@@ -1,5 +1,3 @@
-Java version 7 might not be available for all operating systems. For example, you can search the list of available packages for Ubuntu.
-
-
### Install the Java Software Development Kit (JDK) {#prereq-java}
To determine if Java is already installed, enter the following command:
@@ -10,20 +8,19 @@ If the message `java: command not found` displays, you must install the Java SDK
See one of the following sections:
-* Install the latest JDK on CentOS
-* Install the latest JDK on Ubuntu
+* [Install the latest JDK on CentOS](#install-prereq-java-centos)
+* [Install the latest JDK on Ubuntu](#install-prereq-java-ubuntu)
#### Install the JDK on CentOS {#install-prereq-java-centos}
-See this article on digitalocean.
+See [this article on digitalocean](https://www.digitalocean.com/community/tutorials/how-to-install-java-on-centos-and-fedora#install-oracle-java-8).
Be sure to install the JDK and *not* the JRE.
yum -y install java-1.8.0-openjdk
-
-
+{:.bs-callout .bs-callout-info}
+Java version 8 might not be available for all operating systems. For example, you can [search the list of available packages for Ubuntu](http://packages.ubuntu.com/).
#### Install the JDK on Ubuntu {#install-prereq-java-ubuntu}
@@ -33,4 +30,4 @@ To install JDK 1.8 on Ubuntu, enter the following commands as a user with `root`
apt-get -y update
apt-get install -y oracle-java8-installer
-For other options, see Oracle documentation.
+For other options, see [Oracle documentation](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html).
diff --git a/_includes/config/locate-session.md b/_includes/config/locate-session.md
index 0b08c21f909..64d25fa8f0e 100644
--- a/_includes/config/locate-session.md
+++ b/_includes/config/locate-session.md
@@ -1,5 +1,3 @@
-Java version 8 might not be available for all operating systems. For example, you can search the list of available packages for Ubuntu.
-
-
## Locate your session storage {#session-where}
This topic discusses how to locate where your session files are stored. The Magento application uses the following logic to store session files:
@@ -25,4 +23,3 @@ The preceding example stores session files in `/var/www/session`
### `php.ini` example {#session-where-phpini}
As a user with `root` privileges, open your `php.ini` file and search for the value of `session.save_path`. This identifies where sessions are stored.
-
diff --git a/_includes/config/multi-site_verify.md b/_includes/config/multi-site_verify.md
index 0aa1d748b5b..d244854e07f 100644
--- a/_includes/config/multi-site_verify.md
+++ b/_includes/config/multi-site_verify.md
@@ -1,8 +1,6 @@
-
-
Unless you have DNS set up for your stores' URLs, you must add a static route to the host in your `hosts` file:
-1. Locate your operating system's [`hosts` file](https://en.wikipedia.org/wiki/Hosts_(file)#Location_in_the_file_system){:target="_blank"}.
+1. Locate your operating system's [`hosts` file](https://en.wikipedia.org/wiki/Hosts_(file)#Location_in_the_file_system).
2. Add the static route in the format:
french.mysite.mg
@@ -15,10 +13,9 @@ Unless you have DNS set up for your stores' URLs, you must add a static route to
You're done!
-
-
+{:.bs-callout .bs-callout-info}
+* Additional tasks might be required to deploy multiple websites in a hosted environment; check with your hosting provider for more information.
+* Additional tasks are required to set up {{site.data.var.ece}}; for more information, see [Set up multiple Cloud websites or stores]({{ page.baseurl }}/cloud/project/project-multi-sites.html)
### Troubleshooting
diff --git a/_includes/config/php-memcache.md b/_includes/config/php-memcache.md
index 6928ef9d725..26d28dc131d 100644
--- a/_includes/config/php-memcache.md
+++ b/_includes/config/php-memcache.md
@@ -1,22 +1,18 @@
-- Additional tasks might be required to deploy multiple websites in a hosted environment; check with your hosting provider for more information. -
- Additional tasks are required to set up {{site.data.var.ece}}; for more information, see Set up multiple Cloud websites or stores
-
## PHP memcache and memcached extensions {#config-memcache-memcached}
Because PHP has no native support for memcache, you must install an extension for PHP to use it. There are two PHP extensions available and it's important to decode which to use:
-* `memcache` (no *d*), an older but very popular extension that is not maintained regularly. The `memcache` extension currently *does not* with PHP 7.
+* `memcache` (no *d*), an older but very popular extension that is not maintained regularly. The `memcache` extension currently *does not* work with PHP 7.
- PHP documentation for memcache
+ [PHP documentation for memcache](http://php.net/manual/en/book.memcache.php)
The exact name is `php5-memcache` for Ubuntu and `php-pecl-memcache` for CentOS
* `memcached` (with a `d`), a newer and maintained extension that should be compatible with PHP 7.
- PHP documentation for memcached
+ [PHP documentation for memcached](http://php.net/memcached)
The exact name is `php5-memcached` for Ubuntu and `php-pecl-memcached` for CentOS
-
-
-
\ No newline at end of file
+{:.bs-callout .bs-callout-info}
+For simplicity, we use the PHP `memcache` extension in this guide although we provide examples for both when configuring Magento to use memcache.
diff --git a/_includes/config/redis-verify.md b/_includes/config/redis-verify.md
index fd99557fa1e..b9f7df55d10 100644
--- a/_includes/config/redis-verify.md
+++ b/_includes/config/redis-verify.md
@@ -1,5 +1,3 @@
-For simplicity, we use the PHP memcache extension in this guide although we provide examples for both when configuring Magento to use memcache.
-
To verify that Redis and Magento are working together, use the following commands:
### Redis monitor command
@@ -14,38 +12,41 @@ Refresh your storefront page and you'll see output similar to the following.
If you use Redis for session storage, you'll see output similar to the following:
- 1476824834.187250 [0 127.0.0.1:52353] "select" "0"
- 1476824834.187587 [0 127.0.0.1:52353] "hmget" "sess_sgmeh2k3t7obl2tsot3h2ss0p1" "data" "writes"
- 1476824834.187939 [0 127.0.0.1:52353] "expire" "sess_sgmeh2k3t7obl2tsot3h2ss0p1" "1200"
- 1476824834.257226 [0 127.0.0.1:52353] "select" "0"
- 1476824834.257239 [0 127.0.0.1:52353] "hmset" "sess_sgmeh2k3t7obl2tsot3h2ss0p1" "data" "_session_validator_data|a:4:{s:11:\"remote_addr\";s:12:\"10.235.34.14\";s:8:\"http_via\";s:0:\"\";s:20:\"http_x_forwarded_for\";s:0:\"\";s:15:\"http_user_agent\";s:115:\"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36\";}_session_hosts|a:1:{s:12:\"10.235.32.10\";b:1;}admin|a:0:{}default|a:2:{s:9:\"_form_key\";s:16:\"e331ugBN7vRjGMgk\";s:12:\"visitor_data\";a:3:{s:13:\"last_visit_at\";s:19:\"2016-10-18 21:06:37\";s:10:\"session_id\";s:26:\"sgmeh2k3t7obl2tsot3h2ss0p1\";s:10:\"visitor_id\";s:1:\"9\";}}adminhtml|a:0:{}customer_base|a:1:{s:20:\"customer_segment_ids\";a:1:{i:1;a:0:{}}}checkout|a:0:{}" "lock" "0"
-
- ... more ...
+```terminal
+1476824834.187250 [0 127.0.0.1:52353] "select" "0"
+1476824834.187587 [0 127.0.0.1:52353] "hmget" "sess_sgmeh2k3t7obl2tsot3h2ss0p1" "data" "writes"
+1476824834.187939 [0 127.0.0.1:52353] "expire" "sess_sgmeh2k3t7obl2tsot3h2ss0p1" "1200"
+1476824834.257226 [0 127.0.0.1:52353] "select" "0"
+1476824834.257239 [0 127.0.0.1:52353] "hmset" "sess_sgmeh2k3t7obl2tsot3h2ss0p1" "data" "_session_validator_data|a:4:{s:11:\"remote_addr\";s:12:\"10.235.34.14\";s:8:\"http_via\";s:0:\"\";s:20:\"http_x_forwarded_for\";s:0:\"\";s:15:\"http_user_agent\";s:115:\"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36\";}_session_hosts|a:1:{s:12:\"10.235.32.10\";b:1;}admin|a:0:{}default|a:2:{s:9:\"_form_key\";s:16:\"e331ugBN7vRjGMgk\";s:12:\"visitor_data\";a:3:{s:13:\"last_visit_at\";s:19:\"2016-10-18 21:06:37\";s:10:\"session_id\";s:26:\"sgmeh2k3t7obl2tsot3h2ss0p1\";s:10:\"visitor_id\";s:1:\"9\";}}adminhtml|a:0:{}customer_base|a:1:{s:20:\"customer_segment_ids\";a:1:{i:1;a:0:{}}}checkout|a:0:{}" "lock" "0"
+... more ...
+```
#### Page caching
If you use Redis for page caching, you'll see output similar to the following:
- 1476826133.810090 [0 127.0.0.1:52366] "select" "1"
- 1476826133.816293 [0 127.0.0.1:52367] "select" "0"
- 1476826133.817461 [0 127.0.0.1:52367] "hget" "zc:k:ea6_GLOBAL__DICONFIG" "d"
- 1476826133.829666 [0 127.0.0.1:52367] "hget" "zc:k:ea6_DICONFIG049005964B465901F774DB9751971818" "d"
- 1476826133.837854 [0 127.0.0.1:52367] "hget" "zc:k:ea6_INTERCEPTION" "d"
- 1476826133.868374 [0 127.0.0.1:52368] "select" "1"
- 1476826133.869011 [0 127.0.0.1:52369] "select" "0"
- 1476826133.869601 [0 127.0.0.1:52369] "hget" "zc:k:ea6_DEFAULT_CONFIG_CACHE_DEFAULT__10__235__32__1080MAGENTO2" "d"
- 1476826133.872317 [0 127.0.0.1:52369] "hget" "zc:k:ea6_INITIAL_CONFIG" "d"
- 1476826133.879267 [0 127.0.0.1:52369] "hget" "zc:k:ea6_GLOBAL_PRIMARY_PLUGIN_LIST" "d"
- 1476826133.883312 [0 127.0.0.1:52369] "hget" "zc:k:ea6_GLOBAL__EVENT_CONFIG_CACHE" "d"
- 1476826133.898431 [0 127.0.0.1:52369] "hget" "zc:k:ea6_DB_PDO_MYSQL_DDL_STAGING_UPDATE_1" "d"
- 1476826133.898794 [0 127.0.0.1:52369] "hget" "zc:k:ea6_RESOLVED_STORES_D1BEFA03C79CA0B84ECC488DEA96BC68" "d"
- 1476826133.905738 [0 127.0.0.1:52369] "hget" "zc:k:ea6_DEFAULT_CONFIG_CACHE_STORE_DEFAULT_10__235__32__1080MAGENTO2" "d"
-
- ... more ...
-
- 1476826210.634998 [0 127.0.0.1:52439] "hmset" "zc:k:ea6_MVIEW_CONFIG" "d" "a:18:{s:19:\"design_config_dummy\";a:4:{s:7:\"view_id\";s:19:\"design_config_dummy\";s:12:\"action_class\";s:39:\"Magento\\Theme\\Model\\Indexer\\Mview\\Dummy\";s:5:\"group\";s:7:\"indexer\";s:13:\"subscriptions\";a:0:{}}s:14:\"customer_dummy\";a:4:{s:7:\"view_id\";s:14:\"customer_dummy\";s:12:\"action_class\";s:42:\"Magento\\Customer\\Model\\Indexer\\Mview\\Dummy\";s:5:\"group\";s:7:\"indexer\";s:13:\"subscriptions\";a:0:{}}s:13:\"cms_page_grid\";a:4:{s:7:\"view_id\";s:13:\"cms_page_grid\";s:12:\"action_class\";s:43:\"Magento\\Catalog\\Model\\Indexer\\Category\\Flat\";s:5:\"group\";s:7:\"indexer\";s:13:\"subscriptions\";a:1:{s:8:\"cms_page\";a:3:{s:4:\"name\";s:8:\"cms_page\";s:6:\"column\";s:7:\"page_id\";s:18:\"subscription_model\";N;}}}s:21:\"catalog_category_flat\";a:4:{s:7:\"view_id\";s:21:\"catalog_category_flat\";s:12:\"action_class\";s:43:\"Magento\\Catalog\\Model\\Indexer\\Category\\Flat\";s:5:\"group\";s:7:\"indexer\";s:13:\"subscriptions\";a:6:{s:23:\"catalog_category_entity\";a:3:{s:4:\"name\";s:23:\"catalog_category_entity\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";N;}s:31:\"catalog_category_entity_decimal\";a:3:{s:4:\"name\";s:31:\"catalog_category_entity_decimal\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";s:71:\"Magento\\CatalogStaging\\Model\\Mview\\View\\Category\\Attribute\\Subscription\";}s:27:\"catalog_category_entity_int\";a:3:{s:4:\"name\";s:27:\"catalog_category_entity_int\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";s:71:\"Magento\\CatalogStaging\\Model\\Mview\\View\\Category\\Attribute\\Subscription\";}s:28:\"catalog_category_entity_text\";a:3:{s:4:\"name\";s:28:\"catalog_category_entity_text\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";s:71:\"Magento\\CatalogStaging\\Model\\Mview\\View\\Category\\Attribute\\Subscription\";}s:31:\"catalog_category_entity_varchar\";a:3:{s:4:\"name\";s:31:\"catalog_category_entity_varchar\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";s:71:\"Magento\\CatalogStaging\\Model\\Mview\\View\\Category\\Attribute\\Subscription\";}s:32:\"catalog_category_entity_datetime\";a:3:{s:4:\"name\";s:32:\"catalog_category_entity_datetime\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";s:71:\"Magento\\CatalogStaging\\Model\\Mview\\View\\Category\\Attribute\\Subscription\";}}}s:24:\"catalog_category_product\";a:4:{s:7:\"view_id\";s:24:\"catalog_category_product\";s:12:\"action_class\";s:46:\"Magento\\Catalog\\Model\\Indexer\\Category\\Product\";s:5:\"group\";s:7:\"indexer\";s:13:\"subscriptions\";a:2:{s:23:\"catalog_category_entity\";a:3:{s:4:\"name\";s:23:\"catalog_category_entity\";s:6:\"column\"
-
- ... more ...
+```terminal
+1476826133.810090 [0 127.0.0.1:52366] "select" "1"
+1476826133.816293 [0 127.0.0.1:52367] "select" "0"
+1476826133.817461 [0 127.0.0.1:52367] "hget" "zc:k:ea6_GLOBAL__DICONFIG" "d"
+1476826133.829666 [0 127.0.0.1:52367] "hget" "zc:k:ea6_DICONFIG049005964B465901F774DB9751971818" "d"
+1476826133.837854 [0 127.0.0.1:52367] "hget" "zc:k:ea6_INTERCEPTION" "d"
+1476826133.868374 [0 127.0.0.1:52368] "select" "1"
+1476826133.869011 [0 127.0.0.1:52369] "select" "0"
+1476826133.869601 [0 127.0.0.1:52369] "hget" "zc:k:ea6_DEFAULT_CONFIG_CACHE_DEFAULT__10__235__32__1080MAGENTO2" "d"
+1476826133.872317 [0 127.0.0.1:52369] "hget" "zc:k:ea6_INITIAL_CONFIG" "d"
+1476826133.879267 [0 127.0.0.1:52369] "hget" "zc:k:ea6_GLOBAL_PRIMARY_PLUGIN_LIST" "d"
+1476826133.883312 [0 127.0.0.1:52369] "hget" "zc:k:ea6_GLOBAL__EVENT_CONFIG_CACHE" "d"
+1476826133.898431 [0 127.0.0.1:52369] "hget" "zc:k:ea6_DB_PDO_MYSQL_DDL_STAGING_UPDATE_1" "d"
+1476826133.898794 [0 127.0.0.1:52369] "hget" "zc:k:ea6_RESOLVED_STORES_D1BEFA03C79CA0B84ECC488DEA96BC68" "d"
+1476826133.905738 [0 127.0.0.1:52369] "hget" "zc:k:ea6_DEFAULT_CONFIG_CACHE_STORE_DEFAULT_10__235__32__1080MAGENTO2" "d"
+
+... more ...
+
+1476826210.634998 [0 127.0.0.1:52439] "hmset" "zc:k:ea6_MVIEW_CONFIG" "d" "a:18:{s:19:\"design_config_dummy\";a:4:{s:7:\"view_id\";s:19:\"design_config_dummy\";s:12:\"action_class\";s:39:\"Magento\\Theme\\Model\\Indexer\\Mview\\Dummy\";s:5:\"group\";s:7:\"indexer\";s:13:\"subscriptions\";a:0:{}}s:14:\"customer_dummy\";a:4:{s:7:\"view_id\";s:14:\"customer_dummy\";s:12:\"action_class\";s:42:\"Magento\\Customer\\Model\\Indexer\\Mview\\Dummy\";s:5:\"group\";s:7:\"indexer\";s:13:\"subscriptions\";a:0:{}}s:13:\"cms_page_grid\";a:4:{s:7:\"view_id\";s:13:\"cms_page_grid\";s:12:\"action_class\";s:43:\"Magento\\Catalog\\Model\\Indexer\\Category\\Flat\";s:5:\"group\";s:7:\"indexer\";s:13:\"subscriptions\";a:1:{s:8:\"cms_page\";a:3:{s:4:\"name\";s:8:\"cms_page\";s:6:\"column\";s:7:\"page_id\";s:18:\"subscription_model\";N;}}}s:21:\"catalog_category_flat\";a:4:{s:7:\"view_id\";s:21:\"catalog_category_flat\";s:12:\"action_class\";s:43:\"Magento\\Catalog\\Model\\Indexer\\Category\\Flat\";s:5:\"group\";s:7:\"indexer\";s:13:\"subscriptions\";a:6:{s:23:\"catalog_category_entity\";a:3:{s:4:\"name\";s:23:\"catalog_category_entity\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";N;}s:31:\"catalog_category_entity_decimal\";a:3:{s:4:\"name\";s:31:\"catalog_category_entity_decimal\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";s:71:\"Magento\\CatalogStaging\\Model\\Mview\\View\\Category\\Attribute\\Subscription\";}s:27:\"catalog_category_entity_int\";a:3:{s:4:\"name\";s:27:\"catalog_category_entity_int\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";s:71:\"Magento\\CatalogStaging\\Model\\Mview\\View\\Category\\Attribute\\Subscription\";}s:28:\"catalog_category_entity_text\";a:3:{s:4:\"name\";s:28:\"catalog_category_entity_text\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";s:71:\"Magento\\CatalogStaging\\Model\\Mview\\View\\Category\\Attribute\\Subscription\";}s:31:\"catalog_category_entity_varchar\";a:3:{s:4:\"name\";s:31:\"catalog_category_entity_varchar\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";s:71:\"Magento\\CatalogStaging\\Model\\Mview\\View\\Category\\Attribute\\Subscription\";}s:32:\"catalog_category_entity_datetime\";a:3:{s:4:\"name\";s:32:\"catalog_category_entity_datetime\";s:6:\"column\";s:9:\"entity_id\";s:18:\"subscription_model\";s:71:\"Magento\\CatalogStaging\\Model\\Mview\\View\\Category\\Attribute\\Subscription\";}}}s:24:\"catalog_category_product\";a:4:{s:7:\"view_id\";s:24:\"catalog_category_product\";s:12:\"action_class\";s:46:\"Magento\\Catalog\\Model\\Indexer\\Category\\Product\";s:5:\"group\";s:7:\"indexer\";s:13:\"subscriptions\";a:2:{s:23:\"catalog_category_entity\";a:3:{s:4:\"name\";s:23:\"catalog_category_entity\";s:6:\"column\"
+
+... more ...
+```
### Redis ping command
@@ -53,9 +54,9 @@ Enter the following command:
redis-cli ping
-`PONG` should be the response.
+`PONG` should be the response.
If both commands succeeded, Redis is set up properly.
#### More information
-[`redis-cli` command reference](http://redis.io/topics/rediscli){:target="_blank"}
\ No newline at end of file
+[`redis-cli` command reference](http://redis.io/topics/rediscli)
diff --git a/_includes/config/secure-ws-apache_step1.md b/_includes/config/secure-ws-apache_step1.md
index d10b96992f3..a4dba16bda9 100644
--- a/_includes/config/secure-ws-apache_step1.md
+++ b/_includes/config/secure-ws-apache_step1.md
@@ -1,5 +1,3 @@
-
-
For security reasons, you can locate the password file anywhere except your web server docroot. In this example, we show how to store the password file in a new directory.
#### Install htpasswd if necessary
@@ -23,11 +21,11 @@ Enter the following commands as a user with `root` privileges:
mkdir -p /usr/local/apache/password
htpasswd -c /usr/local/apache/password/.
-where
+where
* `` can be:
- * Setting up cron: the web server user or another user.
+ * Setting up cron: the web server user or another user.
In this example, we use the web server user but the choice of user is up to you.
* Setting up Elasticsearch: the user is named `magento_elasticsearch` in this example
@@ -54,4 +52,4 @@ You must set up authentication for two users: one with access to nginx and one w
To add another user to your password file, enter the following command as a user with `root` privileges:
- htpasswd /usr/local/apache/password/.htpasswd
\ No newline at end of file
+ htpasswd /usr/local/apache/password/.htpasswd
diff --git a/_includes/config/secure-ws-apache_step2.md b/_includes/config/secure-ws-apache_step2.md
index 5c83e0fae94..e04a205c5d5 100644
--- a/_includes/config/secure-ws-apache_step2.md
+++ b/_includes/config/secure-ws-apache_step2.md
@@ -1,5 +1,3 @@
-
-
You can optionally enable more than one user to securely communicate by adding these users to your password file and to a group file you'll configure in the next section.
To add another user to your password file, enter the following command as a user with `root` privileges:
@@ -12,4 +10,4 @@ To create an authorized group, create a group file anywhere outside the web serv
Contents of the file:
- MagentoGroup: ...
\ No newline at end of file
+ MagentoGroup: ...
diff --git a/_includes/config/setup-cron.md b/_includes/config/setup-cron.md
index 7122848e815..83d2cd058df 100644
--- a/_includes/config/setup-cron.md
+++ b/_includes/config/setup-cron.md
@@ -1,23 +1,17 @@
-
-
### Prerequisites
Magento uses cron for two sets of tasks, and for each, cron can run with a different configuration:
* PHP command-line configuration: The general cron job that reindexes indexers, generates e-mails, generates the sitemap, and so on.
- You can find the command-line configuration using the command `php --ini`.
-* Web server PHP plug-in configuration: Two other cron jobs are used by the Component Manager and System Upgrade utilities.
-
- You can find the web server plug-in configuration using /bin/magento cron:run | grep -v "Ran jobs by schedule" >> /var/log/magento.cron.log
+* * * * * /update/cron.php >> /var/log/update.cron.log
+* * * * * /bin/magento setup:cron:run >> /var/log/setup.cron.log
+```
-where
+where
* `` is the absolute file system path to your PHP binary
* `` is the directory in which you installed the Magento software; for example, `/var/www`
@@ -53,9 +49,8 @@ where
The first command (`magento cron:run`) reindexes indexers, sends automated e-mails, generates the sitemap, and so on. Usually it's associated with the PHP command line `.ini` file. The other two commands are used by the Component Manager and System Upgrade.
-
phpinfo.php.
+ You can find the command-line configuration using the command `php --ini`.
+* Web server PHP plug-in configuration: Two other cron jobs are used by the [Component Manager and System Upgrade utilities]({{ page.baseurl }}/comp-mgr/bk-compman-upgrade-guide.html).
-
-* To avoid issues during installation and upgrade, we strongly recommend you apply the same PHP settings to both the PHP command-line configuration and to the PHP web server plug-in's configuration.
- For more information, see [Required PHP settings]({{ page.baseurl }}/install-gde/prereq/php-settings.html).
-* In a multi-node system, crontab can run on only one node.
+ You can find the web server plug-in configuration using [`phpinfo.php`]({{ page.baseurl }}/install-gde/prereq/optional.html#install-optional-phpinfo).
- This applies to you only if you set up more than one webnode for reasons related to performance or scalability.
-
+{:.bs-callout .bs-callout-warning}
+* To avoid issues during installation and upgrade, we strongly recommend you apply the same PHP settings to both the PHP command-line configuration and to the PHP web server plug-in's configuration. For more information, see [Required PHP settings]({{ page.baseurl }}/install-gde/prereq/php-settings.html).
+* In a multi-node system, crontab can run on only one node. This applies to you only if you set up more than one webnode for reasons related to performance or scalability.
#### Find the PHP binary and php.ini path
@@ -41,11 +35,13 @@ For example,
A text editor displays. (You might need to choose a text editor first.)
-* * * * * <path to php binary> <magento install dir>/bin/magento cron:run | grep -v "Ran jobs by schedule" >> <magento install dir>/var/log/magento.cron.log -* * * * * <path to php binary> <magento install dir>/update/cron.php >> <magento install dir>/var/log/update.cron.log -* * * * * <path to php binary> <magento install dir>/bin/magento setup:cron:run >> <magento install dir>/var/log/setup.cron.log+```terminal +* * * * *
-
+{:.bs-callout .bs-callout-info}
+If you're a contributing developer (that is, you [cloned the Magento 2 GitHub repository]({{ page.baseurl }}/install-gde/prereq/dev_install.html)), only the first line applies to you. See the examples that follow for details.
**Example 1:** Everyone except contributing developers
@@ -63,14 +58,18 @@ For example, if the PHP binary is located in `/usr/bin`, you installed Magento i
Example:
- * * * * * /usr/bin/php /var/www/magento2/bin/magento cron:run | grep -v "Ran jobs by schedule" >> /var/www/magento2/var/log/magento.cron.log
- * * * * * /usr/bin/php /var/www/magento2/update/cron.php >> /var/www/magento2/var/log/update.cron.log
- * * * * * /usr/bin/php /var/www/magento2/bin/magento setup:cron:run >> /var/www/magento2/var/log/setup.cron.log
+```terminal
+* * * * * /usr/bin/php /var/www/magento2/bin/magento cron:run | grep -v "Ran jobs by schedule" >> /var/www/magento2/var/log/magento.cron.log
+* * * * * /usr/bin/php /var/www/magento2/update/cron.php >> /var/www/magento2/var/log/update.cron.log
+* * * * * /usr/bin/php /var/www/magento2/bin/magento setup:cron:run >> /var/www/magento2/var/log/setup.cron.log
+```
**Example 2:** Contributing developers only (that is, you cloned the Magento 2 GitHub repository):
- * * * * * /usr/bin/php /var/www/magento2/bin/magento cron:run | grep -v "Ran jobs by schedule" >> /var/www/magento2/var/log/magento.cron.log
+```terminal
+* * * * * /usr/bin/php /var/www/magento2/bin/magento cron:run | grep -v "Ran jobs by schedule" >> /var/www/magento2/var/log/magento.cron.log
+```
-The preceding works for contributing developers because if you cloned the GitHub repository you don't have an `update` directory and errors result if you run `magento setup:cron:run`. These cron jobs work in the Web Setup Wizard, which contributing developers cannot use for installing or updating the Magento application or components.
+The preceding works for contributing developers because if you cloned the GitHub repository you don't have an `update` directory and errors result if you run `magento setup:cron:run`. These cron jobs work in the Web Setup Wizard, which contributing developers cannot use for installing or updating the Magento application or components.
Save your changes to the crontab and exit the editor.
diff --git a/_includes/config/setup-cron_2.2.md b/_includes/config/setup-cron_2.2.md
index 2ec649c66b2..c61541caed0 100644
--- a/_includes/config/setup-cron_2.2.md
+++ b/_includes/config/setup-cron_2.2.md
@@ -1,5 +1,3 @@
-If you're a contributing developer (that is, you cloned the Magento 2 GitHub repository), only the first line applies to you. See the examples that follow for details.
-
-
### About the Magento crontab
The Magento _crontab_ is the configuration used to run Magento cron jobs.
@@ -10,13 +8,9 @@ Magento uses cron for two sets of tasks, and for each, cron can run with a diffe
* Web server PHP plug-in configuration: Two other cron jobs are used by the [Component Manager and System Upgrade utilities]({{ page.baseurl }}/comp-mgr/bk-compman-upgrade-guide.html).
-
-* To avoid issues during installation and upgrade, we strongly recommend you apply the same PHP settings to both the PHP command-line configuration and to the PHP web server plug-in's configuration.
- For more information, see [Required PHP settings]({{ page.baseurl }}/install-gde/prereq/php-settings.html).
-* In a multi-node system, crontab can run on only one node.
-
- This applies to you only if you set up more than one webnode for reasons related to performance or scalability.
-
+{:.bs-callout .bs-callout-warning}
+* To avoid issues during installation and upgrade, we strongly recommend you apply the same PHP settings to both the PHP command-line configuration and to the PHP web server plug-in's configuration. For more information, see [Required PHP settings]({{ page.baseurl }}/install-gde/prereq/php-settings.html).
+* In a multi-node system, crontab can run on only one node. This applies to you only if you set up more than one webnode for reasons related to performance or scalability.
#### Create the Magento crontab
diff --git a/_includes/config/setup-cron_2.2_about.md b/_includes/config/setup-cron_2.2_about.md
index 76a0925b039..9d13e884e1a 100644
--- a/_includes/config/setup-cron_2.2_about.md
+++ b/_includes/config/setup-cron_2.2_about.md
@@ -8,10 +8,6 @@ Magento uses cron for two sets of tasks, and for each, cron can run with a diffe
* Web server PHP plug-in configuration: Two other cron jobs are used by the [Component Manager and System Upgrade utilities]({{ page.baseurl }}/comp-mgr/bk-compman-upgrade-guide.html).
-
-* To avoid issues during installation and upgrade, we strongly recommend you apply the same PHP settings to both the PHP command-line configuration and to the PHP web server plug-in's configuration.
- For more information, see [Required PHP settings]({{ page.baseurl }}/install-gde/prereq/php-settings.html).
-* In a multi-node system, crontab can run on only one node.
-
- This applies to you only if you set up more than one webnode for reasons related to performance or scalability.
-
\ No newline at end of file
+{:.bs-callout .bs-callout-warning}
+* To avoid issues during installation and upgrade, we strongly recommend you apply the same PHP settings to both the PHP command-line configuration and to the PHP web server plug-in's configuration. For more information, see [Required PHP settings]({{ page.baseurl }}/install-gde/prereq/php-settings.html).
+* In a multi-node system, crontab can run on only one node. This applies to you only if you set up more than one webnode for reasons related to performance or scalability.
diff --git a/_includes/config/setup-cron_2.2_how-to.md b/_includes/config/setup-cron_2.2_how-to.md
index 23db5b1b99f..86b24378860 100644
--- a/_includes/config/setup-cron_2.2_how-to.md
+++ b/_includes/config/setup-cron_2.2_how-to.md
@@ -1,5 +1,3 @@
-
-
### Create the Magento crontab
Starting with version 2.2, Magento creates a crontab for you. We add the Magento crontab to any configured crontab for the Magento file system owner. In other words, if you already set up crontabs for other extensions or applications, we add the Magento crontab to it.
@@ -14,12 +12,11 @@ To create the Magento crontab:
php bin/magento cron:install [--force]
-Use `--force` to rewrite an existing Magento crontab.
+Use `--force` to rewrite an existing Magento crontab.
-
+{:.bs-callout .bs-callout-info}
* `magento cron:install` does not rewrite an existing crontab inside `#~ MAGENTO START` and `#~ MAGENTO END` comments in your crontab.
* `magento cron:install --force` has no effect on any cron jobs outside the Magento comments.
-
To view the crontab, enter the following command as the Magento file system owner:
@@ -28,7 +25,7 @@ To view the crontab, enter the following command as the Magento file system owne
A sample follows:
#~ MAGENTO START
- * * * * * /usr/bin/php /var/www/html/magento2/bin/magento cron:run 2>&1 | grep -v Ran jobs by schedule >> /var/www/html/magento2/var/log/magento.cron.log
+ * * * * * /usr/bin/php /var/www/html/magento2/bin/magento cron:run | grep -v Ran jobs by schedule >> /var/www/html/magento2/var/log/magento.cron.log
* * * * * /usr/bin/php /var/www/html/magento2/update/cron.php >> /var/www/html/magento2/var/log/update.cron.log
* * * * * /usr/bin/php /var/www/html/magento2/bin/magento setup:cron:run >> /var/www/html/magento2/var/log/setup.cron.log
#~ MAGENTO END
diff --git a/_includes/config/solr-elastic-selinux.md b/_includes/config/solr-elastic-selinux.md
index 07c477701b0..dc68fd0fe58 100644
--- a/_includes/config/solr-elastic-selinux.md
+++ b/_includes/config/solr-elastic-selinux.md
@@ -1,5 +1,3 @@
-
-
### Firewall and SELinux {#firewall-selinux}
Please take into account that security-related software (iptables, SELinux, AppArmor etc.) may be configured by default to block communication between subsystems. It may be a good idea to check them in case of problems.
@@ -8,8 +6,8 @@ Please take into account that security-related software (iptables, SELinux, AppA
To set up rules to allow communication with the firewall or SELinux enabled, consult the following resources:
-* iptables how-to
-* How to edit iptables rules (fedora project)
-* 25 Most Frequently Used Linux IPTables Rules Examples
-* Introduction to SELinux (CentOS.org)
-* SELinux How-To Wiki (CentOS.org)
+* [iptables how-to](https://help.ubuntu.com/community/IptablesHowTo)
+* [How to edit iptables rules (fedora project)](https://fedoraproject.org/wiki/How_to_edit_iptables_rules)
+* [25 Most Frequently Used Linux IPTables Rules Examples](http://www.thegeekstuff.com/2011/06/iptables-rules-examples/)
+* [Introduction to SELinux (CentOS.org)](https://www.centos.org/docs/5/html/Deployment_Guide-en-US/ch-selinux.html)
+* [SELinux How-To Wiki (CentOS.org)](https://wiki.centos.org/HowTos/SELinux)
diff --git a/_includes/config/split-db.md b/_includes/config/split-db.md
index 1008c038edf..f1284798506 100644
--- a/_includes/config/split-db.md
+++ b/_includes/config/split-db.md
@@ -1,5 +1,3 @@
-
-
## Set up additional master databases {#config-ee-multidb-master-masters}
Create checkout and OMS master databases as follows:
@@ -40,7 +38,7 @@ After setting up a total of three master databases, use the Magento command line
### First steps
-{% include install/first-steps-cli.html %}
+{% include install/first-steps-cli.md %}
### Configure the checkout database {#config-ee-multidb-master-cli-check}
diff --git a/_includes/config/split-deploy/config-mgmt-over1.md b/_includes/config/split-deploy/config-mgmt-over1.md
index a6ec2d5bb47..ed5bf2638d1 100644
--- a/_includes/config/split-deploy/config-mgmt-over1.md
+++ b/_includes/config/split-deploy/config-mgmt-over1.md
@@ -1,5 +1,3 @@
-
-
* _Shared configuration_, which is all settings that are neither system-specific nor sensitive.
Shared settings are settings you want to be consistent on development and production systems. Set the shared configuration in the Magento Admin in your development (or {{site.data.var.ece}} _integration_) system.
@@ -12,9 +10,8 @@
The system-specific configuration file, `app/etc/env.php`, should _not_ be included in source control or otherwise shared between systems. Instead, use the [`magento config:set` and `magento:sensitive:set` commands]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-config-mgmt-set.html) to provide values for those settings in your production system.
-
+{:.bs-callout .bs-callout-info}
These new methods to manage your configuration are optional. You don't have to use them, although we strongly recommend you do.
-
Most of the time, the configuration options you set in the shared, system-specific, or sensitive configuration cannot be edited in the Magento Admin. This helps keep your settings consistent across all systems. (You can optionally use the [`magento config:set` command]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-config-mgmt-set.html) without the `--lock` option to configure settings that are editable in the Admin.)
diff --git a/_includes/config/split-deploy/example_build-sync.md b/_includes/config/split-deploy/example_build-sync.md
index f64dd6119c6..8d85e1b54d1 100644
--- a/_includes/config/split-deploy/example_build-sync.md
+++ b/_includes/config/split-deploy/example_build-sync.md
@@ -1,5 +1,3 @@
-
-
To update your build system:
1. Log in to your build system as, or switch to, the {% glossarytooltip 5e7de323-626b-4d1b-a7e5-c8d13a92c5d3 %}Magento file system owner{% endglossarytooltip %}.
@@ -19,4 +17,4 @@ To update your build system:
The Git command follows:
- git add -A && git commit -m "Updated files on build system" && git push mconfig m2.2_deploy
\ No newline at end of file
+ git add -A && git commit -m "Updated files on build system" && git push mconfig m2.2_deploy
diff --git a/_includes/config/split-deploy/example_save-shared-config.md b/_includes/config/split-deploy/example_save-shared-config.md
index 98848a30b98..14c2e9dd012 100644
--- a/_includes/config/split-deploy/example_save-shared-config.md
+++ b/_includes/config/split-deploy/example_save-shared-config.md
@@ -1,35 +1,42 @@
-
+1. Log in to your development system as, or switch to, the {% glossarytooltip 5e7de323-626b-4d1b-a7e5-c8d13a92c5d3 %}Magento file system owner{% endglossarytooltip %}.
-1. Log in to your development system as, or switch to, the {% glossarytooltip 5e7de323-626b-4d1b-a7e5-c8d13a92c5d3 %}Magento file system owner{% endglossarytooltip %}.
-2. Enter the following commands in the order shown:
+1. Enter the following commands in the order shown:
- cd
- php bin/magento app:config:dump
+ ```bash
+ cd
+ php bin/magento app:config:dump
+ ```
- For example, if Magento is installed in `/var/www/html/magento2`, enter:
+ For example, if Magento is installed in `/var/www/html/magento2`, enter:
- cd /var/www/html/magento2
- php bin/magento app:config:dump
-3. If you use Git, enter the following command to confirm that `app/etc/config.php` was updated:
+ ```bash
+ cd /var/www/html/magento2
+ php bin/magento app:config:dump
+ ```
- git status
+1. If you use Git, enter the following command to confirm that `app/etc/config.php` was updated:
- You should see output similar to the following:
+ ```bash
+ git status
+ ```
-
# On branch m2.2_deploy -# Changed but not updated: -# (use "git add <file>..." to update what will be committed) -# (use "git checkout -- <file>..." to discard changes in working directory) -# -# modified: app/etc/config.php -#+ You should see output similar to the following: -
- _Do not_ submit changes to the `generated`, `pub/media`, or `pub/static` directories to source control. You'll generate those files on your build system. The production system likely has code, themes, and so on that aren't ready to use on production.
-
+ ```terminal
+ On branch m2.2_deploy
+ Changed but not updated:
+ (use "git add <file>..." to update what will be committed)
+ (use "git checkout -- <file>..." to discard changes in working directory)
+ modified: app/etc/config.php
+ ```
-4. Check in your changes to `app/etc/config.php` only to source control.
+ {:.bs-callout .bs-callout-warning}
+ Do _not_ submit changes to the `generated`, `pub/media`, or `pub/static` directories to source control. You'll generate those files on your build system. The production system likely has code, themes, and so on that aren't ready to use on production.
- The Git command follows:
+1. Check in your changes to `app/etc/config.php` only to source control.
- git add app/etc/config.php && git commit -m "Updated shared configuration" && git push mconfig m2.2_deploy
+ The Git command follows:
+
+ ```bash
+ git add app/etc/config.php && git commit -m "Updated shared configuration" && git push mconfig m2.2_deploy
+ ```
diff --git a/_includes/config/split-deploy/example_update-prod.md b/_includes/config/split-deploy/example_update-prod.md
index 2b424adda7e..6a369611ef4 100644
--- a/_includes/config/split-deploy/example_update-prod.md
+++ b/_includes/config/split-deploy/example_update-prod.md
@@ -1,5 +1,3 @@
-
-
To update the production system:
1. Log in to your production system as, or switch to, the {% glossarytooltip 5e7de323-626b-4d1b-a7e5-c8d13a92c5d3 %}Magento file system owner{% endglossarytooltip %}.
@@ -23,4 +21,4 @@ To update the production system:
php bin/magento cache:clean
4. End maintenance mode:
- php bin/magento maintenance:disable
\ No newline at end of file
+ php bin/magento maintenance:disable
diff --git a/_includes/config/split-deploy/split-deploy-assumptions.md b/_includes/config/split-deploy/split-deploy-assumptions.md
index 25ee138820f..01049993d88 100644
--- a/_includes/config/split-deploy/split-deploy-assumptions.md
+++ b/_includes/config/split-deploy/split-deploy-assumptions.md
@@ -1,5 +1,3 @@
-
-
To use pipeline deployment, we assume you are:
* An experienced system integrator with excellent knowledge of Magento configuration options.
@@ -7,4 +5,4 @@ To use pipeline deployment, we assume you are:
* Somewhat knowledgeable about PHP programming.
* Experienced with source control methods.
- To use pipeline deployment, we assume your Magento code is in a source control repository. In this guide, we assume you're using Git but the choice of repositories is up to you.
\ No newline at end of file
+ To use pipeline deployment, we assume your Magento code is in a source control repository. In this guide, we assume you're using Git but the choice of repositories is up to you.
diff --git a/_includes/config/split-deploy/split-deploy-overview.md b/_includes/config/split-deploy/split-deploy-overview.md
index 571e6812df6..ef9442c79c1 100644
--- a/_includes/config/split-deploy/split-deploy-overview.md
+++ b/_includes/config/split-deploy/split-deploy-overview.md
@@ -1,5 +1,3 @@
-
-
In Magento version 2.2, we introduce a new way to deploy to production with minimal downtime. We refer to this as _pipeline deployment_ because the deployment process occurs on different systems.
We also provide the ability to maintain consistent configurations for all pipeline deployment systems. It's a simple but powerful model that enables you to separate ordinary configuration settings from either system-specific settings (like host and port) or sensitive settings (such as names and passwords).
@@ -18,10 +16,10 @@ Development system
Build system
: One system on which you deploy static assets and compile code for your production system. Because you build these assets on a system not in production, your production system's downtime is minimized.
-Your build system does not have to have Magento installed on it. It needs only the Magento code but no database connection is required. Also, your build system doesn't need to be a physically separate server.
+Your build system does not have to have Magento installed on it. It needs only the Magento code but no database connection is required. Also, your build system doesn't need to be a physically separate server.
Staging system
: _Optional_. You can optionally set up a staging system to use for final testing of all integrated code, including User Acceptance Testing (UAT). Set up a staging system the same way you set up a production system. Except for the fact that staging is not your live store and doesn't process orders from customers, it's identical to production.
Production system
-: Your live store. You should make minimal configuration changes here and no changes to websites, stores, store views, products, or the catalog. You should make all those types of changes in your development system.
\ No newline at end of file
+: Your live store. You should make minimal configuration changes here and no changes to websites, stores, store views, products, or the catalog. You should make all those types of changes in your development system.
diff --git a/_includes/contributor/2-1-end.md b/_includes/contributor/2-1-end.md
new file mode 100644
index 00000000000..2f91d90d636
--- /dev/null
+++ b/_includes/contributor/2-1-end.md
@@ -0,0 +1,3 @@
+{:.bs-callout .bs-callout-warning}
+**v2.1 End of Contribution:**
+As of September 17, 2018, we no longer accept contributions to the v2.1 release line. Continue submitting contributions for the [v2.2](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html) and [v2.3](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html) release lines. We made this change to increase our focus on issue investigations and pull request approvals for v2.2 and v2.3 release lines.
diff --git a/_includes/contributor/2-2-submission.md b/_includes/contributor/2-2-submission.md
new file mode 100644
index 00000000000..a05af09b9b7
--- /dev/null
+++ b/_includes/contributor/2-2-submission.md
@@ -0,0 +1,3 @@
+{:.bs-callout .bs-callout-info}
+**v2.2 Contribution Notice:**
+As of September 17, 2018, in an effort to keep 2.2 and 2.3 releases aligned, we will only accept pull requests to 2.2-develop that contain changes already existing in 2.3-develop. We recommend submitting pull requests to 2.3-develop then [back porting](#porting) the changes to 2.2-develop.
diff --git a/_includes/contributor/2-3-submission.md b/_includes/contributor/2-3-submission.md
new file mode 100644
index 00000000000..ca9a9716efc
--- /dev/null
+++ b/_includes/contributor/2-3-submission.md
@@ -0,0 +1,3 @@
+{:.bs-callout .bs-callout-info}
+**v2.3 Contribution Notice:**
+As of September 17, 2018, in an effort to keep 2.2 and 2.3 releases aligned, we accept pull requests to 2.3-develop and encourage [back ports](#porting) to 2.2-develop. We no longer accept pull requests to the v2.1 or v2.0 release lines to focus all development efforts on v2.3 and v2.2.
diff --git a/_includes/contributor/labels.md b/_includes/contributor/labels.md
new file mode 100644
index 00000000000..36d09315e4a
--- /dev/null
+++ b/_includes/contributor/labels.md
@@ -0,0 +1,109 @@
+### Release Lines
+{:.no_toc}
+
+Release line labels indicate the specific Magento release lines affected by the issue or PR. For example, if working on a fix for 2.2.6, you would apply the Release Line: 2.2. This effectively includes all releases in this line.
+
+* `Release Line: 2.1`
+* `Release Line: 2.2`
+* `Release Line: 2.3`
+
+### Progress
+{:.no_toc}
+
+Progress labels indicate the Pull Request status on each review stage:
+
+* `Progress: needs update` - The Community Engineering Team needs additional information from the reporter to properly prioritize and process the pull request.
+* `Progress: on hold` - The pull request is on hold due and will be further reviewed to accept or reject.
+* `Progress: accept` - The pull request has been accepted and will be merged into mainline code.
+* `Progress: reject` - The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution.
+
+### Contribution awards
+{:.no_toc}
+
+The level of investigation, research, and work required for a task may differ. Contribution Rewards labels indicate what type of contribution awards will be applied when completing an issue and PR. Some awards will provide higher points and rewards than others.
+
+* `Award: complex`
+* `Award: advanced`
+* `Award: special achievement`
+* `Award: category of expertise`
+* `Award: test coverage`
+* `Award: devdocs update`
+* `Award: MFTF test coverage`
+* `Award: bug fix`
+* `Cleanup`
+* `Port`
+
+### Partners
+{:.no_toc}
+
+All partners Pull Requests should be marked with label `partners-contribution`. Additionally, add a partner label for PRs submitted by specific Partners. Use the format: `Partner: `. The following are Partner examples:
+
+Example labels:
+
+* `partners-contribution`
+* `Partner: Atwix`
+* `Partner: Comwrap`
+* `Partner: Interactiv4`
+* `Partner: Wagento`
+
+### Components
+{:.no_toc}
+
+Component labels indicate the components affected by the Pull Request. To learn more about available components and assigned architects, see [Magento Components Assignment](https://github.com/magento/magento2/wiki/Magento-Components-Assignment).
+
+Example labels:
+
+* `Component: Catalog`
+* `Component: Report`
+* `Component: Checkout`
+
+For edge cases, `Component: Other` and `Component: Multiple` may be used.
+
+### Events
+{:.no_toc}
+
+Event labels mark recommended issues and submitted PRs for a specific event. Events may include Contribution Days, Hackathons, Imagine, special events like Smashtoberfest, and others. Contributors and Maintainers can easily locate code when attending those events. Some events may also have a [Community Engineering Slack](https://magentocommeng.slack.com) channel using the same label.
+
+Example labels:
+
+* `Event: mm18in`
+* `Event: mm17es`
+* `Event: mlau18`
+
+### General
+{:.no_toc}
+
+General labels include a variety of tasks and definitions for pull requests and issues.
+
+* `good first issue` - Indicates a good issue for first-time contributors.
+* `help wanted` - Indicates the creator or author needs help with a decision, advice for resolving, and so on.
+* `triage wanted` - Indicates the issues are under triage. See this information to learn more about the [Triage Wanted program](https://github.com/magento/magento2/wiki/Triage-Wanted).
+
+### Issue Resolution Status
+{:.no_toc}
+
+Labels applied to issues through verification and completion. For details on the process, see [GitHub Issues Processing Workflow](https://github.com/magento/magento2/wiki/GitHub-Issues-Processing-Workflow).
+
+* `Issue: Format is not valid` - Gate 1 failed. Automatic verification by the Automated Contributor Assistant failed and the issue needs updates. The [format](https://github.com/magento/magento2/tree/2.3-develop/.github/ISSUE_TEMPLATE) of the issue description and minimum required information is not provided: Preconditions, Steps to Reproduce, Actual Result, Expected Result. Previous label `G1 Failed`.
+* `Issue: Format is valid` - Gate 1 passed. Automatic verification by the Automated Contributor Assistant passed for all issue content. Previous label `G1 Passed`.
+* `Issue: Clear Description` - Gate 2 passed. The Community Engineering Team has confirmed that this issue contains the minimum required information to reproduce. Previous label `G2 Passed`.
+* `Issue: Cannot Reproduce` - Gate 3 failed. The issue could not be reproduced or validated. Previous label `Cannot Reproduce`.
+* `Issue: Confirmed` - Gate 3 passed. Manual verification of the issue description and reproduction steps was confirmed. Previous label `G3 Passed`.
+* `Issue: Ready for Work` - Gate 4 passed. The issue is acknowledged and added to the backlog for open development. Previous label `acknowledged`.
+* `Reproduced on 2.1.x` - The Community Engineering Team reproduced the issue on latest 2.1.x release.
+* `Reproduced on 2.2.x` - The Community Engineering Team reproduced the issue on latest 2.2.x release.
+* `Reproduced on 2.3.x` - The Community Engineering Team reproduced the issue on latest 2.3.x release.
+* `Fixed in 2.1.x` - The issue has been fixed in one of the 2.1.x releases or in 2.1-develop branch and will be available with the upcoming patch release.
+* `Fixed in 2.2.x` - The issue has been fixed in one of the 2.2.x releases or in 2.2-develop branch and will be available with the upcoming patch release.
+* `Fixed in 2.3.x` - The issue has been fixed in one of the 2.3.x releases or in 2.3-develop branch and will be available with the upcoming patch release.
+* `non-issue` - A described behavior in the issue description is valid and shouldn't be changed in Magento code base.
+
+### DevDocs
+{:.no_toc}
+
+All [contributions to DevDocs](https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md) receive the following labels:
+
+* `New topic`- New file submissions for content that has never existed on devdocs
+* `Major update` - Significant updates to existing content, such as a new section or example
+* `Technical` - Updates to the code or processes that alter the technical content of the document
+* `Editorial` - Fixes for typos, grammatical inconsistencies, or minor rewrites to correct inaccuracies.
diff --git a/_includes/contributor/pull-request-table.md b/_includes/contributor/pull-request-table.md
new file mode 100644
index 00000000000..e80e212e840
--- /dev/null
+++ b/_includes/contributor/pull-request-table.md
@@ -0,0 +1,5 @@
+| | Fix for Existing Issue | Test Coverage | Refactoring | New Feature | Code Cleanup |
+|:----|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|
+| 2.1 |  |  |  |  |  |
+| 2.2 |  |  |  |  |  |
+| 2.3 |  |  |  |  |  |
diff --git a/_includes/contributor/rewards.md b/_includes/contributor/rewards.md
new file mode 100644
index 00000000000..d2145ecdb51
--- /dev/null
+++ b/_includes/contributor/rewards.md
@@ -0,0 +1,81 @@
+Magento is thankful for all contributions, and we always recognize our most active members. The aim is to find and recognize our top contributors according to points awarded during a given time period (monthly/quarterly/yearly). Contributors can earn points in numerous ways with a focus in pull requests to the backlog and special projects.
+
+The Community Engineering team assesses each Pull Request and determines the best awards for the work involved. Contribution Points are calculated according to the assessment results. We award points when the PR is merged.
+
+### How points are awarded
+{:.no_toc}
+
+Every merged PR receives one base achievement and potentially one or more additional achievements. These achievements are applied to PRs during review and assessment. Contributors and Maintainers receive points after the PR has been merged.
+
+Due to the level of work required for developing and reviewing a PR, Contributors and Maintainers receive the same amount of points.
+
+See the following examples for calculated reward points:
+
+- Contributor submits PR with complex code contributions: Improvement(base) 10 points + Complex(additional) 20 points = 30 points
+- Contributor submits PR with complex code and tests: Improvement(base) 10 points + Complex(additional) 20 points + Test coverage(additional) 10 points = 40 points
+- Contributor submits PR port of existing merged PR:
+ - Original contributor: (Improvement(base) 10 points + Complex(additional) 20 points) + Author of Ported Issue 5 points = 35 points
+ - Porting contributor: Port(base) 5 points
+- Maintainer reviews and approves PR with complex code and tests: Improvement(base) 10 points + Complex(additional) 20 points + Test coverage(additional) 10 points = 40 points
+
+Earned achievements display as labels on GitHub PRs and for each Magento Contributor, Partner, and Maintainer on [magento.com](https://magento.com/magento-contributors).
+
+### Base achievements
+{:.no_toc}
+
+Every merged PR receives one base achievement.
+
+Achievement | Points | Description
+| ------------ | --- | --- |
+Improvement| 10 | Contribution contains code improvements, refactoring, or a bug fix.
+Port | 5 | Contribution ports an existing solution between release lines. The author of the original PR receives an additional **5 points** when another person contributes the ported Pull Request.
+Code Cleanup | 1 | Contribution contains code cleanup such as typos, inline documentation, coding style, remove unused code, and so on.
+{:style="table-layout:auto;"}
+
+### Additional achievements
+{:.no_toc}
+
+Every PR may receive several additional achievements during assessment.
+
+Achievement | Points | Description
+| ------------ | --- | --- |
+Advanced | 30 | Contribution provides new features. For example: introducing a new CLI command, integration with the new payment or shipping methods, and so on
+Complex | 20 | Contribution contains complete refactoring of legacy code, improvements to application design, updates to libraries, and so on
+Special achievement | 20 | Contribution earns recognition in a specific category. For example: extensive tests coverage, improved framework design, improved APIs or API coverage, improved customizability, and so on
+Test coverage | 10 | Contribution contains fix or improvement and new tests or test cases
+MFTF test coverage| 10 | Contribution contains MFTF tests
+Bug fix | 10 | Contribution fixes one or more known issues from GitHub
+Author of Ported Issue | 5 | Additional points for a contribution that ports (up or back port) a previous PR across release lines by another contributor
+{:style="table-layout:auto;"}
+
+## DevDocs awards and points
+
+Contributors and Maintainers can also earn rewards for merged submissions to the [DevDocs repository](https://github.com/magento/devdocs). These earned points add to contributor totals. Like code contributions, the DevDocs team assesses the PRs and applies labels to determine the level of work and achievements. Each PR receives one base achievement and potentially additional achievements.
+
+See the following examples for calculated reward points:
+
+- Contributor submits PR with HTML formatting and typos fixes: Editorial(base) 1 point
+- Contributor submits PR with code sample update and new parameter descriptions: Improvement(base) 10 points + Major update(additional) 20 points = 30 points
+
+### Base achievements
+{:.no_toc}
+
+Every merged PR to the [DevDocs repository](https://github.com/magento/devdocs) receives one base achievement. If you enter a PR with editorial fixes and new content, you receive the Improvement and additional achievements.
+
+Achievement | Points | Description
+| ------------ | --- | --- |
+Improvement | 10 | Contribution contains document improvements, adding missing features of inconsistency between code base and documentation, and so on.
+Editorial | 1 | Contribution contains fixes only for typos, grammatical inconsistencies, or minor rewrites to correct inaccuracies.
+{:style="table-layout:auto;"}
+
+### Additional achievements
+{:.no_toc}
+
+Each PR can earn one of the following additional achievements. If you entered an editorial PR, you may not receive an additional achievement.
+
+Achievement | Points | Description
+| ------------ | --- | --- |
+New topic | 30 | New file submissions for content that has never existed on devdocs
+Major update | 20 | Significant updates to existing content, such as a new section or example
+Technical | 10 | Updates to code or processes that alter the technical content of the document
+{:style="table-layout:auto;"}
diff --git a/_includes/design/icon-fonts.md b/_includes/design/icon-fonts.md
index f88b9034b6d..453502d8b0c 100644
--- a/_includes/design/icon-fonts.md
+++ b/_includes/design/icon-fonts.md
@@ -1,8 +1,6 @@
-
-
If you want to add your own icons, each icon will need to be in its own SVG files. There are multiple ways to create icon fonts, here is one to get started:
-1. Go to https://icomoon.io/app/ or download this app in Chrome web store.
+1. Go to [https://icomoon.io/app/](https://icomoon.io/app/) or download this app in Chrome web store.
2. Upload your icons in SVG format into the app.
diff --git a/_includes/home/contributors.html b/_includes/home/contributors.html
index 33807530496..dabb616297e 100644
--- a/_includes/home/contributors.html
+++ b/_includes/home/contributors.html
@@ -1,17 +1,6 @@
-
-
-
Top Monthly Contributors
- -- Our documentation is open-source on GitHub. Even the smallest of edits are appreciated, as are enhancements and clarifications to our existing content. We love when we get complete new topics from our community members! See all contributors. -
- - - - - +
+
+
diff --git a/_includes/home/intro.html b/_includes/home/intro.html
index 3ac48fde198..33c3ab6e4b6 100644
--- a/_includes/home/intro.html
+++ b/_includes/home/intro.html
@@ -1,7 +1,7 @@
-
+ AllowOverride
+
+ ```
+
+ {:.bs-callout .bs-callout-info}
+ In some cases, additional parameters might be required. For more information, see the [Apache 2.4 documentation](https://httpd.apache.org/docs/2.4/mod/mod_access_compat.html#order).
+
+1. If you changed Apache settings, restart Apache:
+
+ ```bash
+ service apache2 restart
+ ```
+
+ {:.bs-callout .bs-callout-info}
+ - If you upgraded from an earlier Apache version, first look for `` or `` in `000-default.conf`.
+ - You must change the value of `AllowOverride` in the directive for the directory to which you expect to install the Magento software. For example, to install in the web server docroot, edit the directive in ``.
diff --git a/_includes/install/archives-php-issue.md b/_includes/install/archives-php-issue.md
index 99e69ebb0e6..a8a65b14a66 100644
--- a/_includes/install/archives-php-issue.md
+++ b/_includes/install/archives-php-issue.md
@@ -1,6 +1,2 @@
-
-
-
\ No newline at end of file
diff --git a/_includes/install/cli_common-commands.md b/_includes/install/cli_common-commands.md
new file mode 100644
index 00000000000..41798727022
--- /dev/null
+++ b/_includes/install/cli_common-commands.md
@@ -0,0 +1,11 @@
+The following arguments are common to all commands. These commands can be run either before or after the Magento software is installed:
+
+|Long version|Short version|Meaning|
+|--- |--- |--- |
+|`--help`|`-h`|Get help for any command. For example, `./magento help setup:install` or `./magento help setup:config:set`.|
+|`--quiet`|`-q`|Quiet mode; no output.|
+|`--no-interaction`|`-n`|No interactive questions.|
+|`--verbose=1,2,3`|`-v, -vv, -vvv`|Verbosity level. For example, `--verbose=3` or `-vvv` displays debug verbosity, which is the most verbose output. Default is `--verbose=1` or `-v`.|
+|`--version`|`-V`|Display this application version|
+|`--ansi`|n/a|Force ANSI output|
+|`--no-ansi`|n/a|Disable ANSI output|
diff --git a/_includes/install/cli_help-commands.html b/_includes/install/cli_help-commands.html
deleted file mode 100644
index a4ec3085fbc..00000000000
--- a/_includes/install/cli_help-commands.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
+```
+
+For example,
+
+```bash
+magento help setup:install
+```
+```bash
+magento help cache:enable
+```
diff --git a/_includes/install/composer-clear-cache.html b/_includes/install/composer-clear-cache.html
deleted file mode 100644
index 8161c3b7480..00000000000
--- a/_includes/install/composer-clear-cache.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
Magento {{ page.guide_version }}{% if page.guide_version == "2.3" %} Alpha{%endif %} Developer Documentation
+Magento {{ page.guide_version }}{% if page.guide_version == "2.3" %} Beta{%endif %} Developer Documentation
Everything you need to build and manage a customized Magento store.
diff --git a/_includes/install/allowoverrides22.md b/_includes/install/allowoverrides22.md index 81b46fc5a4a..e30ecd77ea0 100644 --- a/_includes/install/allowoverrides22.md +++ b/_includes/install/allowoverrides22.md @@ -1,18 +1,14 @@ -
+Use this section to enable Apache 2.2 rewrites and specify a setting for the [distributed configuration file, `.htaccess`](http://httpd.apache.org/docs/current/howto/htaccess.html)
-Use this section to enable Apache 2.2 rewrites and specify a setting for the distributed configuration file,
-
\ No newline at end of file
diff --git a/_includes/install/allowoverrides24.md b/_includes/install/allowoverrides24.md
index b9f277a8706..587606f52f9 100644
--- a/_includes/install/allowoverrides24.md
+++ b/_includes/install/allowoverrides24.md
@@ -1,31 +1,37 @@
-.htaccess
+Magento uses server rewrites and `.htaccess` to provide directory-level instructions for Apache.
-Magento uses server rewrites and .htaccess to provide directory-level instructions for Apache.
-
-
-
-
+{:.bs-callout .bs-callout-info}
+Failure to enable these settings typically results in no styles displaying on your storefront or Admin.
1. Open the following file for editing.
- * Ubuntu: Failure to enable these settings typically results in no styles displaying on your storefront or Admin.
-vim /etc/apache2/sites-available/default
- * CentOS: vim /etc/httpd/conf/httpd.conf
+ * Ubuntu: `vim /etc/apache2/sites-available/default`
+ * CentOS: `vim /etc/httpd/conf/httpd.conf`
2. Locate the block that starts with:
@@ -30,10 +26,8 @@ Magento uses server rewrites and .htaccess to provide directory-lev
Allow from all
-
-
+ {:.bs-callout .bs-callout-info}
+ The preceding values for `Order` might not work in all cases. For more information, see the Apache documentation ([2.2](https://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order)), [2.4](https://httpd.apache.org/docs/2.4/mod/mod_authz_host.html#order)).
4. Save the file and exit the text editor.
5. *Ubuntu only*. Configure Apache to use the `mod_rewrite` module.
@@ -43,4 +37,3 @@ Magento uses server rewrites and The preceding values for Order might not work in all cases. For more information, see the Apache documentation (2.2, 2.4).
.htaccess to provide directory-lev
6. If you changed Apache settings, restart Apache.
service apache2 restart
-
-
-
\ No newline at end of file
+Use this section to enable Apache 2.4 rewrites and specify a setting for the [distributed configuration file, `.htaccess`](http://httpd.apache.org/docs/current/howto/htaccess.html)
+
+Magento uses server rewrites and `.htaccess` to provide directory-level instructions for Apache.
+
+{:.bs-callout .bs-callout-info}
+Failure to enable these settings typically results in no styles displaying on your storefront or Admin.
+
+1. Enable the Apache rewrite module:
+
+ ```bash
+ a2enmod rewrite
+ ```
+
+1. To enable Magento to use the distributed `.htaccess` configuration file, see the guidelines in the [Apache 2.4 documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html).
+
+ Note that in Apache 2.4, the server's default site configuration file is `/etc/apache2/sites-available/000-default.conf`.
+
+ For example, you can add the following to the end of `000-default.conf`:
+
+ ```terminal
+ Use this section to enable Apache 2.4 rewrites and specify a setting for the distributed configuration file, .htaccess
Magento uses server rewrites and .htaccess to provide directory-level instructions for Apache.
-
-
-Failure to enable these settings typically results in no styles displaying on your storefront or Admin.
-- To enable the Apache rewrite module, enter the following command:
-
a2enmod rewrite
- - To enable Magento to use the distributed configuration file
.htaccesssee the guidelines in the Apache 2.4 documentation.
- Note that in Apache 2.4, the server's default site configuration file is/etc/apache2/sites-available/000-default.conf
- For example, you can add the following to the end of000-default.conf:
--<Directory "/var/www/html"> - AllowOverride <value from Apache site> -</Directory>
- - If you changed Apache settings, restart Apache:
-
service apache2 restart
-
-
-
-In some cases, additional parameters might be required. For more information, see the Apache 2.4 documentation.
-
-
-
-- If you upgraded from an earlier Apache version, first look for
<Directory "/var/www/html">or<Directory "/var/www">in000-default.conf.
- - You must change the value of
AllowOverridein the directive for the directory to which you expect to install the Magento software. For example, to install in the web server docroot, edit the directive in<Directory /var/www>.
-
-
diff --git a/_includes/install/auth-json.md b/_includes/install/auth-json.md
index a1a88e1f49f..5edee1f8711 100644
--- a/_includes/install/auth-json.md
+++ b/_includes/install/auth-json.md
@@ -1,15 +1,13 @@
-
+{:.bs-callout .bs-callout-warning}
Magento 2.2 archives are compatible with PHP 7.0 only. If you're using PHP 7.1, [download Magento 2.2 with Composer]({{ page.baseurl }}/install-gde/composer.html) instead to avoid compatibility issues during installation.
-
-
-
To create `auth.json`:
-1. Log in to your Magento server as, or switch to, the Magento file system owner.
+1. Log in to your Magento server as, or switch to, the [Magento file system owner]({{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html).
2. Edit or create `auth.json` in the user's home directory.
The following example shows how to add `repo.magento.com` authentication to an existing file:
{
"github-oauth": {
- "github.com": ""
+ "github.com": ""
},
"http-basic": {
"repo.magento.com": {
@@ -20,4 +18,3 @@ To create `auth.json`:
}
For example, if your username is `magento_user`, create or edit `/home/magento_user/.composer/auth.json`
-
\ No newline at end of file
diff --git a/_includes/install/auth-tokens-get.md b/_includes/install/auth-tokens-get.md
index ce2fbdc522b..1b7ce83891c 100644
--- a/_includes/install/auth-tokens-get.md
+++ b/_includes/install/auth-tokens-get.md
@@ -1,10 +1,8 @@
-
-
The `repo.magento.com` repository is where Magento 2 and third-party Composer packages are stored and requires authentication. Use your Magento Marketplace account to generate a pair of 32-character *authentication keys* to access the repository.
To create authentication keys:
-1. Log in to the [Magento Marketplace](https://marketplace.magento.com){:target="_blank"}. If you don't have an account, click **Register**.
+1. Log in to the [Magento Marketplace](https://marketplace.magento.com){:target="_blank"}. If you don't have an account, click **Register**.
2. Click your account name in the top-right of the page and select **My Profile**.
3. Click **Access Keys** in the Marketplace tab.
@@ -22,12 +20,11 @@ You can also disable or delete authentication keys. For example, you can disable
* To enable a previously disabled key: Click **Enable**.
* To delete keys: Click **Delete**.
-You cannot delete or disable keys you created by signing in to your [magento.com account](https://www.magentocommerce.com/products/customer/account/login){:target="_blank"}. To manage those keys:
+You cannot delete or disable keys you created by signing in to your [magento.com account](https://www.magentocommerce.com/products/customer/account/login){:target="_blank"}. To manage those keys:
-1. Log in to your [magento.com account](https://www.magentocommerce.com/products/customer/account/login){:target="_blank"}.
+1. Log in to your [magento.com account](https://www.magentocommerce.com/products/customer/account/login){:target="_blank"}.
2. Click **My Account** at the top of the page.
3. Click **Account Settings** > **Downloads Access Token**.
{:width="200px"}
4. Click **Generate new token** to replace and disable an existing token.
-
\ No newline at end of file
diff --git a/_includes/install/before-you-begin-cli.html b/_includes/install/before-you-begin-cli.html
deleted file mode 100644
index 9e3c9ef9914..00000000000
--- a/_includes/install/before-you-begin-cli.html
+++ /dev/null
@@ -1,11 +0,0 @@
-Before you begin, make sure that:
-- Your system meets the requirements discussed in Magento System Requirements. -
- You completed all prerequisite tasks discussed in Prerequisites. -
- After you log in to the Magento server, switch to a user that has permissions to write to the Magento file system. One way to do this is discussed in switch to the Magento file system owner.
Before you begin, make sure that:
-- Your system meets the requirements discussed in Magento System Requirements. -
- You completed all prerequisite tasks discussed in Prerequisites. -
- You started your installation as discussed in Getting started. -
- You completed all preceding steps in the Setup Wizard. -
The following arguments are common to all commands. These commands can be run either before or after the Magento software is installed:
-| Long version | -Short version | -Meaning | -
|---|---|---|
| --help | --h | -Get help for any command. For example, ./magento help setup:install or ./magento help setup:config:set. |
-
| --quiet | --q | -Quiet mode; no output. | -
| --no-interaction | --n | -No interactive questions. | -
| --verbose=1|2|3 | --v|vv|vvv | -Verbosity level. For example, --verbose=3 or -vvv displays debug verbosity, which is the most verbose output. Default is --verbose=1 or -v. |
-
| --version | --V | -Display this application version | -
| --ansi | -n/a | -Force ANSI output | -
| --no-ansi | -n/a | -Disable ANSI output | -
To display a complete list of commands, enter:
-magento list-
To get help for a particular command, enter:
-magento help <command>-
For example,
-magento help setup:install -magento help cache:enable\ No newline at end of file diff --git a/_includes/install/cli_help-commands.md b/_includes/install/cli_help-commands.md new file mode 100644 index 00000000000..9c6e0567762 --- /dev/null +++ b/_includes/install/cli_help-commands.md @@ -0,0 +1,20 @@ +To display a complete list of commands, enter: + +```bash +magento list +``` + +To get help for a particular command, enter: + +```bash +magento help
We introduced a change on packages.magento.com that had the unintended result of causing errors with certain Magento packages.
-This affects only users who used composer create-project to create their Magento project between the dates of August 13 and August 17, 2015.
A user reported one symptom on GitHub about an error that occurred during the installation:
-[UnexpectedValueException] -The checksum verification of the file failed (downloaded from https://packages.magento.com/_packages/magento_framework-1.0.0-beta.zip)-
The cause is a conflict between packages on packages.magento.com compared to the local Composer cache. To resolve the issue, clear your Composer cache as follows:
- Log in to your Magento server as a user with permissions to run
composerin the Magento installation directory.
- cd <your Magento install dir>
- - Enter
composer clear-cache
-
First, check if Composer is already installed:
In a command prompt, enter any of the following commands:
@@ -19,6 +17,5 @@ To install Composer:
curl -sS https://getcomposer.org/installer | php
mv composer.phar /usr/local/bin/composer
-
- For additional installation options, see the Composer installation documentation.
-
\ No newline at end of file
+
+ For additional installation options, see the [Composer installation documentation](https://getcomposer.org/download/).
diff --git a/_includes/install/composer-overview.md b/_includes/install/composer-overview.md
index 6405a290a98..698d1c79abf 100644
--- a/_includes/install/composer-overview.md
+++ b/_includes/install/composer-overview.md
@@ -1,12 +1,10 @@
-
-We use [Composer](https://getcomposer.org/){:target="\_blank"} to manage Magento components and their dependencies. Using Composer to get the Magento software {% glossarytooltip 7490850a-0654-4ce1-83ff-d88c1d7d07fa %}metapackage{% endglossarytooltip %} provides the following advantages:
+We use [Composer](https://getcomposer.org/){:target="_blank"} to manage Magento components and their dependencies. Using Composer to get the Magento software {% glossarytooltip 7490850a-0654-4ce1-83ff-d88c1d7d07fa %}metapackage{% endglossarytooltip %} provides the following advantages:
- Reuse third-party libraries without bundling them with source code
- Reduce extension conflicts and compatibility issues by using a component-based architecture with robust dependency management
-- Adhere to [PHP-Framework Interoperability Group (FIG)](https://www.php-fig.org/){:target="\_blank"} standards
+- Adhere to [PHP-Framework Interoperability Group (FIG)](https://www.php-fig.org/) standards
- Repackage Magento Open Source with other components
- Use the Magento software in a production environment
{:.bs-callout .bs-callout-warning}
You must create a Composer project from our metapackage if you want to use the Magento Web Setup Wizard to upgrade the Magento software and third-party extensions.
-
diff --git a/_includes/install/docker/deprecated-note.html b/_includes/install/docker/deprecated-note.html
deleted file mode 100644
index 5ae43d95d5f..00000000000
--- a/_includes/install/docker/deprecated-note.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/_includes/install/docker/docker-phpstorm.md b/_includes/install/docker/docker-phpstorm.md
deleted file mode 100644
index 3ec95d8a693..00000000000
--- a/_includes/install/docker/docker-phpstorm.md
+++ /dev/null
@@ -1,11 +0,0 @@
-DevBox is currently undergoing an update and is not available for download. A new version will be available in the near future. Please check back for updates.
-
-
-
-PhpStorm notes:
-
-* The instructions in this topic are based on PhpStorm version 2016.3.2. If you use a different version, some steps might be different. Consult your PhpStorm documentation for details.
-* PhpStorm has a commonly used window that has a different name in Windows and Mac OS:
-
- * Windows: The window is named Settings and you access it by clicking **File** > **Settings**.
- * Mac OS: The window is named Preferences and you access it by clicking **PhpStorm** > **Preferences**.
-
diff --git a/_includes/install/docker/docker_compose-ps.md b/_includes/install/docker/docker_compose-ps.md
deleted file mode 100644
index 3831a08f768..00000000000
--- a/_includes/install/docker/docker_compose-ps.md
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-docker-compose ps - - Name Command State Ports ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -magento2devbox_db_709831d587f2feef1e27fa41d4e70219 docker-entrypoint.sh mysqld Up 0.0.0.0:32780->3306/tcp -magento2devbox_elastic_709831d587f2feef1e27fa41d4e70219 /docker-entrypoint.sh elas ... Up 0.0.0.0:32777->9200/tcp, 9300/tcp -magento2devbox_rabbit_709831d587f2feef1e27fa41d4e70219 docker-entrypoint.sh rabbi ... Up 15671/tcp, 0.0.0.0:32778->15672/tcp, 25672/tcp, 4369/tcp, 5671/tcp, 0.0.0.0:32779->5672/tcp -magento2devbox_redis_709831d587f2feef1e27fa41d4e70219 docker-entrypoint.sh redis ... Up 6379/tcp -magento2devbox_web_709831d587f2feef1e27fa41d4e70219 /usr/local/bin/entrypoint.sh Up 22/tcp, 0.0.0.0:22->32705/tcp, 44100/tcp, 0.0.0.0:32781->5000/tcp, 0.0.0.0:32782->80/tcp, 9000/tcp- -In the preceding example: - -* The database listens on port 32780 -* Elasticsearch listens on ports 32777 and 9300 -* RabbitMQ listens on ports 15671, 32778, 25672, 4369, 5671, and 32779 -* Redis listens on port 6379 -* In the web container, the following ports are used: - - * SSH listens on port 32705 - - Applications like PhpStorm communicate with DevBox on the SSH listen port. It's very important to know this port. - * Unison synchronization (Windows only) listens on port 32781 - * The web server listens on port 32782 - -
-You can use any unmapped ports anyway you like. (An example of an unmapped port is port 9000 in the web container in the preceding example.)
-
diff --git a/_includes/install/docker/docker_dir.md b/_includes/install/docker/docker_dir.md
deleted file mode 100644
index 6363012c6d3..00000000000
--- a/_includes/install/docker/docker_dir.md
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-#### Local Project Path
-
-When we build your Docker installation scripts, we need to know the path to your Magento installation relative to the directory in which your scripts are located. Because you must extract the scripts from a compressed archive, it might not be easy to specify a relative path.
-
-The simplest option is to specify the absolute file system path to an existing Magento root directory, if any. If you haven't downloaded the Magento software yet, you can specify any value.
\ No newline at end of file
diff --git a/_includes/install/enable-disable-modules.html b/_includes/install/enable-disable-modules.html
deleted file mode 100644
index d2ab919afdf..00000000000
--- a/_includes/install/enable-disable-modules.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
- find var vendor pub/static pub/media app/etc -type f -exec chmod u+w {} \;
- find var vendor pub/static pub/media app/etc -type d -exec chmod u+w {} \;
+ find var vendor pub/static pub/media app/etc -type f -exec chmod u+w {} +
+ find var vendor pub/static pub/media app/etc -type d -exec chmod u+w {} +
chmod u+x bin/magento
To optionally enter all commands on one line, enter the following assuming Magento is installed in `/var/www/html/magento2`:
- cd /var/www/html/magento2 && find var vendor pub/static pub/media app/etc -type f -exec chmod u+w {} \; && find var vendor pub/static pub/media app/etc -type d -exec chmod u+w {} \; && chmod u+x bin/magento
+ cd /var/www/html/magento2 && find var vendor pub/static pub/media app/etc -type f -exec chmod u+w {} + && find var vendor pub/static pub/media app/etc -type d -exec chmod u+w {} + && chmod u+x bin/magento
3. If you haven't done so already, get the Magento software in one of the following ways:
* [Compressed archive]({{ page.baseurl }}/install-gde/prereq/zip_install.html)
@@ -29,9 +29,8 @@ To set permissions before you install the Magento software:
* [Command-line installation]({{ page.baseurl }}/install-gde/install/cli/install-cli.html)
* [Setup Wizard installation]({{ page.baseurl }}/install-gde/install/web/install-web.html)
-
- find var generated vendor pub/static pub/media app/etc -type f -exec chmod u+w {} \;
- find var vendor generated pub/static pub/media app/etc -type d -exec chmod u+w {} \;
+ find var generated vendor pub/static pub/media app/etc -type f -exec chmod u+w {} +
+ find var generated vendor pub/static pub/media app/etc -type d -exec chmod u+w {} +
chmod u+x bin/magento
To optionally enter all commands on one line, enter the following assuming Magento is installed in `/var/www/html/magento2`:
- cd /var/www/html/magento2 && find var generated vendor pub/static pub/media app/etc -type f -exec chmod u+w {} \; && find var generated vendor pub/static pub/media app/etc -type d -exec chmod u+w {} \; && chmod u+x bin/magento
+ cd /var/www/html/magento2 && find var generated vendor pub/static pub/media app/etc -type f -exec chmod u+w {} + && find var generated vendor pub/static pub/media app/etc -type d -exec chmod u+w {} + && chmod u+x bin/magento
3. If you haven't done so already, get the Magento software in one of the following ways:
* [Compressed archive]({{ page.baseurl }}/install-gde/prereq/zip_install.html)
@@ -30,9 +30,8 @@ To set permissions before you install the Magento software:
* [Command-line installation]({{ page.baseurl }}/install-gde/install/cli/install-cli.html)
* [Setup Wizard installation]({{ page.baseurl }}/install-gde/install/web/install-web.html)
-`
* Ubuntu: `usermod -a -G www-data `
-
- find var vendor pub/static pub/media app/etc -type f -exec chmod g+w {} \;
- find var vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} \;
+ find var vendor pub/static pub/media app/etc -type f -exec chmod g+w {} +
+ find var vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} +
sudo chown -R : .
chmod u+x bin/magento
diff --git a/_includes/install/file-system-perms-twouser_22.md b/_includes/install/file-system-perms-twouser_22.md
index b92fa7ac815..38561f7945c 100644
--- a/_includes/install/file-system-perms-twouser_22.md
+++ b/_includes/install/file-system-perms-twouser_22.md
@@ -13,9 +13,8 @@ To enable the web server to write files and directories in the Magento file syst
This section discusses how to create a new Magento file system owner and put that user in the web server's group. You can use an existing user account if you wish; we recommend the user have a strong password for security reasons.
-`
* Ubuntu: `usermod -a -G www-data `
-
- find var generated vendor pub/static pub/media app/etc -type f -exec chmod g+w {} \;
- find var generated vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} \;
+ find var generated vendor pub/static pub/media app/etc -type f -exec chmod g+w {} +
+ find var generated vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} +
sudo chown -R : .
chmod u+x bin/magento
diff --git a/_includes/install/file-system-perms-twouser_cmds-only.md b/_includes/install/file-system-perms-twouser_cmds-only.md
index 919eaf1de0d..a562e1b9b67 100644
--- a/_includes/install/file-system-perms-twouser_cmds-only.md
+++ b/_includes/install/file-system-perms-twouser_cmds-only.md
@@ -1,10 +1,7 @@
- -s /bin/bash -c
+
+ If the Magento file system owner does not allow logins you can do the following:
+
+ sudo -u
+2. To run Magento commands from any directory, add `/bin` to your system `PATH`.
+
+ Because shells have differing syntax, consult a reference like [unix.stackexchange.com](http://unix.stackexchange.com/questions/117467/how-to-permanently-set-environmental-variables).
+
+ bash shell example for CentOS:
+
+ export PATH=$PATH:/var/www/html/magento2/bin
+
+{:.bs-callout .bs-callout-info}
+You can also run the commands in the following ways:
+- `cd /bin` and run them as `./magento `
+- `php <your Magento install dir>/bin/magento ``
+- `` is a subdirectory of your web server's docroot. [Need help locating the docroot?]({{ page.baseurl }}/install-gde/basics/basics_docroot.html)
diff --git a/_includes/install/flow-diagram.md b/_includes/install/flow-diagram.md
index a3a3c75eae1..b95847b68f2 100644
--- a/_includes/install/flow-diagram.md
+++ b/_includes/install/flow-diagram.md
@@ -1,5 +1,3 @@
-
-
\ No newline at end of file
+|Magento edition|How to get help|
+|--- |--- |
+|{{site.data.var.ce}} and {{site.data.var.ee}}|- [Magento support forums](http://community.magento.com/)
- [stack Exchange](http://magento.stackexchange.com)
- [Twitter](https://twitter.com/magento)| +|{{site.data.var.ce}}|[Submit bug reports](http://www.magentocommerce.com/bug-tracking)| +|{{site.data.var.ee}} only|[Submit bug reports](http://support.magentocommerce.com)| +{:style="table-layout:auto;"} diff --git a/_includes/install/get-software_clone.md b/_includes/install/get-software_clone.md deleted file mode 100644 index 5c91f24b4e8..00000000000 --- a/_includes/install/get-software_clone.md +++ /dev/null @@ -1,6 +0,0 @@ -/bin/magento`. The new interface performs multiple tasks, including:
+
+- Installing Magento (and related tasks such as creating or updating the database schema, creating the deployment configuration, and so on).
+- Clearing the cache.
+- Managing indexes, including reindexing.
+- Creating translation dictionaries and translation packages.
+- Generating non-existent classes such as factories and interceptors for plug-ins, generating the dependency injection configuration for the object manager.
+- Deploying static view files.
+- Creating CSS from Less.
+
+Other benefits:
+
+- A single command (`php /bin/magento list`) lists all available installation and configuration commands.
+- Consistent user interface based on Symfony.
+- The CLI is extensible so third party developers can "plug in" to it. This has the additional benefit of eliminating users' learning curve.
+- Commands for disabled modules do not display.
diff --git a/_includes/install/patch/apply-patch.md b/_includes/install/patch/apply-patch.md
index 791e24576f5..0a3b7559f41 100644
--- a/_includes/install/patch/apply-patch.md
+++ b/_includes/install/patch/apply-patch.md
@@ -1,28 +1,14 @@
-
Magento enables you to enable or disable currently available modules; in other words, any Magento-provided module or any third-party module that is currently available.
-Certain modules have dependencies on other modules, in which case you might not be able to enable or disable a module because it has dependencies on other modules.
-In addition, there might be conflicting modules that cannot both be enabled at the same time.
-Examples:
-- Module A depends on Module B. You cannot disable Module B unless you first disable Module A. -
- Module A depends on Module B, both of which are disabled. You must enable module B before you can enable module A. -
- Module A conflicts with Module B. You can disable Module A and Module B, or you can disable either module but you cannot enable Module A and Module B at the same time.
Dependencies are declared in the require field in Magento's composer.json file for each module. Conflicts are declared in the conflict field in modules' composer.json files. We use that information to build a dependency graph:
A->Bmeans module A depends on module B.
- - A dependency chain is the path from a module to another one. For example, if module A depends on module B and module B depends on module C, then the dependency chain is
A->B->C.
If you attempt to enable or disable a module that depends on other modules, the dependency graph displays in the error message.
-
-
-
-
-It's possible that module A's composer.json declares a conflict with module B but not vice versa.
Command line module enable or disable subcommand only: To force a module to be enabled or disabled regardless of its dependencies, use the optional --force argument.
-
diff --git a/_includes/install/enable-disable-modules.md b/_includes/install/enable-disable-modules.md
new file mode 100644
index 00000000000..ebcf8b1dc03
--- /dev/null
+++ b/_includes/install/enable-disable-modules.md
@@ -0,0 +1,28 @@
+Magento enables you to enable or disable currently available modules; in other words, any Magento-provided module or any third-party module that is currently available.
+
+Certain modules have dependencies on other modules, in which case you might not be able to enable or disable a module because it has dependencies on other modules.
+
+In addition, there might be *conflicting* modules that cannot both be enabled at the same time.
+
+Examples:
+
+- Module A depends on Module B. You cannot disable Module B unless you first disable Module A.
+
+- Module A depends on Module B, both of which are disabled. You must enable module B before you can enable module A.
+
+- Module A conflicts with Module B. You can disable Module A and Module B, or you can disable either module but you *cannot* enable Module A and Module B at the same time.
+
+- Dependencies are declared in the `require` field in Magento's `composer.json` file for each module. Conflicts are declared in the `conflict` field in modules' `composer.json` files. We use that information to build a dependency graph:
+`A->B` means module A depends on module B.
+
+- A *dependency chain* is the path from a module to another one. For example, if module A depends on module B and module B depends on module C, then the dependency chain is `A->B->C`.
+
+If you attempt to enable or disable a module that depends on other modules, the dependency graph displays in the error message.
+
+{:.bs-callout .bs-callout-info}
+It's possible that module A's `composer.json` declares a conflict with module B but not vice versa.
+
+*Command line [module enable or disable subcommand]({{ page.baseurl }}/install-gde/install/cli/install-cli-subcommands-enable.html) only:* To force a module to be enabled or disabled regardless of its dependencies, use the optional`--force` argument.
+
+{:.bs-callout .bs-callout-info}
+Using `--force` can disable your Magento store and cause problems accessing the Magento Admin.
diff --git a/_includes/install/file-system-perms-before.md b/_includes/install/file-system-perms-before.md
index 2cb345a803e..407ffd49ae7 100644
--- a/_includes/install/file-system-perms-before.md
+++ b/_includes/install/file-system-perms-before.md
@@ -1,14 +1,11 @@
-Using --force can disable your Magento store and cause problems accessing the Magento Admin.
-
## Set pre-installation file system ownership and permissions {#perms-over}
This topic discusses how to set read-write permissions for the web server group before you install the Magento software. This is necessary so the Setup Wizard or command line can write files to the Magento file system.
The procedure you use is different, depending on whether you use [shared hosting](#perms-shared) and have one user or if you use a [private server](#perms-private) and have two users.
-
\ No newline at end of file
diff --git a/_includes/install/file-system-perms-before_22.md b/_includes/install/file-system-perms-before_22.md
index 056d6755b79..bf216fc0a7d 100644
--- a/_includes/install/file-system-perms-before_22.md
+++ b/_includes/install/file-system-perms-before_22.md
@@ -1,14 +1,11 @@
-
-
+{:.bs-callout .bs-callout-info}
+If you're using a Magento version*earlier than* 2.0.6, see [Appendix—Magento file system ownership and appendix (legacy)]({{ page.baseurl }}/install-gde/install/legacy-file-system-perms.html) instead.
## Set permissions for shared hosting (one user) {#perms-shared}
@@ -36,4 +33,3 @@ After you've performed the other tasks in this topic, enter one of the following
For example,
su magento_user
-If you're using a Magento version earlier than 2.0.6, see Appendix—Magento file system ownership and appendix (legacy) instead.
-
-
## Set pre-installation file system ownership and permissions {#perms-over}
This topic discusses how to set read-write permissions for the web server group before you install the Magento software. This is necessary so the Setup Wizard or command line can write files to the Magento file system.
The procedure you use is different, depending on whether you use [shared hosting](#perms-shared) and have one user or if you use a [private server](#perms-private) and have two users.
-
\ No newline at end of file
diff --git a/_includes/install/file-system-perms-oneuser.md b/_includes/install/file-system-perms-oneuser.md
index 6083bef424d..374be9c2365 100644
--- a/_includes/install/file-system-perms-oneuser.md
+++ b/_includes/install/file-system-perms-oneuser.md
@@ -12,13 +12,13 @@ To set permissions before you install the Magento software:
2. If you have command-line access, enter the following commands in the order shown:
cd
-
+{:.bs-callout .bs-callout-info}
+If you're using a Magento version *earlier than* 2.0.6, see [Appendix—Magento file system ownership and appendix (legacy)]({{ page.baseurl }}/install-gde/install/legacy-file-system-perms.html) instead.
## Set permissions for shared hosting (one user) {#perms-shared}
@@ -36,4 +33,3 @@ After you've performed the other tasks in this topic, enter one of the following
For example,
su magento_user
-If you're using a Magento version earlier than 2.0.6, see Appendix—Magento file system ownership and appendix (legacy) instead.
-
-
+{:.bs-callout .bs-callout-info}
+To further restrict permissions after installing the Magento software, you [configure a Magento umask]({{ page.baseurl }}/install-gde/install/post-install-umask.html).
*[contributing developer]: A developer who contributes code to the Magento 2 CE codebase
diff --git a/_includes/install/file-system-perms-oneuser_22.md b/_includes/install/file-system-perms-oneuser_22.md
index 2146b5e3a06..8d6189bf2ad 100644
--- a/_includes/install/file-system-perms-oneuser_22.md
+++ b/_includes/install/file-system-perms-oneuser_22.md
@@ -13,13 +13,13 @@ To set permissions before you install the Magento software:
2. If you have command-line access, enter the following commands in the order shown:
cd To further restrict permissions after installing the Magento software, you configure a Magento umask.
-
-
+{:.bs-callout .bs-callout-info}
+To further restrict permissions after installing the Magento software, you [configure a Magento umask]({{ page.baseurl }}/install-gde/install/post-install-umask.html).
*[contributing developer]: A developer who contributes code to the Magento 2 CE codebase
diff --git a/_includes/install/file-system-perms-twouser.md b/_includes/install/file-system-perms-twouser.md
index 5cde6b4ef80..ec96613084b 100644
--- a/_includes/install/file-system-perms-twouser.md
+++ b/_includes/install/file-system-perms-twouser.md
@@ -13,9 +13,8 @@ To enable the web server to write files and directories in the Magento file syst
This section discusses how to create a new Magento file system owner and put that user in the web server's group. You can use an existing user account if you wish; we recommend the user have a strong password for security reasons.
-To further restrict permissions after installing the Magento software, you configure a Magento umask.
-
- Skip to step 2 if you plan on using an existing user account.
-
+{:.bs-callout .bs-callout-info}
+Skip to [step 2](#install-update-depend-user-findgroup) if you plan on using an existing user account.
### Step 1: Create the Magento file system owner and give the user a strong password {#mage-owner-create-user}
@@ -31,18 +30,16 @@ To give the user a password, enter the following command as a user with `root` p
Follow the prompts on your screen to create a password for the user.
-
-
+{:.bs-callout .bs-callout-warning}
+If you don't have `root` privileges on your Magento server, you can use another local user account. Make sure the user has a strong password and continue with [Put the Magento file system owner in the web server group](#install-update-depend-user-add2group).
For example, to create a user named `magento_user` and give the user a password, enter:
sudo adduser magento_user
sudo passwd magento_user
-If you don't have root privileges on your Magento server, you can use another local user account. Make sure the user has a strong password and continue with Put the Magento file system owner in the web server group.
-
+{:.bs-callout .bs-callout-warning}
+Because the point of creating this user is to provide added security, make sure you create a [strong password](https://en.wikipedia.org/wiki/Password_strength).
### Step 2: Find the web server user's group {#install-update-depend-user-findgroup}
@@ -62,9 +59,8 @@ To put the Magento file system owner in the web server's group (assuming the typ
* CentOS: `usermod -a -G apache Because the point of creating this user is to provide added security, make sure you create a strong password.
-
+{:.bs-callout .bs-callout-info}
The `-a -G` options are important because they add `apache` or `www-data` as a _secondary_ group to the user account, which preserves the user's _primary_ group. Adding a secondary group to a user account helps [restrict file ownership and permissions](#perms-set-two-users) to ensure members of a shared group only have access to certain files.
-
For example, to add `apache` as a secondary group to user `magento_user` on CentOS:
@@ -78,9 +74,8 @@ The following sample result shows the user's primary (`magento`) and secondary (
magento_user : magento_user apache
-
+{:.bs-callout .bs-callout-info}
Typically, the username and primary group name are the same.
-
To complete the task, restart the web server:
@@ -103,8 +98,8 @@ To set ownership and permissions before you install the Magento software:
2. Enter the following commands in the order shown:
cd
- Skip to step 2 if you plan on using an existing user account.
-
+{:.bs-callout .bs-callout-info}
+Skip to [step 2](#install-update-depend-user-findgroup) if you plan on using an existing user account.
### Step 1: Create the Magento file system owner and give the user a strong password {#mage-owner-create-user}
@@ -31,18 +30,16 @@ To give the user a password, enter the following command as a user with `root` p
Follow the prompts on your screen to create a password for the user.
-
-
+{:.bs-callout .bs-callout-warning}
+If you don't have `root` privileges on your Magento server, you can use another local user account. Make sure the user has a strong password and continue with [Put the Magento file system owner in the web server group](#install-update-depend-user-add2group).
For example, to create a user named `magento_user` and give the user a password, enter:
sudo adduser magento_user
sudo passwd magento_user
-If you don't have root privileges on your Magento server, you can use another local user account. Make sure the user has a strong password and continue with Put the Magento file system owner in the web server group.
-
+{:.bs-callout .bs-callout-warning}
+Because the point of creating this user is to provide added security, make sure you create a [strong password](https://en.wikipedia.org/wiki/Password_strength).
### Step 2: Find the web server user's group {#install-update-depend-user-findgroup}
@@ -62,9 +59,8 @@ To put the Magento file system owner in the web server's primary group (assuming
* CentOS: `usermod -a -G apache Because the point of creating this user is to provide added security, make sure you create a strong password.
-
+{:.bs-callout .bs-callout-info}
The `-a -G` options are important because they add `apache` or `www-data` as a _secondary_ group to the user account, which preserves the user's _primary_ group. Adding a secondary group to a user account helps [restrict file ownership and permissions](#perms-set-two-users) to ensure members of a shared group only have access to certain files.
-
For example, to add the user `magento_user` to the `apache` primary group on CentOS:
@@ -78,9 +74,8 @@ The following sample result shows the user's primary (`magento`) and secondary (
magento_user : magento_user apache
-
+{:.bs-callout .bs-callout-info}
Typically, the username and primary group name are the same.
-
To complete the task, restart the web server:
@@ -103,8 +98,8 @@ To set ownership and permissions before you install the Magento software:
2. Enter the following commands in the order shown:
cd
-
To optionally enter all commands on one line, enter the following assuming Magento is installed in `/var/www/html/magento2` and the web server group name is `apache`:
- cd /var/www/html/magento2 && find var vendor pub/static pub/media app/etc -type f -exec chmod g+w {} \; && find var vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} \; && chown -R :apache . && chmod u+x bin/magento
+ cd /var/www/html/magento2 && find var vendor pub/static pub/media app/etc -type f -exec chmod g+w {} + && find var vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} + && chown -R :apache . && chmod u+x bin/magento
In the event file system permissions are set improperly and can't be changed by the Magento file system owner, you can enter the command as a user with `root` privileges:
- cd /var/www/html/magento2 && sudo find var vendor pub/static pub/media app/etc -type f -exec chmod g+w {} \; && sudo find var vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} \; && sudo chown -R :apache . && sudo chmod u+x bin/magento
-
\ No newline at end of file
+ cd /var/www/html/magento2 && sudo find var vendor pub/static pub/media app/etc -type f -exec chmod g+w {} + && sudo find var vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} + && sudo chown -R :apache . && sudo chmod u+x bin/magento
diff --git a/_includes/install/file-system-perms-twouser_cmds-only_22.md b/_includes/install/file-system-perms-twouser_cmds-only_22.md
index 839c9803b1d..d2c50e11c00 100644
--- a/_includes/install/file-system-perms-twouser_cmds-only_22.md
+++ b/_includes/install/file-system-perms-twouser_cmds-only_22.md
@@ -1,10 +1,7 @@
-
-
To optionally enter all commands on one line, enter the following assuming Magento is installed in `/var/www/html/magento2` and the web server group name is `apache`:
- cd /var/www/html/magento2 && find var generated vendor pub/static pub/media app/etc -type f -exec chmod g+w {} \; && find var generated vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} \; && chown -R :apache . && chmod u+x bin/magento
+ cd /var/www/html/magento2 && find var generated vendor pub/static pub/media app/etc -type f -exec chmod g+w {} + && find var generated vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} + && chown -R :apache . && chmod u+x bin/magento
In the event file system permissions are set improperly and can't be changed by the Magento file system owner, you can enter the command as a user with `root` privileges:
- cd /var/www/html/magento2 && sudo find var generated vendor pub/static pub/media app/etc -type f -exec chmod g+w {} \; && sudo find var generated vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} \; && sudo chown -R :apache . && sudo chmod u+x bin/magento
-
\ No newline at end of file
+ cd /var/www/html/magento2 && sudo find var generated vendor pub/static pub/media app/etc -type f -exec chmod g+w {} + && sudo find var generated vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} + && sudo chown -R :apache . && sudo chmod u+x bin/magento
diff --git a/_includes/install/file-system-umask-over.md b/_includes/install/file-system-umask-over.md
index 3beb7f3619c..b0b1284a952 100644
--- a/_includes/install/file-system-umask-over.md
+++ b/_includes/install/file-system-umask-over.md
@@ -1,13 +1,9 @@
-
-
## Overview of ownership and permissions {#umask-over}
Even in a development environment, you want your Magento installation to be secure. To help prevent issues related to unauthorized people or processes doing potentially harmful things to your system, we recommend some guidelines related to file system ownership and permissions.
-
\ No newline at end of file
diff --git a/_includes/install/file-system-umask.md b/_includes/install/file-system-umask.md
index d02504211be..0341b9d4de6 100644
--- a/_includes/install/file-system-umask.md
+++ b/_includes/install/file-system-umask.md
@@ -1,12 +1,9 @@
-
-
+{:.bs-callout .bs-callout-info}
+If you're using an Magento version 2.0.5 or earlier, see [Appendix—Magento file system ownership and appendix (legacy)]({{ page.baseurl }}/install-gde/install/legacy-file-system-perms.html) instead of this topic. In version 2.0.6 and later, Magento does not explicitly set file or directory permissions.
This topic provides some basic information about our ownership and permissions guidelines. For additional information, see:
@@ -18,23 +14,22 @@ This topic provides some basic information about our ownership and permissions g
We refer to the *Magento file system owner* as a user who owns and can write to files in the Magento file system.
-If you're using an Magento version 2.0.5 or earlier, see Appendix—Magento file system ownership and appendix (legacy) instead of this topic.
-In version 2.0.6 and later, Magento does not explicitly set file or directory permissions.
-
-
+{:.bs-callout .bs-callout-info}
+The Magento file system owner is sometimes referred to as the *command-line user*.
The Magento file system owner is any of the following:
-* A single user, which is typical of shared hosting.
+* A single user, which is typical of shared hosting.
Shared hosting providers enable you to log in to the Magento server as one user. This user can log in, transfer files using FTP, and this user also runs the web server.
- If you use one Magento user, you have the option of setting a [umask](#restrict) to further restrict access, particularly in production.
+ If you use one Magento user, you have the option of setting a [umask](#restrict) to further restrict access, particularly in production.
* Users that belong to a shared group, which is typical of private hosting or having your own Magento server.
In this situation, you typically *cannot* log in to the server as, or switch to, the web server user. Instead, you have separate users:
- * The web server user, which runs the Magento Admin and storefront.
+ * The web server user, which runs the Magento Admin and storefront.
* A *command-line user*, which is a local user account you can use to log in to the server. This user runs Magento cron jobs and command-line utilities.
@@ -48,11 +43,10 @@ Before you install the Magento software, see [Set pre-installation ownership and
To tighten security, particularly in production on a shared hosting system, we provide a flexible to means to restrict access using a umask. A umask—also referred to as a *file system creation mask*—is a set of bits, each of which restricts how its corresponding permission is set for newly created files.
-The Magento file system owner is sometimes referred to as the command-line user.
-
-
+{:.bs-callout .bs-callout-warning}
+File system security is complex and extremely important. We strongly recommend you consult an experienced system administrator or network administrator before you decide what permissions to set. We provide a mechanism for you to use but a permissions strategy is up to you.
-Magento uses a three-bit mask, by default `002`, that you subtract from the UNIX defaults of 666 for files and 777 for directories.
+Magento uses a three-bit mask, by default `002`, that you subtract from the UNIX defaults of 666 for files and 777 for directories.
Here's what that means:
@@ -67,4 +61,3 @@ For more information about `magento_umask`, see [Optionally set a umask]({{ page
We recommend different permissions and ownership for default mode, developer mode, and production mode.
We discuss these recommendations in [Magento ownership and permissions in development and production]({{ page.baseurl }}/config-guide/prod/prod_file-sys-perms.html).
-File system security is complex and extremely important. We strongly recommend you consult an experienced system administrator or network administrator before you decide what permissions to set. We provide a mechanism for you to use but a permissions strategy is up to you.
-
+The web server group must have write permissions to certain directories in the Magento file system; however, you might want tighter security, especially in production. We provide the flexibility for you to further restrict those permissions using a [umask](http://www.cyberciti.biz/tips/understanding-linux-unix-umask-value-usage.html).
-The web server group must have write permissions to certain directories in the Magento file system; however, you might want tighter security, especially in production. We provide the flexibility for you to further restrict those permissions using a [umask](http://www.cyberciti.biz/tips/understanding-linux-unix-umask-value-usage.html){:target="_blank"}.
+Our solution is to enable you to optionally create a file named `magento_umask` in your Magento root directory that restricts permissions for the web server group and everyone else.
-Our solution is to enable you to optionally create a file named `magento_umask` in your Magento root directory that restricts permissions for the web server group and everyone else.
-
-
\ No newline at end of file
diff --git a/_includes/install/first-steps-cli.html b/_includes/install/first-steps-cli.html
deleted file mode 100644
index 22289930724..00000000000
--- a/_includes/install/first-steps-cli.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
+{:.bs-callout .bs-callout-info}
+We recommend changing the umask on a one-user or shared hosting system only. If you have a private Magento server, the group must have write access to the Magento file system; the umask removes write access from the group.
The default umask (with no `magento_umask` specified) is `002`, which means:
@@ -29,4 +26,3 @@ To set `magento_umask`:
For example, `022`
3. Save your changes to `magento_umask` and exit the text editor.
-We recommend changing the umask on a one-user or shared hosting system only. If you have a private Magento server, the group must have write access to the Magento file system; the umask removes write access from the group.
-
-
-1. Log in to the Magento server as, or switch to, a user who has permissions to write to the Magento file system. One way to do this is to switch to the Magento file system owner.
-
- If you use the bash shell, you can also use the following syntax to switch to the Magento file system owner and enter the command at the same time:
-
- su -s /bin/bash -c
-
- If the Magento file system owner does not allow logins you can do the following:
-
- sudo -u
-2. To run Magento commands from any directory, add `/bin` to your system `PATH`.
-
- Because shells have differing syntax, consult a reference like unix.stackexchange.com.
-
- bash shell example for CentOS:
-
- export PATH=$PATH:/var/www/html/magento2/bin
-
-
\ No newline at end of file
diff --git a/_includes/install/first-steps-cli.md b/_includes/install/first-steps-cli.md
new file mode 100644
index 00000000000..cd0b69e5ad1
--- /dev/null
+++ b/_includes/install/first-steps-cli.md
@@ -0,0 +1,22 @@
+1. Log in to the Magento server as, or switch to, a user who has permissions to write to the Magento file system. One way to do this is to [switch to the Magento file system owner]({{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html).
+
+ If you use the bash shell, you can also use the following syntax to switch to the Magento file system owner and enter the command at the same time:
+
+ su
-
-
-You can also run the commands in the following ways:
-cd <your Magento install dir>/binand run them as./magento <command name>
-php <your Magento install dir>/bin/magento <command name>
<your Magento install dir> is a subdirectory of your web server's docroot. Need help locating the docroot? Click here.
-
{:width="1100px"}
The diagram shows the following:
@@ -20,10 +18,8 @@ The diagram shows the following:
* If you want to contribute to the {{site.data.var.ce}} codebase or customize the Magento application, [clone]({{ page.baseurl }}/install-gde/prereq/dev_install.html) the Magento 2 GitHub repository. (This method requires familiarity with both GitHub and Composer.)
-
diff --git a/_includes/install/fully-secure.md b/_includes/install/fully-secure.md
index 30ed5d685d7..187dfbc7e3b 100644
--- a/_includes/install/fully-secure.md
+++ b/_includes/install/fully-secure.md
@@ -1,5 +1,3 @@
-
-
+ {:.bs-callout .bs-callout-info}
+ To be able to use the Web Setup Wizard to install or upgrade the Magento software, or to manage extensions you get from Magento Marketplace, you must either get a compressed archive or a Composer metapackage. If you clone the GitHub repository, you *cannot* use the Web Setup Wizard to upgrade the Magento software and extensions. You must upgrade using [Composer and Git commands]({{ page.baseurl }}/install-gde/install/cli/dev_options.html).
3. Install the Magento software using either the Web Setup Wizard or command line.
@@ -34,4 +30,3 @@ The diagram shows the following:
If the step fails because prerequisite software isn't set up correctly, review our [Prerequisites]({{ page.baseurl }}/install-gde/prereq/prereq-overview.html).
4. Verify the installation by viewing your storefront and the Magento Admin.
-To be able to use the Web Setup Wizard to install or upgrade the Magento software, or to manage extensions you get from Magento Marketplace, you must either get a compressed archive or a Composer metapackage.
-If you clone the GitHub repository, you cannot use the Web Setup Wizard to upgrade the Magento software and extensions. You must upgrade using Composer and git commands.
-
-
## Completely secure installation {#instgde-cli-fully-secure}
To use Secure Sockets Layer (SSL), also referred to as HTTPS, for both the Magento Admin and the storefront, you must set all of the following parameters:
@@ -10,4 +8,3 @@ To use Secure Sockets Layer (SSL), also referred to as HTTPS, for both the Magen
More details about these parameters can be found later in this topic.
-
\ No newline at end of file
diff --git a/_includes/install/get-help.md b/_includes/install/get-help.md
index b8a7f0ee991..a38dd58a590 100644
--- a/_includes/install/get-help.md
+++ b/_includes/install/get-help.md
@@ -1,29 +1,10 @@
## Getting help with your installation {#help}
-In the event you need additional help, consult the following resources.
+In the event you need additional help, consult the following resources. -| Magento edition | -How to get help | -
|---|---|
| {{site.data.var.ce}} and {{site.data.var.ee}} | -- | -
| {{site.data.var.ce}} | -Submit bug reports | -
| {{site.data.var.ee}} only | -Submit bug reports | -
- [stack Exchange](http://magento.stackexchange.com)
- [Twitter](https://twitter.com/magento)| +|{{site.data.var.ce}}|[Submit bug reports](http://www.magentocommerce.com/bug-tracking)| +|{{site.data.var.ee}} only|[Submit bug reports](http://support.magentocommerce.com)| +{:style="table-layout:auto;"} diff --git a/_includes/install/get-software_clone.md b/_includes/install/get-software_clone.md deleted file mode 100644 index 5c91f24b4e8..00000000000 --- a/_includes/install/get-software_clone.md +++ /dev/null @@ -1,6 +0,0 @@ -
-
-## Clone the Magento 2 repository {#software-composer-clone}
-
-See Install Composer and clone the Magento repository
-
\ No newline at end of file
diff --git a/_includes/install/get-software_zip.md b/_includes/install/get-software_zip.md
index 2cc067bcc40..a63264fa4f5 100644
--- a/_includes/install/get-software_zip.md
+++ b/_includes/install/get-software_zip.md
@@ -1,5 +1,3 @@
-
-
The following table discusses where to get the Magento software. We provide the following downloads:
* {{site.data.var.ce}} or {{site.data.var.ee}} software only
@@ -13,22 +11,22 @@ Archives are available in the following formats: `.zip`, `.tar.bz2`, `.tar.gz`
+
Magento edition
Install package location
-
+
{{site.data.var.ce}}
-
+
-
+
{{site.data.var.ee}}
Use the following steps:
-
-
-
\ No newline at end of file
diff --git a/_includes/install/install-roadmap.md b/_includes/install/install-roadmap.md
index 1b4868da717..4d4cf0aa736 100644
--- a/_includes/install/install-roadmap.md
+++ b/_includes/install/install-roadmap.md
@@ -1,50 +1,47 @@
-Choose either the software or the software and sample data:
Magento-CE-<version>.*(without sample data)Magento-CE-<version>+Samples.*(with sample data)
<version/> is the three-digit release number (for example, 2.0.7, 2.1.0, and so on.)
- Go to www.magento.com +
- Go to www.magento.com
- In the top horizontal navigation bar, click My Account.
- Log in with your Magento username and password.
- In the left navigation bar, click Downloads. @@ -42,5 +40,3 @@ Archives are available in the following formats: `.zip`, `.tar.bz2`, `.tar.gz`
-
This roadmap provides a reference for the installation process. Refer to this topic at any time to move back and forth through the stages of installation.
This is a list of the most common topics you'll need for installation; the list is not comprehensive, however. You'll find additional information using the table of contents on the left side of the page.
## Precondition: How advanced are you?
-Do you know what a "terminal" application is? Do you know what operating system your server runs? Do you know what Apache is? If not, see the Installation overview.
+Do you know what a "terminal" application is? Do you know what operating system your server runs? Do you know what Apache is? If not, see the [Installation overview]({{ page.baseurl }}/install-gde/bk-install-guide.html).
## Installation part 1: Getting started
{% collapsible Topics include: %}
* [Choose how to get the Magento software]({{ page.baseurl }}/install-gde/bk-install-guide.html)
-* System requirements
-* Prerequisites
-* The Magento file system owner
+* [System requirements]({{ page.baseurl }}/install-gde/system-requirements.html)
+* [Prerequisites]({{ page.baseurl }}/install-gde/prereq/prereq-overview.html)
+* [The Magento file system owner]({{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html)
{% endcollapsible %}
## Installation part 2: Installing
{% collapsible Topics include: %}
-* Command line installation
-* Setup Wizard installation
-* Optional sample data
+* [Command line installation]({{ page.baseurl }}/install-gde/install/cli/install-cli.html)
+* [Setup Wizard installation]({{ page.baseurl }}/install-gde/install/web/install-web.html)
+* [Optional sample data]({{ page.baseurl }}/install-gde/install/web/install-web-sample-data.html)
{% endcollapsible %}
## Installation part 3: Post-installation
{% collapsible Topics include: %}
-* Verifying
-* Configuring
-* Optional sample data (after installing Magento)
+* [Verifying]({{ page.baseurl }}/install-gde/install/verify.html)
+* [Configuring]({{ page.baseurl }}/install-gde/install/post-install-config.html)
+* [Optional sample data (after installing Magento)]({{ page.baseurl }}/install-gde/install/sample-data-after-magento.html)
* [Magento in production]({{page.baseurl}}/howdoi/deploy/deploy-to-prod.html)
{% endcollapsible %}
## Upgrade, update
{% collapsible Topics include: %}
-* Upgrading (or *patching* the Magento application)
-* Updating components (including install, uninstall, update, enable, disable)
-* *Contributing developers only*: Contributing developers—update, reinstall Magento
+* [Upgrading (or *patching* the Magento application)]({{ page.baseurl }}/comp-mgr/bk-compman-upgrade-guide.html)
+* [Updating components (including install, uninstall, update, enable, disable)]({{ page.baseurl }}/comp-mgr/bk-compman-upgrade-guide.html)
+* *Contributing developers only*: [Contributing developers—update, reinstall Magento]({{ page.baseurl }}/install-gde/install/cli/dev_options.html)
{% endcollapsible %}
## Deploy to production
-Deploy Magento to production
+[Deploy Magento to production]({{ page.baseurl }}/howdoi/deploy/deploy-to-prod.html)
*[Contributing developers]: A developer who contributes code to the Magento 2 CE codebase
-
diff --git a/_includes/install/mysql_max-allowed-packet-centos.md b/_includes/install/mysql_max-allowed-packet-centos.md
index 069683175af..00797675e52 100644
--- a/_includes/install/mysql_max-allowed-packet-centos.md
+++ b/_includes/install/mysql_max-allowed-packet-centos.md
@@ -1,13 +1,9 @@
-
-
To increase the value, open `/etc/mysql.cnf` in a text editor and add search for `max_allowed_packet`. Set the value to `16M` or larger.
- If it does not exist, add it before `[mysqld_safe]`.
+ If it does not exist, add it before `[mysqld_safe]`.
Save your changes to `mysql.cnf`, close the text editor, and restart MySQL (`service mysqld restart`).
To optionally verify the value you set, enter the following command at a `mysql>` prompt:
SHOW VARIABLES LIKE 'max_allowed_packet';
-
-
\ No newline at end of file
diff --git a/_includes/install/mysql_max-allowed-packet-ubuntu.md b/_includes/install/mysql_max-allowed-packet-ubuntu.md
index 66ea22400d6..5d755b7af67 100644
--- a/_includes/install/mysql_max-allowed-packet-ubuntu.md
+++ b/_includes/install/mysql_max-allowed-packet-ubuntu.md
@@ -1,7 +1,5 @@
-
To increase the value, open `/etc/mysql/mysql.cnf` in a text editor and locate the value for `max_allowed_packet`. Save your changes to `mysql.cnf`, close the text editor, and restart MySQL (`service mysql restart`).
To optionally verify the value you set, enter the following command at a `mysql>` prompt:
SHOW VARIABLES LIKE 'max_allowed_packet';
-
\ No newline at end of file
diff --git a/_includes/install/new-cli-intro.html b/_includes/install/new-cli-intro.html
deleted file mode 100644
index db2b80069d9..00000000000
--- a/_includes/install/new-cli-intro.html
+++ /dev/null
@@ -1,14 +0,0 @@
-Magento has one command-line interface that performs both installation and configuration tasks: <your Magento install dir>/bin/magento. The new interface performs multiple tasks, including:
- Installing Magento (and related tasks such as creating or updating the database schema, creating the deployment configuration, and so on) -
- Clearing the cache -
- Managing indexes, including reindexing -
- Creating translation dictionaries and translation packages -
- Generating non-existent classes such as factories and interceptors for plug-ins, generating the dependency injection configuration for the object manager. -
- Deploying static view files -
- Creating CSS from LESS
Other benefits:
-- A single command (php
<your Magento install dir>/bin/magento list) lists all available installation and configuration commands
- - Consistent user interface based on Symfony -
- The CLI is extensible so third party developers can "plug in" to it
-This has the additional benefit of eliminating users' learning curve
- - Commands for disabled modules do not display.
-
To apply a patch:
-1. Copy the patch file to your Magento installation directory.
-2. As the Magento file system owner, use one of the following commands to extract it:
+1. Copy the patch file to your Magento installation directory.
+1. As the Magento file system owner, use one of the following commands to extract it:
-
-
-
+| Patch file format | Command to extract |
+| ----------------- | ------------------------------- |
+| .zip | `unzip -o .zip` |
+| .tar.gz | `tar -zxf .tar.gz` |
+| .tar.bz2 | `tar -jxf .tar.bz2` |
+{:style="table-layout:auto;"}
-
| Patch file format | -Command to extract | -
|---|---|
.zip |
- unzip -o <patch name>.zip |
-
.tar.gz |
- tar -zxf <patch name>.tar.gz |
-
.tar.bz2 |
- tar -jxf <patch name>.tar.bz2 |
-
-
+{:.bs-callout .bs-callout-info}
+If you don't have command line access to your Magento server, extract the patch locally and transfer the files to the server using an FTP application.
diff --git a/_includes/install/patch/get-patch-ee.md b/_includes/install/patch/get-patch-ee.md
index c1f2733d376..5ed8e4bc5eb 100644
--- a/_includes/install/patch/get-patch-ee.md
+++ b/_includes/install/patch/get-patch-ee.md
@@ -1,24 +1,22 @@
-If you don't have command line access to your Magento server, extract the patch locally and transfer the files to the server using an FTP application.
-
-
You can get a {{site.data.var.ee}} patch in any of the following ways:
#### From the {{site.data.var.ee}} merchant portal
To get a patch from the {{site.data.var.ee}} merchant portal:
-1. Go to [www.magento.com](http://www.magento.com){:target="_blank"}.
-2. In the top horizontal navigation bar, click **My Account**.
-3. Log in with your Magento username and password.
-4. In the left navigation bar, click **Downloads**.
-5. Click **Magento Enterprise Edition** > **2.X** > **Magento Enterprise Edition 2.x Release** > **Support Patches**.
-6. Transfer the patch to your development system.
+1. Go to [www.magento.com](http://www.magento.com).
+1. In the top horizontal navigation bar, click **My Account**.
+1. Log in with your Magento username and password.
+1. In the left navigation bar, click **Downloads**.
+1. Click **Magento Enterprise Edition** > **2.X** > **Magento Enterprise Edition 2.x Release** > **Support Patches**.
+1. Transfer the patch to your development system.
#### From the {{site.data.var.ee}} partner portal
To get a patch from the {{site.data.var.ee}} partner portal:
-1. Log in to [partners.magento.com](https://partners.magento.com/English/?rdir=/files.aspx){:target="_blank"}.
-2. Click **Magento Enterprise Edition** > **Magento Enterprise Edition 2.X** > **Magento Enterprise Edition 2.x Release** > **Support Patches**.
-3. In the left navigation bar, click **Downloads**.
-4. Follow the instructions on your screen to download the desired patch.
-5. Transfer the patch to your development system.
+1. Log in to [partners.magento.com](https://partners.magento.com/English/?rdir=/files.aspx).
+1. Click **Magento Enterprise Edition** > **Magento Enterprise Edition 2.X** > **Magento Enterprise Edition 2.x Release** > **Support Patches**.
+1. In the left navigation bar, click **Downloads**.
+1. Follow the instructions on your screen to download the desired patch.
+1. Transfer the patch to your development system.
diff --git a/_includes/install/patch/get-patch.md b/_includes/install/patch/get-patch.md
index e41124b1c24..8fe7621aae9 100644
--- a/_includes/install/patch/get-patch.md
+++ b/_includes/install/patch/get-patch.md
@@ -1,21 +1,19 @@
-
-
-
| Magento edition | Patch location | ||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{site.data.var.ce}} | -+ |
Follow the instructions on your screen to download the desired patch. |
|||||||||||||||||||||||||||||||||||
| {{site.data.var.ee}} merchant portal | Use the following steps:
-
Magento EE partner portal |
Use the following steps:
- |
-
## TLS 1.2 requirement for PayPal
PayPal recently announced they will require Transport Layer Security (TLS) version 1.2 to process payments in a live environment. (PayPal already requires TLS 1.2 in the sandbox.)
More information:
-* [Details (PayPal security bulletin)](https://www.paypal.com/uk/webapps/mpp/ssl-security-update){:target="_blank"}
-* [PayPal live payments switching in June 2016 (PayPal technical blog)](https://devblog.paypal.com/upcoming-security-changes-notice/#tls){:target="_blank"}
+* [Details (PayPal security bulletin)](https://www.paypal.com/uk/webapps/mpp/ssl-security-update)
+* [PayPal live payments switching in June 2016 (PayPal technical blog)](https://devblog.paypal.com/upcoming-security-changes-notice/#tls)
### Symptom
@@ -18,9 +16,9 @@ According to PayPal, symptoms of the issue include the following messages in you
or
140062736746144:error:1408F10B:SSL routines:SSL3_GET_RECORD:wrong version number:s3_pkt.c:337:
-
+
... (more messages) ...
-
+
New, (NONE), Cipher is (NONE)
Secure Renegotiation IS NOT supported*
Compression: NONE
@@ -32,7 +30,7 @@ or
### Description
-The source of the issue is your version of [`libcurl`](https://curl.haxx.se/libcurl/c/CURLOPT_SSLVERSION.html){:target="_blank"}. `libcurl` versions earlier than 7.34 use TLS 1.1 or earlier by default.
+The source of the issue is your version of [`libcurl`](https://curl.haxx.se/libcurl/c/CURLOPT_SSLVERSION.html). `libcurl` versions earlier than 7.34 use TLS 1.1 or earlier by default.
To determine the version of `libcurl` you're running, enter the following command on the server that processes PayPal transactions:
@@ -42,29 +40,27 @@ If the version is earlier than 7.34, continue with the next section. If you're a
### Solution
-The source of the issue is that the [`libcurl`](https://curl.haxx.se/libcurl/c/CURLOPT_SSLVERSION.html){:target="_blank"} library packaged with CentOS 6.6 and earlier use TLS 1.1 or earlier by default.
+The source of the issue is that the [`libcurl`](https://curl.haxx.se/libcurl/c/CURLOPT_SSLVERSION.html) library packaged with CentOS 6.6 and earlier use TLS 1.1 or earlier by default.
To determine the version of CentOS your server runs, enter the following command:
cat /etc/*release*
-If you're already running CentOS 6.8 or later, no action is necessary. According to the [CentOS 6.8 changelog](https://wiki.centos.org/Manuals/ReleaseNotes/CentOS6.8){:target="_blank"}, "various applications now support TLS 1.2, i.e. OpenLDAP, yum, stunnel, vsftpd, git, postfix and others. Also TLS 1.2 has been enabled by default in various packages".
+If you're already running CentOS 6.8 or later, no action is necessary. According to the [CentOS 6.8 changelog](https://wiki.centos.org/Manuals/ReleaseNotes/CentOS6.8), "various applications now support TLS 1.2, i.e. OpenLDAP, yum, stunnel, vsftpd, git, postfix and others. Also TLS 1.2 has been enabled by default in various packages".
(CentOS 7 has a newer version of `libcurl` that also defaults to TLS 1.2.)
You have the following options:
-* (Recommended). Upgrade your Magento server to CentOS 6.8 or later.
+* (Recommended). Upgrade your Magento server to CentOS 6.8 or later.
Its recommended repositories support current versions of TLS with `libcurl`. Using CentOS 6.8 or later is the most secure way to continue operating your store and accepting PayPal.
- CentOS 6.8 has a `libcurl` version that defaults to TLS 1.2.
+ CentOS 6.8 has a `libcurl` version that defaults to TLS 1.2.
* (Less secure, *not recommended*). Upgrade to `libcurl` 7.34 or later on CentOS 6 using a non-recommended third-party repository.
- One possible solution is to use the information on [serverfault](http://serverfault.com/questions/321321/upgrade-curl-to-latest-on-centos){:target="_blank"}.
+ One possible solution is to use the information on [serverfault](http://serverfault.com/questions/321321/upgrade-curl-to-latest-on-centos).
-
\ No newline at end of file
+ {:.bs-callout .bs-callout-info}
+ Installing software from non-recommended repositories can change other system packages and can result in issues. We strongly recommend you upgrade `libcurl` in a development environment and *thoroughly test* all payment processors you use as well as any other critical software before putting this into production.
diff --git a/_includes/install/php_2.0.md b/_includes/install/php_2.0.md
index c460d8b20da..086384fff1f 100644
--- a/_includes/install/php_2.0.md
+++ b/_includes/install/php_2.0.md
@@ -1,7 +1,2 @@
-
-
-Installing software from non-recommended repositories can change other system packages and can result in issues. We strongly recommend you upgrade
-
| 5.4.x | 5.5.0–5.5.21 | 5.5.22–5.5.x | 5.6.x | 7.0.0, 7.0.1 | 7.0.2 | 7.0.3–7.0.5 | 7.0.6–7.0.x | 7.1.x |
-|  |  |  |  |  |  |  |  | 
-
-
-
\ No newline at end of file
+|  |  |  |  |  |  |  |  |  |
diff --git a/_includes/install/php_2.1.md b/_includes/install/php_2.1.md
index 8b5e21aee62..04c431f2271 100644
--- a/_includes/install/php_2.1.md
+++ b/_includes/install/php_2.1.md
@@ -1,6 +1,2 @@
-
-
| 5.5.x | 5.6.0–5.6.4 | 5.6.5–5.6.x | 7.0.0, 7.0.1 | 7.0.2 | 7.0.3 | 7.0.4 | 7.0.5 | 7.0.6–7.0.x | 7.1.x |
-|  |  |  |  |  | |  |  |  | |
-
-
\ No newline at end of file
+|  |  |  |  |  |  |  |  |  |  |
diff --git a/_includes/install/php_2.2.md b/_includes/install/php_2.2.md
index a95c8dd70aa..d275a7622cf 100644
--- a/_includes/install/php_2.2.md
+++ b/_includes/install/php_2.2.md
@@ -1,6 +1,2 @@
-
-
-| 7.0.0, 7.0.1 | 7.0.2 | 7.0.3 | 7.0.4 | 7.0.5 | 7.0.6–7.0.x | 7.1.x |
-|  |  | |  |  |  | 
-
-
+| 7.0.0–7.0.12 | 7.0.13–7.0.x | 7.1.x |
+|  |  |  |
diff --git a/_includes/install/php_2.3.md b/_includes/install/php_2.3.md
index de16de14183..a621edd5302 100644
--- a/_includes/install/php_2.3.md
+++ b/_includes/install/php_2.3.md
@@ -1,6 +1,2 @@
-
-
| 7.0.0, 7.0.1 | 7.0.2 | 7.0.3 | 7.0.4 | 7.0.5 | 7.0.6–7.0.x | 7.1.3+ | 7.2.x |
-|  |  | |  |  |  |  | 
-
-
\ No newline at end of file
+|  |  |  |  |  |  |  |  |
diff --git a/_includes/install/post-install-configure.md b/_includes/install/post-install-configure.md
deleted file mode 100644
index 02343d38d7a..00000000000
--- a/_includes/install/post-install-configure.md
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-* Learn about Magento's deployment configuration
-* Understand the Magento application bootstrapping and change bootstrap parameters
-* Configure the Magento application using the command line
-* Configure caching, including database, Redis, and Varnish
-
diff --git a/_includes/install/prereq.md b/_includes/install/prereq.md
index d316ad6f822..750a056b22e 100644
--- a/_includes/install/prereq.md
+++ b/_includes/install/prereq.md
@@ -1,7 +1,4 @@
-
-
Before you continue, make sure you've done all of the following:
- Set up a server that meets our [system requirements]({{ page.baseurl }}/install-gde/system-requirements2.html)
- Created the [Magento file system owner]({{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html)
-
diff --git a/_includes/install/releasenotes/20_release-notes-links.md b/_includes/install/releasenotes/20_release-notes-links.md
index 07f9903de29..61903155447 100644
--- a/_includes/install/releasenotes/20_release-notes-links.md
+++ b/_includes/install/releasenotes/20_release-notes-links.md
@@ -1,4 +1,4 @@
-
+
{% collapsibleh2 Magento Open Source 2.0 Release Notes %}
diff --git a/_includes/install/releasenotes/20rc_release-notes-links.md b/_includes/install/releasenotes/20rc_release-notes-links.md
index 3c9aa210857..d45a9c8cde4 100644
--- a/_includes/install/releasenotes/20rc_release-notes-links.md
+++ b/_includes/install/releasenotes/20rc_release-notes-links.md
@@ -1,4 +1,4 @@
-
+
{% collapsibleh3 Magento Open Source 2.1 Release Candidate Notes %}
diff --git a/_includes/install/releasenotes/21_release-notes-links.md b/_includes/install/releasenotes/21_release-notes-links.md
index cc1a5a50bd2..5736879037a 100644
--- a/_includes/install/releasenotes/21_release-notes-links.md
+++ b/_includes/install/releasenotes/21_release-notes-links.md
@@ -1,4 +1,4 @@
-
+
{% collapsibleh2 Magento Open Source 2.1 Release Notes %}
* [Version 2.1.12]({{ page.baseurl }}/release-notes/ReleaseNotes2.1.12CE.html){:target="_blank"}
diff --git a/_includes/install/releasenotes/22_release-notes-links.md b/_includes/install/releasenotes/22_release-notes-links.md
deleted file mode 100644
index 73aa903cbc0..00000000000
--- a/_includes/install/releasenotes/22_release-notes-links.md
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-{% collapsibleh2 Magento Open Source 2.2 Release Notes %}
-* [Version 2.2.2]({{ page.baseurl }}/release-notes/ReleaseNotes2.2.2CE.html){:target="_blank"}
-* [Version 2.2.1]({{ page.baseurl }}/release-notes/ReleaseNotes2.2.1CE.html){:target="_blank"}
-* [Version 2.2.0]({{ page.baseurl }}/release-notes/ReleaseNotes2.2.0CE.html){:target="_blank"}
-
-{% endcollapsibleh2 %}
-
-
-{% collapsibleh2 Magento Commerce 2.2 Release Notes %}
-* [Version 2.2.2]({{ page.baseurl }}/release-notes/ReleaseNotes2.2.2EE.html){:target="_blank"}
-* [Version 2.2.1]({{ page.baseurl }}/release-notes/ReleaseNotes2.2.1EE.html){:target="_blank"}
-* [Version 2.2.0]({{ page.baseurl }}/release-notes/ReleaseNotes2.2.0EE.html){:target="_blank"}
-
-{% endcollapsibleh2 %}
-
-{% collapsibleh2 Magento Commerce (Cloud) 2.2 Release Notes %}
-
-* [magento-cloud-configuration release 101.9.x Release Notes]({{ page.baseurl }}/cloud/release-notes/CloudReleaseNotes101.9.html){:target="_blank"}
-* [magento-cloud-configuration release 101.8.x Release Notes]({{ page.baseurl }}/cloud/release-notes/CloudReleaseNotes101.8.html){:target="_blank"}
-
-{% endcollapsibleh2 %}
diff --git a/_includes/install/releasenotes/ce_install_20.md b/_includes/install/releasenotes/ce_install_20.md
index d3986ac9784..c84d508392c 100644
--- a/_includes/install/releasenotes/ce_install_20.md
+++ b/_includes/install/releasenotes/ce_install_20.md
@@ -1,4 +1,4 @@
-
+
## Install the Magento software
@@ -13,13 +13,13 @@ See one of the following sections:
This software is available from `repo.magento.com`. Before installing the Open Source software using Composer, familiarize yourself with the Composer [metapackage]({{page.baseurl}}/install-gde/prereq/integrator_install.html), then run:
- composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition=
-
+
+
## Install the Magento software
-You can get Magento Open Source (formerly Community Edition) 2.1 from Github, Composer, or using a compressed archive.
+You can get Magento Open Source (formerly Community Edition) 2.1 from GitHub, Composer, or using a compressed archive.
See one of the following sections for more information:
@@ -13,15 +13,15 @@ See one of the following sections for more information:
### Get the Magento Open Source software using Composer {#install-rc-composer}
{:.no_toc}
-The Open Source software is available from `repo.magento.com`. Before getting the Open Source software, familiarize yourself with the Composer metapackage prerequisites, then run
+The Open Source software is available from `repo.magento.com`. Before getting the Open Source software, familiarize yourself with the Composer metapackage [prerequisites]({{ page.baseurl }}/install-gde/composer.html), then run
- composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition=
+
## Install the Magento software
@@ -13,13 +13,13 @@ See one of the following sections:
This software is available from `repo.magento.com`. Before installing the Magento Commerce software using Composer, familiarize yourself with the Composer [metapackage]({{page.baseurl}}/install-gde/prereq/integrator_install.html), then run:
- composer create-project --repository-url=https://repo.magento.com/ magento/project-enterprise-edition=
-
+
+
## Install the Magento software
See one of the following sections:
@@ -11,16 +11,16 @@ See one of the following sections:
### Get Magento Commerce using Composer {#install-rc-composer}
{:.no_toc}
-Magento Commerce (formerly Enterprise Edition) is available from `repo.magento.com`. Before installing the Magento Commerce software using Composer, familiarize yourself with these prerequisites, then run:
+Magento Commerce (formerly Enterprise Edition) is available from `repo.magento.com`. Before installing the Magento Commerce software using Composer, familiarize yourself with these [prerequisites]({{ page.baseurl }}/install-gde/composer.html), then run:
- composer create-project --repository-url=https://repo.magento.com/ magento/project-enterprise-edition=
+
The following table discusses where to get the Magento software. We provide the following downloads:
diff --git a/_includes/install/releasenotes/get-ee-software_zip.md b/_includes/install/releasenotes/get-ee-software_zip.md
index b7b17c08a13..1f0a0dd4bab 100644
--- a/_includes/install/releasenotes/get-ee-software_zip.md
+++ b/_includes/install/releasenotes/get-ee-software_zip.md
@@ -1,4 +1,4 @@
-
+
The following table discusses where to get the Magento software. We provide the following downloads:
diff --git a/_includes/install/sampledata/file-sys-perms-digest.md b/_includes/install/sampledata/file-sys-perms-digest.md
index 00c80fb9f06..1187d5d5bd2 100644
--- a/_includes/install/sampledata/file-sys-perms-digest.md
+++ b/_includes/install/sampledata/file-sys-perms-digest.md
@@ -13,10 +13,10 @@ If you run the Magento application as one user (which is typical of shared hosti
cd
-
## Complete the sample data installation {#sample-next-steps}
After you download the sample data packages, log in to your Magento server as, or switch to, the Magento file system owner and enter the following command:
diff --git a/_includes/install/sampledata/sample-data-clone.md b/_includes/install/sampledata/sample-data-clone.md
index e20396a5c22..00f796bf3ad 100644
--- a/_includes/install/sampledata/sample-data-clone.md
+++ b/_includes/install/sampledata/sample-data-clone.md
@@ -1,20 +1,18 @@
-
+
## Install sample data by cloning repositories {#sample-clone}
-This topic discusses how to get the Magento sample data if you cloned the Magento GitHub repository. This method is intended only for contributing developers (that is, developers who plan to contribute to the Magento 2 codebase).
+This topic discusses how to clone and add Magento sample data if you cloned the Magento GitHub repository. This method is intended only for contributing developers (that is, developers who plan to contribute to the Magento 2 codebase).
If you're not a contributing developer, choose one of the other options displayed in the table of contents on the left side of the page.
Contributing developers can use this method of installing sample data *only* if all of the following are true:
* You use {{site.data.var.ce}}
-* You cloned the Magento 2 repository.
+* You [cloned the Magento 2 repository]({{ page.baseurl }}/install-gde/prereq/dev_install.html).
-
-
+{:.bs-callout .bs-callout-warning}
+You can use sample data with either the `develop` branch (more current) or a released branch (such as `2.2` or `2.2.5` (more stable)). We recommend you use a released branch because it's more stable. If you're contributing code to the Magento 2 repository and you need the most recent code, use the `develop` branch. Regardless of the branch you choose, you must [clone]({{ page.baseurl }}/install-gde/prereq/dev_install.html) the corresponding branch of the Magento 2 GitHub repository. For example, sample data for the `develop` branch can be used *only* with the Magento 2 `develop` branch.
See the following sections:
@@ -25,25 +23,25 @@ See the following sections:
This section discusses how to install Magento sample data by cloning the sample data repository. You can clone the sample data repository in any of the following ways:
-* Clone with the SSH protocol
-* Clone with the HTTPS protocol
+* Clone with the [SSH protocol](#clone-sample-repo-ssh)
+* Clone with the [HTTPS protocol](#instgde-prereq-compose-clone-https)
### Clone with SSH {#clone-sample-repo-ssh}
To clone the Magento sample data GitHub repository using the SSH protocol:
-1. In a web browser, go to the Magento sample data repository.
+1. In a web browser, go to [the Magento sample data repository](https://github.com/magento/magento2-sample-data).
2. Next to the name of the branch, click **SSH** from the list.
3. Click **Copy to clipboard**
The following figure shows an example.
- You can use sample data with either the Regardless of the branch you choose, you must clone the corresponding branch of the Magento 2 GitHub repository. For example, sample data for the 
+ {:width="650px"}
4. Change to your web server's docroot directory.
Typically, for Ubuntu, it's `/var/www` and for CentOS it's `/var/www/html`.
- Need help locating the docroot?
+ Need [help locating the docroot?]({{ page.baseurl }}/install-gde/basics/basics_docroot.html)
5. Enter `git clone` and paste the value you obtained from step 1.
An example follows:
@@ -51,64 +49,65 @@ To clone the Magento sample data GitHub repository using the SSH protocol:
git clone git@github.com:magento/magento2-sample-data.git
6. Wait for the repository to clone on your server.
-
-
+ {:.bs-callout .bs-callout-info}
+ If the following error displays, make sure you [shared your SSH key](https://help.github.com/articles/generating-ssh-keys/) with GitHub:If the following error displays, make sure you shared your SSH key with GitHub: -Cloning into 'magento2'... -Permission denied (publickey). -fatal: The remote end hung up unexpectedly- + ``` + Cloning into 'magento2'... + Permission denied (publickey). + fatal: The remote end hung up unexpectedly + ```` 7. Ensure you checkout the branch of the sample data repository that corresponds with the branch you used from the main `magento2` repository. - + For example: - + If you used the `2.2-develop` branch of the Magento 2 repository, the Sample Data branch should be `2.2-develop`. - + If you used the `2.2.5` branch of the Magento 2 repository, the Sample Data branch should be `2.2.5`. - + To checkout the correct branch, run the following command from the sample data repository's root directory (assuming you need the `2.2.5` branch): git checkout 2.2.5 -7. Change to the ` 
-2. Change to your web server's docroot directory.
+ {:width="650px"}
+4. Change to your web server's docroot directory.
Typically, for Ubuntu, it's `/var/www` and for CentOS it's `/var/www/html`.
-3. Enter `git clone` and paste the value you obtained from step 1.
+5. Enter `git clone` and paste the value you obtained from step 1.
An example follows:
git clone https://github.com/magento/magento2-sample-data.git
-4. Wait for the repository to clone on your server.
+6. Wait for the repository to clone on your server.
7. Ensure you checkout the branch of the sample data repository that corresponds with the branch you used from the main `magento2` repository.
-
+
For example:
-
+
If you used the `2.2-develop` branch of the Magento 2 repository, the Sample Data branch should be `2.2-develop`.
-
+
If you used the `2.2.5` branch of the Magento 2 repository, the Sample Data branch should be `2.2.5`.
-
+
To checkout the correct branch, run the following command from the sample data repository's root directory (assuming you need the `2.2.5` branch):
git checkout 2.2.5
-5. Change to the `
-If you're installing sample data _after_ installing Magento, you must also run the following command to update the database and schema:
+10. Wait for the command to complete.
+11. See the next section.
- php
+{:.bs-callout .bs-callout-warning}
+If you're installing sample data _after_ installing Magento, you must also run the following command to update the database and schema: `php
+
This section discusses how to install sample data if you got the Magento software in any of the following ways:
* Downloaded a compressed archive from [Magento](https://magento.com/tech-resources/download).
- If you downloaded an archive from Github, this method won't work because the `composer.json` file doesn't contain the `repo.magento.com` URL.
+ If you downloaded an archive from GitHub, this method won't work because the `composer.json` file doesn't contain the `repo.magento.com` URL.
* Used `composer create-project`
You can use this method of getting sample data for both {{site.data.var.ce}} or {{site.data.var.ee}}, but you must use the same [authentication keys]({{ page.baseurl }}/install-gde/prereq/connect-auth.html) you used to install Magento.
-
-If you encounter errors, such as `Could not find package...` or `...no matching package found...`, make sure there aren’t any typos in your command. If you still encounter errors, you may not have access to the right Composer repositories, especially if your using {{site.data.var.ee}}. Contact [Magento support](https://magento.com/support){:target="_blank"} for help.
-
+{:.bs-callout .bs-callout-info}
+If you encounter errors, such as `Could not find package...` or `...no matching package found...`, make sure there aren’t any typos in your command. If you still encounter errors, you may not have access to the right Composer repositories, especially if your using {{site.data.var.ee}}. Contact [Magento support](https://magento.com/support) for help.
You can use Composer to install sample data either before or after installing Magento; however, there might be [additional tasks]({{ page.baseurl }}/install-gde/install/sample-data.html).
If you're a contributing developer, refer to [Install by cloning repositories]({{install-gde/install/sample-data-after-clone.html}}).
-
-
+{:.bs-callout .bs-callout-warning}
+Do not install sample data if your Magento application is set for [production mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html#production-mode). Switch to [developer mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html#developer-mode) first. Installing sample data in production mode [fails]({{ page.baseurl }}/install-gde/trouble/tshoot_sample-data.html#trouble-samp-prod).
To install sample data using the command line, enter the following command as the Magento file system owner:
php Do not install sample data if your Magento application is set for production mode. Switch to developer mode first. Installing sample data in production mode fails. -
-If you're installing sample data _after_ installing Magento, you must also run the following command to update the database and schema:
-
- php
+{:.bs-callout .bs-callout-warning}
+If you're installing sample data _after_ installing Magento, you must also run the following command to update the database and schema: `php
-
## Introduction to Magento sample data {#instgde-prereq-sample-intro}
Magento sample data provides a storefront based on the Luma theme outfitted with products, categories, customer registration, and so on. It functions just like a Magento storefront and you can manipulate prices, inventory, and promotional pricing rules using the Magento Admin.
-You can install sample data either before or after installing the Magento software. When you're done with the sample data, you can either remove it or you can install it fresh as discussed in Remove sample data modules or update sample data.
+You can install sample data either before or after installing the Magento software. When you're done with the sample data, you can either remove it or you can install it fresh as discussed in [Remove sample data modules or update sample data]({{ page.baseurl }}/install-gde/install/sample-data-other-cmds.html).
-
-
+{:.bs-callout .bs-callout-warning}
+There is currently no way to uninstall sample data. We recommend you use sample data only to learn about how Magento works. Avoid doing any development in a system in which you installed sample data.
You can install optional sample data in any of the following ways:
-There is currently no way to uninstall sample data. We recommend you use sample data only to learn about how Magento works. Avoid doing any development in a system in which you installed sample data. -
-
## Remove sample data modules or update sample data {#instgde-prereq-sample-intro}
This topic discusses how to:
@@ -11,13 +9,13 @@ This topic discusses how to:
## First steps {#sample-first}
-{% include install/first-steps-cli.html %}
+{% include install/first-steps-cli.md %}
## Remove sample data modules {#inst-sample-remove}
Enter the following command:
- magento sampledata:remove
+ magento sampledata:remove
-
1. From the **Store Default Time Zone** list, click the name of your store's time zone.
2. From the **Store Default Currency** list, click the default currency to use in your store.
@@ -16,12 +8,12 @@
3. Expand **Advanced Modules Configuration** to optionally enable or disable modules before you install the Magento software.
- Before you enable or disable modules, review the information discussed in Enabling and disabling modules.
+ Before you enable or disable modules, review the information discussed in [Enabling and disabling modules]({{ page.baseurl }}/install-gde/install/web/install-web.html#instgde-install-web-enable-mod).
See one of the following sections for more information about enabling and disabling modules:
- * General module configuration options
- * Module dependency errors
+ * [General module configuration options](#instgde-install-magento-web-step4-depend1)
+ * [Module dependency errors](#instgde-install-magento-web-step4-depend2)
4. Click **Next**.
@@ -47,18 +39,15 @@ The following figure shows an example of disabling the `Magento_GoogleAnalytics`
#### Module dependency errors {#instgde-install-magento-web-step4-depend2}
-A dependency error occurs when two inter-dependent modules are disabled at the same time.
+A dependency error occurs when two inter-dependent modules are disabled at the same time.
If there is a dependency error, a message similar to the following displays.
- 
+
Click **Show details** to display details about the dependency error. You can then do any of the following:
* Select the **Skip dependency check for individual modules** to ignore the issue and continue with your installation. (Additional dependency checks are performed after you click **Next**.)
* Resolve the issue by taking the action indicated by the message.
-
-
-
-
+{:.bs-callout .bs-callout-warning}
+Use Skip dependency check for individual modules with caution. We recommend against it because a typical reason for this error is you manually edited the [deployment configuration]({{ page.baseurl }}/config-guide/config/config-php.html). Editing the deployment configuration is not recommended because future Magento software updates can undo your changes.
diff --git a/_includes/install/web/install-web_5-create-admin.md b/_includes/install/web/install-web_5-create-admin.md
index 31acbcb3e76..f4a00015735 100644
--- a/_includes/install/web/install-web_5-create-admin.md
+++ b/_includes/install/web/install-web_5-create-admin.md
@@ -2,32 +2,12 @@
1. Enter the following information:
- Use Skip dependency check for individual modules with caution. We recommend against it because a typical reason for this error is you manually edited the deployment configuration. Editing the deployment configuration is not recommended because future Magento software updates can undo your changes. -
-
## Step 6: Install {#instgde-install-magento-web-step6}
After completing all preceding steps in the Setup Wizard, click **Install Now**.
@@ -22,24 +20,24 @@ You can also run the installer again.
The Setup Wizard creates a log file, named `install.log`, that you might find useful in debugging issues or in verifying the actions performed by the wizard.
-The Setup Wizard uses the sys_get_temp_dir ( void ) PHP call to determine where to write the installation log. To locate the log:
+The Setup Wizard uses the [sys_get_temp_dir ( void )](http://php.net/manual/en/function.sys-get-temp-dir.php) PHP call to determine where to write the installation log. To locate the log:
1. Open `php.ini` in a text editor.
If you don't know where `php.ini` is located:
- 1. Log in as or switch to the switch to the Magento file system owner.
- 2. Create phpinfo.php in the web server's docroot.
+ 1. Log in as or switch to the [switch to the Magento file system owner]({{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html).
+ 2. Create [phpinfo.php]({{ page.baseurl }}/install-gde/prereq/optional.html#install-optional-phpinfo) in the web server's docroot.
3. Access `phpinfo.php` in a web browser.
The location of `php.ini` is typically specified as **Loaded Configuration File** in the displayed results.
2. Search for `sys_temp_dir`.
-The value of `sys_temp_dir` determines where `install.log` is located. If the value is commented out, PHP uses that value as its default.
+The value of `sys_temp_dir` determines where `install.log` is located. If the value is commented out, PHP uses that value as its default.
A typical default value is `/tmp`. If that's the case, the log is `/tmp/install.log`.
### Next step
-Verify the installation
\ No newline at end of file
+[Verify the installation]({{ page.baseurl }}/install-gde/install/verify.html)
diff --git a/_includes/install/web/update-reinstall.md b/_includes/install/web/update-reinstall.md
deleted file mode 100644
index f51fe07c6af..00000000000
--- a/_includes/install/web/update-reinstall.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-## Updating or reinstalling the Magento software {#instgde-install-reinstall}
-
-You can reinstall the Magento software in an development environment especially to get all the latest code changes:
-
-* Update
-* Uninstall and reinstall
\ No newline at end of file
diff --git a/_includes/layout/after-site-header.html b/_includes/layout/after-site-header.html
index 31dce0a7422..a8f18b17cef 100644
--- a/_includes/layout/after-site-header.html
+++ b/_includes/layout/after-site-header.html
@@ -6,6 +6,6 @@
{% if page.guide_version == "2.3" %}
{% endif %}
diff --git a/_includes/layout/footer-links.html b/_includes/layout/footer-links.html
index d0b4333759f..026b60db3d7 100644
--- a/_includes/layout/footer-links.html
+++ b/_includes/layout/footer-links.html
@@ -1,9 +1,7 @@
+{% assign items = site.data.footer-links %}
+
diff --git a/_includes/layout/footer-scripts.html b/_includes/layout/footer-scripts.html
index 306fc2268de..9090fd96650 100644
--- a/_includes/layout/footer-scripts.html
+++ b/_includes/layout/footer-scripts.html
@@ -1,4 +1,4 @@
-
+
{% if site.environment == "public" %}
@@ -25,4 +25,6 @@
})();
-{% endif %}
\ No newline at end of file
+
+
+{% endif %}
diff --git a/_includes/layout/header-scripts.html b/_includes/layout/header-scripts.html
index 133c8bbee42..36b246962c4 100644
--- a/_includes/layout/header-scripts.html
+++ b/_includes/layout/header-scripts.html
@@ -45,4 +45,6 @@
heap.load("2619540280");
+
+
{% endif %}
diff --git a/_includes/layout/main-nav-item.html b/_includes/layout/main-nav-item.html
new file mode 100644
index 00000000000..e772578a7fa
--- /dev/null
+++ b/_includes/layout/main-nav-item.html
@@ -0,0 +1,28 @@
+{% assign item = include.item %}
+
+{% if page.guide_version %}
+ {% assign compare_version = page.guide_version %}
+{% else %}
+ {% assign compare_version = site.version %}
+{% endif %}
+
+{% unless item.exclude_versions contains compare_version %}
+{% if item.include_versions.size == nil or item.include_versions contains compare_version or item.include_versions contains 'all' %}
+ {% assign base = '' %}
+ {% if item.versionless %}
+ {% assign base = site.baseurl %}
+ {% else %}
+ {% if page.guide_version %}
+ {% assign base = page.baseurl %}
+ {% else %}
+ {% assign base = site.version | prepend: "/guides/v" | prepend: site.baseurl %}
+ {% endif %}
+ {% endif %}
+ {% if item.url contains 'http' %}
+ {% assign base = '' %}
+ {% endif %}
+
diff --git a/_includes/php-dev/component-root-2.3.md b/_includes/php-dev/component-root-2.3.md
index 3915c9365c5..eae45cfa3de 100644
--- a/_includes/php-dev/component-root-2.3.md
+++ b/_includes/php-dev/component-root-2.3.md
@@ -1,5 +1,3 @@
-The page will be updated in the
-
### Root directory location
A component's root directory matches the component's name and contains all its subdirectories and files. Based on how you installed Magento, you can put your component's root directory in one of two places:
@@ -11,9 +9,9 @@ A component's root directory matches the component's name and contains all its s
* For Admin themes, use `app/design/adminhtml`.
* For language packages, use `app/i18n`.
-* `
-
### Root directory location
A component's root directory is the top-level directory for that component under which its folders and files are located. Depending on how your Magento development environment was installed, your component's root directory can be located in two places:
@@ -11,7 +9,7 @@ A component's root directory is the top-level directory for that component under
* For Admin themes, use `app/design/adminhtml`.
* For language packages, use `app/i18n`.
-* `
diff --git a/_includes/php-dev/component-versioning.md b/_includes/php-dev/component-versioning.md
index f481b95e5d0..91a04196d2c 100644
--- a/_includes/php-dev/component-versioning.md
+++ b/_includes/php-dev/component-versioning.md
@@ -1,13 +1,9 @@
-
-
Components have the following types of versions:
-* Marketing version; in other words, the version the merchant interacts with.
+* Marketing version; in other words, the version the merchant interacts with.
- Your initial version might be 1.0.0 or 2.0.0, for example. You should follow our versioning policy guidelines when setting your version.
+ Your initial version might be 1.0.0 or 2.0.0, for example. You should follow [our versioning policy]({{ page.baseurl }}/extension-dev-guide/versioning) guidelines when setting your version.
* Composer version; in other words, the version of each module, theme, language package, third-party package, and dependencies.
Using Magento code as an example, {{site.data.var.ce}} marketing version 2.0.0 includes component versions such as 100.0.1, 100.0.2, and so on. These versioning strategy prevents collisions between the marketing version and component versions.
-
-
\ No newline at end of file
diff --git a/_includes/php-dev/composer-types.md b/_includes/php-dev/composer-types.md
index 0ec199eb0d3..4aa747a7325 100644
--- a/_includes/php-dev/composer-types.md
+++ b/_includes/php-dev/composer-types.md
@@ -1,34 +1,9 @@
-
-
The following table discusses the component types that Magento Marketplace supports. The composer `type` column in the following table specifies the value of the `type` field you must add to `composer.json` for that type of component.
-
- {% for tab in tabs %}
-
- {% endfor %}
-
-{% endif %}
diff --git a/_includes/vendor/types-def.md b/_includes/vendor/types-def.md
index 5c43ec4c228..9a65f6767bb 100644
--- a/_includes/vendor/types-def.md
+++ b/_includes/vendor/types-def.md
@@ -1,5 +1,3 @@
-
-
where
* `
\ No newline at end of file
+ {:.bs-callout .bs-callout-info}
+ Currently, themes are located under `
-
-
-
-Currently, themes are located under
-
## {{site.data.var.ee}} Web APIs Services per Module {#eelist}
The Web APIs for {{site.data.var.ee}} are available on Commerce installations only. Commerce installations automatically have access to all {{site.data.var.ce}} REST APIs.
@@ -184,4 +182,3 @@ The Web APIs for {{site.data.var.ee}} are available on Commerce installations on
taxTaxClassRepositoryV1
taxTaxRateRepositoryV1
taxTaxRuleRepositoryV1
-
\ No newline at end of file
diff --git a/_includes/webapi/services22.md b/_includes/webapi/services22.md
index 666704eac3e..50b7ea380a6 100644
--- a/_includes/webapi/services22.md
+++ b/_includes/webapi/services22.md
@@ -1,5 +1,3 @@
-
-
## {{site.data.var.ee}} Web APIs Services per Module {#eelist}
The Web APIs for {{site.data.var.ee}} (formerly Magento Enterprise Edition) are available on {{site.data.var.ee}} installations only. {{site.data.var.ee}} installations automatically have access to all {{site.data.var.ce}} (formerly Magento Community Edition) web APIs.
@@ -33,7 +31,7 @@ The Web APIs for {{site.data.var.ee}} (formerly Magento Enterprise Edition) are
## {{site.data.var.ce}} Web APIs Services per Module {#celist}
The {{site.data.var.ce}} Web APIs are available on all installations.
-
+
### Analytics
analyticsLinkProviderV1
@@ -197,4 +195,3 @@ The Web APIs for {{site.data.var.ee}} (formerly Magento Enterprise Edition) are
## Magento B2B
See [Integrate with B2B using REST]({{ page.baseurl }}/b2b/integrations.html) for a list of services provided with B2B.
-
\ No newline at end of file
diff --git a/_includes/webapi/services23.md b/_includes/webapi/services23.md
index e957afae9d9..93502643ed0 100644
--- a/_includes/webapi/services23.md
+++ b/_includes/webapi/services23.md
@@ -1,5 +1,3 @@
-
-
## {{site.data.var.ee}} Web APIs Services per Module {#eelist}
The Web APIs for {{site.data.var.ee}} (formerly Magento Enterprise Edition) are available on {{site.data.var.ee}} installations only. {{site.data.var.ee}} installations automatically have access to all {{site.data.var.ce}} (formerly Magento Community Edition) web APIs.
diff --git a/_layouts/m1x.html b/_layouts/m1x.html
index d759e8c25b3..987a49430ce 100644
--- a/_layouts/m1x.html
+++ b/_layouts/m1x.html
@@ -13,8 +13,8 @@
+ {% include m1x/eol_message.html %}
{{ page.title }}-
{{ content }}
diff --git a/_layouts/m1x_rest.html b/_layouts/m1x_rest.html
index 3cc2d421895..26672ce8a06 100644
--- a/_layouts/m1x_rest.html
+++ b/_layouts/m1x_rest.html
@@ -32,6 +32,7 @@
+ {% include m1x/eol_message.html %}
{{ page.title }}
diff --git a/_layouts/m1x_soap.html b/_layouts/m1x_soap.html
index 2475bf65c9b..2bb5962848b 100644
--- a/_layouts/m1x_soap.html
+++ b/_layouts/m1x_soap.html
@@ -32,6 +32,7 @@
+ {% include m1x/eol_message.html %}
{{ page.title }}
diff --git a/_plugins/page-baseurl-generator.rb b/_plugins/page-baseurl-generator.rb
index a62b5d40c96..0e8e3e4e361 100644
--- a/_plugins/page-baseurl-generator.rb
+++ b/_plugins/page-baseurl-generator.rb
@@ -5,30 +5,30 @@
#
#
module Jekyll
- # Extending the Generator class of the Jekyll module
+ # The class generates page.baseurl as "{site.baseurl}/guides/v#{version}".
+ # The {version} is taken from the 'guide_version' front matter parameter on the page;
+ # if it is not set, then the generator takes it from the path of the page (for example, "2.2" in the "guides/v2.2");
+ # if the path doesn't contain "guides/vx.x", then the version is unset (returns nil object, same as null)
class PageBaseUrlGenerator < Generator
-
def generate(site)
pattern = %r{guides\/v(\d\.\d)}
- config_version = site.config['version']
pages = site.pages
baseurl = site.baseurl
pages.each do |page|
matcher = pattern.match(page.path)
- version = if matcher
- matcher[1]
- else
- config_version
- end
- page.data['baseurl'] = "#{baseurl}/guides/v#{version}"
+ version =
+ if page.data['guide_version']
+ page.data['guide_version']
+ elsif matcher
+ matcher[1]
+ end
+ page.data['baseurl'] = if version
+ "#{baseurl}/guides/v#{version}"
+ else
+ baseurl
+ end
page.data['guide_version'] = version
end
-
- videos = site.collections['videos'].docs
- videos.each do |video|
- video.data['baseurl'] = "#{baseurl}/guides/v#{config_version}"
- video.data['guide_version'] = config_version
- end
end
end
end
diff --git a/_videos/fundamentals/add-a-javascript-module.md b/_videos/fundamentals/add-a-javascript-module.md
index 3f601a8b18d..f8b9e5a68f0 100644
--- a/_videos/fundamentals/add-a-javascript-module.md
+++ b/_videos/fundamentals/add-a-javascript-module.md
@@ -5,7 +5,6 @@ group: "Fundamentals of Magento 2 Development"
title: "How to Add a JavaScript Module"
thumbnail: "fundamentals/thumbs/add-js-module.png"
menu_order: 1
-github_link:
---
Magento 2 uses requireJS as a tool to define the module structure.
@@ -71,7 +70,7 @@ Next, we’ll create a view folder:
```
$ cd 
diff --git a/availability.md b/availability.md
new file mode 100644
index 00000000000..377e10bc50e
--- /dev/null
+++ b/availability.md
@@ -0,0 +1,16 @@
+---
+layout: full-width
+title: Magento 2.3 product availability
+---
+
+| Product | Availability | How to get it |
+|--------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **Magento Open Source 2.3.0 beta** | Beta available nowGeneral availability expected at end of 2018 | [Composer](https://devdocs.magento.com/guides/v2.3/release-notes/2.3.0-quick-start.html) | +| **Magento Commerce 2.3.0 beta** | Beta available now General availability expected at end of 2018 | [Request access](https://partners.magento.com/portal/pre-release-agreement) and use [Composer](https://devdocs.magento.com/guides/v2.3/release-notes/2.3.0-quick-start.html) | +| **Magento Commerce Cloud Tools (aka ECE-Tools)** | Available now | [Composer](https://devdocs.magento.com/guides/v2.1/cloud/project/ece-tools-update.html) | +| **PWA Studio** | Beta available now General availability expected at end of 2018 | [GitHub](https://magento-research.github.io/pwa-studio/) | +| **Magento Payments** | Early access open for US-based merchants Regional availability expected in Q1 2019 | [Request access](mailto:payments@magento.com) Self-service onboarding from Magento.com | +| **Magento Shipping** | Available now | Merchants on Magento 2.2.2+ can use the [onboarding process](https://account.magento.com/shipping/onboarding/start ) | +| **Page Builder** | Early access begins November 2018 General availability expected in early 2019 | [Request access](mailto:pagebuilderEAP@adobe.com) Bundled with Magento Commerce 2.3.x | +| **Amazon Sales Channel** | Early access closed Regional availability expected in first half of 2019 (US, Canada, Mexico, Australia) Global availability expected in second half of 2019 | N/A Magento Marketplace | +| **Google Ad Channel** | Early access TBD General availability expected in first half of 2019 | TBD Magento Marketplace | diff --git a/codelinks/attributes.md b/codelinks/attributes.md index 5df49b0a442..a9d017c6c12 100644 --- a/codelinks/attributes.md +++ b/codelinks/attributes.md @@ -1,5 +1,4 @@ --- -layout: default title: Retrieving detailed attributes menu_title: Retrieving detailed attributes --- diff --git a/common/css/stylesheet.css b/common/css/stylesheet.css index bc958113f7f..58d1e84defb 100644 --- a/common/css/stylesheet.css +++ b/common/css/stylesheet.css @@ -29,14 +29,14 @@ body { color: #F47027; text-decoration: none; } -#left-nav ul.related-documents li { - font-size:13px; border:0; padding: 5px; margin: 5px 0 5px 5px; +#left-nav ul.related-documents li { + font-size:13px; border:0; padding: 5px; margin: 5px 0 5px 5px; background-image: url(".bullet-round-orange.png"); background-repeat: no-repeat; background-position: 0 9px; padding-left: 16px; } - + /* end left nav styles */ /* HEADINGS */ @@ -45,13 +45,13 @@ h1, h2 { font-weight:100; margin:30px 0 10px 0; } h3, h4, h5, h6 { font-weight:100; color:#444444; margin:25px 0 2px 0; } h1 { font: 36px/46px 'TitilliumText22LBold', Helvetica, sans-serif; letter-spacing: 0; } - + h2 { font: 31px/41px 'TitilliumText22LRegular', Helvetica, sans-serif; color:#f47027; } - + h3 { font: 27px/37px 'TitilliumText22LRegular', Helvetica, sans-serif; letter-spacing: 0;} - + h4 { font: 23px/37px 'TitilliumText22LRegular', Helvetica, sans-serif; letter-spacing: 0; } - + h5 { font: 17px/27px 'TitilliumText22LThin', Helvetica, sans-serif; letter-spacing: 0; font-weight:bold; margin-top:25px; } h6 { font: 14px/24px 'TitilliumText22LThin', Helvetica, sans-serif; letter-spacing: 0; font-weight:bold; margin-top:25px; } @@ -64,60 +64,60 @@ p.toc { color: #cccccc; margin-bottom:10px; } p.toc a { padding: 0 5px 0 5px; } p.toc a.first { padding-left: 0; } -/*PARAGRAPHS */ +/*PARAGRAPHS */ p { letter-spacing: 0.05px; color:#555555; line-height:20px; margin: 8px 0 17px;} /* LINKS */ a:link, a:visited { color:#0090c0; text-decoration:none; } a:hover{ color:#ff613d; } a:active{ color:#0090c0; } - + /* NOTES TIPS ETC. */ -.msg-box, .sm-note-box { +.msg-box, .sm-note-box { margin:2px 0 15px 0; - width:85%; + width:85%; border-radius: 8px 0 8px 0; font-size:14px; color:#777777; padding: 8px 12px 8px 0; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - min-height:35px; } - -.sm-note-box { + min-height:35px; } + +.sm-note-box { min-height:15px; - background-color: rgba(0, 0, 0, 0.025); + background-color: rgba(0, 0, 0, 0.025); border:1px solid #888888; border-left: 3px solid #888888; } - -.sm-note-box span { padding: 0 10px 0 10px; } -.msg-text { color:#777777; font-size:14px; } +.sm-note-box span { padding: 0 10px 0 10px; } + +.msg-text { color:#777777; font-size:14px; } -.caution { - background-color: rgba(240, 171, 0, .05); +.caution { + background-color: rgba(240, 171, 0, .05); border: 1px solid #f7941d; border-left: 5px solid #f7941d; } - -.important { - background-color: rgba(229, 122, 63, 0.04); + +.important { + background-color: rgba(229, 122, 63, 0.04); border:1px solid #EE6933; - border-left: 5px solid #EE6933; } + border-left: 5px solid #EE6933; } -.note { - background-color: rgba(0, 0, 0, 0.025); +.note { + background-color: rgba(0, 0, 0, 0.025); border:1px solid #888888; border-left: 5px solid #888888; } -.tip { +.tip { background-color: rgba(246, 220, 27, .05); border:1px solid #fbe841; - border-left: 5px solid #fbe841; } - + border-left: 5px solid #fbe841; } + .msg-box span { position:relative; left:10px; padding-right:5px; } .msg-box img { position:relative; top:-3px; left:5px; } - + pre { font-size:14px; line-height:20px; overflow: auto; } pre strong{ color:#333333; } pre, .link-callout { padding:10px; margin:0 0 20px; @@ -134,10 +134,10 @@ ul, ol ul li, ul ol li, ol li ol li ul.level1 li margin: 0; } -ul li li, ul li li li, ol li li { +ul li li, ul li li li, ol li li { margin-left: 5px; } - ul li li li { + ul li li li { margin-left: 10px; } @@ -219,7 +219,7 @@ ol li ul li { margin-left: 10px; } -/*ul:nth-child(1) li { +/*ul:nth-child(1) li { background-image: url("bullet-round-orange.png"); background-repeat: no-repeat; background-position: 0px 7px; @@ -227,7 +227,7 @@ ol li ul li { margin-bottom:6px; } -ul:nth-child(2) li { +ul:nth-child(2) li { background-image: url("bullet-round-gold.png"); background-repeat: no-repeat; background-position: 0px 6px; @@ -235,7 +235,7 @@ ul:nth-child(2) li { margin-bottom:6px; } -ul:nth-child(3) li { +ul:nth-child(3) li { background-image: url("bullet-round-gray.png"); bckground-repeat: no-repeat; background-position: 0px 6px; @@ -246,7 +246,7 @@ ul:nth-child(3) li { /* NUMBERED CODE */ -pre.lineCount { background: #F3F6F9 url("gutter.png") 2.1em 0 repeat-y; +pre.lineCount { background: #F3F6F9 url("gutter.png") 2.1em 0 repeat-y; border:1px solid #ebeff2; line-height:0; margin:0; padding:0; } ol.listLineCount { @@ -263,9 +263,9 @@ ol.listLineCount { pre.lineCount li code { color:#333333; line-height:15px;} caption, p.caption { font-family:Georgia, "Times New Roman", Times, serif; color:#787878; font-size: 14px; font-style:italic; padding:0; margin:10px 0 15px 3px;} - + caption {margin:0px 0 2px 0; padding:20px 0 5px 0; } - + /* TABLE */ table { @@ -278,7 +278,7 @@ table td, table th, table tr, table tr th { padding:8px;} table tr:nth-child(odd) { /*(odd) or (2n 1)*/ - background-color: #F3F6F9; + background-color: #F3F6F9; border-bottom: medium none; border-color: transparent #ffffff; border-left: 1px solid #dce5ed; @@ -298,7 +298,7 @@ table tr:nth-child(even) { /*(even) or (2n 0)*/ color: #222222; vertical-align: top; } -table th { +table th { border: #dce5ed 1px solid; color: #444444; font-weight: 600; @@ -363,12 +363,12 @@ p.paging { text-decoration: none; } p.paging span { padding:5px; } -p.paging a { +p.paging a { font-weight:100; padding:5px; } p.paging.bottom { position:relative; top:42px; } - + /* Rules */ .dotted-rule { border-top: 2px dotted #dddddd; margin: 15px 0 15px 0; } hr { border: 0; color: #e2e2e2; background-color: #e2e2e2; height: 2px; margin: 15px 0 15px 0; } @@ -435,9 +435,9 @@ a.image:hover { .expandimg img:hover { - -webkit-transform:scale(1.6); - -moz-transform:scale(1.6); - -o-transform:scale(1.6); + -webkit-transform:scale(1.6); + -moz-transform:scale(1.6); + -o-transform:scale(1.6); box-shadow:0 0 30px gray; -webkit-box-shadow:0 0 30px gray; -moz-box-shadow:0 0 30px gray; @@ -447,32 +447,32 @@ a.image:hover { .expandimg-border img:hover { - -webkit-transform:scale(1.6); - -moz-transform:scale(1.6); - -o-transform:scale(1.6); + -webkit-transform:scale(1.6); + -moz-transform:scale(1.6); + -o-transform:scale(1.6); border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); opacity: 1; margin-left: 195px; } .expandimg-thumb img:hover { - -webkit-transform:scale(2.5); - -moz-transform:scale(2.5); - -o-transform:scale(2.5); + -webkit-transform:scale(2.5); + -moz-transform:scale(2.5); + -o-transform:scale(2.5); border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); opacity: 1; } @@ -504,7 +504,7 @@ a.image:hover { .nav > li > a:hover { text-decoration: none; - background-color: rgba(0, 144, 192, 0.03); + background-color: rgba(0, 144, 192, 0.03); } @@ -562,7 +562,7 @@ a.image:hover { background-color: #ffffff; border: 1px solid #ddd; border-bottom-color: transparent; -} +} .tab-content { border-bottom: 1px solid #DDDDDD; padding: 0 0 5px; } .tab-content p { color:#777777; } @@ -679,3 +679,17 @@ a.image:hover { color: #ef672f; } +.message-banner { + background: #FBEDD9; + border: 1px solid #C27500; + padding: 20px; + border-radius: 2px; + margin: 10px 0; +} + +.message-banner h4 { + margin-top: 0; +} +.message-banner p:last-child { + margin-bottom: 0; +} diff --git a/common/images/Data set2.png b/common/images/Data set2.png new file mode 100755 index 00000000000..85fcb9283de Binary files /dev/null and b/common/images/Data set2.png differ diff --git a/common/images/MigrationModes2.png b/common/images/MigrationModes2.png new file mode 100644 index 00000000000..53f11827013 Binary files /dev/null and b/common/images/MigrationModes2.png differ diff --git a/common/images/MigrationOverview2.png b/common/images/MigrationOverview2.png new file mode 100644 index 00000000000..1628b8a4b99 Binary files /dev/null and b/common/images/MigrationOverview2.png differ diff --git a/common/images/MigrationSteps2.png b/common/images/MigrationSteps2.png new file mode 100644 index 00000000000..d3eb02b9d43 Binary files /dev/null and b/common/images/MigrationSteps2.png differ diff --git a/guides/v2.2/b2b/images/payment-on-credit.png b/common/images/b2b/payment-on-credit.png similarity index 100% rename from guides/v2.2/b2b/images/payment-on-credit.png rename to common/images/b2b/payment-on-credit.png diff --git a/guides/v2.2/b2b/images/quote-checkout-process.png b/common/images/b2b/quote-checkout-process.png similarity index 100% rename from guides/v2.2/b2b/images/quote-checkout-process.png rename to common/images/b2b/quote-checkout-process.png diff --git a/guides/v2.2/b2b/images/quote-statuses.png b/common/images/b2b/quote-statuses.png similarity index 100% rename from guides/v2.2/b2b/images/quote-statuses.png rename to common/images/b2b/quote-statuses.png diff --git a/guides/v2.2/b2b/images/quote-workflow.jpg b/common/images/b2b/quote-workflow.jpg similarity index 100% rename from guides/v2.2/b2b/images/quote-workflow.jpg rename to common/images/b2b/quote-workflow.jpg diff --git a/common/images/cloud/CloudBenefits.svg b/common/images/cloud/CloudBenefits.svg new file mode 100644 index 00000000000..8dc503428a2 --- /dev/null +++ b/common/images/cloud/CloudBenefits.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/common/images/cloud/CloudFastly.png b/common/images/cloud/CloudFastly.png new file mode 100644 index 00000000000..7cc695bb604 Binary files /dev/null and b/common/images/cloud/CloudFastly.png differ diff --git a/common/images/cloud/CloudStack.png b/common/images/cloud/CloudStack.png new file mode 100644 index 00000000000..bcf04c0bfe0 Binary files /dev/null and b/common/images/cloud/CloudStack.png differ diff --git a/common/images/cloud/CloudStack.svg b/common/images/cloud/CloudStack.svg new file mode 100644 index 00000000000..835026116e4 --- /dev/null +++ b/common/images/cloud/CloudStack.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/common/images/cloud_pro-branch-architecture.png b/common/images/cloud_pro-branch-architecture.png new file mode 100755 index 00000000000..e4730f76cda Binary files /dev/null and b/common/images/cloud_pro-branch-architecture.png differ diff --git a/common/images/cloud_project-setup.png b/common/images/cloud_project-setup.png new file mode 100755 index 00000000000..9f9db770638 Binary files /dev/null and b/common/images/cloud_project-setup.png differ diff --git a/common/images/cloud_service-grid.png b/common/images/cloud_service-grid.png new file mode 100755 index 00000000000..0cb125e9a04 Binary files /dev/null and b/common/images/cloud_service-grid.png differ diff --git a/common/images/cloud_ssh-access.png b/common/images/cloud_ssh-access.png new file mode 100755 index 00000000000..dc887f2513e Binary files /dev/null and b/common/images/cloud_ssh-access.png differ diff --git a/common/images/cloud_ssh-access2.png b/common/images/cloud_ssh-access2.png new file mode 100755 index 00000000000..79462ce0d71 Binary files /dev/null and b/common/images/cloud_ssh-access2.png differ diff --git a/common/images/cloud_web-access.png b/common/images/cloud_web-access.png new file mode 100755 index 00000000000..e147be420b2 Binary files /dev/null and b/common/images/cloud_web-access.png differ diff --git a/common/images/common/images/issues.png b/common/images/common/images/issues.png new file mode 100755 index 00000000000..8c79f5ba7b0 Binary files /dev/null and b/common/images/common/images/issues.png differ diff --git a/common/images/config_multi-site_base-url-default2.png b/common/images/config_multi-site_base-url-default2.png old mode 100644 new mode 100755 diff --git a/common/images/config_multi-site_base-url.png b/common/images/config_multi-site_base-url.png old mode 100644 new mode 100755 diff --git a/common/images/create_template.png b/common/images/create_template.png new file mode 100755 index 00000000000..b14db670138 Binary files /dev/null and b/common/images/create_template.png differ diff --git a/common/images/css_guide_luma_.png b/common/images/css_guide_luma_.png new file mode 100755 index 00000000000..c9910fb07dd Binary files /dev/null and b/common/images/css_guide_luma_.png differ diff --git a/common/images/css_over1.png b/common/images/css_over1.png new file mode 100755 index 00000000000..65e22cf4246 Binary files /dev/null and b/common/images/css_over1.png differ diff --git a/common/images/css_over2.png b/common/images/css_over2.png new file mode 100755 index 00000000000..146954b1f61 Binary files /dev/null and b/common/images/css_over2.png differ diff --git a/common/images/css_practice.png b/common/images/css_practice.png new file mode 100755 index 00000000000..ccdc4e884e6 Binary files /dev/null and b/common/images/css_practice.png differ diff --git a/common/images/css_responsive1.jpg b/common/images/css_responsive1.jpg new file mode 100755 index 00000000000..71c70b292ce Binary files /dev/null and b/common/images/css_responsive1.jpg differ diff --git a/common/images/ee-only_large.png b/common/images/ee-only_large.png new file mode 100755 index 00000000000..1b55ae3853c Binary files /dev/null and b/common/images/ee-only_large.png differ diff --git a/common/images/ee-only_small.png b/common/images/ee-only_small.png new file mode 100755 index 00000000000..5de96aed0a5 Binary files /dev/null and b/common/images/ee-only_small.png differ diff --git a/common/images/email-logo-settings.png b/common/images/email-logo-settings.png new file mode 100755 index 00000000000..dc0334bb5d4 Binary files /dev/null and b/common/images/email-logo-settings.png differ diff --git a/common/images/email_choose-template.png b/common/images/email_choose-template.png new file mode 100755 index 00000000000..b756f0e0729 Binary files /dev/null and b/common/images/email_choose-template.png differ diff --git a/common/images/email_create_template.png b/common/images/email_create_template.png new file mode 100755 index 00000000000..844b0424bc2 Binary files /dev/null and b/common/images/email_create_template.png differ diff --git a/common/images/email_insert_variable.png b/common/images/email_insert_variable.png new file mode 100755 index 00000000000..772c2fe0fd0 Binary files /dev/null and b/common/images/email_insert_variable.png differ diff --git a/common/images/extend_less_code_1.png b/common/images/extend_less_code_1.png new file mode 100755 index 00000000000..c38c119157a Binary files /dev/null and b/common/images/extend_less_code_1.png differ diff --git a/common/images/extend_less_code_2.png b/common/images/extend_less_code_2.png new file mode 100755 index 00000000000..9fa224df770 Binary files /dev/null and b/common/images/extend_less_code_2.png differ diff --git a/common/images/extend_less_screenshot0.png b/common/images/extend_less_screenshot0.png new file mode 100755 index 00000000000..f6a7be2b33f Binary files /dev/null and b/common/images/extend_less_screenshot0.png differ diff --git a/common/images/extend_less_screenshot1.png b/common/images/extend_less_screenshot1.png new file mode 100755 index 00000000000..5be6f1bc50b Binary files /dev/null and b/common/images/extend_less_screenshot1.png differ diff --git a/common/images/extend_less_screenshot2.png b/common/images/extend_less_screenshot2.png new file mode 100755 index 00000000000..686573d2e9c Binary files /dev/null and b/common/images/extend_less_screenshot2.png differ diff --git a/common/images/fdg/apply_theme.PNG b/common/images/fdg/apply_theme.PNG new file mode 100755 index 00000000000..2faecae313d Binary files /dev/null and b/common/images/fdg/apply_theme.PNG differ diff --git a/common/images/fdg_debug_theme.jpg b/common/images/fdg_debug_theme.jpg new file mode 100755 index 00000000000..774445ad0ff Binary files /dev/null and b/common/images/fdg_debug_theme.jpg differ diff --git a/common/images/fdg_debug_theme.png b/common/images/fdg_debug_theme.png new file mode 100755 index 00000000000..1608702bfc0 Binary files /dev/null and b/common/images/fdg_debug_theme.png differ diff --git a/common/images/fdg_theme_bck.png b/common/images/fdg_theme_bck.png new file mode 100755 index 00000000000..f6edd0a9ab8 Binary files /dev/null and b/common/images/fdg_theme_bck.png differ diff --git a/common/images/fdg_trans_bag.png b/common/images/fdg_trans_bag.png new file mode 100755 index 00000000000..3992f75cc63 Binary files /dev/null and b/common/images/fdg_trans_bag.png differ diff --git a/common/images/fork.png b/common/images/fork.png index 74b0a34063e..b6d537e815e 100644 Binary files a/common/images/fork.png and b/common/images/fork.png differ diff --git a/common/images/ftf-reporting-diagram.png b/common/images/ftf-reporting-diagram.png new file mode 100755 index 00000000000..dce5034438d Binary files /dev/null and b/common/images/ftf-reporting-diagram.png differ diff --git a/common/images/ftf/mtf_bloch_namepath_ui_onoff.png b/common/images/ftf/mtf_bloch_namepath_ui_onoff.png new file mode 100755 index 00000000000..5a6112822ec Binary files /dev/null and b/common/images/ftf/mtf_bloch_namepath_ui_onoff.png differ diff --git a/common/images/gallery_scr.png b/common/images/gallery_scr.png new file mode 100755 index 00000000000..d2e14a1f4b6 Binary files /dev/null and b/common/images/gallery_scr.png differ diff --git a/common/images/github_needs_updte.png b/common/images/github_needs_updte.png new file mode 100755 index 00000000000..110b271b34a Binary files /dev/null and b/common/images/github_needs_updte.png differ diff --git a/common/images/icon-caution.png b/common/images/icon-caution.png new file mode 100755 index 00000000000..6a3674d82dc Binary files /dev/null and b/common/images/icon-caution.png differ diff --git a/common/images/icon-important.png b/common/images/icon-important.png new file mode 100755 index 00000000000..f1cea282af0 Binary files /dev/null and b/common/images/icon-important.png differ diff --git a/common/images/icon-note.png b/common/images/icon-note.png new file mode 100755 index 00000000000..92593af761c Binary files /dev/null and b/common/images/icon-note.png differ diff --git a/common/images/icon-tip.png b/common/images/icon-tip.png new file mode 100755 index 00000000000..2926df14fce Binary files /dev/null and b/common/images/icon-tip.png differ diff --git a/common/images/inh-background1.jpg b/common/images/inh-background1.jpg new file mode 100755 index 00000000000..79f7296c760 Binary files /dev/null and b/common/images/inh-background1.jpg differ diff --git a/common/images/inh-background2.jpg b/common/images/inh-background2.jpg new file mode 100755 index 00000000000..7cb40c548ae Binary files /dev/null and b/common/images/inh-background2.jpg differ diff --git a/common/images/inherit_mini1.png b/common/images/inherit_mini1.png new file mode 100755 index 00000000000..c67175f0208 Binary files /dev/null and b/common/images/inherit_mini1.png differ diff --git a/common/images/inherit_mini2.png b/common/images/inherit_mini2.png new file mode 100755 index 00000000000..f25db3cdd6b Binary files /dev/null and b/common/images/inherit_mini2.png differ diff --git a/common/images/insert-variable.png b/common/images/insert-variable.png new file mode 100755 index 00000000000..9c458393c29 Binary files /dev/null and b/common/images/insert-variable.png differ diff --git a/common/images/install_mage2_clone-https.png b/common/images/install_mage2_clone-https.png new file mode 100644 index 00000000000..8eebba3edc2 Binary files /dev/null and b/common/images/install_mage2_clone-https.png differ diff --git a/common/images/install_mage2_clone-ssh.png b/common/images/install_mage2_clone-ssh.png new file mode 100644 index 00000000000..5b91f13f291 Binary files /dev/null and b/common/images/install_mage2_clone-ssh.png differ diff --git a/common/images/install_mage2_clone-url1.png b/common/images/install_mage2_clone-url1.png new file mode 100755 index 00000000000..2601b35470a Binary files /dev/null and b/common/images/install_mage2_clone-url1.png differ diff --git a/common/images/issues.png b/common/images/issues.png index 8c79f5ba7b0..562a9b5bab8 100644 Binary files a/common/images/issues.png and b/common/images/issues.png differ diff --git a/common/images/js_rwd_menu.png b/common/images/js_rwd_menu.png new file mode 100755 index 00000000000..18307652a27 Binary files /dev/null and b/common/images/js_rwd_menu.png differ diff --git a/common/images/layout_code_after.png b/common/images/layout_code_after.png new file mode 100755 index 00000000000..469002d70c0 Binary files /dev/null and b/common/images/layout_code_after.png differ diff --git a/common/images/layout_code_before1.png b/common/images/layout_code_before1.png new file mode 100755 index 00000000000..78eb802fc1b Binary files /dev/null and b/common/images/layout_code_before1.png differ diff --git a/common/images/layout_image1.png b/common/images/layout_image1.png new file mode 100755 index 00000000000..67a3da24246 Binary files /dev/null and b/common/images/layout_image1.png differ diff --git a/common/images/layout_image2.png b/common/images/layout_image2.png new file mode 100755 index 00000000000..feb24468c52 Binary files /dev/null and b/common/images/layout_image2.png differ diff --git a/common/images/layout_screen2.png b/common/images/layout_screen2.png new file mode 100755 index 00000000000..d0a8baaeabb Binary files /dev/null and b/common/images/layout_screen2.png differ diff --git a/common/images/layout_screen3.png b/common/images/layout_screen3.png new file mode 100755 index 00000000000..ac65d89dbed Binary files /dev/null and b/common/images/layout_screen3.png differ diff --git a/common/images/layout_transform.png b/common/images/layout_transform.png new file mode 100755 index 00000000000..87d2e97c81a Binary files /dev/null and b/common/images/layout_transform.png differ diff --git a/common/images/layouts_block_defn.jpg b/common/images/layouts_block_defn.jpg new file mode 100755 index 00000000000..92c4ce09983 Binary files /dev/null and b/common/images/layouts_block_defn.jpg differ diff --git a/common/images/layouts_containers_defn.jpg b/common/images/layouts_containers_defn.jpg new file mode 100755 index 00000000000..7e81b2ebb70 Binary files /dev/null and b/common/images/layouts_containers_defn.jpg differ diff --git a/common/images/m1xheader.png b/common/images/m1xheader.png new file mode 100755 index 00000000000..5fe38303b1f Binary files /dev/null and b/common/images/m1xheader.png differ diff --git a/common/images/mtf_admin_scope-id.png b/common/images/mtf_admin_scope-id.png new file mode 100755 index 00000000000..37c43cfc22f Binary files /dev/null and b/common/images/mtf_admin_scope-id.png differ diff --git a/common/images/mtf_bloch_namepath_ui_onoff.png b/common/images/mtf_bloch_namepath_ui_onoff.png new file mode 100755 index 00000000000..5a6112822ec Binary files /dev/null and b/common/images/mtf_bloch_namepath_ui_onoff.png differ diff --git a/common/images/mtf_block_formtab_merge.png b/common/images/mtf_block_formtab_merge.png new file mode 100755 index 00000000000..fe8a494b6b4 Binary files /dev/null and b/common/images/mtf_block_formtab_merge.png differ diff --git a/common/images/mtf_block_login_dir.png b/common/images/mtf_block_login_dir.png new file mode 100755 index 00000000000..6f6874789e7 Binary files /dev/null and b/common/images/mtf_block_login_dir.png differ diff --git a/common/images/mtf_block_login_ui.png b/common/images/mtf_block_login_ui.png new file mode 100755 index 00000000000..75c45280c57 Binary files /dev/null and b/common/images/mtf_block_login_ui.png differ diff --git a/common/images/mtf_block_map_form_tab_xml.png b/common/images/mtf_block_map_form_tab_xml.png new file mode 100755 index 00000000000..a873fc59717 Binary files /dev/null and b/common/images/mtf_block_map_form_tab_xml.png differ diff --git a/common/images/mtf_block_map_form_xml.png b/common/images/mtf_block_map_form_xml.png new file mode 100755 index 00000000000..06e757fc9e4 Binary files /dev/null and b/common/images/mtf_block_map_form_xml.png differ diff --git a/common/images/mtf_block_name_path_in_code.png b/common/images/mtf_block_name_path_in_code.png new file mode 100755 index 00000000000..ba0d5dd3174 Binary files /dev/null and b/common/images/mtf_block_name_path_in_code.png differ diff --git a/common/images/mtf_block_name_path_in_ui.png b/common/images/mtf_block_name_path_in_ui.png new file mode 100755 index 00000000000..032edcceb1a Binary files /dev/null and b/common/images/mtf_block_name_path_in_ui.png differ diff --git a/common/images/mtf_block_tab_composite_ui.png b/common/images/mtf_block_tab_composite_ui.png new file mode 100755 index 00000000000..740885764fe Binary files /dev/null and b/common/images/mtf_block_tab_composite_ui.png differ diff --git a/common/images/mtf_block_tab_struc.png b/common/images/mtf_block_tab_struc.png new file mode 100755 index 00000000000..5a9ba2f76fe Binary files /dev/null and b/common/images/mtf_block_tab_struc.png differ diff --git a/common/images/mtf_block_tabs_ui.png b/common/images/mtf_block_tabs_ui.png new file mode 100755 index 00000000000..a06df94e95f Binary files /dev/null and b/common/images/mtf_block_tabs_ui.png differ diff --git a/common/images/mtf_cache_mngt.png b/common/images/mtf_cache_mngt.png new file mode 100755 index 00000000000..c924c086baa Binary files /dev/null and b/common/images/mtf_cache_mngt.png differ diff --git a/common/images/mtf_cache_refresh.png b/common/images/mtf_cache_refresh.png new file mode 100755 index 00000000000..95886b3e73e Binary files /dev/null and b/common/images/mtf_cache_refresh.png differ diff --git a/common/images/mtf_constraint_arguments_blue.png b/common/images/mtf_constraint_arguments_blue.png new file mode 100755 index 00000000000..8d61e392f00 Binary files /dev/null and b/common/images/mtf_constraint_arguments_blue.png differ diff --git a/common/images/mtf_constraint_arguments_blue.svg b/common/images/mtf_constraint_arguments_blue.svg new file mode 100755 index 00000000000..1a8ae41101b --- /dev/null +++ b/common/images/mtf_constraint_arguments_blue.svg @@ -0,0 +1,224 @@ + + + + diff --git a/common/images/mtf_constraint_arguments_green.png b/common/images/mtf_constraint_arguments_green.png new file mode 100755 index 00000000000..407ca68cdcc Binary files /dev/null and b/common/images/mtf_constraint_arguments_green.png differ diff --git a/common/images/mtf_constraint_arguments_green.svg b/common/images/mtf_constraint_arguments_green.svg new file mode 100755 index 00000000000..8e068c1d61e --- /dev/null +++ b/common/images/mtf_constraint_arguments_green.svg @@ -0,0 +1,285 @@ + + + + diff --git a/common/images/mtf_constraint_arguments_orange.png b/common/images/mtf_constraint_arguments_orange.png new file mode 100755 index 00000000000..77e406bea22 Binary files /dev/null and b/common/images/mtf_constraint_arguments_orange.png differ diff --git a/common/images/mtf_constraint_arguments_orange.svg b/common/images/mtf_constraint_arguments_orange.svg new file mode 100755 index 00000000000..6e9339fc94b --- /dev/null +++ b/common/images/mtf_constraint_arguments_orange.svg @@ -0,0 +1,272 @@ + + + + diff --git a/common/images/mtf_constraint_dir.png b/common/images/mtf_constraint_dir.png new file mode 100755 index 00000000000..887324458b7 Binary files /dev/null and b/common/images/mtf_constraint_dir.png differ diff --git a/common/images/mtf_constraint_flow.png b/common/images/mtf_constraint_flow.png new file mode 100755 index 00000000000..5f1e18a1781 Binary files /dev/null and b/common/images/mtf_constraint_flow.png differ diff --git a/common/images/mtf_constraint_variable.png b/common/images/mtf_constraint_variable.png new file mode 100755 index 00000000000..0fecd596320 Binary files /dev/null and b/common/images/mtf_constraint_variable.png differ diff --git a/common/images/mtf_constraints_variable.ep b/common/images/mtf_constraints_variable.ep new file mode 100755 index 00000000000..7bbcf6c1e2d --- /dev/null +++ b/common/images/mtf_constraints_variable.ep @@ -0,0 +1,151 @@ + + '+r+" "}},this.buildContributorsList=function(t,i){var e="";return t=t.slice(0,i.contributorsLimit),t=this.sortContributors(t),d.each(t,function(t,i){e+=c.buildContributor(i)}),''+e+" "},this.sortContributors=function(t){return t.sort(function(t,i){return i.accepted-t.accepted})},this.buildContributor=function(t){var i=t.name,e=t.avatar,s=t.user_link;if("https://github.com/ghost"==s)return"";var o=t.accepted,a=t.accepted_url,n=t.created,r=t.created_url,l=t.rejected,d=t.rejected_url,p='";return''+i+""+p+"REST Client ExampleRetrieving the list of Products as a Guest
Example 2.
// Assign product
$proxy->call($sessionId, 'category.assignProduct', array($categoryId, 'someProductSku', 5));
-// Update product assignment postion
+// Update product assignment position
$proxy->call($sessionId, 'category.updateProduct', array($categoryId, 'someProductSku', 25));
// Remove product assignment
diff --git a/guides/m1x/api/soap/catalog/catalogCategory/catalog_category.assignProduct.html b/guides/m1x/api/soap/catalog/catalogCategory/catalog_category.assignProduct.html
index 42a786c23fc..b457fa9a76b 100644
--- a/guides/m1x/api/soap/catalog/catalogCategory/catalog_category.assignProduct.html
+++ b/guides/m1x/api/soap/catalog/catalogCategory/catalog_category.assignProduct.html
@@ -92,7 +92,7 @@ $client = new SoapClient('http://magentohost/api/soap/?wsdl');
-// If somestuff requires api authentication,
+// If somestuff requires API authentication,
// then get a session token
$session = $client->login('apiUser', 'apiKey');
diff --git a/guides/m1x/api/soap/catalog/catalogCategory/catalog_category.assignedProducts.html b/guides/m1x/api/soap/catalog/catalogCategory/catalog_category.assignedProducts.html
index e383940399f..9a728c314fc 100644
--- a/guides/m1x/api/soap/catalog/catalogCategory/catalog_category.assignedProducts.html
+++ b/guides/m1x/api/soap/catalog/catalogCategory/catalog_category.assignedProducts.html
@@ -113,7 +113,7 @@ |
