merge from trunk
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index d4f8888..b543294 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -299,7 +299,7 @@
.. method:: FTP.quit()
Send a ``QUIT`` command to the server and close the connection. This is the
- "polite" way to close a connection, but it may raise an exception of the server
+ "polite" way to close a connection, but it may raise an exception if the server
responds with an error to the ``QUIT`` command. This implies a call to the
:meth:`close` method which renders the :class:`FTP` instance useless for
subsequent calls (see below).