Merge with 3.3.

3 files changed, 8 insertions, 1 deletions

diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
index 0b521df..f703e9c 100644
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -263,6 +263,7 @@ The flags that control the logical structure of the memory are listed
 in decreasing order of complexity. Note that each flag contains all bits
 of the flags below it.
 
+.. tabularcolumns:: |p{0.35\linewidth}|l|l|l|
 
 +-----------------------------+-------+---------+------------+
 |  Request                    | shape | strides | suboffsets |
@@ -283,6 +284,8 @@ contiguity requests
 C or Fortran contiguity can be explicitly requested, with and without stride
 information. Without stride information, the buffer must be C-contiguous.
 
+.. tabularcolumns:: |p{0.35\linewidth}|l|l|l|l|
+
 +-----------------------------------+-------+---------+------------+--------+
 |  Request                          | shape | strides | suboffsets | contig |
 +===================================+=======+=========+============+========+
@@ -306,7 +309,7 @@ used combinations as single flags.
 In the following table *U* stands for undefined contiguity. The consumer would
 have to call :c:func:`PyBuffer_IsContiguous` to determine contiguity.
 
-
+.. tabularcolumns:: |p{0.35\linewidth}|l|l|l|l|l|l|
 
 +-------------------------------+-------+---------+------------+--------+----------+--------+
 |  Request                      | shape | strides | suboffsets | contig | readonly | format |
diff --git a/Doc/c-api/bytes.rst b/Doc/c-api/bytes.rst
index 12ec80c..5666dac 100644
--- a/Doc/c-api/bytes.rst
+++ b/Doc/c-api/bytes.rst
@@ -62,6 +62,8 @@ called with a non-bytes parameter.
    .. % because not all compilers support the %z width modifier -- we fake it
    .. % when necessary via interpolating PY_FORMAT_SIZE_T.
 
+   .. tabularcolumns:: |l|l|L|
+
    +-------------------+---------------+--------------------------------+
    | Format Characters | Type          | Comment                        |
    +===================+===============+================================+
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index 89bd148..abf353f 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -439,6 +439,8 @@ APIs:
    .. % Similar comments apply to the %ll width modifier and
    .. % PY_FORMAT_LONG_LONG.
 
+   .. tabularcolumns:: |l|l|L|
+
    +-------------------+---------------------+--------------------------------+
    | Format Characters | Type                | Comment                        |
    +===================+=====================+================================+