From 5e0c57142d7380d7209f198f772bb9851739652d Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 30 Mar 2012 18:07:42 -0400
Subject: [PATCH] #10423: clarify options vs args in argparse discussion of
 optparse

Patch by Sandro Tosi.
---
 Doc/library/argparse.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
index b84e5c8a72a..0123b5cbac9 100644
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -1833,9 +1833,10 @@ A partial upgrade path from :mod:`optparse` to :mod:`argparse`:
 * Replace all :meth:`optparse.OptionParser.add_option` calls with
   :meth:`ArgumentParser.add_argument` calls.
 
-* Replace ``options, args = parser.parse_args()`` with ``args =
+* Replace ``(options, args) = parser.parse_args()`` with ``args =
   parser.parse_args()`` and add additional :meth:`ArgumentParser.add_argument`
-  calls for the positional arguments.
+  calls for the positional arguments. Keep in mind that what was previously
+  called ``options``, now in :mod:`argparse` context is called ``args``.
 
 * Replace callback actions and the ``callback_*`` keyword arguments with
   ``type`` or ``action`` arguments.