merged from trunk

[SVN r26087]
merged from trunk
2004-11-02 14:39:05 +00:00 · 2004-11-02 14:33:01 +00:00 · 2004-11-01 21:24:48 +00:00 · 2004-10-31 12:39:25 +00:00 · 2004-10-31 09:57:19 +00:00 · 2004-10-30 12:52:40 +00:00
147 changed files with 4088 additions and 3004 deletions
--- a/doc/BidirectionalTraversal.html
+++ b/doc/BidirectionalTraversal.html
@ -3,18 +3,18 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Bidirectional Traversal Concept</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="bidirectional-traversal-concept">
 <h1 class="title">Bidirectional Traversal Concept</h1>
+<div class="document" id="bidirectional-traversal-concept">
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Bidirectional Traversal</em>
 concept if, in addition to <tt class="literal"><span class="pre">X</span></tt> meeting the requirements of Forward
 Traversal Iterator, the following expressions are valid and respect
 the stated semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="38%" />
 <col width="37%" />
--- a/doc/ForwardTraversal.html
+++ b/doc/ForwardTraversal.html
@ -3,18 +3,18 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Forward Traversal Concept</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="forward-traversal-concept">
 <h1 class="title">Forward Traversal Concept</h1>
+<div class="document" id="forward-traversal-concept">
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Forward Traversal</em>
 concept if, in addition to <tt class="literal"><span class="pre">X</span></tt> meeting the requirements of Default
 Constructible and Single Pass Iterator, the following expressions are
 valid and respect the stated semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="38%" />
 <col width="34%" />
--- a/doc/GNUmakefile
+++ b/doc/GNUmakefile
@ -1,3 +1,7 @@
+# Copyright David Abrahams 2004. Distributed under 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)
+
 ECHO	= /bin/echo

 all: 
--- a/doc/IncrementableIterator.html
+++ b/doc/IncrementableIterator.html
@ -3,18 +3,18 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Incrementable Iterator Concept</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="incrementable-iterator-concept">
 <h1 class="title">Incrementable Iterator Concept</h1>
+<div class="document" id="incrementable-iterator-concept">
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Incrementable Iterator</em>
 concept if, in addition to <tt class="literal"><span class="pre">X</span></tt> being Assignable and Copy
 Constructible, the following expressions are valid and respect the
 stated semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="39%" />
 <col width="37%" />
--- a/doc/LvalueIterator.html
+++ b/doc/LvalueIterator.html
@ -3,17 +3,17 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Lvalue Iterator Concept</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="lvalue-iterator-concept">
 <h1 class="title">Lvalue Iterator Concept</h1>
+<div class="document" id="lvalue-iterator-concept">
 <p>The <em>Lvalue Iterator</em> concept adds the requirement that the return
 type of <tt class="literal"><span class="pre">operator*</span></tt> type be a reference to the value type of the
 iterator.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="22%" />
 <col width="19%" />
--- a/doc/RandomAccessTraversal.html
+++ b/doc/RandomAccessTraversal.html
@ -3,19 +3,19 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Random Access Traversal Concept</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="random-access-traversal-concept">
 <h1 class="title">Random Access Traversal Concept</h1>
+<div class="document" id="random-access-traversal-concept">
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Random Access Traversal</em>
 concept if the following expressions are valid and respect the stated
 semantics.  In the table below, <tt class="literal"><span class="pre">Distance</span></tt> is
 <tt class="literal"><span class="pre">iterator_traits&lt;X&gt;::difference_type</span></tt> and <tt class="literal"><span class="pre">n</span></tt> represents a
 constant object of type <tt class="literal"><span class="pre">Distance</span></tt>.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="28%" />
 <col width="30%" />
--- a/doc/ReadableIterator.html
+++ b/doc/ReadableIterator.html
@ -3,19 +3,19 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Readable Iterator Concept</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="readable-iterator-concept">
 <h1 class="title">Readable Iterator Concept</h1>
+<div class="document" id="readable-iterator-concept">
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Readable Iterator</em> concept
 for value type <tt class="literal"><span class="pre">T</span></tt> if, in addition to <tt class="literal"><span class="pre">X</span></tt> being Assignable and
 Copy Constructible, the following expressions are valid and respect
 the stated semantics. <tt class="literal"><span class="pre">U</span></tt> is the type of any specified member of
 type <tt class="literal"><span class="pre">T</span></tt>.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="28%" />
 <col width="20%" />
--- a/doc/SinglePassIterator.html
+++ b/doc/SinglePassIterator.html
@ -3,17 +3,17 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Single Pass Iterator Concept</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="single-pass-iterator-concept">
 <h1 class="title">Single Pass Iterator Concept</h1>
+<div class="document" id="single-pass-iterator-concept">
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Single Pass Iterator</em>
 concept if the following expressions are valid and respect the stated
 semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="36%" />
 <col width="33%" />
--- a/doc/SwappableIterator.html
+++ b/doc/SwappableIterator.html
@ -3,17 +3,17 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Swappable Iterator Concept</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="swappable-iterator-concept">
 <h1 class="title">Swappable Iterator Concept</h1>
+<div class="document" id="swappable-iterator-concept">
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Swappable Iterator</em> concept
 if, in addition to <tt class="literal"><span class="pre">X</span></tt> being Copy Constructible, the following
 expressions are valid and respect the stated semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="37%" />
 <col width="19%" />
--- a/doc/WritableIterator.html
+++ b/doc/WritableIterator.html
@ -3,18 +3,18 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Writable Iterator Concept</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="writable-iterator-concept">
 <h1 class="title">Writable Iterator Concept</h1>
+<div class="document" id="writable-iterator-concept">
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Writable Iterator</em> concept
 if, in addition to <tt class="literal"><span class="pre">X</span></tt> being Copy Constructible, the following
 expressions are valid and respect the stated semantics.  Writable
 Iterators have an associated <em>set of value types</em>.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="37%" />
 <col width="21%" />
--- a/doc/counting_iterator.html
+++ b/doc/counting_iterator.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Counting 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" />
-<meta name="date" content="2004-01-15" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="counting-iterator">
 <h1 class="title">Counting Iterator</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -27,11 +26,12 @@
 Lab</a>, University of Hanover <a class="last reference" href="http://www.ive.uni-hannover.de">Institute for Transport
 Railway Operation and Construction</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-15</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved</td></tr>
+<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="counting-iterator">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -52,7 +52,7 @@ are forwarded to the adapted object.</p>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#counting-iterator-synopsis" id="id2" name="id2"><tt class="literal"><span class="pre">counting_iterator</span></tt> synopsis</a></li>
 <li><a class="reference" href="#counting-iterator-requirements" id="id3" name="id3"><tt class="literal"><span class="pre">counting_iterator</span></tt> requirements</a></li>
--- a/doc/counting_iterator.pdf
+++ b/doc/counting_iterator.pdf
--- a/doc/counting_iterator.rst
+++ b/doc/counting_iterator.rst
@ -8,7 +8,7 @@
               Lab`_, University of Hanover `Institute for Transport
               Railway Operation and Construction`_
 :date: $Date$
-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
--- a/doc/facade-and-adaptor.html
+++ b/doc/facade-and-adaptor.html
@ -3,15 +3,14 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: 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, Zephyr Associates, Inc." />
-<meta name="date" content="2004-01-21" />
+<meta name="date" content="2004-11-01" />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="iterator-facade-and-adaptor">
 <h1 class="title">Iterator Facade and Adaptor</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -25,20 +24,21 @@
 <td><a class="first reference" href="http://www.boost-consulting.com">Boost Consulting</a>, Indiana University <a class="reference" href="http://www.osl.iu.edu">Open Systems
 Lab</a>, <a class="last reference" href="http://www.styleadvisor.com">Zephyr Associates, Inc.</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-21</td></tr>
+<td>2004-11-01</td></tr>
 <tr class="field"><th class="docinfo-name">Number:</th><td class="field-body">This is a revised version of <a class="reference" href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1530.html">N1530</a>=03-0113, which was
 accepted for Technical Report 1 by the C++ standard
 committee's library working group.</td>
 </tr>
 </tbody>
 </table>
+<div class="document" id="iterator-facade-and-adaptor">
 <!-- Version 1.9 of this ReStructuredText document corresponds to
 n1530_, the paper accepted by the LWG. -->
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">copyright:</th><td class="field-body">Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved</td>
+<tr class="field"><th class="field-name">copyright:</th><td class="field-body">Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.</td>
 </tr>
 </tbody>
 </table>
@ -53,7 +53,7 @@ by adapting other iterators.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#motivation" id="id15" name="id15">Motivation</a></li>
 <li><a class="reference" href="#impact-on-the-standard" id="id16" name="id16">Impact on the Standard</a></li>
@ -266,8 +266,7 @@ interoperability without introducing unwanted overloads.</p>
 <h2><a class="toc-backref" href="#id20" name="iterator-facade">Iterator Facade</a></h2>
 <!-- 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
-rights reserved -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <p>While the iterator interface is rich, there is a core subset of the
 interface that is necessary for all the functionality.  We have
 identified the following core behaviors for iterators:</p>
@ -325,7 +324,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 border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="44%" />
 <col width="56%" />
@ -443,7 +442,6 @@ are described in terms of a set of requirements, which must be
 satisfied by the <tt class="literal"><span class="pre">iterator_facade</span></tt> implementation.</p>
 <table class="citation" frame="void" id="cop95" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
-<col />
 <tbody valign="top">
 <tr><td class="label"><a class="fn-backref" href="#id4" name="cop95">[Cop95]</a></td><td>[Coplien, 1995] Coplien, J., Curiously Recurring Template
 Patterns, C++ Report, February 1995, pp. 24-27.</td></tr>
@ -455,8 +453,7 @@ Patterns, C++ Report, February 1995, pp. 24-27.</td></tr>
 <h2><a class="toc-backref" href="#id25" name="iterator-adaptor">Iterator Adaptor</a></h2>
 <!-- Version 1.2 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
-rights reserved -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <p>The <tt class="literal"><span class="pre">iterator_adaptor</span></tt> class template adapts some <tt class="literal"><span class="pre">Base</span></tt> <a class="footnote-reference" href="#base" id="id7" name="id7"><sup>3</sup></a>
 type to create a new iterator.  Instantiations of <tt class="literal"><span class="pre">iterator_adaptor</span></tt>
 are derived from a corresponding instantiation of <tt class="literal"><span class="pre">iterator_facade</span></tt>
@ -474,11 +471,12 @@ the underlying iterator object of a <tt class="literal"><span class="pre">revers
 </table>
 <p>The user of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> creates a class derived from an
 instantiation of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> and then selectively
-redefines some of the core member functions described in the table
-above. The <tt class="literal"><span class="pre">Base</span></tt> type need not meet the full requirements for an
-iterator. It need only support the operations used by the core
-interface functions of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been
-redefined in the user's derived class.</p>
+redefines some of the core member functions described in the
+<tt class="literal"><span class="pre">iterator_facade</span></tt> core requirements table. The <tt class="literal"><span class="pre">Base</span></tt> type need
+not meet the full requirements for an iterator; it need only
+support the operations used by the core interface functions of
+<tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been redefined in the user's
+derived class.</p>
 <p>Several of the template parameters of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> default
 to <tt class="literal"><span class="pre">use_default</span></tt>. This allows the
 user to make use of a default parameter even when she wants to
@ -603,8 +601,7 @@ and associated types, to be supplied by a derived iterator class.</p>
 <h3><a class="toc-backref" href="#id30" 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
-rights reserved -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <pre class="literal-block">
 template &lt;
    class Derived
@ -614,7 +611,7 @@ template &lt;
  , class Difference = ptrdiff_t
 &gt;
 class iterator_facade {
-public:
+ public:
    typedef remove_const&lt;Value&gt;::type value_type;
    typedef Reference reference;
    typedef Value* pointer;
@ -631,6 +628,8 @@ public:
    Derived&amp; operator+=(difference_type n);
    Derived&amp; operator-=(difference_type n);
    Derived operator-(difference_type n) const;
+ protected:
+    typedef iterator_facade iterator_facade_;
 };

 // Comparison operators
@ -775,8 +774,8 @@ object of a single pass iterator type interoperable with <tt class="literal"><sp
 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="topic">
-<p class="topic-title"><tt class="literal"><span class="pre">iterator_facade</span></tt> Core Operations</p>
-<table border class="table">
+<p class="topic-title first"><tt class="literal"><span class="pre">iterator_facade</span></tt> Core Operations</p>
+<table border="1" class="table">
 <colgroup>
 <col width="21%" />
 <col width="23%" />
@ -1166,8 +1165,7 @@ operator -(iterator_facade&lt;Dr1,V1,TC1,R1,D1&gt; const&amp; lhs,
 <h2><a class="toc-backref" href="#id33" name="iterator-adaptor-lib-iterator-adaptor">Iterator adaptor [lib.iterator.adaptor]</a></h2>
 <!-- Version 1.1 of this ReStructuredText document corresponds to
 n1530_, the paper accepted by the LWG. -->
-<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All
-rights reserved -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <p>Each specialization of the <tt class="literal"><span class="pre">iterator_adaptor</span></tt> class template is derived from
 a specialization of <tt class="literal"><span class="pre">iterator_facade</span></tt>. The core interface functions
 expected by <tt class="literal"><span class="pre">iterator_facade</span></tt> are implemented in terms of the
@ -1182,8 +1180,7 @@ core interface functions of <tt class="literal"><span class="pre">iterator_facad
 <h3><a class="toc-backref" href="#id34" 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
-rights reserved. -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <pre class="literal-block">
 template &lt;
    class Derived
@ -1202,6 +1199,7 @@ class iterator_adaptor
    explicit iterator_adaptor(Base iter);
    Base const&amp; base() const;
 protected:
+    typedef iterator_adaptor iterator_adaptor_;
    Base const&amp; base_reference() const;
    Base&amp; base_reference();
 private: // Core iterator interface for iterator_facade.  
@ -1773,7 +1771,7 @@ type <tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::refe
 traversal and iterator access concepts modeled by its <tt class="literal"><span class="pre">Iterator</span></tt>
 argument.  In addition, it may model old iterator concepts
 specified in the following table:</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="53%" />
 <col width="47%" />
@ -1980,7 +1978,7 @@ concept that is modeled by the <tt class="literal"><span class="pre">Iterator</s
 <p>If <tt class="literal"><span class="pre">transform_iterator</span></tt> is a model of Readable Lvalue Iterator then
 it models the following original iterator concepts depending on what
 the <tt class="literal"><span class="pre">Iterator</span></tt> argument models.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="47%" />
 <col width="53%" />
@ -2037,17 +2035,20 @@ initialized to <tt class="literal"><span class="pre">f</span></tt> and <tt class
 </tbody>
 </table>
 <pre class="literal-block">
-template&lt;class OtherIterator, class R2, class V2&gt;
+template&lt;class F2, class I2, class R2, class V2&gt;
 transform_iterator(
-      transform_iterator&lt;UnaryFunction, OtherIterator, R2, V2&gt; const&amp; t
-    , typename enable_if_convertible&lt;OtherIterator, Iterator&gt;::type* = 0 // exposition
+      transform_iterator&lt;F2, I2, R2, V2&gt; const&amp; t
+    , typename enable_if_convertible&lt;I2, Iterator&gt;::type* = 0      // exposition only
+    , typename enable_if_convertible&lt;F2, UnaryFunction&gt;::type* = 0 // exposition only
 );
 </pre>
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">An instance of <tt class="literal"><span class="pre">transform_iterator</span></tt> that is a copy of <tt class="literal"><span class="pre">t</span></tt>.</td>
+<tr class="field"><th class="field-name">Returns:</th><td class="field-body">An instance of <tt class="literal"><span class="pre">transform_iterator</span></tt> with <tt class="literal"><span class="pre">m_f</span></tt>
+initialized to <tt class="literal"><span class="pre">t.functor()</span></tt> and <tt class="literal"><span class="pre">m_iterator</span></tt> initialized to
+<tt class="literal"><span class="pre">t.base()</span></tt>.</td>
 </tr>
 <tr class="field"><th class="field-name">Requires:</th><td class="field-body"><tt class="literal"><span class="pre">OtherIterator</span></tt> is implicitly convertible to <tt class="literal"><span class="pre">Iterator</span></tt>.</td>
 </tr>
@ -2173,7 +2174,7 @@ the expression <tt class="literal"><span class="pre">p(x)</span></tt> must be va
 <p>The concepts that <tt class="literal"><span class="pre">filter_iterator</span></tt> models are dependent on which
 concepts the <tt class="literal"><span class="pre">Iterator</span></tt> argument models, as specified in the
 following tables.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="33%" />
 <col width="67%" />
@ -2192,7 +2193,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="41%" />
 <col width="59%" />
@ -2214,7 +2215,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="63%" />
 <col width="38%" />
--- a/doc/facade-and-adaptor.pdf
+++ b/doc/facade-and-adaptor.pdf
--- a/doc/facade-and-adaptor.rst
+++ b/doc/facade-and-adaptor.rst
@ -17,7 +17,7 @@

 .. _n1530: http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1530.html

-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
@ -416,12 +416,12 @@ Class template ``counting_iterator``
 Function output iterator
 ------------------------

-.. include:: function_output_iterator_abstract.rst
+.. include:: func_output_iter_abstract.rst

 Class template ``function_output_iterator``
 ...........................................

-.. include:: function_output_iterator_ref.rst
+.. include:: func_output_iter_ref.rst



--- a/doc/filter_iterator.html
+++ b/doc/filter_iterator.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: 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" />
-<meta name="date" content="2004-01-13" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="filter-iterator">
 <h1 class="title">Filter Iterator</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -27,11 +26,12 @@
 Lab</a>, University of Hanover <a class="last reference" href="http://www.ive.uni-hannover.de">Institute for Transport
 Railway Operation and Construction</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-13</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved</td></tr>
+<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="filter-iterator">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -50,7 +50,7 @@ sequence to be traversed.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#filter-iterator-synopsis" id="id2" name="id2"><tt class="literal"><span class="pre">filter_iterator</span></tt> synopsis</a></li>
 <li><a class="reference" href="#filter-iterator-requirements" id="id3" name="id3"><tt class="literal"><span class="pre">filter_iterator</span></tt> requirements</a></li>
@ -116,7 +116,7 @@ the expression <tt class="literal"><span class="pre">p(x)</span></tt> must be va
 <p>The concepts that <tt class="literal"><span class="pre">filter_iterator</span></tt> models are dependent on which
 concepts the <tt class="literal"><span class="pre">Iterator</span></tt> argument models, as specified in the
 following tables.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="33%" />
 <col width="67%" />
@ -135,7 +135,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="41%" />
 <col width="59%" />
@ -157,7 +157,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="63%" />
 <col width="38%" />
--- a/doc/filter_iterator.pdf
+++ b/doc/filter_iterator.pdf
--- a/doc/filter_iterator.rst
+++ b/doc/filter_iterator.rst
@ -8,7 +8,7 @@
               Lab`_, University of Hanover `Institute for Transport
               Railway Operation and Construction`_
 :date: $Date$
-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
--- a/doc/filter_iterator_ref.html
+++ b/doc/filter_iterator_ref.html
@ -3,11 +3,16 @@
 <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.6: http://docutils.sourceforge.net/" />
+<title></title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
 <div class="document">
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt -->
+<!-- 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)  -->
 <pre class="literal-block">
 template &lt;class Predicate, class Iterator&gt;
 class filter_iterator
@ -29,35 +34,36 @@ class filter_iterator
        );
    Predicate predicate() const;
    Iterator end() const;
-    Iterator base() const;
+    Iterator const&amp; base() const;
    reference operator*() const;
    filter_iterator&amp; operator++();
 private:
-    Predicate m_pred; // exposition
-    Iterator m_iter;  // exposition
-    Iterator m_end;   // exposition
+    Predicate m_pred; // exposition only
+    Iterator m_iter;  // exposition only
+    Iterator m_end;   // exposition only
 };
 </pre>
-<p>The <tt class="literal"><span class="pre">iterator_category</span></tt> member is a type convertible to the tags
-corresponding to each standard concept modeled by <tt class="literal"><span class="pre">filter_iterator</span></tt>,
-as described in the models section.</p>
+<p>If <tt class="literal"><span class="pre">Iterator</span></tt> models Readable Lvalue Iterator and Forward Traversal
+Iterator then <tt class="literal"><span class="pre">iterator_category</span></tt> is convertible to
+<tt class="literal"><span class="pre">std::forward_iterator_tag</span></tt>. Otherwise <tt class="literal"><span class="pre">iterator_category</span></tt> is
+convertible to <tt class="literal"><span class="pre">std::input_iterator_tag</span></tt>.</p>
 <div class="section" id="filter-iterator-requirements">
 <h1><a name="filter-iterator-requirements"><tt class="literal"><span class="pre">filter_iterator</span></tt> requirements</a></h1>
+<p>The <tt class="literal"><span class="pre">Iterator</span></tt> argument shall meet the requirements of Readable
+Iterator and Single Pass Iterator or it shall meet the requirements of
+Input Iterator.</p>
 <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
 <tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::value_type</span></tt>, and where the type of
 <tt class="literal"><span class="pre">p(x)</span></tt> must be convertible to <tt class="literal"><span class="pre">bool</span></tt>.</p>
-<p>The <tt class="literal"><span class="pre">Iterator</span></tt> argument shall meet the requirements of Readable
-Iterator and Single Pass Iterator or it shall meet the requirements of
-Input Iterator.</p>
 </div>
 <div class="section" id="filter-iterator-models">
 <h1><a name="filter-iterator-models"><tt class="literal"><span class="pre">filter_iterator</span></tt> models</a></h1>
 <p>The concepts that <tt class="literal"><span class="pre">filter_iterator</span></tt> models are dependent on which
 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="1" class="table">
 <colgroup>
 <col width="33%" />
 <col width="67%" />
