diff --git a/Makefile b/Makefile index 3d328c36..4136bb5f 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,8 @@ pre-build-tests-fast: check-for-non-ascii-urls check-for-wrong-filename-assignme check-for-missing-rpc-summaries \ check-for-missing-copyright-licenses \ check-bundle \ - check-for-english-in-en-dir + check-for-english-in-en-dir \ + check-for-consistent-bitcoin-core-titles ## Post-build tests which, aggregated together, take less than 10 seconds to run on a typical PC post-build-tests-fast: check-for-build-errors ensure-each-svg-has-a-png check-for-liquid-errors \ @@ -151,7 +152,7 @@ check-for-non-ascii-urls: ## characters or spaces. $S find _translations -name '*.yml' -type f | while read file \ ; do grep -H . $$file | sed -n -e '/url:/,$$p' \ - | grep -P ': +[a-z0-9\-]+: +.*([^\x00-\x7f]|[^a-z0-9\-"]).*$$' \ + | grep -P ': +[a-z0-9\-]+: +.*([^\x00-\x7f]|[^a-z0-9\/\-"]).*$$' \ ; done | eval $(ERROR_ON_OUTPUT) check-for-broken-kramdown-tables: @@ -278,3 +279,8 @@ check-for-javascript-in-svgs: check-for-english-in-en-dir: ## All pages must have page.lang set to work properly with the site templates $S grep -rl -- '---' en/ | xargs grep -L '^ *lang: *en' | eval $(ERROR_ON_OUTPUT) + +check-for-consistent-bitcoin-core-titles: +## Ensure all page titles in the en/bitcoin-core/ hierarchy mention +## Bitcoin Core + $S grep -r -L '^title:.*Bitcoin Core' en/bitcoin-core/ | eval $(ERROR_ON_OUTPUT) diff --git a/_config.yml b/_config.yml index 5eba0ece..3f2945c9 100644 --- a/_config.yml +++ b/_config.yml @@ -208,6 +208,23 @@ kramdown: coderay_bold_every: 10 coderay_css: style +text: + ## Values last updated 2015-08-26 + ## All variable names must indicate unit type for easy translation of adjacent text, + ## such as: subsidy_in_decimal_bitcoins or + ## bitcoin_org_docs_maintainer_email_link + subsidy_in_decimal_bitcoins: 25 + chain_gb: 50 + bitcoin_datadir_gb: 60 + bitcoin_datadir_gb_pruned: 3 + total_tx_count_in_millions: 40 + typical_ibd_time_in_hours: 4 + typical_144_block_catchup_time_in_minutes: 5 + bitcoin_org_docs_maintainer_email_link: 'Dave Harding' + ## Before updating this, verify all assertions are still correct: git grep site.text.assertion_month + ## Use ISO-8601 format, but feel free to round to the nearest month + assertion_month: 2015-09-01 + ## Items in devsearches will appear in the search box in the order they ## are listed below. For the top-level ("Glossary", "RPCs", etc...) this diff --git a/_includes/bitcoin-core/bitcoin-core-possible-problems.md b/_includes/bitcoin-core/bitcoin-core-possible-problems.md new file mode 100644 index 00000000..2fb02bf6 --- /dev/null +++ b/_includes/bitcoin-core/bitcoin-core-possible-problems.md @@ -0,0 +1,27 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +- **Legal:** Bitcoin use is [prohibited or restricted in some + areas.](https://en.wikipedia.org/wiki/Legality_of_bitcoin_by_country) + +- **Bandwidth limits**: Some Internet plans will charge an additional + amount for any excess upload bandwidth used that isn't included in + the plan. Worse, some providers may terminate your connection without + warning because of overuse. We advise that you check whether your + Internet connection is subjected to such limitations and monitor your + bandwidth use so that you can stop Bitcoin Core before you reach your + upload limit. + +- **Anti-virus:** Several people have placed parts of known computer + viruses in the Bitcoin block chain. This block chain data can't infect + your computer, but some anti-virus programs quarantine the data + anyway, making it more difficult to run Bitcoin Core. This problem mostly + affects computers running Windows. + +- **Attack target:** Bitcoin Core powers the Bitcoin peer-to-peer + network, so people who want to disrupt the network may + attack Bitcoin Core users in ways that will affect other things + you do with your computer, such as an attack that limits your + available download bandwidth. diff --git a/_includes/bitcoin-core/core-committers.html b/_includes/bitcoin-core/core-committers.html new file mode 100644 index 00000000..1a6b539b --- /dev/null +++ b/_includes/bitcoin-core/core-committers.html @@ -0,0 +1,12 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+
Wladimir J. van der Laan
laanwj@gmail.com
PGP
+
Gavin Andresen
gavinandresen@gmail.com
PGP
+
Jeff Garzik
jgarzik@bitpay.com
PGP
+
Gregory Maxwell
greg@xiph.org
PGP
+
Pieter Wuille
pieter.wuille@gmail.com
PGP
+
diff --git a/_includes/bitcoin-core/download-bitcoin-core.html b/_includes/bitcoin-core/download-bitcoin-core.html new file mode 100644 index 00000000..9cabbef7 --- /dev/null +++ b/_includes/bitcoin-core/download-bitcoin-core.html @@ -0,0 +1,12 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+

