Merge branch 'master' into HEAD

Work around issue with site updates.

Tree-SHA512: 6039d0f039798b0777070e7f3a6fe1ee68fa4de2bba33b82e2277c410eb3142ca0a93f950cbf2c7f8a3d39df7c2bada3a2ba692688959a957d77ea18e1e620e3

Author: laanwj

_config.yml

@@ -25,35 +25,7 @@ kramdown:
 # Site owner
 owner:
   name: Bitcoin Core
-  avatar: bio-photo.jpg
-  bio: ""
-  email:
-  disqus-shortname:
   twitter: bitcoincoreorg
-  facebook: #username
-  google:
-    plus: #username
-    analytics: #UA-85008990-1
-    verify:
-    ad-client:
-    ad-slot:
-  bing-verify:
-  github: bitcoin
-  stackoverflow: #123456/username   from a "http://stackoverflow.com/users/123456/username" link
-  linkedin: #username
-  xing: #username
-  instagram: #username
-  lastfm: #username
-  tumblr: #username
-  pinterest: #username
-  foursquare: #username
-  steam: #username
-  dribbble: #username
-  youtube: #username
-  soundcloud: #username
-  weibo: #username
-  flickr: #username
-  codepen: #username
 
 exclude:
   - _config.yml
@@ -62,7 +34,6 @@ exclude:
   - CONTRIBUTING.md
   - CNAME
   - vendor  # Travis CI creates a vendor/ dir with files we shouldn't render
-  - assets/images/assets.yml
   - contrib
   - Makefile
 

_data/authors.yml

@@ -2,40 +2,19 @@
 
 laanwj:
   name: Wladimir van der Laan
-  web:
-  email:
-  bio:
   avatar: https://avatars3.githubusercontent.com/u/126646?v=3&s=460
   twitter: orionwl
   github: laanwj
-  google:
-    plus:
 
 sipa:
   name: Pieter Wuille
-  email:
-  bio:
   avatar: https://avatars2.githubusercontent.com/u/548488?v=3&s=460
   github: sipa
   twitter: pwuille
-  google:
-    plus:
-
-0xadada:
-  name: Ron. A
-  email: [email protected]
-  avatar: https://github.com/0xadada.png
-  github: "0xADADA"
-  twitter: "0xADADA"
-  bio: Software writer, privacy and encryption advocate. Open web enthusiast.
 
 gmaxwell:
   name: Gregory Maxwell
-  email:
-  bio:
   avatar: https://avatars0.githubusercontent.com/u/858454?v=3&s=400
   github: gmaxwell
   twitter:
-  google:
-    plus:
 

_data/binaries.yaml

@@ -1,7 +1,7 @@
 win64zip: "win64.zip"
 win64exe: "win64-setup.exe"
-macdmg: "-osx-signed.dmg"
-mactar: "osx64.tar.gz"
+macdmg: "x86_64-apple-darwin.dmg"
+mactar: "x86_64-apple-darwin.tar.gz"
 lin64: "x86_64-linux-gnu.tar.gz"
 riscv64: "riscv64-linux-gnu"
 ppc64: "powerpc64-linux-gnu"

_data/navigation.yml

@@ -15,31 +15,6 @@ en:
   releases:
     title: "releases"
     url:   "/en/releases/"
-  faq:
-    title: "FAQs"
-    submenu: true
-    tree:
-      capacity-faq:
-        title: "Capacity Increases"
-        url: "/en/2015/12/23/capacity-increases-faq/"
-      segwit-faq:
-        title: "Segwit"
-        url: "/en/2016/01/26/segwit-benefits/"
-      segwit-dev:
-        title: "Segwit dev guide"
-        url: "/en/segwit_wallet_dev/"
-      optin-rbf:
-        title: "Opt-in RBF"
-        url: "/en/faq/optin_rbf/"
-      compact-blocks:
-        title: "Compact Blocks"
-        url: "/en/2016/06/07/compact-blocks-faq/"
-      version-bits:
-        title: "Version Bits (BIP9)"
-        url: "/en/2016/06/08/version-bits-miners-faq/"
-      segwit-upgrade-guide:
-        title: "Segwit upgrade guide"
-        url: "/en/2016/10/27/segwit-upgrade-guide/"
   dev:
     title: "Development"
     submenu: true
@@ -82,31 +57,6 @@ zh_CN:
   releases:
     title: "软件发行"
     url:   "/zh_CN/releases/"