@ -76,7 +82,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table class="table" frame="border" rules="all">
+<table border="1" class="table">
 <colgroup>
 <col width="41%" />
 <col width="59%" />
@ -98,7 +104,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table class="table" frame="border" rules="all">
+<table border="1" class="table">
 <colgroup>
 <col width="63%" />
 <col width="38%" />
@ -120,6 +126,8 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
+<p><tt class="literal"><span class="pre">filter_iterator&lt;P1,</span> <span class="pre">X&gt;</span></tt> is interoperable with <tt class="literal"><span class="pre">filter_iterator&lt;P2,</span> <span class="pre">Y&gt;</span></tt> 
+if and only if <tt class="literal"><span class="pre">X</span></tt> is interoperable with <tt class="literal"><span class="pre">Y</span></tt>.</p>
 </div>
 <div class="section" id="filter-iterator-operations">
 <h1><a name="filter-iterator-operations"><tt class="literal"><span class="pre">filter_iterator</span></tt> operations</a></h1>
@ -133,7 +141,7 @@ operations.</p>
 <tbody valign="top">
 <tr class="field"><th class="field-name">Requires:</th><td class="field-body"><tt class="literal"><span class="pre">Predicate</span></tt> and <tt class="literal"><span class="pre">Iterator</span></tt> must be Default Constructible.</td>
 </tr>
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">a <tt class="literal"><span class="pre">filter_iterator</span></tt> whose``m_pred``,  <tt class="literal"><span class="pre">m_iter</span></tt>, and <tt class="literal"><span class="pre">m_end</span></tt> 
+<tr class="field"><th class="field-name">Effects:</th><td class="field-body">Constructs a <tt class="literal"><span class="pre">filter_iterator</span></tt> whose``m_pred``,  <tt class="literal"><span class="pre">m_iter</span></tt>, and <tt class="literal"><span class="pre">m_end</span></tt> 
 members are a default constructed.</td>
 </tr>
 </tbody>
@ -143,7 +151,7 @@ members are a default constructed.</td>
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">A <tt class="literal"><span class="pre">filter_iterator</span></tt> where <tt class="literal"><span class="pre">m_iter</span></tt> is either
+<tr class="field"><th class="field-name">Effects:</th><td class="field-body">Constructs a <tt class="literal"><span class="pre">filter_iterator</span></tt> where <tt class="literal"><span class="pre">m_iter</span></tt> is either
 the first position in the range <tt class="literal"><span class="pre">[x,end)</span></tt> such that <tt class="literal"><span class="pre">f(*m_iter)</span> <span class="pre">==</span> <span class="pre">true</span></tt> 
 or else``m_iter == end``. The member <tt class="literal"><span class="pre">m_pred</span></tt> is constructed from
 <tt class="literal"><span class="pre">f</span></tt> and <tt class="literal"><span class="pre">m_end</span></tt> from <tt class="literal"><span class="pre">end</span></tt>.</td>
@ -155,9 +163,10 @@ or else``m_iter == end``. The member <tt class="literal"><span class="pre">m_pre
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">Requires:</th><td class="field-body"><tt class="literal"><span class="pre">Predicate</span></tt> must be Default Constructible.</td>
+<tr class="field"><th class="field-name">Requires:</th><td class="field-body"><tt class="literal"><span class="pre">Predicate</span></tt> must be Default Constructible and
+<tt class="literal"><span class="pre">Predicate</span></tt> is a class type (not a function pointer).</td>
 </tr>
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">A <tt class="literal"><span class="pre">filter_iterator</span></tt> where <tt class="literal"><span class="pre">m_iter</span></tt> is either
+<tr class="field"><th class="field-name">Effects:</th><td class="field-body">Constructs a <tt class="literal"><span class="pre">filter_iterator</span></tt> where <tt class="literal"><span class="pre">m_iter</span></tt> is either
 the first position in the range <tt class="literal"><span class="pre">[x,end)</span></tt> such that <tt class="literal"><span class="pre">m_pred(*m_iter)</span> <span class="pre">==</span> <span class="pre">true</span></tt> 
 or else``m_iter == end``. The member <tt class="literal"><span class="pre">m_pred</span></tt> is default constructed.</td>
 </tr>
@ -176,7 +185,7 @@ filter_iterator(
 <tbody valign="top">
 <tr class="field"><th class="field-name">Requires:</th><td class="field-body"><tt class="literal"><span class="pre">OtherIterator</span></tt> is implicitly convertible to <tt class="literal"><span class="pre">Iterator</span></tt>.</td>
 </tr>
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">A filter iterator whose members are copied from <tt class="literal"><span class="pre">t</span></tt>.</td>
+<tr class="field"><th class="field-name">Effects:</th><td class="field-body">Constructs a filter iterator whose members are copied from <tt class="literal"><span class="pre">t</span></tt>.</td>
 </tr>
 </tbody>
 </table>
@ -198,7 +207,7 @@ filter_iterator(
 </tr>
 </tbody>
 </table>
-<p><tt class="literal"><span class="pre">Iterator</span> <span class="pre">base()</span> <span class="pre">const;</span></tt></p>
+<p><tt class="literal"><span class="pre">Iterator</span> <span class="pre">const&amp;</span> <span class="pre">base()</span> <span class="pre">const;</span></tt></p>
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -231,10 +240,9 @@ or <tt class="literal"><span class="pre">m_pred(*m_iter)</span> <span class="pre
 </table>
 </div>
 </div>
-<hr class="footer"/>
+<hr class="footer" />
 <div class="footer">
 <a class="reference" href="filter_iterator_ref.rst">View document source</a>.
-Generated on: 2004-01-13 02:57 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>
--- a/doc/function_output_iterator_abstract.rst
+++ b/doc/function_output_iterator_abstract.rst
--- a/doc/function_output_iterator_ref.rst
+++ b/doc/function_output_iterator_ref.rst
--- a/doc/function_output_iterator.html
+++ b/doc/function_output_iterator.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Function Output 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" />
-<meta name="date" content="2004-01-13" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="function-output-iterator">
 <h1 class="title">Function Output Iterator</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -27,11 +26,12 @@
 Lab</a>, University of Hanover <a class="last reference" href="http://www.ive.uni-hannover.de">Institute for Transport
 Railway Operation and Construction</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-13</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved</td></tr>
+<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="function-output-iterator">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -47,7 +47,7 @@ proxy object.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#function-output-iterator-requirements" id="id1" name="id1"><tt class="literal"><span class="pre">function_output_iterator</span></tt> requirements</a></li>
 <li><a class="reference" href="#function-output-iterator-models" id="id2" name="id2"><tt class="literal"><span class="pre">function_output_iterator</span></tt> models</a></li>
--- a/doc/function_output_iterator.pdf
+++ b/doc/function_output_iterator.pdf
--- a/doc/function_output_iterator.rst
+++ b/doc/function_output_iterator.rst
@ -8,7 +8,7 @@
               Lab`_, University of Hanover `Institute for Transport
               Railway Operation and Construction`_
 :date: $Date$
-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
@ -16,9 +16,9 @@

 :abstract:

-  .. include:: function_output_iterator_abstract.rst
+  .. include:: func_output_iter_abstract.rst

 .. contents:: Table of Contents

-.. include:: function_output_iterator_ref.rst
+.. include:: func_output_iter_ref.rst
 .. include:: function_output_iterator_eg.rst
--- a/doc/generate.py
+++ b/doc/generate.py
@ -1,4 +1,7 @@
 #!/usr/bin/python
+# 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)

 #
 # Generate html, TeX, and PDF versions of all the source files
@ -13,7 +16,7 @@ if 0:
    for s in sources:
        syscmd('boosthtml %s' % s)
 else:        
-    extensions = ('html', 'tex', 'pdf')
+    extensions = ('html', 'pdf')

    if len(sys.argv) > 1:
        extensions = sys.argv[1:]
@ -23,7 +26,7 @@ else:
          for s in sources 
        ]

-    print 'make -k %s' % ' '.join(all)
-    syscmd('make -k %s' % ' '.join(all))
+    print 'make %s' % ' '.join(all)
+    syscmd('make %s' % ' '.join(all))


--- a/doc/index.html
+++ b/doc/index.html
@ -3,13 +3,13 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>The Boost.Iterator Library Boost</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
+<h1 class="title">The Boost.Iterator Library <a class="reference" href="../../../index.htm"><img alt="Boost" src="../../../boost.png" /></a></h1>
 <div class="document" id="the-boost-iterator-library-logo">
-<h1 class="title">The Boost.Iterator Library <a class="reference" href="../../../index.htm"><img alt="Boost" src="../../../c++boost.gif" /></a></h1>
 <hr />
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
@ -24,7 +24,7 @@ Lab</a>, <a class="reference" href="http://www.styleadvisor.com">Zephyr Associat
 </tr>
 <tr class="field"><th class="field-name">date:</th><td class="field-body">$Date$</td>
 </tr>
-<tr class="field"><th class="field-name">copyright:</th><td class="field-body">Copyright David Abrahams, Jeremy Siek, Thomas Witt 2003. All rights reserved</td>
+<tr class="field"><th class="field-name">copyright:</th><td class="field-body">Copyright David Abrahams, Jeremy Siek, Thomas Witt 2003.</td>
 </tr>
 </tbody>
 </table>
@ -38,7 +38,7 @@ iterator requirements. The second is a framework of
 components for building iterators based on these
 extended concepts and includes several useful iterator
 adaptors. The extended iterator concepts have been
-carefully designed so that so that old-style iterators
+carefully designed so that old-style iterators
 can fit in the new concepts and so that new-style
 iterators will be compatible with old-style algorithms,
 though algorithms may need to be updated if they want to
@ -51,7 +51,7 @@ older Boost Iterator Adaptor Library.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents"><strong>Table of Contents</strong></a></p>
+<p class="topic-title first"><a name="table-of-contents"><strong>Table of Contents</strong></a></p>
 <ul class="simple">
 <li><a class="reference" href="#new-style-iterators" id="id22" name="id22">New-Style Iterators</a></li>
 <li><a class="reference" href="#iterator-facade-and-adaptor" id="id23" name="id23">Iterator Facade and Adaptor</a></li>
@ -152,9 +152,10 @@ in <tt class="literal"><span class="pre">indirect_iterator</span></tt>.</li>
 <li><a class="reference" href="iterator_traits.html"><tt class="literal"><span class="pre">iterator_traits.hpp</span></tt></a> (<a class="reference" href="iterator_traits.pdf">PDF</a>): Provides <a class="reference" href="../../mpl/doc/index.html">MPL</a>-compatible metafunctions which
 retrieve an iterator's traits.  Also corrects for the deficiencies
 of broken implementations of <tt class="literal"><span class="pre">std::iterator_traits</span></tt>.</li>
-<li><a class="reference" href="interoperable.html"><tt class="literal"><span class="pre">interoperable.hpp</span></tt></a> (<a class="reference" href="interoperable.pdf">PDF</a>): Provides an <a class="reference" href="../../mpl/doc/index.html">MPL</a>-compatible metafunction for
-testing iterator interoperability</li>
 </ul>
+<!-- * |interoperable|_ (PDF__): Provides an MPL_\ -compatible metafunction for
+testing iterator interoperability -->
+<!-- comment! __ interoperable.pdf -->
 </div>
 <div class="section" id="testing-and-concept-checking">
 <h2><a class="toc-backref" href="#id27" name="testing-and-concept-checking">Testing and Concept Checking</a></h2>
@ -217,7 +218,6 @@ near-complete rewrite of the prototype, they came up with the
 library you see today.</p>
 <table class="citation" frame="void" id="cop95" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
-<col />
 <tbody valign="top">
 <tr><td class="label"><a class="fn-backref" href="#id21" name="cop95">[Cop95]</a></td><td>[Coplien, 1995] Coplien, J., Curiously Recurring Template
 Patterns, C++ Report, February 1995, pp. 24-27.</td></tr>
--- a/doc/index.rst
+++ b/doc/index.rst
@ -2,7 +2,7 @@
 The Boost.Iterator Library |(logo)|__
 +++++++++++++++++++++++++++++++++++++++++++++++++

-.. |(logo)| image:: ../../../c++boost.gif
+.. |(logo)| image:: ../../../boost.png
   :alt: Boost

 __ ../../../index.htm
@ -17,7 +17,7 @@ __ ../../../index.htm
                Lab`_, `Zephyr Associates, Inc.`_
 :date:          $Date$

-:copyright:     Copyright David Abrahams, Jeremy Siek, Thomas Witt 2003. All rights reserved
+:copyright:     Copyright David Abrahams, Jeremy Siek, Thomas Witt 2003.

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
@ -29,7 +29,7 @@ __ ../../../index.htm
           components for building iterators based on these
           extended concepts and includes several useful iterator
           adaptors. The extended iterator concepts have been
-           carefully designed so that so that old-style iterators
+           carefully designed so that old-style iterators
           can fit in the new concepts and so that new-style
           iterators will be compatible with old-style algorithms,
           though algorithms may need to be updated if they want to
@ -212,8 +212,8 @@ Traits
  retrieve an iterator's traits.  Also corrects for the deficiencies
  of broken implementations of ``std::iterator_traits``.

-* |interoperable|_ (PDF__): Provides an MPL_\ -compatible metafunction for
-  testing iterator interoperability
+.. * |interoperable|_ (PDF__): Provides an MPL_\ -compatible metafunction for
+     testing iterator interoperability

 .. |pointee| replace:: ``pointee.hpp``
 .. _pointee: pointee.html
@ -225,7 +225,7 @@ __ iterator_traits.pdf

 .. |interoperable| replace:: ``interoperable.hpp``
 .. _interoperable: interoperable.html
-__ interoperable.pdf
+.. comment! __ interoperable.pdf

 .. _MPL: ../../mpl/doc/index.html

--- a/doc/indirect_iterator.html
+++ b/doc/indirect_iterator.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Indirect 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" />
-<meta name="date" content="2004-01-15" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="indirect-iterator">
 <h1 class="title">Indirect Iterator</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -27,11 +26,12 @@
 Lab</a>, University of Hanover <a class="last reference" href="http://www.ive.uni-hannover.de">Institute for Transport
 Railway Operation and Construction</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-15</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved</td></tr>
+<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="indirect-iterator">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -48,7 +48,7 @@ not an iterator.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#indirect-iterator-synopsis" id="id2" name="id2"><tt class="literal"><span class="pre">indirect_iterator</span></tt> synopsis</a></li>
 <li><a class="reference" href="#indirect-iterator-requirements" id="id3" name="id3"><tt class="literal"><span class="pre">indirect_iterator</span></tt> requirements</a></li>
--- a/doc/indirect_iterator.pdf
+++ b/doc/indirect_iterator.pdf
--- a/doc/indirect_iterator.rst
+++ b/doc/indirect_iterator.rst
@ -8,7 +8,7 @@
               Lab`_, University of Hanover `Institute for Transport
               Railway Operation and Construction`_
 :date: $Date$
-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
--- a/doc/indirect_iterator_ref.html
+++ b/doc/indirect_iterator_ref.html
@ -3,7 +3,8 @@
 <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.6: http://docutils.sourceforge.net/" />
+<title></title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
@ -38,64 +39,91 @@ class indirect_iterator
        &gt; const&amp; y
      , typename enable_if_convertible&lt;Iterator2, Iterator&gt;::type* = 0 // exposition
    );
+
+    Iterator const&amp; base() const;
+    reference operator*() const;
+    indirect_iterator&amp; operator++();
+    indirect_iterator&amp; operator--();
+private:
+   Iterator m_iterator; // exposition
 };
 </pre>
-<p>The member types of <tt class="literal"><span class="pre">indirect_iterator</span></tt> are defined according to the
-following pseudo-code.  We use the abbreviation
-<tt class="literal"><span class="pre">V=iterator_traits&lt;Iterator&gt;::value_type</span></tt> and <tt class="literal"><span class="pre">v</span></tt> is an object of
-type <tt class="literal"><span class="pre">V</span></tt>.:</p>
+<p>The member types of <tt class="literal"><span class="pre">indirect_iterator</span></tt> are defined according to
+the following pseudo-code, where <tt class="literal"><span class="pre">V</span></tt> is
+<tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::value_type</span></tt></p>
 <pre class="literal-block">
 if (Value is use_default) then
-    typedef iterator_traits&lt;V&gt;::value_type value_type;
+    typedef remove_const&lt;pointee&lt;V&gt;::type&gt;::type value_type;
 else
    typedef remove_const&lt;Value&gt;::type value_type;

 if (Reference is use_default) then
-    typedef iterator_traits&lt;V&gt;::reference reference;
+    if (Value is use_default) then
+        typedef indirect_reference&lt;V&gt;::type reference;
+    else
+        typedef Value&amp; reference;
 else
    typedef Reference reference;

-typedef Value* pointer;
+if (Value is use_default) then 
+    typedef pointee&lt;V&gt;::type* pointer;
+else 
+    typedef Value* pointer;

 if (Difference is use_default)
    typedef iterator_traits&lt;Iterator&gt;::difference_type difference_type;
 else
    typedef Difference difference_type;
+
+if (CategoryOrTraversal is use_default)
+    typedef <em>iterator-category</em> (
+        iterator_traversal&lt;Iterator&gt;::type,``reference``,``value_type``
+    ) iterator_category;
+else
+    typedef <em>iterator-category</em> (
+        CategoryOrTraversal,``reference``,``value_type``
+    ) iterator_category;
 </pre>
-<p>The member <tt class="literal"><span class="pre">indirect_iterator::iterator_category</span></tt> is a type that
-satisfies the requirements of the concepts modeled by the indirect
-iterator as specified in the models section.</p>
 <div class="section" id="indirect-iterator-requirements">
 <h1><a name="indirect-iterator-requirements"><tt class="literal"><span class="pre">indirect_iterator</span></tt> requirements</a></h1>
-<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>
-is an iterator tag, the template parameter <tt class="literal"><span class="pre">Iterator</span></tt> argument shall
-meet the traversal requirements corresponding to the iterator tag.</p>
-<p>The expression <tt class="literal"><span class="pre">*v</span></tt>, where <tt class="literal"><span class="pre">v</span></tt> is an object of type
-<tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::value_type</span></tt>, must be a valid expression
-and must be convertible to <tt class="literal"><span class="pre">indirect_iterator::reference</span></tt>.  Also,
-there are further requirements on the
-<tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::value_type</span></tt> if the <tt class="literal"><span class="pre">Value</span></tt> parameter
-is not <tt class="literal"><span class="pre">use_default</span></tt>, as implied by the algorithm for deducing the
-default for the <tt class="literal"><span class="pre">value_type</span></tt> member.</p>
+<p>The expression <tt class="literal"><span class="pre">*v</span></tt>, where <tt class="literal"><span class="pre">v</span></tt> is an object of
+<tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::value_type</span></tt>, shall be valid
+expression and convertible to <tt class="literal"><span class="pre">reference</span></tt>.  <tt class="literal"><span class="pre">Iterator</span></tt> shall
+model the traversal concept indicated by <tt class="literal"><span class="pre">iterator_category</span></tt>.
+<tt class="literal"><span class="pre">Value</span></tt>, <tt class="literal"><span class="pre">Reference</span></tt>, and <tt class="literal"><span class="pre">Difference</span></tt> shall be chosen so
+that <tt class="literal"><span class="pre">value_type</span></tt>, <tt class="literal"><span class="pre">reference</span></tt>, and <tt class="literal"><span class="pre">difference_type</span></tt> meet
+the requirements indicated by <tt class="literal"><span class="pre">iterator_category</span></tt>.</p>
+<p>[Note: there are further requirements on the
+<tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::value_type</span></tt> if the <tt class="literal"><span class="pre">Value</span></tt>
+parameter is not <tt class="literal"><span class="pre">use_default</span></tt>, as implied by the algorithm for
+deducing the default for the <tt class="literal"><span class="pre">value_type</span></tt> member.]</p>
 </div>
 <div class="section" id="indirect-iterator-models">
 <h1><a name="indirect-iterator-models"><tt class="literal"><span class="pre">indirect_iterator</span></tt> models</a></h1>
-<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
-of the most refined standard traversal concept that is satisfied by
-the <tt class="literal"><span class="pre">Iterator</span></tt> argument.</p>
-<p><tt class="literal"><span class="pre">indirect_iterator</span></tt> models Readable Iterator.  If
-<tt class="literal"><span class="pre">indirect_iterator::reference(*v)</span> <span class="pre">=</span> <span class="pre">t</span></tt> is a valid expression (where
-<tt class="literal"><span class="pre">t</span></tt> is an object of type <tt class="literal"><span class="pre">indirect_iterator::value_type</span></tt>) then
-<tt class="literal"><span class="pre">indirect_iterator</span></tt> models Writable Iterator. If
-<tt class="literal"><span class="pre">indirect_iterator::reference</span></tt> is a reference then
-<tt class="literal"><span class="pre">indirect_iterator</span></tt> models Lvalue Iterator.</p>
+<p>In addition to the concepts indicated by <tt class="literal"><span class="pre">iterator_category</span></tt>
+and by <tt class="literal"><span class="pre">iterator_traversal&lt;indirect_iterator&gt;::type</span></tt>, a
+specialization of <tt class="literal"><span class="pre">indirect_iterator</span></tt> models the following
+concepts, Where <tt class="literal"><span class="pre">v</span></tt> is an object of
+<tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::value_type</span></tt>:</p>
+<blockquote>
+<ul class="simple">
+<li>Readable Iterator if <tt class="literal"><span class="pre">reference(*v)</span></tt> is convertible to
+<tt class="literal"><span class="pre">value_type</span></tt>.</li>
+<li>Writable Iterator if <tt class="literal"><span class="pre">reference(*v)</span> <span class="pre">=</span> <span class="pre">t</span></tt> is a valid
+expression (where <tt class="literal"><span class="pre">t</span></tt> is an object of type
+<tt class="literal"><span class="pre">indirect_iterator::value_type</span></tt>)</li>
+<li>Lvalue Iterator if <tt class="literal"><span class="pre">reference</span></tt> is a reference type.</li>
+</ul>
+</blockquote>
+<p><tt class="literal"><span class="pre">indirect_iterator&lt;X,V1,C1,R1,D1&gt;</span></tt> is interoperable with
+<tt class="literal"><span class="pre">indirect_iterator&lt;Y,V2,C2,R2,D2&gt;</span></tt> if and only if <tt class="literal"><span class="pre">X</span></tt> is
+interoperable with <tt class="literal"><span class="pre">Y</span></tt>.</p>
 </div>
 <div class="section" id="indirect-iterator-operations">
 <h1><a name="indirect-iterator-operations"><tt class="literal"><span class="pre">indirect_iterator</span></tt> operations</a></h1>
+<p>In addition to the operations required by the concepts described
+above, specializations of <tt class="literal"><span class="pre">indirect_iterator</span></tt> provide the
+following operations.</p>
 <p><tt class="literal"><span class="pre">indirect_iterator();</span></tt></p>
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
@ -103,8 +131,8 @@ the <tt class="literal"><span class="pre">Iterator</span></tt> argument.</p>
 <tbody valign="top">
 <tr class="field"><th class="field-name">Requires:</th><td class="field-body"><tt class="literal"><span class="pre">Iterator</span></tt> must be Default Constructible.</td>
 </tr>
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">An instance of <tt class="literal"><span class="pre">indirect_iterator</span></tt> with 
-a default-constructed <tt class="literal"><span class="pre">iterator_adaptor</span></tt> subobject.</td>
+<tr class="field"><th class="field-name">Effects:</th><td class="field-body">Constructs an instance of <tt class="literal"><span class="pre">indirect_iterator</span></tt> with 
+a default-constructed <tt class="literal"><span class="pre">m_iterator</span></tt>.</td>
 </tr>
 </tbody>
 </table>
@ -113,8 +141,8 @@ a default-constructed <tt class="literal"><span class="pre">iterator_adaptor</sp
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">An instance of <tt class="literal"><span class="pre">indirect_iterator</span></tt> with
-the <tt class="literal"><span class="pre">iterator_adaptor</span></tt> subobject copy constructed from <tt class="literal"><span class="pre">x</span></tt>.</td>
+<tr class="field"><th class="field-name">Effects:</th><td class="field-body">Constructs an instance of <tt class="literal"><span class="pre">indirect_iterator</span></tt> with
+<tt class="literal"><span class="pre">m_iterator</span></tt> copy constructed from <tt class="literal"><span class="pre">x</span></tt>.</td>
 </tr>
 </tbody>
 </table>
@ -136,12 +164,57 @@ indirect_iterator(
 <tbody valign="top">
 <tr class="field"><th class="field-name">Requires:</th><td class="field-body"><tt class="literal"><span class="pre">Iterator2</span></tt> is implicitly convertible to <tt class="literal"><span class="pre">Iterator</span></tt>.</td>
 </tr>
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">An instance of <tt class="literal"><span class="pre">indirect_iterator</span></tt> whose 
-<tt class="literal"><span class="pre">iterator_adaptor</span></tt> subobject is constructed from <tt class="literal"><span class="pre">y.base()</span></tt>.</td>
+<tr class="field"><th class="field-name">Effects:</th><td class="field-body">Constructs an instance of <tt class="literal"><span class="pre">indirect_iterator</span></tt> whose 
+<tt class="literal"><span class="pre">m_iterator</span></tt> subobject is constructed from <tt class="literal"><span class="pre">y.base()</span></tt>.</td>
+</tr>
+</tbody>
+</table>
+<p><tt class="literal"><span class="pre">Iterator</span> <span class="pre">const&amp;</span> <span class="pre">base()</span> <span class="pre">const;</span></tt></p>
+<table class="field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field"><th class="field-name">Returns:</th><td class="field-body"><tt class="literal"><span class="pre">m_iterator</span></tt></td>
+</tr>
+</tbody>
+</table>
+<p><tt class="literal"><span class="pre">reference</span> <span class="pre">operator*()</span> <span class="pre">const;</span></tt></p>
+<table class="field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field"><th class="field-name">Returns:</th><td class="field-body"><tt class="literal"><span class="pre">**m_iterator</span></tt></td>
+</tr>
+</tbody>
+</table>
+<p><tt class="literal"><span class="pre">indirect_iterator&amp;</span> <span class="pre">operator++();</span></tt></p>
+<table class="field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field"><th class="field-name">Effects:</th><td class="field-body"><tt class="literal"><span class="pre">++m_iterator</span></tt></td>
+</tr>
+<tr class="field"><th class="field-name">Returns:</th><td class="field-body"><tt class="literal"><span class="pre">*this</span></tt></td>
+</tr>
+</tbody>
+</table>
+<p><tt class="literal"><span class="pre">indirect_iterator&amp;</span> <span class="pre">operator--();</span></tt></p>
+<table class="field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field"><th class="field-name">Effects:</th><td class="field-body"><tt class="literal"><span class="pre">--m_iterator</span></tt></td>
+</tr>
+<tr class="field"><th class="field-name">Returns:</th><td class="field-body"><tt class="literal"><span class="pre">*this</span></tt></td>
 </tr>
 </tbody>
 </table>
 </div>
 </div>
+<hr class="footer" />
+<div class="footer">
+<a class="reference" href="indirect_iterator_ref.rst">View document source</a>.
+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>
 </html>
--- a/doc/issues.html
+++ b/doc/issues.html
@ -3,13 +3,13 @@
 <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.6: http://docutils.sourceforge.net/" />
 <title>Problem with is_writable and is_swappable in N1550</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="problem-with-is-writable-and-is-swappable-in-n1550">
 <h1 class="title">Problem with <tt class="literal"><span class="pre">is_writable</span></tt> and <tt class="literal"><span class="pre">is_swappable</span></tt> in <a class="reference" href="http://www.boost-consulting.com/writing/n1550.html">N1550</a></h1>
+<div class="document" id="problem-with-is-writable-and-is-swappable-in-n1550">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -30,7 +30,7 @@ at <a class="reference" href="http://www.boost.org/LICENSE_1_0.txt">http://www.b
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#introduction" id="id1" name="id1">Introduction</a></li>
 <li><a class="reference" href="#proposed-resolution" id="id2" name="id2">Proposed Resolution</a></li>
@ -161,5 +161,10 @@ direct result of the removal of <tt class="literal"><span class="pre">iterator_t
 </ol>
 </div>
 </div>
+<hr class="footer" />
+<div class="footer">
+<a class="reference" href="issues.rst">View document source</a>.
+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>
 </html>
--- a/doc/iter-issue-list.html
+++ b/doc/iter-issue-list.html
@ -3,27 +3,24 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Iterator concept and adapter issues</title>
-<meta name="date" content="2004-01-21" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003." />
+<meta name="date" content="2004-01-27" />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="iterator-concept-and-adapter-issues">
 <h1 class="title">Iterator concept and adapter issues</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
 <col class="docinfo-content" />
 <tbody valign="top">
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-21</td></tr>
-<tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.</td></tr>
+<td>2004-01-27</td></tr>
 </tbody>
 </table>
+<div class="document" id="iterator-concept-and-adapter-issues">
 <div class="contents topic" id="index">
-<p class="topic-title"><a name="index">Index</a></p>
+<p class="topic-title first"><a name="index">Index</a></p>
 <ul class="simple">
 <li><a class="reference" href="#issues-from-matt-s-tr-issues-list" id="id1" name="id1">Issues from Matt's TR issues list</a><ul>
 <li><a class="reference" href="#iterator-access-overspecified" id="id2" name="id2">9.1 iterator_access overspecified?</a></li>
@ -800,7 +797,7 @@ capability.</p>
 </blockquote>
 <p>From the Readable Iterator Requirements table, remove:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="37%" />
 <col width="37%" />
@ -816,7 +813,7 @@ capability.</p>
 </blockquote>
 <p>From the Writable Iterator Requirements table, remove:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="37%" />
 <col width="21%" />
@ -832,7 +829,7 @@ capability.</p>
 </blockquote>
 <p>From the Swappable Iterator Requirements table, remove:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="37%" />
 <col width="19%" />
@ -1632,7 +1629,7 @@ random_access_traversal_tag
 <p>In [lib.iterator.traversal]:</p>
 <p>Change:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="39%" />
 <col width="37%" />
@ -1649,7 +1646,7 @@ random_access_traversal_tag
 </blockquote>
 <p>to:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="39%" />
 <col width="37%" />
@ -1666,7 +1663,7 @@ random_access_traversal_tag
 </blockquote>
 <p>Change:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="36%" />
 <col width="33%" />
@ -1683,7 +1680,7 @@ random_access_traversal_tag
 </blockquote>
 <p>to:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="36%" />
 <col width="33%" />
@ -1700,7 +1697,7 @@ random_access_traversal_tag
 </blockquote>
 <p>Change:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="44%" />
 <col width="39%" />
@ -1717,7 +1714,7 @@ random_access_traversal_tag
 </blockquote>
 <p>to:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="38%" />
 <col width="34%" />
@ -1734,7 +1731,7 @@ random_access_traversal_tag
 </blockquote>
 <p>Change:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="35%" />
 <col width="44%" />
@ -1751,7 +1748,7 @@ random_access_traversal_tag
 </blockquote>
 <p>to:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="38%" />
 <col width="37%" />
@ -1768,7 +1765,7 @@ random_access_traversal_tag
 </blockquote>
 <p>Change:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="31%" />
 <col width="35%" />
@ -1787,7 +1784,7 @@ random_access_traversal_tag
 </blockquote>
 <p>to:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="28%" />
 <col width="30%" />
@ -2452,7 +2449,7 @@ Incrementable Iterator concepts.</dd>
 </tbody>
 </table>
 <div class="topic">
-<p class="topic-title"><tt class="literal"><span class="pre">function_output_iterator</span></tt> models</p>
+<p class="topic-title first"><tt class="literal"><span class="pre">function_output_iterator</span></tt> models</p>
 <blockquote>
 <tt class="literal"><span class="pre">function_output_iterator</span></tt> is a model of the Writable and
 Incrementable Iterator concepts.</blockquote>
@ -2612,7 +2609,7 @@ of any specified member of type <tt class="literal"><span class="pre">T</span></
 </dl>
 <p>From the Input Iterator Requirements table, remove:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="37%" />
 <col width="37%" />
@ -2629,7 +2626,7 @@ of any specified member of type <tt class="literal"><span class="pre">T</span></
 </blockquote>
 <p>Change:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="37%" />
 <col width="37%" />
@ -2648,7 +2645,7 @@ equivalent to <tt class="literal"><span class="pre">*b</span></tt></td>
 </blockquote>
 <p>to:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="28%" />
 <col width="20%" />
@ -2678,7 +2675,7 @@ type of the iterator.</dd>
 </dl>
 <p>Change:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="42%" />
 <col width="14%" />
@ -2705,7 +2702,7 @@ cv-qualification</td>
 </blockquote>
 <p>to:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="22%" />
 <col width="19%" />
@ -2970,7 +2967,7 @@ does not provide the 'b' versions of these functions.</p>
 <tr><td>&nbsp;</td><td class="field-body"><p class="first">Remove the 'b' versions.</p>
 <p>In <tt class="literal"><span class="pre">iterator_facade</span></tt> requirements, remove:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="19%" />
 <col width="18%" />
@ -2989,7 +2986,7 @@ equivalent.</td>
 </blockquote>
 <p>and remove:</p>
 <blockquote class="last">
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="19%" />
 <col width="18%" />
@ -3063,7 +3060,7 @@ distance(c, (X)z)?</p>
 <tr><td>&nbsp;</td><td class="field-body"><p class="first">Removed the 'b' versions (see 9.35) and added the cast.</p>
 <p>Change:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="19%" />
 <col width="18%" />
@ -3085,7 +3082,7 @@ Iterator</td>
 </blockquote>
 <p>to:</p>
 <blockquote class="last">
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="21%" />
 <col width="23%" />
@ -3154,7 +3151,7 @@ below, <tt class="literal"><span class="pre">x</span></tt> is an object of type
 type <tt class="literal"><span class="pre">Y</span></tt>, <tt class="literal"><span class="pre">Distance</span></tt> is
 <tt class="literal"><span class="pre">iterator_traits&lt;Y&gt;::difference_type</span></tt>, and <tt class="literal"><span class="pre">n</span></tt> represents a
 constant object of type <tt class="literal"><span class="pre">Distance</span></tt>.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="13%" />
 <col width="27%" />
@ -3195,7 +3192,7 @@ constant object of type <tt class="literal"><span class="pre">Distance</span></t
 </table>
 <p>If <tt class="literal"><span class="pre">X</span></tt> and <tt class="literal"><span class="pre">Y</span></tt> both model Random Access Traversal Iterator then
 the following additional requirements must be met.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="12%" />
 <col width="25%" />
@ -3294,7 +3291,7 @@ class iterator_adaptor
 </tbody>
 </table>
 <div class="topic">
-<p class="topic-title"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> base class parameters</p>
+<p class="topic-title first"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> base class parameters</p>
 <blockquote>
 <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>
@ -3404,7 +3401,7 @@ else
 <p>After the requirements section, add:</p>
 </div>
 <div class="topic">
-<p class="topic-title"><tt class="literal"><span class="pre">indirect_iterator</span></tt> models</p>
+<p class="topic-title first"><tt class="literal"><span class="pre">indirect_iterator</span></tt> models</p>
 <blockquote>
 <p>In addition to the concepts indicated by <tt class="literal"><span class="pre">iterator_category</span></tt>
 and by <tt class="literal"><span class="pre">iterator_traversal&lt;indirect_iterator&gt;::type</span></tt>, a
@ -3569,13 +3566,13 @@ by <tt class="literal"><span class="pre">Iterator</span></tt>.</p>
 </dl>
 </div>
 <div class="topic">
-<p class="topic-title"><tt class="literal"><span class="pre">reverse_iterator</span></tt> models</p>
+<p class="topic-title first"><tt class="literal"><span class="pre">reverse_iterator</span></tt> models</p>
 <blockquote>
 <p>A specialization of <tt class="literal"><span class="pre">reverse_iterator</span></tt> models the same iterator
 traversal and iterator access concepts modeled by its <tt class="literal"><span class="pre">Iterator</span></tt>
 argument.  In addition, it may model old iterator concepts
 specified in the following table:</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="53%" />
 <col width="47%" />
@ -3798,7 +3795,7 @@ The <tt class="literal"><span class="pre">value_type</span></tt> is <tt class="l
 <p>After the requirements section, add:</p>
 </div>
 <div class="topic">
-<p class="topic-title"><tt class="literal"><span class="pre">transform_iterator</span></tt> models</p>
+<p class="topic-title first"><tt class="literal"><span class="pre">transform_iterator</span></tt> models</p>
 <blockquote>
 <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>
@ -3817,7 +3814,7 @@ concept that is modeled by the <tt class="literal"><span class="pre">Iterator</s
 <p>If <tt class="literal"><span class="pre">transform_iterator</span></tt> is a model of Readable Lvalue Iterator then
 it models the following original iterator concepts depending on what
 the <tt class="literal"><span class="pre">Iterator</span></tt> argument models.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="50%" />
 <col width="50%" />
@ -3946,12 +3943,12 @@ Input Iterator.</dd>
 <p>After the requirements section, add:</p>
 </div>
 <div class="topic">
-<p class="topic-title"><tt class="literal"><span class="pre">filter_iterator</span></tt> models</p>
+<p class="topic-title first"><tt class="literal"><span class="pre">filter_iterator</span></tt> models</p>
 <blockquote>
 <p>The concepts that <tt class="literal"><span class="pre">filter_iterator</span></tt> models are dependent on which
 concepts the <tt class="literal"><span class="pre">Iterator</span></tt> argument models, as specified in the
 following tables.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="33%" />
 <col width="67%" />
@ -3970,7 +3967,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="41%" />
 <col width="59%" />
@ -3992,7 +3989,7 @@ following tables.</p>
 </tr>
 </tbody>
 </table>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="63%" />
 <col width="38%" />
@ -4287,7 +4284,7 @@ the following must must also be valid:</dd>
 <p>After the requirements section, add:</p>
 </div>
 <div class="topic">
-<p class="topic-title"><tt class="literal"><span class="pre">counting_iterator</span></tt> models</p>
+<p class="topic-title first"><tt class="literal"><span class="pre">counting_iterator</span></tt> models</p>
 <blockquote>
 <p>Specializations of <tt class="literal"><span class="pre">counting_iterator</span></tt> model Readable Lvalue
 Iterator. In addition, they model the concepts corresponding to the
@ -4433,7 +4430,7 @@ object copy constructed from <tt class="literal"><span class="pre">x</span></tt>
 <p>c++std-lib-12585:</p>
 <p>Readable Iterator Requirements says:</p>
 <blockquote>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="13%" />
 <col width="10%" />
@ -4802,7 +4799,7 @@ struct indirect_reference;
 </tbody>
 </table>
 <div class="topic">
-<p class="topic-title">Class template <tt class="literal"><span class="pre">pointee</span></tt></p>
+<p class="topic-title first">Class template <tt class="literal"><span class="pre">pointee</span></tt></p>
 <!-- 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) -->
@ -4846,7 +4843,7 @@ else
 </pre>
 </div>
 <div class="topic">
-<p class="topic-title">Class template <tt class="literal"><span class="pre">indirect_reference</span></tt></p>
+<p class="topic-title first">Class template <tt class="literal"><span class="pre">indirect_reference</span></tt></p>
 <!-- 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) -->
@ -4991,7 +4988,7 @@ Traversal Iterator to include Default Constructible.</p>
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Forward Traversal Iterator</em>
 concept if the following expressions are valid and respect the stated
 semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="44%" />
 <col width="39%" />
@ -5010,7 +5007,7 @@ concept if, in addition to <tt class="literal"><span class="pre">X</span></tt> m
 Default Constructible and Single Pass Iterator, the following
 expressions are valid and respect the
 stated semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="38%" />
 <col width="34%" />
@ -5122,7 +5119,7 @@ object of type <tt class="literal"><span class="pre">X</span></tt>, <tt class="l
 object of a single pass iterator type interoperable with X, 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>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="19%" />
 <col width="18%" />
@ -5202,7 +5199,7 @@ object of a single pass iterator type interoperable with <tt class="literal"><sp
 is a constant object of a random access traversal iterator type
 interoperable with <tt class="literal"><span class="pre">X</span></tt>.</p>
 <p><strong>iterator_facade Core Operations</strong></p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="21%" />
 <col width="23%" />
--- a/doc/iterator_adaptor.html
+++ b/doc/iterator_adaptor.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: 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" />
-<meta name="date" content="2004-01-12" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="iterator-adaptor">
 <h1 class="title">Iterator Adaptor</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -27,11 +26,12 @@
 Lab</a>, University of Hanover <a class="last reference" href="http://www.ive.uni-hannover.de">Institute for Transport
 Railway Operation and Construction</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-12</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved</td></tr>
+<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="iterator-adaptor">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -42,8 +42,7 @@ Railway Operation and Construction</a></td></tr>
 </table>
 <!-- Version 1.1 of this ReStructuredText document corresponds to
 n1530_, the paper accepted by the LWG. -->
-<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All
-rights reserved -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <p>Each specialization of the <tt class="literal"><span class="pre">iterator_adaptor</span></tt> class template is derived from
 a specialization of <tt class="literal"><span class="pre">iterator_facade</span></tt>. The core interface functions
 expected by <tt class="literal"><span class="pre">iterator_facade</span></tt> are implemented in terms of the
@ -55,7 +54,7 @@ depends on the operations supported by the <tt class="literal"><span class="pre"
 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="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#overview" id="id6" name="id6">Overview</a></li>
 <li><a class="reference" href="#reference" id="id7" name="id7">Reference</a><ul>
@ -73,8 +72,7 @@ core interface functions of <tt class="literal"><span class="pre">iterator_facad
 <h1><a class="toc-backref" href="#id6" name="overview">Overview</a></h1>
 <!-- Version 1.2 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
-rights reserved -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <p>The <tt class="literal"><span class="pre">iterator_adaptor</span></tt> class template adapts some <tt class="literal"><span class="pre">Base</span></tt> <a class="footnote-reference" href="#base" id="id1" name="id1"><sup>1</sup></a>
 type to create a new iterator.  Instantiations of <tt class="literal"><span class="pre">iterator_adaptor</span></tt>
 are derived from a corresponding instantiation of <tt class="literal"><span class="pre">iterator_facade</span></tt>
@ -92,11 +90,12 @@ the underlying iterator object of a <tt class="literal"><span class="pre">revers
 </table>
 <p>The user of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> creates a class derived from an
 instantiation of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> and then selectively
-redefines some of the core member functions described in the table
-above. The <tt class="literal"><span class="pre">Base</span></tt> type need not meet the full requirements for an
-iterator. It need only support the operations used by the core
-interface functions of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been
-redefined in the user's derived class.</p>
+redefines some of the core member functions described in the
+<tt class="literal"><span class="pre">iterator_facade</span></tt> core requirements table. The <tt class="literal"><span class="pre">Base</span></tt> type need
+not meet the full requirements for an iterator; it need only
+support the operations used by the core interface functions of
+<tt class="literal"><span class="pre">iterator_adaptor</span></tt> that have not been redefined in the user's
+derived class.</p>
 <p>Several of the template parameters of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> default
 to <tt class="literal"><span class="pre">use_default</span></tt>. This allows the
 user to make use of a default parameter even when she wants to
@ -114,8 +113,7 @@ that assumption.</p>
 <h1><a class="toc-backref" href="#id7" name="reference">Reference</a></h1>
 <!-- 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
-rights reserved. -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <pre class="literal-block">
 template &lt;
    class Derived
@ -134,6 +132,7 @@ class iterator_adaptor
    explicit iterator_adaptor(Base iter);
    Base const&amp; base() const;
 protected:
+    typedef iterator_adaptor iterator_adaptor_;
    Base const&amp; base_reference() const;
    Base&amp; base_reference();
 private: // Core iterator interface for iterator_facade.  
@ -338,7 +337,7 @@ template we developed in the <a class="reference" href="iterator_facade.html#tut
 read that material, you should go back now and check it out because
 we're going to pick up right where it left off.</p>
 <div class="sidebar">
-<p class="sidebar-title"><tt class="literal"><span class="pre">node_base*</span></tt> really <em>is</em> an iterator</p>
+<p class="sidebar-title first"><tt class="literal"><span class="pre">node_base*</span></tt> really <em>is</em> an iterator</p>
 <p>It's not really a very interesting iterator, since <tt class="literal"><span class="pre">node_base</span></tt>
 is an abstract class: a pointer to a <tt class="literal"><span class="pre">node_base</span></tt> just points
 at some base subobject of an instance of some other class, and
@ -348,7 +347,7 @@ position is to compare another <tt class="literal"><span class="pre">node_base*<
 words, the original iterator traverses a one-element array.</p>
 </div>
 <p>You probably didn't think of it this way, but the <tt class="literal"><span class="pre">node_base*</span></tt>
-object which underlies <tt class="literal"><span class="pre">node_iterator</span></tt> is itself an iterator,
+object that underlies <tt class="literal"><span class="pre">node_iterator</span></tt> is itself an iterator,
 just like all other pointers.  If we examine that pointer closely
 from an iterator perspective, we can see that it has much in common
 with the <tt class="literal"><span class="pre">node_iterator</span></tt> we're building.  First, they share most
@ -357,9 +356,10 @@ of the same associated types (<tt class="literal"><span class="pre">value_type</
 core functionality is the same: <tt class="literal"><span class="pre">operator*</span></tt> and <tt class="literal"><span class="pre">operator==</span></tt> on
 the <tt class="literal"><span class="pre">node_iterator</span></tt> return the result of invoking the same
 operations on the underlying pointer, via the <tt class="literal"><span class="pre">node_iterator</span></tt>'s
-<a class="reference" href="iterator_facade.html#implementing-the-core-operations"><tt class="literal"><span class="pre">dereference</span></tt> and <tt class="literal"><span class="pre">equal</span></tt> member functions</a>). However, the <tt class="literal"><span class="pre">operator++</span></tt> for
-<tt class="literal"><span class="pre">node_iterator</span></tt> behaves differently than for <tt class="literal"><span class="pre">node_base*</span></tt>
-since it follows the <tt class="literal"><span class="pre">m_next</span></tt> pointer.</p>
+<a class="reference" href="iterator_facade.html#implementing-the-core-operations"><tt class="literal"><span class="pre">dereference</span></tt> and <tt class="literal"><span class="pre">equal</span></tt> member functions</a>).  The only real behavioral difference
+between <tt class="literal"><span class="pre">node_base*</span></tt> and <tt class="literal"><span class="pre">node_iterator</span></tt> can be observed when
+they are incremented: <tt class="literal"><span class="pre">node_iterator</span></tt> follows the
+<tt class="literal"><span class="pre">m_next</span></tt> pointer, while <tt class="literal"><span class="pre">node_base*</span></tt> just applies an address offset.</p>
 <p>It turns out that the pattern of building an iterator on another
 iterator-like type (the <tt class="literal"><span class="pre">Base</span></tt> <a class="footnote-reference" href="#base" id="id3" name="id3"><sup>1</sup></a> type) while modifying
 just a few aspects of the underlying type's behavior is an
@ -383,16 +383,12 @@ class node_iter
 private:
    struct enabler {};  // a private type avoids misuse

-    typedef boost::iterator_adaptor&lt;
-        node_iter&lt;Value&gt;, Value*, boost::use_default, boost::forward_traversal_tag
-    &gt; super_t;
-
 public:
    node_iter()
-      : super_t(0) {}
+      : node_iter::iterator_adaptor_(0) {}

    explicit node_iter(Value* p)
-      : super_t(p) {}
+      : node_iter::iterator_adaptor_(p) {}

    template &lt;class OtherValue&gt;
    node_iter(
@ -402,14 +398,20 @@ class node_iter
          , enabler
        &gt;::type = enabler()
    )
-      : super_t(other.base()) {}
+      : node_iter::iterator_adaptor_(other.base()) {}

 private:
    friend class boost::iterator_core_access;
    void increment() { this-&gt;base_reference() = this-&gt;base()-&gt;next(); }
 };
 </pre>
-<p>You can see an example program which exercises this version of the
+<p>Note the use of <tt class="literal"><span class="pre">node_iter::iterator_adaptor_</span></tt> here: because
+<tt class="literal"><span class="pre">iterator_adaptor</span></tt> defines a nested <tt class="literal"><span class="pre">iterator_adaptor_</span></tt> type
+that refers to itself, that gives us a convenient way to refer to
+the complicated base class type of <tt class="literal"><span class="pre">node_iter&lt;Value&gt;</span></tt>. [Note:
+this technique is known not to work with Borland C++ 5.6.4 and
+Metrowerks CodeWarrior versions prior to 9.0]</p>
+<p>You can see an example program that exercises this version of the
 node iterators <a class="reference" href="../example/node_iterator3.cpp">here</a>.</p>
 <p>In the case of <tt class="literal"><span class="pre">node_iter</span></tt>, it's not very compelling to pass
 <tt class="literal"><span class="pre">boost::use_default</span></tt> as <tt class="literal"><span class="pre">iterator_adaptor</span></tt>'s <tt class="literal"><span class="pre">Value</span></tt>
@ -422,7 +424,7 @@ iterator type argument and reverses its direction of traversal,
 since the original iterator and the reversed one have all the same
 associated types, <tt class="literal"><span class="pre">iterator_adaptor</span></tt>'s delegation of default
 types to its <tt class="literal"><span class="pre">Base</span></tt> saves the implementor of
-<tt class="literal"><span class="pre">boost::reverse_iterator</span></tt> from writing</p>
+<tt class="literal"><span class="pre">boost::reverse_iterator</span></tt> from writing:</p>
 <pre class="literal-block">
 std::iterator_traits&lt;Iterator&gt;::<em>some-associated-type</em>
 </pre>
--- a/doc/iterator_adaptor.pdf
+++ b/doc/iterator_adaptor.pdf
--- a/doc/iterator_adaptor.rst
+++ b/doc/iterator_adaptor.rst
@ -8,7 +8,7 @@
               Lab`_, University of Hanover `Institute for Transport
               Railway Operation and Construction`_
 :date: $Date$
-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
--- a/doc/iterator_adaptor_abstract.rst
+++ b/doc/iterator_adaptor_abstract.rst
@ -1,8 +1,7 @@
 .. Version 1.1 of this ReStructuredText document corresponds to
   n1530_, the paper accepted by the LWG.

-.. Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All
-   rights reserved
+.. Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 Each specialization of the ``iterator_adaptor`` class template is derived from
 a specialization of ``iterator_facade``. The core interface functions
--- a/doc/iterator_adaptor_body.rst
+++ b/doc/iterator_adaptor_body.rst
@ -1,8 +1,7 @@
 .. Version 1.2 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
-   rights reserved
+.. Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 The ``iterator_adaptor`` class template adapts some ``Base`` [#base]_
 type to create a new iterator.  Instantiations of ``iterator_adaptor``
@ -18,11 +17,12 @@ instance of the ``Base`` type, which it stores as a member.

 The user of ``iterator_adaptor`` creates a class derived from an
 instantiation of ``iterator_adaptor`` and then selectively
-redefines some of the core member functions described in the table
-above. The ``Base`` type need not meet the full requirements for an
-iterator. It need only support the operations used by the core
-interface functions of ``iterator_adaptor`` that have not been
-redefined in the user's derived class.
+redefines some of the core member functions described in the
+``iterator_facade`` core requirements table. The ``Base`` type need
+not meet the full requirements for an iterator; it need only
+support the operations used by the core interface functions of
+``iterator_adaptor`` that have not been redefined in the user's
+derived class.

 Several of the template parameters of ``iterator_adaptor`` default
 to ``use_default``. This allows the
--- a/doc/iterator_adaptor_ref.html
+++ b/doc/iterator_adaptor_ref.html
@ -3,33 +3,34 @@
 <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.6: http://docutils.sourceforge.net/" />
+<title></title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
 <div class="document">
 <!-- 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
-rights reserved. -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <pre class="literal-block">
 template &lt;
    class Derived
  , class Base
-  , class Value        = use_default
-  , class CategoryOrTraversal  = use_default
-  , class Reference  = use_default
+  , class Value               = use_default
+  , class CategoryOrTraversal = use_default
+  , class Reference           = use_default
  , class Difference = use_default
 &gt;
 class iterator_adaptor 
-  : public iterator_facade&lt;Derived, <em>V</em>, <em>C</em>, <em>R</em>, <em>D</em>&gt; // see <a class="reference" href="#base-parameters">details</a>
+  : public iterator_facade&lt;Derived, <em>V'</em>, <em>C'</em>, <em>R'</em>, <em>D'</em>&gt; // see <a class="reference" href="#base-parameters">details</a>
 {
    friend class iterator_core_access;
 public:
    iterator_adaptor();
    explicit iterator_adaptor(Base iter);
-    Base base() const;
+    Base const&amp; base() const;
 protected:
+    typedef iterator_adaptor iterator_adaptor_;
    Base const&amp; base_reference() const;
    Base&amp; base_reference();
 private: // Core iterator interface for iterator_facade.  
@ -54,23 +55,28 @@ 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">
+<a class="target" id="requirements" name="requirements"></a><div class="section" id="iterator-adaptor-requirements">
+<h1><a name="iterator-adaptor-requirements"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> requirements</a></h1>
+<p><tt class="literal"><span class="pre">static_cast&lt;Derived*&gt;(iterator_adaptor*)</span></tt> shall be well-formed.
+The <tt class="literal"><span class="pre">Base</span></tt> argument shall be Assignable and Copy Constructible.</p>
+<a class="target" id="base-parameters" name="base-parameters"></a></div>
+<div class="section" id="iterator-adaptor-base-class-parameters">
 <h1><a name="iterator-adaptor-base-class-parameters"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> base class parameters</a></h1>
-<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>
+<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>
 <pre class="literal-block">
-<em>V</em> = if (Value is use_default)
+<em>V'</em> = if (Value is use_default)
          return iterator_traits&lt;Base&gt;::value_type
      else
          return Value

-<em>C</em> = if (CategoryOrTraversal is use_default)
+<em>C'</em> = if (CategoryOrTraversal is use_default)
          return iterator_traversal&lt;Base&gt;::type
      else
          return CategoryOrTraversal

-<em>R</em> = if (Reference is use_default)
+<em>R'</em> = if (Reference is use_default)
          if (Value is use_default)
              return iterator_traits&lt;Base&gt;::reference
          else
@ -78,23 +84,22 @@ above are defined as follows:</p>
      else
          return Reference

-<em>D</em> = if (Difference is use_default)
+<em>D'</em> = if (Difference is use_default)
          return iterator_traits&lt;Base&gt;::difference_type
      else
          return Difference
 </pre>
-</div>
-<div class="section" id="iterator-adaptor-usage">
-<h1><a name="iterator-adaptor-usage"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> usage</a></h1>
-<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
-<tt class="literal"><span class="pre">iterator_traits&lt;Derived&gt;::iterator_category</span></tt>, the expressions
-involving <tt class="literal"><span class="pre">m_iterator</span></tt> in the specifications of those private
-member functions of <tt class="literal"><span class="pre">iterator_adaptor</span></tt> that may be called by
-<tt class="literal"><span class="pre">iterator_facade&lt;Derived,</span> <span class="pre">V,</span> <span class="pre">C,</span> <span class="pre">R,</span> <span class="pre">D&gt;</span></tt>
-in evaluating any valid expression involving <tt class="literal"><span class="pre">Derived</span></tt>
-in those concepts' requirements.</p>
+<!-- ``iterator_adaptor`` models
+- - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+In order for ``Derived`` to model the iterator concepts corresponding
+to ``iterator_traits<Derived>::iterator_category``, the expressions
+involving ``m_iterator`` in the specifications of those private member
+functions of ``iterator_adaptor`` that may be called by
+``iterator_facade<Derived, V, C, R, D>`` in evaluating any valid
+expression involving ``Derived`` in those concepts' requirements. -->
+<!-- The above is confusing and needs a rewrite. -JGS -->
+<!-- That's why it's removed.  We're embracing inheritance, remember? -->
 </div>
 <div class="section" id="iterator-adaptor-public-operations">
 <h1><a name="iterator-adaptor-public-operations"><tt class="literal"><span class="pre">iterator_adaptor</span></tt> public operations</a></h1>
@ -120,7 +125,7 @@ in those concepts' requirements.</p>
 </tr>
 </tbody>
 </table>
-<p><tt class="literal"><span class="pre">Base</span> <span class="pre">base()</span> <span class="pre">const;</span></tt></p>
+<p><tt class="literal"><span class="pre">Base</span> <span class="pre">const&amp;</span> <span class="pre">base()</span> <span class="pre">const;</span></tt></p>
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -220,10 +225,9 @@ typename iterator_adaptor::difference_type distance_to(
 </table>
 </div>
 </div>
-<hr class="footer"/>
+<hr class="footer" />
 <div class="footer">
 <a class="reference" href="iterator_adaptor_ref.rst">View document source</a>.
-Generated on: 2004-01-12 15:25 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>
--- a/doc/iterator_adaptor_ref.rst
+++ b/doc/iterator_adaptor_ref.rst
@ -1,8 +1,7 @@
 .. 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
-   rights reserved.
+.. Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 .. parsed-literal::
  
@ -23,6 +22,7 @@
      explicit iterator_adaptor(Base iter);
      Base const& base() const;
   protected:
+      typedef iterator_adaptor iterator_adaptor\_;
      Base const& base_reference() const;
      Base& base_reference();
   private: // Core iterator interface for iterator_facade.  
--- a/doc/iterator_adaptor_tutorial.rst
+++ b/doc/iterator_adaptor_tutorial.rst
@ -21,7 +21,7 @@ we're going to pick up right where it left off.
   words, the original iterator traverses a one-element array.

 You probably didn't think of it this way, but the ``node_base*``
-object which underlies ``node_iterator`` is itself an iterator,
+object that underlies ``node_iterator`` is itself an iterator,
 just like all other pointers.  If we examine that pointer closely
 from an iterator perspective, we can see that it has much in common
 with the ``node_iterator`` we're building.  First, they share most
@ -30,9 +30,10 @@ of the same associated types (``value_type``, ``reference``,
 core functionality is the same: ``operator*`` and ``operator==`` on
 the ``node_iterator`` return the result of invoking the same
 operations on the underlying pointer, via the ``node_iterator``\ 's
-|dereference_and_equal|_). However, the ``operator++`` for
-``node_iterator`` behaves differently than for ``node_base*``
-since it follows the ``m_next`` pointer.
+|dereference_and_equal|_).  The only real behavioral difference
+between ``node_base*`` and ``node_iterator`` can be observed when
+they are incremented: ``node_iterator`` follows the
+``m_next`` pointer, while ``node_base*`` just applies an address offset.   

 .. |dereference_and_equal| replace:: ``dereference`` and ``equal`` member functions
 .. _dereference_and_equal: iterator_facade.html#implementing-the-core-operations
@ -60,16 +61,12 @@ behaviors other than ``increment``.  The implementation of
   private:
      struct enabler {};  // a private type avoids misuse

-      typedef boost::iterator_adaptor<
-          node_iter<Value>, Value*, boost::use_default, boost::forward_traversal_tag
-      > super_t;
-
   public:
      node_iter()
-        : super_t(0) {}
+        : node_iter::iterator_adaptor_(0) {}

      explicit node_iter(Value* p)
-        : super_t(p) {}
+        : node_iter::iterator_adaptor_(p) {}

      template <class OtherValue>
      node_iter(
@ -79,14 +76,21 @@ behaviors other than ``increment``.  The implementation of
            , enabler
          >::type = enabler()
      )
-        : super_t(other.base()) {}
+        : node_iter::iterator_adaptor_(other.base()) {}

   private:
      friend class boost::iterator_core_access;
      void increment() { this->base_reference() = this->base()->next(); }
  };

-You can see an example program which exercises this version of the
+Note the use of ``node_iter::iterator_adaptor_`` here: because
+``iterator_adaptor`` defines a nested ``iterator_adaptor_`` type
+that refers to itself, that gives us a convenient way to refer to
+the complicated base class type of ``node_iter<Value>``. [Note:
+this technique is known not to work with Borland C++ 5.6.4 and
+Metrowerks CodeWarrior versions prior to 9.0]
+
+You can see an example program that exercises this version of the
 node iterators `here`__.

 __ ../example/node_iterator3.cpp
@ -102,7 +106,7 @@ iterator type argument and reverses its direction of traversal,
 since the original iterator and the reversed one have all the same
 associated types, ``iterator_adaptor``\ 's delegation of default
 types to its ``Base`` saves the implementor of
-``boost::reverse_iterator`` from writing
+``boost::reverse_iterator`` from writing:

 .. parsed-literal::

--- a/doc/iterator_archetypes.html
+++ b/doc/iterator_archetypes.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Iterator Archetype</title>
 <meta name="author" content="David Abrahams, Jeremy Siek, Thomas Witt" />
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab, Zephyr Associates, Inc." />
-<meta name="date" content="2004-01-16" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="iterator-archetype">
 <h1 class="title">Iterator Archetype</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -26,21 +25,26 @@
 <td><a class="first reference" href="http://www.boost-consulting.com">Boost Consulting</a>, Indiana University <a class="reference" href="http://www.osl.iu.edu">Open Systems
 Lab</a>, <a class="last reference" href="http://www.styleadvisor.com">Zephyr Associates, Inc.</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-16</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004. All rights reserved</td></tr>
+<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004.</td></tr>
 </tbody>
 </table>
+<div class="document" id="iterator-archetype">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">abstract:</th><td class="field-body">iterator archetypes provide a means to check the compile time requirements of a generic component on its iterator arguments.</td>
+<tr class="field"><th class="field-name">abstract:</th><td class="field-body">The <tt class="literal"><span class="pre">iterator_archetype</span></tt> class constructs a minimal implementation of
+one of the iterator access concepts and one of the iterator traversal concepts.
+This is used for doing a compile-time check to see if a the type requirements
+of a template are really enough to cover the implementation of the template.
+For further information see the documentation for the <a class="reference" href="../../concept_check/index.html"><tt class="literal"><span class="pre">boost::concept_check</span></tt></a> library.</td>
 </tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#reference" id="id1" name="id1">Reference</a><ul>
 <li><a class="reference" href="#iterator-archetype-synopsis" id="id2" name="id2"><tt class="literal"><span class="pre">iterator_archetype</span></tt> Synopsis</a></li>
--- a/doc/iterator_archetypes.pdf
+++ b/doc/iterator_archetypes.pdf
--- a/doc/iterator_archetypes.rst
+++ b/doc/iterator_archetypes.rst
@ -7,13 +7,21 @@
 :organization: `Boost Consulting`_, Indiana University `Open Systems
               Lab`_, `Zephyr Associates, Inc.`_
 :date: $Date$
-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
 .. _`Zephyr Associates, Inc.`: http://www.styleadvisor.com

-:abstract: iterator archetypes provide a means to check the compile time requirements of a generic component on its iterator arguments.
+:abstract: The ``iterator_archetype`` class constructs a minimal implementation of
+  one of the iterator access concepts and one of the iterator traversal concepts.
+  This is used for doing a compile-time check to see if a the type requirements
+  of a template are really enough to cover the implementation of the template.
+  For further information see the documentation for the |concepts|_ library.
+
+.. |concepts| replace:: ``boost::concept_check``
+.. _concepts: ../../concept_check/index.html
+

 .. contents:: Table of Contents

@ -178,4 +186,4 @@ The nested trait types are defined as follows:

        2. X is convertible to TraversalCategory

-        
+        
--- a/doc/iterator_concepts.html
+++ b/doc/iterator_concepts.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Iterator Concepts</title>
 <meta name="author" content="David Abrahams, Jeremy Siek, Thomas Witt" />
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab, Zephyr Associates, Inc." />
-<meta name="date" content="2004-01-27" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="iterator-concepts">
 <h1 class="title">Iterator Concepts</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -26,11 +25,12 @@
 <td><a class="first reference" href="http://www.boost-consulting.com">Boost Consulting</a>, Indiana University <a class="reference" href="http://www.osl.iu.edu">Open Systems
 Lab</a>, <a class="last reference" href="http://www.styleadvisor.com">Zephyr Associates, Inc.</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-27</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004. All rights reserved</td></tr>
+<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004.</td></tr>
 </tbody>
 </table>
+<div class="document" id="iterator-concepts">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
--- a/doc/iterator_concepts.pdf
+++ b/doc/iterator_concepts.pdf
--- a/doc/iterator_concepts.rst
+++ b/doc/iterator_concepts.rst
@ -9,7 +9,7 @@
 :organization: `Boost Consulting`_, Indiana University `Open Systems
               Lab`_, `Zephyr Associates, Inc.`_
 :date: $Date$
-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2004. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
--- a/doc/iterator_facade.html
+++ b/doc/iterator_facade.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: 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" />
-<meta name="date" content="2004-01-12" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="iterator-facade">
 <h1 class="title">Iterator Facade</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -27,11 +26,12 @@
 Lab</a>, University of Hanover <a class="last reference" href="http://www.ive.uni-hannover.de">Institute for Transport
 Railway Operation and Construction</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-12</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved</td></tr>
+<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="iterator-facade">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -43,7 +43,7 @@ and associated types, to be supplied by a derived iterator class.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#overview" id="id23" name="id23">Overview</a><ul>
 <li><a class="reference" href="#usage" id="id24" name="id24">Usage</a></li>
@ -84,8 +84,7 @@ and associated types, to be supplied by a derived iterator class.</td>
 <h1><a class="toc-backref" href="#id23" name="overview">Overview</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
-rights reserved -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <p>While the iterator interface is rich, there is a core subset of the
 interface that is necessary for all the functionality.  We have
 identified the following core behaviors for iterators:</p>
@ -143,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 border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="44%" />
 <col width="56%" />
@ -261,7 +260,6 @@ are described in terms of a set of requirements, which must be
 satisfied by the <tt class="literal"><span class="pre">iterator_facade</span></tt> implementation.</p>
 <table class="citation" frame="void" id="cop95" rules="none">
 <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="#id10">2</a>)</em> [Coplien, 1995] Coplien, J., Curiously Recurring Template
 Patterns, C++ Report, February 1995, pp. 24-27.</td></tr>
@ -273,8 +271,7 @@ Patterns, C++ Report, February 1995, pp. 24-27.</td></tr>
 <h1><a class="toc-backref" href="#id28" name="reference">Reference</a></h1>
 <!-- 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
-rights reserved -->
+<!-- Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.  -->
 <pre class="literal-block">
 template &lt;
    class Derived
@ -284,7 +281,7 @@ template &lt;
  , class Difference = ptrdiff_t
 &gt;
 class iterator_facade {
-public:
+ public:
    typedef remove_const&lt;Value&gt;::type value_type;
    typedef Reference reference;
    typedef Value* pointer;
@ -301,6 +298,8 @@ public:
    Derived&amp; operator+=(difference_type n);
    Derived&amp; operator-=(difference_type n);
    Derived operator-(difference_type n) const;
+ protected:
+    typedef iterator_facade iterator_facade_;
 };

 // Comparison operators
@ -444,8 +443,8 @@ object of a single pass iterator type interoperable with <tt class="literal"><sp
 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="topic">
-<p class="topic-title"><tt class="literal"><span class="pre">iterator_facade</span></tt> Core Operations</p>
-<table border class="table">
+<p class="topic-title first"><tt class="literal"><span class="pre">iterator_facade</span></tt> Core Operations</p>
+<table border="1" class="table">
 <colgroup>
 <col width="21%" />
 <col width="23%" />
@ -1089,7 +1088,7 @@ iterator!  For a working example of its use, see <a class="reference" href="../e
 <div class="section" id="a-constant-node-iterator">
 <h2><a class="toc-backref" href="#id42" 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 class="sidebar-title first">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
@ -1139,7 +1138,7 @@ class const_node_iterator
 };
 </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 class="sidebar-title first"><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
@ -1287,6 +1286,10 @@ appropriate:</p>

  ...

+private: 
+  struct enabler {};
+
+public:
  template &lt;class OtherValue&gt;
  node_iter(
      node_iter&lt;OtherValue&gt; const&amp; other
--- a/doc/iterator_facade.pdf
+++ b/doc/iterator_facade.pdf
--- a/doc/iterator_facade.rst
+++ b/doc/iterator_facade.rst
@ -8,7 +8,7 @@
               Lab`_, University of Hanover `Institute for Transport
               Railway Operation and Construction`_
 :date: $Date$
-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
--- a/doc/iterator_facade_body.rst
+++ b/doc/iterator_facade_body.rst
@ -1,8 +1,7 @@
 .. 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
-   rights reserved
+.. Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 


 While the iterator interface is rich, there is a core subset of the
--- a/doc/iterator_facade_ref.rst
+++ b/doc/iterator_facade_ref.rst
@ -1,8 +1,7 @@
 .. 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
-   rights reserved
+.. Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 


 .. parsed-literal::
@ -15,7 +14,7 @@
    , class Difference = ptrdiff_t
  >
  class iterator_facade {
-  public:
+   public:
      typedef remove_const<Value>::type value_type;
      typedef Reference reference;
      typedef Value\* pointer;
@ -32,6 +31,8 @@
      Derived& operator+=(difference_type n);
      Derived& operator-=(difference_type n);
      Derived operator-(difference_type n) const;
+   protected:
+      typedef iterator_facade iterator_facade\_;
  };

  // Comparison operators
--- a/doc/iterator_facade_tutorial.rst
+++ b/doc/iterator_facade_tutorial.rst
@ -483,6 +483,10 @@ appropriate::

    ...

+  private: 
+    struct enabler {};
+
+  public:
    template <class OtherValue>
    node_iter(
        node_iter<OtherValue> const& other
--- a/doc/iterator_traits.html
+++ b/doc/iterator_traits.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Iterator Traits</title>
 <meta name="author" content="David Abrahams" />
 <meta name="organization" content="Boost Consulting" />
-<meta name="date" content="2004-01-13" />
-<meta name="copyright" content="Copyright David Abrahams 2004. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams 2004." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="iterator-traits">
 <h1 class="title">Iterator Traits</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -25,11 +24,12 @@
 <tr><th class="docinfo-name">Organization:</th>
 <td><a class="first last reference" href="http://www.boost-consulting.com">Boost Consulting</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-13</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams 2004. All rights reserved</td></tr>
+<td>Copyright David Abrahams 2004.</td></tr>
 </tbody>
 </table>
+<div class="document" id="iterator-traits">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
--- a/doc/iterator_traits.pdf
+++ b/doc/iterator_traits.pdf
--- a/doc/iterator_traits.rst
+++ b/doc/iterator_traits.rst
@ -6,7 +6,7 @@
 :Contact: dave@boost-consulting.com
 :organization: `Boost Consulting`_
 :date: $Date$
-:copyright: Copyright David Abrahams 2004. All rights reserved
+:copyright: Copyright David Abrahams 2004. 

 .. _`Boost Consulting`: http://www.boost-consulting.com

--- a/doc/make_filter_iterator.html
+++ b/doc/make_filter_iterator.html
@ -3,7 +3,8 @@
 <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.6: http://docutils.sourceforge.net/" />
+<title></title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
@ -17,10 +18,7 @@ make_filter_iterator(Predicate f, Iterator x, Iterator end = Iterator());
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">An instance of <tt class="literal"><span class="pre">filter_iterator&lt;Predicate,Iterator&gt;</span></tt> 
-where <tt class="literal"><span class="pre">m_iter</span></tt> is either the first position in the range <tt class="literal"><span class="pre">[x,end)</span></tt> such that
-<tt class="literal"><span class="pre">f(*this-&gt;base())</span> <span class="pre">==</span> <span class="pre">true</span></tt> or else <tt class="literal"><span class="pre">m_iter</span> <span class="pre">==</span> <span class="pre">end</span></tt>.
-The member <tt class="literal"><span class="pre">m_pred</span></tt> is constructed from <tt class="literal"><span class="pre">f</span></tt> and <tt class="literal"><span class="pre">m_end</span></tt> from <tt class="literal"><span class="pre">end</span></tt>.</td>
+<tr class="field"><th class="field-name">Returns:</th><td class="field-body">filter_iterator&lt;Predicate,Iterator&gt;(f, x, end)</td>
 </tr>
 </tbody>
 </table>
@ -33,20 +31,14 @@ make_filter_iterator(Iterator x, Iterator end = Iterator());
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">An instance of <tt class="literal"><span class="pre">filter_iterator&lt;Predicate,Iterator&gt;</span></tt> 
-where <tt class="literal"><span class="pre">m_iter</span></tt> is either the first position in the range <tt class="literal"><span class="pre">[x,end)</span></tt>
-such that <tt class="literal"><span class="pre">f(*this-&gt;base())</span> <span class="pre">==</span> <span class="pre">true</span></tt>, where <tt class="literal"><span class="pre">f</span></tt> is a default
-constructed <tt class="literal"><span class="pre">Predicate</span></tt>, or else <tt class="literal"><span class="pre">m_iter</span> <span class="pre">==</span> <span class="pre">end</span></tt>.
-The member <tt class="literal"><span class="pre">m_pred</span></tt> is default constructed and  <tt class="literal"><span class="pre">m_end</span></tt> 
-is constructed from <tt class="literal"><span class="pre">end</span></tt>.</td>
+<tr class="field"><th class="field-name">Returns:</th><td class="field-body">filter_iterator&lt;Predicate,Iterator&gt;(x, end)</td>
 </tr>
 </tbody>
 </table>
 </div>
-<hr class="footer"/>
+<hr class="footer" />
 <div class="footer">
 <a class="reference" href="make_filter_iterator.rst">View document source</a>.
-Generated on: 2004-01-13 02:57 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>
--- a/doc/new-iter-concepts.html
+++ b/doc/new-iter-concepts.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>New Iterator Concepts</title>
 <meta name="author" content="David Abrahams, Jeremy Siek, Thomas Witt" />
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab, Zephyr Associates, Inc." />
-<meta name="date" content="2004-01-19" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="new-iterator-concepts">
 <h1 class="title">New Iterator Concepts</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -26,7 +25,7 @@
 <td><a class="first reference" href="http://www.boost-consulting.com">Boost Consulting</a>, Indiana University <a class="reference" href="http://www.osl.iu.edu">Open Systems
 Lab</a>, <a class="last reference" href="http://www.styleadvisor.com">Zephyr Associates, Inc.</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-19</td></tr>
+<td>2004-11-01</td></tr>
 <tr class="field"><th class="docinfo-name">Number:</th><td class="field-body">This is a revised version of <a class="reference" href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1550.html">n1550</a>=03-0133, which was
 accepted for Technical Report 1 by the C++ standard
 committee's library working group. This proposal is a
@ -34,9 +33,10 @@ revision of paper <a class="reference" href="http://anubis.dkuug.dk/jtc1/sc22/wg
 </tr>
 <tr><th class="docinfo-name">Copyright:</th>
 <td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt
-2003. All rights reserved</td></tr>
+2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="new-iterator-concepts">
 <!-- Version 1.25 of this ReStructuredText document is the same as
 n1550_, the paper accepted by the LWG. -->
 <table class="field-list" frame="void" rules="none">
@ -52,7 +52,7 @@ of iterators that are used in practice.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#motivation" id="id1" name="id1">Motivation</a></li>
 <li><a class="reference" href="#impact-on-the-standard" id="id2" name="id2">Impact on the Standard</a><ul>
@ -107,7 +107,7 @@ geared towards iterator traversal (hence the category names), while
 requirements that address value access sneak in at various places. The
 following table gives a summary of the current value access
 requirements in the iterator categories.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="31%" />
 <col width="69%" />
@ -201,10 +201,9 @@ iterator concepts because the new concepts provide a more accurate way
 to express their type requirements. The result is algorithms that are
 usable in more situations and have fewer type requirements.</p>
 <p>For the next working paper (but not for TR1), the committee should
-consider the following changes to the type requirements of
-algorithms.  These changes are phrased as phrased as textual
-substitutions, listing the algorithms to which each textual
-substitution applies.</p>
+consider the following changes to the type requirements of algorithms.
+These changes are phrased as textual substitutions, listing the
+algorithms to which each textual substitution applies.</p>
 <p>Forward Iterator -&gt; Forward Traversal Iterator and Readable Iterator</p>
 <blockquote>
 <tt class="literal"><span class="pre">find_end,</span> <span class="pre">adjacent_find,</span> <span class="pre">search,</span> <span class="pre">search_n,</span> <span class="pre">rotate_copy,</span>
@ -365,7 +364,7 @@ for value type <tt class="literal"><span class="pre">T</span></tt> if, in additi
 Copy Constructible, the following expressions are valid and respect
 the stated semantics. <tt class="literal"><span class="pre">U</span></tt> is the type of any specified member of
 type <tt class="literal"><span class="pre">T</span></tt>.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="28%" />
 <col width="20%" />
@ -407,7 +406,7 @@ non-cv-qualified type</td>
 if, in addition to <tt class="literal"><span class="pre">X</span></tt> being Copy Constructible, the following
 expressions are valid and respect the stated semantics.  Writable
 Iterators have an associated <em>set of value types</em>.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="37%" />
 <col width="21%" />
@ -436,7 +435,7 @@ value types of <tt class="literal"><span class="pre">X</span></tt></td>
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Swappable Iterator</em> concept
 if, in addition to <tt class="literal"><span class="pre">X</span></tt> being Copy Constructible, the following
 expressions are valid and respect the stated semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="37%" />
 <col width="19%" />
@ -458,17 +457,16 @@ exchanged</td>
 </tr>
 </tbody>
 </table>
-<dl>
-<dt>[<em>Note:</em> An iterator that is a model of the <em>Readable</em> and <em>Writable Iterator</em> concepts</dt>
-<dd>is also a model of <em>Swappable Iterator</em>.  <em>--end note</em>]</dd>
-</dl>
+<p>[<em>Note:</em> An iterator that is a model of the <a class="reference" href="#readable-iterator">Readable Iterator</a> and
+<a class="reference" href="#writable-iterator">Writable Iterator</a> concepts is also a model of <em>Swappable
+Iterator</em>.  <em>--end note</em>]</p>
 </div>
 <div class="section" id="lvalue-iterators-lib-lvalue-iterators">
 <h4><a class="toc-backref" href="#id14" name="lvalue-iterators-lib-lvalue-iterators">Lvalue Iterators [lib.lvalue.iterators]</a></h4>
 <p>The <em>Lvalue Iterator</em> concept adds the requirement that the return
 type of <tt class="literal"><span class="pre">operator*</span></tt> type be a reference to the value type of the
 iterator.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="22%" />
 <col width="19%" />
@ -488,14 +486,15 @@ iterator.</p>
 <td><tt class="literal"><span class="pre">T</span></tt> is <em>cv</em>
 <tt class="literal"><span class="pre">iterator_traits&lt;X&gt;::value_type</span></tt>
 where <em>cv</em> is an optional
-cv-qualification.
-pre: <tt class="literal"><span class="pre">a</span></tt> is
-dereferenceable. If <tt class="literal"><span class="pre">a</span>
-<span class="pre">==</span> <span class="pre">b</span></tt> then <tt class="literal"><span class="pre">*a</span></tt> is
-equivalent to <tt class="literal"><span class="pre">*b</span></tt>.</td>
+cv-qualification.  pre: <tt class="literal"><span class="pre">a</span></tt> is
+dereferenceable.</td>
 </tr>
 </tbody>
 </table>
+<p>If <tt class="literal"><span class="pre">X</span></tt> is a <a class="reference" href="#writable-iterator">Writable Iterator</a> then <tt class="literal"><span class="pre">a</span> <span class="pre">==</span> <span class="pre">b</span></tt> if and only if
+<tt class="literal"><span class="pre">*a</span></tt> is the same object as <tt class="literal"><span class="pre">*b</span></tt>.  If <tt class="literal"><span class="pre">X</span></tt> is a <a class="reference" href="#readable-iterator">Readable
+Iterator</a> then <tt class="literal"><span class="pre">a</span> <span class="pre">==</span> <span class="pre">b</span></tt> implies <tt class="literal"><span class="pre">*a</span></tt> is the same object as
+<tt class="literal"><span class="pre">*b</span></tt>.</p>
 </div>
 </div>
 <div class="section" id="iterator-traversal-concepts-lib-iterator-traversal">
@ -510,18 +509,18 @@ type <tt class="literal"><span class="pre">X</span></tt>, <tt class="literal"><s
 concept if, in addition to <tt class="literal"><span class="pre">X</span></tt> being Assignable and Copy
 Constructible, the following expressions are valid and respect the
 stated semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="39%" />
-<col width="37%" />
-<col width="24%" />
+<col width="38%" />
+<col width="23%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th colspan="3">Incrementable Iterator Requirements (in addition to Assignable, Copy Constructible)</th>
 </tr>
 <tr><th>Expression</th>
 <th>Return Type</th>
-<th>Assertion/Semantics</th>
+<th>Assertion</th>
 </tr>
 </thead>
 <tbody valign="top">
@ -530,15 +529,12 @@ stated semantics.</p>
 <td><tt class="literal"><span class="pre">&amp;r</span> <span class="pre">==</span> <span class="pre">&amp;++r</span></tt></td>
 </tr>
 <tr><td><tt class="literal"><span class="pre">r++</span></tt></td>
-<td><tt class="literal"><span class="pre">X</span></tt></td>
-<td><pre class="first last literal-block">
-{
-   X tmp = r;
-   ++r;
-   return tmp;
-}
-</pre>
-</td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
+</tr>
+<tr><td><tt class="literal"><span class="pre">*r++</span></tt></td>
+<td>&nbsp;</td>
+<td>&nbsp;</td>
 </tr>
 <tr><td><tt class="literal"><span class="pre">iterator_traversal&lt;X&gt;::type</span></tt></td>
 <td>Convertible to
@ -547,6 +543,11 @@ stated semantics.</p>
 </tr>
 </tbody>
 </table>
+<p>If <tt class="literal"><span class="pre">X</span></tt> is a <a class="reference" href="#writable-iterator">Writable Iterator</a> then <tt class="literal"><span class="pre">X</span> <span class="pre">a(r++);</span></tt> is equivalent
+to <tt class="literal"><span class="pre">X</span> <span class="pre">a(r);</span> <span class="pre">++r;</span></tt> and <tt class="literal"><span class="pre">*r++</span> <span class="pre">=</span> <span class="pre">o</span></tt> is equivalent
+to  <tt class="literal"><span class="pre">*r</span> <span class="pre">=</span> <span class="pre">o;</span> <span class="pre">++r</span></tt>.
+If <tt class="literal"><span class="pre">X</span></tt> is a <a class="reference" href="#readable-iterator">Readable Iterator</a> then <tt class="literal"><span class="pre">T</span> <span class="pre">z(*r++);</span></tt> is equivalent
+to <tt class="literal"><span class="pre">T</span> <span class="pre">z(*r);</span> <span class="pre">++r;</span></tt>.</p>
 <!-- TR1: incrementable_iterator_tag changed to
 incrementable_traversal_tag for consistency. -->
 </div>
@ -555,25 +556,29 @@ incrementable_traversal_tag for consistency. -->
 <p>A class or built-in type <tt class="literal"><span class="pre">X</span></tt> models the <em>Single Pass Iterator</em>
 concept if the following expressions are valid and respect the stated
 semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
-<col width="36%" />
-<col width="33%" />
-<col width="31%" />
+<col width="32%" />
+<col width="29%" />
+<col width="13%" />
+<col width="27%" />
 </colgroup>
 <thead valign="bottom">
-<tr><th colspan="3">Single Pass Iterator Requirements (in addition to Incrementable Iterator and Equality
+<tr><th colspan="4">Single Pass Iterator Requirements (in addition to Incrementable Iterator and Equality
 Comparable)</th>
 </tr>
 <tr><th>Expression</th>
 <th>Return Type</th>
-<th>Assertion/Semantics /
+<th>Operational
+Semantics</th>
+<th>Assertion/
 Pre-/Post-condition</th>
 </tr>
 </thead>
 <tbody valign="top">
 <tr><td><tt class="literal"><span class="pre">++r</span></tt></td>
 <td><tt class="literal"><span class="pre">X&amp;</span></tt></td>
+<td>&nbsp;</td>
 <td>pre: <tt class="literal"><span class="pre">r</span></tt> is
 dereferenceable; post:
 <tt class="literal"><span class="pre">r</span></tt> is dereferenceable or
@ -581,17 +586,20 @@ dereferenceable; post:
 </tr>
 <tr><td><tt class="literal"><span class="pre">a</span> <span class="pre">==</span> <span class="pre">b</span></tt></td>
 <td>convertible to <tt class="literal"><span class="pre">bool</span></tt></td>
+<td>&nbsp;</td>
 <td><tt class="literal"><span class="pre">==</span></tt> is an equivalence
 relation over its domain</td>
 </tr>
 <tr><td><tt class="literal"><span class="pre">a</span> <span class="pre">!=</span> <span class="pre">b</span></tt></td>
 <td>convertible to <tt class="literal"><span class="pre">bool</span></tt></td>
 <td><tt class="literal"><span class="pre">!(a</span> <span class="pre">==</span> <span class="pre">b)</span></tt></td>
+<td>&nbsp;</td>
 </tr>
 <tr><td><tt class="literal"><span class="pre">iterator_traversal&lt;X&gt;::type</span></tt></td>
 <td>Convertible to
 <tt class="literal"><span class="pre">single_pass_traversal_tag</span></tt></td>
 <td>&nbsp;</td>
+<td>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@ -604,7 +612,7 @@ single_pass_traversal_tag for consistency -->
 concept if, in addition to <tt class="literal"><span class="pre">X</span></tt> meeting the requirements of Default
 Constructible and Single Pass Iterator, the following expressions are
 valid and respect the stated semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="38%" />
 <col width="34%" />
@ -651,34 +659,39 @@ forward_traversal_tag for consistency -->
 Iterator</em> concept if, in addition to <tt class="literal"><span class="pre">X</span></tt> meeting the requirements of
 Forward Traversal Iterator, the following expressions are valid and
 respect the stated semantics.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
-<col width="38%" />
-<col width="37%" />
-<col width="25%" />
+<col width="33%" />
+<col width="32%" />
+<col width="14%" />
+<col width="21%" />
 </colgroup>
 <thead valign="bottom">
-<tr><th colspan="3">Bidirectional Traversal Iterator Requirements (in addition to Forward Traversal
+<tr><th colspan="4">Bidirectional Traversal Iterator Requirements (in addition to Forward Traversal
 Iterator)</th>
 </tr>
 <tr><th>Expression</th>
 <th>Return Type</th>
-<th>Assertion/Semantics /
+<th>Operational
+Semantics</th>
+<th>Assertion/
 Pre-/Post-condition</th>
 </tr>
 </thead>
 <tbody valign="top">
 <tr><td><tt class="literal"><span class="pre">--r</span></tt></td>
 <td><tt class="literal"><span class="pre">X&amp;</span></tt></td>
-<td>pre: there exists
+<td>&nbsp;</td>
+<td><p class="first">pre: there exists
 <tt class="literal"><span class="pre">s</span></tt> such that <tt class="literal"><span class="pre">r</span>
 <span class="pre">==</span> <span class="pre">++s</span></tt>.  post:
 <tt class="literal"><span class="pre">s</span></tt> is
-dereferenceable.
-<tt class="literal"><span class="pre">--(++r)</span> <span class="pre">==</span> <span class="pre">r</span></tt>.
+dereferenceable.</p>
+<p class="last"><tt class="literal"><span class="pre">++(--r)</span> <span class="pre">==</span> <span class="pre">r</span></tt>.
 <tt class="literal"><span class="pre">--r</span> <span class="pre">==</span> <span class="pre">--s</span></tt>
 implies <tt class="literal"><span class="pre">r</span> <span class="pre">==</span>
-<span class="pre">s</span></tt>. <tt class="literal"><span class="pre">&amp;r</span> <span class="pre">==</span> <span class="pre">&amp;--r</span></tt>.</td>
+<span class="pre">s</span></tt>. <tt class="literal"><span class="pre">&amp;r</span> <span class="pre">==</span> <span class="pre">&amp;--r</span></tt>.</p>
+</td>
 </tr>
 <tr><td><tt class="literal"><span class="pre">r--</span></tt></td>
 <td>convertible to <tt class="literal"><span class="pre">const</span> <span class="pre">X&amp;</span></tt></td>
@ -690,11 +703,13 @@ implies <tt class="literal"><span class="pre">r</span> <span class="pre">==</spa
 }
 </pre>
 </td>
+<td>&nbsp;</td>
 </tr>
 <tr><td><tt class="literal"><span class="pre">iterator_traversal&lt;X&gt;::type</span></tt></td>
 <td>Convertible to
 <tt class="literal"><span class="pre">bidirectional_traversal_tag</span></tt></td>
 <td>&nbsp;</td>
+<td>&nbsp;</td>
 </tr>
 </tbody>
 </table>
@ -708,7 +723,7 @@ Iterator</em> concept if the following expressions are valid and respect
 the stated semantics.  In the table below, <tt class="literal"><span class="pre">Distance</span></tt> is
 <tt class="literal"><span class="pre">iterator_traits&lt;X&gt;::difference_type</span></tt> and <tt class="literal"><span class="pre">n</span></tt> represents a
 constant object of type <tt class="literal"><span class="pre">Distance</span></tt>.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="28%" />
 <col width="30%" />
@ -773,14 +788,14 @@ value <tt class="literal"><span class="pre">n</span></tt> of
 <tr><td><tt class="literal"><span class="pre">a[n]</span></tt></td>
 <td>convertible to T</td>
 <td><tt class="literal"><span class="pre">*(a</span> <span class="pre">+</span> <span class="pre">n)</span></tt></td>
-<td>pre: a is a <a class="reference" href="#readable-iterator">readable
-iterator</a></td>
+<td>pre: a is a <a class="reference" href="#readable-iterator">Readable
+Iterator</a></td>
 </tr>
 <tr><td><tt class="literal"><span class="pre">a[n]</span> <span class="pre">=</span> <span class="pre">v</span></tt></td>
 <td>convertible to T</td>
 <td><tt class="literal"><span class="pre">*(a</span> <span class="pre">+</span> <span class="pre">n)</span> <span class="pre">=</span> <span class="pre">v</span></tt></td>
-<td>pre: a is a <a class="reference" href="#writable-iterator">writable
-iterator</a></td>
+<td>pre: a is a <a class="reference" href="#writable-iterator">Writable
+Iterator</a></td>
 </tr>
 <tr><td><tt class="literal"><span class="pre">a</span> <span class="pre">&lt;</span> <span class="pre">b</span></tt></td>
 <td>convertible to <tt class="literal"><span class="pre">bool</span></tt></td>
@ -824,7 +839,7 @@ respect the stated semantics. In the tables below, <tt class="literal"><span cla
 of type <tt class="literal"><span class="pre">X</span></tt>, <tt class="literal"><span class="pre">y</span></tt> is an object of type <tt class="literal"><span class="pre">Y</span></tt>, <tt class="literal"><span class="pre">Distance</span></tt> is
 <tt class="literal"><span class="pre">iterator_traits&lt;Y&gt;::difference_type</span></tt>, and <tt class="literal"><span class="pre">n</span></tt> represents a
 constant object of type <tt class="literal"><span class="pre">Distance</span></tt>.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="13%" />
 <col width="27%" />
@ -865,7 +880,7 @@ constant object of type <tt class="literal"><span class="pre">Distance</span></t
 </table>
 <p>If <tt class="literal"><span class="pre">X</span></tt> and <tt class="literal"><span class="pre">Y</span></tt> both model Random Access Traversal Iterator then
 the following additional requirements must be met.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="12%" />
 <col width="25%" />
--- a/doc/new-iter-concepts.pdf
+++ b/doc/new-iter-concepts.pdf
--- a/doc/new-iter-concepts.rst
+++ b/doc/new-iter-concepts.rst
@ -17,7 +17,7 @@
         revision of paper n1297_, n1477_, and n1531_.

 :copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt
-         2003. All rights reserved
+         2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
@ -163,10 +163,9 @@ to express their type requirements. The result is algorithms that are
 usable in more situations and have fewer type requirements.

 For the next working paper (but not for TR1), the committee should
-consider the following changes to the type requirements of
-algorithms.  These changes are phrased as phrased as textual
-substitutions, listing the algorithms to which each textual
-substitution applies.
+consider the following changes to the type requirements of algorithms.
+These changes are phrased as textual substitutions, listing the
+algorithms to which each textual substitution applies.

 Forward Iterator -> Forward Traversal Iterator and Readable Iterator

@ -413,8 +412,9 @@ expressions are valid and respect the stated semantics.
 |                         |             |exchanged                    |
 +-------------------------+-------------+-----------------------------+

-[*Note:* An iterator that is a model of the *Readable* and *Writable Iterator* concepts
-  is also a model of *Swappable Iterator*.  *--end note*]
+[*Note:* An iterator that is a model of the `Readable Iterator`_ and
+`Writable Iterator`_ concepts is also a model of *Swappable
+Iterator*.  *--end note*]


 Lvalue Iterators [lib.lvalue.iterators]
@ -422,7 +422,7 @@ Lvalue Iterators [lib.lvalue.iterators]

 The *Lvalue Iterator* concept adds the requirement that the return
 type of ``operator*`` type be a reference to the value type of the
-iterator.
+iterator.  

 +-------------------------------------------------------------+
 | Lvalue Iterator Requirements                                |
@ -432,13 +432,14 @@ iterator.
 |``*a``       | ``T&``    |``T`` is *cv*                      |
 |             |           |``iterator_traits<X>::value_type`` |
 |             |           |where *cv* is an optional          |
-|             |           |cv-qualification.                  |
-|             |           |pre: ``a`` is                      |
-|             |           |dereferenceable. If ``a            |
-|             |           |== b`` then ``*a`` is              |
-|             |           |equivalent to ``*b``.              |
+|             |           |cv-qualification.  pre: ``a`` is   |
+|             |           |dereferenceable.                   |
 +-------------+-----------+-----------------------------------+

+If ``X`` is a `Writable Iterator`_ then ``a == b`` if and only if
+``*a`` is the same object as ``*b``.  If ``X`` is a `Readable
+Iterator`_ then ``a == b`` implies ``*a`` is the same object as
+``*b``.


 Iterator Traversal Concepts [lib.iterator.traversal]
@ -449,7 +450,6 @@ constant objects of type ``X``, ``r`` and ``s`` are mutable objects of
 type ``X``, ``T`` is ``std::iterator_traits<X>::value_type``, and
 ``v`` is a constant object of type ``T``.

-
 Incrementable Iterators [lib.incrementable.iterators]
 -----------------------------------------------------

@ -458,26 +458,28 @@ concept if, in addition to ``X`` being Assignable and Copy
 Constructible, the following expressions are valid and respect the
 stated semantics.

+------------------------------------------------------------------------------------+
+|Incrementable Iterator Requirements (in addition to Assignable, Copy Constructible) |
+|                                                                                    |
+--------------------------------+-------------------------------+-------------------+
+|Expression                      |Return Type                    |Assertion          |
+================================+===============================+===================+
+|``++r``                         |``X&``                         |``&r == &++r``     |
+--------------------------------+-------------------------------+-------------------+
+|``r++``                         |                               |                   |
+--------------------------------+-------------------------------+-------------------+
+|``*r++``                        |                               |                   |
+--------------------------------+-------------------------------+-------------------+
+|``iterator_traversal<X>::type`` |Convertible to                 |                   |
+|                                |``incrementable_traversal_tag``|                   |
+--------------------------------+-------------------------------+-------------------+

-+-------------------------------------------------------------------------------------+
-|Incrementable Iterator Requirements (in addition to Assignable, Copy Constructible)  |
-|                                                                                     |
-+--------------------------------+-------------------------------+--------------------+
-|Expression                      |Return Type                    |Assertion/Semantics |
-+================================+===============================+====================+
-|``++r``                         |``X&``                         |``&r == &++r``      |
-+--------------------------------+-------------------------------+--------------------+
-|``r++``                         |``X``                          |::                  |
-|                                |                               |                    |
-|                                |                               | {                  |
-|                                |                               |    X tmp = r;      |
-|                                |                               |    ++r;            |
-|                                |                               |    return tmp;     |
-|                                |                               | }                  |
-+--------------------------------+-------------------------------+--------------------+
-|``iterator_traversal<X>::type`` |Convertible to                 |                    |
-|                                |``incrementable_traversal_tag``|                    |
-+--------------------------------+-------------------------------+--------------------+
+
+If ``X`` is a `Writable Iterator`_ then ``X a(r++);`` is equivalent
+to ``X a(r); ++r;`` and ``*r++ = o`` is equivalent
+to  ``*r = o; ++r``.
+If ``X`` is a `Readable Iterator`_ then ``T z(*r++);`` is equivalent
+to ``T z(*r); ++r;``. 

 .. TR1: incrementable_iterator_tag changed to
   incrementable_traversal_tag for consistency.
@ -490,26 +492,26 @@ concept if the following expressions are valid and respect the stated
 semantics.


-+------------------------------------------------------------------------------------------+
-|Single Pass Iterator Requirements (in addition to Incrementable Iterator and Equality     |
-|Comparable)                                                                               |
-+--------------------------------+-----------------------------+---------------------------+
-|Expression                      |Return Type                  |Assertion/Semantics /      | 
-|                                |                             |Pre-/Post-condition        |
-+================================+=============================+===========================+
-|``++r``                         |``X&``                       |pre: ``r`` is              |
-|                                |                             |dereferenceable; post:     |
-|                                |                             |``r`` is dereferenceable or|
-|                                |                             |``r`` is past-the-end      |
-+--------------------------------+-----------------------------+---------------------------+
-|``a == b``                      |convertible to ``bool``      |``==`` is an equivalence   |
-|                                |                             |relation over its domain   |
-+--------------------------------+-----------------------------+---------------------------+
-|``a != b``                      |convertible to ``bool``      |``!(a == b)``              |
-+--------------------------------+-----------------------------+---------------------------+
-|``iterator_traversal<X>::type`` |Convertible to               |                           |
-|                                |``single_pass_traversal_tag``|                           |
-+--------------------------------+-----------------------------+---------------------------+
+--------------------------------------------------------------------------------------------------------+
+|Single Pass Iterator Requirements (in addition to Incrementable Iterator and Equality                   |
+|Comparable)                                                                                             |
+--------------------------------+-----------------------------+-------------+---------------------------+
+|Expression                      |Return Type                  | Operational |Assertion/                 | 
+|                                |                             | Semantics   |Pre-/Post-condition        |
+================================+=============================+=============+===========================+
+|``++r``                         |``X&``                       |             |pre: ``r`` is              |
+|                                |                             |             |dereferenceable; post:     |
+|                                |                             |             |``r`` is dereferenceable or|
+|                                |                             |             |``r`` is past-the-end      |
+--------------------------------+-----------------------------+-------------+---------------------------+
+|``a == b``                      |convertible to ``bool``      |             |``==`` is an equivalence   |
+|                                |                             |             |relation over its domain   |
+--------------------------------+-----------------------------+-------------+---------------------------+
+|``a != b``                      |convertible to ``bool``      |``!(a == b)``|                           |
+--------------------------------+-----------------------------+-------------+---------------------------+
+|``iterator_traversal<X>::type`` |Convertible to               |             |                           |
+|                                |``single_pass_traversal_tag``|             |                           |
+--------------------------------+-----------------------------+-------------+---------------------------+

 .. TR1: single_pass_iterator_tag changed to
   single_pass_traversal_tag for consistency
@ -521,7 +523,7 @@ Forward Traversal Iterators [lib.forward.traversal.iterators]
 A class or built-in type ``X`` models the *Forward Traversal Iterator*
 concept if, in addition to ``X`` meeting the requirements of Default
 Constructible and Single Pass Iterator, the following expressions are
-valid and respect the stated semantics.
+valid and respect the stated semantics. 

 +--------------------------------------------------------------------------------------------------------+
 |Forward Traversal Iterator Requirements (in addition to Default Constructible and Single Pass Iterator) |
@ -543,6 +545,8 @@ valid and respect the stated semantics.
 |                                       |``forward_traversal_tag``          |                            |
 +---------------------------------------+-----------------------------------+----------------------------+

+
+
 .. TR1: forward_traversal_iterator_tag changed to
   forward_traversal_tag for consistency

@ -555,35 +559,36 @@ Iterator* concept if, in addition to ``X`` meeting the requirements of
 Forward Traversal Iterator, the following expressions are valid and
 respect the stated semantics.

-+--------------------------------------------------------------------------------------+
-|Bidirectional Traversal Iterator Requirements (in addition to Forward Traversal       |
-|Iterator)                                                                             |
-+--------------------------------+-------------------------------+---------------------+
-|Expression                      |Return Type                    |Assertion/Semantics /|
-|                                |                               |Pre-/Post-condition  |
-+================================+===============================+=====================+
-|``--r``                         |``X&``                         |pre: there exists    |
-|                                |                               |``s`` such that ``r  |
-|                                |                               |== ++s``.  post:     |
-|                                |                               |``s`` is             |
-|                                |                               |dereferenceable.     |
-|                                |                               |``--(++r) == r``.    |
-|                                |                               |``--r == --s``       |
-|                                |                               |implies ``r ==       |
-|                                |                               |s``. ``&r == &--r``. |
-+--------------------------------+-------------------------------+---------------------+
-|``r--``                         |convertible to ``const X&``    |::                   |
-|                                |                               |                     |
-|                                |                               | {                   |
-|                                |                               |   X tmp = r;        |
-|                                |                               |   --r;              |
-|                                |                               |   return tmp;       |
-|                                |                               | }                   |
-+--------------------------------+-------------------------------+---------------------+
-|``iterator_traversal<X>::type`` |Convertible to                 |                     |
-|                                |``bidirectional_traversal_tag``|                     |
-|                                |                               |                     |
-+--------------------------------+-------------------------------+---------------------+
+-----------------------------------------------------------------------------------------------------+
+|Bidirectional Traversal Iterator Requirements (in addition to Forward Traversal                      |
+|Iterator)                                                                                            |
+--------------------------------+-------------------------------+--------------+---------------------+
+|Expression                      |Return Type                    |  Operational |Assertion/           |
+|                                |                               |  Semantics   |Pre-/Post-condition  |
+================================+===============================+==============+=====================+
+|``--r``                         |``X&``                         |              |pre: there exists    |
+|                                |                               |              |``s`` such that ``r  |
+|                                |                               |              |== ++s``.  post:     |
+|                                |                               |              |``s`` is             |
+|                                |                               |              |dereferenceable.     |
+|                                |                               |              |                     |
+|                                |                               |              |``++(--r) == r``.    |
+|                                |                               |              |``--r == --s``       |
+|                                |                               |              |implies ``r ==       |
+|                                |                               |              |s``. ``&r == &--r``. |
+--------------------------------+-------------------------------+--------------+---------------------+
+|``r--``                         |convertible to ``const X&``    |::            |                     |
+|                                |                               |              |                     |
+|                                |                               | {            |                     |
+|                                |                               |   X tmp = r; |                     |
+|                                |                               |   --r;       |                     |
+|                                |                               |   return tmp;|                     |
+|                                |                               | }            |                     |
+--------------------------------+-------------------------------+--------------+---------------------+
+|``iterator_traversal<X>::type`` |Convertible to                 |              |                     |
+|                                |``bidirectional_traversal_tag``|              |                     |
+|                                |                               |              |                     |
+--------------------------------+-------------------------------+--------------+---------------------+

 .. TR1: bidirectional_traversal_iterator_tag changed to
   bidirectional_traversal_tag for consistency
@ -632,11 +637,11 @@ constant object of type ``Distance``.
 |                               |                                 |                         |``a + n == b``.  ``b  |
 |                               |                                 |                         |== a + (b - a)``.     |
 +-------------------------------+---------------------------------+-------------------------+----------------------+
-|``a[n]``                       |convertible to T                 |``*(a + n)``             |pre: a is a `readable |
-|                               |                                 |                         |iterator`_            |
+|``a[n]``                       |convertible to T                 |``*(a + n)``             |pre: a is a `Readable |
+|                               |                                 |                         |Iterator`_            |
 +-------------------------------+---------------------------------+-------------------------+----------------------+
-|``a[n] = v``                   |convertible to T                 |``*(a + n) = v``         |pre: a is a `writable |
-|                               |                                 |                         |iterator`_            |
+|``a[n] = v``                   |convertible to T                 |``*(a + n) = v``         |pre: a is a `Writable |
+|                               |                                 |                         |Iterator`_            |
 +-------------------------------+---------------------------------+-------------------------+----------------------+
 |``a < b``                      |convertible to ``bool``          |``b - a > 0``            |``<`` is a total      |
 |                               |                                 |                         |ordering relation     |
--- a/doc/permutation_iterator_abstract.rst
+++ b/doc/permutation_iterator_abstract.rst
--- a/doc/permutation_iterator.html
+++ b/doc/permutation_iterator.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Permutation Iterator</title>
 <meta name="author" content="Toon Knapen, David Abrahams, Roland Richter, Jeremy Siek" />
 <meta name="organization" content="Boost Consulting, Indiana University Open Systems Lab" />
-<meta name="date" content="2004-01-13" />
-<meta name="copyright" content="Copyright Toon Knapen, David Abrahams, Roland Richter, and Jeremy Siek 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright Toon Knapen, David Abrahams, Roland Richter, and Jeremy Siek 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="permutation-iterator">
 <h1 class="title">Permutation Iterator</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -26,11 +25,12 @@
 <td><a class="first reference" href="http://www.boost-consulting.com">Boost Consulting</a>, Indiana University <a class="last reference" href="http://www.osl.iu.edu">Open Systems
 Lab</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-13</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright Toon Knapen, David Abrahams, Roland Richter, and Jeremy Siek 2003. All rights reserved</td></tr>
+<td>Copyright Toon Knapen, David Abrahams, Roland Richter, and Jeremy Siek 2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="permutation-iterator">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -42,7 +42,7 @@ in a potentially different order.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#introduction" id="id2" name="id2">Introduction</a></li>
 <li><a class="reference" href="#reference" id="id3" name="id3">Reference</a><ul>
@ -283,7 +283,7 @@ Elements at even indices in the permutation : 9 7
 Permutation backwards : 6 7 8 9 
 Iterate backward with stride 2 : 6 8 
 </pre>
-<p>The source code for this example can be found <a class="reference" href="../example/permutation_iterator_example.cpp">here</a>.</p>
+<p>The source code for this example can be found <a class="reference" href="../example/permutation_iter_example.cpp">here</a>.</p>
 </div>
 </div>
 <hr class="footer" />
--- a/doc/permutation_iterator.pdf
+++ b/doc/permutation_iterator.pdf
--- a/doc/permutation_iterator.rst
+++ b/doc/permutation_iterator.rst
@ -7,14 +7,14 @@
 :organization: `Boost Consulting`_, Indiana University `Open Systems
               Lab`_
 :date: $Date$
-:copyright: Copyright Toon Knapen, David Abrahams, Roland Richter, and Jeremy Siek 2003. All rights reserved
+:copyright: Copyright Toon Knapen, David Abrahams, Roland Richter, and Jeremy Siek 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu

 :abstract:

-  .. include:: permutation_iterator_abstract.rst
+  .. include:: permutation_iter_abstract.rst

 .. contents:: Table of Contents

--- a/doc/permutation_iterator_eg.rst
+++ b/doc/permutation_iterator_eg.rst
@ -64,4 +64,4 @@ The output is::

 The source code for this example can be found `here`__.

-__ ../example/permutation_iterator_example.cpp
+__ ../example/permutation_iter_example.cpp
--- a/doc/pointee.html
+++ b/doc/pointee.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>pointee and indirect_reference</title>
 <meta name="author" content="David Abrahams" />
 <meta name="organization" content="Boost Consulting" />
-<meta name="date" content="2004-01-29" />
-<meta name="copyright" content="Copyright David Abrahams 2004. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams 2004." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="pointee-and-indirect-reference">
 <h1 class="title"><tt class="literal"><span class="pre">pointee</span></tt> and <tt class="literal"><span class="pre">indirect_reference</span></tt></h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -21,15 +20,16 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>David Abrahams</td></tr>
 <tr><th class="docinfo-name">Contact:</th>
-<td><a class="first reference" href="mailto:dave&#64;boost-consulting.com">dave&#64;boost-consulting.com</a>, <a class="reference" href="mailto:jsiek&#64;osl.iu.edu">jsiek&#64;osl.iu.edu</a>, <a class="last reference" href="mailto:witt&#64;ive.uni-hannover.de">witt&#64;ive.uni-hannover.de</a></td></tr>
+<td><a class="first last reference" href="mailto:dave&#64;boost-consulting.com">dave&#64;boost-consulting.com</a></td></tr>
 <tr><th class="docinfo-name">Organization:</th>
 <td><a class="first last reference" href="http://www.boost-consulting.com">Boost Consulting</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-29</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams 2004. All rights reserved</td></tr>
+<td>Copyright David Abrahams 2004.</td></tr>
 </tbody>
 </table>
+<div class="document" id="pointee-and-indirect-reference">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
--- a/doc/pointee.pdf
+++ b/doc/pointee.pdf
--- a/doc/pointee.rst
+++ b/doc/pointee.rst
@ -6,7 +6,7 @@
 :Contact: dave@boost-consulting.com
 :organization: `Boost Consulting`_
 :date: $Date$
-:copyright: Copyright David Abrahams 2004. All rights reserved
+:copyright: Copyright David Abrahams 2004. 

 .. _`Boost Consulting`: http://www.boost-consulting.com

--- a/doc/ref_problem.html
+++ b/doc/ref_problem.html
@ -3,13 +3,13 @@
 <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.6: http://docutils.sourceforge.net/" />
 <title>Problem with reference and old/new iterator category correspondance</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="problem-with-reference-and-old-new-iterator-category-correspondance">
 <h1 class="title">Problem with <tt class="literal"><span class="pre">reference</span></tt> and old/new iterator category correspondance</h1>
+<div class="document" id="problem-with-reference-and-old-new-iterator-category-correspondance">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -66,5 +66,10 @@ new iterator concepts. We are not in favor of this approach because it
 extends what we see as a defect further into the future.</p>
 </div>
 </div>
+<hr class="footer" />
+<div class="footer">
+<a class="reference" href="ref_problem.rst">View document source</a>.
+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>
 </html>
--- a/doc/reverse_iterator.html
+++ b/doc/reverse_iterator.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Reverse 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" />
-<meta name="date" content="2004-01-13" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="reverse-iterator">
 <h1 class="title">Reverse Iterator</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -27,11 +26,12 @@
 Lab</a>, University of Hanover <a class="last reference" href="http://www.ive.uni-hannover.de">Institute for Transport
 Railway Operation and Construction</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-13</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved</td></tr>
+<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="reverse-iterator">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -42,7 +42,7 @@ range in the opposite direction.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#reverse-iterator-synopsis" id="id2" name="id2"><tt class="literal"><span class="pre">reverse_iterator</span></tt> synopsis</a></li>
 <li><a class="reference" href="#reverse-iterator-requirements" id="id3" name="id3"><tt class="literal"><span class="pre">reverse_iterator</span></tt> requirements</a></li>
@ -100,7 +100,7 @@ type <tt class="literal"><span class="pre">iterator_traits&lt;Iterator&gt;::refe
 traversal and iterator access concepts modeled by its <tt class="literal"><span class="pre">Iterator</span></tt>
 argument.  In addition, it may model old iterator concepts
 specified in the following table:</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="53%" />
 <col width="47%" />
--- a/doc/reverse_iterator.pdf
+++ b/doc/reverse_iterator.pdf
--- a/doc/reverse_iterator.rst
+++ b/doc/reverse_iterator.rst
@ -8,7 +8,7 @@
               Lab`_, University of Hanover `Institute for Transport
               Railway Operation and Construction`_
 :date: $Date$
-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
--- a/doc/rst2html
+++ b/doc/rst2html
@ -1,7 +1,7 @@
 #!/bin/sh
 PYTHONPATH="c:/src/docutils/docutils;c:/src/docutils/docutils/extras"
 export PYTHONPATH
-python c:/src/docutils/docutils/tools/html.py -gs $1 `echo $1 | sed 's/\(.*\)\..*/\1.html/'`
+python c:/src/docutils/docutils/tools/rst2html.py -gs $1 `echo $1 | sed 's/\(.*\)\..*/\1.html/'`



--- a/doc/transform_iterator.html
+++ b/doc/transform_iterator.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Transform 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" />
-<meta name="date" content="2004-01-13" />
-<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="transform-iterator">
 <h1 class="title">Transform Iterator</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -27,11 +26,12 @@
 Lab</a>, University of Hanover <a class="last reference" href="http://www.ive.uni-hannover.de">Institute for Transport
 Railway Operation and Construction</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-13</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved</td></tr>
+<td>Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="transform-iterator">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -43,7 +43,7 @@ dereferencing the iterator and returning the result.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
 <li><a class="reference" href="#transform-iterator-synopsis" id="id2" name="id2"><tt class="literal"><span class="pre">transform_iterator</span></tt> synopsis</a></li>
 <li><a class="reference" href="#transform-iterator-requirements" id="id3" name="id3"><tt class="literal"><span class="pre">transform_iterator</span></tt> requirements</a></li>
@ -130,7 +130,7 @@ concept that is modeled by the <tt class="literal"><span class="pre">Iterator</s
 <p>If <tt class="literal"><span class="pre">transform_iterator</span></tt> is a model of Readable Lvalue Iterator then
 it models the following original iterator concepts depending on what
 the <tt class="literal"><span class="pre">Iterator</span></tt> argument models.</p>
-<table border class="table">
+<table border="1" class="table">
 <colgroup>
 <col width="47%" />
 <col width="53%" />
@ -187,17 +187,20 @@ initialized to <tt class="literal"><span class="pre">f</span></tt> and <tt class
 </tbody>
 </table>
 <pre class="literal-block">
-template&lt;class OtherIterator, class R2, class V2&gt;
+template&lt;class F2, class I2, class R2, class V2&gt;
 transform_iterator(
-      transform_iterator&lt;UnaryFunction, OtherIterator, R2, V2&gt; const&amp; t
-    , typename enable_if_convertible&lt;OtherIterator, Iterator&gt;::type* = 0 // exposition
+      transform_iterator&lt;F2, I2, R2, V2&gt; const&amp; t
+    , typename enable_if_convertible&lt;I2, Iterator&gt;::type* = 0      // exposition only
+    , typename enable_if_convertible&lt;F2, UnaryFunction&gt;::type* = 0 // exposition only
 );
 </pre>
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
-<tr class="field"><th class="field-name">Returns:</th><td class="field-body">An instance of <tt class="literal"><span class="pre">transform_iterator</span></tt> that is a copy of <tt class="literal"><span class="pre">t</span></tt>.</td>
+<tr class="field"><th class="field-name">Returns:</th><td class="field-body">An instance of <tt class="literal"><span class="pre">transform_iterator</span></tt> with <tt class="literal"><span class="pre">m_f</span></tt>
+initialized to <tt class="literal"><span class="pre">t.functor()</span></tt> and <tt class="literal"><span class="pre">m_iterator</span></tt> initialized to
+<tt class="literal"><span class="pre">t.base()</span></tt>.</td>
 </tr>
 <tr class="field"><th class="field-name">Requires:</th><td class="field-body"><tt class="literal"><span class="pre">OtherIterator</span></tt> is implicitly convertible to <tt class="literal"><span class="pre">Iterator</span></tt>.</td>
 </tr>
--- a/doc/transform_iterator.pdf
+++ b/doc/transform_iterator.pdf
--- a/doc/transform_iterator.rst
+++ b/doc/transform_iterator.rst
@ -8,7 +8,7 @@
               Lab`_, University of Hanover `Institute for Transport
               Railway Operation and Construction`_
 :date: $Date$
-:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. All rights reserved
+:copyright: Copyright David Abrahams, Jeremy Siek, and Thomas Witt 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Open Systems Lab`: http://www.osl.iu.edu
--- a/doc/transform_iterator_ref.rst
+++ b/doc/transform_iterator_ref.rst
@ -130,13 +130,16 @@ operations.

 ::

-    template<class OtherIterator, class R2, class V2>
+    template<class F2, class I2, class R2, class V2>
    transform_iterator(
-          transform_iterator<UnaryFunction, OtherIterator, R2, V2> const& t
-        , typename enable_if_convertible<OtherIterator, Iterator>::type* = 0 // exposition
+          transform_iterator<F2, I2, R2, V2> const& t
+        , typename enable_if_convertible<I2, Iterator>::type* = 0      // exposition only
+        , typename enable_if_convertible<F2, UnaryFunction>::type* = 0 // exposition only
    );

-:Returns: An instance of ``transform_iterator`` that is a copy of ``t``.
+:Returns: An instance of ``transform_iterator`` with ``m_f``
+  initialized to ``t.functor()`` and ``m_iterator`` initialized to
+  ``t.base()``.
 :Requires: ``OtherIterator`` is implicitly convertible to ``Iterator``.


--- a/doc/zip_iterator.html
+++ b/doc/zip_iterator.html
@ -3,16 +3,15 @@
 <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.3.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
 <title>Zip Iterator</title>
 <meta name="author" content="David Abrahams, Thomas Becker" />
 <meta name="organization" content="Boost Consulting, Zephyr Associates, Inc." />
-<meta name="date" content="2004-01-27" />
-<meta name="copyright" content="Copyright David Abrahams and Thomas Becker 2003. All rights reserved" />
+<meta name="date" content="2004-11-01" />
+<meta name="copyright" content="Copyright David Abrahams and Thomas Becker 2003." />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
 <body>
-<div class="document" id="zip-iterator">
 <h1 class="title">Zip Iterator</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
@ -25,11 +24,12 @@
 <tr><th class="docinfo-name">Organization:</th>
 <td><a class="first reference" href="http://www.boost-consulting.com">Boost Consulting</a>, <a class="last reference" href="http://www.styleadvisor.com">Zephyr Associates, Inc.</a></td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2004-01-27</td></tr>
+<td>2004-11-01</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams and Thomas Becker 2003. All rights reserved</td></tr>
+<td>Copyright David Abrahams and Thomas Becker 2003.</td></tr>
 </tbody>
 </table>
+<div class="document" id="zip-iterator">
 <table class="field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@ -44,17 +44,17 @@ the results of dereferencing the individual iterators.</td>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
+<p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p>
 <ul class="simple">
-<li><a class="reference" href="#zip-iterator-synopsis" id="id2" name="id2"><tt class="literal"><span class="pre">zip_iterator</span></tt> synopsis</a></li>
-<li><a class="reference" href="#zip-iterator-requirements" id="id3" name="id3"><tt class="literal"><span class="pre">zip_iterator</span></tt> requirements</a></li>
-<li><a class="reference" href="#zip-iterator-models" id="id4" name="id4"><tt class="literal"><span class="pre">zip_iterator</span></tt> models</a></li>
-<li><a class="reference" href="#zip-iterator-operations" id="id5" name="id5"><tt class="literal"><span class="pre">zip_iterator</span></tt> operations</a></li>
-<li><a class="reference" href="#examples" id="id6" name="id6">Examples</a></li>
+<li><a class="reference" href="#zip-iterator-synopsis" id="id1" name="id1"><tt class="literal"><span class="pre">zip_iterator</span></tt> synopsis</a></li>
+<li><a class="reference" href="#zip-iterator-requirements" id="id2" name="id2"><tt class="literal"><span class="pre">zip_iterator</span></tt> requirements</a></li>
+<li><a class="reference" href="#zip-iterator-models" id="id3" name="id3"><tt class="literal"><span class="pre">zip_iterator</span></tt> models</a></li>
+<li><a class="reference" href="#zip-iterator-operations" id="id4" name="id4"><tt class="literal"><span class="pre">zip_iterator</span></tt> operations</a></li>
+<li><a class="reference" href="#examples" id="id5" name="id5">Examples</a></li>
 </ul>
 </div>
 <div class="section" id="zip-iterator-synopsis">
-<h1><a class="toc-backref" href="#id2" name="zip-iterator-synopsis"><tt class="literal"><span class="pre">zip_iterator</span></tt> synopsis</a></h1>
+<h1><a class="toc-backref" href="#id1" name="zip-iterator-synopsis"><tt class="literal"><span class="pre">zip_iterator</span></tt> synopsis</a></h1>
 <pre class="literal-block">
 template&lt;typename IteratorTuple&gt;
 class zip_iterator
@ -102,11 +102,11 @@ iterators, then <tt class="literal"><span class="pre">iterator_category</span></
 but no longer to <tt class="literal"><span class="pre">boost::random_access_traversal_tag</span></tt>.</p>
 </div>
 <div class="section" id="zip-iterator-requirements">
-<h1><a class="toc-backref" href="#id3" name="zip-iterator-requirements"><tt class="literal"><span class="pre">zip_iterator</span></tt> requirements</a></h1>
+<h1><a class="toc-backref" href="#id2" name="zip-iterator-requirements"><tt class="literal"><span class="pre">zip_iterator</span></tt> requirements</a></h1>
 <p>All iterator types in the argument <tt class="literal"><span class="pre">IteratorTuple</span></tt> shall model Readable Iterator.</p>
 </div>
 <div class="section" id="zip-iterator-models">
-<h1><a class="toc-backref" href="#id4" name="zip-iterator-models"><tt class="literal"><span class="pre">zip_iterator</span></tt> models</a></h1>
+<h1><a class="toc-backref" href="#id3" name="zip-iterator-models"><tt class="literal"><span class="pre">zip_iterator</span></tt> models</a></h1>
 <p>The resulting <tt class="literal"><span class="pre">zip_iterator</span></tt> models Readable Iterator.</p>
 <p>The fact that the <tt class="literal"><span class="pre">zip_iterator</span></tt> models only Readable Iterator does not 
 prevent you from modifying the values that the individual iterators point
@ -128,7 +128,7 @@ models the least refined standard traversal concept in this set.</p>
 is interoperable with <tt class="literal"><span class="pre">IteratorTuple2</span></tt>.</p>
 </div>
 <div class="section" id="zip-iterator-operations">
-<h1><a class="toc-backref" href="#id5" name="zip-iterator-operations"><tt class="literal"><span class="pre">zip_iterator</span></tt> operations</a></h1>
+<h1><a class="toc-backref" href="#id4" name="zip-iterator-operations"><tt class="literal"><span class="pre">zip_iterator</span></tt> operations</a></h1>
 <p>In addition to the operations required by the concepts modeled by
 <tt class="literal"><span class="pre">zip_iterator</span></tt>, <tt class="literal"><span class="pre">zip_iterator</span></tt> provides the following
 operations.</p>
@ -242,7 +242,7 @@ initialized to <tt class="literal"><span class="pre">t</span></tt>.</td>
 </table>
 </div>
 <div class="section" id="examples">
-<h1><a class="toc-backref" href="#id6" name="examples">Examples</a></h1>
+<h1><a class="toc-backref" href="#id5" name="examples">Examples</a></h1>
 <p>There are two main types of applications of the <tt class="literal"><span class="pre">zip_iterator</span></tt>. The first
 one concerns runtime efficiency: If one has several controlled sequences
 of the same length that must be somehow processed, e.g., with the 
@ -340,7 +340,6 @@ the_transform_iterator it_end(
  tuple_multiplies&lt;double&gt;()
  );
 </pre>
-<p>The source code for these examples can be found <a class="reference" href="../example/zip_iterator_examples.cpp">here</a>.</p>
 </div>
 </div>
 <hr class="footer" />
--- a/doc/zip_iterator.pdf
+++ b/doc/zip_iterator.pdf
--- a/doc/zip_iterator.rst
+++ b/doc/zip_iterator.rst
@ -6,7 +6,7 @@
 :Contact: dave@boost-consulting.com, thomas@styleadvisor.com
 :organization: `Boost Consulting`_, `Zephyr Associates, Inc.`_
 :date: $Date$
-:copyright: Copyright David Abrahams and Thomas Becker 2003. All rights reserved
+:copyright: Copyright David Abrahams and Thomas Becker 2003. 

 .. _`Boost Consulting`: http://www.boost-consulting.com
 .. _`Zephyr Associates, Inc.`: http://www.styleadvisor.com
--- a/doc/zip_iterator_eg.rst
+++ b/doc/zip_iterator_eg.rst
@ -110,8 +110,3 @@ sequence containing the products of the elements of ``vect_1`` and
        ),
      tuple_multiplies<double>()
      );
-
-
-The source code for these examples can be found `here`__.
-
-__ ../example/zip_iterator_examples.cpp
--- a/example/Jamfile
+++ b/example/Jamfile
@ -10,4 +10,13 @@ test-suite iterator_examples
    [ run node_iterator1.cpp ]
    [ run node_iterator2.cpp ]
    [ run node_iterator3.cpp ]
-      ;
+    [ run counting_iterator_example.cpp ]
+    [ run filter_iterator_example.cpp ]
+    [ run func_output_iter_example.cpp ]
+    [ run indirect_iterator_example.cpp ]
+    [ run permutation_iter_example.cpp ]
+    [ run reverse_iterator_example.cpp ]
+    [ run projection_iterator_example.cpp ]
+    [ run transform_iterator_example.cpp ]
+
+;
--- a/example/counting_iterator_example.cpp
+++ b/example/counting_iterator_example.cpp
@ -1,9 +1,7 @@
 // (C) Copyright Jeremy Siek 2000-2004.
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all
-// copies. This software is provided "as is" without express or
-// implied warranty, and with no claim as to its suitability for any
-// purpose.
+// Distributed under 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)


 #include <boost/config.hpp>
@ -23,6 +21,13 @@ int main(int, char*[])
  std::copy(first, last, std::ostream_iterator<int>(std::cout, " "));
  std::cout << std::endl;

+  // Example of using make_counting_iterator()
+  std::cout << "counting from -5 to 4:" << std::endl;
+  std::copy(boost::make_counting_iterator(-5),
+            boost::make_counting_iterator(5),
+            std::ostream_iterator<int>(std::cout, " "));
+  std::cout << std::endl;
+
  // Example of using counting iterator to create an array of pointers.
  int N = 7;
  std::vector<int> numbers;
--- a/example/filter_iterator_example.cpp
+++ b/example/filter_iterator_example.cpp
@ -1,9 +1,7 @@
 //  (C) Copyright Jeremy Siek 1999-2004.
-//  Permission to copy, use, modify,
-//  sell and distribute this software is granted provided this
-//  copyright notice appears in all copies. This software is provided
-//  "as is" without express or implied warranty, and with no claim as
-//  to its suitability for any purpose.
+// Distributed under 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)

 #include <boost/config.hpp>
 #include <algorithm>
--- a/example/function_output_iterator_example.cpp
+++ b/example/function_output_iterator_example.cpp
@ -1,9 +1,7 @@
 // (C) Copyright Jeremy Siek 2001-2004.
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all
-// copies. This software is provided "as is" without express or
-// implied warranty, and with no claim as to its suitability for any
-// purpose.
+// Distributed under 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)

 // Revision History:

