Merge pull request #4469 from atwixfirster/magento-root

magento/devdocs#: Replace <your Magento install dir> with <magento_root>

Author: dobooth

_includes/comp-man/dependency.md

@@ -4,21 +4,22 @@
 
 We suggest you try the following solutions in the order shown:
 
-*	[Conflicting dependencies](#trouble-depend-conflict)
-*	[File system permissions issues](#trouble-depend-permission)
-*	[The Component Dependency Check status never changes](#trouble-depend-state)
+* [Conflicting dependencies](#trouble-depend-conflict)
+* [File system permissions issues](#trouble-depend-permission)
+* [The Component Dependency Check status never changes](#trouble-depend-state)
 
 ### Conflicting dependencies {#trouble-depend-conflict}
 
 The message `We found conflicting component dependencies` displays if Composer cannot determine which components to install or update. To resolve component dependency issues, you should be a technical person who thoroughly understands how Composer works.
 
 Following is a sample failure message:
 
-	We found conflicting component dependencies.
-
-	You are trying to update package(s) magento/module-sample-data to 1.0.0-beta
-	We've detected conflicts with the following packages:
-	- magento/sample-data version 0.74.0-beta15. Please try to update it to one of the following package versions: 0.74.0-beta16, 0.74.0-beta14, 0.74.0-beta13, 0.74.0-beta12, 0.74.0-beta11, 0.74.0-beta10, 0.74.0-beta9, 0.74.0-beta8, 0.74.0-beta7
+```terminal
+ We found conflicting component dependencies.
+ You are trying to update package(s) magento/module-sample-data to 1.0.0-beta
+ We've detected conflicts with the following packages:
+ - magento/sample-data version 0.74.0-beta15. Please try to update it to one of the following package versions: 0.74.0-beta16, 0.74.0-beta14, 0.74.0-beta13, 0.74.0-beta12, 0.74.0-beta11, 0.74.0-beta10, 0.74.0-beta9, 0.74.0-beta8, 0.74.0-beta7
+```
 
 {:.bs-callout .bs-callout-info}
 The message you see will likely be different.
@@ -33,13 +34,15 @@ Edit `composer.json` to make any of these changes and try the readiness check ag
 
 If the Magento file system owner doesn't have permissions to write to directories on the Magento file system, a message similar to the following displays:
 
-	file_put_contents(/var/www/html/magento2ce/var/composer_home/cache/repo/https---
-	packagist.org/provider-doctrine$instantiator.json): failed to open stream: Permission denied
+```terminal
+file_put_contents(/var/www/html/magento2ce/var/composer_home/cache/repo/https---
+packagist.org/provider-doctrine$instantiator.json): failed to open stream: Permission denied
+```
 
 Make sure you set file system permissions as discussed in [Overview of ownership and permissions]({{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html).
 
 ### The Component Dependency Check status never changes {#trouble-depend-state}
 
-In some cases, the status of the Component Dependency Check doesn't change, even after you try to correct issues. In that case, you can either delete or rename files named `<your Magento install dir>/var/.update_cronjob_status` and `<your Magento install dir>/var/.setup_cronjob_status` and try running the Component Manager again.
+In some cases, the status of the Component Dependency Check doesn't change, even after you try to correct issues. In that case, you can either delete or rename files named `<magento_root>/var/.update_cronjob_status` and `<magento_root>/var/.setup_cronjob_status` and try running the Component Manager again.
 
 Renaming or removing these files forces the Component Manager to run the checks again.

_includes/config/locate-session.md

@@ -2,24 +2,28 @@
 
 This topic discusses how to locate where your session files are stored. The Magento application uses the following logic to store session files:
 
-*	If you configured memcached, sessions are stored in RAM; for more information, see [Use memcached for session storage]({{ page.baseurl }}/config-guide/memcache/memcache.html).
-*	If you configured Redis, sessions are stored on the Redis server; for more information, see [Use Redis for page caching or session storage]({{ page.baseurl }}/config-guide/redis/config-redis.html).
-*	If you're using the default file-based session storage, we store sessions in the following locations in the order shown:
+* If you configured memcached, sessions are stored in RAM; for more information, see [Use memcached for session storage]({{ page.baseurl }}/config-guide/memcache/memcache.html).
+* If you configured Redis, sessions are stored on the Redis server; for more information, see [Use Redis for page caching or session storage]({{ page.baseurl }}/config-guide/redis/config-redis.html).
+* If you're using the default file-based session storage, we store sessions in the following locations in the order shown:
 
-	1.	Directory defined in [`env.php`](#session-where-env)
-	2.	Directory defined in [`php.ini`](#session-where-phpini)
-	3.	`<your Magento install dir>/var/session` directory
+  1. Directory defined in [`env.php`](#session-where-env)
+  1. Directory defined in [`php.ini`](#session-where-phpini)
+  1. `<magento_root>/var/session` directory
 
 ### `env.php` example {#session-where-env}
-A sample snippet from `<your Magento install dir>/app/etc/env.php` follows:
 
-	'session' =>
-	   array (
-	     'save' => 'files',
-	     'save_path' => '/var/www/session',
-	),
+A sample snippet from `<magento_root>/app/etc/env.php` follows:
+
+```php
+ 'session' =>
+    array (
+      'save' => 'files',
+      'save_path' => '/var/www/session',
+ ),
+```
 
 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.

_includes/install/file-system-perms-oneuser.md

@@ -1,36 +1,50 @@
 To set permissions before you install the Magento software:
 
-1.	Log in to your Magento server.
-2.	Use a file manager application provided by your shared hosting provider to verify write permissions are set on the following directories:
+1. Log in to your Magento server.
+1. Use a file manager application provided by your shared hosting provider to verify write permissions are set on the following directories:
 
-	*	`vendor` (Composer or compressed archive installation)
-	*	`app/etc`
-	*	`pub/static`
-	*	`var`
-	*	Any other static resources
+    * `vendor` (Composer or compressed archive installation)
+    * `app/etc`
+    * `pub/static`
+    * `var`
+    * Any other static resources
 
-2.	If you have command-line access, enter the following commands in the order shown:
+1. If you have command-line access, enter the following commands in the order shown:
 
-		cd <your Magento install dir>
-		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
+    ```bash
+    cd <magento_root>
+    ```
 
-	To optionally enter all commands on one line, enter the following assuming Magento is installed in `/var/www/html/magento2`:
+    ```bash
+    find var vendor pub/static pub/media app/etc -type f -exec chmod u+w {} +
+   ```
 
-		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:
+    ```bash
+    find var vendor pub/static pub/media app/etc -type d -exec chmod u+w {} +
+    ```
 
-	*	[Compressed archive]({{ page.baseurl }}/install-gde/prereq/zip_install.html)
-	*	[Composer metapackage]({{ page.baseurl }}/install-gde/composer.html)
-	*	[Clone the repository (contributing developers only)]({{ page.baseurl }}/install-gde/prereq/dev_install.html)
-4.	After you have set file system ownership and permissions, continue with any of the following:
+    ```bash
+    chmod u+x bin/magento
+    ```
 
-	*	[Command-line installation]({{ page.baseurl }}/install-gde/install/cli/install-cli.html)
-	*	[Setup Wizard installation]({{ page.baseurl }}/install-gde/install/web/install-web.html)
+1. To optionally enter all commands on one line, enter the following, assuming Magento is installed in `/var/www/html/magento2`:
+
+    ```bash
+    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
+    ```
+
+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)
+* [Composer metapackage]({{ page.baseurl }}/install-gde/composer.html)
+* [Clone the repository (contributing developers only)]({{ page.baseurl }}/install-gde/prereq/dev_install.html)
+
+1. After you have set file system ownership and permissions, continue with any of the following:
+
+* [Command-line installation]({{ page.baseurl }}/install-gde/install/cli/install-cli.html)
+* [Setup Wizard installation]({{ page.baseurl }}/install-gde/install/web/install-web.html)
 
 {:.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

_includes/install/file-system-perms-oneuser_22.md

@@ -1,37 +1,51 @@
 To set permissions before you install the Magento software:
 
-1.	Log in to your Magento server.
-2.	Use a file manager application provided by your shared hosting provider to verify write permissions are set on the following directories:
+1. Log in to your Magento server.
+1. Use a file manager application provided by your shared hosting provider to verify write permissions are set on the following directories:
 
-	*	`vendor` (Composer or compressed archive installation)
-	*	`app/etc`
-	*	`pub/static`
-	*	`var`
-	*	`generated`
-	*	Any other static resources
+    * `vendor` (Composer or compressed archive installation)
+    * `app/etc`
+    * `pub/static`
+    * `var`
+    * `generated`
+    * Any other static resources
 
-2.	If you have command-line access, enter the following commands in the order shown:
+1. If you have command-line access, enter the following commands in the order shown:
 
-		cd <your Magento install dir>
-		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
+    ```bash
+    cd <magento_root>
+   ```
 
-	To optionally enter all commands on one line, enter the following assuming Magento is installed in `/var/www/html/magento2`:
+    ```bash
+    find var generated vendor pub/static pub/media app/etc -type f -exec chmod u+w {} +
+    ```
 
-		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:
+    ```bash
+    find var generated vendor pub/static pub/media app/etc -type d -exec chmod u+w {} +
+    ```
 
-	*	[Compressed archive]({{ page.baseurl }}/install-gde/prereq/zip_install.html)
-	*	[Composer metapackage]({{ page.baseurl }}/install-gde/composer.html)
-	*	[Clone the repository (contributing developers only)]({{ page.baseurl }}/install-gde/prereq/dev_install.html)
-4.	After you have set file system ownership and permissions, continue with any of the following:
+    ```bash
+    chmod u+x bin/magento
+    ```
 
-	*	[Command-line installation]({{ page.baseurl }}/install-gde/install/cli/install-cli.html)
-	*	[Setup Wizard installation]({{ page.baseurl }}/install-gde/install/web/install-web.html)
+To optionally enter all commands on one line, enter the following assuming Magento is installed in `/var/www/html/magento2`:
+
+    ```bash
+    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
+    ```
+
+1. 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)
+    * [Composer metapackage]({{ page.baseurl }}/install-gde/composer.html)
+    * [Clone the repository (contributing developers only)]({{ page.baseurl }}/install-gde/prereq/dev_install.html)
+
+1. After you have set file system ownership and permissions, continue with any of the following:
+
+    * [Command-line installation]({{ page.baseurl }}/install-gde/install/cli/install-cli.html)
+    * [Setup Wizard installation]({{ page.baseurl }}/install-gde/install/web/install-web.html)
 
 {:.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