Resolve merge conflict

404.html

@@ -1,4 +1,7 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
 layout: base
 lang: en
 id: index

Makefile

@@ -1,5 +1,5 @@
-## Optional Makefile: only used for testing & maintainer automation;
+## This file is licensed under the MIT License (MIT) available on
-##                    not used to build live site
+## http://opensource.org/licenses/MIT.
 
 S=@  ## Silent: only print errors by default; 
      ## run `make S='' [other args]` to print commands as they're run
@@ -198,6 +198,12 @@ check-for-missing-copyright-licenses:
 ## say MIT license, but it has to say something.) This can be extended
 ## to include other directories by adding them after "_includes/"
 	$S git grep -iL 'This file is licensed' _includes/ | eval $(ERROR_ON_OUTPUT)
+	$S git ls-files | grep -v '^_alerts' \
+          | while read file ; do \
+            if sed -n 1p $$file | grep -q '^---$$' ; then \
+              grep -iL 'This file is licensed' $$file ; \
+            fi ; \
+          done | eval $(ERROR_ON_OUTPUT)
 
 check-for-missing-rpc-summaries:
 ## Make sure the Quick Reference section has a summary for each RPC we

README.md

@@ -408,6 +408,9 @@ recommend naming it after the release, such as `0.10.0.md`
 Then copy in the following YAML header (the part between the three dashes, ---):
 ~~~
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
 ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value)
 required_version: 0.10.0
 ## Optional release date.  May be filled in hours/days after a release

_alerts/2015-07-04-spv-mining.md

@@ -1,4 +1,7 @@
 ---
+## This file is licensed under the MIT License (MIT) available on
+## http://opensource.org/licenses/MIT.
+
 title: "Some Miners Generating Invalid Blocks"
 alias: "spv-mining"
 active: false

_events.yml

@@ -174,6 +174,14 @@
   country: "United States"
   link: "http://www.imtconferences.com/mtbit/"
 
+- date: 2015-12-14
+  title: "Inside Bitcoins San Diego"
+  venue: "San Diego Convention Center"
+  address: "111 W. Harbor Drive"
+  city: "San Diego"
+  country: "United States"
+  link: "http://insidebitcoins.com/san-diego/2015?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibsd"
+
 - date: 2016-04-04
   title: "Money 20/20 Europe"
   venue: "Bella Center"

_includes/layout/base/breadcrumbs.html

@@ -0,0 +1,28 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div class="breadcrumbs">
+  {% for crumb in page.breadcrumbs %}
+    {% if forloop.last %}
+      {% case crumb %}
+        {% when "GLOSSARY_ENTRY_TITLE" %}
+          {% comment %} ## Only show first synonym in crumb ## {% endcomment %}
+          {% for synonym in page.required.synonyms_shown_in_glossary_capitalize_first_letter %}
+            {% if forloop.first %}{{synonym}}{% endif %}
+          {% endfor %}
+        {% else %}{{crumb}}
+      {% endcase %}
+    {% else %}
+      {% case crumb %}
+        {% comment %}/// Alphabetical order by crumb \\\{% endcomment %}
+        {% when "bitcoin" %}<a href="/{{page.lang}}/">{% translate bitcoin vocabulary %}</a>
+        {% when "dev docs" %}<a href="/en/developer-documentation">Dev Docs</a>
+        {% when "glossary" %}<a href="/en/developer-glossary">Glossary</a>
+        {% else %}{% die "Breadcrumb not found in _includes/layout/breadcrumbs.html" %}
+      {% endcase %}
+      &gt;
+    {% endif %}
+  {% endfor %}
+</div>

_includes/layout/base/content.html

@@ -0,0 +1,8 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div id="content" class="content">
+  {{ content }}
+</div>

_includes/layout/base/footer-js.html

@@ -0,0 +1,9 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<script type="text/javascript">
+  fallbackSVG();
+  addAnchorLinks();
+</script>

_includes/layout/base/footer-license.html

@@ -0,0 +1,6 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div class="footerlicense">© Bitcoin Project 2009-{{ site.time | date: '%Y' }} {% translate footer layout %}</div>

_includes/layout/base/footer-menu.html

