Merge branch 'master' of github.com:adambard/learnxinyminutes-docs

1 files changed, 6 insertions, 3 deletions

diff --git a/solidity.html.markdown b/solidity.html.markdown
index 602d74f0..fc54d6e4 100644
--- a/solidity.html.markdown
+++ b/solidity.html.markdown
@@ -37,6 +37,9 @@ features are typically marked, and subject to change. Pull requests welcome.
 // simple_bank.sol (note .sol extension)
 /* **** START EXAMPLE **** */
 
+// Declare the source file compiler version.
+pragma solidity ^0.4.2;
+
 // Start with Natspec comment (the three slashes)
 // used for documentation - and as descriptive data for UI elements/actions
 
@@ -188,7 +191,7 @@ string n = "hello"; // stored in UTF8, note double quotes, not single
 // string utility functions to be added in future
 // prefer bytes32/bytes, as UTF8 uses more storage
 
-// Type inferrence
+// Type inference
 // var does inferred typing based on first assignment,
 // can't be used in functions parameters
 var a = true;
@@ -484,7 +487,7 @@ contract MyContract is abc, def("a custom argument to def") {
     function z() {
         if (msg.sender == owner) {
             def.z(); // call overridden function from def
-            super.z(); // call immediate parent overriden function
+            super.z(); // call immediate parent overridden function
         }
     }
 }
@@ -804,7 +807,7 @@ someContractAddress.callcode('function_name');
 // else should be placed on own line
 
 
-// 14. NATSPEC COMENTS
+// 14. NATSPEC COMMENTS
 // used for documentation, commenting, and external UIs
 
 // Contract natspec - always above contract definition