sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #18170: doc: Minor grammatical changes and flow improvements

Browse Source 
7ba962276e3e540a15eb0bdbbaaa101958229bd4 doc: Minor grammatical changes and flow improvements (Travin Keith)

Pull request description:

  **Grammar:**

  Line 49: There shouldn't be a period at the end of a phrase.

  Lines 56, 57, 116, 137, and 177: Adding necessary commas

  Lines 103 and 136: Run-on sentence issues fixed.

  Line 176: Fixed punctuation and added necessary conjunction

  Line 178: Singular noun when it should be plural

  **Flow:**

  Line 49: Adding "for" makes it more natural.

  Line 54: Though it's not grammatically incorrect to end a sentence with a preposition in an informal document such as this, the word "followed" is much easier to understand anyway, especially for those who don't have English as their native language.

Top commit has no ACKs.

Tree-SHA512: 17fdb5fc6146e025f160e860dbcbdbfa07b7608b8cb611c3b9d4ed91c426100ef772915251bc1f6bacb3a62df57b72c2003fb72cb2c8542454638545985313da
This commit is contained in:
MarcoFalke 2020-03-11 10:25:32 -04:00 committed by Vijay Das Manikpuri
parent 311a64408d
commit ed0f1bd976
No known key found for this signature in database
GPG Key ID: DB1D81B01DB7C46E
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CONTRIBUTING.md
View File

@ -27,15 +27,15 @@ facilitates social contribution, easy testing and peer review.
To contribute a patch, the workflow is as follows: To contribute a patch, the workflow is as follows:
1. Fork repository ([only the first time](https://help.github.com/en/articles/fork-a-repo)). 1. Fork repository ([only for the first time](https://help.github.com/en/articles/fork-a-repo))
1. Create topic branch 1. Create topic branch
1. Commit patches 1. Commit patches
The project coding conventions in the [developer notes](doc/developer-notes.md) The project coding conventions in the [developer notes](doc/developer-notes.md)
must be adhered to. must be followed.
In general [commits should be atomic](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention) In general, [commits should be atomic](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention)
and diffs should be easy to read. For this reason do not mix any formatting and diffs should be easy to read. For this reason, do not mix any formatting
fixes or code moves with actual code changes. fixes or code moves with actual code changes.
Commit messages should be verbose by default consisting of a short subject line Commit messages should be verbose by default consisting of a short subject line
@ -80,7 +80,7 @@ Examples:
Qt: Add feed bump button Qt: Add feed bump button
Log: Fix typo in log message Log: Fix typo in log message
Note that translations should not be submitted as pull requests, please see Note that translations should not be submitted as pull requests. Please see
[Translation Process](https://github.com/dashpay/dash/blob/master/doc/translation_process.md) [Translation Process](https://github.com/dashpay/dash/blob/master/doc/translation_process.md)
for more information on helping with translations. for more information on helping with translations.
@ -93,7 +93,7 @@ patch does together with any justification/reasoning. You should include
references to any discussions (for example other tickets or mailing list references to any discussions (for example other tickets or mailing list
discussions). discussions).
At this stage one should expect comments and review from other contributors. You At this stage, one should expect comments and review from other contributors. You
can add more commits to your pull request by committing them locally and pushing can add more commits to your pull request by committing them locally and pushing
to your fork until you have satisfied all feedback. to your fork until you have satisfied all feedback.
@ -113,8 +113,8 @@ before it will be reviewed. The basic squashing workflow is shown below.
# Save and quit. # Save and quit.
git push -f # (force push to GitHub) git push -f # (force push to GitHub)
Please update the resulting commit message if needed, it should read as a Please update the resulting commit message if needed. It should read as a
coherent message. In most cases this means that you should not just list the coherent message. In most cases, this means that you should not just list the
interim commits. interim commits.
If you have problems with squashing (or other workflows with `git`), you can If you have problems with squashing (or other workflows with `git`), you can
@ -167,9 +167,9 @@ in the future, they may be removed by the Repository Maintainer.
Refactoring is a necessary part of any software project's evolution. The Refactoring is a necessary part of any software project's evolution. The
following guidelines cover refactoring pull requests for the project. following guidelines cover refactoring pull requests for the project.
There are three categories of refactoring, code only moves, code style fixes, There are three categories of refactoring: code-only moves, code style fixes, and
code refactoring. In general refactoring pull requests should not mix these code refactoring. In general, refactoring pull requests should not mix these
three kinds of activity in order to make refactoring pull requests easy to three kinds of activities in order to make refactoring pull requests easy to
review and uncontroversial. In all cases, refactoring PRs must not change the review and uncontroversial. In all cases, refactoring PRs must not change the
behaviour of code within the pull request (bugs must be preserved as is). behaviour of code within the pull request (bugs must be preserved as is).