@@ -0,0 +1,18 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div class="footermenu">
+  <a href="/en/alerts" class="statusmenu{% if site.STATUS == 1 %} alert{% endif %}">Network Status</a>
+  <a href="/{{ page.lang }}/{% translate legal url %}">{% translate menu-legal layout %}</a>
+  {% case page.lang %}
+  {% when 'ar' or 'es' or 'sl' %}
+  <a href="/en/privacy">Privacy</a>
+  {% else %}
+  <a href="/{{ page.lang }}/{% translate privacy url %}">{% translate menu-privacy layout %}</a>
+  {% endcase %}
+  <a href="/{{ page.lang }}/{% translate press url %}">{% translate menu-press layout %}</a>
+  <a href="/{{ page.lang }}/{% translate about-us url %}">{% translate menu-about-us layout %}</a>
+  <a href="/en/blog">Blog</a>
+</div>

_includes/layout/base/footer-sponsor.html

@@ -0,0 +1,8 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div class="footersponsor">
+  <div><span>{% translate sponsor layout %}</span> <a href="https://bitcoinfoundation.org/"><img src="/img/brand/bitcoinfoundation.png" alt="Bitcoin Foundation"></a></div>
+</div>

_includes/layout/base/head-language-dropdown.html

@@ -0,0 +1,17 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+<ul class="lang">
+  <li><a>{{ site.langs[page.lang] }}</a>
+  <ul>
+    <li><ul>
+      {% assign i = 0 %}{% assign c = site.langsorder.size | divided_by: 2 | plus: 1 %}
+      {% for lang in site.langsorder %}{% assign mod = i | modulo: c %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' class="active"'%}{% endif %}
+        {% if mod == 0 and i != 0 %}</ul></li><li><ul>{% endif %}
+          <li><a href="/{{ lang }}/{% translate {{page.id}} url {{lang}} %}"{{ active }}>{{ site.langs[lang] }}</a></li>
+        {% assign i = i | plus: 1 %}{% endfor %}
+      </ul></li>
+    </ul>
+  </li>
+</ul>

_includes/layout/base/head-language-select.html

@@ -0,0 +1,9 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+<div id="langselect" class="langselect"><select onchange="window.location=this.value;">
+    {% for lang in site.langsorder %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' selected="selected"'%}{% endif %}
+          <option value="/{{ lang }}/{% translate {{page.id}} url {{lang}} %}"{{ active }}>{{ site.langs[lang] }}</option>
+    {% endfor %}
+</select></div>

_includes/layout/base/head-logo.html

@@ -0,0 +1,6 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<a class="logo" href="/{{ page.lang }}/"><img src="/img/icons/logotop.svg" alt="Bitcoin"></a>

_includes/layout/base/head-menu.html

@@ -0,0 +1,35 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<ul id="menusimple" class="menusimple" onclick="mobileMenuHover(event);" ontouchstart="mobileMenuHover(event);">
+  <li><a>{% translate menu-intro layout %}</a>
+    <ul>
+      <li{% if page.id == 'bitcoin-for-individuals' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-individuals url %}">{% translate menu-bitcoin-for-individuals layout %}</a></li>
+      <li{% if page.id == 'bitcoin-for-businesses' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-businesses url %}">{% translate menu-bitcoin-for-businesses layout %}</a></li>
+      <li{% if page.id == 'bitcoin-for-developers' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-developers url %}">{% translate menu-bitcoin-for-developers layout %}</a></li>
+      <li{% if page.id == 'getting-started' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate getting-started url %}">{% translate menu-getting-started layout %}</a></li>
+      <li{% if page.id == 'how-it-works' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate how-it-works url %}">{% translate menu-how-it-works layout %}</a></li>
+      <li{% if page.id == 'you-need-to-know' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate you-need-to-know url %}">{% translate menu-you-need-to-know layout %}</a></li>
+    </ul>
+  </li>
+  <li><a>{% translate menu-resources layout %}</a>
+    <ul>
+      <li{% if page.id == 'resources' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate resources url %}">{% translate menu-resources layout %}</a></li>
+      <li{% if page.id == 'community' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate community url %}">{% translate menu-community layout %}</a></li>
+      {% if page.lang == 'en' %}<li{% if page.id == 'developer-documentation' %} class="active"{% endif %}><a href="/en/developer-documentation">Documentation</a></li>{% endif %}
+      <li{% if page.id == 'vocabulary' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate vocabulary url %}">{% translate menu-vocabulary layout %}</a></li>
+      <li{% if page.id == 'events' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate events url %}">{% translate menu-events layout %}</a></li>
+    </ul>
+  </li>
+  <li{% if page.id == 'innovation' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate innovation url %}">{% translate menu-innovation layout %}</a></li>
+  <li><a>{% translate menu-participate layout %}</a>
+    <ul>
+      <li{% if page.id == 'support-bitcoin' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate support-bitcoin url %}">{% translate menu-support-bitcoin layout %}</a>
+      {% if page.lang == 'en' %}<li{% if page.id == 'full-node' %} class="active"{% endif %}><a href="/en/full-node">Running a full node</a></li>{% endif %}
+      <li{% if page.id == 'development' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate development url %}">{% translate menu-development layout %}</a></li>
+    </ul>
+  </li>
+  <li{% if page.id == 'faq' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate faq url %}">{% translate menu-faq layout %}</a></li>
+</ul>

