Merge with master

2017-05-21 16:08:47 -04:00
parent 929367f0ab
commit a6a2ee2bf1
61 changed files with 1272 additions and 227 deletions
--- a/docs/source/killable.rst
+++ b/docs/source/killable.rst
@ -1,11 +1,16 @@
-Killable
+Destructible
 =============================================

-Base contract that can be killed by owner.
+Base contract that can be destroyed by owner.

 Inherits from contract Ownable.

-kill( ) onlyOwner
+destroy( ) onlyOwner
 """""""""""""""""""

-Destroys the contract and sends funds back to the owner.
+Destroys the contract and sends funds back to the owner.
+
+destroyAndSend(address _recipient) onlyOwner
+"""""""""""""""""""
+
+Destroys the contract and sends funds back to the _recepient.