Skip to content

Commit

Permalink
Core: mention separation of concerns from Bitcoin.org
Browse files Browse the repository at this point in the history
  • Loading branch information
harding committed Dec 29, 2015
1 parent 51a5e1c commit 9f94bce
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 3 deletions.
10 changes: 10 additions & 0 deletions _includes/layout/base-core/footer-license.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{% 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 %}<br>
Bitcoin Core pages on Bitcoin.org are <a
href="/en/bitcoin-core/about-site">maintained separately</a> from the
rest of the site.
</div>
16 changes: 16 additions & 0 deletions _includes/layout/base-core/footer-menu.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{% 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 'id' or 'da' or 'de' or 'es' or 'fr' or 'it' or 'hu' or 'nl' or 'pl' or 'pt_BR' or 'ro' or 'sl' or 'sv' or 'tr' or 'el' or 'bg' or 'ru' or 'uk' or 'ar' or 'fa' or 'hi' or 'ko' or 'ja' or 'zh_CN' or 'zh_TW' %}
<a href="/en/privacy">Privacy Policy</a>
{% else %}
<a href="/{{ page.lang }}/{% translate privacy url %}">{% translate menu-privacy layout %}</a>
{% endcase %}
<a href="/en/bitcoin-core/about-site">About</a>
</div>
2 changes: 2 additions & 0 deletions _includes/references.md
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ http://opensource.org/licenses/MIT.
[bcc pulls]: https://github.com/bitcoin/bitcoin/pulls
[bcc tor]: https://en.bitcoin.it/wiki/Tor
[bcc tor hs]: https://en.bitcoin.it/wiki/Tor#Hidden_services
[core github tag]: https://github.com/bitcoin-dot-org/bitcoin.org/labels/Core
[BFGMiner]: https://github.com/luke-jr/bfgminer
[Bitcoin beginners]: http://www.reddit.com/r/bitcoinbeginners
[Bitcoin Core]: https://bitcoin.org/en/download
Expand Down Expand Up @@ -388,6 +389,7 @@ http://opensource.org/licenses/MIT.
[protobuf]: https://developers.google.com/protocol-buffers/
[python-bitcoinlib]: https://github.com/petertodd/python-bitcoinlib
[python-blkmaker]: https://gitorious.org/bitcoin/python-blkmaker
[Satoshi Nakamoto]: https://en.bitcoin.it/wiki/Satoshi_Nakamoto
[setup tor]: https://www.torproject.org/
[SHA256]: https://en.wikipedia.org/wiki/SHA-2
[Stratum mining protocol]: http://mining.bitcoin.cz/stratum-mining
Expand Down
5 changes: 2 additions & 3 deletions _layouts/base-core.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@
{% endif %}
{% include layout/base-core/content.html %}
<div class="footer">
{% include layout/base/footer-menu.html %}
{% include layout/base/footer-sponsor.html %}
{% include layout/base/footer-license.html %}
{% include layout/base-core/footer-menu.html %}
{% include layout/base-core/footer-license.html %}
</div>
</div>

Expand Down
51 changes: 51 additions & 0 deletions en/bitcoin-core/about-site.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
---
# This file is licensed under the MIT License (MIT) available on
# http://opensource.org/licenses/MIT.

layout: base-core
lang: en
id: bitcoin-core-about-site
columns: 1
title: About Site - Bitcoin Core
breadcrumbs:
- bitcoin
- bcc
- About site
---
# About the Bitcoin Core pages on Bitcoin.org

Bitcoin.org hosts several pages about Bitcoin Core as well as the
[Bitcoin Core downloads][bcc download], but the Bitcoin.org and Bitcoin
Core open source projects are run by separate teams.

## History

Bitcoin.org was originally used by [Satoshi Nakamoto][] to host his
[Bitcoin paper][bitcoinpdf]. Soon after, it began linking to
downloadable versions of the original Bitcoin software, making it the
homepage for the Bitcoin program.

New educational content about Bitcoin was added to Bitcoin.org over
time, but that home page remained even when the name of the original
program was changed to Bitcoin Core.

In the years since, the amount of content on Bitcoin.org has continued
to increase. There's more content about Bitcoin Core than ever before
and also more content about other Bitcoin software and resources.

## Separation of concerns

As of Dec 2015, Bitcoin.org has 876 pages in 25 different languages,
but fewer than 100 of those pages belong to Bitcoin Core. The Bitcoin
Core project has no control over those non-Core pages or any polices
enacted on them.

Likewise, content provided through the Bitcoin Core pages is not
necessarily endorsed or supported by the Bitcoin.org contributors.

## Maintenance

Pull requests and issues directly relating to Bitcoin Core are tagged as
*[Core][core github tag]* in the Bitcoin.org repository.

{% include references.md %}

0 comments on commit 9f94bce

Please sign in to comment.