Merge branch '1.0' into feature/exactVersionDependencies

Author: dacarley

docs/web3-eth.rst

@@ -633,7 +633,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.eth.getBlock(3150);
+    web3.eth.getBlock(3150)
     .then(console.log);
 
     > {
@@ -1401,7 +1401,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.eth.getCompilers();
+    web3.eth.getCompilers()
     .then(console.log);
     > ["lll", "solidity", "serpent"]
 
@@ -1444,7 +1444,7 @@ Example
         "   }\n" +
         "}\n";
 
-    web3.eth.compile.solidity(source);
+    web3.eth.compile.solidity(source)
     .then(console.log);
 
     > {
@@ -1521,7 +1521,7 @@ Example
 
     var source = "...";
 
-    web3.eth.compile.lll(source);
+    web3.eth.compile.lll(source)
     .then(console.log);
     > "0x603880600c6000396000f3006001600060e060020a600035048063c6888fa114601857005b6021600435602b565b8060005260206000f35b600081600702905091905056"
 
@@ -1556,7 +1556,7 @@ Returns
 
     var source = "...";
 
-    var code = web3.eth.compile.serpent(source);
+    var code = web3.eth.compile.serpent(source)
     .then(console.log);
     > "0x603880600c6000396000f3006001600060e060020a600035048063c6888fa114601857005b6021600435602b565b8060005260206000f35b600081600702905091905056"
 
@@ -1596,7 +1596,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.eth.getWork();
+    web3.eth.getWork()
     .then(console.log);
     > [
       "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
@@ -1642,7 +1642,7 @@ Example
         "0x0000000000000001",
         "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
         "0xD1FE5700000000000000000000000000D1FE5700000000000000000000000000"
-    ]);
+    ])
     .then(console.log);
     > true
 

docs/web3-shh.rst

@@ -206,7 +206,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.setMinPoW(0.9);
+    web3.shh.setMinPoW(0.9)
     .then(console.log);
     > true
 
@@ -247,7 +247,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.markTrustedPeer();
+    web3.shh.markTrustedPeer()
     .then(console.log);
     > true
 
@@ -285,7 +285,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.newKeyPair();
+    web3.shh.newKeyPair()
     .then(console.log);
     > "5e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
 
@@ -324,7 +324,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.addPrivateKey('0x8bda3abeb454847b515fa9b404cede50b1cc63cfdeddd4999d074284b4c21e15');
+    web3.shh.addPrivateKey('0x8bda3abeb454847b515fa9b404cede50b1cc63cfdeddd4999d074284b4c21e15')
     .then(console.log);
     > "3e22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
 
@@ -363,7 +363,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.deleteKeyPair('3e22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f');
+    web3.shh.deleteKeyPair('3e22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f')
     .then(console.log);
     > true
 
@@ -402,7 +402,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.hasKeyPair('fe22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f');
+    web3.shh.hasKeyPair('fe22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f')
     .then(console.log);
     > true
 
@@ -441,7 +441,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.getPublicKey('3e22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f');
+    web3.shh.getPublicKey('3e22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f')
     .then(console.log);
     > "0x04d1574d4eab8f3dde4d2dc7ed2c4d699d77cbbdd09167b8fffa099652ce4df00c4c6e0263eafe05007a46fdf0c8d32b11aeabcd3abbc7b2bc2bb967368a68e9c6"
 
@@ -480,7 +480,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.getPrivateKey('3e22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f');
+    web3.shh.getPrivateKey('3e22b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f')
     .then(console.log);
     > "0x234234e22b9ffc2387e18636e0534534a3d0c56b0243567432453264c16e78a2adc"
 
@@ -519,7 +519,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.newSymKey();
+    web3.shh.newSymKey()
     .then(console.log);
     > "cec94d139ff51d7df1d228812b90c23ec1f909afa0840ed80f1e04030bb681e4"
 
@@ -558,7 +558,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.addSymKey('0x5e11b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f');
+    web3.shh.addSymKey('0x5e11b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f')
     .then(console.log);
     > "fea94d139ff51d7df1d228812b90c23ec1f909afa0840ed80f1e04030bb681e4"
 
@@ -597,7 +597,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.generateSymKeyFromPassword('Never use this password - password!');
+    web3.shh.generateSymKeyFromPassword('Never use this password - password!')
     .then(console.log);
     > "2e57b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f"
 
@@ -636,7 +636,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.hasSymKey('f6dcf21ed6a17bd78d8c4c63195ab997b3b65ea683705501eae82d32667adc92');
+    web3.shh.hasSymKey('f6dcf21ed6a17bd78d8c4c63195ab997b3b65ea683705501eae82d32667adc92')
     .then(console.log);
     > true
 
@@ -675,7 +675,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.getSymKey('af33b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f');
+    web3.shh.getSymKey('af33b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f')
     .then(console.log);
     > "0xa82a520aff70f7a989098376e48ec128f25f767085e84d7fb995a9815eebff0a"
 
@@ -714,7 +714,7 @@ Example
 
 .. code-block:: javascript
 
-    web3.shh.deleteSymKey('bf31b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f');
+    web3.shh.deleteSymKey('bf31b9ffc2387e18636e0a3d0c56b023264c16e78a2adcba1303cefc685e610f')
     .then(console.log);
     > true