Commit Graph

41 Commits

Author SHA1 Message Date
MarcoFalke
ed0f1bd976
Merge #18170: doc: Minor grammatical changes and flow improvements
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
2022-04-07 07:22:28 +05:30
fanquake
dbdfa1b3d0 Merge #16484: doc: update labels in CONTRIBUTING.md
faa88d0b5c7f6e317d0e35daef28d320801f1bb5 doc: update labels in CONTRIBUTING.md (MarcoFalke)

Pull request description:

  None of the examples in the "trivial" area are acceptable pull requests, unless they are acceptable in a different area (like "doc" or "log").

  Fix that by removing the "trivial" area.

ACKs for top commit:
  jonatack:
    ACK faa88d0b5c7f6e317d0e35daef28d320801f1bb5
  fanquake:
    ACK faa88d0b5c7f6e317d0e35daef28d320801f1bb5 - agree that trivial was pretty useless and that the meaning was unclear. Other changes look fine. Surprised the white space linter hasn't been having a field day in this file.

Tree-SHA512: 6208bcc7c84ad0ca6aeaa2de1901c9da8971aac332b5e7a1194ea7b24fb2d887f988aa22fdfa818e89cbcfd8cb8595ce312525f88c81c5ade484fd7c9bd13d1b
2022-01-30 18:29:19 -05:00
Munkybooty
b2c051af40
doc: instructions on how to update the backports spreadsheet (#4644) 2022-01-04 18:21:00 +03:00
fanquake
0dcf7e3579 Merge #21263: doc: Clarify that squashing should happen before review
fa1f3a26a7541ba82a28c2a5fd09401be825c888 doc: Clarify that squashing should happen before review (MarcoFalke)

Pull request description:

  Unlike other repos, in our repo code review happens before merge, ideally.

  Thus, rebases, solving merge conflicts and squashing should happen before review, which again happens before merge.

ACKs for top commit:
  theStack:
    ACK fa1f3a26a7541ba82a28c2a5fd09401be825c888
  fanquake:
    ACK fa1f3a26a7541ba82a28c2a5fd09401be825c888

Tree-SHA512: e9222191a6e9cf9867bd1f29982526dd7b746b70dd2cc94f485256ec98ff2d3941c9b40728935e151d13795239334e334b71ad41044909cb2849f57776811a94
2021-07-15 19:39:10 -05:00
Wladimir J. van der Laan
9c6b782196
Merge #18283: doc: Explain rebase policy in CONTRIBUTING.md
fa1244783ccb4798af4906ac6be5a38df241fa38 doc: Explain rebase/squash policy in CONTRIBUTING.md (MarcoFalke)

Pull request description:

ACKs for top commit:
  hebasto:
    re-ACK fa1244783ccb4798af4906ac6be5a38df241fa38, typos fixed.
  laanwj:
    ACK fa1244783ccb4798af4906ac6be5a38df241fa38

Tree-SHA512: b8f790a8ffa4f59f26b64befbea8acd92f3c548e577c35750a60dde94b4340258a540ad0db60a6de650db0156cbff9e1330c589c300db5253531fe6a16cdbcc9
2021-07-14 18:44:43 -05:00
MarcoFalke
545139e5c1
Merge #17159: doc: Add a note about backporting
2a6bce482c13cff37c1af00231265de4656a454b doc: Add a note about backporting (Carnhof Daki)

Pull request description:

  See laanwj's comment in #17158
  https://github.com/bitcoin/bitcoin/pull/17158#issuecomment-542627090

Top commit has no ACKs.

Tree-SHA512: ac5248a796050ce1a5bd0718955f941f6a3c025e192599948f12566eb55296079404b999676b9a2c8fe10616fc8334698dfa415af0fb4db6c98038d52218af1f
2021-07-14 18:44:43 -05:00
UdjinM6
3004c3498b
Merge pull request #4245 from PastaPastaPasta/backport-triv-pr9
backport: 'trivial' pr9
2021-07-14 02:52:00 +03:00
fanquake
5857a5d5b4
Merge #17157: doc: Added instructions for how to add an upsteam to forked repo
f09ba060cacd42e4cb9a242c1d731deb1f6623c6 doc: Added instructions for how to add an upsteam to forked repo (dannmat)

Pull request description:

  As a first time git developer, I struggled to understand whether to create a new fork for each pull request or not.

  After asking the IRC chat, I have added this to the documentation to further help new developers using git.

ACKs for top commit:
  fanquake:
    ACK f09ba060cacd42e4cb9a242c1d731deb1f6623c6 - For such a simple change, I think we've bike-shed this enough already. The `bitcoin/bitcoin` repo isn't really where anyone should be learning how to use `git` etc, but I think linking out here is ok.

Tree-SHA512: e0e9d655d0725e0128673afedb81dc5ba9387968fcbb681de7e50155a2cfa1a7f39fad040b596f4de9ad6727a1a8a90fd3d36eaa5242bc12186c3b82abd23fb2
2021-07-13 13:14:07 -05:00
PastaPastaPasta
d2e45e0a35
Update CONTRIBUTING.md 2021-07-13 10:48:56 -05:00
MarcoFalke
7066614d6c Merge #16149: doc: Rework section on ACK in CONTRIBUTING.md
fac5ddfc57 doc: Rework section on ACK (MarcoFalke)

Pull request description:

  `utACK` and `t(ested) ACK` are deprecated and will be removed in the next major release. Please use the more generic `ACK` and include an explanation of what was reviewed.

  There was a related discussion in http://diyhpl.us/wiki/transcripts/bitcoin-core-dev-tech/2019-06-05-code-review/ section `The author could offer a guide for review`.

ACKs for commit fac5dd:
  moneyball:
    ACK fac5ddfc5796022601af2c17fd0b158b2c465cba

Tree-SHA512: 29177e8d96aeba055b5cad6d99be3ca1be0c61af0fdc90f70a3136872c9ad6201a02f63fbac78b90b8a56b4c06af304f2583d52a94fdd954fdcc7ad0552b9ef8
2021-07-12 20:16:37 -05:00
Wladimir J. van der Laan
e32f1e0b2b Merge #15794: docs: Clarify PR guidelines w/re documentation
f4a230b627bf9ff53e14719609849ee05b022480 docs: Clarify PR guidelines w/re documentation (Carl Dong)

Pull request description:

  PRs should change documentation accordingly when the behaviour of code changes.

ACKs for commit f4a230:
  practicalswift:
    ACK f4a230b627bf9ff53e14719609849ee05b022480
  fanquake:
    utACK f4a230b

Tree-SHA512: 6d9d65d7f0f9bc8f324ee16f03169df28fb512c58bb71093128cf16797b25533cdc992bc8757034a99d6fa6423a3129ca7cf2ab2da857535f409a683486fd4ab
2021-07-10 12:10:51 -05:00
Wladimir J. van der Laan
368f5f0c9f Merge #15626: Docs: Update ACK description in CONTRIBUTING.md
0d9d2b385b8c32ab422964128d10b99cfcad2612 Doc: update ACK description in CONTRIBUTING.md (Jon Atack)

Pull request description:

  as per https://github.com/bitcoin/bitcoin/pull/15617#issuecomment-474773043.

  Edit:

  as per https://github.com/bitcoin/bitcoin/pull/15617#issuecomment-474773043 and https://github.com/bitcoin/bitcoin/pull/15626#discussion_r267286564.

Tree-SHA512: 12df420d20338270bca310873c73d2f38b631c05cf8b3e5b2c1380f95936cb122687ba66b71de53348222efd5fed6d21e67f535a6ada689bf294dceec184a631
2021-07-10 12:10:51 -05:00
Jonas Schnelli
a4b2ac0c59 Merge #15577: Docs: Enable TLS in link to chris.beams.io
228e80608 Enable TLS in link to chris.beams.io (JeremyRand)

Pull request description:

  This PR enables TLS in a documentation link to chris.beams.io, which improves security.  This change was originally part of https://github.com/bitcoin/bitcoin/pull/13778 , which was closed for reasons unrelated to this change.

Tree-SHA512: 01f02031b39ebdaa7fc1859befde7e3bfff105892a8b9e1737ff94741599c6c5936eff53871e5e3560931512c9b7a4ea34f48d8555b583d232c90c2ca6d4d776
2021-07-10 12:10:51 -05:00
Wladimir J. van der Laan
0ed7a8622a Merge #14600: docs: Clarify commit message guidelines
0e6de3aacb8ebbf2617e8c11b8dae61acdd79816 added details about commit messages (Martin Erlandsson)

Pull request description:

  In this small PR, the gist of [this helpful and informative comment from @fanquake](https://github.com/bitcoin/bitcoin/pull/14583#issuecomment-433668211) is added to the official contributing instructions, to help future first-time contributors get their commit messages right.

Tree-SHA512: ca6e9b639e007944314690ef771470f346d6f0ad8aa398abf86e45258bc617334fdbd2ca10ff930d62669a5eca5b507a3ebae11f75971f80f8a44b0bb17ab054
2021-07-03 13:44:50 -05:00
MarcoFalke
5698ebb7fe Merge #13803: doc: add note to contributor docs about warranted PR's
db213aa47f doc: add note to contributor docs about warranted PR's (Karl-Johan Alm)

Pull request description:

Tree-SHA512: 39d4085ec0217c56b0d6a34e95d7b7a18e0373ec25549e6460cb8ef16218a6060f15e539ec2f8cceccd1188d2769e14fc276071f214ceb80db9b08ec5c24ccef
2021-06-28 21:21:50 -05:00
MarcoFalke
5c44138f18
Merge #13165: doc: Mention good first issue list in CONTRIBUTING.md
a508091c59 doc: Mention good first issue list in CONTRIBUTING.md (fanquake)

Pull request description:

Tree-SHA512: a954cda62d6dc8ab78809565be392a1c9f55c543e8d5c1a5a8588c0062e1a11bd4968991646e4aa5bd9b9761b1765fde4ceab8fea7a973148122ff249d728b92
2021-05-25 14:09:36 +03:00
MarcoFalke
38f90834cc Merge #13488: Docs: Improve readability of "Squashing commits"
42c499614a Docs: Improve readability of "Squashing commits" (wodry)

Pull request description:

  It was not easy to read the comment lines for me because I was not sure whether the sentence ended with the line or not ("pull set commits"?).
  Therefore, dots had been invented and I have added them to signal the end of a sentence. Also begin New sentence with a capital letter.

  I guess, not all 'pick' words should be replaced by 'squash'? At least I found [this DO](https://www.digitalocean.com/community/tutorials/how-to-rebase-and-update-a-pull-request) rebase/squash documentation helpful, where is written that the first line should not be changed.

Tree-SHA512: 1cb6d866a7295d44e2c8a7911f8a2650eb2f0ba0cffe2b97e90f7e1ed36ac942480b45ef46e01dd3871beb20d04840fb5093fdb414b60f6cc4f88f95fe70f47b
2020-07-07 11:51:06 -05:00
UdjinM6
469d6aa737
Some Dashification (#3513)
* Trivial Dashification

* Tweak getnetworkinfo and dumpwallet help text

We don't have RBF and Segwit

* CopyrightHolders should also check for missing "Dash Core" copyright
2020-06-11 11:39:04 +03:00
PastaPastaPasta
a9fc40fb0a
add "Verifying a Rebase" section to CONTRIBUTING.md (#3487)
Signed-off-by: Pasta <pasta@dashboost.org>
2020-05-18 15:26:42 +03:00
MarcoFalke
3d6713d651
Merge #11729: [docs] links to code style guides
fe27a7236 [docs] links to code style guides (Sjors Provoost)

Pull request description:

  I always have difficulty finding these, probably because they're not actually called "code style guideline".

Tree-SHA512: a2716c5e7e6778ce71b4451091e3899c0f9e04d07e95d1a0bdb07eb0319c083e3d9aa94bc2e33fc8546f82a1441e73c37218fdc7f228ee8273c7a87466958973
2020-02-27 09:23:29 -06:00
MarcoFalke
eb9263f046
Merge #11624: Docs: Change formatting for sequence of steps
d0b1fc88d Docs: Change formatting for sequence of steps (Vivek Ganesan)

Pull request description:

  A numbered list is used when the sequence of steps matters. A bulleted list is used to denote a set of items where the sequence does not matter.

  The workflow is a sequence and hence changed to a numbered list.

  Reference: https://www.w3.org/wiki/HTML_lists#Ordered_lists

Tree-SHA512: 310532713ed2dc3a5fe6d3b54f77fef09f355fa0ead57f2861c469e9149c658af4767cf00fb3e13569f6c4700edb0cc0265c2654c59393df80a99bf5123de5f5
2020-01-16 09:22:46 -06:00
Wladimir J. van der Laan
ce381d0826
Merge #11571: Fixed a couple small grammatical errors.
f927ee1 Fixed a couple small grammatical errors. (Christian Gentry)

Pull request description:

  1. "If a pull request is not to be considered for merging (yet), please
  prefix the ..."

  2. If a particular commit references another issue, please add the reference. For
  example: `refs #1234` or `fixes #4321`.

Tree-SHA512: b2ed11a235800a6b8e9450937352954a2222eb6f08f9556c8f298fd3d64d18e731397b46f3141eab01e0196f53fa3a9d84fb707a1e7691a63dd146b3c5298fe5
2020-01-16 09:22:46 -06:00
Wladimir J. van der Laan
e14eb40b50
Merge #11236: Add note on translations to CONTRIBUTING.md
87fe21f81 Add translation note to CONTRIBUTING.md (MeshCollider)

Pull request description:

  The readme mentions it but there is no note in contributing.md, so this just adds a note there as suggested by https://github.com/bitcoin/bitcoin/pull/11235#issuecomment-327110644

Tree-SHA512: 915afd7d38e06ca771084d1e7a931bf230961003dc1657165e6a3b8b55893427f76a4e6846993c351bda2ed4da2c9ab4b9634390cbc4391479f39b6b7556bca8

Update CONTRIBUTING.md

Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
2020-01-01 22:31:14 -06:00
MarcoFalke
5f2aef826f
Merge #11003: Docs: Capitalize bullet points in CONTRIBUTING guide
13b1e9a16 Capitalize bullet points in CONTRIBUTING guide (Evan Klitzke)

Pull request description:

  English grammar dictates that these bullet points should be capitalized.
  This also makes the capitalization style consistent with the rest of the
  document, e.g. the "Decision Making Process" section.

Tree-SHA512: 59f5a8941180ff3862ba63d364c27fd83d2e144299a71b2e784d58f806e8a02d7951dcc80fcc7152d0c78c2d1f5a22db1236af7ea6b9abece8dbe93533e4b65c
2019-08-12 09:07:03 -05:00
Pasta
2f63322cdc
dashify "Finding reviewers" section to be more relevant
Signed-off-by: Pasta <Pasta@dash.org>
2019-05-19 20:43:04 -05:00
Wladimir J. van der Laan
383d1819a9
Merge #10211: [doc] Contributor fixes & new "finding reviewers" section
3ddd227 [doc] Add blob about finding reviewers. (Kalle Alm)
846dc17 [doc] Wording fixes in CONTRIBUTING.md. (Kalle Alm)

Tree-SHA512: 232e6496769f0fba1022da2e9a3add10dcec721e6cc168d552445125849a8c02729a71b7c526bbff30c7428bcdcfdd92b424014fbb6310148392d261408b4044
2019-05-19 20:43:01 -05:00
PastaPastaPasta
b99886532e add link for developer-notes in contributing (#2260) 2018-09-05 15:05:27 +03:00
Wladimir J. van der Laan
5f88c6451d Merge #9675: Fix typo and spelling inconsistency in CONTRIBUTING.md
36164fa Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
52819ca9b9 Merge #9763: [Trivial] Update comments referencing main.cpp
00e623d [Trivial] Update comments referencing main.cpp (CryptAxe)
2018-01-23 09:24:29 +01:00
Wladimir J. van der Laan
3f360d3e24 Merge #9542: Docs: Update CONTRIBUTING.md
c70622e Docs: Update CONTRIBUTING.md (John Newbery)
2018-01-21 12:48:33 +01:00
MarcoFalke
552fafdae6 Merge #8915: Add copyright/patent issues to possible NACK reasons
36f60a5 Add copyright/patent issues to possible NACK reasons (Peter Todd)
2018-01-12 09:58:14 +01:00
Wladimir J. van der Laan
fdc87cecc6 Merge #8771: CONTRIBUTING: Mention not to open several pulls
faa91bc CONTRIBUTING: Mention not to open several pulls (MarcoFalke)
2018-01-11 13:22:22 +01:00
Wladimir J. van der Laan
ce73b8300a Merge #8786: Mandatory copyright agreement
4b67402 Mandatory copyright agreement (Andrew Chow)
2018-01-11 13:22:22 +01:00
Pieter Wuille
909945d34d Merge #8226: contributing.md: Fix formatting (line lengths and smart quotes)
be1d451 contributing.md: Fix formatting (Will Binns)
2018-01-09 14:04:20 +01:00
Alexander Block
5496e468a6 Dashify a few docs and the use of an address 2017-12-22 06:09:04 +01:00
Wladimir J. van der Laan
9bf6987933 Merge #8034: [doc][trivial] Add basic git squash workflow [skip ci]
90963e5 [doc] Add basic git squash example (fanquake)
2017-12-21 18:50:14 +01:00
Will Wray
82a4643135 Doc: fix broken formatting in markdown #headers (#1462)
* Doc: fix broken formatting in markdown #headers

Insert a space in markdown headers between the #'s and the header text.
(It appears that the space is required since a github update a year ago
https://github.com/blog/2100-github-pages-now-faster-and-simpler-with-jekyll-3-0)

* Update REST-interface.md

* Update guide-startmany.md

* Update instantsend.md

* Update keepass.md

* Update release-process.md
2017-05-05 14:28:08 +03:00
UdjinM6
a2c6140cb1 more bitcoin -> dash
Closes #712
2016-03-06 18:21:29 +01:00
Patrick Strateman
6307beb09f Note that reviewers should mention the commit hash of the commits they reviewed.
Github-Pull: #7185
Rebased-From: e1030dddab
2016-01-13 21:25:35 +00:00
paveljanik
05b5831aa0 Add PR title prefix for trivial changes [skip ci] 2015-09-30 08:44:51 +02:00
BtcDrak
06d92d71a2 Add CONTRIBUTING.md 2015-09-26 09:03:47 +01:00