#12072: merge with 3.1.

diff --cc Doc/c-api/buffer.rst
index 5a34bc09eef7e3458066c63c10c80601509eff02,37866b7dbdc542344c7e74b2d2dbb163f0b5fad9..d98ece3e98ef9b0885eaef6e8a590eb64f171b24
--- 1/Doc/c-api/buffer.rst
--- 2/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@@ -311,10 -313,10 +311,10 @@@ Buffer-related function
     (*fortran* is ``'A'``).  Return 0 otherwise.
  
  
 -.. cfunction:: void PyBuffer_FillContiguousStrides(int ndim, Py_ssize_t *shape, Py_ssize_t *strides, Py_ssize_t itemsize, char fortran)
 +.. c:function:: void PyBuffer_FillContiguousStrides(int ndim, Py_ssize_t *shape, Py_ssize_t *strides, Py_ssize_t itemsize, char fortran)
  
     Fill the *strides* array with byte-strides of a contiguous (C-style if
-    *fortran* is ``'C'`` or Fortran-style if *fortran* is ``'F'`` array of the
+    *fortran* is ``'C'`` or Fortran-style if *fortran* is ``'F'``) array of the
     given shape with the given number of bytes per element.