Merge pull request #5439 from magento/code-blocks

Merge code block fixes from integration branch (MD040)

Author: jeff-matthews

_includes/comp-man/checklist.md

@@ -17,17 +17,23 @@ Magento requires three cron jobs, all running as the [Magento file system owner]
 
 To verify your cron jobs are set up properly, enter the following command as a user with `root` privileges:
 
-	crontab -u <magento file system owner> -l
+```bash
+crontab -u <magento file system owner> -l
+```
 
 For example, if your Magento file system owner is named `magento_user`, enter:
 
-	crontab -u magento_user -l
+```bash
+crontab -u magento_user -l
+```
 
 Results similar to the following should display:
 
-	* * * * * /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
+```
 
 Another symptom of cron not running is the following error in the Magento Admin:
 
@@ -49,7 +55,9 @@ To verify your file system permissions are set properly, either log in to the Ma
 
 For example, enter the following commands on a Linux system if the Magento application is installed in `/var/www/html/magento2`:
 
-	ls -al /var/www/html/magento2
+```bash
+ls -al /var/www/html/magento2
+```
 
 A sample result follows:
 
@@ -92,7 +100,9 @@ In the preceding example, the Magento file system owner is `magento_user`. Direc
 
 To get more detailed information, you can optionally enter the following command:
 
-	ls -al /var/www/html/magento2/pub
+```bash
+ls -al /var/www/html/magento2/pub
+```
 
 Because Magento deploys static file assets to subdirectories of `pub`, it's a good idea to verify permissions and ownership there as well.
 

guides/v2.2/comp-mgr/extens-man/extensman-uninst-data.md

@@ -19,7 +19,9 @@ After backing up, you have the choice of removing data from the Magento 2 databa
 
 If the [extension](https://glossary.magento.com/extension) has no data to remove, the following message displays. (If a extension has data but no uninstall script, the same prompt displays. In that case, contact the vendor or remove database data manually.)
 
-	The selected extension has no data to remove.
+```terminal
+The selected extension has no data to remove.
+```
 
 If the extension has data to remove, a page similar to the following displays.
 
@@ -30,7 +32,6 @@ Click one of the following:
 *	**Keep data**: Click to keep the data in the database.
 *	**Remove data**: Click to remove data from the database.
 
-	You can click **Back** to back up the database first if you did not do so already.
+  You can click **Back** to back up the database first if you did not do so already.
 
 Continue with [Step 4. Uninstall]({{ page.baseurl }}/comp-mgr/extens-man/extensman-uninst-final.html)
-

guides/v2.2/comp-mgr/trouble/cman/maint-mode.md

@@ -71,18 +71,20 @@ To redirect traffic to a custom maintenance page:
 	*	Redirect all traffic to the maintenance page
 	*	Whitelist certain IPs so an administrator can run the System Upgrade utility to upgrade the Magento software.
 
-	The following example whitelists 192.0.2.110.
+    The following example whitelists 192.0.2.110.
 
-	Add the following at the end of your Apache configuration file:
+    Add the following at the end of your Apache configuration file:
 
-		RewriteEngine On
-		RewriteCond %{REMOTE_ADDR} !^192\.0\.2\.110
-		RewriteCond %{DOCUMENT_ROOT}/maintenance.html -f
-		RewriteCond %{DOCUMENT_ROOT}/maintenance.enable -f
-		RewriteCond %{SCRIPT_FILENAME} !maintenance.html
-		RewriteRule ^.*$ /maintenance.html [R=503,L]
-		ErrorDocument 503 /maintenance.html
-		Header Set Cache-Control "max-age=0, no-store"
+    ```terminal
+    RewriteEngine On
+    RewriteCond %{REMOTE_ADDR} !^192\.0\.2\.110
+    RewriteCond %{DOCUMENT_ROOT}/maintenance.html -f
+    RewriteCond %{DOCUMENT_ROOT}/maintenance.enable -f
+    RewriteCond %{SCRIPT_FILENAME} !maintenance.html
+    RewriteRule ^.*$ /maintenance.html [R=503,L]
+    ErrorDocument 503 /maintenance.html
+    Header Set Cache-Control "max-age=0, no-store"
+    ```
 
 3.	Restart Apache:
 
@@ -91,7 +93,10 @@ To redirect traffic to a custom maintenance page:
 
 4. Enter the following command:
 
-		touch <web server docroot>/maintenance.enable
+    ```bash
+    touch <web server docroot>/maintenance.enable
+    ```
+
 5.	[Upgrade your system]({{ page.baseurl }}/comp-mgr/upgrader/upgrade-start.html).
 7.	Test your site to make sure it functions correctly.
 6.	After the upgrade is done, delete `maintenance.enable`.
@@ -105,46 +110,56 @@ To redirect traffic to a custom maintenance page:
 1.	Use a text editor to open the [nginx](https://glossary.magento.com/nginx) configuration file that contains your server block.
 2.	Add the following to the server block (`server` is shown for clarity only; don't add a second server block).
 
-	The following whitelists IP address 192.0.2.110 and 192.0.2.115 on a system where Magento is installed in `/var/www/html/magento2`:
+    The following whitelists IP address 192.0.2.110 and 192.0.2.115 on a system where Magento is installed in `/var/www/html/magento2`:
+
+    ```conf
+    server {
+        listen 80;
+        set $MAGE_ROOT /var/www/html/magento2;
 
-		server {
-		listen 80;
-		set $MAGE_ROOT /var/www/html/magento2;
+        set $maintenance off;
 
-		set $maintenance off;
+        if (-f $MAGE_ROOT/maintenance.enable) {
+            set $maintenance on;
+        }
 
-		if (-f $MAGE_ROOT/maintenance.enable) {
-		set $maintenance on;
-		}
+        if ($remote_addr ~ (192.0.2.110|192.0.2.115)) {
+            set $maintenance off;
+        }
 
-		if ($remote_addr ~ (192.0.2.110|192.0.2.115)) {
-		set $maintenance off;
-		}
+        if ($maintenance = on) {
+            return 503;
+        }
 
-		if ($maintenance = on) {
-		return 503;
-		}
+        location /maintenance {
+        }
 
-		location /maintenance {
-		}
+        error_page 503 @maintenance;
 
-		error_page 503 @maintenance;
+        location @maintenance {
+        root $MAGE_ROOT;
+        rewrite ^(.*)$ /maintenance.html break;
 
-		location @maintenance {
-		root $MAGE_ROOT;
-		rewrite ^(.*)$ /maintenance.html break;
+        include /var/www/html/magento2/nginx.conf;
+    }
 
-		include /var/www/html/magento2/nginx.conf;
-		}
 4. Enter the following command:
 
-		touch <magento_root>/maintenance.enable
+    ```bash
+    touch <magento_root>/maintenance.enable
+    ```
+
 3. Reload the nginx configuration:
 
-		service nginx reload
+    ```bash
+    service nginx reload
+    ```
+
 5.	[Upgrade your system]({{ page.baseurl }}/comp-mgr/upgrader/upgrade-start.html).
 7.	Test your site to make sure it functions correctly.
 6.	After the upgrade is done, delete or rename `maintenance.enable`
 5.	Reload the nginx configuration:
 
-		service nginx reload
+    ```bash
+    service nginx reload
+    ```

guides/v2.2/comp-mgr/trouble/cman/out-of-memory.md

@@ -15,9 +15,11 @@ You may encounter an error, caused by your system running out of physical memory
 
 When installing or updating the Magento application or components like extensions, themes, or language packages, an error similar to the following displays:
 
-	Could not complete update {"components":[
-	{"name":"magento/module-bundle-sample-data","version":"100.1.0"}
-	]} successfully: proc_open(): fork failed - Cannot allocate memory
+```terminal
+Could not complete update {"components":[
+{"name":"magento/module-bundle-sample-data","version":"100.1.0"}
+]} successfully: proc_open(): fork failed - Cannot allocate memory
+```
 
 The error `proc_open(): fork failed - Cannot allocate memory` can also display on the command line.
 

guides/v2.2/comp-mgr/trouble/cman/update-fail.md

@@ -11,11 +11,13 @@ functional_areas:
 
 If your component update fails, messages similar to the following display in the Console Log:
 
-	[2015-08-14 12:12:02 CDT] Job "update {"components":[{"name":"example/module","version":"1.1.0"}]}" has been started
-	[2015-08-14 12:12:02 CDT] Starting composer update...
-	[2015-08-14 12:12:02 CDT] An error occurred while executing job "update {"components":
-	[{"name":"example/module","version":"1.1.0"}]}": Could not complete update {"components":
-	[{"name":"example/module","version":"1.1.0"}]} successfully: Cannot find component to update
+```terminal
+[2015-08-14 12:12:02 CDT] Job "update {"components":[{"name":"example/module","version":"1.1.0"}]}" has been started
+[2015-08-14 12:12:02 CDT] Starting composer update...
+[2015-08-14 12:12:02 CDT] An error occurred while executing job "update {"components":
+[{"name":"example/module","version":"1.1.0"}]}": Could not complete update {"components":
+[{"name":"example/module","version":"1.1.0"}]} successfully: Cannot find component to update
+```
 
 In the preceding example, there is no component version to which to roll back. Contact the component vendor or try to resolve the issue yourself.
 

