Merge pull request bitcoin#291 from JornC/segwit-address

BIP142 - Typos and grammar

Author: luke-jr

bip-0142.mediawiki

@@ -19,7 +19,7 @@ To define standard payment address for native segregated witness (segwit) transa
 
 The new Bitcoin address format defined is for the Pay-to-Witness-Public-Key-Hash (P2WPKH) and Pay-to-Witness-Script-Hash (P2WSH) transaction described in segregated witness soft fork (BIP141). The scriptPubKey is an OP_0 followed by a push of 20-byte-hash (P2WPKH) or 32-byte hash (P2WSH).
 
-The new address is encoded in a simlar way as existing address formats:
+The new address is encoded in a way similar to existing address formats:
 
   base58-encode:
     [1-byte address version]
@@ -32,23 +32,23 @@ For P2WPKH address, the address version is 6 (0x06) for a main-network address o
 
 For P2WSH address, the address version is 10 (0x0A) for a main-network address or 40 (0x28) for a testnet address.
 
-The witness program version is an 1-byte value between 0 (0x00) and 16 (0x10). Only version 0 is defined in BIP141. Versions 1 to 16 are reserved for future extensions.
+The witness program version is a 1-byte value between 0 (0x00) and 16 (0x10). Only version 0 is defined in BIP141. Versions 1 to 16 are reserved for future extensions.
 
-Following the witness program version is a 0x00 padding to make sure that each witness program version will have an unique prefix.
+Following the witness program version is a 0x00 padding to make sure that each witness program version will have a unique prefix.
 
 Following the padding is the program hash, 20 byte for a P2WPKH address and 32 byte for a P2WSH address.
 
 The 4-byte checksum is the first four bytes of the double SHA256 hash of the serialization of the previous items.
 
-All addresses generated with this scheme will have a constant length, with 36 digits for 20-byte and 53 digits for 32-byte. Different witness program version will have an unique prefix shown in the following table:
+All addresses generated with this scheme will have a constant length, with 36 digits for 20-byte and 53 digits for 32-byte. Different witness program versions will have a unique prefix, as shown in the following table:
 
 {|class="wikitable" style="text-align: center;"
 |-
 !rowspan=3 style=""|Witness program version
 !colspan=4 style=""|Hash size
 |-
-!colspan=2 style=""|20-byte (36 digits)
-!colspan=2 style=""|32-byte (53 digits)
+!colspan=2 style=""|20-byte (36 characters)
+!colspan=2 style=""|32-byte (53 characters)
 |-
 !Mainnet
 !Testnet
@@ -94,12 +94,12 @@ All addresses generated with this scheme will have a constant length, with 36 di
 
 == Rationale ==
 
-The BIP141 defines 2 ways of encoding "witness program", a data push of 2 to 32 bytes:
+BIP141 defines 2 ways of encoding a "witness program", a data push of 2 to 32 bytes:
 
 * A native witness program output is a scriptPubKey with a push of version byte followed by a push of witness program, and nothing else;
 * Segwit-in-P2SH is a BIP16 P2SH redeemScript with a push of version byte followed by a push of witness program, while the scriptPubKey looks like a normal P2SH output.
 
-As the BIP13 P2SH address has been defined in 2012, using segwit-in-P2SH allows most existing wallets to pay a segwit-compatible wallet without any upgrade. However, this method requires more block space and is only a short-term solution to make the transition smoother. Eventually, all users are expected to use the more efficient native witness program as the primary payment method.
+Considering the BIP13 P2SH address has been defined in 2012, using segwit-in-P2SH allows most existing wallets to pay a segwit-compatible wallet without any upgrade. However, this method requires more block space and is only a short-term solution to make the transition smoother. Eventually, all users are expected to use the more efficient native witness program as the primary method of payment.
 
 The drawbacks of Bitcoin addresses have been extensively discussed in BIP13. Since then, better payment methods have been proposed or deployed, for example:
 *BIP47 Reusable Payment Codes for Hierarchical Deterministic Wallets
@@ -108,13 +108,13 @@ The drawbacks of Bitcoin addresses have been extensively discussed in BIP13. Sin
 
 However, none of these are as widely adopted as the suboptimal base-58 scriptPubKey template addresses, which is still a standard for the whole eco-system, from wallets, block explorers, merchants, exchanges, to end users. It is believed that the proposed P2WPKH and P2WSH address format is the easiest way for wallets and services to adopt native witness program, which is particularly important in the context of scaling the capacity of the blockchain.
 
-While P2WPKH address is specific for simple payment to a single public key, P2WSH address allows arbitrarily complex segwit transactions, resemble to the BIP13 P2SH address.
+While P2WPKH address is specific for simple payment to a single public key, P2WSH address allows arbitrarily complex segwit transactions, similar to the BIP13 P2SH address.
 
 == Compatibility ==
 
-This proposal is not backward compatible. However, an older implementation will report the new address type as invalid and will refuse to create a transaction.
+This proposal is not backward-compatible. However, an older implementation will report the new address type as invalid, and refuse to create a transaction.
 
-This proposal is forward compatible to the future versions of witness program of 20 and 32 bytes.
+This proposal is forward-compatible with future versions of witness programs of 20 and 32 bytes.
 
 == Example ==
 
@@ -126,15 +126,15 @@ when encoded as a P2PKH template, would become:
 
     DUP HASH160 <010966776006953D5567439E5E39F86A0D273BEE> EQUALVERIFY CHECKSIG
 
-And the corresponding version 1 Bitcoin address is
+With the corresponding version 1 Bitcoin address being:
 
     16UwLL9Risc3QfPqBUvKofHmBQ7wMtjvM
  
 When the same public key is encoded as P2WPKH, the scriptPubKey becomes: 
 
     OP_0 <010966776006953D5567439E5E39F86A0D273BEE>
 
-Using 0x06 as witness version, followed 0x00 as witness version, and a 0x00 padding, the equivalent P2WPKH address is:
+Using 0x06 as address version, followed by 0x00 as witness program version, and a 0x00 padding, the equivalent P2WPKH address is:
 
     p2xtZoXeX5X8BP8JfFhQK2nD3emtjch7UeFm