aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@exmulti.com>2011-09-05 20:01:55 -0700
committerJeff Garzik <jgarzik@exmulti.com>2011-09-05 20:01:55 -0700
commit3a7c4d89de95b8a52f8e5a8fdca50a47ec5e6e0b (patch)
tree7eda4b2e9acb1ffb5940f6f008718b952c1a3369
parent7464e647decace52bc075d9ac8788974504e0bb9 (diff)
parentadb8a55b46d3f2ae86f94ad73c0a03c79f7cd9e3 (diff)
Merge pull request #495 from alexwaters/readme
Updated readme file
-rw-r--r--README.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/README.md b/README.md
index ab328adbff..54ab4a4a50 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,9 @@ Developers work in their own trees, then submit pull requests when they think th
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 development forums: http://www.bitcoin.org/smf/index.php?board=6.0
+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 (by who? need people willing to be quality assurance testers), and periodically pushed to the subversion repo to become the official, stable, released bitcoin.
+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