Merge branch 'master' into ds_fix-external-links-2

Author: dshevtsov

_data/mftf.yml

@@ -78,7 +78,7 @@ General labels include a variety of tasks and definitions for pull requests and
 * `help wanted` - Indicates the creator or author needs help with a decision, advice for resolving, and so on.
 * `triage wanted` - Indicates the issues are under triage. See this information to learn more about the [Triage Wanted program](https://github.com/magento/magento2/wiki/Triage-Wanted).
 
-### Issue Resolution Status
+### Issue resolution status
 {:.no_toc}
 
 Labels applied to issues through verification and completion. For details on the process, see [GitHub Issues Processing Workflow](https://github.com/magento/magento2/wiki/GitHub-Issues-Processing-Workflow).
@@ -101,7 +101,7 @@ Labels applied to issues through verification and completion. For details on the
 
 All [contributions to DevDocs](https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md) receive the following labels:
 
-* `New topic`- New file submissions for content that has never existed on devdocs
-* `Major update` - Significant updates to existing content, such as a new section or example
-* `Technical` - Updates to the code or processes that alter the technical content of the document
-* `Editorial` - Fixes for typos, grammatical inconsistencies, or minor rewrites to correct inaccuracies.
+* `New topic`- New topic submissions for content that has never existed on DevDocs such as tutorials, references, instructions, and so on
+* `Major update` - Significant original updates to existing content
+* `Technical` - Updates to the code or processes that alter the technical content of the document, such as code snippets, reference documentation, parameter names and values, and other relevant content
+* `Editorial` - Fixes for typos, grammatical inconsistencies, or minor rewrites to correct inaccuracies

_includes/contributor/labels.md

@@ -76,7 +76,8 @@ Each PR can earn one of the following additional achievements. If you entered an
 
 Achievement | Points | Description
 | ------------ | --- | --- |
-New topic | 30 | New file submissions for content that has never existed on devdocs
-Major update | 20 | Significant updates to existing content, such as a new section or example
-Technical | 10 | Updates to code or processes that alter the technical content of the document
+New topic | 30 | New topic submissions for content that has never existed in DevDocs, such as tutorials, references, instructions, and other relevant content
+Major update | 20 | Significant updates to existing content
+Technical | 10 | Updates to code or processes that alter the technical content of the document, such as code snippets, reference documentation, parameter names and values, and other relevant content
 
+If the PR earns recognition for significant updates and additions to the documentation, it may also receive a Special Achievement label, which garners an additional 20 points.

_includes/contributor/rewards.md

@@ -0,0 +1 @@
+{% assign mftf = site.data.mftf | group_by: "module" | sort: "name"  %}

_includes/mftf/mftf_data.md

@@ -11,58 +11,94 @@ Each component must have a file called `registration.php` in its root directory.
 
 Register modules with:
 
-     ComponentRegistrar::register(ComponentRegistrar::MODULE, '<VendorName_ModuleName>', __DIR__);
+```php
+ComponentRegistrar::register(ComponentRegistrar::MODULE, '<VendorName_ModuleName>', __DIR__);
+```
 
 Here `<VendorName>` is the name of the company providing the [module](https://glossary.magento.com/module) and `<ModuleName>` is the name of the module.
 
 Avoid using "Ui" for your custom module name because the <code>%Vendor%_Ui</code> notation, required when specifying paths, might cause issues.
 
 ### Example
-    use Magento\Framework\Component\ComponentRegistrar;
-    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminNotification', __DIR__);
+
+```php
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminNotification', __DIR__);
+```
 
 ## Register themes {#register-themes}
 
 Register themes with:
 
-     ComponentRegistrar::register(ComponentRegistrar::THEME, '<area>/<vendor>/<theme name>', __DIR__);
+```php
+ComponentRegistrar::register(ComponentRegistrar::THEME, '<area>/<vendor>/<theme name>', __DIR__);
+```
 
 Here `<area>` is the functional area of the module (frontend, controller, and so on.), `<vendor>` is the name of the company providing the theme, and `<theme name>` is the name of the [theme](https://glossary.magento.com/theme).
 
 ### Example
-     ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Magento/luma', __DIR__);
 
-## Register language packages {#register-lagpacks}
+```php
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::THEME, 'frontend/Magento/luma', __DIR__);
+```
+
+## Register language packages {#register-langpacks}
 
 Register language packages with:
 
-     ComponentRegistrar::register(ComponentRegistrar::LANGUAGE, '<VendorName>_<packageName>', __DIR__);
+```php
+ComponentRegistrar::register(ComponentRegistrar::LANGUAGE, '<VendorName>_<packageName>', __DIR__);
+```
 
 Here `<VendorName>` is the name of the company providing the package and `<packageName>` is the name of the package.
 
 ### Example
-     ComponentRegistrar::register(ComponentRegistrar::LANGUAGE, 'magento_de_de', __DIR__);
+
+```php
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::LANGUAGE, 'magento_de_de', __DIR__);
+```
+
+## Register libraries {#register-libraries}
+
+Libraries should be registered using
+
+```php
+ComponentRegistrar::register(ComponentRegistrar::LIBRARY, '<vendor>/<library_name>', __DIR__);
+```
+
+Here `<vendor>` is the name of the company providing the library. `<library_name>` is the library name.
+
+### Example
+
+```php
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::LIBRARY, 'magento/framework', __DIR__);
+```
 
 ## Invoke `registration.php` in `composer.json` with autoload {#register-autoload}
 
 After you create your `registration.php` file and you are creating [your component's composer.json file]({{page.baseurl}}/extension-dev-guide/build/composer-integration.html), invoke your `registration.php` file in the `autoload` section of `composer.json`:
 
 ```json
 {
-    "name": "Acme-vendor/bar-component",
-    "autoload": {
-        "psr-4": { "AcmeVendor\\BarComponent\\": "" },
-        "files": [ "registration.php" ]
-    }
+ "name": "Acme-vendor/bar-component",
+ "autoload": {
+    "psr-4": { "AcmeVendor\\BarComponent\\": "" },
+    "files": [ "registration.php" ]
+ }
 }
 ```
 
 ### Sample `registration.php` file {#register-sample}
 
 ```php
-<?php
-
-use Magento\Framework\Component\ComponentRegistrar;
+use \Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminNotification', __DIR__);
 ```

guides/v2.2/contributor-guide/contributing.md

@@ -3,6 +3,10 @@ group: functional-testing-framework-guide
 title: Installation of the Functional Testing Framework Entities
 ---
 
+{: .bs-callout-info}
+The Magento Testing Framework (MTF) is superseded by the Magento Functional Testing Framework ([MFTF][]).
+While the MTF is still functional, all MTF tests are ported over to the MFTF. We recommend using the MFTF for testing.
+
 Well, you are on the way to install the Functional Testing Framework!
 
 ## Check pre-installation conditions {#mtf_install_pre}
@@ -15,7 +19,7 @@ To install the Magento application, see [Magento Installation Guide][].
 
 #### PHP {#mtf_install_pre_tools_php}
 
-For more details about PHP verification, installation and configuration ([Ubuntu][], [CentOS][]).
+For more details about PHP verification, installation and configuration see [PHP Settings][].
 
 {: .bs-callout .bs-callout-warning }
 In `php.ini` file, make sure `extension=php_openssl.dll` is not commented out.
@@ -75,18 +79,18 @@ ls
 Open `<magento2_root_dir>/dev/tests/functional/vendor/magento/mtf/CHANGELOG.md`.
 The latest version in `CHANGELOG.md` is version of the FTF you installed.
 
-## Next Steps {#mtf_install_next}
+## Next steps {#mtf_install_next}
 
 [Adjust the FTF configuration ]({{ page.baseurl }}/mtf/mtf_quickstart/mtf_quickstart_config.html)
 
 <!-- Link defifnitions -->
 
 [Adjust the FTF configuration ]: {{ page.baseurl }}/mtf/mtf_quickstart/mtf_quickstart_config.html
-[CentOS]: {{ page.baseurl }}/install-gde/prereq/php-centos.html
 [Composer]: https://getcomposer.org
 [globally]: https://getcomposer.org/doc/00-intro.md#globally
 [Install Composer]: {{ page.baseurl }}/install-gde/prereq/dev_install.html#instgde-prereq-compose-install
 [Magento Installation Guide]: {{ page.baseurl }}/install-gde/bk-install-guide.html
 [Open a command prompt]: {{ page.baseurl }}/install-gde/basics/basics_login.html
 [the Magento file system owner]: {{ page.baseurl }}/install-gde/prereq/apache-user.html
-[Ubuntu]: {{ page.baseurl }}/install-gde/prereq/php-ubuntu.html
+[PHP Settings]: {{ page.baseurl }}/install-gde/prereq/php-settings.html
+[MFTF]: https://devdocs.magento.com/mftf/docs/introduction.html

guides/v2.2/extension-dev-guide/build/component-registration.md

@@ -4,6 +4,10 @@ title: Introduction to the Functional Testing Framework
 landing-page: Functional Testing Framework Guide
 ---
 
+{: .bs-callout-info}
+The Magento Testing Framework (MTF) is superseded by the Magento Functional Testing Framework ([MFTF][]).
+While the MTF is still functional, all MTF tests are being ported over to the MFTF. We recommend using the MFTF for testing.
+
 This guide provides instructions on installing and configuring the Functional Testing Framework (FTF). Using the FTF, you can create and run *functional* tests to make it easier to perform basic acceptance testing, smoke testing, regression testing, and so on.
 
 FTF is an open source cross-platform solution (that is, does not depend on a specific operating system).
@@ -83,6 +87,6 @@ For other tests please see the following topics:
 Follow the FTF project and contribute on GitHub
 <https://github.com/magento/mtf>.
 
-
 [Selenium Standalone Server]: http://www.seleniumhq.org/download/
 [PHPUnit]: https://phpunit.de/
+[MFTF]: https://devdocs.magento.com/mftf/docs/introduction.html

guides/v2.2/mtf/mtf_installation.md

@@ -3,6 +3,10 @@ group: functional-testing-framework-guide
 title: Quick start with the Functional Testing Framework
 ---
 
+{: .bs-callout-info}
+The Magento Testing Framework (MTF) is superseded by the Magento Functional Testing Framework ([MFTF][]).
+While the MTF is still functional, all MTF tests are being ported over to the MFTF. We recommend using the MFTF for testing.
+
 In this chapter you will learn how to:
 
 - [Adjust configuration to set PHPUnit, the FTF, and credentials for Magento modules if required]({{ page.baseurl }}/mtf/mtf_quickstart/mtf_quickstart_config.html)
@@ -16,3 +20,5 @@ In this chapter you will learn how to:
 - [Check logs for failed tests]({{ page.baseurl }}/mtf/mtf_quickstart/mtf_quickstart_logs.html)
   - Check FTF logs
   - Check Magento logs
+
+[MFTF]: https://devdocs.magento.com/mftf/docs/introduction.html

guides/v2.2/mtf/mtf_introduction.md

@@ -3,6 +3,10 @@ group: functional-testing-framework-guide
 title: Update the Functional Testing Framework
 ---
 
+{: .bs-callout-info}
+The Magento Testing Framework (MTF) is superseded by the Magento Functional Testing Framework ([MFTF][]).
+While the MTF is still functional, all MTF tests are being ported over to the MFTF. We recommend using the MFTF for testing.
+
 Two types of updates are available.
 
 -     [Install a new version of the Functional Testing Framework](#mtf_update_install)
@@ -38,3 +42,5 @@ cd <magento2_root_dir>/dev/tests/functional/
 ```bash
 composer update
 ```
+
+[MFTF]: https://devdocs.magento.com/mftf/docs/introduction.html