Merge pulls #1195, #1197, #1200, #1202, and #1208

- 1195: Remove Inside Bitcoins New York and Hong Kong from event page
- 1197: Update _events.yml with correct San Fran event date
- 1200: Making clear that segwit is equivalent to a block size increase
- 1202: Capacity Increases FAQ: more prominently link to roadmap
- 1208: Change references to 'getaddr.bitnodes.io'

_events.yml

@@ -30,7 +30,7 @@
   country: "United States of America"
   link: "http://www.btcmiami.com"
 
-- date: 2016-02-23
+- date: 2016-03-07
   title: "Blockchain Conference San Francisco"
   venue: "Fort Mason"
   address: "2 Marina Blvd"
@@ -62,14 +62,6 @@
   country: "Russia"
   link: "http://bitcoinconf.moscow/en"
 
-- date: 2016-04-10
-  title: "Inside Bitcoins New York"
-  venue: "Javits Convention Center"
-  address: "655 W 34th St"
-  city: "New York"
-  country: "United States"
-  link: "http://insidebitcoins.com/new-york/2016?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibny"
-
 - date: 2016-05-02
   title: "Blockchain Technology Conference (BTC) 2016"
   venue: "Marriott Marquis, Times Square, New York City"
@@ -78,10 +70,3 @@
   country: "USA"
   link: "http://www.btc2016.co/"
 
-- date: 2016-05-24
-  title: "Inside Bitcoins Hong Kong"
-  venue: "Hong Kong Convention & Exhibition Centre"
-  address: "1 Expo Drive, Wan Chai"
-  city: "Hong Kong"
-  country: "China"
-  link: "http://insidebitcoins.com/hong-kong/2016"

en/bitcoin-core/capacity-increases-faq.md

@@ -19,6 +19,14 @@ Other versions: [Italiano](/it/bitcoin-core/capacity-increases-faq) \| [简体
 1. toc
 {:toc}
 
+## What is the roadmap? {#roadmap}
+
+**[Capacity increases for the Bitcoin system][roadmap]**, written by Gregory
+Maxwell and published 7 Dec 2015 to the bitcoin-dev mailing list. A
+[statement][] supporting the roadmap has been signed by developers who
+([according to GitHub][commit stats]) generated more than [90% of all
+commits][commit spreadsheet] to Bitcoin Core in 2015.
+
 ## What specific technologies are included in the roadmap, and when can we expect them?  {#roadmap-dates}
 
 New technology will be deployed when it is ready and has been tested.
@@ -29,7 +37,7 @@ specific improvements described in the [roadmap][].
 | Feb 2016 | 0.12.0 | [libsecp256k1 verification][] |
 | Feb 2016 | | Segregated witness feature complete & ready for general review |
 | Mar 2016\* | 0.12.x | Deploy OP_CHECKSEQUENCEVERIFY (BIPs [68][BIP68] & [112][BIP112]) + [BIP113][] as first [BIP9][] versionbits soft fork |
-| April 2016\* |  0.12.x |  Deploy segregated witness |
+| April 2016\* |  0.12.x |  Segregated witness deployment including [block size increase](#segwit-size) |
 | 2016 | | Weak blocks, IBLTs, or both |
 
 \* Dates with an asterisk are when we expect to release soft fork-ready code. The code will not be released until it has been well reviewed, and the actual fork will take time to activate ([BIP66][] activated in July 2015 after a few months; [BIP65][] activated in Dec 2015 after only 5 weeks).
@@ -359,6 +367,8 @@ To get specific suggestions on how you can help, please join the
 [bitcoin core contributor]: /en/bitcoin-core/
 [Bitcoin relay network]: http://bitcoinrelaynetwork.org/
 [code review]: https://bitcoin.org/en/development#code-review
+[commit spreadsheet]: https://docs.google.com/spreadsheets/d/15jtxuA3dVY5NUuYezZ4d_69ASUMYjqFOMxsF9ZX-BKA/edit?usp=sharing
+[commit stats]: https://github.com/bitcoin/bitcoin/graphs/contributors?from=2015-01-01&to=2015-12-31&type=c
 [estimated savings]: https://www.reddit.com/r/bitcoinxt/comments/3w1i6b/i_attended_scaling_bitcoin_hong_kong_these_are_my/cxtkaih
 [increase in total bandwidth]: https://scalingbitcoin.org/hongkong2015/presentations/DAY1/3_block_propagation_1_rosenbaum.pdf
 [libsecp256k1]: https://github.com/bitcoin/secp256k1
@@ -367,5 +377,6 @@ To get specific suggestions on how you can help, please join the
 [miners' panel]: https://youtu.be/H-ErmmDQRFs?t=1086
 [payment channel efficiency]: https://scalingbitcoin.org/hongkong2015/presentations/DAY2/1_layer2_2_dryja.pdf
 [previous soft forks]: https://github.com/bitcoin/bips/blob/master/bip-0123.mediawiki#classification-of-existing-bips
+[statement]: /en/bitcoin-core/capacity-increases
 [weak blocks and iblts]: https://www.youtube.com/watch?v=ivgxcEOyWNs&t=1h40m20s
 [q simple raise]: #size-bump