summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2017-05-18 02:42:53 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2017-05-18 02:42:53 +0000
commit3c42de59978e83627b9cb704af47ba30076c64d9 (patch)
tree0fe1fcbf88fa5c67499fdef755e9ec631e7d3da1
parent96f871c80f59b3bc4f759de9320d3ec3a319d563 (diff)
parent6b8f2eb395b770bd528a76f056c390bcc2ae3343 (diff)
downloadbips-3c42de59978e83627b9cb704af47ba30076c64d9.tar.xz
Merge branch 'master' of github.com:bitcoin/bips
-rw-r--r--README.mediawiki2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 27150fd..d4d60e3 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -2,7 +2,7 @@ People wishing to submit BIPs, first should propose their idea or document to th
We are fairly liberal with approving BIPs, and try not to be too involved in decision making on behalf of the community. The exception is in very rare cases of dispute resolution when a decision is contentious and cannot be agreed upon. In those cases, the conservative option will always be preferred.
-Having a BIP here does not make it a formally accepted standard until its status becomes Active. For a BIP to become Active requires the mutual consent of the community.
+Having a BIP here does not make it a formally accepted standard until its status becomes Final or Active.
Those proposing changes should consider that ultimately consent may rest with the consensus of the Bitcoin users (see also: [https://en.bitcoin.it/wiki/Economic_majority economic majority]).