Merge 3.4.

d95224ce · Stefan Krah · f026dae1 · bb458dbe · d95224ce
Commit d95224ce authored Jun 30, 2014 by Stefan Krah
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Doc/c-api/buffer.rst Doc/c-api/buffer.rst +2 -2

No files found.
--- 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
+   *exporter* MUST be set to the exporting object and *flags* must be passed
-   be NULL.
+   unmodified. Otherwise, *exporter* MUST be NULL.