Merged revisions 62490 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62490 | benjamin.peterson | 2008-04-24 20:29:10 -0500 (Thu, 24 Apr 2008) | 2 lines
reformat some documentation of classes so methods and attributes are under the class directive
........
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index 9e99190..4ce8893 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -47,33 +47,34 @@
or passed as None, the global default timeout setting will be used).
-.. data:: all_errors
+ .. attribute:: all_errors
- The set of all exceptions (as a tuple) that methods of :class:`FTP` instances
- may raise as a result of problems with the FTP connection (as opposed to
- programming errors made by the caller). This set includes the four exceptions
- listed below as well as :exc:`socket.error` and :exc:`IOError`.
+ The set of all exceptions (as a tuple) that methods of :class:`FTP`
+ instances may raise as a result of problems with the FTP connection (as
+ opposed to programming errors made by the caller). This set includes the
+ four exceptions listed below as well as :exc:`socket.error` and
+ :exc:`IOError`.
-.. exception:: error_reply
+ .. exception:: error_reply
- Exception raised when an unexpected reply is received from the server.
+ Exception raised when an unexpected reply is received from the server.
-.. exception:: error_temp
+ .. exception:: error_temp
- Exception raised when an error code in the range 400--499 is received.
+ Exception raised when an error code in the range 400--499 is received.
-.. exception:: error_perm
+ .. exception:: error_perm
- Exception raised when an error code in the range 500--599 is received.
+ Exception raised when an error code in the range 500--599 is received.
-.. exception:: error_proto
+ .. exception:: error_proto
- Exception raised when a reply is received from the server that does not begin
- with a digit in the range 1--5.
+ Exception raised when a reply is received from the server that does not
+ begin with a digit in the range 1--5.
.. seealso::