Replace criterium with criterion. Fixes #705120.
diff --git a/Doc/lib/libimaplib.tex b/Doc/lib/libimaplib.tex
index dba9692..27e493b 100644
--- a/Doc/lib/libimaplib.tex
+++ b/Doc/lib/libimaplib.tex
@@ -274,12 +274,12 @@
\code{None}. Returns the given code, instead of the usual type.
\end{methoddesc}
-\begin{methoddesc}{search}{charset, criterium\optional{, ...}}
+\begin{methoddesc}{search}{charset, criterion\optional{, ...}}
Search mailbox for matching messages. Returned data contains a space
separated list of matching message numbers. \var{charset} may be
\code{None}, in which case no \samp{CHARSET} will be specified in the
request to the server. The IMAP protocol requires that at least one
- criterium be specified; an exception will be raised when the server
+ criterion be specified; an exception will be raised when the server
returns an error.
Example:
@@ -325,12 +325,12 @@
Returns socket instance used to connect to server.
\end{methoddesc}
-\begin{methoddesc}{sort}{sort_criteria, charset, search_criterium\optional{, ...}}
+\begin{methoddesc}{sort}{sort_criteria, charset, search_criterion\optional{, ...}}
The \code{sort} command is a variant of \code{search} with sorting semantics for
the results. Returned data contains a space
separated list of matching message numbers.
- Sort has two arguments before the \var{search_criterium}
+ Sort has two arguments before the \var{search_criterion}
argument(s); a parenthesized list of \var{sort_criteria}, and the searching \var{charset}.
Note that unlike \code{search}, the searching \var{charset} argument is mandatory.
There is also a \code{uid sort} command which corresponds to \code{sort} the way
diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index c3d56a7..12c19a0 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -573,7 +573,7 @@
def search(self, charset, *criteria):
"""Search mailbox for matching messages.
- (typ, [data]) = <instance>.search(charset, criterium, ...)
+ (typ, [data]) = <instance>.search(charset, criterion, ...)
'data' is space separated list of matching message numbers.
"""