From a7eaa017b10c4a6a2ffe11d665e779ba51f6eff8 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Mon, 12 Jan 2004 16:05:15 +0000
Subject: [PATCH] Fixed general formatting, re-resolved title level problem,
 acknowledged Keith MacDonald for inspiring the tutorial.

[SVN r21631]
---
 doc/facade-and-adaptor.html      |  191 +++---
 doc/facade-and-adaptor.rst       |    6 +
 doc/filter_iterator.html         |   12 +-
 doc/iterator_adaptor.html        |    6 +-
 doc/iterator_facade.html         | 1023 +++++++++++++++---------------
 doc/iterator_facade.rst          |   21 +-
 doc/iterator_facade_ref.rst      |   63 +-
 doc/iterator_facade_tutorial.rst |   11 +-
 doc/new-iter-concepts.html       |  231 +------
 doc/rst2html                     |    7 +
 doc/style.tex                    |    8 +-
 11 files changed, 682 insertions(+), 897 deletions(-)
 create mode 100755 doc/rst2html
diff --git a/doc/facade-and-adaptor.html b/doc/facade-and-adaptor.html
index 83e07bc..44ae1dc 100755
--- a/doc/facade-and-adaptor.html
+++ b/doc/facade-and-adaptor.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.2.8: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.1: http://docutils.sourceforge.net/" />
 <title>Iterator Facade and Adaptor</title>
 <meta name="author" content="David Abrahams, Jeremy Siek, Thomas Witt" />
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab, University of Hanover Institute for Transport Railway Operation and Construction" />
@@ -75,63 +75,64 @@ by adapting other iterators.</td>
 <li><a class="reference" href="#proposed-text" id="id25" name="id25">Proposed Text</a><ul>
 <li><a class="reference" href="#header-iterator-helper-synopsis-lib-iterator-helper-synopsis" id="id26" name="id26">Header <tt class="literal"><span class="pre">&lt;iterator_helper&gt;</span></tt> synopsis    [lib.iterator.helper.synopsis]</a></li>
 <li><a class="reference" href="#iterator-facade-lib-iterator-facade" id="id27" name="id27">Iterator facade [lib.iterator.facade]</a><ul>
-<li><a class="reference" href="#iterator-facade-usage" id="id28" name="id28"><tt class="literal"><span class="pre">iterator_facade</span></tt> usage</a><ul>
-<li><a class="reference" href="#iterator-facade-core-operations" id="id29" name="id29"><tt class="literal"><span class="pre">iterator_facade</span></tt> Core Operations</a></li>
-</ul>
-</li>
+<li><a class="reference" href="#class-template-iterator-facade" id="id28" name="id28">Class template <tt class="literal"><span class="pre">iterator_facade</span></tt></a><ul>
+<li><a class="reference" href="#iterator-facade-requirements" id="id29" name="id29"><tt class="literal"><span class="pre">iterator_facade</span></tt> Requirements</a></li>
 <li><a class="reference" href="#iterator-facade-iterator-category" id="id30" name="id30"><tt class="literal"><span class="pre">iterator_facade</span></tt> iterator category</a></li>
 <li><a class="reference" href="#iterator-facade-operations" id="id31" name="id31"><tt class="literal"><span class="pre">iterator_facade</span></tt> operations</a></li>
 </ul>
 </li>
+</ul>
+</li>
 <li><a class="reference" href="#iterator-adaptor-lib-iterator-adaptor" id="id32" name="id32">Iterator adaptor [lib.iterator.adaptor]</a><ul>
-<li><a class="reference" href="#iterator-adaptor-base-class-parameters" id="id33" name="id33"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> base class parameters</a></li>
-<li><a class="reference" href="#iterator-adaptor-usage" id="id34" name="id34"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> usage</a></li>
-<li><a class="reference" href="#iterator-adaptor-public-operations" id="id35" name="id35"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> public operations</a></li>
-<li><a class="reference" href="#iterator-adaptor-protected-member-functions" id="id36" name="id36"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> protected member functions</a></li>
-<li><a class="reference" href="#iterator-adaptor-private-member-functions" id="id37" name="id37"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> private member functions</a></li>
+<li><a class="reference" href="#class-template-iterator-adaptor" id="id33" name="id33">Class template <tt class="literal"><span class="pre">iterator_adaptor</span></tt></a></li>
+<li><a class="reference" href="#iterator-adaptor-base-class-parameters" id="id34" name="id34"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> base class parameters</a></li>
+<li><a class="reference" href="#iterator-adaptor-usage" id="id35" name="id35"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> usage</a></li>
+<li><a class="reference" href="#iterator-adaptor-public-operations" id="id36" name="id36"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> public operations</a></li>
+<li><a class="reference" href="#iterator-adaptor-protected-member-functions" id="id37" name="id37"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> protected member functions</a></li>
+<li><a class="reference" href="#iterator-adaptor-private-member-functions" id="id38" name="id38"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> private member functions</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#specialized-adaptors-lib-iterator-special-adaptors" id="id38" name="id38">Specialized adaptors [lib.iterator.special.adaptors]</a><ul>
-<li><a class="reference" href="#indirect-iterator" id="id39" name="id39">Indirect iterator</a><ul>
-<li><a class="reference" href="#class-template-indirect-iterator" id="id40" name="id40">Class template <tt class="literal"><span class="pre">indirect_iterator</span></tt></a></li>
-<li><a class="reference" href="#indirect-iterator-requirements" id="id41" name="id41"><tt class="literal"><span class="pre">indirect_iterator</span></tt> requirements</a></li>
-<li><a class="reference" href="#indirect-iterator-models" id="id42" name="id42"><tt class="literal"><span class="pre">indirect_iterator</span></tt> models</a></li>
-<li><a class="reference" href="#indirect-iterator-operations" id="id43" name="id43"><tt class="literal"><span class="pre">indirect_iterator</span></tt> operations</a></li>
+<li><a class="reference" href="#specialized-adaptors-lib-iterator-special-adaptors" id="id39" name="id39">Specialized adaptors [lib.iterator.special.adaptors]</a><ul>
+<li><a class="reference" href="#indirect-iterator" id="id40" name="id40">Indirect iterator</a><ul>
+<li><a class="reference" href="#class-template-indirect-iterator" id="id41" name="id41">Class template <tt class="literal"><span class="pre">indirect_iterator</span></tt></a></li>
+<li><a class="reference" href="#indirect-iterator-requirements" id="id42" name="id42"><tt class="literal"><span class="pre">indirect_iterator</span></tt> requirements</a></li>
+<li><a class="reference" href="#indirect-iterator-models" id="id43" name="id43"><tt class="literal"><span class="pre">indirect_iterator</span></tt> models</a></li>
+<li><a class="reference" href="#indirect-iterator-operations" id="id44" name="id44"><tt class="literal"><span class="pre">indirect_iterator</span></tt> operations</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#reverse-iterator" id="id44" name="id44">Reverse iterator</a><ul>
-<li><a class="reference" href="#class-template-reverse-iterator" id="id45" name="id45">Class template <tt class="literal"><span class="pre">reverse_iterator</span></tt></a></li>
-<li><a class="reference" href="#reverse-iterator-requirements" id="id46" name="id46"><tt class="literal"><span class="pre">reverse_iterator</span></tt> requirements</a></li>
-<li><a class="reference" href="#reverse-iterator-models" id="id47" name="id47"><tt class="literal"><span class="pre">reverse_iterator</span></tt> models</a></li>
-<li><a class="reference" href="#reverse-iterator-operations" id="id48" name="id48"><tt class="literal"><span class="pre">reverse_iterator</span></tt> operations</a></li>
+<li><a class="reference" href="#reverse-iterator" id="id45" name="id45">Reverse iterator</a><ul>
+<li><a class="reference" href="#class-template-reverse-iterator" id="id46" name="id46">Class template <tt class="literal"><span class="pre">reverse_iterator</span></tt></a></li>
+<li><a class="reference" href="#reverse-iterator-requirements" id="id47" name="id47"><tt class="literal"><span class="pre">reverse_iterator</span></tt> requirements</a></li>
+<li><a class="reference" href="#reverse-iterator-models" id="id48" name="id48"><tt class="literal"><span class="pre">reverse_iterator</span></tt> models</a></li>
+<li><a class="reference" href="#reverse-iterator-operations" id="id49" name="id49"><tt class="literal"><span class="pre">reverse_iterator</span></tt> operations</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#transform-iterator" id="id49" name="id49">Transform iterator</a><ul>
-<li><a class="reference" href="#class-template-transform-iterator" id="id50" name="id50">Class template <tt class="literal"><span class="pre">transform_iterator</span></tt></a></li>
-<li><a class="reference" href="#transform-iterator-requirements" id="id51" name="id51"><tt class="literal"><span class="pre">transform_iterator</span></tt> requirements</a></li>
-<li><a class="reference" href="#transform-iterator-models" id="id52" name="id52"><tt class="literal"><span class="pre">transform_iterator</span></tt> models</a></li>
-<li><a class="reference" href="#transform-iterator-operations" id="id53" name="id53"><tt class="literal"><span class="pre">transform_iterator</span></tt> operations</a></li>
+<li><a class="reference" href="#transform-iterator" id="id50" name="id50">Transform iterator</a><ul>
+<li><a class="reference" href="#class-template-transform-iterator" id="id51" name="id51">Class template <tt class="literal"><span class="pre">transform_iterator</span></tt></a></li>
+<li><a class="reference" href="#transform-iterator-requirements" id="id52" name="id52"><tt class="literal"><span class="pre">transform_iterator</span></tt> requirements</a></li>
+<li><a class="reference" href="#transform-iterator-models" id="id53" name="id53"><tt class="literal"><span class="pre">transform_iterator</span></tt> models</a></li>
+<li><a class="reference" href="#transform-iterator-operations" id="id54" name="id54"><tt class="literal"><span class="pre">transform_iterator</span></tt> operations</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#filter-iterator" id="id54" name="id54">Filter iterator</a><ul>
-<li><a class="reference" href="#class-template-filter-iterator" id="id55" name="id55">Class template <tt class="literal"><span class="pre">filter_iterator</span></tt></a></li>
-<li><a class="reference" href="#filter-iterator-requirements" id="id56" name="id56"><tt class="literal"><span class="pre">filter_iterator</span></tt> requirements</a></li>
-<li><a class="reference" href="#filter-iterator-models" id="id57" name="id57"><tt class="literal"><span class="pre">filter_iterator</span></tt> models</a></li>
-<li><a class="reference" href="#filter-iterator-operations" id="id58" name="id58"><tt class="literal"><span class="pre">filter_iterator</span></tt> operations</a></li>
+<li><a class="reference" href="#filter-iterator" id="id55" name="id55">Filter iterator</a><ul>
+<li><a class="reference" href="#class-template-filter-iterator" id="id56" name="id56">Class template <tt class="literal"><span class="pre">filter_iterator</span></tt></a></li>
+<li><a class="reference" href="#filter-iterator-requirements" id="id57" name="id57"><tt class="literal"><span class="pre">filter_iterator</span></tt> requirements</a></li>
+<li><a class="reference" href="#filter-iterator-models" id="id58" name="id58"><tt class="literal"><span class="pre">filter_iterator</span></tt> models</a></li>
+<li><a class="reference" href="#filter-iterator-operations" id="id59" name="id59"><tt class="literal"><span class="pre">filter_iterator</span></tt> operations</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#counting-iterator" id="id59" name="id59">Counting iterator</a><ul>
-<li><a class="reference" href="#class-template-counting-iterator" id="id60" name="id60">Class template <tt class="literal"><span class="pre">counting_iterator</span></tt></a></li>
-<li><a class="reference" href="#counting-iterator-requirements" id="id61" name="id61"><tt class="literal"><span class="pre">counting_iterator</span></tt> requirements</a></li>
-<li><a class="reference" href="#counting-iterator-models" id="id62" name="id62"><tt class="literal"><span class="pre">counting_iterator</span></tt> models</a></li>
-<li><a class="reference" href="#counting-iterator-operations" id="id63" name="id63"><tt class="literal"><span class="pre">counting_iterator</span></tt> operations</a></li>
+<li><a class="reference" href="#counting-iterator" id="id60" name="id60">Counting iterator</a><ul>
+<li><a class="reference" href="#class-template-counting-iterator" id="id61" name="id61">Class template <tt class="literal"><span class="pre">counting_iterator</span></tt></a></li>
+<li><a class="reference" href="#counting-iterator-requirements" id="id62" name="id62"><tt class="literal"><span class="pre">counting_iterator</span></tt> requirements</a></li>
+<li><a class="reference" href="#counting-iterator-models" id="id63" name="id63"><tt class="literal"><span class="pre">counting_iterator</span></tt> models</a></li>
+<li><a class="reference" href="#counting-iterator-operations" id="id64" name="id64"><tt class="literal"><span class="pre">counting_iterator</span></tt> operations</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#function-output-iterator" id="id64" name="id64">Function output iterator</a><ul>
-<li><a class="reference" href="#class-template-function-output-iterator" id="id65" name="id65">Class template <tt class="literal"><span class="pre">function_output_iterator</span></tt></a></li>
-<li><a class="reference" href="#function-output-iterator-requirements" id="id66" name="id66"><tt class="literal"><span class="pre">function_output_iterator</span></tt> requirements</a></li>
-<li><a class="reference" href="#function-output-iterator-operations" id="id67" name="id67"><tt class="literal"><span class="pre">function_output_iterator</span></tt> operations</a></li>
-<li><a class="reference" href="#function-output-iterator-output-proxy-operations" id="id68" name="id68"><tt class="literal"><span class="pre">function_output_iterator::output_proxy</span></tt> operations</a></li>
+<li><a class="reference" href="#function-output-iterator" id="id65" name="id65">Function output iterator</a><ul>
+<li><a class="reference" href="#class-template-function-output-iterator" id="id66" name="id66">Class template <tt class="literal"><span class="pre">function_output_iterator</span></tt></a></li>
+<li><a class="reference" href="#function-output-iterator-requirements" id="id67" name="id67"><tt class="literal"><span class="pre">function_output_iterator</span></tt> requirements</a></li>
+<li><a class="reference" href="#function-output-iterator-operations" id="id68" name="id68"><tt class="literal"><span class="pre">function_output_iterator</span></tt> operations</a></li>
+<li><a class="reference" href="#function-output-iterator-output-proxy-operations" id="id69" name="id69"><tt class="literal"><span class="pre">function_output_iterator::output_proxy</span></tt> operations</a></li>
 </ul>
 </li>
 </ul>
@@ -324,7 +325,7 @@ of the derived iterator type.  These member functions are described
 briefly below and in more detail in the iterator facade
 requirements.</p>
 <blockquote>
-<table class="table" frame="border" rules="all">
+<table border class="table">
 <colgroup>
 <col width="44%" />
 <col width="56%" />
@@ -594,6 +595,8 @@ class function_output_iterator;
 <p><tt class="literal"><span class="pre">iterator_facade</span></tt> is a base class template that implements the
 interface of standard iterators in terms of a few core functions
 and associated types, to be supplied by a derived iterator class.</p>
+<div class="section" id="class-template-iterator-facade">
+<h3><a class="toc-backref" href="#id28" name="class-template-iterator-facade">Class template <tt class="literal"><span class="pre">iterator_facade</span></tt></a></h3>
 <!-- Version 1.3 of this ReStructuredText document corresponds to
 n1530_, the paper accepted by the LWG for TR1. -->
 <!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All
@@ -704,8 +707,8 @@ struct enable_if_interoperable
     &gt;
 {};
 </pre>