guides/v2.2/comp-mgr/trouble/cman/were-sorry.md

@@ -43,30 +43,39 @@ Modify Magento's `composer.json` to reference the `https://repo.magento.com` rep
 2.	Change to your Magento installation directory.
 3.	Back up your existing `composer.json`:
 
-		cp composer.json composer.json.bak
+    ```bash
+    cp composer.json composer.json.bak
+    ```
 
 4.	Open `composer.json` in a text editor.
 5.	To the `repositories` section, add the following:
 
-			{
-				"type": "composer",
-				"url": "https://repo.magento.com/"
-			}
+    ```json
+    {
+        "type": "composer",
+        "url": "https://repo.magento.com/"
+    }
+    ```
 
     Example:
 
-		"repositories": [
-				{
-					"type": "composer",
-					"url": "https://repo.magento.com/"
-				}
-			]
+    ```json
+    "repositories": [
+        {
+          "type": "composer",
+          "url": "https://repo.magento.com/"
+        }
+      ]
+    ```
 
 6.	Save your changes to `composer.json` and exit the text editor.
 7.	Change to the `update` subdirectory, where the updater is located.
 8.	Enter the following command:
 
-		composer install
+    ```bash
+    composer install
+    ```
+
 9.	After the command completes, try the upgrade again.
 
 ### You cloned the Magento GitHub repository {#git-clone}

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