-  faq:
-    title: "常见问题"
-    submenu: true
-    tree:
-      capacity-faq:
-        title: "容量增长"
-        url: "/zh_CN/2015/12/21/系统扩展常见问题解答/"
-      segwit-faq:
-        title: "隔离见证"
-        url: "/zh_CN/2016/01/26/segwit-benefits/"
-      segwit-dev:
-        title: "Segwit dev guide"
-        url: "/en/segwit_wallet_dev/"
-      optin-rbf:
-        title: "使用费用替代方案 opt-in RBF"
-        url: "/zh_CN/faq/optin_rbf/"
-      compact-blocks:
-        title: "压缩区块"
-        url: "/en/2016/06/07/compact-blocks-faq/"
-      version-bits:
-        title: "版本位 (比特币改进协议 9/BIP9)"
-        url: "/zh_CN/2016/06/08/version-bits-miners-faq/"
-      segwit-upgrade-guide:
-        title: "Segwit upgrade guide"
-        url: "/en/2016/10/27/segwit-upgrade-guide/"
   dev:
     title: "开发"
     submenu: true
@@ -149,31 +99,6 @@ zh_TW:
   releases:
     title: "軟件發行"
     url:   "/zh_TW/releases/"
-  faq:
-    title: "FAQs"
-    submenu: true
-    tree:
-      capacity-faq:
-        title: "Capacity Increases"
-        url: "/zh_TW/2015/12/21/系統擴展常見問題解答/"
-      segwit-faq:
-        title: "Segwit"
-        url: "/en/2016/01/26/segwit-benefits/"
-      segwit-dev:
-        title: "Segwit dev guide"
-        url: "/en/segwit_wallet_dev/"
-      optin-rbf:
-        title: "Opt-in RBF"
-        url: "/en/faq/optin_rbf/"
-      compact-blocks:
-        title: "Compact Blocks"
-        url: "/en/2016/06/07/compact-blocks-faq/"
-      version-bits:
-        title: "Version Bits (BIP9)"
-        url: "/en/2016/06/08/version-bits-miners-faq/"
-      segwit-upgrade-guide:
-        title: "Segwit upgrade guide"
-        url: "/en/2016/10/27/segwit-upgrade-guide/"
   dev:
     title: "Development"
     submenu: true
@@ -216,31 +141,6 @@ ja:
   releases:
     title: "リリース"
     url:   "/ja/releases/"
-  faq:
-    title: "FAQ"
-    submenu: true
-    tree:
-      capacity-faq:
-        title: "キャパシティの増加"
-        url: "/en/2015/12/23/capacity-increases-faq/"
-      segwit-faq:
-        title: "Segwit"
-        url: "/ja/2016/01/26/segwit-benefits/"
-      segwit-dev:
-        title: "Segwit開発ガイド"
-        url: "/ja/segwit_wallet_dev/"
-      optin-rbf:
-        title: "Opt-in RBF"
-        url: "/en/faq/optin_rbf/"
-      compact-blocks:
-        title: "Compact Block"
-        url: "/ja/2016/06/07/compact-blocks-faq/"
-      version-bits:
-        title: "Version Bits (BIP9)"
-        url: "/en/2016/06/08/version-bits-miners-faq/"
-      segwit-upgrade-guide:
-        title: "Segwitアップグレードガイド"
-        url: "/en/2016/10/27/segwit-upgrade-guide/"
   dev:
     title: "開発"
     submenu: true
@@ -286,31 +186,6 @@ es:
   releases:
     title: "Versiones"
     url:   "/es/releases/"
-  faq:
-    title: "FAQs"
-    submenu: true
-    tree:
-      capacity-faq:
-        title: "Capacity Increases"  # XXX
-        url: "/en/2015/12/23/capacity-increases-faq/"  # XXX
-      segwit-faq:
-        title: "Segwit"
-        url: "/en/2016/01/26/segwit-benefits/"  # XXX
-      segwit-dev:
-        title: "Segwit dev guide"  # XXX
-        url: "/en/segwit_wallet_dev/"  # XXX
-      optin-rbf:
-        title: "Opt-in RBF"  # XXX
-        url: "/en/faq/optin_rbf/"  # XXX
-      compact-blocks:
-        title: "Compact Blocks"  # XXX
-        url: "/en/2016/06/07/compact-blocks-faq/"  # XXX
-      version-bits:
-        title: "Version Bits (BIP9)"  # XXX
-        url: "/en/2016/06/08/version-bits-miners-faq/"  # XXX
-      segwit-upgrade-guide:
-        title: "Segwit upgrade guide"  # XXX
-        url: "/en/2016/10/27/segwit-upgrade-guide/"  # XXX
   dev:
     title: "Development"  # XXX
     submenu: true

_includes/author-bio.html

@@ -20,25 +20,6 @@
 {% endif %}
 
   <h3 itemprop="name">{{ author.name }}</h3>
-  <p>{{ author.bio }}</p>
-  {% if author.email %}<a href="mailto:{{ author.email }}" class="author-social" target="_blank"><i class="fa fa-fw fa-envelope-square"></i> Email</a>{% endif %}
   {% if author.twitter %}<a href="https://twitter.com/{{ author.twitter }}" class="author-social" target="_blank"><i class="fa fa-fw fa-twitter-square"></i> Twitter</a>{% endif %}
