From 9f94bce8c46f615da68a818dbd7ac1a25cf43bf7 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Tue, 29 Dec 2015 01:24:50 -0500 Subject: [PATCH] Core: mention separation of concerns from Bitcoin.org --- .../layout/base-core/footer-license.html | 10 ++++ _includes/layout/base-core/footer-menu.html | 16 ++++++ _includes/references.md | 2 + _layouts/base-core.html | 5 +- en/bitcoin-core/about-site.md | 51 +++++++++++++++++++ 5 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 _includes/layout/base-core/footer-license.html create mode 100644 _includes/layout/base-core/footer-menu.html create mode 100644 en/bitcoin-core/about-site.md diff --git a/_includes/layout/base-core/footer-license.html b/_includes/layout/base-core/footer-license.html new file mode 100644 index 00000000..33189fe8 --- /dev/null +++ b/_includes/layout/base-core/footer-license.html @@ -0,0 +1,10 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
© Bitcoin Project 2009-{{ site.time | date: '%Y' }} {% translate footer layout %}
+Bitcoin Core pages on Bitcoin.org are maintained separately from the +rest of the site. +
diff --git a/_includes/layout/base-core/footer-menu.html b/_includes/layout/base-core/footer-menu.html new file mode 100644 index 00000000..59b5c794 --- /dev/null +++ b/_includes/layout/base-core/footer-menu.html @@ -0,0 +1,16 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+ Network Status + {% translate menu-legal layout %} + {% 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' %} + Privacy Policy + {% else %} + {% translate menu-privacy layout %} + {% endcase %} + About +
diff --git a/_includes/references.md b/_includes/references.md index 78ed320e..2f81fa8a 100644 --- a/_includes/references.md +++ b/_includes/references.md @@ -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 @@ -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 diff --git a/_layouts/base-core.html b/_layouts/base-core.html index 599c2659..4a1d3431 100644 --- a/_layouts/base-core.html +++ b/_layouts/base-core.html @@ -40,9 +40,8 @@ use the base template --> {% endif %} {% include layout/base-core/content.html %}
- {% 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 %}
diff --git a/en/bitcoin-core/about-site.md b/en/bitcoin-core/about-site.md new file mode 100644 index 00000000..89e1475a --- /dev/null +++ b/en/bitcoin-core/about-site.md @@ -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 %}