Merge pull request bitcoin-core#30 from remote btcdrak/segwit

_data/navigation.yml

@@ -6,29 +6,25 @@ en:
   about:
     title: "About"
     url:   "/en/about/"
-  test: # this is temporary structure to show how to do nested menus
-    disabled: true # disable from rendering
-    title: "Nested"
-    submenu: true
-    tree: # menus go here
-      first:
-        title: "first"
-        url: "/first"
-      second:
-        title: "second"
-        url: "/second"
   blog:
     title: "blog"
     url:   "/en/blog/"
   releases:
     title: "releases"
     url:   "/en/releases/"
-  contribute:
-    title: "contribute"
-    url:   "/en/contribute/"
-  meetings:
-    title: "meetings"
-    url:   "/en/meetings/"
+  dev:
+    title: "Development"
+    submenu: true
+    tree:
+      contribute:
+        title: "contribute"
+        url:   "/en/contribute/"
+      segwit:
+        title: "SegWit Adoption"
+        url:   "/en/segwit_adoption/"
+      meetings:
+        title: "meetings"
+        url:   "/en/meetings/"
 de:
   home:
     title: "Bitcoin Core"

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

@@ -0,0 +1,34 @@
+---
+title: Segregated Witness Support
+name: segwit-support
+type: page
+permalink: /en/segwit_adoption
+---
+
+The follow is a list of companies and projects which have stated they will support segregated witness.
+
+To add your company or service, please ACK ticket [#30] with company/service name.
+
+|#| Name | Planned | Ready |Notes|
+|-|------|---------|-------|-----|
+|1|[mSIGNA](https://ciphrex.com/)| yes | yes | wallet |
+|2|[BitGo](https://www.bitgo.com/)| yes | no| wallet |
+|3|[Bitcoinjs](http://bitcoinjs.org/)|yes| no|library|
+|4|[Blocktrail](https://www.blocktrail.com/)|yes| no|wallet, block explorer|
+|5|[BreadWallet](http://breadwallet.com/)|yes| no|wallet|
+|6|[Coinkite](https://coinkite.com/)|yes|no|wallet, hardware wallet|
+|7|[Coinomi](https://coinomi.com/)|yes|no|wallet|
+|8|[Digitalbitbox](https://digitalbitbox.com/)|yes|no|hardware wallet|
+|9|[GreenAddress](https://greenaddress.it/)|yes|no|wallet|
+|10|[GreenBits](https://www.greenbits.com/)|yes|no|wallet|
+|11|[Ledger](https://www.ledgerwallet.com/)|yes|no|hardware wallet|
+|12|[libbitcoin](http://libbitcoin.dyne.org/)|yes|no|library|
+|13|[libbtc](https://github.com/libbtc)|yes|no|library|
+|14|NBitcoin|yes|no|library|
+|15|[Samourai Wallet](http://samouraiwallet.com/)|yes|no|wallet|
+|16|[EI8HT](http://ei8.ht/)|yes|no|wallet|
+|17|[OmniCore](https://github.com/OmniLayer/omnicore)|yes|no|wallet|
+
+To add your company or service, please ACK ticket [#30] with company/service name.
+
+[#30]: https://github.com/bitcoin-core/website/pull/fixme