Merge 3.4.

Stefan Krah · Stefan Krah · commit d95224ceaf61 · 2014-06-30T00:16:09.000+02:00
diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
@@ -489,8 +489,8 @@ Buffer-related functions
    :c:member:`view->obj` to *NULL* and return -1;
 
    If this function is used as part of a :ref:`getbufferproc <buffer-structs>`,
-   *exporter* MUST be set to the exporting object. Otherwise, *exporter* MUST
-   be NULL.
+   *exporter* MUST be set to the exporting object and *flags* must be passed
+   unmodified. Otherwise, *exporter* MUST be NULL.
 
 
 
