merge from 3.2
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index c8e22f1..3bda2ab 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1267,7 +1267,7 @@
subtracting their UTC offsets (obtained from ``self.utcoffset()``). In order
to stop mixed-type comparisons from falling back to the default comparison by
object address, when a :class:`time` object is compared to an object of a
- different type, :exc:`TypeError` is raised unless the comparison is ``==`` or
+ different type, :exc:`TypeError` is raised unless the comparison is ``==`` or
``!=``. The latter cases return :const:`False` or :const:`True`, respectively.
* hash, use as dict key
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 77a28b4..2cdd102 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1826,7 +1826,7 @@
.. note::
- The exact meaning and resolution of the :attr:`st_atime`,
+ The exact meaning and resolution of the :attr:`st_atime`,
:attr:`st_mtime`, and :attr:`st_ctime` attributes depend on the operating
system and the file system. For example, on Windows systems using the FAT
or FAT32 file systems, :attr:`st_mtime` has 2-second resolution, and