Merge #584: Replace keyhash with scripthash as appropriate

1f83208 Replace keyhash with scripthash as appropriate (Carl Dong)

Pull request description:

Tree-SHA512: 03cc3c8830da3f24e9b4be2e60d8fa9bf5a8c484500ae281f275f01f030bd1664ef838449d563abf0bd99e29dd5a4d5d687b8f9b7a45e119e9595eabc0d71115

Author: harding

_posts/en/pages/2016-01-18-segwit-wallet-dev.md

@@ -150,7 +150,7 @@ The following functions are not required for initial segwit support.
 
 #### Native Pay-to-Witness-Script-Hash (P2WSH)
 
-* Native P2WSH is a <code>scripPubKey</code> of 34 bytes. It starts with a <code>OP_0</code>, followed by a canonical push of the <code>scripthash</code> (i.e. <code>0x0020{32-byte keyhash}</code>)
+* Native P2WSH is a <code>scripPubKey</code> of 34 bytes. It starts with a <code>OP_0</code>, followed by a canonical push of the <code>scripthash</code> (i.e. <code>0x0020{32-byte scripthash}</code>)
 * Same as P2SH-P2WSH, <code>scripthash</code> is SHA256 of the <code>witnessScript</code>.
 * When spending a native P2WSH, the <code>scriptSig</code> MUST be empty, and the witness stack format and signature generating rules are same as P2SH-P2WSH (including the requirement of using compressed public key)
 * [Example](http://n.bitcoin.ninja/checktx?txid=78457666f82c28aa37b74b506745a7c7684dc7842a52a457b09f09446721e11c)

_posts/ja/pages/2016-01-18-segwit-wallet-dev.md

@@ -154,7 +154,7 @@ version: 1
 
 #### Native Pay-to-Witness-Script-Hash (P2WSH) {#native-pay-to-witness-script-hash}
 
-* Native P2WSHは34バイトの<code>scripPubKey</code>です。この<code>scripPubKey</code>は<code>OP_0</code>から始まり、その後に<code>scripthash</code>がプッシュされます。（例：<code>0x0020{32-byte keyhash}</code>）
+* Native P2WSHは34バイトの<code>scripPubKey</code>です。この<code>scripPubKey</code>は<code>OP_0</code>から始まり、その後に<code>scripthash</code>がプッシュされます。（例：<code>0x0020{32-byte scripthash}</code>）
 * P2SH-P2WSHと同様、<code>scripthash</code>は<code>witnessScript</code>をSHA256した値です。
 * Native P2WSHを使用する際は、<code>scriptSig</code>は必ず空で、witnessスタックの形式と署名の生成ルールはP2SH-P2WSHと同じです（圧縮公開鍵を使用する要件含め）。
 * [Example](http://n.bitcoin.ninja/checktx?txid=78457666f82c28aa37b74b506745a7c7684dc7842a52a457b09f09446721e11c)