Merge pull request #1 from magento/master

merge from master

Author: sandipklevu

.github/CONTRIBUTING.md

@@ -15,8 +15,6 @@ If you write and contribute a full topic, we will add your name (or your company
 
 ## Get started
 
-> We no longer accept contributions to files in the `src/guides/v2.2/` directory.
-
 ![Get started workflow](https://devdocs.magento.com/common/images/contribute-prerequisites.png)
 
 1. Make sure you have a [GitHub account](https://github.com/signup/free).
@@ -54,7 +52,7 @@ The following diagram shows the contribution workflow:
 
     **We will close your pull request if you do not respond to feedback in two weeks.**
 
-**Note:** If you have not signed the [Magento Contributor Agreement](https://magento.com/content/magento-contributor-agreement), the pull request provides a link. Magento requires a signed form and agreement to the terms for contribution.
+**Note:** If you have not signed the [Adobe Contributor License Agreement](https://opensource.adobe.com/cla.html), the pull request provides a link. You must sign the CLA before we can accept your contribution.
 
 ## Contribution guidelines
 
@@ -69,7 +67,7 @@ The following guidelines may answer most of your questions and help you get star
 
    -  If you need to update the site navigation, ask for help in Slack ([#devdocs](https://magentocommeng.slack.com/messages/CAN932A3H)).
 
--  Ensure that you update the correct version(s) of documentation (v2.2, v2.3). If you are not sure what directory to put your content in, just do your best. We can help re-locate it (if necessary) during the review process.
+-  Ensure that you update the correct version(s) of documentation (v2.3). If you are not sure what directory to put your content in, just do your best. We can help re-locate it (if necessary) during the review process.
 -  Review your work for basic typos, formatting errors, or ambiguous sentences before opening a pull request.
 -  Revise pull requests according to review feedback. We will close pull requests that require an inordinate amount of time to review and process (especially for minor changes) if you fail to make revisions according to review feedback.
 -  Do not directly contact DevDocs team members or maintainers on Slack to review your pull request unless it has been open for more than five days. We have a process and queue for pull requests that everyone must follow.

.github/ISSUE_TEMPLATE.md

@@ -17,7 +17,7 @@ Thank you for taking the time to report this issue!
 GitHub Issues should only be created for problems/topics related to this project's codebase.
 
 Before submitting this issue, please make sure you are complying with our Code of Conduct:
-https://github.com/magento/devdocs/blob/develop/.github/CODE_OF_CONDUCT.md
+https://github.com/magento/devdocs/blob/master/.github/CODE_OF_CONDUCT.md
 
 Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
 

.github/ISSUE_TEMPLATE/BUG.md

@@ -34,7 +34,7 @@ Thank you for taking the time to report this issue!
 GitHub Issues should only be created for problems/topics related to this project's codebase.
 
 Before submitting this issue, please make sure you are complying with our Code of Conduct:
-https://github.com/magento/devdocs/blob/develop/.github/CODE_OF_CONDUCT.md
+https://github.com/magento/devdocs/blob/master/.github/CODE_OF_CONDUCT.md
 
 Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
 

.github/ISSUE_TEMPLATE/COMMUNITY_ISSUE_TEMPLATE.md

@@ -19,11 +19,7 @@ Magento 2 GitHub PR: https://github.com/magento/devdocs/pull/link
 
 Magento 2 version:
 
--  [ ] 2.1.X
--  [ ] 2.2.X
--  [ ] 2.3.X
--  [ ] back port
--  [ ] forward port
+-  [ ] 2.3
 
 Notifications of Changes:
 
@@ -45,7 +41,7 @@ Thank you for taking the time to request updates for your Community Engineering
 GitHub Issues should only be created for problems/topics related to this project's codebase.
 
 Before submitting this issue, please make sure you are complying with our Code of Conduct:
-https://github.com/magento/devdocs/blob/develop/.github/CODE_OF_CONDUCT.md
+https://github.com/magento/devdocs/blob/master/.github/CODE_OF_CONDUCT.md
 
 Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
 

.github/ISSUE_TEMPLATE/NEW_FEATURE.md

@@ -30,7 +30,7 @@ Thank you for taking the time to report this issue!
 GitHub Issues should only be created for problems/topics related to this project's codebase.
 
 Before submitting this issue, please make sure you are complying with our Code of Conduct:
-https://github.com/magento/devdocs/blob/develop/.github/CODE_OF_CONDUCT.md
+https://github.com/magento/devdocs/blob/master/.github/CODE_OF_CONDUCT.md
 
 Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
 

.github/ISSUE_TEMPLATE/NEW_TOPIC.md

@@ -29,7 +29,7 @@ Thank you for taking the time to report this issue!
 GitHub Issues should only be created for problems/topics related to this project's codebase.
 
 Before submitting this issue, please make sure you are complying with our Code of Conduct:
-https://github.com/magento/devdocs/blob/develop/.github/CODE_OF_CONDUCT.md
+https://github.com/magento/devdocs/blob/master/.github/CODE_OF_CONDUCT.md
 
 Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
 

.github/ISSUE_TEMPLATE/TOPIC_CLARIFICATION.md

@@ -26,7 +26,7 @@ Thank you for taking the time to report this issue!
 GitHub Issues should only be created for problems/topics related to this project's codebase.
 
 Before submitting this issue, please make sure you are complying with our Code of Conduct:
-https://github.com/magento/devdocs/blob/develop/.github/CODE_OF_CONDUCT.md
+https://github.com/magento/devdocs/blob/master/.github/CODE_OF_CONDUCT.md
 
 Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
 

.github/MAINTAINER_GUIDELINES.md

@@ -1,41 +1,39 @@
 # DevDocs maintainer guidelines
 
-In general, the same [guidelines](https://devdocs.magento.com/guides/v2.3/contributor-guide/maintainers.html) for [`magento/magento2`](https://github.com/magento/magento2) maintainers apply to devdocs maintainers. However, there are some additional guidelines specific to devdocs that will help you as a maintainer.
+In general, the same [guidelines](https://devdocs.magento.com/guides/v2.3/contributor-guide/maintainers.html) for [`magento/magento2`](https://github.com/magento/magento2) maintainers apply to DevDocs maintainers. However, there are some additional guidelines specific to DevDocs that will help you as a maintainer.
 
 ## General expectations
 
 -  Self assign issues/pull requests (mostly pull requests)
    -  Review and approve or request changes
    -  Enforce the use of the issue/pull requests template
    -  Ask contributors to link to the code base to validate documentation updates when applicable
-   -  Ask contributors not to contribute to v2.0 docs
--  If a maintainer creates a pull request, it should be reviewed by another maintainer or DevDocs staff member
+   -  Ask contributors not to contribute to unsupported versions of documentation when applicable
+-  If a DevDocs maintainer creates a pull request, it must be reviewed by another maintainer or DevDocs admin
 
 ## Labels
 
-Labels are important because they help us identify pull requests and ensure that contributors receive points and recognition. See [devdocs awards and points](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#devdocs-awards-and-points).
+Labels are important because they help us identify pull requests by type and ensure that contributors receive points and recognition. See [DevDocs awards and points](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#devdocs-awards-and-points).
 
 Here is a brief summary of the most important labels:
 
 -  `New Topic`: Entirely new documents
--  `Major Update`: Significant new info: new section in existing topic, etc.
--  `Technical`: Changes to technical content/code/processes/naming conventions (any change to technical content)
+-  `Major Update`: Significant new info (for example, a new section in an existing topic)
+-  `Technical`: Minor changes to technical content, code, processes, naming conventions
 -  `Editorial`: Typos, grammatical inconsistencies, or minor rewrites
 -  `small changes`: See [Small changes workflow](#small-changes-workflow)
 
-We also use version labels when appropriate.
+We also use version labels when appropriate (for example, 2.3.x).
 
-As a maintainer, we expect you to add or remove labels when appropriate.
+As a maintainer, we expect you to add or remove labels according to these guidelines.
 
 See https://github.com/magento/devdocs/labels for all labels and their descriptions.
 
 ## Testing
 
-Currently, we only test internal links. In the future, we plan to expand tests to include external links, markdown linting, and spell checking.
+We use a private CI/CD stack and do not provide access to it.
 
-We use private CI/CD stack and do not provide access to it.
-
-Every pull request to the `master` branch must pass tests before it can be merged. When a pull request is ready for tests, a member of the [`devdocs-admins`](https://github.com/orgs/magento/teams/devdocs-admins) team must add the test trigger phrase to the pull request as a comment. The trigger phrase is "_running tests_". By approving a pull request, you are signalling an admin that the pull request is ready for tests.
+Every pull request to the `master` branch must pass tests before it can be merged. When a pull request is ready for tests, a member of the [`devdocs-admins`](https://github.com/orgs/magento/teams/devdocs-admins) team must add the test trigger phrase to the pull request as a comment. The trigger phrase is "_running tests_". By approving a pull request, you are signalling to an admin that the pull request is ready for tests.
 
 ## Projects
 
@@ -49,21 +47,21 @@ We prefer Markdown over HTML (in most cases). You can use [kramdown](https://kra
 
 ## Small changes workflow
 
-Before merging a pull request to the `master` branch, it must pass automated testing. Testing takes about 30 minutes to complete for each pull request, so we created a workflow to save time for small changes.
+Before merging a pull request to the `master` branch, it must pass automated testing. Testing takes about 10 minutes to complete for each pull request, so we created a workflow to save time for small changes.
 
--  **Individual pull requests to `master`**—15 individual pull requests to `master` x 30 minutes per pull request = 7.5 hrs of testing time
--  **Multiple pull requests using `small_changes`**—1 `small_changes` pull request (containing 15 individual pull requests) to `master` x 30 minutes = 30 minutes of testing time
+-  **Individual pull requests to `master`**—15 individual pull requests to `master` x 10 minutes per pull request = 2.5 hrs of testing time
+-  **Multiple pull requests using `small_changes`**—1 `small_changes` pull request (containing 15 individual pull requests) to `master` x 10 minutes = 10 minutes of testing time
 
 This workflow is for typos, formatting issues, and minor text additions or deletions. It is not for substantial new content, changes to tables, new files, or files that have been moved.
 
-Periodically, we will create a pull request from `small_changes` to `master` and then run tests on that pull request to save time.
+Periodically, we will create a pull request from the `small_changes` branch to the `master` branch and then run tests on that pull request to save time.
 
 ### Process
 
 1. Review the pull request and either approve it or request changes.
-1. Apply the `Small changes` label if one of the following labels should also be applied:
+1. Apply the `small changes` label if one of the following labels should also be applied:
 
    -  `Editorial`
    -  `Technical`
 
-1. That's it! A devdocs-admin will run tests and merge.
+1. That's it! A DevDocs admin will run tests and merge.

.github/workflows/main.yml

@@ -0,0 +1,22 @@
+name: Markdown linting test
+
+on:
+  pull_request:
+    branches:
+      - master
+      - 2.*-develop
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+    - name: Install mdl gem
+      run: gem install mdl -v '0.7.0'
+    - name: Run mdl
+      run: mdl --style=_checks/styles/style-rules-prod --ignore-front-matter --git-recurse -- .

.ruby-version

@@ -0,0 +1 @@
+ruby-2.6.5

COPYING.txt

@@ -0,0 +1,9 @@
+Copyright © 2013-present Magento, Inc.
+
+Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
+
+http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+Please see LICENSE.txt for the full text of the OSL 3.0 license or contact [email protected] for a copy.
+
+Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
+Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

Docfile.yml

@@ -17,11 +17,11 @@ content_map:
 -
   directory: src/page-builder
   repository: magento/magento2-page-builder
-  branch: 1.1-develop
+  branch: develop
   filter: true
 -
   directory: src/page-builder-migration
   repository: magento/magento2-page-builder-data-migration
   branch: 1.0.0-release
   filter: true
-  
+

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: e1a4ff6880d5047cb8e14ac44849aca8ffaecf2a
+  revision: d72768697309f7f13af8a37073af776420f6c3a7
   specs:
     devdocs (7)
       jekyll (>= 4.0)
@@ -17,43 +17,43 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     exifr (1.3.6)
-    faraday (0.17.1)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.3)
+    ffi (1.12.2)
     filesize (0.2.0)
     forwardable-extended (2.6.0)
     fspath (3.1.2)
-    html-proofer (3.14.1)
+    html-proofer (3.15.2)
       addressable (~> 2.3)
       mercenary (~> 0.3)
-      nokogiri (~> 1.10)
+      nokogumbo (~> 2.0)
       parallel (~> 1.3)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     image_optim (0.26.5)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.6.0.20191208)
+    image_optim_pack (0.6.0.20200215)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
     image_size (2.0.2)
-    in_threads (1.5.3)
+    in_threads (1.5.4)
     jekyll (4.0.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
@@ -80,24 +80,24 @@ GEM
       verbal_expressions (~> 0.1.5)
     jekyll-optional-front-matter (0.3.2)
       jekyll (>= 3.0, < 5.0)
-    jekyll-redirect-from (0.15.0)
+    jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
     jekyll-relative-links (0.6.1)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (2.0.1)
+    jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-titles-from-headings (0.5.3)
       jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.2.0)
+    json (2.3.0)
     kramdown (2.1.0)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    launchy (2.4.3)
-      addressable (~> 2.3)
+    launchy (2.5.0)
+      addressable (~> 2.7)
     liquid (4.0.3)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -109,27 +109,30 @@ GEM
       mixlib-config (>= 2.2.1, < 4)
     mercenary (0.3.6)
     mini_portile2 (2.4.0)
-    mixlib-cli (2.1.1)
-    mixlib-config (3.0.5)
+    mixlib-cli (2.1.6)
+    mixlib-config (3.0.6)
       tomlrb
     multipart-post (2.1.1)
     netrc (0.11.0)
-    nokogiri (1.10.7)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
+    nokogumbo (2.0.2)
+      nokogiri (~> 1.8, >= 1.8.4)
+    octokit (4.18.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.19.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     progress (3.5.2)
     progressbar (1.10.1)
-    public_suffix (4.0.1)
+    public_suffix (4.0.4)
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.13.0)
+    rouge (3.17.0)
     safe_yaml (1.0.5)
     sassc (2.2.1)
       ffi (~> 1.9)
@@ -139,17 +142,17 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
-    tomlrb (1.2.9)
+    tomlrb (1.3.0)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
     verbal_expressions (0.1.5)
     wdm (0.1.1)
-    whatsup_github (0.0.1)
+    whatsup_github (0.1.1)
       netrc (~> 0.10)
       octokit (~> 4.14)
       thor (~> 0.20)
-    yell (2.2.0)
+    yell (2.2.2)
 
 PLATFORMS
   ruby