Incorporated Keith MacDonald's comments

[SVN r22567]

doc/facade-and-adaptor.html

@@ -474,11 +474,12 @@ the underlying iterator object of a <tt class="literal"><span class="pre">revers
 </table>
 <p>The user of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> creates a class derived from an
 instantiation of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> and then selectively
-redefines some of the core member functions described in the table
-above. The <tt class="literal"><span class="pre">Base</span></tt> type need not meet the full requirements for an
-iterator. It need only support the operations used by the core
-interface functions of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been
-redefined in the user's derived class.</p>
+redefines some of the core member functions described in the
+<tt class="literal"><span class="pre">iterator_facade</span></tt> core requirements table. The <tt class="literal"><span class="pre">Base</span></tt> type need
+not meet the full requirements for an iterator; it need only
+support the operations used by the core interface functions of
+<tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been redefined in the user's
+derived class.</p>
 <p>Several of the template parameters of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> default
 to <tt class="literal"><span class="pre">use_default</span></tt>. This allows the
 user to make use of a default parameter even when she wants to

doc/iterator_adaptor.html

@@ -92,11 +92,12 @@ the underlying iterator object of a <tt class="literal"><span class="pre">revers
 </table>
 <p>The user of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> creates a class derived from an
 instantiation of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> and then selectively
-redefines some of the core member functions described in the table
-above. The <tt class="literal"><span class="pre">Base</span></tt> type need not meet the full requirements for an
-iterator. It need only support the operations used by the core
-interface functions of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been
-redefined in the user's derived class.</p>
+redefines some of the core member functions described in the
+<tt class="literal"><span class="pre">iterator_facade</span></tt> core requirements table. The <tt class="literal"><span class="pre">Base</span></tt> type need
+not meet the full requirements for an iterator; it need only
+support the operations used by the core interface functions of
+<tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been redefined in the user's
+derived class.</p>
 <p>Several of the template parameters of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> default
 to <tt class="literal"><span class="pre">use_default</span></tt>. This allows the
 user to make use of a default parameter even when she wants to

doc/iterator_adaptor_body.rst

@@ -18,11 +18,12 @@ instance of the ``Base`` type, which it stores as a member.
 
 The user of ``iterator_adaptor`` creates a class derived from an
 instantiation of ``iterator_adaptor`` and then selectively
-redefines some of the core member functions described in the table
-above. The ``Base`` type need not meet the full requirements for an
-iterator. It need only support the operations used by the core
-interface functions of ``iterator_adaptor`` that have not been
-redefined in the user's derived class.
+redefines some of the core member functions described in the
+``iterator_facade`` core requirements table. The ``Base`` type need
+not meet the full requirements for an iterator; it need only
+support the operations used by the core interface functions of
+``iterator_adaptor`` that have not been redefined in the user's
+derived class.
 
 Several of the template parameters of ``iterator_adaptor`` default
 to ``use_default``. This allows the

doc/iterator_facade.html

@@ -1287,6 +1287,10 @@ appropriate:</p>
 
   ...
 
+private: 
+  struct enabler {};
+
+public:
   template &lt;class OtherValue&gt;
   node_iter(
       node_iter&lt;OtherValue&gt; const&amp; other

doc/iterator_facade_tutorial.rst

@@ -483,6 +483,10 @@ appropriate::
 
     ...
 
+  private: 
+    struct enabler {};
+
+  public:
     template <class OtherValue>
     node_iter(
         node_iter<OtherValue> const& other