#16154: merge with 3.2.

diff --cc Doc/library/filecmp.rst
Simple merge

diff --cc Doc/library/math.rst
Simple merge

diff --cc Doc/library/string.rst
Simple merge

diff --cc Misc/ACKS
index 5e06870531a0424b086634fc55a52d17b299e2f7,3b8c7f29502688ab874a21e7316b2a5c519fc280..ae00e88e4ae76ddfd1d94b5f0eb334992a1195fa
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1102,7 -998,7 +1102,8 @@@ Michael Simcic
  Ionel Simionescu
  Kirill Simonov
  Nathan Paul Simons
 +Adam Simpkins
+ Ravi Sinha
  Janne Sinkkonen
  Ng Pheng Siong
  George Sipe