_includes/layout/base/head-mobile-menu.html

@@ -0,0 +1,6 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<a id="menumobile" class="menumobile" onclick="mobileMenuShow(event);" ontouchstart="mobileMenuShow(event);"></a>

_includes/layout/base/html-head.html

@@ -0,0 +1,19 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<meta property="og:image" content="https://bitcoin.org/img/icons/opengraph.png" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+<title>{% capture title %}{% translate title %}{% endcapture %}{% if title != '' %}{{ title }}{% else %}{{ page.title }}{% endif %}</title>
+{% capture metadescription %}{% translate metadescription %}{% endcapture %}{% if metadescription != '' %}<meta name="description" content="{{ metadescription }}">{% endif %}
+{% lesscss main.less %}
+<!--[if lt IE 8]>{% lesscss ie.css %}<script type="text/javascript" src="/js/ie.js"></script><![endif]-->
+<!--[if IE 8]>{% lesscss ie8.less %}<![endif]-->
+{% if page.lang == 'ar' or page.lang == 'fa' %}{% lesscss rtl.less %}{% endif %}
+{% if page.lang == 'bg' or page.lang == 'el' or page.lang == 'ko' or page.lang == 'hi' or page.lang == 'pl' or page.lang == 'sl' or page.lang == 'ro' or page.lang == 'ru' or page.lang == 'tr' or page.lang == 'uk' or page.lang == 'zh_CN' or page.lang == 'zh_TW' %}{% lesscss sans.less %}{% endif %}
+<script type="text/javascript" src="/js/base.js"></script>
+{% if page.id != 'download' %}<script type="text/javascript" src="/js/main.js"></script>{% endif %}
+<link rel="shortcut icon" href="/favicon.png">
+<link rel="apple-touch-icon-precomposed" href="/img/icons/logo_ios.png"/>

_includes/layout/base/pagetop-alert.html

@@ -0,0 +1,10 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+{% if site.ALERT %}
+  <div class="banner-message {{ site.ALERTCLASS }}">
+    <a href="{{ site.ALERTURL }}"><span>{{ site.ALERT }}</span></a>
+  </div>
+{% endif %}

_includes/layout/base/pagetop-detect-mobile.html

@@ -0,0 +1,6 @@
+{% comment %}
+This file is licensed under the MIT License (MIT) available on
+http://opensource.org/licenses/MIT.
+{% endcomment %}
+
+<div id="detectmobile" class="detectmobile"></div>

_layouts/base.html

@@ -4,109 +4,34 @@
 ---
 <!DOCTYPE HTML>
 <html lang="{{ page.lang }}">
+
 <head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+{% include layout/base/html-head.html %}
-<meta property="og:image" content="https://bitcoin.org/img/icons/opengraph.png" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
-<title>{% capture title %}{% translate title %}{% endcapture %}{% if title != '' %}{{ title }}{% else %}{{ page.title }}{% endif %}</title>
-{% capture metadescription %}{% translate metadescription %}{% endcapture %}{% if metadescription != '' %}<meta name="description" content="{{ metadescription }}">{% endif %}
-{% lesscss main.less %}
-<!--[if lt IE 8]>{% lesscss ie.css %}<script type="text/javascript" src="/js/ie.js"></script><![endif]-->
-<!--[if IE 8]>{% lesscss ie8.less %}<![endif]-->
-{% if page.lang == 'ar' or page.lang == 'fa' %}{% lesscss rtl.less %}{% endif %}
-{% if page.lang == 'bg' or page.lang == 'el' or page.lang == 'ko' or page.lang == 'hi' or page.lang == 'pl' or page.lang == 'sl' or page.lang == 'ro' or page.lang == 'ru' or page.lang == 'tr' or page.lang == 'uk' or page.lang == 'zh_CN' or page.lang == 'zh_TW' %}{% lesscss sans.less %}{% endif %}
-<script type="text/javascript" src="/js/base.js"></script>
-{% if page.id != 'download' %}<script type="text/javascript" src="/js/main.js"></script>{% endif %}
-<link rel="shortcut icon" href="/favicon.png">
-<link rel="apple-touch-icon-precomposed" href="/img/icons/logo_ios.png"/>
 </head>