{% translate download-bitcoin-core bitcoin-core-overview %} + Windows + Mac + Linux +

+
diff --git a/_includes/layout/base-core/content.html b/_includes/layout/base-core/content.html new file mode 100644 index 00000000..0e82165d --- /dev/null +++ b/_includes/layout/base-core/content.html @@ -0,0 +1,10 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+
+ {{ content }} +
+
diff --git a/_includes/layout/base-core/footer-js-extra.html b/_includes/layout/base-core/footer-js-extra.html new file mode 100644 index 00000000..5fb6d9f9 --- /dev/null +++ b/_includes/layout/base-core/footer-js-extra.html @@ -0,0 +1,9 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +{% comment %}{% endcomment %} +{% if page.id != 'download' %} + +{% endif %} diff --git a/_includes/layout/base-core/head-logo.html b/_includes/layout/base-core/head-logo.html new file mode 100644 index 00000000..d79e5cf1 --- /dev/null +++ b/_includes/layout/base-core/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 %} + + diff --git a/_includes/layout/base-core/head-menu.html b/_includes/layout/base-core/head-menu.html new file mode 100644 index 00000000..1a9e578c --- /dev/null +++ b/_includes/layout/base-core/head-menu.html @@ -0,0 +1,29 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + diff --git a/_includes/layout/base-core/html-head-extra.html b/_includes/layout/base-core/html-head-extra.html new file mode 100644 index 00000000..7aac3466 --- /dev/null +++ b/_includes/layout/base-core/html-head-extra.html @@ -0,0 +1,10 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +{% comment %}{% endcomment %} +{% if page.id != 'download' %} + + +{% endif %} diff --git a/_includes/layout/base-core/html-head-jquery-css.html b/_includes/layout/base-core/html-head-jquery-css.html new file mode 100644 index 00000000..749cd7a5 --- /dev/null +++ b/_includes/layout/base-core/html-head-jquery-css.html @@ -0,0 +1,9 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. + + +{% endcomment %} + + diff --git a/_includes/layout/base/breadcrumbs.html b/_includes/layout/base/breadcrumbs.html index fd2f430d..60425bef 100644 --- a/_includes/layout/base/breadcrumbs.html +++ b/_includes/layout/base/breadcrumbs.html @@ -12,11 +12,20 @@ http://opensource.org/licenses/MIT. {% for synonym in page.required.synonyms_shown_in_glossary_capitalize_first_letter %} {% if forloop.first %}{{synonym}}{% endif %} {% endfor %} + {% when "RELEASE" %} + {% comment %}{% endcomment %} + {{page.required_version}} {% else %}{{crumb}} {% endcase %} {% else %} {% case crumb %} {% comment %}/// Alphabetical order by crumb \\\{% endcomment %} + {% when "bcc" %}Core + {% when "bcc contribute" %}Contribute + {% when "bcc documentation" %}Documentation + {% when "bcc features" %}Features + {% when "bcc help" %}Help + {% when "bcc news" %}News {% when "bitcoin" %}{% translate bitcoin vocabulary %} {% when "dev docs" %}Dev Docs {% when "glossary" %}Glossary diff --git a/_includes/layout/base/head-menu.html b/_includes/layout/base/head-menu.html index af454160..b537c214 100644 --- a/_includes/layout/base/head-menu.html +++ b/_includes/layout/base/head-menu.html @@ -3,7 +3,7 @@ This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %} -