From 85bf4b40733e7409ac0adeaeb768a28271df07d7 Mon Sep 17 00:00:00 2001 From: Dima Shevtsov Date: Mon, 1 Oct 2018 12:15:45 -0500 Subject: [PATCH 1/2] Update formatting and links --- README.md | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 9687c3b47..ee384efe3 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Magento Functional Testing Framework +# Magento Functional Testing Framework (MFTF) [![Build Status](https://travis-ci.org/magento/magento2-functional-testing-framework.svg?branch=develop)](https://travis-ci.org/magento/magento2-functional-testing-framework) @@ -6,24 +6,17 @@ ---- -## System Requirements -[Magento Functional Testing Framework system requirements](http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/getting-started.html#prepare-environment) - ## Installation -To install the Magento Functional Testing Framework, see [Getting Started](http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/getting-started.html) - -## Contributing -Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions. -To learn about how to make a contribution, click [here][1]. +For the installation guidelines and system requirements, read [Getting Started](https://devdocs.magento.com/mftf/2.3/getting-started.html). -To open an issue, click [here][2]. +## Contributing -To suggest documentation improvements, click [here][3]. +We would appreciate your contributions to new components or new features, changes to the existing features, tests, documentation, specifications, bug fixes, optimizations, or just good suggestions. +Report about an issue or request features opening a GitHub issue. +Learn more about contributing in our [Contribution Guidelines](https://devdocs.magento.com/mftf/2.3/contribution-guidelines.html). -[1]: -[2]: -[3]: +If you want to participate in the documentation work, see [DevDocs Contributing](https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md). ### Labels applied by the MFTF team @@ -33,7 +26,7 @@ Refer to the tables with descriptions of each label below. These labels are appl Label| Description ---|--- -**accept**| The pull request has been accepted and will be merged into mainline code. +**accept**| The pull request has been accepted and will be merged into mainline code. **reject**| The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. **needsUpdate**| The Magento Team needs additional information from the reporter to properly prioritize and process the pull request. @@ -43,8 +36,8 @@ Label| Description ---|--- **acknowledged**| The Magento Team has validated the issue and an internal ticket has been created. **needsUpdate**| The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. -**cannot reproduce**| The Magento Team has not confirmed that this issue contains the minimum required information to reproduce. -**non-issue**| The Magento Team has not recognised any issue according to provided information. +**cannot reproduce**| The Magento Team has not confirmed that this issue contains the minimum required information to reproduce. +**non-issue**| The Magento Team has not recognized any issue according to provided information. ### Domains Impacted @@ -63,12 +56,12 @@ Label| Description ## Reporting security issues -To report security vulnerabilities in Magento software or web sites, please e-mail security@magento.com. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our encryption key if it includes sensitive information. Learn more about reporting security issues here. +To report security vulnerabilities in the Magento software or web sites, please e-mail [security@magento.com](mailto:security@magento.com). Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our [encryption key](https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc) if it includes sensitive information. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue). -Stay up-to-date on the latest security news and patches for Magento by signing up for Security Alert Notifications. +Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up). ## License -Each Magento source file included in this distribution is licensed under AGPL 3.0 +Each Magento source file included in this distribution is licensed under AGPL 3.0. -Please see LICENSE_AGPL3.txt for the full text of the AGPL 3.0 license or contact license@magentocommerce.com for a copy. +Please see LICENSE_AGPL3.txt for the full text of the AGPL 3.0 license or contact [license@magentocommerce.com](mailto:license@magentocommerce.com) for a copy. From 16d459aae7b94adb6bd1ce39e966fc21a39dcd38 Mon Sep 17 00:00:00 2001 From: Dima Shevtsov Date: Mon, 1 Oct 2018 13:40:24 -0500 Subject: [PATCH 2/2] Fix formatting and style --- README.md | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index ee384efe3..487902d96 100755 --- a/README.md +++ b/README.md @@ -20,43 +20,47 @@ If you want to participate in the documentation work, see [DevDocs Contributing] ### Labels applied by the MFTF team -Refer to the tables with descriptions of each label below. These labels are applied by the MFTF development team to community contributed issues and pull requests, to communicate status, impact, or which team is working on it. +Refer to the tables with descriptions of each label below. +These labels are applied by the MFTF development team to community contributed issues and pull requests, to communicate status, impact, or which team is working on it. ### Pull Request Status -Label| Description ----|--- -**accept**| The pull request has been accepted and will be merged into mainline code. -**reject**| The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. -**needsUpdate**| The Magento Team needs additional information from the reporter to properly prioritize and process the pull request. +| Label | Description | +| --------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **accept** | The pull request has been accepted and will be merged into mainline code. | +| **reject** | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. | +| **needsUpdate** | The Magento Team needs additional information from the reporter to properly prioritize and process the pull request. | ### Issue Resolution Status -Label| Description ----|--- -**acknowledged**| The Magento Team has validated the issue and an internal ticket has been created. -**needsUpdate**| The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. -**cannot reproduce**| The Magento Team has not confirmed that this issue contains the minimum required information to reproduce. -**non-issue**| The Magento Team has not recognized any issue according to provided information. +| Label | Description | +| -------------------- | ----------------------------------------------------------------------------------------------------------------------------- | +| **acknowledged** | The Magento Team has validated the issue and an internal ticket has been created. | +| **needsUpdate** | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. | +| **cannot reproduce** | The Magento Team has not confirmed that this issue contains the minimum required information to reproduce. | +| **non-issue** | The Magento Team has not recognized any issue according to provided information. | ### Domains Impacted -Label| Description ----|--- -**PROD**| Affects the Product team (mostly feature requests or business logic change). -**DOC**| Affects Documentation domain. -**TECH**| Affects Architect Group (mostly to make decisions around technology changes). +| Label | Description | +| -------- | ----------------------------------------------------------------------------- | +| **PROD** | Affects the Product team (mostly feature requests or business logic change). | +| **DOC** | Affects Documentation domain. | +| **TECH** | Affects Architect Group (mostly to make decisions around technology changes). | ### Type -Label| Description ----|--- -**bugfix**| The issue or pull request relates to bug fixing. -**enhancement**| The issue or pull request that raises the MFTF to a higher degree (for example new features, optimization, refactoring, etc). +| Label | Description | +| --------------- | ----------------------------------------------------------------------------------------------------------------------------- | +| **bugfix** | The issue or pull request relates to bug fixing. | +| **enhancement** | The issue or pull request that raises the MFTF to a higher degree (for example new features, optimization, refactoring, etc). | ## Reporting security issues -To report security vulnerabilities in the Magento software or web sites, please e-mail [security@magento.com](mailto:security@magento.com). Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our [encryption key](https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc) if it includes sensitive information. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue). +To report security vulnerabilities and other security issues in the Magento software or web sites, send an email with the report at [security@magento.com](mailto:security@magento.com). +Do not report security issues using GitHub. +Be sure to encrypt your e-mail with our [encryption key](https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc) if it includes sensitive information. +Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue). Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up). @@ -64,4 +68,4 @@ Stay up-to-date on the latest security news and patches for Magento by signing u Each Magento source file included in this distribution is licensed under AGPL 3.0. -Please see LICENSE_AGPL3.txt for the full text of the AGPL 3.0 license or contact [license@magentocommerce.com](mailto:license@magentocommerce.com) for a copy. +See the license [here](LICENSE_AGPL3.txt) or contact [license@magentocommerce.com](mailto:license@magentocommerce.com) for a copy.