Merge branch 'master' into imported-EvheniiaKolkhiieva-devdocs-9199

Author: keharper

.github/CODEOWNERS

@@ -0,0 +1,31 @@
+# Each line is a file pattern followed by one or more owners.
+# Learn more at: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
+
+# All .rb files
+*.rb @dshevtsov
+
+# All .rake files
+*.rake @dshevtsov
+
+# All .sh files
+*.sh @dshevtsov
+
+# All files at the root directory, non-recursively.
+/* @dshevtsov
+
+# All files at the /.github/linters/ directory and in sub-directories.
+/.github/linters/ @dshevtsov
+
+# All files at the /.github/workflows/ directory and in sub-directories.
+/.github/workflows/ @dshevtsov
+
+# All files at the /.github/bin/ directory and in sub-directories.
+/bin/ @dshevtsov
+
+/docker-compose.yaml @hguthrie
+
+LICENSE.txt @leslietilling
+
+COPYING.txt @leslietilling
+
+CODEOWNERS @leslietilling @dshevtsov

.github/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team in [Slack](https://magentocommeng.slack.com/messages/CAN932A3H). All
+reported by contacting the project team in [Slack](https://magentocommeng.slack.com/archives/CAN932A3H). All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
@@ -70,4 +70,4 @@ members of the project's leadership.
 This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
 available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
-[homepage]: https://www.contributor-covenant.org
+[homepage]: https://www.contributor-covenant.org

.github/CONTRIBUTING.md

@@ -13,6 +13,8 @@ As you contribute PRs, you gain [Contribution Points](https://devdocs.magento.co
 
 If you write and contribute a full topic, we will add your name (or your company's name) at the top of the DevDocs page and link it to your blog or website!
 
+If you contribute a major update to a topic, your GitHub username will be added to a description of the update in our [What's New topic](https://devdocs.magento.com/whats-new.html).
+
 ## Get started
 
 ![Get started workflow](https://devdocs.magento.com/common/images/contribute-prerequisites.png)
@@ -148,7 +150,7 @@ You can provide feedback using the following options:
 
 Have a question? Need help? Magento DevDocs, Maintainers, and other Contributors are available through:
 
--  [Slack](https://magentocommeng.slack.com/messages/CAN932A3H) ([Join us](https://opensource.magento.com/slack))
+-  [Slack](https://magentocommeng.slack.com/archives/CAN932A3H) ([Join us](https://opensource.magento.com/slack))
 -  [Twitter @MagentoDevDocs](https://twitter.com/MagentoDevDocs)
 
 Thank you for contributing your brilliance to Magento DevDocs!!

.github/MAINTAINER_GUIDELINES.md

@@ -22,7 +22,6 @@ Here is a brief summary of the most important labels:
 -  `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)
 
 PRs with the `Internal Dev` label were created by Magento/Adobe employees and will be handled by the Documentation team only.
 
@@ -54,24 +53,3 @@ https://github.com/magento/devdocs/projects
 ## Style
 
 We prefer Markdown over HTML (in most cases). You can use [kramdown](https://kramdown.gettalong.org/syntax.html) syntax for more markup features and [Liquid](https://jekyllrb.com/docs/liquid/) for in-topic scripting.
-
-## Small changes workflow
-
-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 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 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:
-
-   -  `Editorial`
-   -  `Technical`
-
-1. That's it! A DevDocs admin will run tests and merge.

.gitignore

@@ -14,7 +14,6 @@
 _config.local.yml
 .jekyll-metadata
 .jekyll-cache
-.whatsup.yml
 
 *.bat
 /tmp/

.ruby-version

@@ -1 +1 @@
-ruby-2.6.6
+ruby-2.7.2

.whatsup.yml

@@ -0,0 +1,23 @@
+# Parameters for a GitHub search query
+base_branch: master
+
+repos:
+  - magento/devdocs
+  - magento-commerce/devdocs
+
+# Labels also will be used as a 'type' value in the output file
+labels:
+  required:
+    - New Topic
+    - Major Update
+  optional:
+    - Technical
+
+# Format of output file
+output_format:
+  - yaml
+#  - markdown
+
+magic_word: whatsnew
+
+membership: magento-commerce

COPYING.txt

@@ -1,9 +1,9 @@
-Copyright © 2013-present Magento, Inc.
+Copyright © 2013-present Adobe Inc.
 
-Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
+Each Adobe source file included in this distribution is licensed under OSL 3.0 or the Adobe Commerce 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 license@magentocommerce.com for a copy.
+Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@adobe.com 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.
+Subject to Licensee's payment of fees and compliance with the terms and conditions of the Adobe License, the Adobe License supersedes the OSL 3.0 license for each source file.
+Please see LICENSE.txt for the full text of the Adobe License or visit http://magento.com/legal/terms/enterprise.

Docfile.yml

@@ -17,6 +17,6 @@ content_map:
   filter: true
 -
   directory: src/page-builder
-  repository: magento/magento2-page-builder-docs
+  repository: magento/pagebuilder-docs
   branch: master
   filter: true

Gemfile.lock

@@ -1,38 +1,56 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: 0bd45b1e1816f5c94233c2c36403bc3242a6551a
+  revision: b1e43366e1fa7c7cd33a2213c6a9304f57536e8f
   specs:
-    devdocs (14)
+    devdocs (16)
       jekyll (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    algolia_html_extractor (2.6.2)
+    algolia_html_extractor (2.6.4)
       json (~> 2.0)
-      nokogiri (~> 1.10.4)
-    algoliasearch (1.27.2)
+      nokogiri (~> 1.10)
+    algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    chef-utils (16.4.41)
+    chef-utils (17.5.22)
+      concurrent-ruby
     colorator (1.1.0)
-    concurrent-ruby (1.1.6)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.9)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
+    ethon (0.14.0)
+      ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    exifr (1.3.6)
-    faraday (1.0.1)
+    exifr (1.3.9)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    ffi (1.15.4)
     filesize (0.2.0)
     forwardable-extended (2.6.0)
     fspath (3.1.2)
-    html-proofer (3.15.3)
+    html-proofer (3.19.2)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogumbo (~> 2.0)
@@ -42,38 +60,38 @@ GEM
       yell (~> 2.0)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    image_optim (0.26.5)
+    image_optim (0.30.0)
       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.20200215)
+    image_optim_pack (0.7.0.20210511)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
-    image_optim_pack (0.6.0.20200215-x86_64-darwin)
+    image_optim_pack (0.7.0.20210511-x86_64-darwin)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
-    image_size (2.0.2)
+    image_size (2.1.2)
     in_threads (1.5.4)
-    jekyll (4.1.0)
+    jekyll (4.2.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.4.0)
       pathutil (~> 0.9)
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
-    jekyll-algolia (1.6.0)
+      terminal-table (~> 2.0)
+    jekyll-algolia (1.7.1)
       algolia_html_extractor (~> 2.6)
       algoliasearch (~> 1.26)
       filesize (~> 0.1)
@@ -96,15 +114,15 @@ GEM
       jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.3.0)
-    kramdown (2.3.0)
+    json (2.5.1)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     launchy (2.5.0)
       addressable (~> 2.7)
     liquid (4.0.3)
-    listen (3.2.1)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mdl (0.11.0)
@@ -114,53 +132,58 @@ GEM
       mixlib-config (>= 2.2.1, < 4)
       mixlib-shellout
     mercenary (0.4.0)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.6.1)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.9)
       tomlrb
-    mixlib-shellout (3.1.4)
+    mixlib-shellout (3.2.5)
       chef-utils
     multipart-post (2.1.1)
     netrc (0.11.0)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.2)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
-    octokit (4.18.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.19.1)
+    parallel (1.21.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    progress (3.5.2)
-    progressbar (1.10.1)
-    public_suffix (4.0.5)
+    progress (3.6.0)
+    progressbar (1.11.0)
+    public_suffix (4.0.6)
+    racc (1.5.2)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.4)
-    rouge (3.19.0)
+    rexml (3.2.5)
+    rouge (3.26.1)
+    ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
-    sassc (2.3.0)
+    sassc (2.4.0)
       ffi (~> 1.9)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    terminal-table (1.8.0)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.3)
-    tomlrb (1.3.0)
+    thor (1.1.0)
+    tomlrb (2.0.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (1.8.0)
     verbal_expressions (0.1.5)
     wdm (0.1.1)
-    whatsup_github (0.3.1)
-      netrc (~> 0.10)
-      octokit (~> 4.14)
-      thor (~> 0.20)
+    whatsup_github (0.4.2)
+      netrc (~> 0.11)
+      octokit (~> 4.20)
+      thor (~> 1.1)
     yell (2.2.2)
 
 PLATFORMS
@@ -188,4 +211,4 @@ DEPENDENCIES
   whatsup_github
 
 BUNDLED WITH
-   1.17.3
+   2.2.15