Skip to content

Commit

Permalink
Merge pull request #3 from rxl/master
Browse files Browse the repository at this point in the history
update docs (including language that refers to the original Bitcoin project, instead of Namecoin)
  • Loading branch information
namecoinq committed Nov 26, 2013
2 parents 5b00e68 + b128e40 commit f672348
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
3 changes: 2 additions & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright (c) 2009-2011 Bitcoin Developers
Copyright (c) 2009-2013 Bitcoin Developers
Copyright (c) 2009-2013 Namecoin Developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions DESIGN-namecoin.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Name Coin Design
# Namecoin Design

## Key Operations

Expand All @@ -8,7 +8,7 @@ Key operations are performed by transactions with version 0x9900 - 0x99ff
* name\_firstupdate(name, rand, value)
* name\_update(name, value)

The last is a normal bitcoin like transaction that does not affect the name.
The last is a normal bitcoin-like transaction that does not affect the name.

## Method

Expand Down
9 changes: 5 additions & 4 deletions DEVELOPMENT-PROCESS.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
Bitcoin integration/staging tree
Namecoin 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.

If it is a simple/trivial/non-controversial change, then one of the bitcoin development team members simply pulls it.
If it is a simple/trivial/non-controversial change, then one of the namecoin 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.

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
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 (by who? need people willing to be quality assurance testers), and periodically pushed to the subversion repo to become the official, stable, released namecoin.


Feature branches are created when there are major new features being worked on by several people.

0 comments on commit f672348

Please sign in to comment.