+
 <body>
-<div id="detectmobile" class="detectmobile"></div>
+{% include layout/base/pagetop-detect-mobile.html %}
-{% if site.ALERT %}
+{% include layout/base/pagetop-alert.html %}
-  <div class="banner-message {{ site.ALERTCLASS }}">
+
-    <a href="{{ site.ALERTURL }}"><span>{{ site.ALERT }}</span></a>
+<div class="head"><div>
+  {% include layout/base/head-language-dropdown.html %}
+  {% include layout/base/head-mobile-menu.html %}
+  {% include layout/base/head-logo.html %}
+  {% include layout/base/head-language-select.html %}
+  {% include layout/base/head-menu.html %}
+</div></div>
+
+<div class="body">
+  {% include layout/base/breadcrumbs.html %}
+  {% include layout/base/content.html %}
+  <div class="footer">
+    {% include layout/base/footer-menu.html %}
+    {% include layout/base/footer-sponsor.html %}
+    {% include layout/base/footer-license.html %}
   </div>
-{% endif %}
+</div>
-  <div class="head"><div>
+
-    <ul class="lang">
+{% include layout/base/footer-js.html %}
-      <li><a>{{ site.langs[page.lang] }}</a>
-      <ul>
-        <li><ul>
-        {% assign i = 0 %}{% assign c = site.langsorder.size | divided_by: 2 | plus: 1 %}
-        {% for lang in site.langsorder %}{% assign mod = i | modulo: c %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' class="active"'%}{% endif %}
-        {% if mod == 0 and i != 0 %}</ul></li><li><ul>{% endif %}
-          <li><a href="/{{ lang }}/{% translate {{page.id}} url {{lang}} %}"{{ active }}>{{ site.langs[lang] }}</a></li>
-        {% assign i = i | plus: 1 %}{% endfor %}
-        </ul></li>
-      </ul>
-      </li>
-    </ul>
-    <a id="menumobile" class="menumobile" onclick="mobileMenuShow(event);" ontouchstart="mobileMenuShow(event);"></a>
-    <a class="logo" href="/{{ page.lang }}/"><img src="/img/icons/logotop.svg" alt="Bitcoin"></a>
-    <div id="langselect" class="langselect"><select onchange="window.location=this.value;">
-    {% for lang in site.langsorder %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' selected="selected"'%}{% endif %}
-          <option value="/{{ lang }}/{% translate {{page.id}} url {{lang}} %}"{{ active }}>{{ site.langs[lang] }}</option>
-    {% endfor %}
-    </select></div>
-    <ul id="menusimple" class="menusimple" onclick="mobileMenuHover(event);" ontouchstart="mobileMenuHover(event);">
-      <li><a>{% translate menu-intro layout %}</a>
-        <ul>
-          <li{% if page.id == 'bitcoin-for-individuals' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-individuals url %}">{% translate menu-bitcoin-for-individuals layout %}</a></li>
-          <li{% if page.id == 'bitcoin-for-businesses' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-businesses url %}">{% translate menu-bitcoin-for-businesses layout %}</a></li>
-          <li{% if page.id == 'bitcoin-for-developers' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate bitcoin-for-developers url %}">{% translate menu-bitcoin-for-developers layout %}</a></li>
-          <li{% if page.id == 'getting-started' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate getting-started url %}">{% translate menu-getting-started layout %}</a></li>
-          <li{% if page.id == 'how-it-works' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate how-it-works url %}">{% translate menu-how-it-works layout %}</a></li>
-          <li{% if page.id == 'you-need-to-know' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate you-need-to-know url %}">{% translate menu-you-need-to-know layout %}</a></li>
-        </ul>
-      </li>
-      <li><a>{% translate menu-resources layout %}</a>
-        <ul>
-          <li{% if page.id == 'resources' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate resources url %}">{% translate menu-resources layout %}</a></li>
-          <li{% if page.id == 'community' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate community url %}">{% translate menu-community layout %}</a></li>
-          {% if page.lang == 'en' %}<li{% if page.id == 'developer-documentation' %} class="active"{% endif %}><a href="/en/developer-documentation">Documentation</a></li>{% endif %}
-          <li{% if page.id == 'vocabulary' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate vocabulary url %}">{% translate menu-vocabulary layout %}</a></li>
-          <li{% if page.id == 'events' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate events url %}">{% translate menu-events layout %}</a></li>
-        </ul>
-      </li>
-      <li{% if page.id == 'innovation' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate innovation url %}">{% translate menu-innovation layout %}</a></li>
-      <li><a>{% translate menu-participate layout %}</a>
-        <ul>
-          <li{% if page.id == 'support-bitcoin' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate support-bitcoin url %}">{% translate menu-support-bitcoin layout %}</a>
-          {% if page.lang == 'en' %}<li{% if page.id == 'full-node' %} class="active"{% endif %}><a href="/en/full-node">Running a full node</a></li>{% endif %}
-          <li{% if page.id == 'development' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate development url %}">{% translate menu-development layout %}</a></li>
-        </ul>
-      </li>
-      <li{% if page.id == 'faq' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate faq url %}">{% translate menu-faq layout %}</a></li>
-    </ul>
-  </div></div>
-  <div class="body">
-    <div id="content" class="content">
-    {{ content }}
-    </div>
-    <div class="footer">
-    <div class="footermenu">
-    <a href="/en/alerts" class="statusmenu{% if site.STATUS == 1 %} alert{% endif %}">Network Status</a>
-    <a href="/{{ page.lang }}/{% translate legal url %}">{% translate menu-legal layout %}</a>
-    {% case page.lang %}
-    {% when 'ar' or 'es' or 'sl' %}
-    <a href="/en/privacy">Privacy</a>
-    {% else %}
-    <a href="/{{ page.lang }}/{% translate privacy url %}">{% translate menu-privacy layout %}</a>
-    {% endcase %}
-    <a href="/{{ page.lang }}/{% translate press url %}">{% translate menu-press layout %}</a>
-    <a href="/{{ page.lang }}/{% translate about-us url %}">{% translate menu-about-us layout %}</a>
-    <a href="/en/blog">Blog</a>
-    </div>
-    <div class="footersponsor">
-      <div><span>{% translate sponsor layout %}</span> <a href="https://bitcoinfoundation.org/"><img src="/img/brand/bitcoinfoundation.png" alt="Bitcoin Foundation"></a></div>
-    </div>
-    <div class="footerlicense">© Bitcoin Project 2009-{{ site.time | date: '%Y' }} {% translate footer layout %}</div>
-    </div>
-  </div>
-  <script type="text/javascript">
-    fallbackSVG();
-    addAnchorLinks();
-  </script>
 </body>
 
 </html>

