Merge branch 'master' into feature/merkleproof

docs/source/basictoken.rst

@@ -9,4 +9,4 @@ Returns the token balance of the passed address.
 
 function transfer(address _to, uint _value) returns (bool success)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-Transfers tokens from sender's account. Amount must not be greater than sender's balance.
+Transfers tokens from sender's account. Amount must not be greater than sender's balance.

docs/source/crowdsaletoken.rst

@@ -1,14 +0,0 @@
-CrowdsaleToken
-=============================================
-
-Simple ERC20 Token example, with crowdsale token creation.
-
-Inherits from contract StandardToken.
-
-createTokens(address recipient) payable
-"""""""""""""""""""""""""""""""""""""""""
-Creates tokens based on message value and credits to the recipient.
-
-getPrice() constant returns (uint result)
-"""""""""""""""""""""""""""""""""""""""""
-Returns the amount of tokens per 1 ether.

docs/source/developer-resources.rst

@@ -9,4 +9,4 @@ Interested in contributing to Zeppelin?
 
 * Framework proposal and roadmap: https://medium.com/zeppelin-blog/zeppelin-framework-proposal-and-development-roadmap-fdfa9a3a32ab#.iain47pak
 * Issue tracker: https://github.com/OpenZeppelin/zeppelin-solidity/issues
-* Contribution guidelines: https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/CONTRIBUTING.md
+* Contribution guidelines: https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/CONTRIBUTING.md

docs/source/ecrecovery.rst

@@ -0,0 +1,9 @@
+ECReovery
+=============================================
+
+Returns the signer of the the hash using the signature divided in v, r, and s values.
+
+recover(bytes32 hash, bytes sig) internal returns (address)
+"""""""""""""""""""""""""""""""""""""""""""""""""
+
+Returns the signer of the the hash using the signature that provides the web3.eth.sign() method.

docs/source/getting-started.rst

@@ -13,7 +13,7 @@ To install the Zeppelin library, run::
 
 After that, you'll get all the library's contracts in the contracts/zeppelin folder. You can use the contracts in the library like so::
 
