diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index de0a78075e3..73aefadea81 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -469,8 +469,9 @@ the iteration methods.
 One method needs to be defined for container objects to provide iteration
 support:
 
+.. XXX duplicated in reference/datamodel!
 
-.. method:: object.__iter__()
+.. method:: container.__iter__()
 
    Return an iterator object.  The object is required to support the iterator
    protocol described below.  If a container supports different types of
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 12aa0f2393c..cee79d99f93 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -441,10 +441,10 @@ These environment variables influence Python's behavior.
 
 
 Debug-mode variables
---------------------
+~~~~~~~~~~~~~~~~~~~~
 
 Setting these variables only has an effect in a debug build of Python, that is,
-if Python was configured with the :opt:`--with-pydebug` build option.
+if Python was configured with the :option:`--with-pydebug` build option.
 
 .. envvar:: PYTHONTHREADDEBUG