Merge branch 'master' into kh_tech-vision

Author: keharper

_videos/fundamentals/add-a-javascript-module.md

@@ -173,7 +173,8 @@ Finally, let’s add our module and test the result.
 
 ```
 $ cd <magento2_root>
-$ php bin/magento setup:upgrade
+$ bin/magento setup:upgrade
+$ bin/magento cache:clean
 ```
 
 Now we’ll go to any product view page, and we should see the “HELLO WORLD!” message.

guides/v2.1/comp-mgr/cli/cli-upgrade.md

@@ -79,7 +79,14 @@ To enable maintenance mode:
    composer update
    ```
 
-3. If prompted, enter your [authentication keys]({{ page.baseurl }}/comp-mgr/prereq/prereq_auth-token.html).
+4. If prompted, enter your [authentication keys]({{ page.baseurl }}/comp-mgr/prereq/prereq_auth-token.html).
+
+5. Clean the Magento cache:
+
+   ```bash
+   bin/magento cache:clean
+   ```
+
 4. Manually clear `var` subdirectories:
 
    ```bash

guides/v2.1/comp-mgr/install-extensions.md

@@ -26,7 +26,7 @@ If you already know the extension's Composer name and version, skip this step an
 
 To get the extension's Composer name and version from the Magento Marketplace:
 
