Merge branch 'master' into db_arch_img

Author: dobooth

Docfile.yml

@@ -12,7 +12,7 @@ content_map:
 -
   directory: mftf
   repository: magento/magento2-functional-testing-framework
-  branch: develop
+  branch: master
   filter: true
 -
   directory: page-builder

Rakefile

@@ -10,12 +10,10 @@ require 'html-proofer'
 require 'kramdown'
 require 'launchy'
 require 'colorator'
+require 'erb'
 
-# Load ruby files with helper methods from the 'rakelib/' directory
-require_relative 'rakelib/lib/link-checker.rb'
-require_relative 'rakelib/lib/converter.rb'
-require_relative 'rakelib/lib/double-slash-check.rb'
-require_relative 'rakelib/lib/doc-config.rb'
+# Require helper methods from the 'rakelib/lib' directory
+Dir.glob('rakelib/lib/**/*.rb') { |file| require_relative(file) }
 
 desc "Same as 'rake', 'rake preview'"
 task default: %w[preview]

_config.checks.yml

@@ -4,26 +4,32 @@
 #
 html-proofer:
 
-  # Do not check external links.	
+  # Do not check external links.
   :disable_external: true
 
   # Report only errors that fall within the 4xx status code range.
   :only_4xx: true
 
   # Ignores images with empty alt tags.
   :empty_alt_ignore: true
-
+  
   # Sort errors by description in the report
   :error_sort: :desc
 
   # Use up to 3 parallel processes to speed up internal file checks.
   :parallel:
     :in_processes: 3
+  
+  :cache:
+    :timeframe: 2w
 
   # Ignore entirely the files which pathname matches a specified pattern 
   :file_ignore:
-  - !ruby/regexp /page-builder/
-  - !ruby/regexp /mrg/
+    - !ruby/regexp /page-builder/
+    - !ruby/regexp /guides\/v2\.3\/mrg/
+
+  :internal_domains:
+    - devdocs.magento.com
 
   # Ignore any link that includes a specified pattern
   # :url_ignore:

_data/toc/extension-best-practices.yml

@@ -60,3 +60,6 @@ pages:
 
         - label: Creating a dynamic row system config
           url: /ext-best-practices/tutorials/dynamic-row-system-config.html
+
+        - label: Creating a custom import entity
+          url: /ext-best-practices/tutorials/custom-import-entity.html

_data/toc/rest-api.yml

@@ -8,7 +8,7 @@ pages:
 
         - label: REST Endpoints (Swagger)
           include_versions: ["2.2"]
-          url: http://devdocs.magento.com/swagger/index_22.html
+          url: https://devdocs.magento.com/swagger/index_22.html
 
         - label: REST Endpoints (ReDoc)
           include_versions: ["2.3"]

_data/whats-new.yml

@@ -1,3 +1,3 @@
 {:.bs-callout .bs-callout-warning}
 **v2.1 End of Contribution:**
-As of September 17, 2018, we no longer accept contributions to the v2.1 release line. Continue submitting  contributions for the [v2.2](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html) and [v2.3](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html) release lines. We made this change to increase our focus on issue investigations and pull request approvals for v2.2 and v2.3 release lines.
+As of September 17, 2018, we no longer accept contributions to the v2.1 release line. Continue submitting  contributions for the [v2.2]({{ site.baseurl }}/guides/v2.2/contributor-guide/contributing.html) and [v2.3]({{ site.baseurl }}/guides/v2.3/contributor-guide/contributing.html) release lines. We made this change to increase our focus on issue investigations and pull request approvals for v2.2 and v2.3 release lines.

_includes/contributor/2-1-end.md

@@ -1,17 +1,17 @@
 {% if page.group == "inventory" %}
 <div class="message-banner">
-  This page may include updates for <a href="https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html" target="_blank">Inventory Management (MSI) 1.1.2 Beta</a>. Content is subject to change.
+  This page may include updates for <a href="{{ site.baseurl }}/guides/v2.3/inventory/release-notes.html" target="_blank">Inventory Management (MSI) 1.1.2 Beta</a>. Content is subject to change.
 </div>
 {% endif %}
 
 {% if page.title == "Inventory mass actions" %}
 <div class="message-banner">
-  This page may include updates for <a href="https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html" target="_blank">Inventory Management (MSI) 1.1.2 Beta</a>. Content is subject to change.
+  This page may include updates for <a href="{{ site.baseurl }}/guides/v2.3/inventory/release-notes.html" target="_blank">Inventory Management (MSI) 1.1.2 Beta</a>. Content is subject to change.
 </div>
 {% endif %}
 
 {% if page.title == "Install Inventory Management" %}
 <div class="message-banner">
-  This page may include updates for <a href="https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html" target="_blank">Inventory Management (MSI) 1.1.2 Beta</a>. Content is subject to change.
+  This page may include updates for <a href="{{ site.baseurl }}/guides/v2.3/inventory/release-notes.html" target="_blank">Inventory Management (MSI) 1.1.2 Beta</a>. Content is subject to change.
 </div>
 {% endif %}

_includes/layout/after-site-header.html

@@ -2,5 +2,5 @@
 <link rel="alternate" type="application/rss+xml" title="Magento DevDocs RSS" href="/feed.xml" />
 
 {% if page.canonical_url != nil %}
-<link rel="canonical" href="{{ page.canonical_url }}" />
+<link rel="canonical" href="{{ page.canonical_url }}" data-proofer-ignore />
 {% endif %}

_includes/layout/header-styles.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en-US" data-proofer-ignore >
+  <meta charset="utf-8">
+  <title>Redirecting&hellip;</title>
+  <link rel="canonical" href="{{ page.redirect.to }}">
+  <script>location="{{ page.redirect.to }}"</script>
+  <meta http-equiv="refresh" content="0; url={{ page.redirect.to }}">
+  <meta name="robots" content="noindex">
+  <h1>Redirecting&hellip;</h1>
+  <a href="{{ page.redirect.to }}">Click here if you are not redirected.</a>
+</html>