Merge branch '1.0' into documentation/web3-module-example

Author: nivida

docs/getting-started.rst

@@ -8,7 +8,6 @@ The web3.js library is a collection of modules which contain specific functional
 
 - The ``web3-eth`` is for the Ethereum blockchain and smart contracts
 - The ``web3-shh`` is for the whisper protocol to communicate p2p and broadcast
-- The ``web3-bzz`` is for the swarm protocol, the decentralized file storage
 - The ``web3-utils`` contains useful helper functions for DApp developers.
 
 

docs/include_package-core.rst

@@ -277,12 +277,11 @@ setProvider
     web3.setProvider(myProvider)
     web3.eth.setProvider(myProvider)
     web3.shh.setProvider(myProvider)
-    web3.bzz.setProvider(myProvider)
     ...
 
 Will change the provider for its module.
 
-.. note:: When called on the umbrella package ``web3`` it will also set the provider for all sub modules ``web3.eth``, ``web3.shh``, etc EXCEPT ``web3.bzz`` which needs a separate provider at all times.
+.. note:: When called on the umbrella package ``web3`` it will also set the provider for all sub modules ``web3.eth``, ``web3.shh``, etc.
 
 ----------
 Parameters
@@ -378,7 +377,6 @@ givenProvider
     Web3.givenProvider
     web3.eth.givenProvider
     web3.shh.givenProvider
-    web3.bzz.givenProvider
     ...
 
 When using web3.js in an Ethereum compatible browser, it will set with the current native provider by that browser.
@@ -411,7 +409,6 @@ currentProvider
     web3.currentProvider
     web3.eth.currentProvider
     web3.shh.currentProvider
-    web3.bzz.currentProvider
     ...
 
 Will return the current provider.

docs/include_package-net.rst

@@ -7,7 +7,6 @@ getId
 .. code-block:: javascript
 
     web3.eth.net.getId([callback])
-    web3.bzz.net.getId([callback])
     web3.shh.net.getId([callback])
 
 Gets the current network ID.
@@ -41,7 +40,6 @@ isListening
 .. code-block:: javascript
 
     web3.eth.net.isListening([callback])
-    web3.bzz.net.isListening([callback])
     web3.shh.net.isListening([callback])
 
 Checks if the node is listening for peers.
@@ -75,7 +73,6 @@ getPeerCount
 .. code-block:: javascript
 
     web3.eth.net.getPeerCount([callback])
-    web3.bzz.net.getPeerCount([callback])
     web3.shh.net.getPeerCount([callback])
 
 Get the number of peers connected to.

docs/index.rst

@@ -39,7 +39,6 @@ Contents:
     web3-eth-net
     web3-eth-abi
     web3-net
-    web3-bzz
     web3-shh
     web3-utils
     web3-module

docs/web3-bzz.rst

@@ -23,7 +23,6 @@ The ``web3-net`` package allows you to interact with the Ethereum nodes network
     const web3 = new Web3(Web3.givenProvider || 'ws://some.local-or-remote.node:8546', null, options);
 
     // -> web3.eth.net
-    // -> web3.bzz.net
     // -> web3.shh.net