Merge pulls #824 and #830

* 824: Dev Docs: Update For New 'generate' RPC
* 830: Link "quantum computing" in FAQ to related Bitcoin Magazine article
This commit is contained in:
David A. Harding 2015-04-22 17:35:23 -04:00
commit 224127f2f0
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
10 changed files with 90 additions and 3 deletions

View file

@ -115,8 +115,12 @@ someone else, that second transaction would not be displayed in our
list of UTXOs.
{% highlight bash %}
## Bitcoin Core 0.10.1 and earlier
> bitcoin-cli -regtest setgenerate true 1
## Later versions of Bitcoin Core
> bitcoin-cli -regtest generate 1
> unset NEW_ADDRESS
{% endhighlight %}
@ -332,8 +336,12 @@ would usually then broadcast it to other peers, but we're not currently
connected to other peers because we started in regtest mode.
{% highlight bash %}
## Bitcoin Core 0.10.1 and earlier
> bitcoin-cli -regtest setgenerate true 1
## Later versions of Bitcoin Core
> bitcoin-cli -regtest generate 1
> unset UTXO_TXID UTXO_VOUT NEW_ADDRESS RAW_TX SIGNED_RAW_TX
{% endhighlight %}