added final review edits

Author: Dmitry Shevtsov

_includes/mtf/block_attributes.md

@@ -6,7 +6,7 @@ See the `block` node attributes details in the following table:
 |---|---|---|---|---|
 |`name`| Name of the block| Required|Unique in the page. The method to get the block class instance is generated using this value.|`widgetGrid`|
 |`class`| Full name of the block class |Required| Class name |`Magento\Widget\Test\Block\Adminhtml\Widget\WidgetGrid` |
-|`locator`| CSS selector or XPath locator of the block.|Required|[CSS Selectors](http://www.w3.org/TR/selectors/), <a href="http://www.w3.org/TR/xpath-31/">XPath</a>|CSS: `#widgetInstanceGrid`, XPath: `//*[@id="widgetInstanceGrid"`]|
+|`locator`| CSS selector or XPath locator of the block|Required|[CSS Selectors](http://www.w3.org/TR/selectors/), <a href="http://www.w3.org/TR/xpath-31/">XPath</a>|CSS: `#widgetInstanceGrid`, XPath: `//*[@id="widgetInstanceGrid"]`|
 |`strategy` |Selector strategy| Required|`css selector` or `xpath`| `css selector`|
 
 </div>

_includes/mtf/page-generator.html

@@ -1,3 +1,3 @@
 <p>To apply all changes you've made to the page (XML file), run the page generator.</p>
-<pre><code>php magento2/dev/tests/functional/utils/page.php</code></pre>
-<p>The page will be updated in the <code>magento2/dev/tests/functional/generated</code> directory.</p>
+<pre><code>php &lt;magento2&gt;/dev/tests/functional/utils/page.php</code></pre>
+<p>The page will be updated in the <code>&lt;magento2&gt;/dev/tests/functional/generated</code> directory.</p>

guides/v2.0/mtf/mtf_entities/mtf_block.md

@@ -52,7 +52,7 @@ To enable this feature follow:
 
 1. Log in to Magento Admin as administrator
 1. Follow **STORES > Configuration**
-1. Change **Store View** to **Main Website** (the Template Path and Block name will only appear for current website)
+1. Change **Store View** to **Main Website** (the template path and block name will only appear for current website)
 1. Follow **ADVANCED > Developer**
 1. Expand the **Debug** tab
 1. Set **Template Path Hints** to **Yes**
@@ -235,7 +235,7 @@ See a description of the nodes in the following table.
 
 <table><tbody>
 <tr><th>Node </th><th>Description </th><th>Value from example</th></tr>
-<tr><td><code>mapping</code> </td><td>Root node with a <code>strict</code> attribute. If <code>strict</code> equals 0, then all the fixture field data must be entered in the block form. If <code>strict</code> equals 1, then only the mapping file fields data must be entered in the block form. </td><td><code>"1"</code>. *only* the *mapping* file fields data *must* be entered in the block form.</td></tr>
+<tr><td><code>mapping</code> </td><td>Root node with a <code>strict</code> attribute. If <code>strict</code> equals <code>0</code>, then all the fixture field data must be entered in the block form. If <code>strict</code> equals <code>1</code>, then only the mapping file fields data must be entered in the block form. </td><td><code>"1"</code>. <i>Only</i> the <i>mapping</i> file fields data <i>must</i> be entered in the block form.</td></tr>
 <tr><td><code>wrapper</code> </td><td>Automatically adds <code>group_name</code> to the selector of the field, when <code>selector</code> has not been specified. </td><td><code>login</code></td></tr>
 <tr><td><code>fields</code> </td><td>The node containing mapping fields. </td><td><code>&lt;email&gt;</code>, <code>&lt;password /&gt;</code>.</td></tr>
 <tr><td><code>selector</code> </td><td>Value for the selector that is used to find the field. Default: <code>[name='group_name[field_node_name]']</code>. Default value is assigned automatically if the node is absent in the field. </td><td>For the <code>&lt;email&gt;</code>, the <code>[name='login[username]']</code>.<br/> For the <code>&lt;password /&gt;</code>, the <code>[name='login[password]']</code> that is the default value where <code>wrapper="login"</code>.</td></tr>
@@ -323,7 +323,7 @@ See the following table to understand the node's purpose.
 <tr><td><code>class</code> </td><td>Reference to the class that handles tab’s behavior.</td></tr>
 <tr><td><code>selector</code> </td><td>Identifier for the selector of the tab in the HTML code, used to open the tab.</td></tr>
 <tr><td><code>strategy</code> </td><td>Strategy of the selector. Can be <code>css selector</code> or <code>xpath</code>.</td></tr>
-<tr><td><code>fields</code> </td><td>List of fields with parameters, that are the same as in the [form mapping](#mtf_block_form_xml_nodes). Also field in tab can include more then one field, in this case add <code>field</code> attribute <code>composite="1"</code>.</td></tr>
+<tr><td><code>fields</code> </td><td>List of fields with parameters, that are the same as in the <a href="#mtf_block_form_xml_nodes">form mapping</a>. Also field in tab can include more then one field, in this case add <code>field</code> attribute <code>composite="1"</code>.</td></tr>
 </tbody>
 </table>
 
@@ -432,7 +432,7 @@ Let's create render for the bundle product.
 Details:
 
 * The PHP class for the page will be generated in the Magento_Catalog module, because we did not mention module attribute in the `page` node
-* In the viewBlock `block`, we indicate `name` attribute only
+* In the `block`, we indicate `name` attribute only
 
 **Step 4**. Run the page generator
 

guides/v2.0/mtf/mtf_entities/mtf_fixture-repo.md

@@ -433,7 +433,7 @@ As you can see, the `ConfigData.xml` of the `Authorizenet` module and the `Confi
 
 To run the generator, enter the following command in your terminal:
 
-    php magento2/dev/tests/functional/utils/generate.php
+    php <magento2>/dev/tests/functional/utils/generate.php
 
 The preceding is an example of repository merging. Using the approach from the example you can merge repositories for any other fixture, not `Config` only.
 

guides/v2.0/mtf/mtf_entities/mtf_fixture.md

@@ -32,7 +32,7 @@ In this chapter we will create a new fixture and modify it, considering differen
 
 To apply any changes of the fixture, you should run generate tool:
 
-    cd magento2/dev/tests/functional/utils
+    cd <magento2>/dev/tests/functional/utils
     php generate.php
 
 This tool creates PHP classes that are used by the test.
@@ -45,7 +45,7 @@ Let's imagine that we want to create new fixture to test our Widget module.
 
 Magento has a tool that automatically generates your fixture with parameters you indicated in arguments.  That is `generateFixtureXml.php,` located in `<magento2>/dev/tests/functional/utils`.
 
-    cd magento2/dev/tests/functional/utils
+    cd <magento2>/dev/tests/functional/utils
     php -f generateFixtureXml.php -- --name widget --entity_type widget_instance --collection Magento\\Widget\\Model\\Resource\\Widget\\Instance\\Collection
 
 <div class="bs-callout bs-callout-info" id="info">
@@ -103,7 +103,7 @@ Following is the generated Widget fixture located in `<magento2>/dev/tests/funct
 
 To generate PHP classes, enter the following commands in the order shown:
 
-    cd magento2/dev/tests/functional/utils
+    cd <magento2>/dev/tests/functional/utils
     php generate.php
 
 That's it!
@@ -193,7 +193,7 @@ Let's manually add a new field and `group` attribute to the `Widget.xml`. See wh
 
 To apply the changes, enter the following commands:
 
-    cd magento2/dev/tests/functional/utils
+    cd <magento2>/dev/tests/functional/utils
     php generate.php
 
 ## Add a repository to the fixture field {#mtf_fixture_repositoy}
@@ -247,7 +247,7 @@ Following is the code of `LayoutUpdates.xml`. It specifies two datasets that you
 
 To apply the changes, enter the following commands:
 
-    cd magento2/dev/tests/functional/utils
+    cd <magento2>/dev/tests/functional/utils
     php generate.php
 
 ## Add the data source to the fixture field {#mtf_fixture_source}
@@ -278,7 +278,7 @@ Let's see our data source file `<magento2>/dev/tests/functional/tests/app/Magent
 
 To apply the changes, enter the following commands:
 
-    cd magento2/dev/tests/functional/utils
+    cd <magento2>/dev/tests/functional/utils
     php generate.php
 
 <div class="bs-callout bs-callout-warning">
@@ -314,7 +314,7 @@ We can create file that adds field `new_field` to our widget fixture.
 
 To apply the changes, enter the following commands:
 
-    cd magento2/dev/tests/functional/utils
+    cd <magento2>/dev/tests/functional/utils
     php generate.php
 
 `new_field` has been added in fixture `Widget.php`.
@@ -351,6 +351,6 @@ In this example you will create a new fixture PHP class AdWidget that extends Wi
 
 To generate your new fixture PHP class, enter the following commands:
 
-    cd magento2/dev/tests/functional/utils
+    cd <magento2>/dev/tests/functional/utils
     php generate.php
 

guides/v2.0/mtf/mtf_entities/mtf_page.md

@@ -75,7 +75,7 @@ The following table explains `<page>` attributes.
 |`name`|Name of the page PHP class, that will be generated in `<magento2>/dev/tests/functional/generated/Magento/<module>/Page/<area>/<name>.php`.|`WidgetInstanceIndex` |
 |`area`|The page usage area. Determines a [type of the page](#mtf_page_types). The directory with the name assigned to `area` will be created in the module. Value can be `Adminhtml` for the Admin area, or any other for another area.|`Adminhtml`. The page class will be generated in the `<magento2>/dev/tests/functional/generated/Magento/Widget/Page/Adminhtml`. |
 |`mca`{:#mca}|Path following the base URL for the Magento pages (storefront or Admin), or full URL for other pages. MCA is an abbreviation of the Module Controller Action.|`admin/widget_instance/index`. Considering that `area="Adminhtml"`, the Magento page under test is `http://example.com/admin/admin/widget_instance/index`|
-|`module`|Module where the page will be generated |`Magento_Widget`. The page will be generated in the `<magento2>/dev/tests/functional/Magento/Widget/Page`|
+|`module`|Module where the page will be generated. |`Magento_Widget`. The page will be generated in the `<magento2>/dev/tests/functional/Magento/Widget/Page`|
 
 {% include mtf/block_attributes.md %}
 
@@ -99,13 +99,13 @@ The page will be opened as a concatenation of `app_backend_url` from `<magento2>
 
 ### Storefront page {#mtf_page_storefront}
 
-Storefront page is recognizable by `area` assigned any value except `Adminhtml` *and* `mca` doesn't have `http`. This type of page extends the [Mtf\Page\FrontendPage][] class.
+Storefront page is recognizable by `area` assigned any value except `Adminhtml`, *and* `mca` doesn't have `http`. This type of page extends the [Mtf\Page\FrontendPage][] class.
 
 The page will be opened as concatenation of `app_frontend_url` from `magento2/dev/tests/functional/phpunit.xml` and [mca](#mca) link.
 
 ### External page {#mtf_page_extern}
 
-External page has `area` assigned any value except `Adminhtml` AND `mca` containing `http`. The generated page extends [Magento\Mtf\Page\ExternalPage][] class.
+External page has `area` assigned any value except `Adminhtml`, *and* `mca` containing `http`. The generated page extends [Magento\Mtf\Page\ExternalPage][] class.
 
 The page will be opened using [mca](#mca) link.
 
@@ -168,7 +168,7 @@ We should create `dev/tests/functional/tests/app/Magento/Review/Test/Page/Produc
 
 And generate the updated page:
 
-    php magento2/dev/tests/functional/utils/generate/page.php
+    php <magento2>/dev/tests/functional/utils/generate/page.php
 
 The result is in the `<magento2>/dev/tests/functional/generated/Magento/Catalog/Test/Page/Product/CatalogProductView.php` with the following code:
 

guides/v2.0/mtf/mtf_installation.md

@@ -59,7 +59,7 @@ The Magento Testing Framework requires Composer, which downloads libraries defin
 1.    <a href="{{ site.gdeurl }}install-gde/basics/basics_login.html">Open a command prompt</a>.
 1.    Log in to your Magento server as a user with permissions to modify the Magento file system. (This is typically <a href="{{ site.gdeurl }}install-gde/prereq/apache-user.html">the Magento file system owner</a>.)
 
-    cd magento2/dev/tests/functional/
+    cd <magento2>/dev/tests/functional/
     composer install
 
 <div class="bs-callout bs-callout-info" id="info">
@@ -76,7 +76,7 @@ And run from this directory <code>php composer.phar install</code>.</p>
 
 Check whether the `vendor` directory exists in `<magento2>/dev/tests/functional/`.
 
-    cd magento2/dev/tests/functional/
+    cd <magento2>/dev/tests/functional/
     ls
 
 Find the `mtf` directory.

guides/v2.0/mtf/mtf_quickstart/mtf_quickstart_environmemt.md

@@ -46,7 +46,7 @@ Generator generates fixtures, repositories and page objects. Once MTF is initial
 
 Enter in terminal:
 
-    cd magento2/dev/tests/functional/utils
+    cd <magento2>/dev/tests/functional/utils
     php generate.php
 
 <h2 id="mtf_install_pre">Next Steps</h2>

guides/v2.0/mtf/mtf_update.md

@@ -43,5 +43,5 @@ Step 3.    <a href="{{ site.gdeurl }}mtf/mtf_installation.html#mtf_install_perfo
 
 Enter in terminal:
 
-    cd magento2/dev/tests/functional/
+    cd <magento2>/dev/tests/functional/
     composer update