@@ -65,10 +65,12 @@ After the upgrade completes:
 
 *	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
-		class "\Cybersource" for "CybersourceLogger" generation does not exist.
+    ```terminal
+    [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.
+    ```
 
 ## Continue your upgrade {#ce-ee-continue}
 

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

@@ -37,15 +37,25 @@ bin/magento cache:clean
 
 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>/generated/code/*
+```bash
+rm -rf <Magento install dir>/var/cache/*
+```
+
+```bash
+rm -rf <Magento install dir>/var/page_cache/*
+```
+
+```bash
+rm -rf <Magento install dir>/generated/code/*
+```
 
 ## Restart Varnish
 
 After the upgrade completes, restart Varnish if you use it for page caching.
 
-	service varnish restart
+```bash
+service varnish restart
+```
 
 Then access your [storefront](https://glossary.magento.com/storefront) and verify everything is working properly.
 
@@ -55,10 +65,11 @@ After you finish your upgrade, errors might display.
 
 *	On the main storefront page, the following error might display.
 
-		We're sorry, an error has occurred while generating this email.
+    _We're sorry, an error has occurred while generating this email._
+
 *	On a [category](https://glossary.magento.com/category) page, the following error might display:
 
-		We can't find products matching the selection.
+    _We can't find products matching the selection._
 
 If any of the preceding errors display, perform all of the following tasks.
 
@@ -70,7 +81,9 @@ Clear the `var/cache`, 	`var/page_cache`, `generated/code`
 
 A sample command follows:
 
-	rm -rf var/cache/* var/page_cache/* generated/code/*
+```bash
+rm -rf var/cache/* var/page_cache/* generated/code/*
+```
 
 ### Access your storefront again
 

guides/v2.2/get-started/authentication/gs-authentication-token.md

@@ -68,15 +68,15 @@ The following image shows a token request for the [admin](https://glossary.magen
 
 The following example uses the `curl` command to request a token for a customer account:
 
-```
+```bash
 curl -X POST "https://magento.host/index.php/rest/V1/integration/customer/token" \
      -H "Content-Type:application/json" \
      -d "{"username":"customer1", "password":"customer1pw"}"
 ```
 
 The following example makes the same request with [XML](https://glossary.magento.com/xml) for a customer account token:
 
-```
+```bash
 curl -X POST "http://magento.vg/index.php/rest/V1/integration/customer/token" \
      -H "Content-Type:application/xml"  \
      -d "<login><username>customer1</username><password>customer1pw</password></login>"

guides/v2.2/marketplace/eqp/auth.md

@@ -22,7 +22,7 @@ You must use an application ID and secret to obtain a session token. See the fol
 
 The following endpoint grants an application session token:
 
-```
+```http
 POST /rest/v1/apps/session/token
 ```
 
@@ -41,7 +41,7 @@ The following example shows a request and expected response:
 
 **Request**
 
-```shell
+```bash
 curl -X POST \
      -u 'AQ17NZ49WC:8820c99614d65f923df7660276f20e029d73e2ca' \
      -H 'Content-Type: application/json' \
@@ -72,7 +72,7 @@ After obtaining a valid session token, you must use it as a bearer token in all
 
 For example, to access a user profile with a session token:
 
-```shell
+```bash
 curl -X GET \
      -H 'Authorization: Bearer baGXoStRuR9VCDFQGZNzgNqbqu5WUwlr.cAxZJ9m22Le7' \
      https://developer-api.magento.com/rest/v1/users/MAG123456789