argparse documentation updates (including updates to optparse and getopt documentation that were promised in the PEP)
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
index 50c62aa..9d5b9ff 100644
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -3,8 +3,13 @@
.. module:: optparse
:synopsis: Command-line option parsing library.
-.. moduleauthor:: Greg Ward <gward@python.net>
+ :deprecated:
+.. deprecated:: 2.7
+ The :mod:`optparse` module is deprecated and will not be developed further;
+ development will continue with the :mod:`argparse` module.
+
+.. moduleauthor:: Greg Ward <gward@python.net>
.. versionadded:: 2.3