-	import "./zeppelin/Ownable.sol";
+	import "zeppelin-solidity/contracts/Ownable.sol";
 
 	contract MyContract is Ownable {
 	  ...

docs/source/index.rst

@@ -6,14 +6,14 @@
 Welcome to Zeppelin-Solidity
 =============================================
 
-Zeppelin is a library for writing secure Smart Contracts on Ethereum. 
+Zeppelin is a library for writing secure Smart Contracts on Ethereum.
 
 With Zeppelin, you can build distributed applications, protocols and organizations:
 
 * using :doc:`contract-security-patterns`
 * in the `Solidity language <https://solidity.readthedocs.io/en/develop/>`_.
 
-The code is open-source, and `available on github <https://github.com/OpenZeppelin/zeppelin-solidity>`_. 
+The code is open-source, and `available on github <https://github.com/OpenZeppelin/zeppelin-solidity>`_.
 
 .. toctree::
    :maxdepth: 2
@@ -24,7 +24,7 @@ The code is open-source, and `available on github <https://github.com/OpenZeppel
 .. toctree::
    :maxdepth: 2
    :caption: Smart Contracts
-   
+
    ownable
    Pausable
    destructible
@@ -41,7 +41,7 @@ The code is open-source, and `available on github <https://github.com/OpenZeppel
 .. toctree::
    :maxdepth: 2
    :caption: Developer Resources
-   
+
    contract-security-patterns
    developer-resources
-   license
+   license

docs/source/killable.rst

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

docs/source/license.rst

@@ -6,18 +6,18 @@ Copyright (c) 2016 Smart Contract Solutions, Inc.
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish, 
+without limitation the rights to use, copy, modify, merge, publish,
 distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to 
+permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
 
 The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

docs/source/limitbalance.rst

@@ -5,8 +5,8 @@ Base contract that provides mechanism for limiting the amount of funds a contrac
 
 LimitBalance(unit _limit)
 """"""""""""""""""""""""""""
-Constructor takes an unisgned integer and sets it as the limit of funds this contract can hold.
+Constructor takes an unsigned integer and sets it as the limit of funds this contract can hold.
 
 modifier limitedPayable()
 """"""""""""""""""""""""""""
-Throws an error if this contract's balance is already above the limit.
+Throws an error if this contract's balance is already above the limit.

docs/source/math.rst

@@ -0,0 +1,24 @@
+Math
+=============================================
+
+Provides assorted low-level math operations.
+
+max64(uint64 a, uint64 b) internal constant returns (uint64)
+"""""""""""""""""""""""""""""""""""""""""""""""""
+
+Returns the largest of two uint64 numbers.
+
+min64(uint64 a, uint64 b) internal constant returns (uint64)
+"""""""""""""""""""""""""""""""""""""""""""""""""
+
+Returns the smallest of two uint64 numbers.
+
+max64(uint256 a, uint256 b) internal constant returns (uint256)
+"""""""""""""""""""""""""""""""""""""""""""""""""
+
+Returns the largest of two uint256 numbers.
+
+min64(uint256 a, uint256 b) internal constant returns (uint256)
+"""""""""""""""""""""""""""""""""""""""""""""""""
+
+Returns the smallest of two uint256 numbers.

docs/source/migrations.rst

@@ -13,4 +13,4 @@ Creates a new instance of the contract at the passed address.
 setCompleted(uint completed) onlyOwner**
 """"""""""""""""""""""""""""""""""""""""
 
-Sets the last time that a migration was completed.
+Sets the last time that a migration was completed.

docs/source/ownable.rst

@@ -11,6 +11,6 @@ modifier onlyOwner( )
 """"""""""""""""""""""""""""""""""""""
 Prevents function from running if it is called by anyone other than the owner.
 
-transfer(address newOwner) onlyOwner
+transferOwnership(address newOwner) onlyOwner
 """"""""""""""""""""""""""""""""""""""
-Transfers ownership of the contract to the passed address.
+Transfers ownership of the contract to the passed address.

docs/source/pausable.rst

@@ -24,4 +24,4 @@ Only runs if pause mechanism is activated.
 unpause() onlyOwner whenPaused returns (bool)
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-Deactivates the pause mechanism.
+Deactivates the pause mechanism.

docs/source/pullpayment.rst

@@ -9,4 +9,4 @@ Adds sent amount to available balance that payee can pull from this contract, ca
 
 withdrawPayments( )
 """""""""""""""""""""""""""""""""""""""""""""""
-Sends designated balance to payee calling the contract. Throws error if designated balance is 0, if contract does not hold enough funds ot pay the payee, or if the send transaction is not successful.
+Sends designated balance to payee calling the contract. Throws error if designated balance is 0, if contract does not hold enough funds to pay the payee, or if the send transaction is not successful.

docs/source/safemath.rst

@@ -8,17 +8,17 @@ assert(bool assertion) internal
 
 Throws an error if the passed result is false. Used in this contract by checking mathematical expressions.
 
-safeMul(uint a, uint b) internal returns (uint)
+mul(uint256 a, uint256 b) internal returns (uint256)
 """""""""""""""""""""""""""""""""""""""""""""""""
 
-Multiplies two unisgned integers. Asserts that dividing the product by the non-zero multiplicand results in the multiplier.
+Multiplies two unsigned integers. Asserts that dividing the product by the non-zero multiplicand results in the multiplier.
 
-safeSub(uint a, uint b) internal returns (uint)
+sub(uint256 a, uint256 b) internal returns (uint256)
 """""""""""""""""""""""""""""""""""""""""""""""""
 
 Checks that b is not greater than a before subtracting.
 
-safeAdd(uint a, uint b) internal returns (uint)
+add(uint256 a, uint256 b) internal returns (uint256)
 """""""""""""""""""""""""""""""""""""""""""""""""
 
 Checks that the result is greater than both a and b.

docs/source/standardtoken.rst

@@ -23,4 +23,4 @@ Transfers tokens from an account that the sender is approved to transfer from. A
 
 function transfer(address _to, uint _value) returns (bool success)
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-Transfers tokens from sender's account. Amount must not be greater than sender's balance.
+Transfers tokens from sender's account. Amount must not be greater than sender's balance.