Merge pull request #34 from magento/2.1_migration_update-include-php-dev

Update php-dev to match 2.0 content

Author: jcalcaben

_includes/php-dev/component-root.md

@@ -1,19 +1,19 @@
 <div markdown="1">
 
-### Root directory
-We refer to a component's *root directory* as the top-level directory in which you develop component code. Typically, this directory is located in one of the following directories relative to the Magento root directory:
+### 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:
 
-*	Subdirectory of `app` (*recommended*.) :
+* `<Magento install directory>/app`: This is the *recommended* location for component development. You can easily set up this type of environment by [Cloning the Magento 2 GitHub repository]({{ site.gdeurl21 }}install-gde/prereq/dev_install.html).
 
-	*	For modules, use `app/code`
-	*	For themes, use `app/design/frontend` (storefront theme) or `app/design/adminhtml` (Magento Admin theme)
-	*	For language packages, use `app/i18n`
+  * For modules, use `app/code`.
+  * For storefront themes, use `app/design/frontend`.
+  * For Admin themes, use `app/design/adminhtml`.
+  * For language packages, use `app/i18n`.
 
-	You can easily set up this type of environment by <a href="{{ site.gdeurl21 }}install-gde/prereq/dev_install.html">cloning the Magento 2 GitHub repository</a>. Typically, you cloned the repository if you want to to contribute code to the Magento 2 codebase.
-*	`vendor`: You get this directory structure if you used the <a href="{{ site.gdeurl21 }}install-gde/prereq/integrator_install.html">`composer create-project`</a> command to get a Magento 2 metapackage (which downloads the CE or EE code), or if you extracted a <a href="{{ site.gdeurl21 }}install-gde/prereq/zip_install.html">compressed Magento 2 archive</a>.
+* `<Magento install directory>/vendor`: This location is found in the alternative setups where the [`composer create-project`]({{ site.gdeurl21 }}install-gde/prereq/integrator_install.html) command was used to get a Magento 2 metapackage (which downloads the CE or EE code), or a [compressed Magento 2 archive]({{ site.gdeurl21 }}install-gde/prereq/zip_install.html) was extracted in order to install Magento. *We do not recommend developing components using this setup*.
 
 ### Required files
-The following are required for all components:
+The following files are required for all components:
 
-*	`registration.php`: Among other things, specifies the directory in which the component is installed; by default, components install in the `<Magento root dir>/vendor` directory. For more information, see <a href="{{ site.gdeurl21 }}extension-dev-guide/component-registration.html" target="_blank">Component registration</a>.
-*	`composer.json`: Specifies component dependencies. For more information, see <a href="{{ site.gdeurl21 }}extension-dev-guide/composer-integration.html" target="_blank">Composer integration</a>.
+*	`registration.php`: Among other things, this file specifies the directory in which the component is installed by vendors in production environments. By default, composer automatically installs components in the `<Magento root dir>/vendor` directory. For more information, see [Component registration]({{ site.gdeurl21 }}extension-dev-guide/component-registration.html).
+*	`composer.json`: Specifies component dependencies and other metadata. For more information, see [Composer integration]({{ site.gdeurl21 }}extension-dev-guide/composer-integration.html).

_includes/php-dev/lang-pack-file-struct.md

@@ -1,27 +1,27 @@
-<div markdown="1">
-
-<h3 id="file-struct-comp-lang">Magento 2 language package file structure</h3>
+### Language package file structure
 A typical directory structure for three language packages follows:
 
-	├── de_DE
-	│   ├── composer.json
-	│   ├── language.xml
-	│   ├── LICENSE_AFL.txt
-	│   ├── LICENSE.txt
-	│   └── registration.php
-	├── en_US
-	│   ├── composer.json
-	│   ├── language.xml
-	│   ├── LICENSE_AFL.txt
-	│   ├── LICENSE.txt
-	│   └── registration.php
-	├── pt_BR
-	│   ├── composer.json
-	│   ├── language.xml
-	│   ├── LICENSE_AFL.txt
-	│   ├── LICENSE.txt
-	│   └── registration.php
+~~~
+├── de_DE
+│   ├── composer.json
+│   ├── language.xml
+│   ├── LICENSE_AFL.txt
+│   ├── LICENSE.txt
+│   └── registration.php
+├── en_US
+│   ├── composer.json
+│   ├── language.xml
+│   ├── LICENSE_AFL.txt
+│   ├── LICENSE.txt
+│   └── registration.php
+├── pt_BR
+│   ├── composer.json
+│   ├── language.xml
+│   ├── LICENSE_AFL.txt
+│   ├── LICENSE.txt
+│   └── registration.php
+~~~
 
-The only required directory for a language package is the top-level directory. Although not required, we recommend that the directory name match the <a href="http://www.iso.org/iso/home/standards/language_codes.htm" target="_blank">ISO</a> code to identify the locale.
+The only required directory for a language package is the top-level directory. Although not required, we recommend that the directory name match the [ISO](http://www.iso.org/iso/home/standards/language_codes.htm){:target="_blank"} code to identify the locale.
 
-For more information about language packages, see <a href="{{ site.gdeurl21 }}config-guide/cli/config-cli-subcommands-i18n.html">Translation dictionaries and language packages</a>.
+For more information about language packages, see [Translation dictionaries and language packages]({{ site.gdeurl21 }}config-guide/cli/config-cli-subcommands-i18n.html).