Merge pull request #5416 from ethereum/develop

Merge develop into release for 0.5.0

1 files changed, 16 insertions, 10 deletions

diff --git a/docs/structure-of-a-contract.rst b/docs/structure-of-a-contract.rst
index 7a6317eb..582e5338 100644
--- a/docs/structure-of-a-contract.rst
+++ b/docs/structure-of-a-contract.rst
@@ -11,16 +11,22 @@ Each contract can contain declarations of :ref:`structure-state-variables`, :ref
 :ref:`structure-function-modifiers`, :ref:`structure-events`, :ref:`structure-struct-types` and :ref:`structure-enum-types`.
 Furthermore, contracts can inherit from other contracts.
 
+There are also special kinds of contracts called :ref:`libraries<libraries>` and :ref:`interfaces<interfaces>`.
+
+The section about :ref:`contracts<contracts>` contains more details than this section,
+which serves to provide a quick overview.
+
 .. _structure-state-variables:
 
 State Variables
 ===============
 
-State variables are values which are permanently stored in contract storage.
+State variables are variables whose values are permanently stored in contract
+storage.
 
 ::
 
-    pragma solidity ^0.4.0;
+    pragma solidity >=0.4.0 <0.6.0;
 
     contract SimpleStorage {
         uint storedData; // State variable
@@ -40,7 +46,7 @@ Functions are the executable units of code within a contract.
 
 ::
 
-    pragma solidity ^0.4.0;
+    pragma solidity >=0.4.0 <0.6.0;
 
     contract SimpleAuction {
         function bid() public payable { // Function
@@ -49,7 +55,7 @@ Functions are the executable units of code within a contract.
     }
 
 :ref:`function-calls` can happen internally or externally
-and have different levels of visibility (:ref:`visibility-and-getters`)
+and have different levels of :ref:`visibility<visibility-and-getters>`
 towards other contracts.
 
 .. _structure-function-modifiers:
@@ -58,11 +64,11 @@ Function Modifiers
 ==================
 
 Function modifiers can be used to amend the semantics of functions in a declarative way
-(see :ref:`modifiers` in contracts section).
+(see :ref:`modifiers` in the contracts section).
 
 ::
 
-    pragma solidity ^0.4.22;
+    pragma solidity >=0.4.22 <0.6.0;
 
     contract Purchase {
         address public seller;
@@ -75,7 +81,7 @@ Function modifiers can be used to amend the semantics of functions in a declarat
             _;
         }
 
-        function abort() public onlySeller { // Modifier usage
+        function abort() public view onlySeller { // Modifier usage
             // ...
         }
     }
@@ -89,7 +95,7 @@ Events are convenience interfaces with the EVM logging facilities.
 
 ::
 
-    pragma solidity ^0.4.21;
+    pragma solidity >=0.4.21 <0.6.0;
 
     contract SimpleAuction {
         event HighestBidIncreased(address bidder, uint amount); // Event
@@ -113,7 +119,7 @@ Structs are custom defined types that can group several variables (see
 
 ::
 
-    pragma solidity ^0.4.0;
+    pragma solidity >=0.4.0 <0.6.0;
 
     contract Ballot {
         struct Voter { // Struct
@@ -134,7 +140,7 @@ Enums can be used to create custom types with a finite set of 'constant values'
 
 ::
 
-    pragma solidity ^0.4.0;
+    pragma solidity >=0.4.0 <0.6.0;
 
     contract Purchase {
         enum State { Created, Locked, Inactive } // Enum