diff --git a/docs/gmock_cook_book.md b/docs/gmock_cook_book.md
index cee1da8e..6063ec29 100644
--- a/docs/gmock_cook_book.md
+++ b/docs/gmock_cook_book.md
@@ -15,6 +15,8 @@ brevity, but you should do it in your own code.
 Mock classes are defined as normal classes, using the `MOCK_METHOD` macro to
 generate mocked methods. The macro gets 3 or 4 parameters:
 
+Note that a mocked method can have at most 31 arguments.
+
 ```cpp
 class MyMock {
  public:
diff --git a/docs/reference/mocking.md b/docs/reference/mocking.md
index ab37ebf3..3b01f9fd 100644
--- a/docs/reference/mocking.md
+++ b/docs/reference/mocking.md
@@ -16,6 +16,8 @@ GoogleTest defines the following macros for working with mocks.
 Defines a mock method *`method_name`* with arguments `(`*`args...`*`)` and
 return type *`return_type`* within a mock class.
 
+The number of arguments is limited to 31.
+
 The parameters of `MOCK_METHOD` mirror the method declaration. The optional
 fourth parameter *`specs...`* is a comma-separated list of qualifiers. The
 following qualifiers are accepted: