Merge branch 'master' into issue-2910

Author: dobooth

.github/CONTRIBUTING.md

@@ -42,7 +42,7 @@ The DevDocs team and Maintainers will review the PR and help with formatting and
 
 ## Contribution guidelines
 
-Write content using [Kramdown](https://kramdown.gettalong.org/), which is a simple markup language. We use Kramdown, Liquid, and [Jekyll](https://jekyllrb.com/) to generate a static site hosted through [GH Pages](https://help.github.com/articles/what-is-github-pages/). Check [Templates](#templates) for examples of styles and markdown.
+Write content using [kramdown](https://kramdown.gettalong.org/), which is a simple markup language. We use kramdown, Liquid, and [Jekyll](https://jekyllrb.com/) to generate a static site hosted through [GH Pages](https://help.github.com/articles/what-is-github-pages/). Check [Templates](#templates) for examples of styles and markdown.
 
 You can update existing or add new topics in their respective Magento 2 versioned directories (2.1, 2.2, 2.3, and onward). If you need help finding a directory for your content, we can help in your PR.
 

.gitignore

@@ -31,3 +31,9 @@ _algolia_api_key
 /mbi/
 /page-builder/
 /guides/m1x/
+/mftf/
+
+# Docs from different branches #
+###################################
+
+/guides/v2.0/

Gemfile.lock

@@ -1,14 +1,14 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: dcb189be6fd4e0ebc69dce7cd6cdeb3b960b3a9e
+  revision: 7a7f3798c51e6d9ea0fe2d419a13d945ed1406d8
   specs:
     devdocs (0.0.1)
       jekyll (~> 3.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -23,7 +23,7 @@ GEM
       json (>= 1.5.1)
     colorator (1.1.0)
     colorize (0.8.1)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -70,23 +70,23 @@ GEM
       verbal_expressions (~> 0.1.5)
     jekyll-optional-front-matter (0.3.0)
       jekyll (~> 3.0)
-    jekyll-redirect-from (0.14.0)
-      jekyll (~> 3.3)
+    jekyll-redirect-from (0.15.0)
+      jekyll (>= 3.3, < 5.0)
     jekyll-relative-links (0.6.0)
       jekyll (~> 3.3)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
+    jekyll-sitemap (1.3.1)
+      jekyll (>= 3.7, < 5.0)
     jekyll-titles-from-headings (0.5.1)
       jekyll (~> 3.3)
-    jekyll-watch (2.1.2)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.1.0)
+    json (2.2.0)
     kramdown (1.17.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    liquid (4.0.1)
+    liquid (4.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -96,7 +96,7 @@ GEM
     minitest (5.11.3)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    parallel (1.13.0)
+    parallel (1.17.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     progressbar (1.10.0)
@@ -106,7 +106,7 @@ GEM
       ffi (~> 1.0)
     rouge (3.3.0)
     ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
     sass (3.7.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -118,7 +118,7 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     verbal_expressions (0.1.5)
-    yell (2.0.7)
+    yell (2.1.0)
 
 PLATFORMS
   ruby
@@ -136,4 +136,4 @@ DEPENDENCIES
   launchy
 
 BUNDLED WITH
-   1.17.3
+   1.17.2

_config.yml

@@ -74,17 +74,11 @@ defaults:
 
   -
     scope:
-      path: mftf/2.2
+      path: mftf/docs
     values:
-      group: magento-functional-testing-framework-guide
-      functional_areas:
-        - Test
-
-  -
-    scope:
-      path: mftf/2.3
-    values:
-      group: magento-functional-testing-framework-guide-2_3
+      group: mftf
+      github_files: https://github.com/magento/magento2-functional-testing-framework/blob/develop/
+      github_repo: https://github.com/magento/magento2-functional-testing-framework/
       functional_areas:
         - Test
 
@@ -147,7 +141,6 @@ relative_links:
     - codelinks
     - community
     - guides
-    - mftf
     - redoc
     - tmp
     - 404.md