Merge #518: rm segwit support

def532d Redirect segwit_adoption to segwit-upgrade-guide (MarcoFalke)
0587d7c rm references to segwit_adoption (MarcoFalke)
dfa988e rm segwit support (MarcoFalke)

Author: jonasschnelli

_data/navigation.yml

@@ -68,9 +68,6 @@ en:
       contribute-code:
         title: "contributing code"
         url:   "/en/faq/contributing-code/"
-      segwit:
-        title: "SegWit Adoption"
-        url:   "/en/segwit_adoption/"
       meetings:
         title: "meetings"
         url:   "/en/meetings/"
@@ -159,9 +156,6 @@ zh_CN:
       contribute-code:
         title: "贡献码"
         url:   "/en/faq/contributing-code/"
-      segwit:
-        title: "SegWit 采用"
-        url:   "/zh_CN/segwit_adoption/"
       meetings:
         title: "会议"
         url:   "/zh_CN/meetings/"
@@ -247,9 +241,6 @@ zh_TW:
       contribute-code:
         title: "contributing code"
         url:   "/en/faq/contributing-code/"
-      segwit:
-        title: "SegWit Adoption"
-        url:   "/en/segwit_adoption/"
       meetings:
         title: "meetings"
         url:   "/en/meetings/"
@@ -335,9 +326,6 @@ ja:
       contribute-code:
         title: "contributing code"
         url:   "/en/faq/contributing-code/"
-      segwit:
-        title: "SegWit Adoption"
-        url:   "/en/segwit_adoption/"
       meetings:
         title: "meetings"
         url:   "/en/meetings/"

_data/segwitsupport.csv

@@ -62,9 +62,6 @@ en:
       contribute-code:
         title: "contributing code"
         url:   "/en/faq/contributing-code/"
-      segwit:
-        title: "SegWit Adoption"
-        url:   "/en/segwit_adoption/"
       meetings:
         title: "meetings"
         url:   "/en/meetings/"

_data/source_navigation.txt

@@ -8,6 +8,9 @@ lang: en
 permalink: /en/2016/10/27/segwit-upgrade-guide/
 version: 1
 excerpt: Almost two years of iterative design, development, and testing has gone into the version of segwit being released in Bitcoin Core 0.13.1, with much of the effort over the last year focused on making it as easy as possible for existing Bitcoin users, businesses, developers, and miners to upgrade to segwit.
+redirect_from:
+  - /en/segwit_adoption/
+  - /zh_CN/segwit_adoption/
 ---
 {% include _toc.html %}
 {% include _references.md %}
@@ -204,7 +207,7 @@ Most implementation details for BIPs 141, 143, 144, and 145 may be found in [Bit
 
 For testing changes on a segwit-enabled network, testnet (testnet3) has supported segwit for several months now and includes a large number of segwit blocks, including blocks that have very nearly the maximum block size allowed for by segwit.  Bitcoin Core’s regression-testing (regtest) mode also supports segwit by default in Bitcoin Core 0.13.0 and 0.13.1.
 
-A number of free and open source software Bitcoin wallets and packages besides Bitcoin Core have also already [added segwit compatibility](https://bitcoincore.org/en/segwit_adoption/) or have segwit-compatible code ready to deploy, so you may be able to use their code changes as an example for updating your software if their copyright license is compatible with your code.
+A number of free and open source software Bitcoin wallets and packages besides Bitcoin Core have also already added segwit compatibility or have segwit-compatible code ready to deploy, so you may be able to use their code changes as an example for updating your software if their copyright license is compatible with your code.
 
 **Questions?** Bitcoin development questions may be asked in the #bitcoin-dev IRC chatroom on irc.freenode.net.  Questions may also be asked on Bitcoin.StackExchange.com and the BitcoinTalk.org [technical discussion board.](https://bitcointalk.org/index.php?board=6.0)
 

_includes/pages/segwit_support.md

@@ -22,7 +22,7 @@ This effort was initiated by Dr. Pieter Wuille, but included contributions from
 
 ## Bitcoin Core Ecosystem
 
-There is broad excitement and anticipation as far as what providers and other exchange operators will create with the fundamental developments and innovations included in this release. So far, the [most popular wallets][segwit_adoption] and supporting libraries have stated they will support segwit including Ledger, Trezor, Electrum, and Bitgo. Additionally, work on numerous other libraries such as bitcoinj, bitcoinjs, pycoin and bitcore has already begun.
+There is broad excitement and anticipation as far as what providers and other exchange operators will create with the fundamental developments and innovations included in this release. So far, the most popular wallets and supporting libraries have stated they will support segwit including Ledger, Trezor, Electrum, and Bitgo. Additionally, work on numerous other libraries such as bitcoinj, bitcoinjs, pycoin and bitcore has already begun.
 
 A faucet is available for "segnet" coins [here](https://segwit.greenaddress.it/faucet/).
 
@@ -37,8 +37,6 @@ Please join the `segwit-dev` IRC channel on irc.freenode.net.
 
 Wallet providers should read the [migration guide](/en/segwit_wallet_dev).
 
-If you are a wallet user interested in following the status of your wallet’s implementation, please [follow their progress][segwit_adoption] which will be regularly updated. 
-
 ## Testing
 
 Finally and most importantly, please help test the Segwit Testnet!
@@ -69,5 +67,4 @@ Once compiled, add `-segnet` to the standard `bitcoind` and `bitcoin-cli` comman
 
 [FAQ]: https://bitcoincore.org/en/2015/12/23/capacity-increases-faq
 [roadmap]: http://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html
-[segwit_adoption]: /en/segwit_adoption
 

_posts/en/pages/2016-01-13-segwit-support.md

@@ -118,7 +118,7 @@ In order to reduce the chances of these risks occurring when segwit is activated
    - segnet1 through segnet4 -- tested implementation of segwit as a soft-fork, between January and May 2016
    - testnet3 -- segwit activated on the standard testnet in May 2016
 
- * Alternative implementations: the segwit BIPs have been reimplemented in [btcd](https://github.com/btcsuite/btcd/pull/656) (Go) and [Bcoin](https://medium.com/purse-essays/introducing-bcoin-fdfcb22dfa34) (Javascript), as well as in [various wallets and libraries](/en/segwit_adoption/).  Independent reimplementation helps shake out unstated assumptions and ambiguities in the design, and avoid bugs that may result from them.
+ * Alternative implementations: the segwit BIPs have been reimplemented in [btcd](https://github.com/btcsuite/btcd/pull/656) (Go) and [Bcoin](https://medium.com/purse-essays/introducing-bcoin-fdfcb22dfa34) (Javascript), as well as in various wallets and libraries.  Independent reimplementation helps shake out unstated assumptions and ambiguities in the design, and avoid bugs that may result from them.
 
 ### Mitigation