-  {% if author.facebook %}<a href="https://facebook.com/{{ author.facebook }}" class="author-social" target="_blank"><i class="fa fa-fw fa-facebook-square"></i> Facebook</a>{% endif %}
-  {% if author.google.plus %}<a href="http://plus.google.com/+{{ author.google.plus }}" class="author-social" target="_blank"><i class="fa fa-fw fa-google-plus-square"></i> Google+</a>{% endif %}
-  {% if author.linkedin %}<a href="http://linkedin.com/in/{{ author.linkedin }}" class="author-social" target="_blank"><i class="fa fa-fw fa-linkedin-square"></i> LinkedIn</a>{% endif %}
-  {% if author.xing %}<a href="http://www.xing.com/profile/{{ author.xing }}" class="author-social" target="_blank"><i class="fa fa-fw fa-xing-square"></i> XING</a>{% endif %}
-  {% if author.instagram %}<a href="http://instagram.com/{{ author.instagram }}" class="author-social" target="_blank"><i class="fa fa-fw fa-instagram"></i> Instagram</a>{% endif %}
-  {% if author.tumblr %}<a href="http://{{ author.tumblr }}.tumblr.com" class="author-social" target="_blank"><i class="fa fa-fw fa-tumblr-square"></i> Tumblr</a>{% endif %}
   {% if author.github %}<a href="https://github.com/{{ author.github }}" class="author-social" target="_blank"><i class="fa fa-fw fa-github"></i> Github</a>{% endif %}
-  {% if author.stackoverflow %}<a href="https://stackoverflow.com/users/{{ author.stackoverflow }}" class="author-social" target="_blank"><i class="fa fa-fw fa-stack-overflow"></i> Stackoverflow</a>{% endif %}
-  {% if author.lastfm %}<a href="https://lastfm.com/user/{{ author.lastfm }}" class="author-social" target="_blank"><i class="fa fa-fw fa-music"></i> Last.fm</a>{% endif %}
-  {% if author.dribbble %}<a href="http://dribbble.com/{{ author.dribbble }}" class="author-social" target="_blank"><i class="fa fa-fw fa-dribbble"></i> Dribbble</a>{% endif %}
-  {% if author.pinterest %}<a href="http://www.pinterest.com/{{ author.pinterest }}" class="author-social" target="_blank"><i class="fa fa-fw fa-pinterest"></i> Pinterest</a>{% endif %}
-  {% if author.foursquare %}<a href="http://foursquare.com/{{ author.foursquare }}" class="author-social" target="_blank"><i class="fa fa-fw fa-foursquare"></i> Foursquare</a>{% endif %}
-  {% if author.steam %}<a href="http://steamcommunity.com/id/{{ author.steam }}" class="author-social" target="_blank"><i class="fa fa-fw fa-steam-square"></i> Steam</a>{% endif %}
-  {% if author.youtube %}<a href="https://youtube.com/user/{{ author.youtube }}" class="author-social" target="_blank"><i class="fa fa-fw fa-youtube-square"></i> Youtube</a>{% endif %}
-  {% if author.soundcloud %}<a href="http://soundcloud.com/{{ author.soundcloud }}" class="author-social" target="_blank"><i class="fa fa-fw fa-soundcloud"></i> Soundcloud</a>{% endif %}
-  {% if author.weibo %}<a href="http://www.weibo.com/{{ author.weibo }}" class="author-social" target="_blank"><i class="fa fa-fw fa-weibo"></i> Weibo</a>{% endif %}
-  {% if author.flickr %}<a href="http://www.flickr.com/{{ author.flickr }}" class="author-social" target="_blank"><i class="fa fa-fw fa-flickr"></i> Flickr</a>{% endif %}
-  {% if author.codepen %}<a href="http://codepen.io/{{ author.codepen }}" class="author-social" target="_blank"><i class="fa fa-fw fa-codepen"></i> CodePen</a>{% endif %}
 </div>

_includes/disqus_comments.html

@@ -18,10 +18,6 @@
 
 {% include open-graph.html %}
 
-{% if site.owner.google.verify %}<!-- Webmaster Tools verfication -->
-<meta name="google-site-verification" content="{{ site.owner.google.verify }}">{% endif %}
-{% if site.owner.bing-verify %}<meta name="msvalidate.01" content="{{ site.owner.bing-verify }}">{% endif %}
-
 {% assign posts=site.posts |where:"name", page.name %}
 {% for hrefpost in posts %}<link rel="alternate" hreflang="{{ hrefpost.lang }}" href="{{ site.url }}{{ hrefpost.permalink }}" />{% endfor %}
 {% if page.canonical != null %}<link rel="canonical" href="{{ page.canonical }}">{% else %}<link rel="canonical" href="{{ site.url }}{{ page.url }}">{% endif %}