diff --git a/doc/fusion.qbk b/doc/fusion.qbk
index 8edf9be1..f5d921de 100644
--- a/doc/fusion.qbk
+++ b/doc/fusion.qbk
@@ -26,11 +26,11 @@
[def __caution__ [$images/caution.png]]
[def __spirit__ [@http://spirit.sourceforge.net Spirit]]
-[def __phoenix__ [@http://boost.org/libs/spirit/phoenix/index.html Phoenix]]
+[def __phoenix__ [@http://www.boost.org/libs/phoenix/index.html Phoenix]]
[def __mpl__ [@http://www.boost.org/libs/mpl/index.html MPL]]
[def __stl__ [@http://en.wikipedia.org/wiki/Standard_Template_Library STL]]
[def __tuple__ [@http://www.boost.org/libs/tuple/doc/tuple_users_guide.html Boost.Tuple]]
-[def __tr1__tuple__ [@http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf TR1 Tuple]]
+[def __tr1__tuple__ [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf TR1 Tuple]]
[def __boost_tools__ [@http://www.boost.org/tools/index.html Boost Tools]]
[def __spirit_list__ [@https://lists.sourceforge.net/lists/listinfo/spirit-general Spirit Mailing List]]
[def __spirit_general__ [@news://news.gmane.org/gmane.comp.spirit.general Spirit General NNTP news portal]]
@@ -40,8 +40,8 @@
[def __david_abrahams__ [@http://www.boost.org/people/dave_abrahams.htm David Abrahams]]
[def __the_forwarding_problem__ [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm The Forwarding Problem]]
-[def __boost_any__ [@http://boost.org/doc/html/any.html Boost.Any]]
-[def __new_iterator_concepts__ [@http://boost.org/libs/iterator/doc/new-iter-concepts.html New Iterator Concepts]]
+[def __boost_any__ [@http://www.boost.org/doc/html/any.html Boost.Any]]
+[def __new_iterator_concepts__ [@http://www.boost.org/libs/iterator/doc/new-iter-concepts.html New Iterator Concepts]]
[def __boost_array_library__ [@http://www.boost.org/doc/html/array.html Boost.Array Library]]
[def __boost_variant_library__ [@http://www.boost.org/doc/html/variant.html Boost.Variant Library]]
[def __boost_tuple_library__ [@http://www.boost.org/libs/tuple/doc/tuple_users_guide.html Boost.Tuple Library]]
diff --git a/doc/html/index.html b/doc/html/index.html
index bba8e552..2279bd54 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -126,6 +126,7 @@
- I/O
- Comparison
+- Hashing
Container
@@ -160,6 +161,7 @@
reverse_view
nview
repetitive_view
+flatten_view
Adapted
diff --git a/doc/sequence.qbk b/doc/sequence.qbk
index 69899f8d..658fd6e6 100644
--- a/doc/sequence.qbk
+++ b/doc/sequence.qbk
@@ -1488,7 +1488,7 @@ The code:
__vector__ j;
std::cin >> i;
- std::cin >> set_open('[') >> set_close(']') >> set_delimiter(':');
+ std::cin >> tuple_open('[') >> tuple_close(']') >> tuple_delimiter(':');
std::cin >> j;
reads the data into the __vector__(s) `i` and `j`.
diff --git a/doc/tuple.qbk b/doc/tuple.qbk
index 5dd6be51..6f8e829f 100644
--- a/doc/tuple.qbk
+++ b/doc/tuple.qbk
@@ -23,6 +23,21 @@ As such the fusion tuple type provides a lot of functionality beyond that requir
Currently tuple is basically a synonym for __vector__, although this may be changed
in future releases of fusion.
+[heading Header]
+
+ #include
+ #include
+
+ #include
+ #include
+ #include
+
+ // for creation function
+ #include
+ #include
+ #include
+ #include
+
[heading Synopsis]
template<
typename T1 = __unspecified__,
@@ -31,8 +46,6 @@ in future releases of fusion.
typename TN = __unspecified__>
class tuple;
-/tuple.hpp>
-
[section Construction]
[heading Description]
@@ -77,19 +90,21 @@ The __tr1__tuple__ type provides a default constructor, a constructor that takes
[section Tuple creation functions]
[heading Description]
-TR1 describes 2 utility functions for creating __tr1__tuple__s. `make_tuple` builds a tuple out of it's argument list, and `tie` builds a tuple of references to it's arguments. The details of these creation functions are described in this section.
+TR1 describes 2 utility functions for creating __tr1__tuple__. `make_tuple` builds a tuple out of it's argument list, and `tie` builds a tuple of references to it's arguments. The details of these creation functions are described in this section.
[heading Specification]
template
- tuple make_tuple(const T1& t1, const T2& t2, ..., const TN& tn);
+ tuple
+ make_tuple(const T1& t1, const T2& t2, ..., const TN& tn);
Where `Vi` is `X&` if the cv-unqualified type `Ti` is `reference_wrapper`, otherwise `Vi` is `Ti`.
[*Returns]: `tuple(t1, t2, ..., tN)`
template
- tuple tie(T1& t1, T2& t2, ..., TN& tn);
+ tuple
+ tie(T1& t1, T2& t2, ..., TN& tn);
[*Returns]: tuple(t1, t2, ..., tN). When argument `ti` is `ignore`, assigning any value to the corresponding tuple element has no effect.