-1.  Log in to [Magento Marketplace](https://marketplace.magento.com){:target="_blank"} with the username and password you used to purchase the extension.
+1.  Log in to [Magento Marketplace](https://marketplace.magento.com) with the username and password you used to purchase the extension.
 
 2.  In the upper-right corner, click **Your name** > **My Profile**.
 
@@ -66,7 +66,9 @@ Add the extension's name and version to your `composer.json` file:
 
 To verify that the extension installed properly, run the following command:
 
-	bin/magento module:status
+```bash
+bin/magento module:status
+```
 
 By default, the extension is probably disabled:
 
@@ -100,8 +102,8 @@ Some extensions won't work properly unless you clear Magento-generated static vi
 
 3.  Recompile your Magento project:
 
-{: .bs-callout .bs-callout-info }
-In Production mode, you may receive a message to 'Please rerun Magento compile command'.  Enter the command below. Magento does not prompt you to run the compile command in Developer mode.
+    {: .bs-callout .bs-callout-info }
+		In Production mode, you may receive a message to 'Please rerun Magento compile command'.  Enter the command below. Magento does not prompt you to run the compile command in Developer mode.
 
 		bin/magento setup:di:compile
 
@@ -117,7 +119,13 @@ In Production mode, you may receive a message to 'Please rerun Magento compile c
 		List of disabled modules:
 		None
 
-5.  Configure the extension in Admin as needed.
+5. Clean the cache:
+
+   ```bash
+   bin/magento cache:clean
+   ```
+
+6.  Configure the extension in Admin as needed.
 
 {:.bs-callout .bs-callout-tip}
 If you encounter errors when loading the storefront in a browser, use the following command to clear the cache:

guides/v2.1/comp-mgr/module-man/compman-new-purchase.md

@@ -16,6 +16,7 @@ When you're installing new purchases from Magento Marketplace, the page displays
 
 ![]({{ site.baseurl }}/common/images/compman_new-purchases-step3install.png){: width="500px"}
 
+## Install the component
 
 If the list of purchases is correct, click **Install**.
 
@@ -78,3 +79,11 @@ When the installation is complete, a page similar to the following displays:
 
 
 Click **Back to Setup Tool**.
+
+## Clean the cache
+
+Clean the cache by clicking **System** > **Cache Management** > **Flush Magento Cache** or by entering the following command:
+
+```bash
+bin/magento cache:clean
+```

guides/v2.1/comp-mgr/module-man/compman-update.md

@@ -16,7 +16,7 @@ This step displays if you're updating components. The following figure shows an
 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="{{ site.baseurl }}/common/images/cman_update-step.png" width="350px" alt="Click update to complete the task">
 
-To complete the update, click **Update**. 
+To complete the update, click **Update**.
 
 ### Success
 
@@ -42,11 +42,15 @@ Messages similar to the following display in the Console Log:
 	[2015-07-31 19:42:05 CDT] Composer update completed successfully
 	[2015-07-31 19:42:05 CDT] Job "update {"require":[{"name":"magento/sample-module-updater-wizard","version":"3.0.0.0"}]}" has successfully completed
 
-### Failure
 
-If the update fails, click **Rollback** to restore an earlier backup. Messages display in the Console Log as shown in the following figure.
+  Clean the cache by clicking **System** > **Cache Management** > **Flush Magento Cache** or by entering the following command:
 
-![If the component update fails, you can roll back]({{ site.baseurl }}/common/images/cman_update-fail.png)
+  ```bash
+  bin/magento cache:clean
+  ```
 
+### Failure
 
+If the update fails, click **Rollback** to restore an earlier backup. Messages display in the Console Log as shown in the following figure.
 
+![If the component update fails, you can roll back]({{ site.baseurl }}/common/images/cman_update-fail.png)

guides/v2.1/comp-mgr/upgrader/ce-ee-upgrade-start.md

@@ -20,13 +20,13 @@ You must be authorized for {{site.data.var.ee}} to perform the tasks discussed i
 
 Before continuing, complete all tasks discussed in [Prerequisites]({{ page.baseurl }}/comp-mgr/prereq/prereq_compman.html).
 
-In addition, you might need to install the {% glossarytooltip bf703ab1-ca4b-48f9-b2b7-16a81fd46e02 %}PHP{% endglossarytooltip %} [`bcmath`](http://php.net/manual/en/book.bc.php){:target="_blank"} extension, which is required by {{site.data.var.ee}}. Examples follow:
+In addition, you might need to install the {% glossarytooltip bf703ab1-ca4b-48f9-b2b7-16a81fd46e02 %}PHP{% endglossarytooltip %} [`bcmath`](http://php.net/manual/en/book.bc.php) extension, which is required by {{site.data.var.ee}}. Examples follow:
 
 *	CentOS (using the `webtatic` repository): `yum -y install php56w-bcmath`
 *	Ubuntu (using the `ppa:ondrej/php5-5.6` repository): `apt-get -y install php5-bcmath`
 
 {:.bs-callout .bs-callout-info}
-Make sure you are authorized for {{site.data.var.ee}} access before you continue. Contact [Magento Support](http://support.magentocommerce.com){:target="_blank"} if you have questions.
+Make sure you are authorized for {{site.data.var.ee}} access before you continue. Contact [Magento Support](http://support.magentocommerce.com) if you have questions.
 
 ## Start System Upgrade from the Magento Admin {#compman-access}
 
@@ -47,9 +47,19 @@ To run System Upgrade:
 
 	From the list, click the version to which to upgrade. Typically, you'll choose the most recent version (indicated by **(latest)**.)
 
-After the upgrade completes, restart Varnish if you use it for page caching.
+After the upgrade completes:
 
-	service varnish restart
+1. Clean the cache by clicking **System** > **Cache Management** > **Flush Magento Cache** or by entering the following command:
+
+   ```bash
+   bin/magento cache:clean
+   ```
+
+2. Restart Varnish if you use it for page caching.
+
+	```bash
+  service varnish restart
+  ```
 
 #### Errors
 
@@ -61,9 +71,9 @@ After the upgrade completes, restart Varnish if you use it for page caching.
 
 *	The following error might display:
 
-		[2016-01-19 23:33:24 UTC] An error occurred while executing job 
-		"setup:upgrade {"command":"setup:upgrade"}": Could not complete 
-		setup:upgrade {"command":"setup:upgrade"} successfully: Source 
+		[2016-01-19 23:33:24 UTC] An error occurred while executing job
+		"setup:upgrade {"command":"setup:upgrade"}": Could not complete
+		setup:upgrade {"command":"setup:upgrade"} successfully: Source
 		class "\Cybersource" for "CybersourceLogger" generation does not exist.
 
 	For more information, see [Error upgrading from CE to EE]({{ page.baseurl }}/comp-mgr/trouble/cman/ce-ee-upgrade.html).

guides/v2.1/comp-mgr/upgrader/upgrade.md

@@ -29,13 +29,21 @@ Messages similar to the following display in the Console Log:
 
 {% endcollapsible %}
 
+## Clean the Magento cache
+
+Clean the Magento cache:
+
+```bash
+bin/magento cache:clean
+```
+
 ## Manually clear directories
 
 After the upgrade completes, manually clear `var` subdirectories:
 
 	rm -rf <Magento install dir>/var/cache/*
 	rm -rf <Magento install dir>/var/page_cache/*
-	rm -rf <Magento install dir>/var/generation/* 
+	rm -rf <Magento install dir>/var/generation/*
 
 ## Restart Varnish
 
@@ -55,7 +63,7 @@ After you finish your upgrade, errors might display.
 *	On a {% glossarytooltip 50e49338-1e6c-4473-8527-9e401d67ea2b %}category{% endglossarytooltip %} page, the following error might display:
 
 		We can't find products matching the selection.
-	
+
 If any of the preceding errors display, perform all of the following tasks.
 
 {% include install/sampledata/file-sys-perms-digest.md %}

guides/v2.1/config-guide/cli/config-cli-subcommands-cache.md

@@ -85,6 +85,9 @@ To purge out-of-date items from the cache, you can *clean* or *flush* cache type
 
     Disabled cache types are not cleaned.
 
+	{:.bs-callout .bs-callout-tip}
+	Always clean the cache after upgrading versions of {{site.data.var.ce}} or {{site.data.var.ee}}, upgrading from {{site.data.var.ce}} to {{site.data.var.ee}}, or installing {{site.data.var.b2b}} or any module.
+
 -   Flushing a cache type purges the cache storage, which might affect other processes applications that are using the same storage.
 
 Flush cache types if you've already tried cleaning the cache and you're still having issues that you cannot isolate.

guides/v2.1/config-guide/cron/custom-cron-tut.md

@@ -60,7 +60,14 @@ If you already have a sample module, you can use it; skip this step and the next
         drwxrwsr-x.   3 magento_user apache  4096 Oct 30 13:19 Test
 6.  Update the Magento database and schema:
 
-        php /var/www/html/magento2/bin/magento setup:upgrade
+    ```bash
+    bin/magento setup:upgrade
+    ```
+
+7. Clean the cache:
+   ```
+   bin/magento cache:clean
+   ```
 
 {% endcollapsible %}
 

guides/v2.1/ext-best-practices/extension-coding/example-module-adminpage.md

@@ -298,6 +298,7 @@ Now that the module is code-complete, run the following commands to install it:
 2. `bin/magento module:enable MyCompany_ExampleAdminNewPage` - If necessary, run this to enable the disabled module.
 3. `bin/magento setup:upgrade` - This command will properly register the module with Magento.
 4. `bin/magento setup:di:compile` - This command compiles classes used in dependency injections.
+5. `bin/magento cache:clean` - This command cleans the cache.
 
 Once the module installation has completed, the link to the **Hello World** page should appear in the **Greetings** section under **Content** in the left navigation in the admin area. Clicking this link will take you to a page that looks like the one pictured below.
 

guides/v2.1/extension-dev-guide/build/enable-module.md

@@ -15,6 +15,7 @@ After you have built the component and are ready to enable it in your Magento en
    ``` bash
    bin/magento module:enable --clear-static-content Component_Name
    bin/magento setup:upgrade
+   bin/magento cache:clean
    ```
 
    Where `Component_Name` is the name of the component you are enabling.

guides/v2.1/frontend-dev-guide/themes/admin_theme_apply.md

@@ -9,10 +9,10 @@ functional_areas:
 
 This topic describes how to apply your custom {% glossarytooltip d2093e4a-2b71-48a3-99b7-b32af7158019 %}theme{% endglossarytooltip %} for {% glossarytooltip 18b930cf-09cc-47c9-a5e5-905f86c43f81 %}Magento Admin{% endglossarytooltip %}.
 
-## Prerequisites 
+## Prerequisites
 
-1. [Set]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-mode.html) your Magento application to the developer [mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html). The application mode influences the way {% glossarytooltip 363662cb-73f1-4347-a15e-2d2adabeb0c2 %}static files{% endglossarytooltip %} are cached by Magento. 
-2. [Create a custom theme for the Admin panel]({{ page.baseurl }}/frontend-dev-guide/themes/admin_theme_create.html). 
+1. [Set]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-mode.html) your Magento application to the developer [mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html). The application mode influences the way {% glossarytooltip 363662cb-73f1-4347-a15e-2d2adabeb0c2 %}static files{% endglossarytooltip %} are cached by Magento.
+2. [Create a custom theme for the Admin panel]({{ page.baseurl }}/frontend-dev-guide/themes/admin_theme_create.html).
 3. [Add a new custom module]({{ page.baseurl }}/extension-dev-guide/build/build.html) or decide to use existing custom module. The module must load after the Magento_Theme module. To ensure this, add the following code in `<your_custom_module_dir>/etc/module.xml` (replace placeholders with your {% glossarytooltip c1e4242b-1f1a-44c3-9d72-1d5b1435e142 %}module{% endglossarytooltip %} information):
 
     ```xml
@@ -54,16 +54,16 @@ In `<your_module_dir>/etc/adminhtml/di.xml` add the following (replace the place
              <argument name="themes" xsi:type="array">
                  <item name="adminhtml" xsi:type="string">%Your_vendor_dir%/%your_theme_code%</item> <!-- Example: "Magento/backend" -->
              </argument>
-         </arguments> 
+         </arguments>
     </type>
     <!-- Admin theme. End -->
 </config>
 ```
 
-## Update components to actually apply the Admin theme
+## Update components to apply the Admin theme
 
-For your changes to take effect, you need to update Magento components. For this, 
-run the `bin/magento setup:upgrade` command in your command line. If prompted, also run `bin/magento setup:di:compile`.
+For your changes to take effect, you need to update Magento components. For this,
+run the `bin/magento setup:upgrade` command in your command line. If prompted, also run `bin/magento setup:di:compile`. Then run `bin/magento cache:clean` to clear the cache.
 
 
 For details about performing command line tasks, view the following topics:
@@ -77,6 +77,3 @@ The last step is to open the Admin in browser and view the new theme applied.
 ## See also
 
  * [Uninstall a theme]({{ page.baseurl }}/install-gde/install/cli/install-cli-theme-uninstall.html)
-
-
-

guides/v2.1/get-started/create-integration.md

@@ -241,10 +241,14 @@ Use the following steps to install your module:
 
 2. Run the following command to generate the new code.
 
-{: .bs-callout .bs-callout-info }
-In Production mode, you may receive a message to 'Please rerun Magento compile command'.  Enter the command below. Magento does not prompt you to run the compile command in Developer mode.
+   {: .bs-callout .bs-callout-info }
+   In Production mode, you may receive a message to 'Please rerun Magento compile command'.  Enter the command below. Magento does not prompt you to run the compile command in Developer mode.
 
-    <code>bin/magento setup:di:compile</code>
+   <code>bin/magento setup:di:compile</code>
+
+3. Run the following command to clean the cache.
+
+   <code>bin/magento cache:clean</code>
 
 ## Check your integration {#check}
 

guides/v2.1/install-gde/install/cli/dev_update-magento.md

@@ -36,4 +36,8 @@ To update the Magento software if you're a contributing developer:
 
 5.	Update the Magento database:
 
-		php <your Magento install dir>/bin/magento setup:upgrade
+		<your Magento install dir>/bin/magento setup:upgrade
+
+6.  Clean the cache:
+
+    bin/magento cache:clean

guides/v2.1/install-gde/install/cli/install-cli-subcommands-db-upgr.md

@@ -28,8 +28,16 @@ Note the following:
 *	If you used the Web Setup Wizard to do any of the preceding, you don't have to use the command discussed in this topic.
 *	A Magento *component* can be a module, theme, or language pack; it doesn't matter whether the component comes from the Magento Marketplace or not
 
-Command usage:
+1. Start the upgrade:
 
-	magento setup:upgrade [--keep-generated]
+	 ```bash
+   magento setup:upgrade [--keep-generated]
+   ```
 
-where `--keep-generated` is an optional argument that does not update [static view files]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html). This optional argument is for use *only* in limited circumstances by experienced system integrators. It should be used *only* in [production mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html#production-mode). It should *not* be used in [developer mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html#developer-mode).
+   where `--keep-generated` is an optional argument that does not update [static view files]({{ page.baseurl }}/config-guide/cli/config-cli-subcommands-static-view.html). This optional argument is for use *only* in limited circumstances by experienced system integrators. It should be used *only* in [production mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html#production-mode). It should *not* be used in [developer mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html#developer-mode).
+
+2. Clean the cache:
+
+   ```bash
+   bin/magento cache:clean
+   ```

guides/v2.1/install-gde/install/cli/install-cli-subcommands-enable.md

@@ -49,7 +49,15 @@ For important information about enabling and disabling modules, see [About enabl
 
 If you enabled one or more modules, run the following command to update the database:
 
-	magento setup:upgrade
+```bash
+bin/magento setup:upgrade
+```
+
+Then clean the cache:
+
+```bash
+bin/magento cache:clean
+```
 
 ## About enabling and disabling modules {#instgde-cli-subcommands-enable-modules}
 {% include install/enable-disable-modules.md %}

guides/v2.1/security/google-recaptcha.md

@@ -26,8 +26,13 @@ composer require msp/recaptcha:2.0.0
 To complete installation in an existing Magento instance, run the following commands to enable the module:
 
 ``` bash
-php bin/magento module:enable --all
-php bin/magento setup:upgrade
+bin/magento module:enable --all
+```
+``` bash
+bin/magento setup:upgrade
+```
+```bash
+bin/magento cache:clean
 ```
 
 ## Configure reCAPTCHA