-<div class="section" id="iterator-facade-usage">
-<h3><a class="toc-backref" href="#id28" name="iterator-facade-usage"><tt class="literal"><span class="pre">iterator_facade</span></tt> usage</a></h3>
+<div class="section" id="iterator-facade-requirements">
+<h4><a class="toc-backref" href="#id29" name="iterator-facade-requirements"><tt class="literal"><span class="pre">iterator_facade</span></tt> Requirements</a></h4>
 <p>The following table describes the typical valid expressions on
 <tt class="literal"><span class="pre">iterator_facade</span></tt>'s <tt class="literal"><span class="pre">Derived</span></tt> parameter, depending on the
 iterator concept(s) it will model.  The operations in the first
@@ -717,9 +720,9 @@ object of type <tt class="literal"><span class="pre">X</span></tt>, <tt class="l
 object of a single pass iterator type interoperable with <tt class="literal"><span class="pre">X</span></tt>, and <tt class="literal"><span class="pre">z</span></tt>
 is a constant object of a random access traversal iterator type
 interoperable with <tt class="literal"><span class="pre">X</span></tt>.</p>
-<a class="target" id="core-operations" name="core-operations"></a><div class="section" id="iterator-facade-core-operations">
-<h4><a class="toc-backref" href="#id29" name="iterator-facade-core-operations"><tt class="literal"><span class="pre">iterator_facade</span></tt> Core Operations</a></h4>
-<table class="table" frame="border" rules="all">
+<a class="target" id="core-operations" name="core-operations"></a><div class="topic">
+<p class="topic-title"><tt class="literal"><span class="pre">iterator_facade</span></tt> Core Operations</p>
+<table border class="table">
 <colgroup>
 <col width="19%" />
 <col width="21%" />
@@ -783,10 +786,10 @@ Iterator</td>
 </tr>
 </tbody>
 </table>
-<a class="target" id="facade-iterator-category" name="facade-iterator-category"></a></div>
 </div>
+<a class="target" id="facade-iterator-category" name="facade-iterator-category"></a></div>
 <div class="section" id="iterator-facade-iterator-category">
-<h3><a class="toc-backref" href="#id30" name="iterator-facade-iterator-category"><tt class="literal"><span class="pre">iterator_facade</span></tt> iterator category</a></h3>
+<h4><a class="toc-backref" href="#id30" name="iterator-facade-iterator-category"><tt class="literal"><span class="pre">iterator_facade</span></tt> iterator category</a></h4>
 <p>The <tt class="literal"><span class="pre">iterator_category</span></tt> member of <tt class="literal"><span class="pre">iterator_facade&lt;X,V,R,C,D&gt;</span></tt>
 is a type which satisfies the following conditions:</p>
 <blockquote>
@@ -839,7 +842,7 @@ convertible, and not to any more-derived traversal tag type.</p>
 </blockquote>
 </div>
 <div class="section" id="iterator-facade-operations">
-<h3><a class="toc-backref" href="#id31" name="iterator-facade-operations"><tt class="literal"><span class="pre">iterator_facade</span></tt> operations</a></h3>
+<h4><a class="toc-backref" href="#id31" name="iterator-facade-operations"><tt class="literal"><span class="pre">iterator_facade</span></tt> operations</a></h4>
 <p>The operations in this section are described in terms of operations on
 the core interface of <tt class="literal"><span class="pre">Derived</span></tt> which may be inaccessible
 (i.e. private).  The implementation should access these operations
@@ -980,6 +983,7 @@ return tmp -= n;
 </table>
 </div>
 </div>
+</div>
 <div class="section" id="iterator-adaptor-lib-iterator-adaptor">
 <h2><a class="toc-backref" href="#id32" name="iterator-adaptor-lib-iterator-adaptor">Iterator adaptor [lib.iterator.adaptor]</a></h2>
 <!-- Version 1.1 of this ReStructuredText document corresponds to
@@ -996,6 +1000,8 @@ Whether the derived class models any of the standard iterator concepts
 depends on the operations supported by the <tt class="literal"><span class="pre">Base</span></tt> type and which
 core interface functions of <tt class="literal"><span class="pre">iterator_facade</span></tt> are redefined in the
 <tt class="literal"><span class="pre">Derived</span></tt> class.</p>
+<div class="section" id="class-template-iterator-adaptor">
+<h3><a class="toc-backref" href="#id33" name="class-template-iterator-adaptor">Class template <tt class="literal"><span class="pre">iterator_adaptor</span></tt></a></h3>
 <!-- Version 1.4 of this ReStructuredText document corresponds to
 n1530_, the paper accepted by the LWG for TR1. -->
 <!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All
@@ -1042,8 +1048,9 @@ class iterator_adaptor
     Base m_iterator; // exposition only
 };
 </pre>
-<a class="target" id="base-parameters" name="base-parameters"></a><div class="section" id="iterator-adaptor-base-class-parameters">
-<h3><a class="toc-backref" href="#id33" name="iterator-adaptor-base-class-parameters"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> base class parameters</a></h3>
+<a class="target" id="base-parameters" name="base-parameters"></a></div>
+<div class="section" id="iterator-adaptor-base-class-parameters">
+<h3><a class="toc-backref" href="#id34" name="iterator-adaptor-base-class-parameters"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> base class parameters</a></h3>
 <p>The <em>V</em>, <em>C</em>, <em>R</em>, and <em>D</em> parameters of the <tt class="literal"><span class="pre">iterator_facade</span></tt>
 used as a base class in the summary of <tt class="literal"><span class="pre">iterator_adaptor</span></tt>
 above are defined as follows:</p>
@@ -1073,7 +1080,7 @@ above are defined as follows:</p>
 </pre>
 </div>
 <div class="section" id="iterator-adaptor-usage">
-<h3><a class="toc-backref" href="#id34" name="iterator-adaptor-usage"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> usage</a></h3>
+<h3><a class="toc-backref" href="#id35" name="iterator-adaptor-usage"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> usage</a></h3>
 <p>The <tt class="literal"><span class="pre">Derived</span></tt> template parameter must be a publicly derived from
 <tt class="literal"><span class="pre">iterator_adaptor</span></tt>.  In order for <tt class="literal"><span class="pre">Derived</span></tt> to model the
 iterator concepts corresponding to
@@ -1085,7 +1092,7 @@ in evaluating any valid expression involving <tt class="literal"><span class="pr
 in those concepts' requirements.</p>
 </div>
 <div class="section" id="iterator-adaptor-public-operations">
-<h3><a class="toc-backref" href="#id35" name="iterator-adaptor-public-operations"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> public operations</a></h3>
+<h3><a class="toc-backref" href="#id36" name="iterator-adaptor-public-operations"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> public operations</a></h3>
 <p><tt class="literal"><span class="pre">iterator_adaptor();</span></tt></p>
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
@@ -1119,7 +1126,7 @@ in those concepts' requirements.</p>
 </table>
 </div>
 <div class="section" id="iterator-adaptor-protected-member-functions">
-<h3><a class="toc-backref" href="#id36" name="iterator-adaptor-protected-member-functions"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> protected member functions</a></h3>
+<h3><a class="toc-backref" href="#id37" name="iterator-adaptor-protected-member-functions"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> protected member functions</a></h3>
 <p><tt class="literal"><span class="pre">Base</span> <span class="pre">const&amp;</span> <span class="pre">base_reference()</span> <span class="pre">const;</span></tt></p>
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
@@ -1140,7 +1147,7 @@ in those concepts' requirements.</p>
 </table>
 </div>
 <div class="section" id="iterator-adaptor-private-member-functions">
-<h3><a class="toc-backref" href="#id37" name="iterator-adaptor-private-member-functions"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> private member functions</a></h3>
+<h3><a class="toc-backref" href="#id38" name="iterator-adaptor-private-member-functions"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> private member functions</a></h3>
 <p><tt class="literal"><span class="pre">typename</span> <span class="pre">iterator_adaptor::reference</span> <span class="pre">dereference()</span> <span class="pre">const;</span></tt></p>
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
@@ -1209,7 +1216,7 @@ typename iterator_adaptor::difference_type distance_to(
 </div>
 </div>
 <div class="section" id="specialized-adaptors-lib-iterator-special-adaptors">
-<h2><a class="toc-backref" href="#id38" name="specialized-adaptors-lib-iterator-special-adaptors">Specialized adaptors [lib.iterator.special.adaptors]</a></h2>
+<h2><a class="toc-backref" href="#id39" name="specialized-adaptors-lib-iterator-special-adaptors">Specialized adaptors [lib.iterator.special.adaptors]</a></h2>
 <p>The <tt class="literal"><span class="pre">enable_if_convertible&lt;X,Y&gt;::type</span></tt> expression used in
 this section is for exposition purposes. The converting constructors
 for specialized adaptors should be only be in an overload set provided
@@ -1238,7 +1245,7 @@ take the constructor out of the overload set when the types are not
 implicitly convertible.  
 ]</p>
 <div class="section" id="indirect-iterator">
-<h3><a class="toc-backref" href="#id39" name="indirect-iterator">Indirect iterator</a></h3>
+<h3><a class="toc-backref" href="#id40" name="indirect-iterator">Indirect iterator</a></h3>
 <p>The indirect iterator adapts an iterator by applying an <em>extra</em>
 dereference inside of <tt class="literal"><span class="pre">operator*()</span></tt>. For example, this iterator
 adaptor makes it possible to view a container of pointers
@@ -1247,7 +1254,7 @@ adaptor makes it possible to view a container of pointers
 <!-- At some point we should add the capability to handle
 iterators over smart pointers, which the impl handles. -JGS -->
 <div class="section" id="class-template-indirect-iterator">
-<h4><a class="toc-backref" href="#id40" name="class-template-indirect-iterator">Class template <tt class="literal"><span class="pre">indirect_iterator</span></tt></a></h4>
+<h4><a class="toc-backref" href="#id41" name="class-template-indirect-iterator">Class template <tt class="literal"><span class="pre">indirect_iterator</span></tt></a></h4>
 <pre class="literal-block">
 template &lt;
     class Iterator
@@ -1319,7 +1326,7 @@ satisfies the requirements of the concepts modeled by the indirect
 iterator as specified in the models section.</p>
 </div>
 <div class="section" id="indirect-iterator-requirements">
-<h4><a class="toc-backref" href="#id41" name="indirect-iterator-requirements"><tt class="literal"><span class="pre">indirect_iterator</span></tt> requirements</a></h4>
+<h4><a class="toc-backref" href="#id42" name="indirect-iterator-requirements"><tt class="literal"><span class="pre">indirect_iterator</span></tt> requirements</a></h4>
 <p>The <tt class="literal"><span class="pre">Iterator</span></tt> argument shall meet the requirements of Readable
 Iterator. The <tt class="literal"><span class="pre">CategoryOrTraversal</span></tt> argument shall be one of the
 standard iterator tags or <tt class="literal"><span class="pre">use_default</span></tt>. If <tt class="literal"><span class="pre">CategoryOrTraversal</span></tt>
@@ -1335,7 +1342,7 @@ is not <tt class="literal"><span class="pre">use_default</span></tt>, as implied
 default for the <tt class="literal"><span class="pre">value_type</span></tt> member.</p>
 </div>
 <div class="section" id="indirect-iterator-models">
-<h4><a class="toc-backref" href="#id42" name="indirect-iterator-models"><tt class="literal"><span class="pre">indirect_iterator</span></tt> models</a></h4>
+<h4><a class="toc-backref" href="#id43" name="indirect-iterator-models"><tt class="literal"><span class="pre">indirect_iterator</span></tt> models</a></h4>
 <p>If <tt class="literal"><span class="pre">CategoryOrTraversal</span></tt> is a standard iterator tag,
 <tt class="literal"><span class="pre">indirect_iterator</span></tt> is a model of the iterator concept corresponding
 to the tag, otherwise <tt class="literal"><span class="pre">indirect_iterator</span></tt> satisfies the requirements
@@ -1349,7 +1356,7 @@ the <tt class="literal"><span class="pre">Iterator</span></tt> argument.</p>
 <tt class="literal"><span class="pre">indirect_iterator</span></tt> models Lvalue Iterator.</p>
 </div>
 <div class="section" id="indirect-iterator-operations">
-<h4><a class="toc-backref" href="#id43" name="indirect-iterator-operations"><tt class="literal"><span class="pre">indirect_iterator</span></tt> operations</a></h4>
+<h4><a class="toc-backref" href="#id44" name="indirect-iterator-operations"><tt class="literal"><span class="pre">indirect_iterator</span></tt> operations</a></h4>
 <p>In addition to the operations required by the concepts modeled by
 <tt class="literal"><span class="pre">indirect_iterator</span></tt>, <tt class="literal"><span class="pre">indirect_iterator</span></tt> provides the following
 operations.</p>
