Merge pull request #6 from wanderer/master

updated history; simple spelling fixes
ethereum · Oct 28, 2015 · 8d25038 · 8d25038
2 parents c9506ad + 374432d
commit 8d25038
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/EIPS/eip-1.mediawiki b/EIPS/eip-1.mediawiki
@@ -177,4 +177,4 @@ The editors don't pass judgement on EIPs. We merely do the administrative & edit
 
 ==History==
 
-This document was derived heavily from [https://github.com/bitcoin/bips Bitcoin's BIP-0001] written by Todd Peters wich in turn was derived from [https://www.python.org/dev/peps/ Python's PEP-0001]. In many places text was simply copied and modified. Although the PEP-0001 text was written by Barry Warsaw, Jeremy Hylton, and David Goodger, they are not responsible for its use in the Ethereum Improvement Process, and should not be bothered with technical questions specific to Ethereum or the EIP. Please direct all comments to the EIP editors.
+This document was derived heavily from [https://github.com/bitcoin/bips Bitcoin's BIP-0001] written by Amir Taaki wich in turn was derived from [https://www.python.org/dev/peps/ Python's PEP-0001]. In many places text was simply copied and modified. Although the PEP-0001 text was written by Barry Warsaw, Jeremy Hylton, and David Goodger, they are not responsible for its use in the Ethereum Improvement Process, and should not be bothered with technical questions specific to Ethereum or the EIP. Please direct all comments to the EIP editors.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # EIP [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/EIPs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-The Ethereum Improvement Process. EIPs propose and discribe changes made to Ethereum Protocol.
+Ethereum Improvement Proposal. EIPs propose and describe changes made to Ethereum Protocol.
 
 People wishing to submit EIPs first should propose their idea an issue or document as pull request. After discussion it will be published here. We are fairly liberal with approving EIPs and try not to be too involved in decision making on behalf of the community. Having a EIP here does not make it a formally accepted standard until its status becomes Active. For a EIP to become Active requires the mutual consent of the community. Those proposing changes should consider that ultimately consent may rest with the consensus of the Ethereum users.