Merge pull request #236 from jgarzik/2015_2mb_blocksize

BIP 102: Add miner vote. Fix index.
bitcoin · Nov 7, 2015 · 1bc8075 · 1bc8075
2 parents 4f79338 + aad8125
commit 1bc8075
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.mediawiki b/README.mediawiki
@@ -308,7 +308,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Standard
 | Draft
 |-
-| [[bip-0102.mediawiki|101]]
+| [[bip-0102.mediawiki|102]]
 | Block size increase to 2MB
 | Jeff Garzik
 | Standard

diff --git a/bip-0102.mediawiki b/bip-0102.mediawiki
@@ -9,7 +9,7 @@
 
 ==Abstract==
 
-Increase total amount of transaction data permitted in a block from 1MB to 2MB on November 11, 2015.
+Simple, one-time increase in total amount of transaction data permitted in a block from 1MB to 2MB.
 
 ==Motivation==
 
@@ -20,7 +20,7 @@ Increase total amount of transaction data permitted in a block from 1MB to 2MB o
 ==Specification==
 
 # Maximum block size permitted to be valid is 1MB.
-# Increase this maximum to 2MB on November 11, 2015 at 00:00:00 UTC.
+# Increase this maximum to 2MB as soon as 75% of the last 1,000 blocks have signaled support.
 # Increase maximum block sigops by similar factor, preserving SIZE/50 formula.
 
 ==Backward compatibility==