@@ -1441,13 +1448,13 @@ indirect_iterator(
 </div>
 </div>
 <div class="section" id="reverse-iterator">
-<h3><a class="toc-backref" href="#id44" name="reverse-iterator">Reverse iterator</a></h3>
+<h3><a class="toc-backref" href="#id45" name="reverse-iterator">Reverse iterator</a></h3>
 <!-- I think we'd better strike the old reverse_iterator text from the standard, eh? -->
 <p>The reverse iterator adaptor flips the direction of a base iterator's
 motion. Invoking <tt class="literal"><span class="pre">operator++()</span></tt> moves the base iterator backward and
 invoking <tt class="literal"><span class="pre">operator--()</span></tt> moves the base iterator forward.</p>
 <div class="section" id="class-template-reverse-iterator">
-<h4><a class="toc-backref" href="#id45" name="class-template-reverse-iterator">Class template <tt class="literal"><span class="pre">reverse_iterator</span></tt></a></h4>
+<h4><a class="toc-backref" href="#id46" name="class-template-reverse-iterator">Class template <tt class="literal"><span class="pre">reverse_iterator</span></tt></a></h4>
 <pre class="literal-block">
 template &lt;class Iterator&gt;
 class reverse_iterator
@@ -1471,19 +1478,19 @@ private:
 </pre>
 </div>
 <div class="section" id="reverse-iterator-requirements">
-<h4><a class="toc-backref" href="#id46" name="reverse-iterator-requirements"><tt class="literal"><span class="pre">reverse_iterator</span></tt> requirements</a></h4>
+<h4><a class="toc-backref" href="#id47" name="reverse-iterator-requirements"><tt class="literal"><span class="pre">reverse_iterator</span></tt> requirements</a></h4>
 <p>The base <tt class="literal"><span class="pre">Iterator</span></tt> must be a model of Bidirectional Traversal
 Iterator and Readable Iterator.</p>
 </div>
 <div class="section" id="reverse-iterator-models">
-<h4><a class="toc-backref" href="#id47" name="reverse-iterator-models"><tt class="literal"><span class="pre">reverse_iterator</span></tt> models</a></h4>
+<h4><a class="toc-backref" href="#id48" name="reverse-iterator-models"><tt class="literal"><span class="pre">reverse_iterator</span></tt> models</a></h4>
 <p><tt class="literal"><span class="pre">reverse_iterator</span></tt> models Bidirectional Traversal Iterator and
 Readable Iterator.  In addition, <tt class="literal"><span class="pre">reverse_iterator</span></tt> models the same
 standard iterator access concepts that the <tt class="literal"><span class="pre">Iterator</span></tt>
 argument models.</p>
 </div>
 <div class="section" id="reverse-iterator-operations">
-<h4><a class="toc-backref" href="#id48" name="reverse-iterator-operations"><tt class="literal"><span class="pre">reverse_iterator</span></tt> operations</a></h4>
+<h4><a class="toc-backref" href="#id49" name="reverse-iterator-operations"><tt class="literal"><span class="pre">reverse_iterator</span></tt> operations</a></h4>
 <p>In addition to the operations required by the concepts modeled by
 <tt class="literal"><span class="pre">reverse_iterator</span></tt>, <tt class="literal"><span class="pre">reverse_iterator</span></tt> provides the following
 operations.</p>
@@ -1573,14 +1580,14 @@ return *..tmp;
 </div>
 </div>
 <div class="section" id="transform-iterator">
-<h3><a class="toc-backref" href="#id49" name="transform-iterator">Transform iterator</a></h3>
+<h3><a class="toc-backref" href="#id50" name="transform-iterator">Transform iterator</a></h3>
 <p>The transform iterator adapts an iterator by applying some function
 object to the result of dereferencing the iterator. In other words,
 the <tt class="literal"><span class="pre">operator*</span></tt> of the transform iterator first dereferences the
 base iterator, passes the result of this to the function object, and
 then returns the result.</p>
 <div class="section" id="class-template-transform-iterator">
-<h4><a class="toc-backref" href="#id50" name="class-template-transform-iterator">Class template <tt class="literal"><span class="pre">transform_iterator</span></tt></a></h4>
+<h4><a class="toc-backref" href="#id51" name="class-template-transform-iterator">Class template <tt class="literal"><span class="pre">transform_iterator</span></tt></a></h4>
 <!-- Version 1.3 of this document was accepted for TR1 -->
 <pre class="literal-block">
 template &lt;class UnaryFunction,
@@ -1611,7 +1618,7 @@ private:
 </pre>
 </div>
 <div class="section" id="transform-iterator-requirements">
-<h4><a class="toc-backref" href="#id51" name="transform-iterator-requirements"><tt class="literal"><span class="pre">transform_iterator</span></tt> requirements</a></h4>
+<h4><a class="toc-backref" href="#id52" name="transform-iterator-requirements"><tt class="literal"><span class="pre">transform_iterator</span></tt> requirements</a></h4>
 <p>The type <tt class="literal"><span class="pre">UnaryFunction</span></tt> must be Assignable, Copy Constructible, and
 the expression <tt class="literal"><span class="pre">f(*i)</span></tt> must be valid where <tt class="literal"><span class="pre">f</span></tt> is an object of
 type <tt class="literal"><span class="pre">UnaryFunction</span></tt>, <tt class="literal"><span class="pre">i</span></tt> is an object of type <tt class="literal"><span class="pre">Iterator</span></tt>, and
@@ -1620,7 +1627,7 @@ where the type of <tt class="literal"><span class="pre">f(*i)</span></tt> must b
 <p>The type <tt class="literal"><span class="pre">Iterator</span></tt> must at least model Readable Iterator.</p>
 </div>
 <div class="section" id="transform-iterator-models">
-<h4><a class="toc-backref" href="#id52" name="transform-iterator-models"><tt class="literal"><span class="pre">transform_iterator</span></tt> models</a></h4>
+<h4><a class="toc-backref" href="#id53" name="transform-iterator-models"><tt class="literal"><span class="pre">transform_iterator</span></tt> models</a></h4>
 <p>The resulting <tt class="literal"><span class="pre">transform_iterator</span></tt> models the most refined of the
 following options that is also modeled by <tt class="literal"><span class="pre">Iterator</span></tt>.</p>
 <blockquote>
@@ -1638,7 +1645,7 @@ concept that is modeled by <tt class="literal"><span class="pre">Iterator</span>
 The <tt class="literal"><span class="pre">value_type</span></tt> is <tt class="literal"><span class="pre">remove_cv&lt;remove_reference&lt;reference&gt;</span> <span class="pre">&gt;::type</span></tt>.</p>
 </div>
 <div class="section" id="transform-iterator-operations">
-<h4><a class="toc-backref" href="#id53" name="transform-iterator-operations"><tt class="literal"><span class="pre">transform_iterator</span></tt> operations</a></h4>
+<h4><a class="toc-backref" href="#id54" name="transform-iterator-operations"><tt class="literal"><span class="pre">transform_iterator</span></tt> operations</a></h4>
 <p>In addition to the operations required by the concepts modeled by
 <tt class="literal"><span class="pre">transform_iterator</span></tt>, <tt class="literal"><span class="pre">transform_iterator</span></tt> provides the following
 operations.</p>
@@ -1731,7 +1738,7 @@ transform_iterator(
 </div>
 </div>
 <div class="section" id="filter-iterator">
-<h3><a class="toc-backref" href="#id54" name="filter-iterator">Filter iterator</a></h3>
+<h3><a class="toc-backref" href="#id55" name="filter-iterator">Filter iterator</a></h3>
 <p>The filter iterator adaptor creates a view of an iterator range in
 which some elements of the range are skipped over. A predicate
 function object controls which elements are skipped. When the
@@ -1743,7 +1750,7 @@ of the underlying range. Therefore the constructor of the filter
 iterator takes two iterator parameters: the position for the filtered
 iterator and the end of the range.</p>
 <div class="section" id="class-template-filter-iterator">
-<h4><a class="toc-backref" href="#id55" name="class-template-filter-iterator">Class template <tt class="literal"><span class="pre">filter_iterator</span></tt></a></h4>
+<h4><a class="toc-backref" href="#id56" name="class-template-filter-iterator">Class template <tt class="literal"><span class="pre">filter_iterator</span></tt></a></h4>
 <pre class="literal-block">
 template &lt;class Predicate, class Iterator&gt;
 class filter_iterator
@@ -1779,7 +1786,7 @@ corresponding to each standard concept modeled by <tt class="literal"><span clas
 as described in the models section.</p>
 </div>
 <div class="section" id="filter-iterator-requirements">
-<h4><a class="toc-backref" href="#id56" name="filter-iterator-requirements"><tt class="literal"><span class="pre">filter_iterator</span></tt> requirements</a></h4>
+<h4><a class="toc-backref" href="#id57" name="filter-iterator-requirements"><tt class="literal"><span class="pre">filter_iterator</span></tt> requirements</a></h4>
 <p>The <tt class="literal"><span class="pre">Predicate</span></tt> argument must be Assignable, Copy Constructible, and
 the expression <tt class="literal"><span class="pre">p(x)</span></tt> must be valid where <tt class="literal"><span class="pre">p</span></tt> is an object of type
 <tt class="literal"><span class="pre">Predicate</span></tt>, <tt class="literal"><span class="pre">x</span></tt> is an object of type
@@ -1790,11 +1797,11 @@ Iterator and Single Pass Iterator or it shall meet the requirements of
 Input Iterator.</p>
 </div>
 <div class="section" id="filter-iterator-models">
-<h4><a class="toc-backref" href="#id57" name="filter-iterator-models"><tt class="literal"><span class="pre">filter_iterator</span></tt> models</a></h4>
+<h4><a class="toc-backref" href="#id58" name="filter-iterator-models"><tt class="literal"><span class="pre">filter_iterator</span></tt> models</a></h4>
 <p>The concepts that <tt class="literal"><span class="pre">filter_iterator</span></tt> models are dependent on what
 concepts the <tt class="literal"><span class="pre">Iterator</span></tt> argument models, as specified in the
 following tables.</p>
-<table class="table" frame="border" rules="all">
+<table border class="table">
 <colgroup>
 <col width="33%" />
 <col width="67%" />
@@ -1813,7 +1820,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table class="table" frame="border" rules="all">
+<table border class="table">
 <colgroup>
 <col width="41%" />
 <col width="59%" />
@@ -1835,7 +1842,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table class="table" frame="border" rules="all">
+<table border class="table">
 <colgroup>
 <col width="63%" />
 <col width="38%" />
@@ -1859,7 +1866,7 @@ following tables.</p>
 </table>
 </div>
 <div class="section" id="filter-iterator-operations">
-<h4><a class="toc-backref" href="#id58" name="filter-iterator-operations"><tt class="literal"><span class="pre">filter_iterator</span></tt> operations</a></h4>
+<h4><a class="toc-backref" href="#id59" name="filter-iterator-operations"><tt class="literal"><span class="pre">filter_iterator</span></tt> operations</a></h4>
 <p>In addition to those operations required by the concepts that
 <tt class="literal"><span class="pre">filter_iterator</span></tt> models, <tt class="literal"><span class="pre">filter_iterator</span></tt> provides the following
 operations.</p>
@@ -1969,11 +1976,11 @@ or <tt class="literal"><span class="pre">m_pred(*m_iter)</span> <span class="pre
 </div>
 </div>
 <div class="section" id="counting-iterator">
-<h3><a class="toc-backref" href="#id59" name="counting-iterator">Counting iterator</a></h3>
+<h3><a class="toc-backref" href="#id60" name="counting-iterator">Counting iterator</a></h3>
 <p><tt class="literal"><span class="pre">counting_iterator</span></tt> adapts an arithmetic type, such as <tt class="literal"><span class="pre">int</span></tt>, by
 adding an <tt class="literal"><span class="pre">operator*</span></tt> that returns the current value of the object.</p>
 <div class="section" id="class-template-counting-iterator">
-<h4><a class="toc-backref" href="#id60" name="class-template-counting-iterator">Class template <tt class="literal"><span class="pre">counting_iterator</span></tt></a></h4>
+<h4><a class="toc-backref" href="#id61" name="class-template-counting-iterator">Class template <tt class="literal"><span class="pre">counting_iterator</span></tt></a></h4>
 <pre class="literal-block">
 template &lt;
     class Incrementable
@@ -2001,13 +2008,13 @@ the cases when the <tt class="literal"><span class="pre">Incrementable</span></t
 </dl>
 </div>
 <div class="section" id="counting-iterator-requirements">
-<h4><a class="toc-backref" href="#id61" name="counting-iterator-requirements"><tt class="literal"><span class="pre">counting_iterator</span></tt> requirements</a></h4>
+<h4><a class="toc-backref" href="#id62" name="counting-iterator-requirements"><tt class="literal"><span class="pre">counting_iterator</span></tt> requirements</a></h4>
 <p>The <tt class="literal"><span class="pre">Incrementable</span></tt> type must be Default Constructible, Copy
 Constructible, and Assignable.  The default distance is
 an implementation defined signed integral type.</p>
 </div>
 <div class="section" id="counting-iterator-models">
-<h4><a class="toc-backref" href="#id62" name="counting-iterator-models"><tt class="literal"><span class="pre">counting_iterator</span></tt> models</a></h4>
+<h4><a class="toc-backref" href="#id63" name="counting-iterator-models"><tt class="literal"><span class="pre">counting_iterator</span></tt> models</a></h4>
 <p><tt class="literal"><span class="pre">counting_iterator</span></tt> models Readable Lvalue Iterator.</p>
 <p>Furthermore, if you wish to create a counting iterator that is a Forward
 Traversal Iterator, then the following expressions must be valid:</p>
@@ -2032,7 +2039,7 @@ i &lt; j
 </pre>
 </div>
 <div class="section" id="counting-iterator-operations">
-<h4><a class="toc-backref" href="#id63" name="counting-iterator-operations"><tt class="literal"><span class="pre">counting_iterator</span></tt> operations</a></h4>
+<h4><a class="toc-backref" href="#id64" name="counting-iterator-operations"><tt class="literal"><span class="pre">counting_iterator</span></tt> operations</a></h4>
 <p>In addition to the operations required by the concepts modeled by
 <tt class="literal"><span class="pre">counting_iterator</span></tt>, <tt class="literal"><span class="pre">counting_iterator</span></tt> provides the following
 operations.</p>
@@ -2107,7 +2114,7 @@ constructed from <tt class="literal"><span class="pre">x</span></tt>.</td>
 </div>
 </div>
 <div class="section" id="function-output-iterator">
-<h3><a class="toc-backref" href="#id64" name="function-output-iterator">Function output iterator</a></h3>
+<h3><a class="toc-backref" href="#id65" name="function-output-iterator">Function output iterator</a></h3>
 <p>The function output iterator adaptor makes it easier to create custom
 output iterators. The adaptor takes a unary function and creates a
 model of Output Iterator. Each item assigned to the output iterator is
@@ -2116,7 +2123,7 @@ iterator is that creating a conforming output iterator is non-trivial,
 particularly because the proper implementation usually requires a
 proxy object.</p>
 <div class="section" id="class-template-function-output-iterator">
-<h4><a class="toc-backref" href="#id65" name="class-template-function-output-iterator">Class template <tt class="literal"><span class="pre">function_output_iterator</span></tt></a></h4>
+<h4><a class="toc-backref" href="#id66" name="class-template-function-output-iterator">Class template <tt class="literal"><span class="pre">function_output_iterator</span></tt></a></h4>
 <pre class="literal-block">
 template &lt;class UnaryFunction&gt;
 class function_output_iterator {
@@ -2143,7 +2150,7 @@ public:
 </pre>
 </div>
 <div class="section" id="function-output-iterator-requirements">
-<h4><a class="toc-backref" href="#id66" name="function-output-iterator-requirements"><tt class="literal"><span class="pre">function_output_iterator</span></tt> requirements</a></h4>
+<h4><a class="toc-backref" href="#id67" name="function-output-iterator-requirements"><tt class="literal"><span class="pre">function_output_iterator</span></tt> requirements</a></h4>
 <p>The <tt class="literal"><span class="pre">UnaryFunction</span></tt> must be Assignable, Copy Constructible, and the
 expression <tt class="literal"><span class="pre">f(x)</span></tt> must be valid, where <tt class="literal"><span class="pre">f</span></tt> is an object of type
 <tt class="literal"><span class="pre">UnaryFunction</span></tt> and <tt class="literal"><span class="pre">x</span></tt> is an object of a type accepted by <tt class="literal"><span class="pre">f</span></tt>.
@@ -2151,7 +2158,7 @@ The resulting <tt class="literal"><span class="pre">function_output_iterator</sp
 and Incrementable Iterator concepts.</p>
 </div>
 <div class="section" id="function-output-iterator-operations">
-<h4><a class="toc-backref" href="#id67" name="function-output-iterator-operations"><tt class="literal"><span class="pre">function_output_iterator</span></tt> operations</a></h4>
+<h4><a class="toc-backref" href="#id68" name="function-output-iterator-operations"><tt class="literal"><span class="pre">function_output_iterator</span></tt> operations</a></h4>
 <p><tt class="literal"><span class="pre">explicit</span> <span class="pre">function_output_iterator(const</span> <span class="pre">UnaryFunction&amp;</span> <span class="pre">f</span> <span class="pre">=</span> <span class="pre">UnaryFunction());</span></tt></p>
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
@@ -2192,7 +2199,7 @@ a copy of the unary function <tt class="literal"><span class="pre">f</span></tt>
 </table>
 </div>
 <div class="section" id="function-output-iterator-output-proxy-operations">
-<h4><a class="toc-backref" href="#id68" name="function-output-iterator-output-proxy-operations"><tt class="literal"><span class="pre">function_output_iterator::output_proxy</span></tt> operations</a></h4>
+<h4><a class="toc-backref" href="#id69" name="function-output-iterator-output-proxy-operations"><tt class="literal"><span class="pre">function_output_iterator::output_proxy</span></tt> operations</a></h4>
 <p><tt class="literal"><span class="pre">output_proxy(UnaryFunction&amp;</span> <span class="pre">f);</span></tt></p>
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
@@ -2227,10 +2234,10 @@ LocalWords:  OtherIncrementable Coplien -->
 </div>
 </div>
 </div>
-<hr class="footer"/>
+<hr class="footer" />
 <div class="footer">
 <a class="reference" href="facade-and-adaptor.rst">View document source</a>.
-Generated on: 2004-01-12 15:41 UTC.
+Generated on: 2004-01-12 16:01 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 </div>
 </body>
diff --git a/doc/facade-and-adaptor.rst b/doc/facade-and-adaptor.rst
index 7cdff26..17174a9 100644
--- a/doc/facade-and-adaptor.rst
+++ b/doc/facade-and-adaptor.rst
@@ -297,6 +297,9 @@ Iterator facade [lib.iterator.facade]
 
 .. include:: iterator_facade_abstract.rst
 
+Class template ``iterator_facade``
+----------------------------------
+
 .. include:: iterator_facade_ref.rst
 
 Iterator adaptor [lib.iterator.adaptor]
@@ -304,6 +307,9 @@ Iterator adaptor [lib.iterator.adaptor]
 
 .. include:: iterator_adaptor_abstract.rst
 
+Class template ``iterator_adaptor``
+-----------------------------------
+
 .. include:: iterator_adaptor_ref.rst
 
 
diff --git a/doc/filter_iterator.html b/doc/filter_iterator.html
index bd57fd4..79f2ac4 100644
--- a/doc/filter_iterator.html
+++ b/doc/filter_iterator.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.2.8: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.1: http://docutils.sourceforge.net/" />
 <title>Filter Iterator</title>
 <meta name="author" content="David Abrahams, Jeremy Siek, Thomas Witt" />
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab, University of Hanover Institute for Transport Railway Operation and Construction" />
@@ -112,7 +112,7 @@ Input Iterator.</p>
 <p>The concepts that <tt class="literal"><span class="pre">filter_iterator</span></tt> models are dependent on what
 concepts the <tt class="literal"><span class="pre">Iterator</span></tt> argument models, as specified in the
 following tables.</p>
-<table class="table" frame="border" rules="all">
+<table border class="table">
 <colgroup>
 <col width="33%" />
 <col width="67%" />
@@ -131,7 +131,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table class="table" frame="border" rules="all">
+<table border class="table">
 <colgroup>
 <col width="41%" />
 <col width="59%" />
@@ -153,7 +153,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table class="table" frame="border" rules="all">
+<table border class="table">
 <colgroup>
 <col width="63%" />
 <col width="38%" />
@@ -378,10 +378,10 @@ int main()
 </pre>
 </div>
 </div>
-<hr class="footer"/>
+<hr class="footer" />
 <div class="footer">
 <a class="reference" href="filter_iterator.rst">View document source</a>.
-Generated on: 2004-01-12 15:46 UTC.
+Generated on: 2004-01-12 16:01 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 </div>
 </body>
diff --git a/doc/iterator_adaptor.html b/doc/iterator_adaptor.html
index 218c193..f03707a 100644
--- a/doc/iterator_adaptor.html
+++ b/doc/iterator_adaptor.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.2.8: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.1: http://docutils.sourceforge.net/" />
 <title>Iterator Adaptor</title>
 <meta name="author" content="David Abrahams, Jeremy Siek, Thomas Witt" />
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab, University of Hanover Institute for Transport Railway Operation and Construction" />
@@ -324,10 +324,10 @@ typename iterator_adaptor::difference_type distance_to(
 </div>
 </div>
 </div>
-<hr class="footer"/>
+<hr class="footer" />
 <div class="footer">
 <a class="reference" href="iterator_adaptor.rst">View document source</a>.
-Generated on: 2004-01-12 15:25 UTC.
+Generated on: 2004-01-12 15:49 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 </div>
 </body>
diff --git a/doc/iterator_facade.html b/doc/iterator_facade.html
index 814ff83..d825dec 100644
--- a/doc/iterator_facade.html
+++ b/doc/iterator_facade.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.2.8: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.1: http://docutils.sourceforge.net/" />
 <title>Iterator Facade</title>
 <meta name="author" content="David Abrahams, Jeremy Siek, Thomas Witt" />
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab, University of Hanover Institute for Transport Railway Operation and Construction" />
@@ -45,51 +45,44 @@ and associated types, to be supplied by a derived iterator class.</td>
 <div class="contents topic" id="table-of-contents">
 <p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
-<li><a class="reference" href="#overview" id="id20" name="id20">Overview</a><ul>
-<li><a class="reference" href="#motivation" id="id21" name="id21">Motivation</a></li>
+<li><a class="reference" href="#a-facade-for-iterator-implementation" id="id21" name="id21">A Facade for Iterator Implementation</a><ul>
 <li><a class="reference" href="#usage" id="id22" name="id22">Usage</a></li>
 <li><a class="reference" href="#iterator-core-access" id="id23" name="id23">Iterator Core Access</a></li>
 <li><a class="reference" href="#operator" id="id24" name="id24"><tt class="literal"><span class="pre">operator[]</span></tt></a></li>
 <li><a class="reference" href="#id2" id="id25" name="id25"><tt class="literal"><span class="pre">operator-&gt;</span></tt></a></li>
+<li><a class="reference" href="#reference" id="id26" name="id26">Reference</a><ul>
+<li><a class="reference" href="#iterator-facade-requirements" id="id27" name="id27"><tt class="literal"><span class="pre">iterator_facade</span></tt> Requirements</a></li>
+<li><a class="reference" href="#iterator-facade-iterator-category" id="id28" name="id28"><tt class="literal"><span class="pre">iterator_facade</span></tt> iterator category</a></li>
+<li><a class="reference" href="#iterator-facade-operations" id="id29" name="id29"><tt class="literal"><span class="pre">iterator_facade</span></tt> operations</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#tutorial-example" id="id26" name="id26">Tutorial Example</a><ul>
-<li><a class="reference" href="#introduction" id="id27" name="id27">Introduction</a></li>
-<li><a class="reference" href="#the-problem" id="id28" name="id28">The Problem</a></li>
-<li><a class="reference" href="#a-basic-iterator-using-iterator-facade" id="id29" name="id29">A Basic Iterator Using <tt class="literal"><span class="pre">iterator_facade</span></tt></a><ul>
-<li><a class="reference" href="#template-arguments-for-iterator-facade" id="id30" name="id30">Template Arguments for <tt class="literal"><span class="pre">iterator_facade</span></tt></a><ul>
-<li><a class="reference" href="#derived" id="id31" name="id31"><tt class="literal"><span class="pre">Derived</span></tt></a></li>
-<li><a class="reference" href="#value" id="id32" name="id32"><tt class="literal"><span class="pre">Value</span></tt></a></li>
-<li><a class="reference" href="#categoryortraversal" id="id33" name="id33"><tt class="literal"><span class="pre">CategoryOrTraversal</span></tt></a></li>
-<li><a class="reference" href="#reference" id="id34" name="id34"><tt class="literal"><span class="pre">Reference</span></tt></a></li>
-<li><a class="reference" href="#difference" id="id35" name="id35"><tt class="literal"><span class="pre">Difference</span></tt></a></li>
 </ul>
 </li>
-<li><a class="reference" href="#constructors-and-data-members" id="id36" name="id36">Constructors and Data Members</a></li>
-<li><a class="reference" href="#core-operations" id="id37" name="id37">Core Operations</a></li>
+<li><a class="reference" href="#tutorial-example" id="id30" name="id30">Tutorial Example</a><ul>
+<li><a class="reference" href="#the-problem" id="id31" name="id31">The Problem</a></li>
+<li><a class="reference" href="#a-basic-iterator-using-iterator-facade" id="id32" name="id32">A Basic Iterator Using <tt class="literal"><span class="pre">iterator_facade</span></tt></a><ul>
+<li><a class="reference" href="#template-arguments-for-iterator-facade" id="id33" name="id33">Template Arguments for <tt class="literal"><span class="pre">iterator_facade</span></tt></a><ul>
+<li><a class="reference" href="#derived" id="id34" name="id34"><tt class="literal"><span class="pre">Derived</span></tt></a></li>
+<li><a class="reference" href="#value" id="id35" name="id35"><tt class="literal"><span class="pre">Value</span></tt></a></li>
+<li><a class="reference" href="#categoryortraversal" id="id36" name="id36"><tt class="literal"><span class="pre">CategoryOrTraversal</span></tt></a></li>
+<li><a class="reference" href="#id10" id="id37" name="id37"><tt class="literal"><span class="pre">Reference</span></tt></a></li>
+<li><a class="reference" href="#difference" id="id38" name="id38"><tt class="literal"><span class="pre">Difference</span></tt></a></li>
 </ul>
 </li>
-<li><a class="reference" href="#a-constant-node-iterator" id="id38" name="id38">A constant <tt class="literal"><span class="pre">node_iterator</span></tt></a></li>
-<li><a class="reference" href="#interoperability" id="id39" name="id39">Interoperability</a></li>
-<li><a class="reference" href="#telling-the-truth" id="id40" name="id40">Telling the Truth</a></li>
-<li><a class="reference" href="#wrap-up" id="id41" name="id41">Wrap Up</a></li>
+<li><a class="reference" href="#constructors-and-data-members" id="id39" name="id39">Constructors and Data Members</a></li>
+<li><a class="reference" href="#id12" id="id40" name="id40">Core Operations</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#id14" id="id42" name="id42">Reference</a><ul>
-<li><a class="reference" href="#iterator-facade-usage" id="id43" name="id43"><tt class="literal"><span class="pre">iterator_facade</span></tt> usage</a><ul>
-<li><a class="reference" href="#iterator-facade-core-operations" id="id44" name="id44"><tt class="literal"><span class="pre">iterator_facade</span></tt> Core Operations</a></li>
-</ul>
-</li>
-<li><a class="reference" href="#iterator-facade-iterator-category" id="id45" name="id45"><tt class="literal"><span class="pre">iterator_facade</span></tt> iterator category</a></li>
-<li><a class="reference" href="#iterator-facade-operations" id="id46" name="id46"><tt class="literal"><span class="pre">iterator_facade</span></tt> operations</a></li>
+<li><a class="reference" href="#a-constant-node-iterator" id="id41" name="id41">A constant <tt class="literal"><span class="pre">node_iterator</span></tt></a></li>
+<li><a class="reference" href="#interoperability" id="id42" name="id42">Interoperability</a></li>
+<li><a class="reference" href="#telling-the-truth" id="id43" name="id43">Telling the Truth</a></li>
+<li><a class="reference" href="#wrap-up" id="id44" name="id44">Wrap Up</a></li>
 </ul>
 </li>
 </ul>
 </div>
-<div class="section" id="overview">
-<h1><a class="toc-backref" href="#id20" name="overview">Overview</a></h1>
-<div class="section" id="motivation">
-<h2><a class="toc-backref" href="#id21" name="motivation">Motivation</a></h2>
+<div class="section" id="a-facade-for-iterator-implementation">
+<h1><a class="toc-backref" href="#id21" name="a-facade-for-iterator-implementation">A Facade for Iterator Implementation</a></h1>
 <!-- Version 1.1 of this ReStructuredText document corresponds to
 n1530_, the paper accepted by the LWG for TR1. -->
 <!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All
@@ -131,7 +124,6 @@ iterators, and a separate <tt class="literal"><span class="pre">iterator_adaptor
 impossible.</li>
 </ol>
 </blockquote>
-</div>
 <div class="section" id="usage">
 <h2><a class="toc-backref" href="#id22" name="usage">Usage</a></h2>
 <p>The user of <tt class="literal"><span class="pre">iterator_facade</span></tt> derives his iterator class from a
@@ -150,7 +142,7 @@ of the derived iterator type.  These member functions are described
 briefly below and in more detail in the iterator facade
 requirements.</p>
 <blockquote>
-<table class="table" frame="border" rules="all">
+<table border class="table">
 <colgroup>
 <col width="44%" />
 <col width="56%" />
@@ -269,485 +261,13 @@ specialization to meet the requirements of its <tt class="literal"><span class="
 <colgroup><col class="label" /><col /></colgroup>
 <col />
 <tbody valign="top">
-<tr><td class="label"><a name="cop95">[Cop95]</a></td><td><em>(<a class="fn-backref" href="#id1">1</a>, <a class="fn-backref" href="#id3">2</a>)</em> [Coplien, 1995] Coplien, J., Curiously Recurring Template
+<tr><td class="label"><a name="cop95">[Cop95]</a></td><td><em>(<a class="fn-backref" href="#id1">1</a>, <a class="fn-backref" href="#id8">2</a>)</em> [Coplien, 1995] Coplien, J., Curiously Recurring Template
 Patterns, C++ Report, February 1995, pp. 24-27.</td></tr>
 </tbody>
 </table>
 </div>
-</div>
-<div class="section" id="tutorial-example">
-<h1><a class="toc-backref" href="#id26" name="tutorial-example">Tutorial Example</a></h1>
-<!-- Copyright David Abrahams 2004. Use, modification and distribution is -->
-<!-- subject to the Boost Software License, Version 1.0. (See accompanying -->
-<!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
-<div class="section" id="introduction">
-<h2><a class="toc-backref" href="#id27" name="introduction">Introduction</a></h2>
-<p>In this section we'll walk through the implementation of a few
-iterators using <tt class="literal"><span class="pre">iterator_facade</span></tt>, based around the simple
-example of a linked list of polymorphic objects.</p>
-</div>
-<div class="section" id="the-problem">
-<h2><a class="toc-backref" href="#id28" name="the-problem">The Problem</a></h2>
-<p>Say we've written a polymorphic linked list node base class:</p>
-<pre class="literal-block">
-# include &lt;iostream&gt;
-
-struct node_base
-{
-    node_base() : m_next(0) {}
-
-    // Each node manages all of its tail nodes
-    virtual ~node_base() { delete m_next; }
-
-    // Access the rest of the list
-    node_base* next() const { return m_next; }
-
-    // print to the stream
-    virtual void print(std::ostream&amp; s) const = 0;
-    
-    // double the value
-    virtual void double_me() = 0;
-
-    void append(node_base* p)
-    {
-        if (m_next) 
-            m_next-&gt;append(p); 
-        else
-            m_next = p; 
-    }
-
- private:
-    node_base* m_next;
-};
-</pre>
-<p>Lists can hold objects of different types by linking together
-specializations of the following template:</p>
-<pre class="literal-block">
-template &lt;class T&gt;
-struct node : node_base
-{
-    node(T x)
-      : m_value(x)
-    {}
-
-    void print(std::ostream&amp; s) const { s &lt;&lt; this-&gt;m_value; }
-    void double_me() { m_value += m_value; }
-
- private:
-    T m_value;
-};
-</pre>
-<p>And we can print any node using the following streaming operator:</p>
-<pre class="literal-block">
-inline std::ostream&amp; operator&lt;&lt;(std::ostream&amp; s, node_base const&amp; n)
-{
-    n.print(s);
-    return s;
-}
-</pre>
-<p>Our first challenge is to build an appropriate iterator over these
-lists.</p>
-</div>
-<div class="section" id="a-basic-iterator-using-iterator-facade">
-<h2><a class="toc-backref" href="#id29" name="a-basic-iterator-using-iterator-facade">A Basic Iterator Using <tt class="literal"><span class="pre">iterator_facade</span></tt></a></h2>
-<p>We will construct a <tt class="literal"><span class="pre">node_iterator</span></tt> class using inheritance from
-<tt class="literal"><span class="pre">iterator_facade</span></tt> to implement most of the iterator's operations.</p>
-<pre class="literal-block">
-# include &quot;node.hpp&quot;
-# include &lt;boost/iterator/iterator_facade.hpp&gt;
-
-class node_iterator
-  : public boost::iterator_facade&lt;...&gt;
-{
-   ...
-};
-</pre>
-<div class="section" id="template-arguments-for-iterator-facade">
-<h3><a class="toc-backref" href="#id30" name="template-arguments-for-iterator-facade">Template Arguments for <tt class="literal"><span class="pre">iterator_facade</span></tt></a></h3>
-<p><tt class="literal"><span class="pre">iterator_facade</span></tt> has several template parameters, so we must decide
-what types to use for the arguments. The parameters are <tt class="literal"><span class="pre">Derived</span></tt>,
-<tt class="literal"><span class="pre">Value</span></tt>, <tt class="literal"><span class="pre">CategoryOrTraversal</span></tt>, <tt class="literal"><span class="pre">Reference</span></tt>, and <tt class="literal"><span class="pre">Difference</span></tt>.</p>
-<div class="section" id="derived">
-<h4><a class="toc-backref" href="#id31" name="derived"><tt class="literal"><span class="pre">Derived</span></tt></a></h4>
-<p>Because <tt class="literal"><span class="pre">iterator_facade</span></tt> is meant to be used with the CRTP
-<a class="citation-reference" href="#cop95" id="id3" name="id3">[Cop95]</a> the first parameter is the iterator class name itself,
-<tt class="literal"><span class="pre">node_iterator</span></tt>.</p>
-</div>
-<div class="section" id="value">
-<h4><a class="toc-backref" href="#id32" name="value"><tt class="literal"><span class="pre">Value</span></tt></a></h4>
-<p>The <tt class="literal"><span class="pre">Value</span></tt> parameter determines the <tt class="literal"><span class="pre">node_iterator</span></tt>'s
-<tt class="literal"><span class="pre">value_type</span></tt>.  In this case, we are iterating over <tt class="literal"><span class="pre">node_base</span></tt>
-objects, so <tt class="literal"><span class="pre">Value</span></tt> will be <tt class="literal"><span class="pre">node_base</span></tt>.</p>
-</div>
-<div class="section" id="categoryortraversal">
-<h4><a class="toc-backref" href="#id33" name="categoryortraversal"><tt class="literal"><span class="pre">CategoryOrTraversal</span></tt></a></h4>
-<p>Now we have to determine which <a class="reference" href="new-iter-concepts.html#iterator-traversal-concepts-lib-iterator-traversal">iterator traversal concept</a> our
-<tt class="literal"><span class="pre">node_iterator</span></tt> is going to model.  Singly-linked lists only have
-forward links, so our iterator can't can't be a <a class="reference" href="new-iter-concepts.html#bidirectional-traversal-iterators-lib-bidirectional-traversal-iterators">bidirectional
-traversal iterator</a>.  Our iterator should be able to make multiple
-passes over the same linked list (unlike, say, an
-<tt class="literal"><span class="pre">istream_iterator</span></tt> which consumes the stream it traverses), so it
-must be a <a class="reference" href="new-iter-concepts.html#forward-traversal-iterators-lib-forward-traversal-iterators">forward traversal iterator</a>.  Therefore, we'll pass
-<tt class="literal"><span class="pre">boost::forward_traversal_tag</span></tt> in this position <a class="footnote-reference" href="#category" id="id4" name="id4"><sup>1</sup></a>.</p>
-<table class="footnote" frame="void" id="category" rules="none">
-<colgroup><col class="label" /><col /></colgroup>
-<tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id4" name="category">[1]</a></td><td><tt class="literal"><span class="pre">iterator_facade</span></tt> also supports old-style category
-tags, so we could have passed <tt class="literal"><span class="pre">std::forward_iterator_tag</span></tt> here;
-either way, the resulting iterator's <tt class="literal"><span class="pre">iterator_category</span></tt> will
-end up being <tt class="literal"><span class="pre">std::forward_iterator_tag</span></tt>.</td></tr>
-</tbody>
-</table>
-</div>
 <div class="section" id="reference">
-<h4><a class="toc-backref" href="#id34" name="reference"><tt class="literal"><span class="pre">Reference</span></tt></a></h4>
-<p>The <tt class="literal"><span class="pre">Reference</span></tt> argument becomes the type returned by
-<tt class="literal"><span class="pre">node_iterator</span></tt>'s dereference operation, and will also be the
-same as <tt class="literal"><span class="pre">std::iterator_traits&lt;node_iterator&gt;::reference</span></tt>.  The
-library's default for this parameter is <tt class="literal"><span class="pre">Value&amp;</span></tt>; since
-<tt class="literal"><span class="pre">node_base&amp;</span></tt> is a good choice for the iterator's <tt class="literal"><span class="pre">reference</span></tt>
-type, we can omit this argument, or pass <tt class="literal"><span class="pre">use_default</span></tt>.</p>
-</div>
-<div class="section" id="difference">
-<h4><a class="toc-backref" href="#id35" name="difference"><tt class="literal"><span class="pre">Difference</span></tt></a></h4>
-<p>The <tt class="literal"><span class="pre">Difference</span></tt> argument determines how the distance between
-two <tt class="literal"><span class="pre">node_iterator</span></tt>s will be measured and will also be the
-same as <tt class="literal"><span class="pre">std::iterator_traits&lt;node_iterator&gt;::difference_type</span></tt>.
-The library's default for <tt class="literal"><span class="pre">Difference</span></tt> is <tt class="literal"><span class="pre">std::ptrdiff_t</span></tt>, an
-appropriate type for measuring the distance between any two
-addresses in memory, and one that works for almost any iterator,
-so we can omit this argument, too.</p>
-<p>The declaration of <tt class="literal"><span class="pre">node_iterator</span></tt> will therefore look something
-like:</p>
-<pre class="literal-block">
-# include &quot;node.hpp&quot;
-# include &lt;boost/iterator/iterator_facade.hpp&gt;
-
-class node_iterator
-  : public boost::iterator_facade&lt;
-        node_iterator
-      , node_base
-      , boost::forward_traversal_tag
-    &gt;
-{
-   ...
-};
-</pre>
-</div>
-</div>
-<div class="section" id="constructors-and-data-members">
-<h3><a class="toc-backref" href="#id36" name="constructors-and-data-members">Constructors and Data Members</a></h3>
-<p>Next we need to decide how to represent the iterator's position.
-This representation will take the form of data members, so we'll
-also need to write constructors to initialize them.  The
-<tt class="literal"><span class="pre">node_iterator</span></tt>'s position is quite naturally represented using
-a pointer to a <tt class="literal"><span class="pre">node_base</span></tt>.  We'll need a constructor to build an
-iterator from a <tt class="literal"><span class="pre">node_base*</span></tt>, and a default constructor to
-satisfy the <a class="reference" href="new-iter-concepts.html#forward-traversal-iterators-lib-forward-traversal-iterators">forward traversal iterator</a> requirements <a class="footnote-reference" href="#default" id="id5" name="id5"><sup>2</sup></a>.
-Our <tt class="literal"><span class="pre">node_iterator</span></tt> then becomes:</p>
-<pre class="literal-block">
-# include &quot;node.hpp&quot;
-# include &lt;boost/iterator/iterator_facade.hpp&gt;
-
-class node_iterator
-  : public boost::iterator_facade&lt;
-        node_iterator
-      , node_base
-      , boost::forward_traversal_tag
-    &gt;
-{
- public:
-    node_iterator()
-      : m_node(0)
-    {}
-
-    explicit node_iterator(node_base* p)
-      : m_node(p)
-    {}
-
- private:
-    ...
-    node_base* m_node;
-};
-</pre>
-<table class="footnote" frame="void" id="default" rules="none">
-<colgroup><col class="label" /><col /></colgroup>
-<tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id5" name="default">[2]</a></td><td>Technically, the C++ standard places almost no
-requirements on a default-constructed iterator, so if we were
-really concerned with efficiency, we could've written the
-default constructor to leave <tt class="literal"><span class="pre">m_node</span></tt> uninitialized.</td></tr>
-</tbody>
-</table>
-</div>
-<div class="section" id="core-operations">
-<h3><a class="toc-backref" href="#id37" name="core-operations">Core Operations</a></h3>
-<p>The last step is to implement the <a class="reference" href="#id18">core operations</a> required by
-the concepts we want our iterator to model.  Referring to the
-<a class="reference" href="#id18">table</a>, we can see that the first three rows are applicable
-because <tt class="literal"><span class="pre">node_iterator</span></tt> needs to satisfy the requirements for
-<a class="reference" href="new-iter-concepts.html#readable-iterators-lib-readable-iterators">readable iterator</a>, <a class="reference" href="new-iter-concepts.html#single-pass-iterators-lib-single-pass-iterators">single pass iterator</a>, and <a class="reference" href="new-iter-concepts.html#incrementable-iterators-lib-incrementable-iterators">incrementable
-iterator</a>.</p>
-<p>We therefore need to supply <tt class="literal"><span class="pre">dereference</span></tt>,
-<tt class="literal"><span class="pre">equal</span></tt>, and <tt class="literal"><span class="pre">increment</span></tt> members.  We don't want these members
-to become part of <tt class="literal"><span class="pre">node_iterator</span></tt>'s public interface, so we can
-make them private and grant friendship to
-<tt class="literal"><span class="pre">boost::iterator_core_access</span></tt>, a &quot;back-door&quot; that
-<tt class="literal"><span class="pre">iterator_facade</span></tt> uses to get access to the core operations:</p>
-<pre class="literal-block">
-# include &quot;node.hpp&quot;
-# include &lt;boost/iterator/iterator_facade.hpp&gt;
-
-class node_iterator
-  : public boost::iterator_facade&lt;
-        node_iterator
-      , node_base
-      , boost::forward_traversal_tag
-    &gt;
-{
- public:
-    node_iterator()
-      : m_node(0) {}
-
-    explicit node_iterator(node_base* p)
-      : m_node(p) {}
-
- private:
-    friend class boost::iterator_core_access;
-
-    void increment() { m_node = m_node-&gt;next(); }
-
-    bool equal(node_iterator const&amp; other) const
-    {
-        return this-&gt;m_node == other.m_node;
-    }
-
-    node_base&amp; dereference() const { return *m_node; }
-
-    node_base* m_node;
-};
-</pre>
-<p>Voilà; a complete and conforming readable, forward-traversal
-iterator!  For a working example of its use, see <a class="reference" href="../example/node_iterator1.cpp">this program</a>.</p>
-</div>
-</div>
-<div class="section" id="a-constant-node-iterator">
-<h2><a class="toc-backref" href="#id38" name="a-constant-node-iterator">A constant <tt class="literal"><span class="pre">node_iterator</span></tt></a></h2>
-<div class="sidebar">
-<p class="sidebar-title">Constant and Mutable iterators</p>
-<p>The term <strong>mutable iterator</strong> means an iterator through which
-the object it references (its &quot;referent&quot;) can be modified.  A
-<strong>constant iterator</strong> is one which doesn't allow modification of
-its referent.</p>
-<p>The words <em>constant</em> and <em>mutable</em> don't refer to the ability to
-modify the iterator itself.  For example, an <tt class="literal"><span class="pre">int</span> <span class="pre">const*</span></tt> is a
-non-<tt class="literal"><span class="pre">const</span></tt> <em>constant iterator</em>, which can be incremented
-but doesn't allow modification of its referent, and <tt class="literal"><span class="pre">int*</span>
-<span class="pre">const</span></tt> is a <tt class="literal"><span class="pre">const</span></tt> <em>mutable iterator</em>, which cannot be
-modified but which allows modification of its referent.</p>
-<p>Confusing?  We agree, but those are the standard terms.  It
-probably doesn't help much that a container's constant iterator
-is called <tt class="literal"><span class="pre">const_iterator</span></tt>.</p>
-</div>
-<p>Now, our <tt class="literal"><span class="pre">node_iterator</span></tt> gives clients access to both <tt class="literal"><span class="pre">node</span></tt>'s <tt class="literal"><span class="pre">print(std::ostream&amp;)</span> <span class="pre">const</span></tt> member function, but also its
-mutating <tt class="literal"><span class="pre">double_me()</span></tt> member.  If we wanted to build a
-<em>constant</em> <tt class="literal"><span class="pre">node_iterator</span></tt>, we'd only have to make three
-changes:</p>
-<pre class="literal-block">
-class const_node_iterator
-  : public boost::iterator_facade&lt;
-        node_iterator
-      , node_base <strong>const</strong>
-      , boost::forward_traversal_tag
-    &gt;
-{
- public:
-    const_node_iterator()
-      : m_node(0) {}
-
-    explicit const_node_iterator(node_base* p)
-      : m_node(p) {}
-
- private:
-    friend class boost::iterator_core_access;
-
-    void increment() { m_node = m_node-&gt;next(); }
-
-    bool equal(const_node_iterator const&amp; other) const
-    {
-        return this-&gt;m_node == other.m_node;
-    }
-
-    node_base <strong>const</strong>&amp; dereference() const { return *m_node; }
-
-    node_base <strong>const</strong>* m_node;
-};
-</pre>
-<div class="sidebar">
-<p class="sidebar-title"><tt class="literal"><span class="pre">const</span></tt> and an iterator's <tt class="literal"><span class="pre">value_type</span></tt></p>
-<p>The C++ standard requires an iterator's <tt class="literal"><span class="pre">value_type</span></tt> <em>not</em> be
-<tt class="literal"><span class="pre">const</span></tt>-qualified, so <tt class="literal"><span class="pre">iterator_facade</span></tt> strips the
-<tt class="literal"><span class="pre">const</span></tt> from its <tt class="literal"><span class="pre">Value</span></tt> parameter in order to produce the
-iterator's <tt class="literal"><span class="pre">value_type</span></tt>.  Making the <tt class="literal"><span class="pre">Value</span></tt> argument
-<tt class="literal"><span class="pre">const</span></tt> provides a useful hint to <tt class="literal"><span class="pre">iterator_facade</span></tt> that the
-iterator is a <em>constant iterator</em>, and the default <tt class="literal"><span class="pre">Reference</span></tt>
-argument will be correct for all lvalue iterators.</p>
-</div>
-<p>As a matter of fact, <tt class="literal"><span class="pre">node_iterator</span></tt> and <tt class="literal"><span class="pre">const_node_iterator</span></tt>
-are so similar that it makes sense to factor the common code out
-into a template as follows:</p>
-<pre class="literal-block">
-template &lt;class Value&gt;
-class node_iter
-  : public boost::iterator_facade&lt;
-        node_iter&lt;Value&gt;
-      , Value
-      , boost::forward_traversal_tag
-    &gt;
-{
- public:
-    node_iter()
-      : m_node(0) {}
-
-    explicit node_iter(Value* p)
-      : m_node(p) {}
-
- private:
-    friend class boost::iterator_core_access;
-
-    bool equal(node_iter&lt;Value&gt; const&amp; other) const
-    {
-        return this-&gt;m_node == other.m_node;
-    }
-
-    void increment()
-    { m_node = m_node-&gt;next(); }
-
-    Value&amp; dereference() const
-    { return *m_node; }
-
-    Value* m_node;
-};
-typedef node_iter&lt;node_base&gt; node_iterator;
-typedef node_iter&lt;node_base const&gt; node_const_iterator;
-</pre>
-</div>
-<div class="section" id="interoperability">
-<h2><a class="toc-backref" href="#id39" name="interoperability">Interoperability</a></h2>
-<p>Our <tt class="literal"><span class="pre">const_node_iterator</span></tt> works perfectly well on its own, but
-taken together with <tt class="literal"><span class="pre">node_iterator</span></tt> it doesn't quite meet
-expectations.  For example, we'd like to be able to pass a
-<tt class="literal"><span class="pre">node_iterator</span></tt> where a <tt class="literal"><span class="pre">node_const_iterator</span></tt> was expected,
-just as you can with <tt class="literal"><span class="pre">std::list&lt;int&gt;</span></tt>'s <tt class="literal"><span class="pre">iterator</span></tt> and
-<tt class="literal"><span class="pre">const_iterator</span></tt>.  Furthermore, given a <tt class="literal"><span class="pre">node_iterator</span></tt> and a
-<tt class="literal"><span class="pre">node_const_iterator</span></tt> into the same list, we should be able to
-compare them for equality.</p>
-<p>This expected ability to use two different iterator types together
-is known as <strong>interoperability</strong>.  Achieving interoperability in
-our case is as simple as templatizing the <tt class="literal"><span class="pre">equal</span></tt> function and
-adding a templatized converting constructor <a class="footnote-reference" href="#broken" id="id8" name="id8"><sup>3</sup></a> <a class="footnote-reference" href="#random" id="id9" name="id9"><sup>4</sup></a>:</p>
-<pre class="literal-block">
-template &lt;class Value&gt;
-class node_iter
-  : public boost::iterator_facade&lt;
-        node_iter&lt;Value&gt;
-      , Value
-      , boost::forward_traversal_tag
-    &gt;
-{
- public:
-    node_iter()
-      : m_node(0) {}
-
-    explicit node_iter(Value* p)
-      : m_node(p) {}
-
-    template &lt;class OtherValue&gt;
-    node_iter(node_iter&lt;OtherValue&gt; const&amp; other)
-      : m_node(other.m_node) {}
-
- private:
-    friend class boost::iterator_core_access;
-    template &lt;class&gt; friend class node_iter;
-
-    template &lt;class OtherValue&gt;
-    bool equal(node_iter&lt;OtherValue&gt; const&amp; other) const
-    { 
-        return this-&gt;m_node == other.m_node;
-    }
-
-    void increment()
-    { m_node = m_node-&gt;next(); }
-
-    Value&amp; dereference() const
-    { return *m_node; }
-
-    Value* m_node;
-};
-typedef impl::node_iterator&lt;node_base&gt; node_iterator;
-typedef impl::node_iterator&lt;node_base const&gt; node_const_iterator;
-</pre>
-<table class="footnote" frame="void" id="broken" rules="none">
-<colgroup><col class="label" /><col /></colgroup>
-<tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id8" name="broken">[3]</a></td><td>If you're using an older compiler and it can't handle
-this example, see the <a class="reference" href="../example/node_iterator2.hpp">example code</a> for workarounds.</td></tr>
-</tbody>
-</table>
-<table class="footnote" frame="void" id="random" rules="none">
-<colgroup><col class="label" /><col /></colgroup>
-<tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id9" name="random">[4]</a></td><td>If <tt class="literal"><span class="pre">node_iterator</span></tt> had been a <a class="reference" href="new-iter-concepts.html#random-access-traversal-iterators-lib-random-access-traversal-iterators">random access
-traversal iterator</a>, we'd have had to templatize its
-<tt class="literal"><span class="pre">distance_to</span></tt> function as well.</td></tr>
-</tbody>
-</table>
-<p>You can see an example program which exercises our interoperable
-iterators <a class="reference" href="../example/node_iterator2.cpp">here</a>.</p>
-</div>
-<div class="section" id="telling-the-truth">
-<h2><a class="toc-backref" href="#id40" name="telling-the-truth">Telling the Truth</a></h2>
-<p>Now <tt class="literal"><span class="pre">node_iterator</span></tt> and <tt class="literal"><span class="pre">node_const_iterator</span></tt> behave exactly as
-you'd expect... almost.  We can compare them and we can convert in
-one direction: from <tt class="literal"><span class="pre">node_iterator</span></tt> to <tt class="literal"><span class="pre">node_const_iterator</span></tt>.
-If we try to convert from <tt class="literal"><span class="pre">node_const_iterator</span></tt> to
-<tt class="literal"><span class="pre">node_iterator</span></tt>, we'll get an error when the converting
-constructor tries to initialize <tt class="literal"><span class="pre">node_iterator</span></tt>'s <tt class="literal"><span class="pre">m_node</span></tt>, a
-<tt class="literal"><span class="pre">node*</span></tt> with a <tt class="literal"><span class="pre">node</span> <span class="pre">const*</span></tt>.  So what's the problem?</p>
-<p>The problem is that
-<tt class="literal"><span class="pre">boost::</span></tt><a class="reference" href="../../type_traits/index.html#relationships"><tt class="literal"><span class="pre">is_convertible</span></tt></a><tt class="literal"><span class="pre">&lt;node_const_iterator,node_iterator&gt;::value</span></tt>
-will be <tt class="literal"><span class="pre">true</span></tt>, but it should be <tt class="literal"><span class="pre">false</span></tt>.  <a class="reference" href="../../type_traits/index.html#relationships"><tt class="literal"><span class="pre">is_convertible</span></tt></a>
-lies because it can only see as far as the <em>declaration</em> of
-<tt class="literal"><span class="pre">node_iter</span></tt>'s converting constructor, but can't look inside at
-the <em>definition</em> to make sure it will compile.  A perfect solution
-would make <tt class="literal"><span class="pre">node_iter</span></tt>'s converting constructor disappear when
-the <tt class="literal"><span class="pre">m_node</span></tt> conversion would fail.</p>
-<p>In fact, that sort of magic is possible using
-<a class="reference" href="../../utility/enable_if.html"><tt class="literal"><span class="pre">boost::enable_if</span></tt></a>.  By rewriting the converting constructor as
-follows, we can remove it from the overload set when it's not
-appropriate:</p>
-<pre class="literal-block">
-template &lt;class OtherValue&gt;
-node_iter(
-    node_iter&lt;OtherValue&gt; const&amp; other
-  , typename boost::enable_if&lt;
-        boost::is_convertible&lt;OtherValue*,Value*&gt;
-      , enabler
-    &gt;::type = enabler()
-)
-  : m_node(other.m_node) {}
-</pre>
-</div>
-<div class="section" id="wrap-up">
-<h2><a class="toc-backref" href="#id41" name="wrap-up">Wrap Up</a></h2>
-<p>This concludes our <tt class="literal"><span class="pre">iterator_facade</span></tt> tutorial, but before you
-stop reading we urge you to take a look at <a class="reference" href="iterator_adaptor.html"><tt class="literal"><span class="pre">iterator_adaptor</span></tt></a>.
-There's another way to approach writing these iterators which might
-even be superior.</p>
-</div>
-</div>
-<div class="section" id="id14">
-<h1><a class="toc-backref" href="#id42" name="id14">Reference</a></h1>
+<h2><a class="toc-backref" href="#id26" name="reference">Reference</a></h2>
 <!-- Version 1.3 of this ReStructuredText document corresponds to
 n1530_, the paper accepted by the LWG for TR1. -->
 <!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All
@@ -858,8 +378,8 @@ struct enable_if_interoperable
     &gt;
 {};
 </pre>
-<div class="section" id="iterator-facade-usage">
-<h2><a class="toc-backref" href="#id43" name="iterator-facade-usage"><tt class="literal"><span class="pre">iterator_facade</span></tt> usage</a></h2>
+<div class="section" id="iterator-facade-requirements">
+<h3><a class="toc-backref" href="#id27" name="iterator-facade-requirements"><tt class="literal"><span class="pre">iterator_facade</span></tt> Requirements</a></h3>
 <p>The following table describes the typical valid expressions on
 <tt class="literal"><span class="pre">iterator_facade</span></tt>'s <tt class="literal"><span class="pre">Derived</span></tt> parameter, depending on the
 iterator concept(s) it will model.  The operations in the first
@@ -871,9 +391,9 @@ object of type <tt class="literal"><span class="pre">X</span></tt>, <tt class="l
 object of a single pass iterator type interoperable with <tt class="literal"><span class="pre">X</span></tt>, and <tt class="literal"><span class="pre">z</span></tt>
 is a constant object of a random access traversal iterator type
 interoperable with <tt class="literal"><span class="pre">X</span></tt>.</p>
-<a class="target" id="id18" name="id18"></a><div class="section" id="iterator-facade-core-operations">
-<h3><a class="toc-backref" href="#id44" name="iterator-facade-core-operations"><tt class="literal"><span class="pre">iterator_facade</span></tt> Core Operations</a></h3>
-<table class="table" frame="border" rules="all">
+<a class="target" id="core-operations" name="core-operations"></a><div class="topic">
+<p class="topic-title"><tt class="literal"><span class="pre">iterator_facade</span></tt> Core Operations</p>
+<table border class="table">
 <colgroup>
 <col width="19%" />
 <col width="21%" />
@@ -937,10 +457,10 @@ Iterator</td>
 </tr>
 </tbody>
 </table>
-<a class="target" id="facade-iterator-category" name="facade-iterator-category"></a></div>
 </div>
+<a class="target" id="facade-iterator-category" name="facade-iterator-category"></a></div>
 <div class="section" id="iterator-facade-iterator-category">
-<h2><a class="toc-backref" href="#id45" name="iterator-facade-iterator-category"><tt class="literal"><span class="pre">iterator_facade</span></tt> iterator category</a></h2>
+<h3><a class="toc-backref" href="#id28" name="iterator-facade-iterator-category"><tt class="literal"><span class="pre">iterator_facade</span></tt> iterator category</a></h3>
 <p>The <tt class="literal"><span class="pre">iterator_category</span></tt> member of <tt class="literal"><span class="pre">iterator_facade&lt;X,V,R,C,D&gt;</span></tt>
 is a type which satisfies the following conditions:</p>
 <blockquote>
@@ -993,7 +513,7 @@ convertible, and not to any more-derived traversal tag type.</p>
 </blockquote>
 </div>
 <div class="section" id="iterator-facade-operations">
-<h2><a class="toc-backref" href="#id46" name="iterator-facade-operations"><tt class="literal"><span class="pre">iterator_facade</span></tt> operations</a></h2>
+<h3><a class="toc-backref" href="#id29" name="iterator-facade-operations"><tt class="literal"><span class="pre">iterator_facade</span></tt> operations</a></h3>
 <p>The operations in this section are described in terms of operations on
 the core interface of <tt class="literal"><span class="pre">Derived</span></tt> which may be inaccessible
 (i.e. private).  The implementation should access these operations
@@ -1135,10 +655,481 @@ return tmp -= n;
 </div>
 </div>
 </div>
-<hr class="footer"/>
+<div class="section" id="tutorial-example">
+<h1><a class="toc-backref" href="#id30" name="tutorial-example">Tutorial Example</a></h1>
+<!-- Copyright David Abrahams 2004. Use, modification and distribution is -->
+<!-- subject to the Boost Software License, Version 1.0. (See accompanying -->
+<!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
+<p>In this section we'll walk through the implementation of a few
+iterators using <tt class="literal"><span class="pre">iterator_facade</span></tt>, based around the simple
+example of a linked list of polymorphic objects.  This example was
+inspired by a <a class="reference" href="http://thread.gmane.org/gmane.comp.lib.boost.user/5100">posting</a> by Keith Macdonald on the <a class="reference" href="../../../more/mailing_lists.htm#users">Boost-Users</a>
+mailing list.</p>
+<div class="section" id="the-problem">
+<h2><a class="toc-backref" href="#id31" name="the-problem">The Problem</a></h2>
+<p>Say we've written a polymorphic linked list node base class:</p>
+<pre class="literal-block">
+# include &lt;iostream&gt;
+
+struct node_base
+{
+    node_base() : m_next(0) {}
+
+    // Each node manages all of its tail nodes
+    virtual ~node_base() { delete m_next; }
+
+    // Access the rest of the list
+    node_base* next() const { return m_next; }
+
+    // print to the stream
+    virtual void print(std::ostream&amp; s) const = 0;
+    
+    // double the value
+    virtual void double_me() = 0;
+
+    void append(node_base* p)
+    {
+        if (m_next) 
+            m_next-&gt;append(p); 
+        else
+            m_next = p; 
+    }
+
+ private:
+    node_base* m_next;
+};
+</pre>
+<p>Lists can hold objects of different types by linking together
+specializations of the following template:</p>
+<pre class="literal-block">
+template &lt;class T&gt;
+struct node : node_base
+{
+    node(T x)
+      : m_value(x)
+    {}
+
+    void print(std::ostream&amp; s) const { s &lt;&lt; this-&gt;m_value; }
+    void double_me() { m_value += m_value; }
+
+ private:
+    T m_value;
+};
+</pre>
+<p>And we can print any node using the following streaming operator:</p>
+<pre class="literal-block">
+inline std::ostream&amp; operator&lt;&lt;(std::ostream&amp; s, node_base const&amp; n)
+{
+    n.print(s);
+    return s;
+}
+</pre>
+<p>Our first challenge is to build an appropriate iterator over these
+lists.</p>
+</div>
+<div class="section" id="a-basic-iterator-using-iterator-facade">
+<h2><a class="toc-backref" href="#id32" name="a-basic-iterator-using-iterator-facade">A Basic Iterator Using <tt class="literal"><span class="pre">iterator_facade</span></tt></a></h2>
+<p>We will construct a <tt class="literal"><span class="pre">node_iterator</span></tt> class using inheritance from
+<tt class="literal"><span class="pre">iterator_facade</span></tt> to implement most of the iterator's operations.</p>
+<pre class="literal-block">
+# include &quot;node.hpp&quot;
+# include &lt;boost/iterator/iterator_facade.hpp&gt;
+
+class node_iterator
+  : public boost::iterator_facade&lt;...&gt;
+{
+   ...
+};
+</pre>
+<div class="section" id="template-arguments-for-iterator-facade">
+<h3><a class="toc-backref" href="#id33" name="template-arguments-for-iterator-facade">Template Arguments for <tt class="literal"><span class="pre">iterator_facade</span></tt></a></h3>
+<p><tt class="literal"><span class="pre">iterator_facade</span></tt> has several template parameters, so we must decide
+what types to use for the arguments. The parameters are <tt class="literal"><span class="pre">Derived</span></tt>,
+<tt class="literal"><span class="pre">Value</span></tt>, <tt class="literal"><span class="pre">CategoryOrTraversal</span></tt>, <tt class="literal"><span class="pre">Reference</span></tt>, and <tt class="literal"><span class="pre">Difference</span></tt>.</p>
+<div class="section" id="derived">
+<h4><a class="toc-backref" href="#id34" name="derived"><tt class="literal"><span class="pre">Derived</span></tt></a></h4>
+<p>Because <tt class="literal"><span class="pre">iterator_facade</span></tt> is meant to be used with the CRTP
+<a class="citation-reference" href="#cop95" id="id8" name="id8">[Cop95]</a> the first parameter is the iterator class name itself,
+<tt class="literal"><span class="pre">node_iterator</span></tt>.</p>
+</div>
+<div class="section" id="value">
+<h4><a class="toc-backref" href="#id35" name="value"><tt class="literal"><span class="pre">Value</span></tt></a></h4>
+<p>The <tt class="literal"><span class="pre">Value</span></tt> parameter determines the <tt class="literal"><span class="pre">node_iterator</span></tt>'s
+<tt class="literal"><span class="pre">value_type</span></tt>.  In this case, we are iterating over <tt class="literal"><span class="pre">node_base</span></tt>
+objects, so <tt class="literal"><span class="pre">Value</span></tt> will be <tt class="literal"><span class="pre">node_base</span></tt>.</p>
+</div>
+<div class="section" id="categoryortraversal">
+<h4><a class="toc-backref" href="#id36" name="categoryortraversal"><tt class="literal"><span class="pre">CategoryOrTraversal</span></tt></a></h4>
+<p>Now we have to determine which <a class="reference" href="new-iter-concepts.html#iterator-traversal-concepts-lib-iterator-traversal">iterator traversal concept</a> our
+<tt class="literal"><span class="pre">node_iterator</span></tt> is going to model.  Singly-linked lists only have
+forward links, so our iterator can't can't be a <a class="reference" href="new-iter-concepts.html#bidirectional-traversal-iterators-lib-bidirectional-traversal-iterators">bidirectional
+traversal iterator</a>.  Our iterator should be able to make multiple
+passes over the same linked list (unlike, say, an
+<tt class="literal"><span class="pre">istream_iterator</span></tt> which consumes the stream it traverses), so it
+must be a <a class="reference" href="new-iter-concepts.html#forward-traversal-iterators-lib-forward-traversal-iterators">forward traversal iterator</a>.  Therefore, we'll pass
+<tt class="literal"><span class="pre">boost::forward_traversal_tag</span></tt> in this position <a class="footnote-reference" href="#category" id="id9" name="id9"><sup>1</sup></a>.</p>
+<table class="footnote" frame="void" id="category" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id9" name="category">[1]</a></td><td><tt class="literal"><span class="pre">iterator_facade</span></tt> also supports old-style category
+tags, so we could have passed <tt class="literal"><span class="pre">std::forward_iterator_tag</span></tt> here;
+either way, the resulting iterator's <tt class="literal"><span class="pre">iterator_category</span></tt> will
+end up being <tt class="literal"><span class="pre">std::forward_iterator_tag</span></tt>.</td></tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id10">
+<h4><a class="toc-backref" href="#id37" name="id10"><tt class="literal"><span class="pre">Reference</span></tt></a></h4>
+<p>The <tt class="literal"><span class="pre">Reference</span></tt> argument becomes the type returned by
+<tt class="literal"><span class="pre">node_iterator</span></tt>'s dereference operation, and will also be the
+same as <tt class="literal"><span class="pre">std::iterator_traits&lt;node_iterator&gt;::reference</span></tt>.  The
+library's default for this parameter is <tt class="literal"><span class="pre">Value&amp;</span></tt>; since
+<tt class="literal"><span class="pre">node_base&amp;</span></tt> is a good choice for the iterator's <tt class="literal"><span class="pre">reference</span></tt>
+type, we can omit this argument, or pass <tt class="literal"><span class="pre">use_default</span></tt>.</p>
+</div>
+<div class="section" id="difference">
+<h4><a class="toc-backref" href="#id38" name="difference"><tt class="literal"><span class="pre">Difference</span></tt></a></h4>
+<p>The <tt class="literal"><span class="pre">Difference</span></tt> argument determines how the distance between
+two <tt class="literal"><span class="pre">node_iterator</span></tt>s will be measured and will also be the
+same as <tt class="literal"><span class="pre">std::iterator_traits&lt;node_iterator&gt;::difference_type</span></tt>.
+The library's default for <tt class="literal"><span class="pre">Difference</span></tt> is <tt class="literal"><span class="pre">std::ptrdiff_t</span></tt>, an
+appropriate type for measuring the distance between any two
+addresses in memory, and one that works for almost any iterator,
+so we can omit this argument, too.</p>
+<p>The declaration of <tt class="literal"><span class="pre">node_iterator</span></tt> will therefore look something
+like:</p>
+<pre class="literal-block">
+# include &quot;node.hpp&quot;
+# include &lt;boost/iterator/iterator_facade.hpp&gt;
+
+class node_iterator
+  : public boost::iterator_facade&lt;
+        node_iterator
+      , node_base
+      , boost::forward_traversal_tag
+    &gt;
+{
+   ...
+};
+</pre>
+</div>
+</div>
+<div class="section" id="constructors-and-data-members">
+<h3><a class="toc-backref" href="#id39" name="constructors-and-data-members">Constructors and Data Members</a></h3>
+<p>Next we need to decide how to represent the iterator's position.
+This representation will take the form of data members, so we'll
+also need to write constructors to initialize them.  The
+<tt class="literal"><span class="pre">node_iterator</span></tt>'s position is quite naturally represented using
+a pointer to a <tt class="literal"><span class="pre">node_base</span></tt>.  We'll need a constructor to build an
+iterator from a <tt class="literal"><span class="pre">node_base*</span></tt>, and a default constructor to
+satisfy the <a class="reference" href="new-iter-concepts.html#forward-traversal-iterators-lib-forward-traversal-iterators">forward traversal iterator</a> requirements <a class="footnote-reference" href="#default" id="id11" name="id11"><sup>2</sup></a>.
+Our <tt class="literal"><span class="pre">node_iterator</span></tt> then becomes:</p>
+<pre class="literal-block">
+# include &quot;node.hpp&quot;
+# include &lt;boost/iterator/iterator_facade.hpp&gt;
+
+class node_iterator
+  : public boost::iterator_facade&lt;
+        node_iterator
+      , node_base
+      , boost::forward_traversal_tag
+    &gt;
+{
+ public:
+    node_iterator()
+      : m_node(0)
+    {}
+
+    explicit node_iterator(node_base* p)
+      : m_node(p)
+    {}
+
+ private:
+    ...
+    node_base* m_node;
+};
+</pre>
+<table class="footnote" frame="void" id="default" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id11" name="default">[2]</a></td><td>Technically, the C++ standard places almost no
+requirements on a default-constructed iterator, so if we were
+really concerned with efficiency, we could've written the
+default constructor to leave <tt class="literal"><span class="pre">m_node</span></tt> uninitialized.</td></tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id12">
+<h3><a class="toc-backref" href="#id40" name="id12">Core Operations</a></h3>
+<p>The last step is to implement the <a class="reference" href="#core-operations">core operations</a> required by
+the concepts we want our iterator to model.  Referring to the
+<a class="reference" href="#core-operations">table</a>, we can see that the first three rows are applicable
+because <tt class="literal"><span class="pre">node_iterator</span></tt> needs to satisfy the requirements for
+<a class="reference" href="new-iter-concepts.html#readable-iterators-lib-readable-iterators">readable iterator</a>, <a class="reference" href="new-iter-concepts.html#single-pass-iterators-lib-single-pass-iterators">single pass iterator</a>, and <a class="reference" href="new-iter-concepts.html#incrementable-iterators-lib-incrementable-iterators">incrementable
+iterator</a>.</p>
+<p>We therefore need to supply <tt class="literal"><span class="pre">dereference</span></tt>,
+<tt class="literal"><span class="pre">equal</span></tt>, and <tt class="literal"><span class="pre">increment</span></tt> members.  We don't want these members
+to become part of <tt class="literal"><span class="pre">node_iterator</span></tt>'s public interface, so we can
+make them private and grant friendship to
+<tt class="literal"><span class="pre">boost::iterator_core_access</span></tt>, a &quot;back-door&quot; that
+<tt class="literal"><span class="pre">iterator_facade</span></tt> uses to get access to the core operations:</p>
+<pre class="literal-block">
+# include &quot;node.hpp&quot;
+# include &lt;boost/iterator/iterator_facade.hpp&gt;
+
+class node_iterator
+  : public boost::iterator_facade&lt;
+        node_iterator
+      , node_base
+      , boost::forward_traversal_tag
+    &gt;
+{
+ public:
+    node_iterator()
+      : m_node(0) {}
+
+    explicit node_iterator(node_base* p)
+      : m_node(p) {}
+
+ private:
+    friend class boost::iterator_core_access;
+
+    void increment() { m_node = m_node-&gt;next(); }
+
+    bool equal(node_iterator const&amp; other) const
+    {
+        return this-&gt;m_node == other.m_node;
+    }
+
+    node_base&amp; dereference() const { return *m_node; }
+
+    node_base* m_node;
+};
+</pre>
+<p>Voilà; a complete and conforming readable, forward-traversal
+iterator!  For a working example of its use, see <a class="reference" href="../example/node_iterator1.cpp">this program</a>.</p>
+</div>
+</div>
+<div class="section" id="a-constant-node-iterator">
+<h2><a class="toc-backref" href="#id41" name="a-constant-node-iterator">A constant <tt class="literal"><span class="pre">node_iterator</span></tt></a></h2>
+<div class="sidebar">
+<p class="sidebar-title">Constant and Mutable iterators</p>
+<p>The term <strong>mutable iterator</strong> means an iterator through which
+the object it references (its &quot;referent&quot;) can be modified.  A
+<strong>constant iterator</strong> is one which doesn't allow modification of
+its referent.</p>
+<p>The words <em>constant</em> and <em>mutable</em> don't refer to the ability to
+modify the iterator itself.  For example, an <tt class="literal"><span class="pre">int</span> <span class="pre">const*</span></tt> is a
+non-<tt class="literal"><span class="pre">const</span></tt> <em>constant iterator</em>, which can be incremented
+but doesn't allow modification of its referent, and <tt class="literal"><span class="pre">int*</span>
+<span class="pre">const</span></tt> is a <tt class="literal"><span class="pre">const</span></tt> <em>mutable iterator</em>, which cannot be
+modified but which allows modification of its referent.</p>
+<p>Confusing?  We agree, but those are the standard terms.  It
+probably doesn't help much that a container's constant iterator
+is called <tt class="literal"><span class="pre">const_iterator</span></tt>.</p>
+</div>
+<p>Now, our <tt class="literal"><span class="pre">node_iterator</span></tt> gives clients access to both <tt class="literal"><span class="pre">node</span></tt>'s <tt class="literal"><span class="pre">print(std::ostream&amp;)</span> <span class="pre">const</span></tt> member function, but also its
+mutating <tt class="literal"><span class="pre">double_me()</span></tt> member.  If we wanted to build a
+<em>constant</em> <tt class="literal"><span class="pre">node_iterator</span></tt>, we'd only have to make three
+changes:</p>
+<pre class="literal-block">
+class const_node_iterator
+  : public boost::iterator_facade&lt;
+        node_iterator
+      , node_base <strong>const</strong>
+      , boost::forward_traversal_tag
+    &gt;
+{
+ public:
+    const_node_iterator()
+      : m_node(0) {}
+
+    explicit const_node_iterator(node_base* p)
+      : m_node(p) {}
+
+ private:
+    friend class boost::iterator_core_access;
+
+    void increment() { m_node = m_node-&gt;next(); }
+
+    bool equal(const_node_iterator const&amp; other) const
+    {
+        return this-&gt;m_node == other.m_node;
+    }
+
+    node_base <strong>const</strong>&amp; dereference() const { return *m_node; }
+
+    node_base <strong>const</strong>* m_node;
+};
+</pre>
+<div class="sidebar">
+<p class="sidebar-title"><tt class="literal"><span class="pre">const</span></tt> and an iterator's <tt class="literal"><span class="pre">value_type</span></tt></p>
+<p>The C++ standard requires an iterator's <tt class="literal"><span class="pre">value_type</span></tt> <em>not</em> be
+<tt class="literal"><span class="pre">const</span></tt>-qualified, so <tt class="literal"><span class="pre">iterator_facade</span></tt> strips the
+<tt class="literal"><span class="pre">const</span></tt> from its <tt class="literal"><span class="pre">Value</span></tt> parameter in order to produce the
+iterator's <tt class="literal"><span class="pre">value_type</span></tt>.  Making the <tt class="literal"><span class="pre">Value</span></tt> argument
+<tt class="literal"><span class="pre">const</span></tt> provides a useful hint to <tt class="literal"><span class="pre">iterator_facade</span></tt> that the
+iterator is a <em>constant iterator</em>, and the default <tt class="literal"><span class="pre">Reference</span></tt>
+argument will be correct for all lvalue iterators.</p>
+</div>
+<p>As a matter of fact, <tt class="literal"><span class="pre">node_iterator</span></tt> and <tt class="literal"><span class="pre">const_node_iterator</span></tt>
+are so similar that it makes sense to factor the common code out
+into a template as follows:</p>
+<pre class="literal-block">
+template &lt;class Value&gt;
+class node_iter
+  : public boost::iterator_facade&lt;
+        node_iter&lt;Value&gt;
+      , Value
+      , boost::forward_traversal_tag
+    &gt;
+{
+ public:
+    node_iter()
+      : m_node(0) {}
+
+    explicit node_iter(Value* p)
+      : m_node(p) {}
+
+ private:
+    friend class boost::iterator_core_access;
+
+    bool equal(node_iter&lt;Value&gt; const&amp; other) const
+    {
+        return this-&gt;m_node == other.m_node;
+    }
+
+    void increment()
+    { m_node = m_node-&gt;next(); }
+
+    Value&amp; dereference() const
+    { return *m_node; }
+
+    Value* m_node;
+};
+typedef node_iter&lt;node_base&gt; node_iterator;
+typedef node_iter&lt;node_base const&gt; node_const_iterator;
+</pre>
+</div>
+<div class="section" id="interoperability">
+<h2><a class="toc-backref" href="#id42" name="interoperability">Interoperability</a></h2>
+<p>Our <tt class="literal"><span class="pre">const_node_iterator</span></tt> works perfectly well on its own, but
+taken together with <tt class="literal"><span class="pre">node_iterator</span></tt> it doesn't quite meet
+expectations.  For example, we'd like to be able to pass a
+<tt class="literal"><span class="pre">node_iterator</span></tt> where a <tt class="literal"><span class="pre">node_const_iterator</span></tt> was expected,
+just as you can with <tt class="literal"><span class="pre">std::list&lt;int&gt;</span></tt>'s <tt class="literal"><span class="pre">iterator</span></tt> and
+<tt class="literal"><span class="pre">const_iterator</span></tt>.  Furthermore, given a <tt class="literal"><span class="pre">node_iterator</span></tt> and a
+<tt class="literal"><span class="pre">node_const_iterator</span></tt> into the same list, we should be able to
+compare them for equality.</p>
+<p>This expected ability to use two different iterator types together
+is known as <strong>interoperability</strong>.  Achieving interoperability in
+our case is as simple as templatizing the <tt class="literal"><span class="pre">equal</span></tt> function and
+adding a templatized converting constructor <a class="footnote-reference" href="#broken" id="id15" name="id15"><sup>3</sup></a> <a class="footnote-reference" href="#random" id="id16" name="id16"><sup>4</sup></a>:</p>
+<pre class="literal-block">
+template &lt;class Value&gt;
+class node_iter
+  : public boost::iterator_facade&lt;
+        node_iter&lt;Value&gt;
+      , Value
+      , boost::forward_traversal_tag
+    &gt;
+{
+ public:
+    node_iter()
+      : m_node(0) {}
+
+    explicit node_iter(Value* p)
+      : m_node(p) {}
+
+    template &lt;class OtherValue&gt;
+    node_iter(node_iter&lt;OtherValue&gt; const&amp; other)
+      : m_node(other.m_node) {}
+
+ private:
+    friend class boost::iterator_core_access;
+    template &lt;class&gt; friend class node_iter;
+
+    template &lt;class OtherValue&gt;
+    bool equal(node_iter&lt;OtherValue&gt; const&amp; other) const
+    { 
+        return this-&gt;m_node == other.m_node;
+    }
+
+    void increment()
+    { m_node = m_node-&gt;next(); }
+
+    Value&amp; dereference() const
+    { return *m_node; }
+
+    Value* m_node;
+};
+typedef impl::node_iterator&lt;node_base&gt; node_iterator;
+typedef impl::node_iterator&lt;node_base const&gt; node_const_iterator;
+</pre>
+<table class="footnote" frame="void" id="broken" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id15" name="broken">[3]</a></td><td>If you're using an older compiler and it can't handle
+this example, see the <a class="reference" href="../example/node_iterator2.hpp">example code</a> for workarounds.</td></tr>
+</tbody>
+</table>
+<table class="footnote" frame="void" id="random" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id16" name="random">[4]</a></td><td>If <tt class="literal"><span class="pre">node_iterator</span></tt> had been a <a class="reference" href="new-iter-concepts.html#random-access-traversal-iterators-lib-random-access-traversal-iterators">random access
+traversal iterator</a>, we'd have had to templatize its
+<tt class="literal"><span class="pre">distance_to</span></tt> function as well.</td></tr>
+</tbody>
+</table>
+<p>You can see an example program which exercises our interoperable
+iterators <a class="reference" href="../example/node_iterator2.cpp">here</a>.</p>
+</div>
+<div class="section" id="telling-the-truth">
+<h2><a class="toc-backref" href="#id43" name="telling-the-truth">Telling the Truth</a></h2>
+<p>Now <tt class="literal"><span class="pre">node_iterator</span></tt> and <tt class="literal"><span class="pre">node_const_iterator</span></tt> behave exactly as
+you'd expect... almost.  We can compare them and we can convert in
+one direction: from <tt class="literal"><span class="pre">node_iterator</span></tt> to <tt class="literal"><span class="pre">node_const_iterator</span></tt>.
+If we try to convert from <tt class="literal"><span class="pre">node_const_iterator</span></tt> to
+<tt class="literal"><span class="pre">node_iterator</span></tt>, we'll get an error when the converting
+constructor tries to initialize <tt class="literal"><span class="pre">node_iterator</span></tt>'s <tt class="literal"><span class="pre">m_node</span></tt>, a
+<tt class="literal"><span class="pre">node*</span></tt> with a <tt class="literal"><span class="pre">node</span> <span class="pre">const*</span></tt>.  So what's the problem?</p>
+<p>The problem is that
+<tt class="literal"><span class="pre">boost::</span></tt><a class="reference" href="../../type_traits/index.html#relationships"><tt class="literal"><span class="pre">is_convertible</span></tt></a><tt class="literal"><span class="pre">&lt;node_const_iterator,node_iterator&gt;::value</span></tt>
+will be <tt class="literal"><span class="pre">true</span></tt>, but it should be <tt class="literal"><span class="pre">false</span></tt>.  <a class="reference" href="../../type_traits/index.html#relationships"><tt class="literal"><span class="pre">is_convertible</span></tt></a>
+lies because it can only see as far as the <em>declaration</em> of
+<tt class="literal"><span class="pre">node_iter</span></tt>'s converting constructor, but can't look inside at
+the <em>definition</em> to make sure it will compile.  A perfect solution
+would make <tt class="literal"><span class="pre">node_iter</span></tt>'s converting constructor disappear when
+the <tt class="literal"><span class="pre">m_node</span></tt> conversion would fail.</p>
+<p>In fact, that sort of magic is possible using
+<a class="reference" href="../../utility/enable_if.html"><tt class="literal"><span class="pre">boost::enable_if</span></tt></a>.  By rewriting the converting constructor as
+follows, we can remove it from the overload set when it's not
+appropriate:</p>
+<pre class="literal-block">
+template &lt;class OtherValue&gt;
+node_iter(
+    node_iter&lt;OtherValue&gt; const&amp; other
+  , typename boost::enable_if&lt;
+        boost::is_convertible&lt;OtherValue*,Value*&gt;
+      , enabler
+    &gt;::type = enabler()
+)
+  : m_node(other.m_node) {}
+</pre>
+</div>
+<div class="section" id="wrap-up">
+<h2><a class="toc-backref" href="#id44" name="wrap-up">Wrap Up</a></h2>
+<p>This concludes our <tt class="literal"><span class="pre">iterator_facade</span></tt> tutorial, but before you
+stop reading we urge you to take a look at <a class="reference" href="iterator_adaptor.html"><tt class="literal"><span class="pre">iterator_adaptor</span></tt></a>.
+There's another way to approach writing these iterators which might
+even be superior.</p>
+</div>
+</div>
+</div>
+<hr class="footer" />
 <div class="footer">
 <a class="reference" href="iterator_facade.rst">View document source</a>.
-Generated on: 2004-01-12 15:06 UTC.
+Generated on: 2004-01-12 15:49 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 </div>
 </body>
diff --git a/doc/iterator_facade.rst b/doc/iterator_facade.rst
index 3caab6d..b7b0397 100644
--- a/doc/iterator_facade.rst
+++ b/doc/iterator_facade.rst
@@ -20,22 +20,21 @@
 
 .. contents:: Table of Contents
 
-Overview
-========
-
-Motivation
-----------
+A Facade for Iterator Implementation
+====================================
 
 .. include:: iterator_facade_body.rst
 
+
+Reference
+---------
+
+.. include:: iterator_facade_ref.rst
+
+.. _counting: counting_iterator.html
+
 Tutorial Example
 ================
 
 .. include:: iterator_facade_tutorial.rst
 
-Reference
-=========
-
-.. include:: iterator_facade_ref.rst
-
-.. _counting: counting_iterator.html
diff --git a/doc/iterator_facade_ref.rst b/doc/iterator_facade_ref.rst
index fd6960a..f879971 100644
--- a/doc/iterator_facade_ref.rst
+++ b/doc/iterator_facade_ref.rst
@@ -120,8 +120,8 @@ were defined to be::
   {};
 
 
-``iterator_facade`` usage
--------------------------
+``iterator_facade`` Requirements
+................................
 
 The following table describes the typical valid expressions on
 ``iterator_facade``\ 's ``Derived`` parameter, depending on the
@@ -138,40 +138,39 @@ interoperable with ``X``.
 
 .. _`core operations`:
 
-``iterator_facade`` Core Operations
-...................................
+.. topic:: ``iterator_facade`` Core Operations
 
-+--------------------+----------------------+-------------------------------------+---------------------------+
-|Expression          |Return Type           |Assertion/Note                       |Used to implement Iterator |
-|                    |                      |                                     |Concept(s)                 |
-+====================+======================+=====================================+===========================+
-|``c.dereference()`` |``F::reference``      |                                     |Readable Iterator, Writable|
-|                    |                      |                                     |Iterator                   |
-+--------------------+----------------------+-------------------------------------+---------------------------+
-|``c.equal(y)``      |convertible to bool   |true iff ``c`` and ``y`` refer to the|Single Pass Iterator       |
-|                    |                      |same position.  Implements ``c == y``|                           |
-|                    |                      |and ``c != y``.                      |                           |
-+--------------------+----------------------+-------------------------------------+---------------------------+
-|``a.increment()``   |unused                |                                     |Incrementable Iterator     |
-+--------------------+----------------------+-------------------------------------+---------------------------+
-|``a.decrement()``   |unused                |                                     |Bidirectional Traversal    |
-|                    |                      |                                     |Iterator                   |
-+--------------------+----------------------+-------------------------------------+---------------------------+
-|``a.advance(n)``    |unused                |                                     |Random Access Traversal    |
-|                    |                      |                                     |Iterator                   |
-+--------------------+----------------------+-------------------------------------+---------------------------+
-|``c.distance_to(b)``|convertible to        |equivalent to ``distance(c, b)``     |Random Access Traversal    |
-|                    |``F::difference_type``|                                     |Iterator                   |
-+--------------------+----------------------+-------------------------------------+---------------------------+
-|``c.distance_to(z)``|convertible to        |equivalent to ``distance(c, z)``.    |Random Access Traversal    |
-|                    |``F::difference_type``|Implements ``c - z``, ``c < z``, ``c |Iterator                   |
-|                    |                      |<= z``, ``c > z``, and ``c >= c``.   |                           |
-+--------------------+----------------------+-------------------------------------+---------------------------+
+   +--------------------+----------------------+-------------------------------------+---------------------------+
+   |Expression          |Return Type           |Assertion/Note                       |Used to implement Iterator |
+   |                    |                      |                                     |Concept(s)                 |
+   +====================+======================+=====================================+===========================+
+   |``c.dereference()`` |``F::reference``      |                                     |Readable Iterator, Writable|
+   |                    |                      |                                     |Iterator                   |
+   +--------------------+----------------------+-------------------------------------+---------------------------+
+   |``c.equal(y)``      |convertible to bool   |true iff ``c`` and ``y`` refer to the|Single Pass Iterator       |
+   |                    |                      |same position.  Implements ``c == y``|                           |
+   |                    |                      |and ``c != y``.                      |                           |
+   +--------------------+----------------------+-------------------------------------+---------------------------+
+   |``a.increment()``   |unused                |                                     |Incrementable Iterator     |
+   +--------------------+----------------------+-------------------------------------+---------------------------+
+   |``a.decrement()``   |unused                |                                     |Bidirectional Traversal    |
+   |                    |                      |                                     |Iterator                   |
+   +--------------------+----------------------+-------------------------------------+---------------------------+
+   |``a.advance(n)``    |unused                |                                     |Random Access Traversal    |
+   |                    |                      |                                     |Iterator                   |
+   +--------------------+----------------------+-------------------------------------+---------------------------+
+   |``c.distance_to(b)``|convertible to        |equivalent to ``distance(c, b)``     |Random Access Traversal    |
+   |                    |``F::difference_type``|                                     |Iterator                   |
+   +--------------------+----------------------+-------------------------------------+---------------------------+
+   |``c.distance_to(z)``|convertible to        |equivalent to ``distance(c, z)``.    |Random Access Traversal    |
+   |                    |``F::difference_type``|Implements ``c - z``, ``c < z``, ``c |Iterator                   |
+   |                    |                      |<= z``, ``c > z``, and ``c >= c``.   |                           |
+   +--------------------+----------------------+-------------------------------------+---------------------------+
 
 .. _facade iterator category:
 
 ``iterator_facade`` iterator category
--------------------------------------
+.....................................
 
 The ``iterator_category`` member of ``iterator_facade<X,V,R,C,D>``
 is a type which satisfies the following conditions:
@@ -219,7 +218,7 @@ is a type which satisfies the following conditions:
 
 
 ``iterator_facade`` operations
-------------------------------
+..............................
 
 The operations in this section are described in terms of operations on
 the core interface of ``Derived`` which may be inaccessible
diff --git a/doc/iterator_facade_tutorial.rst b/doc/iterator_facade_tutorial.rst
index 869e5d5..837fcbc 100755
--- a/doc/iterator_facade_tutorial.rst
+++ b/doc/iterator_facade_tutorial.rst
@@ -2,12 +2,15 @@
 .. subject to the Boost Software License, Version 1.0. (See accompanying
 .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-Introduction
-------------
-
 In this section we'll walk through the implementation of a few
 iterators using ``iterator_facade``, based around the simple
-example of a linked list of polymorphic objects.
+example of a linked list of polymorphic objects.  This example was
+inspired by a `posting`__ by Keith Macdonald on the `Boost-Users`_
+mailing list.
+
+.. _`Boost-Users`: ../../../more/mailing_lists.htm#users
+
+__ http://thread.gmane.org/gmane.comp.lib.boost.user/5100
 
 The Problem
 -----------
diff --git a/doc/new-iter-concepts.html b/doc/new-iter-concepts.html
index ec815a3..6f2f033 100755
--- a/doc/new-iter-concepts.html
+++ b/doc/new-iter-concepts.html
@@ -9,234 +9,7 @@
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab, University of Hanover Institute for Transport Railway Operation and Construction" />
 <meta name="date" content="2003-12-02" />
 <meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
-<style type="text/css"><!--
-
-/*
-:Author: David Goodger
-:Contact: goodger@users.sourceforge.net
-:date: $Date$
-:version: $Revision$
-:copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-*/
-
-.first {
-  margin-top: 0 }
-
-.last {
-  margin-bottom: 0 }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-dd {
-  margin-bottom: 0.5em }
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.attention, div.caution, div.danger, div.error, div.hint,
-div.important, div.note, div.tip, div.warning, div.admonition {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.hint p.admonition-title, div.important p.admonition-title,
-div.note p.admonition-title, div.tip p.admonition-title,
-div.admonition p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em }
-
-div.footer, div.header {
-  font-size: smaller }
-
-div.sidebar {
-  margin-left: 1em ;
-  border: medium outset ;
-  padding: 0em 1em ;
-  background-color: #ffffee ;
-  width: 40% ;
-  float: right ;
-  clear: right }
-
-div.sidebar p.rubric {
-  font-family: sans-serif ;
-  font-size: medium }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr {
-  width: 75% }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.attribution {
-  text-align: right ;
-  margin-left: 50% }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.rubric {
-  font-weight: bold ;
-  font-size: larger ;
-  color: maroon ;
-  text-align: center }
-
-p.sidebar-title {
-  font-family: sans-serif ;
-  font-weight: bold ;
-  font-size: larger }
-
-p.sidebar-subtitle {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font-family: serif ;
-  font-size: 100% }
-
-pre.line-block {
-  font-family: serif ;
-  font-size: 100% }
-
-pre.literal-block, pre.doctest-block {
-  margin-left: 2em ;
-  margin-right: 2em ;
-  background-color: #eeeeee }
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option {
-  white-space: nowrap }
-
-span.option-argument {
-  font-style: italic }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-table {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.citation {
-  border-left: solid thin gray ;
-  padding-left: 0.5ex }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.footnote {
-  border-left: solid thin black ;
-  padding-left: 0.5ex }
-
-td, th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-th.docinfo-name, th.field-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap }
-
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
-  font-size: 100% }
-
-tt {
-  background-color: #eeeeee }
-
-ul.auto-toc {
-  list-style-type: none }
-
---></style>
+<link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
 <div class="document" id="new-iterator-concepts">
@@ -1111,7 +884,7 @@ LocalWords:  TraversalTag typename lvalues DWA Hmm JGS mis enum -->
 <hr class="footer" />
 <div class="footer">
 <a class="reference" href="new-iter-concepts.rst">View document source</a>.
-Generated on: 2004-01-12 02:46 UTC.
+Generated on: 2004-01-12 15:50 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 </div>
 </body>
diff --git a/doc/rst2html b/doc/rst2html
new file mode 100755
index 0000000..845c11f
--- /dev/null
+++ b/doc/rst2html
@@ -0,0 +1,7 @@
+#!/bin/sh
+PYTHONPATH="c:/src/docutils/docutils;c:/src/docutils/docutils/extras"
+export PYTHONPATH
+python c:/src/docutils/docutils/tools/html.py -gdts $1 `echo $1 | sed 's/\(.*\)\..*/\1.html/'`
+
+
+
diff --git a/doc/style.tex b/doc/style.tex
index a4fe2f9..681d6b3 100755
--- a/doc/style.tex
+++ b/doc/style.tex
@@ -20,13 +20,13 @@
 % pagestyle
 % \usepackage{fancyhdr}
 \pagestyle{headings}
-\setlength{\paperwidth}{7.375in}
-\setlength{\paperheight}{9.25in}
+\setlength{\paperwidth}{8.5in}
+\setlength{\paperheight}{11in}
 
 \setlength{\oddsidemargin}{0.375in}
 \setlength{\evensidemargin}{0.375in}
-\setlength{\textwidth}{5in}
-\setlength{\textheight}{7.125in}
+\setlength{\textwidth}{6.125in}
+\setlength{\textheight}{8.875in}
 
 \setlength{\topmargin}{-0.375in}
 \setlength{\headheight}{0.25in}
