Merge branch '1.x' into release/1.2.8

web3 · May 20, 2020 · da8122c · da8122c
2 parents e5b3b37 + 4ec98d4
commit da8122c
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/docs/web3-eth.rst b/docs/web3-eth.rst
@@ -1346,8 +1346,7 @@ Parameters
 
 2. ``callback`` - ``Function``: (optional) Optional callback, returns an error object as first parameter and the result as second.
 
-.. note:: The ``from`` property can also be an address or index from the :ref:`web3.eth.accounts.wallet <eth_accounts_wallet>`. It will then sign locally using the private key of that account, and send the transaction via :ref:`web3.eth.sendSignedTransaction() <eth-sendsignedtransaction>`. If the properties ``chain`` and ``hardfork`` or ``common`` are not set, Web3 will try to set appropriate values by
-querying the network for its chainId and networkId.
+.. note:: The ``from`` property can also be an address or index from the :ref:`web3.eth.accounts.wallet <eth_accounts_wallet>`. It will then sign locally using the private key of that account, and send the transaction via :ref:`web3.eth.sendSignedTransaction() <eth-sendsignedtransaction>`. If the properties ``chain`` and ``hardfork`` or ``common`` are not set, Web3 will try to set appropriate values by querying the network for its chainId and networkId.
 
 .. _eth-sendtransaction-return: