merged from trunk

[SVN r22042]

doc/pointee.rst

@@ -3,7 +3,7 @@
 ++++++++++++++++++++++++++++++++++++++++
 
 :Author: David Abrahams
-:Contact: dave@boost-consulting.com, jsiek@osl.iu.edu, witt@ive.uni-hannover.de
+:Contact: dave@boost-consulting.com
 :organization: `Boost Consulting`_
 :date: $Date$
 :copyright: Copyright David Abrahams 2004. All rights reserved

doc/sources.py

@@ -1,6 +1,6 @@
-# This is where we list the ReStructuredText source files that form
-# the book.  When you're ready to expose a new chapter, add the
-# filename here and put links in index.rst
+# 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)
 
 sources = [
 'counting_iterator.rst',
@@ -17,6 +17,8 @@ sources = [
 'reverse_iterator.rst',
 'transform_iterator.rst',
 'zip_iterator.rst',
-'iterator_archetypes.rst'
+'iterator_archetypes.rst',
+'iterator_concepts.rst',
+'iterator_traits.rst'
       ]
 

doc/zip_iterator.html

@@ -7,7 +7,7 @@
 <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-19" />
+<meta name="date" content="2004-01-27" />
 <meta name="copyright" content="Copyright David Abrahams and Thomas Becker 2003. All rights reserved" />
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head>
@@ -25,7 +25,7 @@
 <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-19</td></tr>
+<td>2004-01-27</td></tr>
 <tr><th class="docinfo-name">Copyright:</th>
 <td>Copyright David Abrahams and Thomas Becker 2003. All rights reserved</td></tr>
 </tbody>