Skip to content
This repository has been archived by the owner on Jan 25, 2021. It is now read-only.

Commit

Permalink
Fix test failures from revert in fc6049f
Browse files Browse the repository at this point in the history
  • Loading branch information
harding committed Jul 30, 2018
1 parent c19343a commit 6ba0d0b
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Gemfile.lock
Expand Up @@ -43,7 +43,7 @@ GEM
kramdown (1.9.0)
less (2.4.0)
commonjs (~> 0.2.7)
libv8 (3.16.14.13)
libv8 (3.16.14.19)
liquid (3.0.6)
listen (3.0.5)
rb-fsevent (>= 0.9.3)
Expand All @@ -62,8 +62,8 @@ GEM
rouge (1.10.1)
safe_yaml (1.0.4)
sass (3.4.20)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
typhoeus (0.8.0)
ethon (>= 0.8.0)
Expand Down
4 changes: 2 additions & 2 deletions _translations/en.yml
Expand Up @@ -385,7 +385,7 @@ en:
whatisbitcoin: "What is Bitcoin?"
whatisbitcointxt1: "Bitcoin is a consensus network that enables a new payment system and a completely digital money. It is the first decentralized peer-to-peer payment network that is powered by its users with no central authority or middlemen. From a user perspective, Bitcoin is pretty much like cash for the Internet. Bitcoin can also be seen as the most prominent <a href=\"http://financialcryptography.com/mt/archives/001325.html\">triple entry bookkeeping system</a> in existence."
creator: "Who created Bitcoin?"
creatortxt1: "Bitcoin is the first implementation of a concept called \"cryptocurrency\", which was first described in 1998 by Wei Dai on the cypherpunks mailing list, suggesting the idea of a new form of money that uses cryptography to control its creation and transactions, rather than a central authority. The first Bitcoin specification and proof of concept was published in 2009 in a cryptography mailing list by Satoshi Nakamoto. Satoshi left the project in late 2010 without revealing much about himself. The community has since grown exponentially with <a href=\"#development#\">many developers</a> working on Bitcoin."
creatortxt1: "Bitcoin is the first implementation of a concept called \"cryptocurrency\", which was first described in 1998 by Wei Dai on the cypherpunks mailing list, suggesting the idea of a new form of money that uses cryptography to control its creation and transactions, rather than a central authority. The first Bitcoin specification and proof of concept was published in 2009 in a cryptography mailing list by Satoshi Nakamoto. Satoshi left the project in late 2010 without revealing much about himself. The community has since grown exponentially with many developers working on Bitcoin."
creatortxt2: "Satoshi's anonymity often raised unjustified concerns, many of which are linked to misunderstanding of the open-source nature of Bitcoin. The Bitcoin protocol and software are published openly and any developer around the world can review the code or make their own modified version of the Bitcoin software. Just like current developers, Satoshi's influence was limited to the changes he made being adopted by others and therefore he did not control Bitcoin. As such, the identity of Bitcoin's inventor is probably as relevant today as the identity of the person who invented paper."
whocontrols: "Who controls the Bitcoin network?"
whocontrolstxt1: "Nobody owns the Bitcoin network much like no one owns the technology behind email. Bitcoin is controlled by all Bitcoin users around the world. While developers are improving the software, they can't force a change in the Bitcoin protocol because all users are free to choose what software and version they use. In order to stay compatible with each other, all users need to use software complying with the same rules. Bitcoin can only work correctly with a complete consensus among all users. Therefore, all users and developers have a strong incentive to protect this consensus."
Expand Down Expand Up @@ -808,7 +808,7 @@ en:
mining: "Mining"
miningtxt: "You can start <a href=\"http://www.bitcoinmining.com/\">mining bitcoins</a> to help processing transactions. In order to protect the network, you should join smaller mining pools and prefer decentralized pools like <a href=\"http://p2pool.in/\">P2Pool</a> or <a href=\"https://en.bitcoin.it/wiki/Comparison_of_mining_pools\">pools</a> with getblocktemplate (GBT) support."
develop: "Development"
developtxt: "Bitcoin is free software. So if you are a developer, you can use your super-powers to do good and <a href=\"#development#\">improve Bitcoin</a>. Or you can build amazing new services or software that can use Bitcoin."
developtxt: "Bitcoin is free software. So if you are a developer, you can use your super-powers to do good and improve Bitcoin. Or you can build amazing new services or software that can use Bitcoin."
donation: "Donation"
donationtxt: "The easiest way to help is to <a href=\"http://bitgivefoundation.org/donate-now/\">donate</a> a few bitcoins to BitGive. Or you can help directly fund any project related to Bitcoin that you believe will be helpful in the future."
nonprofit: "Organizations"
Expand Down
2 changes: 1 addition & 1 deletion _wallets/greenaddress.md
Expand Up @@ -5,7 +5,7 @@
id: greenaddress
title: "GreenAddress"
titleshort: "Green<br>Address"
compat: "mobile desktop web android ios windows mac linux"
compat: "mobile desktop android ios windows mac linux"
level: 3
platform:
- mobile:
Expand Down
2 changes: 1 addition & 1 deletion en/alerts.html
Expand Up @@ -38,5 +38,5 @@ <h1>Network status and alerts</h1>
<p><a href="http://getaddr.bitnodes.io/">Status and distribution of Bitcoin nodes</a></p>
<p><a href="http://bitcoinstats.com/network/propagation/">Propagation time on the network</a></p>
<p><a href="https://en.bitcoin.it/wiki/Common_Vulnerabilities_and_Exposures">Complete CVE list</a></p>
<p>Please refer to the <a href="/en/development">development</a> page if you want to report a vulnerability.</p>
<p>Please refer to the <a href="https://bitcoincore.org/en/contact/">Bittcoin Core contact page</a> page if you want to report a vulnerability.</p>
</div>
3 changes: 1 addition & 2 deletions en/full-node.md
Expand Up @@ -1502,8 +1502,7 @@ par=1

A user-friendly configuration file generator is [available here.](https://jlopp.github.io/bitcoin-core-config-generator/)
If you have any questions about configuring Bitcoin Core, please stop by
one of our [forums](/en/bitcoin-core/help#forums) or [live
chatrooms](/en/bitcoin-core/help#live).
one of our forums or live chatrooms.

### Reduce Storage

Expand Down
2 changes: 1 addition & 1 deletion js/devsearch.js
Expand Up @@ -4,7 +4,7 @@
---
"use strict";

var search_data = {{ site.devsearches_json }}
var search_data = {{ site.devsearches_json }};

{% raw %}
// code adapted from http://jqueryui.com/autocomplete/#categories
Expand Down

0 comments on commit 6ba0d0b

Please sign in to comment.