bip-0002: Remove/merge old BIP 1 Status stuff

1 files changed, 7 insertions, 20 deletions

diff --git a/bip-0002.mediawiki b/bip-0002.mediawiki
index 0cab460..593037e 100644
--- a/bip-0002.mediawiki
+++ b/bip-0002.mediawiki
@@ -51,25 +51,7 @@ It must be a clear and complete description of the proposed enhancement.
 The enhancement must represent a net improvement.
 The proposed implementation, if applicable, must be solid and must not complicate the protocol unduly.
 
-The BIP author may update the Draft as necessary in the git repository. Updates to drafts should also be submitted by the author as pull requests.
-
-Standards Track BIPs consist of two parts, a design document and a reference implementation.
-The reference implementation is not required to be begun until the BIP is accepted, unless having such an implementation will aid people in studying the BIP.
-Standards Track BIPs must include an implementation -- in the form of code, a patch, or a URL to same -- before it can be considered Final.
-
-Once a BIP has been accepted, the reference implementation must be completed. When the reference implementation is complete and accepted by the community, the status will be changed to "Final".
-
-A BIP can also be assigned status "Deferred". The BIP author or editor can assign the BIP this status when no progress is being made on the BIP. Once a BIP is deferred, the BIP editor can re-assign it to draft status.
-
-A BIP can also be "Rejected". Perhaps after all is said and done it was not a good idea. It is still important to have a record of this fact.
-
-BIPs can also be superseded by a different BIP, rendering the original obsolete. This is intended for Informational BIPs, where version 2 of an API can replace version 1.
-
-The possible paths of the status of BIPs are as follows:
-
-<img src="bip-0001/process.png"></img>
-
-Some Informational and Process BIPs may also have a status of "Active" if they are never meant to be completed. E.g. BIP 2 (this BIP).
+The BIP author may update the draft as necessary in the git repository. Updates to drafts should also be submitted by the author as pull requests.
 
 ===Transferring BIP Ownership===
 
@@ -181,7 +163,7 @@ BIPs may include auxiliary files such as diagrams. Auxiliary files should be inc
 
 There are three kinds of BIP:
 
-* A Standards Track BIP describes any change that affects most or all Bitcoin implementations, such as a change to the network protocol, a change in block or transaction validity rules, or any change or addition that affects the interoperability of applications using Bitcoin.
+* A Standards Track BIP describes any change that affects most or all Bitcoin implementations, such as a change to the network protocol, a change in block or transaction validity rules, or any change or addition that affects the interoperability of applications using Bitcoin. Standards Track BIPs consist of two parts, a design document and a reference implementation.
 * An Informational BIP describes a Bitcoin design issue, or provides general guidelines or information to the Bitcoin community, but does not propose a new feature. Informational BIPs do not necessarily represent a Bitcoin community consensus or recommendation, so users and implementors are free to ignore Informational BIPs or follow their advice.
 * A Process BIP describes a process surrounding Bitcoin, or proposes a change to (or an event in) a process. Process BIPs are like Standards Track BIPs but apply to areas other than the Bitcoin protocol itself. They may propose an implementation, but not to Bitcoin's codebase; they often require community consensus; unlike Informational BIPs, they are more than recommendations, and users are typically not free to ignore them. Examples include procedures, guidelines, changes to the decision-making process, and changes to the tools or environment used in Bitcoin development. Any meta-BIP is also considered a Process BIP.
 
@@ -189,7 +171,12 @@ There are three kinds of BIP:
 
 ===Specification===
 
+The possible paths of the status of BIPs are as follows:
+
+<img src="bip-0001/process.png"></img>
+
 Champions of a BIP may decide on their own to change the status between Draft, Deferred, or Withdrawn.
+The BIP editor may also change the status to Deferred when no progress is being made on the BIP.
 
 A BIP may only change status from Draft (or Rejected) to Accepted, when the author deems it is complete, has a working implementation (where applicable), and has community plans to progress it to the Final status.