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

@ -12,6 +12,7 @@ This file is licensed under the terms of its source texts{%endcomment%}
{% assign summary_encryptWallet="encrypts the wallet with a passphrase. This is only to enable encryption for the first time. After encryption is enabled, you will need to enter the passphrase to use private keys." %}
{% assign summary_estimateFee="estimates the transaction fee per kilobyte that needs to be paid for a transaction to be included within a certain number of blocks." %}
{% assign summary_estimatePriority="estimates the priority that a transaction needs in order to be included within a certain number of blocks as a free high-priority transaction." %}
{% assign summary_generate="nearly instantly generates blocks (in regtest mode only)" %}
{% assign summary_getAccountAddress="returns the current Bitcoin address for receiving payments to this account. If the account doesn't exist, it creates both the account and a new address for receiving payment. Once a payment has been received to an address, future calls to this RPC for the same account will return a different address." %}
{% assign summary_getAccount="returns the name of the account associated with the given address." %}
{% assign summary_getAddedNodeInfo="returns information about the given added node, or all added nodes (except onetry nodes). Only nodes which have been manually added using the `addnode` RPC will have their information displayed." %}