Merge pull request #4 from magento/master

Merge magento/devdocs to master

Author: KevinBKozan

.github/CONTRIBUTING.md

@@ -16,7 +16,7 @@ If you write and contribute a full topic, we will add your name (or your company
 
 ## Get started
 
-* Make sure you have a [GitHub account](https://github.com/signup/free).
+* Make sure you have a [GitHub account](https://github.com/signup/free). We recommend adding [Two-Factor Authentication](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#two-factor)(2FA) to your account. Partners are required to add 2FA protection when contributing to Magento respositories.
 * Make sure you sign the [Magento Contributor Agreement](http://www.magento.com/legaldocuments/mca).
 * Check the [guidelines](#contribution-guidelines).
 * [Fork and clone](https://help.github.com/articles/fork-a-repo/) the [DevDocs repository](GitHub.com/magento/devdocs). [Sync](https://help.github.com/articles/syncing-a-fork/) as needed.
@@ -25,7 +25,7 @@ If you write and contribute a full topic, we will add your name (or your company
 
 **Note:** If you have not signed the [Magento Contributor Agreement](http://www.magento.com/legaldocuments/mca), the PR will provide a link to complete. All contributors are required to submit the form and agree to the terms to complete it.
 
-**TIP:** If you are not sure where to start contributing, check out our GitHub issues labeled [help wanted](https://github.com/magento/devdocs/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) and [good first issue](https://github.com/magento/devdocs/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).
+**Tip![:]()** If you are not sure where to start contributing, check out our GitHub issues labeled [help wanted](https://github.com/magento/devdocs/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) and [good first issue](https://github.com/magento/devdocs/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).
 
 ## Contribution guidelines
 We use [Markdown](http://daringfireball.net/projects/markdown/) to write our documentation, which is a simple markup language that we convert to HTML using [Kramdown](http://kramdown.gettalong.org/syntax.html).

404.md

@@ -1,9 +1,9 @@
 ---
 layout: full-width
 group:
-subgroup: 
+subgroup:
 title: Page Not Found
-menu_title: Page Not Found 
+menu_title: Page Not Found
 menu_order: 1
 permalink: /404.html
 ---
@@ -16,4 +16,4 @@ The page you are looking for could not be found or the documentation does not ex
 To report a missing page, please submit an issue in our public [GitHub](https://github.com/magento/devdocs) repo.
 
 
-[Return to main page]({{ site.baseurl }})
+[Return to main page]({{ site.baseurl }}/)

_data/toc/magento-functional-testing-framework-guide.yml

@@ -1,133 +1,81 @@
 label: Magento Functional Testing Framework Guide
+versions: ["2.2", "2.3"]
 pages:
 
-  - label:  MFTF release 2
+  - label: Introduction
     url: /magento-functional-testing-framework/release-2/introduction.html
-    versions: ["2.2", "2.3"]
-    children:
-
-      - label: Getting started
-        url: /magento-functional-testing-framework/release-2/getting-started.html
-
-      - label: Suite
-        url: /magento-functional-testing-framework/release-2/suite.html
-
-      - label: Test
-        url: /magento-functional-testing-framework/release-2/test.html
-        children:
-
-          - label: Annotations
-            url: /magento-functional-testing-framework/release-2/test/annotations.html
-
-          - label: Actions
-            url: /magento-functional-testing-framework/release-2/test/actions.html
-
-          - label: Action groups
-            url: /magento-functional-testing-framework/release-2/test/action-groups.html
-
-          - label: Assertions
-            url: /magento-functional-testing-framework/release-2/test/assertions.html
-
-      - label: Page
-        url: /magento-functional-testing-framework/release-2/page.html
 
-      - label: Section
-        url: /magento-functional-testing-framework/release-2/section.html
-        children:
+  - label: Getting started
+    url: /magento-functional-testing-framework/release-2/getting-started.html
 
-          - label: Parameterized selectors
-            url: /magento-functional-testing-framework/release-2/section/parameterized-selectors.html
+  - label: Suite
+    url: /magento-functional-testing-framework/release-2/suite.html
 
-          - label: Locator functions
-            url: /magento-functional-testing-framework/release-2/section/locator-functions.html
-
-      - label: Data
-        url: /magento-functional-testing-framework/release-2/data.html
-
-      - label: Metadata
-        url: /magento-functional-testing-framework/release-2/metadata.html
-
-      - label: Merging
-        url: /magento-functional-testing-framework/release-2/merging.html
-
-      - label: Configuration
-        url: /magento-functional-testing-framework/release-2/configuration.html
+  - label: Test
+    url: /magento-functional-testing-framework/release-2/test.html
+    children:
 
-      - label: CLI Commands
-        children:
+      - label: Annotations
+        url: /magento-functional-testing-framework/release-2/test/annotations.html
 
-          - label: robo
-            url: /magento-functional-testing-framework/release-2/commands/robo.html
-          - label: codecept
-            url: /magento-functional-testing-framework/release-2/commands/codeception.html
+      - label: Actions
+        url: /magento-functional-testing-framework/release-2/test/actions.html
 
-      - label: Update
-        url: /magento-functional-testing-framework/release-2/update.html
+      - label: Action groups
+        url: /magento-functional-testing-framework/release-2/test/action-groups.html
 
-      - label: Best practices
-        url: /magento-functional-testing-framework/release-2/best-practices.html
+      - label: Assertions
+        url: /magento-functional-testing-framework/release-2/test/assertions.html
 
-      - label: Troubleshooting
-        url: /magento-functional-testing-framework/release-2/troubleshooting.html
+  - label: Page
+    url: /magento-functional-testing-framework/release-2/page.html
 
-  - label: MFTF release 1
-    url: /magento-functional-testing-framework/release-1/introduction.html
-    versions: ["2.2"]
+  - label: Section
+    url: /magento-functional-testing-framework/release-2/section.html
     children:
 
-    - label: Getting Started
-      url: /magento-functional-testing-framework/release-1/getting-started.html
+      - label: Parameterized selectors
+        url: /magento-functional-testing-framework/release-2/section/parameterized-selectors.html
 
-    - label: Cest
-      url: /magento-functional-testing-framework/release-1/cest.html
-      children:
+      - label: Locator functions
+        url: /magento-functional-testing-framework/release-2/section/locator-functions.html
 
-        - label: Annotations
-          url: /magento-functional-testing-framework/release-1/cest/annotations.html
+  - label: Data
+    url: /magento-functional-testing-framework/release-2/data.html
 
-        - label: Actions
-          url: /magento-functional-testing-framework/release-1/cest/actions.html
+  - label: Metadata
+    url: /magento-functional-testing-framework/release-2/metadata.html
 
-        - label: Action groups
-          url: /magento-functional-testing-framework/release-1/cest/action-groups.html
+  - label: Merging
+    url: /magento-functional-testing-framework/release-2/merging.html
 
-        - label: Assertions
-          url: /magento-functional-testing-framework/release-1/cest/assertions.html
+  - label: Extending
+    url: /magento-functional-testing-framework/release-2/extending.html
 
-    - label: Page
-      url: /magento-functional-testing-framework/release-1/page.html
+  - label: Configuration
+    url: /magento-functional-testing-framework/release-2/configuration.html
 
-    - label: Section
-      url: /magento-functional-testing-framework/release-1/section.html
-      children:
-
-        - label: Parameterized selectors
-          url: /magento-functional-testing-framework/release-1/section/parameterized-selectors.html
-
-        - label: Locator Functions
-          url: /magento-functional-testing-framework/release-1/section/locator-functions.html
-
-    - label: Data
-      url: /magento-functional-testing-framework/release-1/data.html
+  - label: CLI Commands
+    children:
 
-    - label: CLI Commands
-      children:
+      - label: mftf
+        url: /magento-functional-testing-framework/release-2/commands/mftf.html
+      - label: codecept
+        url: /magento-functional-testing-framework/release-2/commands/codeception.html
 
-        - label: robo
-          url: /magento-functional-testing-framework/release-1/commands/robo.html
-        - label: codecept
-          url: /magento-functional-testing-framework/release-1/commands/codeception.html
+  - label: Update
+    url: /magento-functional-testing-framework/release-2/update.html
 
-    - label: Update
-      url: /magento-functional-testing-framework/release-1/update.html
+  - label: Best practices
+    url: /magento-functional-testing-framework/release-2/best-practices.html
 
-    - label: Troubleshooting
-      url: /magento-functional-testing-framework/release-1/troubleshooting.html
+  - label: Troubleshooting
+    url: /magento-functional-testing-framework/release-2/troubleshooting.html
 
   - label: Contribution Guidelines
     url: /magento-functional-testing-framework/contribution-guidelines.html
-    versions: ["2.2", "2.3"]
+#    versions: ["2.2", "2.3"]
 
   - label: Changelog
     url: /magento-functional-testing-framework/changelog.html
-    versions: ["2.2", "2.3"]
+#    versions: ["2.2", "2.3"]

_includes/backward-incompatible-changes/b2b/1.0.2-1.0.3.html

@@ -0,0 +1,2 @@
+<h3 id="changes-102-103">No changes</h3>
+<p>No backward incompatible changes.</p>

_includes/backward-incompatible-changes/b2b/1.0.3-1.0.4.html

@@ -0,0 +1,2 @@
+<h3 id="changes-103-104">No changes</h3>
+<p>No backward incompatible changes.</p>

_includes/backward-incompatible-changes/b2b/1.0.4-1.0.5.html

@@ -0,0 +1,2 @@
+<h3 id="changes-104-105">No changes</h3>
+<p>No backward incompatible changes.</p>

_includes/install/mysql_max-allowed-packet-ubuntu.md

@@ -1,9 +1,7 @@
-<div markdown="1">
 
 	To increase the value, open `/etc/mysql/mysql.cnf` in a text editor and locate the value for `max_allowed_packet`. Save your changes to `mysql.cnf`, close the text editor, and restart MySQL (`service mysql restart`).
 
 	To optionally verify the value you set, enter the following command at a `mysql>` prompt:
 
 		 SHOW VARIABLES LIKE 'max_allowed_packet';
-		 
-</div>
+