Merge remote-tracking branch 'origin/develop' into HEAD

docs/style-guide.rst

@@ -558,7 +558,7 @@ Yes::
         return x + 1;
     }
 
-    function increment(uint x) public pure onlyowner returns (uint) {
+    function increment(uint x) public pure onlyOwner returns (uint) {
         return x + 1;
     }
 
@@ -594,7 +594,7 @@ Yes::
         return balanceOf[from];
     }
 
-    function shutdown() public onlyowner {
+    function shutdown() public onlyOwner {
         selfdestruct(owner);
     }
 
@@ -604,7 +604,7 @@ No::
         return balanceOf[from];
     }
 
-    function shutdown() onlyowner public {
+    function shutdown() onlyOwner public {
         selfdestruct(owner);
     }
 
@@ -661,7 +661,7 @@ Yes::
 
     function thisFunctionNameIsReallyLong(address x, address y, address z)
         public
-        onlyowner
+        onlyOwner
         priced
         returns (address)
     {
@@ -674,7 +674,7 @@ Yes::
         address z,
     )
         public
-        onlyowner
+        onlyOwner
         priced
         returns (address)
     {
@@ -685,21 +685,21 @@ No::
 
     function thisFunctionNameIsReallyLong(address x, address y, address z)
                                           public
-                                          onlyowner
+                                          onlyOwner
                                           priced
                                           returns (address) {
         doSomething();
     }
 
     function thisFunctionNameIsReallyLong(address x, address y, address z)
-        public onlyowner priced returns (address)
+        public onlyOwner priced returns (address)
     {
         doSomething();
     }
 
     function thisFunctionNameIsReallyLong(address x, address y, address z)
         public
-        onlyowner
+        onlyOwner
         priced
         returns (address) {
         doSomething();

docs/using-the-compiler.rst

@@ -346,7 +346,12 @@ Input Description
       "modelCheckerSettings":
       {
         // Choose which model checker engine to use: all (default), bmc, chc, none.
-        "engine": "chc"
+        "engine": "chc",
+        // Timeout for each SMT query in milliseconds.
+        // If this option is not given, the SMTChecker will use a deterministic
+        // resource limit by default.
+        // A given timeout of 0 means no resource/time restrictions for any query.
+        "timeout": 20000
       }
     }
 

docs/yul.rst

@@ -54,7 +54,7 @@ be omitted to help readability.
 To keep the language simple and flexible, Yul does not have
 any built-in operations, functions or types in its pure form.
 These are added together with their semantics when specifying a dialect of Yul,
-which allows to specialize Yul to the requirements of different
+which allows specializing Yul to the requirements of different
 target platforms and feature sets.
 
 Currently, there is only one specified dialect of Yul. This dialect uses
@@ -526,7 +526,7 @@ The ``leave`` statement can only be used inside a function.
 
 Functions cannot be defined anywhere inside for loop init blocks.
 
-Literals cannot be larger than the their type. The largest type defined is 256-bit wide.
+Literals cannot be larger than their type. The largest type defined is 256-bit wide.
 
 During assignments and function calls, the types of the respective values have to match.
 There is no implicit type conversion. Type conversion in general can only be achieved