Skip to content

Commit c698f27

Browse files
committed
Fix typos and formatting
1 parent b8c6d22 commit c698f27

File tree

1 file changed

+22
-24
lines changed

1 file changed

+22
-24
lines changed

.github/CONTRIBUTING.md

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
- [Contribution requirements](#contribution-requirements)
44
- [Fork a repository](#fork-a-repository)
5-
- [Update the fork with the latest changes](#update-the-fork-with-the-latest-changes)
5+
- [Update the fork with the latest changes](#update-the-fork-with-the-latest-changes)
66
- [Create a pull request](#create-a-pull-request)
77
- [Report an issue](#report-an-issue)
88
- [Read labels](#read-labels)
9-
- [Pull request status](#pull-request-status)
10-
- [Issue resolution status](#issue-resolution-status)
11-
- [Domains impacted](#domains-impacted)
12-
- [Type](#type)
9+
- [Pull request status](#pull-request-status)
10+
- [Issue resolution status](#issue-resolution-status)
11+
- [Domains impacted](#domains-impacted)
12+
- [Type](#type)
1313

1414
Use the [fork] & [pull] model to contribute to the Magento Functional Testing Framework (MFTF) code base.
1515
This contribution model has contributors maintaining their own copy of the forked code base (which can be easily synced with the main copy).
@@ -31,16 +31,18 @@ All contributors are required to submit a click-through form to agree to the ter
3131

3232
1. Contributions must adhere to [Magento coding standards].
3333
2. Refer to the Magento development team’s [Definition of Done].
34-
We use these guidelines internally to ensure that we deliver well-tested, well-documented, solid code, and we encourage you to as well!
34+
We use these guidelines internally to ensure that we deliver well-tested, well-documented, solid code, and we encourage you to as well!
3535
3. Pull requests (PRs) must be accompanied by a meaningful description of their purpose.
36-
Comprehensive descriptions increase the chances that a pull request is merged quickly and without additional clarification requests.
36+
Comprehensive descriptions increase the chances that a pull request is merged quickly and without additional clarification requests.
3737
4. Commits must be accompanied by meaningful commit messages.
3838
5. PRs that include bug fixing must be accompanied by a step-by-step description of how to reproduce the bug.
3939
6. PRs that include new logic or new features must be submitted along with:
40-
* Unit/integration test coverage
41-
* Proposed [documentation update]. Documentation contributions can be submitted [here][devdocs].
40+
41+
- Unit/integration test coverage
42+
- Proposed documentation update.
43+
For the documentation contribution guidelines, see [DevDocs Contributing][devdocs].
4244
7. For large features or changes, [open an issue][issue] to discuss first.
43-
This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
45+
This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
4446
8. To report a bug, [open an issue][issue], and follow [guidelines about bugfix issues][issue reporting].
4547
9. All automated tests must pass successfully (all builds on [Travis CI] must be green).
4648

@@ -59,17 +61,15 @@ Learn more in the [Fork a repo][github fork] GitHub article.
5961
As community and Magento writers’ changes are merged to the repository, your fork becomes outdated and pull requests might result in conflicts.
6062
To see if your fork is outdated, open the fork page in GitHub and if at the top displays the following message:
6163

62-
```
63-
This branch is NUMBER commits behind magento:develop.
64-
```
64+
__This branch is NUMBER commits behind magento:develop.__
6565

6666
It means your fork must be updated.
67-
67+
6868
There are two ways to update your fork.
6969
The typical way is discussed in the [Syncing a fork][github sync fork] GitHub article.
7070
Make sure to update from the correct branch!
7171

72-
The othger way is to create a reverse pull request from the original repository.
72+
The other way is to create a reverse pull request from the original repository.
7373
Though this method has the downside of inserting unnecessary information into fork commit history.
7474

7575
1. In your fork, click **New pull request**.
@@ -94,8 +94,8 @@ To create a pull request do the following:
9494
Learn more in the [Creating a pull request][create pr] GitHub article.
9595

9696
After submitting your PR, you can head over to the repository’s [Pull Requests panel][existing PRs] to see your PR along with the others.
97-
Your PR undergoes automated testing, and if it passes, the core team considers it for inclusion in the Magento Functional Testing Framework codebase.
98-
If some tests fail, make the corresponding corrections in your code.
97+
Your PR undergoes automated testing, and if it passes, the core team considers it for inclusion in the Magento Functional Testing Framework codebase.
98+
If some tests fail, make the corresponding corrections in your code.
9999

100100
## Report an issue
101101

@@ -110,8 +110,8 @@ Before creating an issue, do the following:
110110
To add an issue:
111111

112112
1. [Open a new issue][open new issue]
113-
3. Fill in the **Title** and issue description
114-
4. Click **Submit new issue**
113+
2. Fill in the **Title** and issue description
114+
3. Click **Submit new issue**
115115

116116
Learn more in the [Creating an issue][create issue] GitHub article.
117117

@@ -124,7 +124,7 @@ The labels reflect the status, impact, or which team is working on it.
124124

125125
Label| Description
126126
---|---
127-
**accept**| The pull request has been accepted to be merged into mainline code.
127+
**accept**| The pull request has been accepted to be merged into mainline code.
128128
**reject**| The pull request has been rejected. The most common cases are when the issue has already been fixed in another code contribution, or there is an issue with the code contribution.
129129
**needsUpdate**| We need more information from the PR author to properly prioritize and process the pull request.
130130

@@ -134,7 +134,7 @@ Label| Description
134134
---|---
135135
**acknowledged**| We validated the issue and created an internal ticket.
136136
**needsUpdate**| We need more information from the PR author to properly prioritize and process the issue.
137-
**cannot reproduce**| We do not have enough details from the issue description to reproduce the issue.
137+
**cannot reproduce**| We do not have enough details from the issue description to reproduce the issue.
138138
**non-issue**| We don't think that this is an issue according to the provided information.
139139

140140
### Domains impacted
@@ -152,7 +152,6 @@ Label| Description
152152
**bugfix**| The issue or pull request is about fixing a bug.
153153
**enhancement**| The issue or pull request that makes the MFTF even more awesome (for example new features, optimization, refactoring, etc).
154154

155-
156155
[fork]: #fork-a-repository
157156
[issue]: #report-an-issue
158157
[labels]: #read-labels
@@ -161,8 +160,7 @@ Label| Description
161160
[create issue]: https://help.github.com/articles/creating-an-issue/
162161
[create pr]: https://help.github.com/articles/creating-a-pull-request/
163162
[Definition of Done]: https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing_dod.html
164-
[devdocs]: https://github.com/magento/devdocs/
165-
[documentation update]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
163+
[devdocs]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
166164
[existing issues]: https://github.com/magento/magento2-functional-testing-framework/issues?q=is%3Aopen+is%3Aissue
167165
[existing PRs]: https://github.com/magento/magento2-functional-testing-framework/pulls?q=is%3Aopen+is%3Apr
168166
[GitHub documentation]: https://help.github.com/articles/syncing-a-fork

0 commit comments

Comments
 (0)