_layouts/glossary_entry.html

@@ -4,6 +4,11 @@
 
 layout: base
 lang: en
+breadcrumbs:
+  - bitcoin
+  - dev docs
+  - glossary
+  - GLOSSARY_ENTRY_TITLE
 ---
 <link rel="stylesheet" href="/css/jquery-ui.min.css">
 

_less/screen.less

@@ -363,6 +363,10 @@ table td,table th{
 	display:block;
 }
 
+.breadcrumbs {
+	font-size: 75%;
+	padding-left: 10px;
+}
 .content{
 	position:relative;
 	padding:30px 40px 40px 40px;

_posts/2015-06-16-hard-fork-policy.md

@@ -1,4 +1,7 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
 type: posts
 layout: post
 lang: en

_posts/2015-06-23-repository-move.md

@@ -1,4 +1,7 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
 type: posts
 layout: post
 lang: en

_releases/0.10.0.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value)
 required_version: 0.10.0
 ## Optional release date.  May be filled in hours/days after a release

_releases/0.10.1.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value)
 required_version: 0.10.1
 ## Optional release date.  May be filled in hours/days after a release

_releases/0.10.2.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value)
 required_version: 0.10.2
 ## Optional release date.  May be filled in hours/days after a release

_releases/0.11.0.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value)
 required_version: 0.11.0
 ## Optional release date.  May be filled in hours/days after a release

_releases/0.3.21.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.3.21
 optional_date: 2011-04-27

_releases/0.3.22.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.3.22
 optional_date: 2011-06-05

_releases/0.3.23.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.3.23
 optional_date: 2011-06-14

_releases/0.3.24.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.3.24
 optional_date: 2011-07-08

