From dc35c736428aead0791f65ecb005bd95ccf9cd62 Mon Sep 17 00:00:00 2001 From: Mike C Date: Sun, 9 Apr 2017 13:14:09 -0600 Subject: [PATCH 1/4] Rename CONTRIBUTING to CONTRIBUTING.md Renaming document allows a CONTRIBUTING guide to be better formatted and therefore more accessible. --- CONTRIBUTING => CONTRIBUTING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CONTRIBUTING => CONTRIBUTING.md (100%) diff --git a/CONTRIBUTING b/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING rename to CONTRIBUTING.md From 09bbf96d859242af3127ee49692547f0eb8c28f6 Mon Sep 17 00:00:00 2001 From: Mike C Date: Sun, 9 Apr 2017 13:26:26 -0600 Subject: [PATCH 2/4] Grouping CONTRIBUTING into digestable sections The current document is very much a wall of text. This commit begins to re-structure that information into logical groups. --- CONTRIBUTING.md | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 55fcedccd..78d78f7bf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,8 +1,17 @@ -A good way to help is to test, and report bugs. -See http://www.chiark.greenend.org.uk/~sgtatham/bugs.html if you -want to help that way. Testing is invaluable in making a piece +# Contributing to Monero + +A good way to help is to test, and report bugs. See +[How to Report Bugs Effectively (by Simon Tatham)](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) +if you want to help that way. Testing is invaluable in making a piece of software solid and usable. + +## General Guidelines + +* Comments are encouraged. +* If modifying code for which Doxygen headers exist, that header must be modified to match. +* Tests would be nice to have if you're adding functionality. + Patches are preferably to be sent via a github pull request. If that can't be done, patches in "git format-patch" format can be sent (eg, posted to fpaste.org with a long enough timeout and a link @@ -16,15 +25,12 @@ modifying is encourgaged. Proper squashing should be done (eg, if you're making a buggy patch, then a later patch to fix the bug, both patches should be merged). +## Commits and Pull Requests + Commit messages should be sensible. That means a subject line that describes the patch, with an optional longer body that gives details, documentation, etc. -Comments are encouraged. - -If modifying code for which Doxygen headers exist, that header must -be modified to match. - When submitting a pull request on github, make sure your branch is rebased. No merge commits nor stray commits from other people in your submitted branch, please. You may be asked to rebase if there @@ -32,5 +38,3 @@ are conflicts (even trivially resolvable ones). PGP signing commits is strongly encouraged. That should explain why the previous paragraph is here. - -Tests would be nice to have if you're adding functionality. From a55bb37508401de83d5024af65a24f80a9420737 Mon Sep 17 00:00:00 2001 From: Mike C Date: Sun, 9 Apr 2017 13:29:26 -0600 Subject: [PATCH 3/4] Add link to CONTRIBUTING to README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7bebbbc5b..0f03d66c6 100644 --- a/README.md +++ b/README.md @@ -380,7 +380,7 @@ Note: rlwrap will save things like your seed and private keys, if you supply the # Contributing -If you want to help out, see CONTRIBUTING for a set of guidelines. +If you want to help out, see [CONTRIBUTING](CONTRIBUTING.md) for a set of guidelines. # Debugging From aa02ff7f350e42687b1fbe75bb52b26026340667 Mon Sep 17 00:00:00 2001 From: Mike C Date: Sun, 9 Apr 2017 13:32:25 -0600 Subject: [PATCH 4/4] mv "Contributing" above install, compile, etc The section on contributing to the Monero project is buried deep below lots of other information in the main README. This PR moves that section (which is very small since it links to a different document) up to an easier to locate place just below License information. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0f03d66c6..274f9a55d 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,10 @@ There are also several mining pools that kindly donate a portion of their fees, See [LICENSE](LICENSE). +# Contributing + +If you want to help out, see [CONTRIBUTING](CONTRIBUTING.md) for a set of guidelines. + ## Monero software updates and consensus protocol changes (hard fork schedule) Monero uses a fixed-schedule hard fork mechanism to implement new features. This means that users of Monero (end users and service providers) need to run current versions and update their software on a regular schedule. Here is the current schedule, versions, and compatibility. @@ -378,10 +382,6 @@ While monerod and monero-wallet-cli do not use readline directly, most of the fu Note: rlwrap will save things like your seed and private keys, if you supply them on prompt. You may want to not use rlwrap when you use simplewallet to restore from seed, etc. -# Contributing - -If you want to help out, see [CONTRIBUTING](CONTRIBUTING.md) for a set of guidelines. - # Debugging This section contains general instructions for debugging failed installs or problems encountered with Monero. First ensure you are running the latest version built from the github repo.