aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2011-09-05 23:02:35 -0400
committerJeff Garzik <jgarzik@redhat.com>2011-09-05 23:02:35 -0400
commitcc558f060372cf479b7d654775edc81908fd9179 (patch)
treef1bfd906e18fce23822b460e6605d00205a7e49f
parent3a7c4d89de95b8a52f8e5a8fdca50a47ec5e6e0b (diff)
README.md: word wrap text file
-rw-r--r--README.md27
1 files changed, 21 insertions, 6 deletions
diff --git a/README.md b/README.md
index 54ab4a4a50..a41eb2d770 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,30 @@
+
Bitcoin integration/staging tree
Development process
===================
-Developers work in their own trees, then submit pull requests when they think their feature or bug fix is ready.
+Developers work in their own trees, then submit pull requests when
+they think their feature or bug fix is ready.
+
+If it is a simple/trivial/non-controversial change, then one of the
+bitcoin development team members simply pulls it.
+
+If it is a more complicated or potentially controversial
+change, then the patch submitter will be asked to start a
+discussion (if they haven't already) on the mailing list:
+http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development
-If it is a simple/trivial/non-controversial change, then one of the bitcoin development team members simply pulls it.
+The patch will be accepted if there is broad consensus that it is a
+good thing. Developers should expect to rework and resubmit patches
+if they don't match the project's coding conventions (see coding.txt)
+or are controversial.
-If it is a more complicated or potentially controversial change, then the patch submitter will be asked to start a discussion (if they haven't already) on the mailing list: http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development
-The patch will be accepted if there is broad consensus that it is a good thing. Developers should expect to rework and resubmit patches if they don't match the project's coding conventions (see coding.txt) or are controversial.
+The master branch is regularly built and tested, but is not guaranteed
+to be completely stable. Tags are regularly created to indicate new
+official, stable release versions of Bitcoin. If you would like to
+help test the Bitcoin core, please contact QA@Bitcoin.org.
-The master branch is regularly built and tested, but is not guaranteed to be completely stable. Tags are regularly created to indicate new official, stable release versions of Bitcoin. If you would like to help test the Bitcoin core, please contact QA@Bitcoin.org.
+Feature branches are created when there are major new features being
+worked on by several people.
-Feature branches are created when there are major new features being worked on by several people. \ No newline at end of file