Merge payable FAQ item

2 files changed, 2 insertions, 9 deletions

diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index 76245952..522ce5c4 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -236,9 +236,9 @@ functions match the given function identifier (or if no data was supplied at
 all).
 
 Furthermore, this function is executed whenever the contract receives plain
-Ether (without data). Additionally, in order to receive Ether, the fallback function
+Ether (without data). To receive Ether and add it to the total balance of the contract, the fallback function
 must be marked ``payable``. If no such function exists, the contract cannot receive
-Ether through regular transactions.
+Ether through regular transactions and throws an exception.
 
 In the worst case, the fallback function can only rely on 2300 gas being
 available (for example when `send` or `transfer` is used), leaving little
diff --git a/docs/frequently-asked-questions.rst b/docs/frequently-asked-questions.rst
index ff2f1fac..4cd9acb2 100644
--- a/docs/frequently-asked-questions.rst
+++ b/docs/frequently-asked-questions.rst
@@ -54,13 +54,6 @@ Yes, you can use ``abi.encodePacked``::
         }
     }
 
-What happens if you send ether along with a function call to a contract?
-========================================================================
-
-It gets added to the total balance of the contract, just like when you send ether when creating a contract.
-You can only send ether along to a function that has the ``payable`` modifier,
-otherwise an exception is thrown.
-
 ******************
 Advanced Questions
 ******************