_releases/0.4.0.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.4.0
 optional_date: 2011-09-23

_releases/0.5.0.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.5.0
 optional_date: 2011-11-21

_releases/0.5.1.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.5.1
 optional_date: 2011-12-15

_releases/0.5.2.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.5.2
 optional_date: 2012-01-09

_releases/0.5.3.1.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.5.3.1
 optional_date: 2012-03-16

_releases/0.5.3.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.5.3
 optional_date: 2012-03-14

_releases/0.6.0.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.6.0
 optional_date: 2012-03-30

_releases/0.6.1.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.6.1
 optional_date: 2012-05-04

_releases/0.6.2.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.6.2
 optional_date: 2012-05-08

_releases/0.6.3.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.6.3
 optional_date: 2012-06-25

_releases/0.7.0.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.7.0
 optional_date: 2012-09-17

_releases/0.7.1.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.7.1
 optional_date: 2012-10-19

_releases/0.7.2.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.7.2
 optional_date: 2012-12-14

_releases/0.8.0.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.8.0
 optional_date: 2013-02-19

_releases/0.8.1.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.8.1
 optional_date: 2013-03-18

_releases/0.8.2.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.8.2
 optional_date: 2013-05-29

_releases/0.8.3.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.8.3
 optional_date: 2013-06-25

_releases/0.8.4.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.8.4
 optional_date: 2013-09-03

_releases/0.8.5.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.8.5
 optional_date: 2013-09-13

_releases/0.8.6.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.8.6
 optional_date: 2013-12-09

_releases/0.9.0.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.9.0
 optional_date: 2014-03-19

_releases/0.9.1.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.9.1
 optional_date: 2014-04-08

_releases/0.9.2.1.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.9.2.1
 optional_date: 2014-06-19

_releases/0.9.2.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.9.2
 optional_date: 2014-06-16

_releases/0.9.3.md

@@ -1,4 +1,9 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+# Text originally from Bitcoin Core project
+# Metadata and small formatting changes from Bitcoin.org project
+
 ## Please see _releases/0.10.0.md for a release template
 required_version: 0.9.3
 optional_date: 2014-09-27

_templates/privacy.html

@@ -1,4 +1,7 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
 layout: base
 id: privacy
 ---

_translations/en.yml

@@ -706,6 +706,7 @@ en:
     footer: "Released under the <a href=\"http://opensource.org/licenses/mit-license.php\" target=\"_blank\">MIT license</a>"
     sponsor: "A community website sponsored by"
     getstarted: "Get started with Bitcoin"
+    bitcoin-core: "Bitcoin Core"
   url:
     about-us: about-us
     bitcoin-for-developers: bitcoin-for-developers

en/developer-documentation.md

@@ -6,6 +6,9 @@ layout: base
 lang: en
 id: developer-documentation
 title: "Developer Documentation - Bitcoin"
+breadcrumbs:
+  - bitcoin
+  - Developer Documentation
 ---
 <link rel="stylesheet" href="/css/jquery-ui.min.css">
 

en/developer-examples.md

@@ -6,6 +6,10 @@ layout: base
 lang: en
 id: developer-examples
 title: "Developer Examples - Bitcoin"
+breadcrumbs:
+  - bitcoin
+  - dev docs
+  - Examples
 ---
 <link rel="stylesheet" href="/css/jquery-ui.min.css">
 

en/developer-glossary.html

@@ -5,6 +5,10 @@
 title: Developer Glossary - Bitcoin
 layout: base
 lang: en
+breadcrumbs:
+  - bitcoin
+  - dev docs
+  - Glossary
 ---
 <link rel="stylesheet" href="/css/jquery-ui.min.css">
 

en/developer-guide.md

@@ -6,6 +6,10 @@ layout: base
 lang: en
 id: developer-guide
 title: "Developer Guide - Bitcoin"
+breadcrumbs:
+  - bitcoin
+  - dev docs
+  - Guide
 ---
 <link rel="stylesheet" href="/css/jquery-ui.min.css">
 

en/developer-reference.md

@@ -6,6 +6,10 @@ layout: base
 lang: en
 id: developer-reference
 title: "Developer Reference - Bitcoin"
+breadcrumbs:
+  - bitcoin
+  - dev docs
+  - Reference
 ---
 <link rel="stylesheet" href="/css/jquery-ui.min.css">
 

js/events.js

@@ -1,4 +1,7 @@
 ---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
 layout: null
 ---