aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2016-04-13 19:23:49 +0800
committerchriseth <c@ethdev.com>2016-04-13 19:23:49 +0800
commit9137506a15c9b134b39d9dabb6c32a9efb51a793 (patch)
treef809f2be2f91da35318d2c0cac4bfaaa620c02b7
parent3ad5e821f25d9c389b29370705d4df5d1014b2bd (diff)
parent9af44f457c30ce60962daf78cfc97569b7ec34da (diff)
downloaddexon-solidity-9137506a15c9b134b39d9dabb6c32a9efb51a793.tar.gz
dexon-solidity-9137506a15c9b134b39d9dabb6c32a9efb51a793.tar.zst
dexon-solidity-9137506a15c9b134b39d9dabb6c32a9efb51a793.zip
Merge pull request #497 from redsquirrel/doc-tiny-fixes
Doc tiny fixes
-rw-r--r--docs/introduction-to-smart-contracts.rst2
-rw-r--r--docs/solidity-by-example.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 22dbbcb7..cecd6b91 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -122,7 +122,7 @@ get the idea - the compiler figures that out for you.
.. index:: mapping
The next line, `mapping (address => uint) public balances;` also
-creates a public state variable, but it of a more complex datatype.
+creates a public state variable, but it is a more complex datatype.
The type maps addresses to unsigned integers.
Mappings can be seen as hashtables which are
virtually initialized such that every possible key exists and is mapped to a
diff --git a/docs/solidity-by-example.rst b/docs/solidity-by-example.rst
index 63c82798..59400f3f 100644
--- a/docs/solidity-by-example.rst
+++ b/docs/solidity-by-example.rst
@@ -199,7 +199,7 @@ activate themselves.
contract SimpleAuction {
// Parameters of the auction. Times are either
// absolute unix timestamps (seconds since 1970-01-01)
- // ore time periods in seconds.
+ // or time periods in seconds.
address public beneficiary;
uint public auctionStart;
uint public biddingTime;