--- a/example/indirect_iterator_example.cpp
+++ b/example/indirect_iterator_example.cpp
@ -1,9 +1,7 @@
 // (C) Copyright Jeremy Siek 2000-2004.
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all
-// copies. This software is provided "as is" without express or
-// implied warranty, and with no claim as to its suitability for any
-// purpose.
+// Distributed under 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)

 #include <boost/config.hpp>
 #include <vector>
--- a/example/node.hpp
+++ b/example/node.hpp
@ -10,7 +10,7 @@

 struct node_base
 {
-	node_base() : m_next(0) {}
+    node_base() : m_next(0) {}

    virtual ~node_base()
    {
@ -34,7 +34,7 @@ struct node_base
    }
    
 private:
-	node_base* m_next;
+    node_base* m_next;
 };

 inline std::ostream& operator<<(std::ostream& s, node_base const& n)
--- a/example/node_iterator1.hpp
+++ b/example/node_iterator1.hpp
@ -15,24 +15,24 @@ class node_iterator
    >
 {
 public:
-	node_iterator()
+    node_iterator()
      : m_node(0)
    {}

-	explicit node_iterator(node_base* p)
+    explicit node_iterator(node_base* p)
      : m_node(p)
-	{}
+    {}

 private:
-	friend class boost::iterator_core_access;
+    friend class boost::iterator_core_access;

-	void increment()
+    void increment()
    { m_node = m_node->next(); }
    
-	bool equal(node_iterator const& other) const
+    bool equal(node_iterator const& other) const
    { return this->m_node == other.m_node; }
    
-	node_base& dereference() const
+    node_base& dereference() const
    { return *m_node; }

    node_base* m_node;
--- a/example/permutation_iterator_example.cpp
+++ b/example/permutation_iterator_example.cpp
@ -1,3 +1,8 @@
+// Copyright (C) 2004 Jeremy Siek <jsiek@cs.indiana.edu>
+// Distributed under 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)
+
 #include <iostream>
 #include <vector>
 #include <deque>
--- a/example/projection_iterator_example.cpp
+++ b/example/projection_iterator_example.cpp
@ -0,0 +1,103 @@
+// (C) Copyright Jeremy Siek 2000.
+// Distributed under 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)
+
+#include <boost/config.hpp>
+#include <list>
+#include <iostream>
+#include <iterator>
+#include <algorithm>
+#include <string>
+#include <boost/iterator/transform_iterator.hpp>
+
+struct personnel_record {
+  personnel_record(std::string n, int id) : m_name(n), m_ID(id) { }
+  std::string m_name;
+  int m_ID;
+};
+
+struct select_name {
+  typedef personnel_record argument_type;
+  typedef std::string const& result_type;
+  const std::string& operator()(const personnel_record& r) const {
+    return r.m_name;
+  }
+  std::string& operator()(personnel_record& r) const {
+    return r.m_name;
+  }
+};
+
+struct select_ID {
+  typedef personnel_record argument_type;
+  typedef int& result_type;
+  const int& operator()(const personnel_record& r) const {
+    return r.m_ID;
+  }
+  int& operator()(personnel_record& r) const {
+    return r.m_ID;
+  }
+};
+
+int main(int, char*[])
+{
+  std::list<personnel_record> personnel_list;
+
+  personnel_list.push_back(personnel_record("Barney", 13423));
+  personnel_list.push_back(personnel_record("Fred", 12343));
+  personnel_list.push_back(personnel_record("Wilma", 62454));
+  personnel_list.push_back(personnel_record("Betty", 20490));
+
+  // Example of using transform_iterator to print out the names in the
+  // personnel list using a projection.
+
+  boost::transform_iterator<
+      select_name
+    , std::list<personnel_record>::iterator
+#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+    , std::string
+#endif 
+  >
+    personnel_first(personnel_list.begin()),
+    personnel_last(personnel_list.end());
+
+  std::copy(personnel_first, personnel_last,
+            std::ostream_iterator<std::string>(std::cout, "\n"));
+  std::cout << std::endl;
+  
+  // Example of using transform_iterator with const_iterators to
+  // assign new ID numbers to the personnel.
+  
+  boost::transform_iterator<
+      select_ID, std::list<personnel_record>::iterator
+ > ID_first(personnel_list.begin()),
+    ID_last(personnel_list.end());
+
+  int new_id = 0;
+  while (ID_first != ID_last) {
+    *ID_first = new_id++;
+    ++ID_first;
+  }
+
+    boost::transform_iterator<
+      select_ID, std::list<personnel_record>::const_iterator, int const&
+    >
+    const_ID_first(personnel_list.begin()),
+    const_ID_last(personnel_list.end());
+
+  std::copy(const_ID_first, const_ID_last,
+            std::ostream_iterator<int>(std::cout, " "));
+  std::cout << std::endl;
+  std::cout << std::endl;
+
+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+  // Example of using make_transform_iterator()
+  // to print out the names in the personnel list again.
+  std::copy(
+      boost::make_transform_iterator<select_name>(personnel_list.begin())
+    , boost::make_transform_iterator<select_name>(personnel_list.end())
+    , std::ostream_iterator<std::string>(std::cout, "\n"));
+#endif
+  
+  return 0;
+}
--- a/example/reverse_iterator.cpp
+++ b/example/reverse_iterator.cpp
@ -1,3 +1,8 @@
+// Copyright (C) 2004 Jeremy Siek <jsiek@cs.indiana.edu>
+// Distributed under 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)
+
 #include <boost/iterator/reverse_iterator.hpp>
 #include <boost/cstdlib.hpp>
 #include <iostream>
--- a/example/reverse_iterator_example.cpp
+++ b/example/reverse_iterator_example.cpp
@ -1,9 +1,7 @@
 // (C) Copyright Jeremy Siek 2000-2004.
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all
-// copies. This software is provided "as is" without express or
-// implied warranty, and with no claim as to its suitability for any
-// purpose.
+// Distributed under 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)

 #include <boost/config.hpp>
 #include <iostream>
--- a/example/transform_iterator_example.cpp
+++ b/example/transform_iterator_example.cpp
@ -1,9 +1,7 @@
 // (C) Copyright Jeremy Siek 2000-2004. 
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all
-// copies. This software is provided "as is" without express or
-// implied warranty, and with no claim as to its suitability for any
-// purpose.
+// Distributed under 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)


 #include <functional>
--- a/include/boost/function_output_iterator.hpp
+++ b/include/boost/function_output_iterator.hpp
@ -1,8 +1,7 @@
-// (C) Copyright Jeremy Siek 2001. Permission to copy, use, modify,
-// sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
+// (C) Copyright Jeremy Siek 2001.
+// Distributed under 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)

 // Revision History:

@ -26,7 +25,9 @@ namespace boost {
    typedef void                pointer;
    typedef void                reference;

-    explicit function_output_iterator(const UnaryFunction& f = UnaryFunction())
+    explicit function_output_iterator() {}
+
+    explicit function_output_iterator(const UnaryFunction& f)
      : m_f(f) {}

    struct output_proxy {
--- a/include/boost/half_open_range.hpp
+++ b/include/boost/half_open_range.hpp
@ -1,426 +0,0 @@
-// (C) Copyright Jeremy Siek and David Abrahams 2000-2001. Permission to copy,
-// use, modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its suitability
-// for any purpose.
-//
-// Revision History:
-// 11 Feb 2001  Use new iterator_adaptor interface, Fixes for Borland.
-//              (Dave Abrahams)
-// 04 Feb 2001  Support for user-defined iterator categories (Dave Abrahams)
-// 30 Jan 2001  Initial Checkin (Dave Abrahams)
-
-#ifndef BOOST_HALF_OPEN_RANGE_HPP_
-# define BOOST_HALF_OPEN_RANGE_HPP_
-
-# include <boost/counting_iterator.hpp>
-# include <functional>
-# include <cassert>
-# include <boost/operators.hpp>
-# include <string>
-# include <stdexcept>
-# include <iterator>
-
-namespace boost {
-
-namespace detail {
-
-  // Template class choose_finish -- allows us to maintain the invariant that
-  // start() <= finish() on half_open_range specializations that support random
-  // access.
-#ifdef __MWERKS__
-  template <class T>
-  const T& choose_finish(const T&, const T& finish, std::input_iterator_tag)
-  {
-      return finish;
-  }
-
-  template <class T>
-  const T& choose_finish(const T&, const T& finish, std::output_iterator_tag)
-  {
-      return finish;
-  }
-
-  template <class T>
-  const T& choose_finish(const T& start, const T& finish, std::random_access_iterator_tag)
-  {
-      return finish < start ? start : finish;
-  }
-#else
-  template <bool is_random_access> struct finish_chooser;
-
-  template <>
-  struct finish_chooser<false>
-  {
-      template <class T>
-      struct rebind
-      {
-          static T choose(const T&, const T& finish)
-              { return finish; }
-      };
-  };
-
-  template <>
-  struct finish_chooser<true>
-  {
-      template <class T>
-      struct rebind
-      {
-          static T choose(const T& start, const T& finish)
-              { return finish < start ? start : finish; }
-      };
-  };
-
-  template <class Category, class Incrementable>
-  struct choose_finish
-  {
-      static const Incrementable choose(const Incrementable& start, const Incrementable& finish)
-      {
-          return finish_chooser<(
-              ::boost::is_convertible<Category*,std::random_access_iterator_tag*>::value
-              )>::template rebind<Incrementable>::choose(start, finish);
-      }
-  };
-#endif
-}
-
-template <class Incrementable>
-struct half_open_range
-{
-    typedef typename counting_iterator_generator<Incrementable>::type iterator;
-
- private: // utility type definitions
-    // Using iter_t prevents compiler confusion with boost::iterator
-    typedef typename counting_iterator_generator<Incrementable>::type iter_t;
-
-    typedef std::less<Incrementable> less_value;
-    typedef typename iter_t::iterator_category category;
-    typedef half_open_range<Incrementable> self;
-
- public:
-    typedef iter_t const_iterator;
-    typedef typename iterator::value_type value_type;
-    typedef typename iterator::difference_type difference_type;
-    typedef typename iterator::reference reference;
-    typedef typename iterator::reference const_reference;
-    typedef typename iterator::pointer pointer;
-    typedef typename iterator::pointer const_pointer;
-    
-    // It would be nice to select an unsigned type, but this is appropriate
-    // since the library makes an attempt to select a difference_type which can
-    // hold the difference between any two iterators.
-    typedef typename iterator::difference_type size_type;
-
-    half_open_range(Incrementable start, Incrementable finish)
-        : m_start(start),
-          m_finish(
-#ifndef __MWERKS__
-            detail::choose_finish<category,Incrementable>::choose(start, finish)
-#else
-            detail::choose_finish(start, finish, category())
-#endif
-              )
-        {}
-
-    // Implicit conversion from std::pair<Incrementable,Incrementable> allows us
-    // to accept the results of std::equal_range(), for example.
-    half_open_range(const std::pair<Incrementable,Incrementable>& x)
-        : m_start(x.first),
-          m_finish(
-#ifndef __MWERKS__
-              detail::choose_finish<category,Incrementable>::choose(x.first, x.second)
-#else
-            detail::choose_finish(x.first, x.second, category())
-#endif
-              )
-        {}
-
-    half_open_range& operator=(const self& x)
-    {
-        m_start = x.m_start;
-        m_finish = x.m_finish;
-        return *this;
-    }
-    
-    half_open_range& operator=(const std::pair<Incrementable,Incrementable>& x)
-    {
-        m_start = x.first;
-        m_finish =
-#ifndef __MWERKS__
-            detail::choose_finish<category,Incrementable>::choose(x.first, x.second);
-#else
-            detail::choose_finish(x.first, x.second, category();
-#endif
-    }
-        
-    iterator begin() const { return iterator(m_start); }
-    iterator end() const { return iterator(m_finish); }
-    
-    Incrementable front() const { assert(!this->empty()); return m_start; }
-    Incrementable back() const { assert(!this->empty()); return boost::prior(m_finish); }
-                                     
-    Incrementable start() const { return m_start; }
-    Incrementable finish() const { return m_finish; }
-    
-    size_type size() const { return boost::detail::distance(begin(), end()); }
-
-    bool empty() const
-    {
-        return m_finish == m_start;
-    }
-
-    void swap(half_open_range& x) {
-        std::swap(m_start, x.m_start);
-        std::swap(m_finish, x.m_finish);
-    }
-    
- public: // functions requiring random access elements
-    
-    // REQUIRES: x is reachable from this->front()
-    bool contains(const value_type& x) const
-    {
-        BOOST_STATIC_ASSERT((boost::is_same<category, std::random_access_iterator_tag>::value));
-        return !less_value()(x, m_start) && less_value()(x, m_finish);
-    }
-
-    bool contains(const half_open_range& x) const
-    {
-        BOOST_STATIC_ASSERT((boost::is_same<category, std::random_access_iterator_tag>::value));
-        return x.empty() || !less_value()(x.m_start, m_start) && !less_value()(m_finish, x.m_finish);
-    }
-
-    bool intersects(const half_open_range& x) const
-    {
-        BOOST_STATIC_ASSERT((boost::is_same<category, std::random_access_iterator_tag>::value));
-        return less_value()(
-            less_value()(this->m_start, x.m_start) ? x.m_start : this->m_start,
-            less_value()(this->m_finish, x.m_finish) ? this->m_finish : x.m_finish);
-    }
-
-    half_open_range& operator&=(const half_open_range& x)
-    {
-        BOOST_STATIC_ASSERT((boost::is_same<category, std::random_access_iterator_tag>::value));
-        
-        if (less_value()(this->m_start, x.m_start))
-            this->m_start = x.m_start;
-        
-        if (less_value()(x.m_finish, this->m_finish))
-            this->m_finish = x.m_finish;
-
-        if (less_value()(this->m_finish, this->m_start))
-            this->m_start = this->m_finish;
-
-        return *this;
-    }
-
-    half_open_range& operator|=(const half_open_range& x)
-    {
-        BOOST_STATIC_ASSERT((boost::is_same<category, std::random_access_iterator_tag>::value));
-
-        if (!x.empty())
-        {
-            if (this->empty())
-            {
-                *this = x;
-            }
-            else
-            {
-                if (less_value()(x.m_start, this->m_start))
-                    this->m_start = x.m_start;
-        
-                if (less_value()(this->m_finish, x.m_finish))
-                    this->m_finish = x.m_finish;
-            }
-        }
-        return *this;
-    }
-
-    // REQUIRES: x is reachable from this->front()
-    const_iterator find(const value_type& x) const
-    {
-        BOOST_STATIC_ASSERT((boost::is_same<category, std::random_access_iterator_tag>::value));
-        
-        return const_iterator(this->contains(x) ? x : m_finish);
-    }
-
-    // REQUIRES: index >= 0 && index < size()
-    value_type operator[](size_type index) const
-    {
-        assert(index >= 0 && index < size());
-        return m_start + index;
-    }
-    
-    value_type at(size_type index) const
-    {
-        if (index < 0 || index >= size())
-            throw std::out_of_range(std::string("half_open_range"));
-        return m_start + index;
-    }
-    
- private: // data members
-    Incrementable m_start, m_finish;
-};
-
-template <class Incrementable>
-half_open_range<Incrementable> operator|(
-    half_open_range<Incrementable> x,
-    const half_open_range<Incrementable>& y)
-{
-    return x |= y;
-}
-
-template <class Incrementable>
-half_open_range<Incrementable> operator&(
-    half_open_range<Incrementable> x,
-    const half_open_range<Incrementable>& y)
-{
-    return x &= y;
-}
-
-template <class Incrementable>
-inline bool operator==(
-    const half_open_range<Incrementable>& x,
-    const half_open_range<Incrementable>& y)
-{
-    const bool y_empty = y.empty();
-    return x.empty() ? y_empty : !y_empty && x.start() == y.start() && x.finish() == y.finish();
-}
-
-template <class Incrementable>
-inline bool operator!=(
-    const half_open_range<Incrementable>& x,
-    const half_open_range<Incrementable>& y)
-{
-    return !(x == y);
-}
-
-template <class Incrementable>
-inline half_open_range<Incrementable>
-make_half_open_range(Incrementable first, Incrementable last)
-{
-  return half_open_range<Incrementable>(first, last);
-}
-
-template <class Incrementable>
-bool intersects(
-    const half_open_range<Incrementable>& x,
-    const half_open_range<Incrementable>& y)
-{
-    return x.intersects(y);
-}
-    
-template <class Incrementable>
-bool contains(
-    const half_open_range<Incrementable>& x,
-    const half_open_range<Incrementable>& y)
-{
-    return x.contains(y);
-}
-    
-} // namespace boost
-
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-
-namespace std {
-template <class Incrementable> struct less<boost::half_open_range<Incrementable> >
-        : binary_function<
-            boost::half_open_range<Incrementable>,
-            boost::half_open_range<Incrementable>,bool>
-{
-    bool operator()(
-        const boost::half_open_range<Incrementable>& x,
-        const boost::half_open_range<Incrementable>& y) const
-    {
-        less<Incrementable> cmp;
-        return !y.empty() && (
-            cmp(x.start(), y.start())
-            || !cmp(y.start(), x.start())
-               && cmp(x.finish(), y.finish()));
-    }
-};
-
-template <class Incrementable> struct less_equal<boost::half_open_range<Incrementable> >
-        : binary_function<
-            boost::half_open_range<Incrementable>,
-            boost::half_open_range<Incrementable>,bool>
-{
-    bool operator()(
-        const boost::half_open_range<Incrementable>& x,
-        const boost::half_open_range<Incrementable>& y) const
-    {
-        typedef boost::half_open_range<Incrementable> range;
-        less<range> cmp;
-        return !cmp(y,x);
-    }
-};
-template <class Incrementable> struct greater<boost::half_open_range<Incrementable> >
-        : binary_function<
-            boost::half_open_range<Incrementable>,
-            boost::half_open_range<Incrementable>,bool>
-{
-    bool operator()(
-        const boost::half_open_range<Incrementable>& x,
-        const boost::half_open_range<Incrementable>& y) const
-    {
-        typedef boost::half_open_range<Incrementable> range;
-        less<range> cmp;
-        return cmp(y,x);
-    }
-};
-
-template <class Incrementable> struct greater_equal<boost::half_open_range<Incrementable> >
-        : binary_function<
-            boost::half_open_range<Incrementable>,
-            boost::half_open_range<Incrementable>,bool>
-{
-    bool operator()(
-        const boost::half_open_range<Incrementable>& x,
-        const boost::half_open_range<Incrementable>& y) const
-    {
-        typedef boost::half_open_range<Incrementable> range;
-        less<range> cmp;
-        return !cmp(x,y);
-    }
-};
-} // namespace std
-
-#else
-
-namespace boost {
-// Can't partially specialize std::less et al, so we must provide the operators
-template <class Incrementable>
-bool operator<(const half_open_range<Incrementable>& x,
-               const half_open_range<Incrementable>& y)
-{
-    return !y.empty() && (
-        x.empty() || std::less<Incrementable>()(x.start(), y.start())
-        || !std::less<Incrementable>()(y.start(), x.start())
-                && std::less<Incrementable>()(x.finish(), y.finish()));
-}
-
-template <class Incrementable>
-bool operator>(const half_open_range<Incrementable>& x,
-               const half_open_range<Incrementable>& y)
-{
-    return y < x;
-}
-
-template <class Incrementable>
-bool operator<=(const half_open_range<Incrementable>& x,
-               const half_open_range<Incrementable>& y)
-{
-    return !(y < x);
-}
-
-template <class Incrementable>
-bool operator>=(const half_open_range<Incrementable>& x,
-               const half_open_range<Incrementable>& y)
-{
-    return !(x < y);
-}
-} // namespace boost
-
-#endif
-    
-
-#endif // BOOST_HALF_OPEN_RANGE_HPP_
--- a/include/boost/iterator.hpp
+++ b/include/boost/iterator.hpp
@ -1,9 +1,8 @@
 //  interator.hpp workarounds for non-conforming standard libraries  ---------//

-//  (C) Copyright Boost.org 2000. Permission to copy, use, modify, sell and
-//  distribute this software is granted provided this copyright notice appears
-//  in all copies. This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
+//  (C) Copyright Beman Dawes 2000. Distributed under 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)

 //  See http://www.boost.org/libs/utility for documentation.

--- a/include/boost/iterator/counting_iterator.hpp
+++ b/include/boost/iterator/counting_iterator.hpp
@ -1,8 +1,7 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
+// Copyright David Abrahams 2003.
+// Distributed under 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)
 #ifndef COUNTING_ITERATOR_DWA200348_HPP
 # define COUNTING_ITERATOR_DWA200348_HPP

@ -11,7 +10,7 @@
 # include <boost/mpl/bool.hpp>
 # include <boost/mpl/if.hpp>
 # include <boost/mpl/identity.hpp>
-# include <boost/mpl/apply_if.hpp>
+# include <boost/mpl/eval_if.hpp>

 namespace boost {

@ -58,11 +57,11 @@ namespace detail

 #  if defined(BOOST_HAS_LONG_LONG)
  template <>
-  struct is_numeric<long long>
+  struct is_numeric< ::boost::long_long_type>
    : mpl::true_ {};
  
  template <>
-  struct is_numeric<unsigned long long>
+  struct is_numeric< ::boost::ulong_long_type>
    : mpl::true_ {};
 #  endif

@ -84,7 +83,7 @@ namespace detail
  {
      typedef typename detail::ia_dflt_help<
          CategoryOrTraversal
-        , mpl::apply_if<
+        , mpl::eval_if<
              is_numeric<Incrementable>
            , mpl::identity<random_access_traversal_tag>
            , iterator_traversal<Incrementable>
@ -93,7 +92,7 @@ namespace detail
      
      typedef typename detail::ia_dflt_help<
          Difference
-        , mpl::apply_if<
+        , mpl::eval_if<
              is_numeric<Incrementable>
            , numeric_difference<Incrementable>
            , iterator_difference<Incrementable>
--- a/include/boost/iterator/detail/categories.hpp
+++ b/include/boost/iterator/detail/categories.hpp
@ -1 +0,0 @@
-#error obsolete
--- a/include/boost/iterator/detail/config_def.hpp
+++ b/include/boost/iterator/detail/config_def.hpp
@ -1,11 +1,9 @@
 // (C) Copyright David Abrahams 2002.
 // (C) Copyright Jeremy Siek    2002.
 // (C) Copyright Thomas Witt    2002.
-// Permission to copy, use, modify,
-// sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
+// Distributed under 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)

 // no include guard multiple inclusion intended

@ -112,7 +110,7 @@
 # define BOOST_ITERATOR_NO_MPL_AUX_HAS_XXX  // "MPL's has_xxx facility doesn't work"
 #endif 

-#if defined(BOOST_NO_SFINAE) || defined(BOOST_NO_IS_CONVERTIBLE) || defined(BOOST_NO_IS_CONVERTIBLE_TEMPLATE)
+#if !defined(BOOST_MSVC) && (defined(BOOST_NO_SFINAE) || defined(BOOST_NO_IS_CONVERTIBLE) || defined(BOOST_NO_IS_CONVERTIBLE_TEMPLATE))
 # define BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY
 #endif 

--- a/Show More
+++ b/Show More