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

@ -209,6 +209,8 @@ CVE-2012-2459:
'`estimatefee` RPC': rpc estimatefee
'`estimatepriority`': rpc estimatepriority
'`estimatepriority` RPC': rpc estimatepriority
'`generate`': rpc generate
'`generate` RPC': rpc generate
'`getaccount`': rpc getaccount
'`getaccount` RPC': rpc getaccount
'`getaccountaddress`': rpc getaccountaddress