[Boost-commit] svn:boost r59021 - in branches/release/libs/fusion/doc/html: . fusion fusion/adapted fusion/algorithm fusion/algorithm/iteration fusion/algorithm/iteration/functions fusion/algorithm/iteration/metafunctions fusion/algorithm/query fusion/algorithm/query/functions fusion/algorithm/query/metafunctions fusion/algorithm/transformation fusion/algorithm/transformation/functions fusion/algorithm/transformation/metafunctions fusion/container fusion/container/conversion fusion/container/conversion/functions fusion/container/conversion/metafunctions fusion/container/generation fusion/container/generation/functions fusion/container/generation/metafunctions fusion/extension fusion/functional fusion/functional/adapters fusion/functional/concepts fusion/functional/generation fusion/functional/generation/functions fusion/functional/generation/metafunctions fusion/functional/invocation fusion/functional/invocation/functions fusion/functional/invocation/metafunctions fusion/iterator fusion/iterator/concepts fusion/iterator/functions fusion/iterator/metafunctions fusion/iterator/operator fusion/sequence fusion/sequence/concepts fusion/sequence/intrinsic fusion/sequence/intrinsic/functions fusion/sequence/intrinsic/metafunctions fusion/sequence/operator fusion/sequence/operator/comparison fusion/sequence/operator/i_o fusion/support fusion/tuple fusion/tuple/class_template_tuple fusion/view

Subject: [Boost-commit] svn:boost r59021 - in branches/release/libs/fusion/doc/html: . fusion fusion/adapted fusion/algorithm fusion/algorithm/iteration fusion/algorithm/iteration/functions fusion/algorithm/iteration/metafunctions fusion/algorithm/query fusion/algorithm/query/functions fusion/algorithm/query/metafunctions fusion/algorithm/transformation fusion/algorithm/transformation/functions fusion/algorithm/transformation/metafunctions fusion/container fusion/container/conversion fusion/container/conversion/functions fusion/container/conversion/metafunctions fusion/container/generation fusion/container/generation/functions fusion/container/generation/metafunctions fusion/extension fusion/functional fusion/functional/adapters fusion/functional/concepts fusion/functional/generation fusion/functional/generation/functions fusion/functional/generation/metafunctions fusion/functional/invocation fusion/functional/invocation/functions fusion/functional/invocation/metafunctions fusion/iterator fusion/iterator/concepts fusion/iterator/functions fusion/iterator/metafunctions fusion/iterator/operator fusion/sequence fusion/sequence/concepts fusion/sequence/intrinsic fusion/sequence/intrinsic/functions fusion/sequence/intrinsic/metafunctions fusion/sequence/operator fusion/sequence/operator/comparison fusion/sequence/operator/i_o fusion/support fusion/tuple fusion/tuple/class_template_tuple fusion/view
From: daniel_james_at_[hidden]
Date: 2010-01-15 01:35:56

Author: danieljames
Date: 2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
New Revision: 59021
URL: http://svn.boost.org/trac/boost/changeset/59021

Log:
Copy generated fusion documentation from trunk.
Removed:
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_generic.html
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_lvalue_args.html
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_rvalue_args.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_genrc.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_lvargs.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_rvargs.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_genrc.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_lvargs.html
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_rvargs.html
Text files modified: 
   branches/release/libs/fusion/doc/html/fusion/acknowledgements.html                                    |    25                                         
   branches/release/libs/fusion/doc/html/fusion/adapted.html                                             |    42 -                                       
   branches/release/libs/fusion/doc/html/fusion/adapted/adapt_assoc.html                                 |    86 +----                                   
   branches/release/libs/fusion/doc/html/fusion/adapted/adapt_struct.html                                |    82 +---                                    
   branches/release/libs/fusion/doc/html/fusion/adapted/boost__array.html                                |    78 +---                                    
   branches/release/libs/fusion/doc/html/fusion/adapted/boost__tuple.html                                |    67 ---                                     
   branches/release/libs/fusion/doc/html/fusion/adapted/mpl_sequence.html                                |    81 +---                                    
   branches/release/libs/fusion/doc/html/fusion/adapted/std__pair.html                                   |    78 +---                                    
   branches/release/libs/fusion/doc/html/fusion/algorithm.html                                           |    84 +---                                    
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html                                 |    32 -                                       
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions.html                       |    23                                         
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/accumulate.html            |   287 ++--------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/fold.html                  |   287 ++--------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/for_each.html              |   281 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions.html                   |    23                                         
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html        |   262 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/fold.html              |   262 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html          |   245 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/query.html                                     |    32 -                                       
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions.html                           |    23                                         
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/all.html                       |   290 ++++-------------                       
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/any.html                       |   290 ++++-------------                       
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count.html                     |   280 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count_if.html                  |   278 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find.html                      |   276 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find_if.html                   |   251 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/none.html                      |   290 ++++-------------                       
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions.html                       |    23                                         
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/all.html                   |   249 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/any.html                   |   249 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count.html                 |   239 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count_if.html              |   239 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find.html                  |   246 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find_if.html               |   248 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/none.html                  |   249 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation.html                            |    36 -                                       
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions.html                  |    23                                         
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/clear.html            |   247 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase.html            |   324 +++++--------------                     
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase_key.html        |   272 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter.html           |   276 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter_if.html        |   280 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert.html           |   297 ++++-------------                       
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert_range.html     |   302 ++++-------------                       
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/join.html             |   279 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_back.html         |   252 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_front.html        |   252 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_back.html        |   274 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_front.html       |   274 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove.html           |   276 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove_if.html        |   278 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace.html          |   301 ++++-------------                       
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace_if.html       |   301 ++++-------------                       
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/reverse.html          |   250 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/transform.html        |   450 ++++++++-------------------             
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/zip.html              |   263 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions.html              |    23                                         
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/clear.html        |   213 ++----------                            
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase.html        |   278 ++++------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html    |   237 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter.html       |   247 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html    |   245 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert.html       |   268 ++++------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html |   271 ++++------------                        
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/join.html         |   170 ---------                               
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html     |   221 ++----------                            
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html    |   196 ++---------                             
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html    |   218 +++---------                            
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html   |   218 +++---------                            
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove.html       |   247 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html    |   247 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace.html      |   238 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html   |   264 ++++-----------                         
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html      |   221 ++----------                            
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/transform.html    |   453 ++++++++-------------------             
   branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/zip.html          |   178 +---------                              
   branches/release/libs/fusion/doc/html/fusion/change_log.html                                          |    57 +-                                      
   branches/release/libs/fusion/doc/html/fusion/container.html                                           |    37 -                                       
   branches/release/libs/fusion/doc/html/fusion/container/cons.html                                      |   347 ++++++++++-----------                   
   branches/release/libs/fusion/doc/html/fusion/container/conversion.html                                |    34 -                                       
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions.html                      |    23                                         
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_list.html              |   231 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_map.html               |   239 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_set.html               |   233 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_vector.html            |   231 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions.html                  |    23                                         
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_list.html          |   235 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_map.html           |   243 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_set.html           |   237 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_vector.html        |   235 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/container/generation.html                                |    34 -                                       
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions.html                      |    23                                         
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/list_tie.html             |   245 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_cons.html            |   290 +++--------------                       
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_list.html            |   274 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_map.html             |   306 ++++--------------                      
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_set.html             |   276 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_vector.html          |   274 +++-------------                        
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/map_tie.html              |   271 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/tiers.html                |   100 -----                                   
   branches/release/libs/fusion/doc/html/fusion/container/generation/functions/vector_tie.html           |   245 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions.html                  |    23                                         
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/list_tie.html         |   241 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_cons.html        |   255 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_list.html        |   243 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_map.html         |   298 +++--------------                       
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_set.html         |   245 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_vector.html      |   243 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/map_tie.html          |   267 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/vector_tie.html       |   241 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/container/list.html                                      |   285 +++++++---------                        
   branches/release/libs/fusion/doc/html/fusion/container/map.html                                       |   268 +++++++---------                        
   branches/release/libs/fusion/doc/html/fusion/container/set.html                                       |   256 ++++++---------                         
   branches/release/libs/fusion/doc/html/fusion/container/vector.html                                    |   253 ++++++--------                          
   branches/release/libs/fusion/doc/html/fusion/extension.html                                           |    27 -                                       
   branches/release/libs/fusion/doc/html/fusion/extension/ext_full.html                                  |   353 +++++++--------------                   
   branches/release/libs/fusion/doc/html/fusion/extension/iterator_facade.html                           |   537 ++++++++++++++++----------------        
   branches/release/libs/fusion/doc/html/fusion/extension/sequence_facade.html                           |   347 +++++++++-----------                    
   branches/release/libs/fusion/doc/html/fusion/functional.html                                          |    85 +---                                    
   branches/release/libs/fusion/doc/html/fusion/functional/adapters.html                                 |    25                                         
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused.html                           |   253 ++++++---------                         
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_function_object.html           |   266 ++++++---------                         
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_procedure.html                 |   269 ++++++---------                         
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/limits.html                          |    47 --                                      
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused.html                         |   270 ++++++---------                         
   branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_typed.html                   |   297 +++++++----------                       
   branches/release/libs/fusion/doc/html/fusion/functional/concepts.html                                 |    25                                         
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/callable.html                        |    60 --                                      
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/def_callable.html                    |   164 +++------                               
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/poly.html                            |   168 +++------                               
   branches/release/libs/fusion/doc/html/fusion/functional/concepts/reg_callable.html                    |   145 +++-----                                
   branches/release/libs/fusion/doc/html/fusion/functional/generation.html                               |    23                                         
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions.html                     |    26 -                                       
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused.html            |   289 +++--------------                       
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html       |   292 +++--------------                       
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_proc.html       |   287 +++--------------                       
   branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused.html          |   281 +++--------------                       
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions.html                 |    27 -                                       
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused.html        |   142 -------                                 
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html   |   143 -------                                 
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html   |   143 -------                                 
   branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html      |   140 -------                                 
   branches/release/libs/fusion/doc/html/fusion/functional/invocation.html                               |    24                                         
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions.html                     |    23                                         
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke.html              |   319 ++++---------------                     
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_fobj.html         |   315 ++++---------------                     
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_proc.html         |   319 ++++---------------                     
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/limits.html                        |    48 --                                      
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions.html                 |    24                                         
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke.html          |   113 ------                                  
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html     |   117 ------                                  
   branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html     |   119 ------                                  
   branches/release/libs/fusion/doc/html/fusion/introduction.html                                        |   108 +-----                                  
   branches/release/libs/fusion/doc/html/fusion/iterator.html                                            |    36 -                                       
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts.html                                   |    41 -                                       
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/bidirectional_iterator.html            |   322 +++++++++----------                     
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/forward_iterator.html                  |   652 ++++++++++++++++++++++----------------- 
   branches/release/libs/fusion/doc/html/fusion/iterator/concepts/random_access_iterator.html            |   297 ++++++++---------                       
   branches/release/libs/fusion/doc/html/fusion/iterator/functions.html                                  |    26 -                                       
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance.html                          |   175 +++-------                              
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance_c.html                        |   175 +++-------                              
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref.html                            |   150 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/distance.html                         |   146 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/next.html                             |   150 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/functions/prior.html                            |   150 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions.html                              |    24                                         
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance.html                      |   174 +++-------                              
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance_c.html                    |   176 +++-------                              
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref.html                        |   154 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/distance.html                     |   148 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/equal_to.html                     |   149 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/next.html                         |   147 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/prior.html                        |   151 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of.html                     |   151 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/operator.html                                   |    27 -                                       
   branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_equality.html                 |   140 ++------                                
   branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_inequality.html               |   137 ++-----                                 
   branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_unary_star.html               |   158 ++------                                
   branches/release/libs/fusion/doc/html/fusion/notes.html                                               |   235 +++----------                           
   branches/release/libs/fusion/doc/html/fusion/organization.html                                        |   172 +++-------                              
   branches/release/libs/fusion/doc/html/fusion/preface.html                                             |   190 ++++------                              
   branches/release/libs/fusion/doc/html/fusion/quick_start.html                                         |   223 +++---------                            
   branches/release/libs/fusion/doc/html/fusion/references.html                                          |    41 +-                                      
   branches/release/libs/fusion/doc/html/fusion/sequence.html                                            |    42 -                                       
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts.html                                   |    64 +--                                     
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/associative_sequence.html              |   351 +++++++++++---------                    
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/bidirectional_sequence.html            |   354 ++++++++++----------                    
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/forward_sequence.html                  |   527 +++++++++++++++++---------------        
   branches/release/libs/fusion/doc/html/fusion/sequence/concepts/random_access_sequence.html            |   386 +++++++++++-----------                  
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic.html                                  |    68 ---                                     
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions.html                        |    23                                         
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at.html                     |   268 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_c.html                   |   268 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_key.html                 |   264 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/back.html                   |   244 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/begin.html                  |   253 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/empty.html                  |   240 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/end.html                    |   253 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/front.html                  |   244 ++------------                          
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/has_key.html                |   260 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/size.html                   |   234 ++-----------                           
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/swap.html                   |   209 ++----------                            
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions.html                    |    23                                         
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at.html                 |   249 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html               |   249 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html             |   253 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/back.html               |   194 ++---------                             
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html              |   199 ++---------                             
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html              |   200 ++---------                             
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/end.html                |   199 ++---------                             
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/front.html              |   196 ++---------                             
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html            |   220 +++---------                            
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/size.html               |   194 ++---------                             
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html               |   159 ++-------                               
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html           |   214 +++---------                            
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html         |   214 +++---------                            
   branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html       |   216 +++---------                            
   branches/release/libs/fusion/doc/html/fusion/sequence/operator.html                                   |    25                                         
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison.html                        |    40 -                                       
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/equal.html                  |   256 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than.html           |   228 +++----------                           
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html     |   225 +++----------                           
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than.html              |   232 +++-----------                          
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than_equal.html        |   228 +++----------                           
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/not_equal.html              |   225 +++----------                           
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o.html                               |    86 ++---                                   
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/in.html                            |   251 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/out.html                           |   251 +++------------                         
   branches/release/libs/fusion/doc/html/fusion/support.html                                             |    25                                         
   branches/release/libs/fusion/doc/html/fusion/support/category_of.html                                 |   138 +++-----                                
   branches/release/libs/fusion/doc/html/fusion/support/deduce.html                                      |    73 ---                                     
   branches/release/libs/fusion/doc/html/fusion/support/deduce_sequence.html                             |    77 ---                                     
   branches/release/libs/fusion/doc/html/fusion/support/is_sequence.html                                 |   134 ++-----                                 
   branches/release/libs/fusion/doc/html/fusion/support/is_view.html                                     |   131 ++-----                                 
   branches/release/libs/fusion/doc/html/fusion/support/pair.html                                        |   387 ++++++++++++-----------                 
   branches/release/libs/fusion/doc/html/fusion/support/tag_of.html                                      |   125 ++-----                                 
   branches/release/libs/fusion/doc/html/fusion/tuple.html                                               |    29 -                                       
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple.html                          |    37 -                                       
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/construction.html             |    91 +---                                    
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/element_access.html           |    82 +---                                    
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/relational_operators.html     |   162 +++------                               
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html |    67 +--                                     
   branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html     |    72 +---                                    
   branches/release/libs/fusion/doc/html/fusion/tuple/pairs.html                                         |    76 +---                                    
   branches/release/libs/fusion/doc/html/fusion/view.html                                                |    34 -                                       
   branches/release/libs/fusion/doc/html/fusion/view/filter_view.html                                    |   249 ++++++--------                          
   branches/release/libs/fusion/doc/html/fusion/view/iterator_range.html                                 |   268 +++++++---------                        
   branches/release/libs/fusion/doc/html/fusion/view/joint_view.html                                     |   255 ++++++---------                         
   branches/release/libs/fusion/doc/html/fusion/view/nview.html                                          |   275 +++++++---------                        
   branches/release/libs/fusion/doc/html/fusion/view/reverse_view.html                                   |   240 ++++++--------                          
   branches/release/libs/fusion/doc/html/fusion/view/single_view.html                                    |   209 +++++-------                            
   branches/release/libs/fusion/doc/html/fusion/view/transform_view.html                                 |   389 +++++++++++------------                 
   branches/release/libs/fusion/doc/html/fusion/view/zip_view.html                                       |   233 +++++--------                           
   branches/release/libs/fusion/doc/html/index.html                                                      |    53 --                                      
   254 files changed, 13648 insertions(+), 35516 deletions(-)

Modified: branches/release/libs/fusion/doc/html/fusion/acknowledgements.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/acknowledgements.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/acknowledgements.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Acknowledgements</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="change_log.html" title="Change log">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="change_log.html" title="Change log">
 <link rel="next" href="references.html" title="References">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="change_log.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="references.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.acknowledgements"></a>Acknowledgements
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Acknowledgements">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.acknowledgements"></a><a class="link" href="acknowledgements.html" title="Acknowledgements">Acknowledgements</a>
+</h2></div></div></div>
 <p>
       Special thanks to David Abrahams, Douglas Gregor, Hartmut Kaiser, Aleksey Gurtovoy,
       Peder Holt, Daniel Wallin, Jaakko Jarvi, Jeremiah Willcock, Dan Marsden, Eric
@@ -50,7 +43,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/adapted.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Adapted</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="view/nview.html" title="nview">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="view/nview.html" title="nview">
 <link rel="next" href="adapted/std__pair.html" title="std::pair">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="view/nview.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="adapted/std__pair.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.adapted"></a>Adapted
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Adapted">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.adapted"></a><a class="link" href="adapted.html" title="Adapted">Adapted</a>
+</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">std::pair</span></dt>
 <dt><span class="section">mpl sequence</span></dt>
@@ -42,10 +35,10 @@
 <dt><span class="section"> BOOST_FUSION_ADAPT_ASSOC_STRUCT</span></dt>
 </dl></div>
 <p>
-      Fusion provides a couple of adapters for other sequences such as <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>,
+      Fusion provides a couple of adapters for other sequences such as <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code>,
       <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a> sequences,
-      and <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></tt>. These adapters are written using Fusion's
-      non-intrusive Extension mechanism.
+      and <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code>. These adapters are written using Fusion's
+      non-intrusive <a class="link" href="extension.html" title="Extension">Extension</a> mechanism.
       If you wish to use these sequences with fusion, simply include the necessary
       files and they will be regarded as first-class, fully conforming fusion sequences.
     </p>
@@ -53,23 +46,16 @@
       Fusion also provides various schemes to make it easy for the user to adapt
       various data structures, non-intrusively, as full fledged Fusion sequences.
     </p>
-<<<<<<< .working
-<a name="fusion.adapted.header"></a><h3>
-<a name="id530111"></a>
-      Header
-    </h3>
-=======
 <a name="fusion.adapted.header"></a><h4>
-<a name="id737474"></a>
+<a name="id738203"></a>
       <a class="link" href="adapted.html#fusion.adapted.header">Header</a>
     </h4>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
       Fusion sequences may also be adapted as fully conforming MPL
-      sequences (see Intrinsics).
+      sequences (see <a class="link" href="sequence/intrinsic.html" title="Intrinsic">Intrinsics</a>).
       That way, we can have 2-way adaptation to and from MPL
       and Fusion. To make Fusion sequences fully conforming MPL
       sequences, include:
@@ -88,7 +74,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/adapt_assoc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/adapt_assoc.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/adapt_assoc.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> BOOST_FUSION_ADAPT_ASSOC_STRUCT</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>BOOST_FUSION_ADAPT_ASSOC_STRUCT</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
-<link rel="previous" href="adapt_struct.html" title=" BOOST_FUSION_ADAPT_STRUCT">
+<link rel="prev" href="adapt_struct.html" title="BOOST_FUSION_ADAPT_STRUCT">
 <link rel="next" href="../algorithm.html" title="Algorithm">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,47 +22,24 @@
 <div class="spirit-nav">
 <a accesskey="p" href="adapt_struct.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapted.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../algorithm.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.adapted.adapt_assoc"></a> BOOST_FUSION_ADAPT_ASSOC_STRUCT
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.adapted.adapt_assoc.description"></a><h4>
-<a name="id534295"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="BOOST_FUSION_ADAPT_ASSOC_STRUCT">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.adapted.adapt_assoc"></a><a class="link" href="adapt_assoc.html" title="BOOST_FUSION_ADAPT_ASSOC_STRUCT"> BOOST_FUSION_ADAPT_ASSOC_STRUCT</a>
 </h3></div></div></div>
 <a name="fusion.adapted.adapt_assoc.description"></a><h5>
-<a name="id741464"></a>
+<a name="id741666"></a>
         <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         BOOST_FUSION_ADAPT_ASSOC_STRUCT is a macro that can be used to generate all
-        the necessary boilerplate to make an arbitrary struct into a model of <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random Access Sequence</a>
-        and <a href="../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
+        the necessary boilerplate to make an arbitrary struct into a model of <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random Access Sequence</a>
+        and <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
         Sequence</a>.
       </p>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_assoc.synopsis"></a><h4>
-<a name="id534343"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.adapted.adapt_assoc.synopsis"></a><h5>
-<a name="id741490"></a>
+<a name="id742513"></a>
         <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">BOOST_FUSION_ADAPT_ASSOC_STRUCT</span><span class="special">(</span>
     <span class="identifier">struct_name</span><span class="special">,</span>
     <span class="special">(</span><span class="identifier">member_type0</span><span class="special">,</span> <span class="identifier">member_name0</span><span class="special">,</span> <span class="identifier">key_type0</span><span class="special">)</span>
@@ -74,58 +47,35 @@
     <span class="special">...</span>
     <span class="special">)</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_assoc.semantics"></a><h4>
-<a name="id534485"></a>
-        Semantics
-      </h4>
-=======
 <a name="fusion.adapted.adapt_assoc.semantics"></a><h5>
-<a name="id741591"></a>
+<a name="id742613"></a>
         <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.semantics">Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        The above macro generates the necessary code to adapt <tt class="computeroutput"><span class="identifier">struct_name</span></tt>
-        as a model of <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-        Access Sequence</a> and <a href="../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
-        Sequence</a>. The sequence of <tt class="computeroutput"><span class="special">(</span><span class="identifier">member_typeN</span><span class="special">,</span>
+        The above macro generates the necessary code to adapt <code class="computeroutput"><span class="identifier">struct_name</span></code>
+        as a model of <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+        Access Sequence</a> and <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+        Sequence</a>. The sequence of <code class="computeroutput"><span class="special">(</span><span class="identifier">member_typeN</span><span class="special">,</span>
         <span class="identifier">member_nameN</span><span class="special">,</span>
-        <span class="identifier">key_typeN</span><span class="special">)</span></tt>
+        <span class="identifier">key_typeN</span><span class="special">)</span></code>
         triples declare the type, name and key type of each of the struct members
         that will be part of the sequence.
       </p>
 <p>
-        The macro should be used at global scope, and <tt class="computeroutput"><span class="identifier">struct_name</span></tt>
+        The macro should be used at global scope, and <code class="computeroutput"><span class="identifier">struct_name</span></code>
         should be the fully namespace qualified name of the struct to be converted.
       </p>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_assoc.header"></a><h4>
-<a name="id534609"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.adapted.adapt_assoc.header"></a><h5>
-<a name="id742214"></a>
+<a name="id742690"></a>
         <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="keyword">struct</span><span class="special">/</span><span class="identifier">adapt_assoc_struct</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">adapt_assoc_struct</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_assoc.example"></a><h4>
-<a name="id534774"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.adapted.adapt_assoc.example"></a><h5>
-<a name="id742330"></a>
+<a name="id742805"></a>
         <a class="link" href="adapt_assoc.html#fusion.adapted.adapt_assoc.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">demo</span>
 <span class="special">{</span>
     <span class="keyword">struct</span> <span class="identifier">employee</span>
@@ -152,7 +102,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/adapt_struct.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/adapt_struct.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/adapt_struct.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> BOOST_FUSION_ADAPT_STRUCT</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>BOOST_FUSION_ADAPT_STRUCT</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
-<link rel="previous" href="boost__tuple.html" title="boost::tuple">
-<link rel="next" href="adapt_assoc.html" title=" BOOST_FUSION_ADAPT_ASSOC_STRUCT">
+<link rel="prev" href="boost__tuple.html" title="boost::tuple">
+<link rel="next" href="adapt_assoc.html" title="BOOST_FUSION_ADAPT_ASSOC_STRUCT">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -26,45 +22,23 @@
 <div class="spirit-nav">
 <a accesskey="p" href="boost__tuple.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapted.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="adapt_assoc.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.adapted.adapt_struct"></a> BOOST_FUSION_ADAPT_STRUCT
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.adapted.adapt_struct.description"></a><h4>
-<a name="id533623"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="BOOST_FUSION_ADAPT_STRUCT">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.adapted.adapt_struct"></a><a class="link" href="adapt_struct.html" title="BOOST_FUSION_ADAPT_STRUCT"> BOOST_FUSION_ADAPT_STRUCT</a>
 </h3></div></div></div>
 <a name="fusion.adapted.adapt_struct.description"></a><h5>
-<a name="id741004"></a>
+<a name="id741207"></a>
         <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         BOOST_FUSION_ADAPT_STRUCT is a macro that can be used to generate all the
-        necessary boilerplate to make an arbitrary struct into a <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+        necessary boilerplate to make an arbitrary struct into a <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
         Access Sequence</a>.
       </p>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_struct.synopsis"></a><h4>
-<a name="id533662"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.adapted.adapt_struct.synopsis"></a><h5>
-<a name="id741026"></a>
+<a name="id741228"></a>
         <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">BOOST_FUSION_ADAPT_STRUCT</span><span class="special">(</span>
     <span class="identifier">struct_name</span><span class="special">,</span>
     <span class="special">(</span><span class="identifier">member_type0</span><span class="special">,</span> <span class="identifier">member_name0</span><span class="special">)</span>
@@ -72,55 +46,33 @@
     <span class="special">...</span>
     <span class="special">)</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_struct.semantics"></a><h4>
-<a name="id533781"></a>
-        Semantics
-      </h4>
-=======
 <a name="fusion.adapted.adapt_struct.semantics"></a><h5>
-<a name="id741110"></a>
+<a name="id741312"></a>
         <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.semantics">Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        The above macro generates the necessary code to adapt <tt class="computeroutput"><span class="identifier">struct_name</span></tt>
-        as a model of <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-        Access Sequence</a>. The sequence of <tt class="computeroutput"><span class="special">(</span><span class="identifier">member_typeN</span><span class="special">,</span>
-        <span class="identifier">member_nameN</span><span class="special">)</span></tt>
+        The above macro generates the necessary code to adapt <code class="computeroutput"><span class="identifier">struct_name</span></code>
+        as a model of <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+        Access Sequence</a>. The sequence of <code class="computeroutput"><span class="special">(</span><span class="identifier">member_typeN</span><span class="special">,</span>
+        <span class="identifier">member_nameN</span><span class="special">)</span></code>
         pairs declare the type and names of each of the struct members that will
         be part of the sequence.
       </p>
 <p>
-        The macro should be used at global scope, and <tt class="computeroutput"><span class="identifier">struct_name</span></tt>
+        The macro should be used at global scope, and <code class="computeroutput"><span class="identifier">struct_name</span></code>
         should be the fully namespace qualified name of the struct to be converted.
       </p>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_struct.header"></a><h4>
-<a name="id533884"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.adapted.adapt_struct.header"></a><h5>
-<a name="id741173"></a>
+<a name="id741376"></a>
         <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="keyword">struct</span><span class="special">/</span><span class="identifier">adapt_struct</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">adapt_struct</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.adapt_struct.example"></a><h4>
-<a name="id534049"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.adapted.adapt_struct.example"></a><h5>
-<a name="id741288"></a>
+<a name="id741491"></a>
         <a class="link" href="adapt_struct.html#fusion.adapted.adapt_struct.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">demo</span>
 <span class="special">{</span>
     <span class="keyword">struct</span> <span class="identifier">employee</span>
@@ -139,7 +91,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/boost__array.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/boost__array.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/boost__array.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>boost::array</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
-<link rel="previous" href="mpl_sequence.html" title="mpl sequence">
+<link rel="prev" href="mpl_sequence.html" title="mpl sequence">
 <link rel="next" href="boost__tuple.html" title="boost::tuple">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,86 +22,52 @@
 <div class="spirit-nav">
 <a accesskey="p" href="mpl_sequence.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapted.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="boost__tuple.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.adapted.boost__array"></a>boost::array
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="boost::array">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.adapted.boost__array"></a><a class="link" href="boost__array.html" title="boost::array">boost::array</a>
+</h3></div></div></div>
 <p>
-        This module provides adapters for <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></tt>.
-        Including the module header makes <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></tt>
-        a fully conforming <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+        This module provides adapters for <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code>.
+        Including the module header makes <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code>
+        a fully conforming <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
         Access Sequence</a>.
       </p>
-<<<<<<< .working
-<a name="fusion.adapted.boost__array.header"></a><h4>
-<a name="id532132"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.adapted.boost__array.header"></a><h5>
-<a name="id739972"></a>
+<a name="id740175"></a>
         <a class="link" href="boost__array.html#fusion.adapted.boost__array.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="identifier">array</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">array</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.boost__array.model_of"></a><h4>
-<a name="id532287"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-=======
 <a name="fusion.adapted.boost__array.model_of"></a><h5>
-<a name="id740080"></a>
+<a name="id740283"></a>
         <a class="link" href="boost__array.html#fusion.adapted.boost__array.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
->>>>>>> .merge-right.r57125
           Access Sequence</a></li></ul></div>
-<<<<<<< .working
-<a name="fusion.adapted.boost__array.example"></a><h4>
-<a name="id532327"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.adapted.boost__array.example"></a><h5>
-<a name="id740105"></a>
+<a name="id740308"></a>
         <a class="link" href="boost__array.html#fusion.adapted.boost__array.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="number">3</span><span class="special">&gt;</span> <span class="identifier">arr</span> <span class="special">=</span> <span class="special">{{</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">}};</span>
 
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span>begin<span class="special">(</span><span class="identifier">arr</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">arr</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span>advance_c<span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;(</span>begin<span class="special">(</span><span class="identifier">arr</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span>prior<span class="special">(</span>end<span class="special">(</span><span class="identifier">arr</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;(</span><span class="identifier">arr</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><a class="link" href="../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">arr</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><a class="link" href="../iterator/functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">arr</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><a class="link" href="../iterator/functions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;(</span><a class="link" href="../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">arr</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><a class="link" href="../iterator/functions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><a class="link" href="../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">arr</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;(</span><span class="identifier">arr</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.boost__array.see_also"></a><h4>
-<a name="id532945"></a>
-        See also
-      </h4>
-=======
 <a name="fusion.adapted.boost__array.see_also"></a><h5>
-<a name="id740541"></a>
+<a name="id740744"></a>
         <a class="link" href="boost__array.html#fusion.adapted.boost__array.see_also">See also</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         <a href="http://www.boost.org/doc/html/array.html" target="_top">Boost.Array Library</a>
       </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/boost__tuple.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/boost__tuple.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/boost__tuple.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>boost::tuple</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
-<link rel="previous" href="boost__array.html" title="boost::array">
-<link rel="next" href="adapt_struct.html" title=" BOOST_FUSION_ADAPT_STRUCT">
+<link rel="prev" href="boost__array.html" title="boost::array">
+<link rel="next" href="adapt_struct.html" title="BOOST_FUSION_ADAPT_STRUCT">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -26,71 +22,40 @@
 <div class="spirit-nav">
 <a accesskey="p" href="boost__array.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapted.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="adapt_struct.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.adapted.boost__tuple"></a>boost::tuple
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="boost::tuple">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.adapted.boost__tuple"></a><a class="link" href="boost__tuple.html" title="boost::tuple">boost::tuple</a>
+</h3></div></div></div>
 <p>
-        This module provides adapters for <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">tuple</span></tt>.
-        Including the module header makes <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">tuple</span></tt>
-        a fully conforming <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+        This module provides adapters for <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">tuple</span></code>.
+        Including the module header makes <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">tuple</span></code>
+        a fully conforming <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
         Sequence</a>.
       </p>
-<<<<<<< .working
-<a name="fusion.adapted.boost__tuple.header"></a><h4>
-<a name="id533058"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.adapted.boost__tuple.header"></a><h5>
-<a name="id740610"></a>
+<a name="id740813"></a>
         <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="identifier">boost_tuple</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">boost_tuple</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.boost__tuple.model_of"></a><h4>
-<a name="id533213"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a></li></ul></div>
-<a name="fusion.adapted.boost__tuple.example"></a><h4>
-<a name="id533252"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.adapted.boost__tuple.model_of"></a><h5>
-<a name="id740718"></a>
+<a name="id740921"></a>
         <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a></li></ul></div>
 <a name="fusion.adapted.boost__tuple.example"></a><h5>
-<a name="id740744"></a>
+<a name="id740946"></a>
         <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">tuple</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">example_tuple</span><span class="special">(</span><span class="number">101</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">);</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">begin</span><span class="special">(</span><span class="identifier">example_tuple</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="char">'\n'</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="special">*</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">next</span><span class="special">(</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">begin</span><span class="special">(</span><span class="identifier">example_tuple</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="char">'\n'</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.boost__tuple.see_also"></a><h4>
-<a name="id533568"></a>
-        See also
-      </h4>
-=======
 <a name="fusion.adapted.boost__tuple.see_also"></a><h5>
-<a name="id740970"></a>
+<a name="id741173"></a>
         <a class="link" href="boost__tuple.html#fusion.adapted.boost__tuple.see_also">See also</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         <a href="http://www.boost.org/libs/tuple/doc/tuple_users_guide.html" target="_top">Boost.Tuple
         Library</a>
@@ -98,7 +63,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/mpl_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/mpl_sequence.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/mpl_sequence.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>mpl sequence</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
-<link rel="previous" href="std__pair.html" title="std::pair">
+<link rel="prev" href="std__pair.html" title="std::pair">
 <link rel="next" href="boost__array.html" title="boost::array">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,104 +22,67 @@
 <div class="spirit-nav">
 <a accesskey="p" href="std__pair.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapted.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="boost__array.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.adapted.mpl_sequence"></a>mpl sequence
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="mpl sequence">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.adapted.mpl_sequence"></a><a class="link" href="mpl_sequence.html" title="mpl sequence">mpl sequence</a>
+</h3></div></div></div>
 <p>
         This module provides adapters for MPL
         sequences. Including the module header makes all MPL
         sequences fully conforming fusion sequences.
       </p>
-<<<<<<< .working
-<a name="fusion.adapted.mpl_sequence.header"></a><h4>
-<a name="id531191"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.adapted.mpl_sequence.header"></a><h5>
-<a name="id738223"></a>
+<a name="id739518"></a>
         <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="identifier">mpl</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">mpl</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.mpl_sequence.model_of"></a><h4>
-<a name="id531346"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc">
-<li>
-<a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>
-=======
 <a name="fusion.adapted.mpl_sequence.model_of"></a><h5>
-<a name="id738331"></a>
+<a name="id739626"></a>
         <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
 <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
->>>>>>> .merge-right.r57125
           (If the MPL
           sequence is a forward sequence.)
         </li>
-<li>
-<a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+<li class="listitem">
+<a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
           Sequence</a> (If the MPL
           sequence is a bidirectional sequence.)
         </li>
-<li>
-<a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+<li class="listitem">
+<a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
           Access Sequence</a> (If the MPL
           sequence is a random access sequence.)
         </li>
 </ul></div>
-<<<<<<< .working
-<a name="fusion.adapted.mpl_sequence.example"></a><h4>
-<a name="id531436"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.adapted.mpl_sequence.example"></a><h5>
-<a name="id739482"></a>
+<a name="id739685"></a>
         <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector_c</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="number">456</span><span class="special">&gt;</span> <span class="identifier">vec_c</span><span class="special">;</span>
 <span class="identifier">fusion</span><span class="special">::</span><span class="identifier">vector2</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">long</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="identifier">vec_c</span><span class="special">);</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 
 <span class="identifier">v</span> <span class="special">=</span> <span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector_c</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="number">456</span><span class="special">,</span> <span class="number">789</span><span class="special">&gt;();</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.mpl_sequence.see_also"></a><h4>
-<a name="id532022"></a>
-        See also
-      </h4>
-=======
 <a name="fusion.adapted.mpl_sequence.see_also"></a><h5>
-<a name="id739902"></a>
+<a name="id740105"></a>
         <a class="link" href="mpl_sequence.html#fusion.adapted.mpl_sequence.see_also">See also</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         <a href="http://www.boost.org/libs/mpl/index.html" target="_top">MPL</a>
       </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/adapted/std__pair.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/adapted/std__pair.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/adapted/std__pair.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>std::pair</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../adapted.html" title="Adapted">
-<link rel="previous" href="../adapted.html" title="Adapted">
+<link rel="prev" href="../adapted.html" title="Adapted">
 <link rel="next" href="mpl_sequence.html" title="mpl sequence">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,85 +22,51 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../adapted.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapted.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mpl_sequence.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.adapted.std__pair"></a>std::pair
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="std::pair">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.adapted.std__pair"></a><a class="link" href="std__pair.html" title="std::pair">std::pair</a>
+</h3></div></div></div>
 <p>
-        This module provides adapters for <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>.
-        Including the module header makes <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>
-        a fully conforming <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+        This module provides adapters for <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code>.
+        Including the module header makes <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code>
+        a fully conforming <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
         Access Sequence</a>.
       </p>
-<<<<<<< .working
-<a name="fusion.adapted.std__pair.header"></a><h4>
-<a name="id530512"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.adapted.std__pair.header"></a><h5>
-<a name="id737752"></a>
+<a name="id738481"></a>
         <a class="link" href="std__pair.html#fusion.adapted.std__pair.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="identifier">std_pair</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">std_pair</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.std__pair.model_of"></a><h4>
-<a name="id530668"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-=======
 <a name="fusion.adapted.std__pair.model_of"></a><h5>
-<a name="id737860"></a>
+<a name="id738589"></a>
         <a class="link" href="std__pair.html#fusion.adapted.std__pair.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
->>>>>>> .merge-right.r57125
           Access Sequence</a></li></ul></div>
-<<<<<<< .working
-<a name="fusion.adapted.std__pair.example"></a><h4>
-<a name="id530707"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.adapted.std__pair.example"></a><h5>
-<a name="id737886"></a>
+<a name="id738614"></a>
         <a class="link" href="std__pair.html#fusion.adapted.std__pair.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">p</span><span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"Hola!!!"</span><span class="special">);</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">p</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">p</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">p</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">p</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">p</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.adapted.std__pair.see_also"></a><h4>
-<a name="id531057"></a>
-        See also
-      </h4>
-=======
 <a name="fusion.adapted.std__pair.see_also"></a><h5>
-<a name="id738136"></a>
+<a name="id738865"></a>
         <a class="link" href="std__pair.html#fusion.adapted.std__pair.see_also">See also</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        std::pair,
-        <a href="../tuple/pairs.html" title="Pairs"><tt class="computeroutput"><span class="identifier">TR1</span>
-        <span class="keyword">and</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt></a>
+        std::pair,
+        <a class="link" href="../tuple/pairs.html" title="Pairs"><code class="computeroutput"><span class="identifier">TR1</span>
+        <span class="keyword">and</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a>
       </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Algorithm</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="adapted/adapt_assoc.html" title=" BOOST_FUSION_ADAPT_ASSOC_STRUCT">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="adapted/adapt_assoc.html" title="BOOST_FUSION_ADAPT_ASSOC_STRUCT">
 <link rel="next" href="algorithm/iteration.html" title="Iteration">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="adapted/adapt_assoc.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="algorithm/iteration.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.algorithm"></a>Algorithm
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Algorithm">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.algorithm"></a><a class="link" href="algorithm.html" title="Algorithm">Algorithm</a>
+</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Iteration</span></dt>
 <dd><dl>
@@ -50,17 +43,10 @@
 <dt><span class="section">Metafunctions</span></dt>
 </dl></dd>
 </dl></div>
-<<<<<<< .working
-<a name="fusion.algorithm.lazy_evaluation"></a><h3>
-<a name="id535132"></a>
-      Lazy Evaluation
-    </h3>
-=======
 <a name="fusion.algorithm.lazy_evaluation"></a><h4>
-<a name="id742590"></a>
+<a name="id743066"></a>
       <a class="link" href="algorithm.html#fusion.algorithm.lazy_evaluation">Lazy Evaluation</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       Unlike MPL, Fusion
       algorithms are lazy and non sequence-type preserving. What does that mean?
@@ -72,62 +58,48 @@
       fusion algorithms are functional in nature such that algorithms are non mutating
       (no side effects). However, due to the high cost of returning full sequences
       such as vectors and lists, <span class="emphasis"><em>Views</em></span> are returned from Fusion
-      algorithms instead. For example, the transform algorithm does not actually
-      return a transformed version of the original sequence. transform returns a transform_view. This view holds a
+      algorithms instead. For example, the <a class="link" href="algorithm/transformation/functions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a> algorithm does not actually
+      return a transformed version of the original sequence. <a class="link" href="algorithm/transformation/functions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a> returns a <a class="link" href="view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a>. This view holds a
       reference to the original sequence plus the transform function. Iteration over
-      the transform_view
+      the <a class="link" href="view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a>
       will apply the transform function over the sequence elements on demand. This
       <span class="emphasis"><em>lazy</em></span> evaluation scheme allows us to chain as many algorithms
       as we want without incurring a high runtime penalty.
     </p>
-<<<<<<< .working
-<a name="fusion.algorithm.sequence_extension"></a><h3>
-<a name="id535279"></a>
-      Sequence Extension
-    </h3>
-=======
 <a name="fusion.algorithm.sequence_extension"></a><h4>
-<a name="id742667"></a>
+<a name="id743143"></a>
       <a class="link" href="algorithm.html#fusion.algorithm.sequence_extension">Sequence Extension</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
-      The <span class="emphasis"><em>lazy</em></span> evaluation scheme where Algorithms
-      return Views also allows operations such
-      as push_back to be totally generic. In
-      Fusion, push_back is actually a generic algorithm
-      that works on all sequences. Given an input sequence <tt class="computeroutput"><span class="identifier">s</span></tt>
-      and a value <tt class="computeroutput"><span class="identifier">x</span></tt>, Fusion's push_back algorithm simply returns
-      a joint_view:
-      a view that holds a reference to the original sequence <tt class="computeroutput"><span class="identifier">s</span></tt>
-      and the value <tt class="computeroutput"><span class="identifier">x</span></tt>. Functions
+      The <span class="emphasis"><em>lazy</em></span> evaluation scheme where <a class="link" href="algorithm.html" title="Algorithm">Algorithms</a>
+      return <a class="link" href="view.html" title="View">Views</a> also allows operations such
+      as <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a> to be totally generic. In
+      Fusion, <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a> is actually a generic algorithm
+      that works on all sequences. Given an input sequence <code class="computeroutput"><span class="identifier">s</span></code>
+      and a value <code class="computeroutput"><span class="identifier">x</span></code>, Fusion's <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a> algorithm simply returns
+      a <a class="link" href="view/joint_view.html" title="joint_view"><code class="computeroutput"><span class="identifier">joint_view</span></code></a>:
+      a view that holds a reference to the original sequence <code class="computeroutput"><span class="identifier">s</span></code>
+      and the value <code class="computeroutput"><span class="identifier">x</span></code>. Functions
       that were once sequence specific and need to be implemented N times over N
       different sequences are now implemented only once. That is to say that Fusion
       sequences are cheaply extensible. However, an important caveat is that the
-      result of a sequence extending operation like push_back does not retain the properties
-      of the original sequence such as associativity of set(s). To regain the original sequence,
-      Conversion functions
-      are provided. You may use one of the Conversion
+      result of a sequence extending operation like <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a> does not retain the properties
+      of the original sequence such as associativity of <a class="link" href="container/set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a>(s). To regain the original sequence,
+      <a class="link" href="container/conversion/functions.html" title="Functions">Conversion</a> functions
+      are provided. You may use one of the <a class="link" href="container/conversion/functions.html" title="Functions">Conversion</a>
       functions to convert back to the original sequence type.
     </p>
-<<<<<<< .working
-<a name="fusion.algorithm.header"></a><h3>
-<a name="id535506"></a>
-      Header
-    </h3>
-=======
 <a name="fusion.algorithm.header"></a><h4>
-<a name="id742794"></a>
+<a name="id743270"></a>
       <a class="link" href="algorithm.html#fusion.algorithm.header">Header</a>
     </h4>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Iteration</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../algorithm.html" title="Algorithm">
-<link rel="previous" href="../algorithm.html" title="Algorithm">
+<link rel="prev" href="../algorithm.html" title="Algorithm">
 <link rel="next" href="iteration/functions.html" title="Functions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../algorithm.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../algorithm.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="iteration/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.algorithm.iteration"></a>Iteration
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Iteration">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.algorithm.iteration"></a><a class="link" href="iteration.html" title="Iteration">Iteration</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Functions</span></dt>
 <dt><span class="section">Metafunctions</span></dt>
@@ -41,24 +34,17 @@
         The iteration algorithms provide the fundamental algorithms for traversing
         a sequence repeatedly applying an operation to its elements.
       </p>
-<<<<<<< .working
-<a name="fusion.algorithm.iteration.header"></a><h4>
-<a name="id535675"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.algorithm.iteration.header"></a><h5>
-<a name="id742908"></a>
+<a name="id743384"></a>
         <a class="link" href="iteration.html#fusion.algorithm.iteration.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../iteration.html" title="Iteration">
-<link rel="previous" href="../iteration.html" title="Iteration">
+<link rel="prev" href="../iteration.html" title="Iteration">
 <link rel="next" href="functions/fold.html" title="fold">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../iteration.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iteration.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="functions/fold.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.iteration.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.iteration.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">fold</span></dt>
 <dt><span class="section">accumulate</span></dt>
@@ -41,7 +34,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/accumulate.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/accumulate.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/accumulate.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>accumulate</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="fold.html" title="fold">
+<link rel="prev" href="fold.html" title="fold">
 <link rel="next" href="for_each.html" title="for_each">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,50 +22,15 @@
 <div class="spirit-nav">
 <a accesskey="p" href="fold.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="for_each.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.functions.accumulate"></a>accumulate
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="accumulate">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.functions.accumulate"></a><a class="link" href="accumulate.html" title="accumulate">accumulate</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.iteration.functions.accumulate.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id537581"></a>
-            Description
-=======
-<a name="id789366"></a>
-=======
-<a name="id751900"></a>
-=======
-<a name="id744276"></a>
-=======
-<a name="id767092"></a>
-=======
-<a name="id755686"></a>
-=======
-<a name="id752410"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id745856"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-<<<<<<< .working
-            For a sequence <tt class="computeroutput"><span class="identifier">Seq</span></tt>, initial
-            state, and binary function object or function pointer <tt class="computeroutput"><span class="identifier">f</span></tt>,
-            accumulate repeatedly applies binary <tt class="computeroutput"><span class="identifier">f</span></tt>
-            to each element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-            and the previous state.
-=======
             For a sequence <code class="computeroutput"><span class="identifier">seq</span></code>, initial
             state <code class="computeroutput"><span class="identifier">initial_state</span></code>,
             and binary function object or function pointer <code class="computeroutput"><span class="identifier">f</span></code>,
@@ -82,105 +39,46 @@
             previous <code class="computeroutput"><span class="identifier">f</span></code> invocation
             (<code class="computeroutput"><span class="identifier">inital_state</span></code> if it is
             the first call) and each element of <code class="computeroutput"><span class="identifier">seq</span></code>.
->>>>>>> .merge-right.r57125
           </p>
 <a name="fusion.algorithm.iteration.functions.accumulate.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id537658"></a>
-            Synopsis
-=======
-<a name="id789441"></a>
-=======
-<a name="id751975"></a>
-=======
-<a name="id744350"></a>
-=======
-<a name="id767166"></a>
-=======
-<a name="id755761"></a>
-=======
-<a name="id752484"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id745930"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">State</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::accumulate<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">State</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">accumulate</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/accumulate.html" title="accumulate"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">accumulate</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">State</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">accumulate</span><span class="special">(</span>
     <span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">State</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">initial_state</span><span class="special">,</span> <span class="identifier">F</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id537917"></a><p class="title"><b>Table 1.34. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id789627"></a><p class="title"><b>Table 1.34. Parameters</b></p>
-=======
-<a name="id752184"></a><p class="title"><b>Table 1.38. Parameters</b></p>
-=======
-<a name="id744560"></a><p class="title"><b>Table 1.38. Parameters</b></p>
-=======
-<a name="id767352"></a><p class="title"><b>Table&#160;1.38.&#160;Parameters</b></p>
-=======
-<a name="id755947"></a><p class="title"><b>Table&#160;1.38.&#160;Parameters</b></p>
-=======
-<a name="id752670"></a><p class="title"><b>Table&#160;1.38.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id746116"></a><p class="title"><b>Table&#160;1.38.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<<<<<<< .working
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                  Sequence</a>, <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">eN</span>
-                  <span class="special">....</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">e2</span><span class="special">,</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span><span class="identifier">initial_state</span><span class="special">)))</span></tt> must be a valid expression for
-                  each element <tt class="computeroutput"><span class="identifier">e1</span></tt>
-                  to <tt class="computeroutput"><span class="identifier">eN</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-=======
 <td>
                 <p>
                   <code class="computeroutput"><span class="identifier">seq</span></code>
@@ -197,33 +95,28 @@
                 </td>
 <td>
                 <p>
->>>>>>> .merge-right.r57125
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">initial_state</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">initial_state</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Initial state
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<<<<<<< .working
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E</span><span class="special">,</span><span class="identifier">S</span><span class="special">)&gt;::</span><span class="identifier">type</span></tt> is the return type of <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">,</span><span class="identifier">s</span><span class="special">)</span></tt>
-                  for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-                  of type <tt class="computeroutput"><span class="identifier">E</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>, and current state <tt class="computeroutput"><span class="identifier">s</span></tt> of type <tt class="computeroutput"><span class="identifier">S</span></tt>
-                </p></td>
-<td><p>
-=======
 <td>
                 <p>
                   <code class="computeroutput"><span class="identifier">f</span></code>
@@ -240,131 +133,45 @@
                 </td>
 <td>
                 <p>
->>>>>>> .merge-right.r57125
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.iteration.functions.accumulate.expression_semantics"></a><h6>
-<a name="id538367"></a>
-            <a href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.iteration.functions.accumulate.expression_semantics"></a><h6>
-<a name="id752970"></a>
+<a name="id746416"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">accumulate</span><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">initial_state</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type
+            <span class="bold"><strong>Return type</strong></span>: Any type
           </p>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Semantics</b></span>: Equivalent to <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">eN</span> <span class="special">....</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">e2</span><span class="special">,</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span><span class="identifier">initial_state</span><span class="special">)))</span></tt>
-            where <tt class="computeroutput"><span class="identifier">e1</span> <span class="special">...</span><span class="identifier">eN</span></tt> are the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
-=======
             <span class="bold"><strong>Semantics</strong></span>: Equivalent to <code class="computeroutput"><span class="identifier">f</span><span class="special">(...</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">initial_state</span><span class="special">,</span><span class="identifier">e1</span><span class="special">),</span><span class="identifier">e2</span><span class="special">)</span> <span class="special">...</span><span class="identifier">eN</span><span class="special">)</span></code> where <code class="computeroutput"><span class="identifier">e1</span>
             <span class="special">...</span><span class="identifier">eN</span></code>
             are the elements of <code class="computeroutput"><span class="identifier">seq</span></code>.
->>>>>>> .merge-right.r57125
           </p>
 <a name="fusion.algorithm.iteration.functions.accumulate.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id538575"></a>
-            Complexity
-=======
-<a name="id790624"></a>
-=======
-<a name="id752635"></a>
-=======
-<a name="id745011"></a>
-=======
-<a name="id767803"></a>
-=======
-<a name="id756398"></a>
-=======
-<a name="id753121"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id746568"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear, exactly <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> applications of <tt class="computeroutput"><span class="identifier">f</span></tt>.
+            Linear, exactly <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> applications of <code class="computeroutput"><span class="identifier">f</span></code>.
           </p>
 <a name="fusion.algorithm.iteration.functions.accumulate.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id538669"></a>
-            Header
-=======
-<a name="id790684"></a>
-=======
-<a name="id752695"></a>
-=======
-<a name="id745071"></a>
-=======
-<a name="id767863"></a>
-=======
-<a name="id756458"></a>
-=======
-<a name="id753181"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id746628"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">accumulate</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">accumulate</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.iteration.functions.accumulate.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id538836"></a>
-            Example
-=======
-<a name="id790800"></a>
-=======
-<a name="id752811"></a>
-=======
-<a name="id745186"></a>
-=======
-<a name="id767978"></a>
-=======
-<a name="id756573"></a>
-=======
-<a name="id753296"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id746743"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.functions.accumulate.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">make_string</span>
 <span class="special">{</span>
@@ -377,8 +184,8 @@
     <span class="special">}</span>
 <span class="special">};</span>
 <span class="special">...</span>
-<span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>accumulate<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="string">""</span><span class="special">),</span> <span class="identifier">make_string</span><span class="special">())</span> <span class="special">==</span> <span class="string">"12"</span><span class="special">);</span>
+<span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="accumulate.html" title="accumulate"><code class="computeroutput"><span class="identifier">accumulate</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">,</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="string">""</span><span class="special">),</span> <span class="identifier">make_string</span><span class="special">())</span> <span class="special">==</span> <span class="string">"12"</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/fold.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/fold.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/fold.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>fold</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="../functions.html" title="Functions">
+<link rel="prev" href="../functions.html" title="Functions">
 <link rel="next" href="accumulate.html" title="accumulate">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,154 +22,60 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../functions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="accumulate.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.functions.fold"></a>fold
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="fold">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.functions.fold"></a><a class="link" href="fold.html" title="fold">fold</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.iteration.functions.fold.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id535870"></a>
-            Description
-=======
-<a name="id788125"></a>
-=======
-<a name="id750659"></a>
-=======
-<a name="id743035"></a>
-=======
-<a name="id765839"></a>
-=======
-<a name="id753341"></a>
-=======
-<a name="id750065"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id743511"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-<<<<<<< .working
-            For a sequence <tt class="computeroutput"><span class="identifier">Seq</span></tt>, initial
-            state, and binary function object or function pointer <tt class="computeroutput"><span class="identifier">f</span></tt>,
-            fold repeatedly applies binary <tt class="computeroutput"><span class="identifier">f</span></tt>
-            to each element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-            and the previous state.
-=======
             For a sequence <code class="computeroutput"><span class="identifier">seq</span></code>, initial
             state <code class="computeroutput"><span class="identifier">initial_state</span></code>,
             and binary function object or function pointer <code class="computeroutput"><span class="identifier">f</span></code>,
             fold returns the result of the repeated application of binary <code class="computeroutput"><span class="identifier">f</span></code> to the result of the previous <code class="computeroutput"><span class="identifier">f</span></code> invocation (<code class="computeroutput"><span class="identifier">inital_state</span></code>
             if it is the first call) and each element of <code class="computeroutput"><span class="identifier">seq</span></code>.
->>>>>>> .merge-right.r57125
           </p>
 <a name="fusion.algorithm.iteration.functions.fold.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id535948"></a>
-            Synopsis
-=======
-<a name="id788195"></a>
-=======
-<a name="id750729"></a>
-=======
-<a name="id743105"></a>
-=======
-<a name="id765908"></a>
-=======
-<a name="id753411"></a>
-=======
-<a name="id750134"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id743581"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">State</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::fold<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">State</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">fold</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/fold.html" title="fold"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">fold</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">State</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">fold</span><span class="special">(</span>
     <span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">State</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">initial_state</span><span class="special">,</span> <span class="identifier">F</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id536204"></a><p class="title"><b>Table 1.33. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id788379"></a><p class="title"><b>Table 1.33. Parameters</b></p>
-=======
-<a name="id750913"></a><p class="title"><b>Table 1.37. Parameters</b></p>
-=======
-<a name="id743288"></a><p class="title"><b>Table 1.37. Parameters</b></p>
-=======
-<a name="id766092"></a><p class="title"><b>Table&#160;1.37.&#160;Parameters</b></p>
-=======
-<a name="id753595"></a><p class="title"><b>Table&#160;1.37.&#160;Parameters</b></p>
-=======
-<a name="id750318"></a><p class="title"><b>Table&#160;1.37.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id743764"></a><p class="title"><b>Table&#160;1.37.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<<<<<<< .working
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                  Sequence</a>,<tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">,</span><span class="identifier">s</span><span class="special">)</span></tt> must be a valid expression for
-                  each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-                  in <tt class="computeroutput"><span class="identifier">seq</span></tt>, and current
-                  state <tt class="computeroutput"><span class="identifier">s</span></tt>
-                </p></td>
-<td><p>
-=======
 <td>
                 <p>
                   <code class="computeroutput"><span class="identifier">seq</span></code>
@@ -194,33 +92,28 @@
                 </td>
 <td>
                 <p>
->>>>>>> .merge-right.r57125
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">initial_state</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">initial_state</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Initial state
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<<<<<<< .working
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E</span><span class="special">,</span><span class="identifier">S</span><span class="special">)&gt;::</span><span class="identifier">type</span></tt> is the return type of <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">,</span><span class="identifier">s</span><span class="special">)</span></tt>
-                  for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-                  of type <tt class="computeroutput"><span class="identifier">E</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>, and current state <tt class="computeroutput"><span class="identifier">s</span></tt> of type <tt class="computeroutput"><span class="identifier">S</span></tt>
-                </p></td>
-<td><p>
-=======
 <td>
                 <p>
                   <code class="computeroutput"><span class="identifier">f</span></code>
@@ -237,131 +130,45 @@
                 </td>
 <td>
                 <p>
->>>>>>> .merge-right.r57125
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.iteration.functions.fold.expression_semantics"></a><h6>
-<a name="id536612"></a>
-            <a href="fold.html#fusion.algorithm.iteration.functions.fold.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.iteration.functions.fold.expression_semantics"></a><h6>
-<a name="id750620"></a>
+<a name="id744067"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">fold</span><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">initial_state</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type
+            <span class="bold"><strong>Return type</strong></span>: Any type
           </p>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Semantics</b></span>: Equivalent to <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">eN</span> <span class="special">....</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">e2</span><span class="special">,</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span><span class="identifier">initial_state</span><span class="special">)))</span></tt>
-            where <tt class="computeroutput"><span class="identifier">e1</span> <span class="special">...</span><span class="identifier">eN</span></tt> are the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
-=======
             <span class="bold"><strong>Semantics</strong></span>: Equivalent to <code class="computeroutput"><span class="identifier">f</span><span class="special">(...</span> <span class="identifier">f</span><span class="special">(</span><span class="identifier">f</span><span class="special">(</span><span class="identifier">initial_state</span><span class="special">,</span><span class="identifier">e1</span><span class="special">),</span><span class="identifier">e2</span><span class="special">)</span> <span class="special">...</span><span class="identifier">eN</span><span class="special">)</span></code> where <code class="computeroutput"><span class="identifier">e1</span>
             <span class="special">...</span><span class="identifier">eN</span></code>
             are the elements of <code class="computeroutput"><span class="identifier">seq</span></code>.
->>>>>>> .merge-right.r57125
           </p>
 <a name="fusion.algorithm.iteration.functions.fold.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id536820"></a>
-            Complexity
-=======
-<a name="id788832"></a>
-=======
-<a name="id751366"></a>
-=======
-<a name="id743742"></a>
-=======
-<a name="id766546"></a>
-=======
-<a name="id754048"></a>
-=======
-<a name="id750771"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id744218"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear, exactly <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> applications of <tt class="computeroutput"><span class="identifier">f</span></tt>.
+            Linear, exactly <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> applications of <code class="computeroutput"><span class="identifier">f</span></code>.
           </p>
 <a name="fusion.algorithm.iteration.functions.fold.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id536913"></a>
-            Header
-=======
-<a name="id788890"></a>
-=======
-<a name="id751424"></a>
-=======
-<a name="id743800"></a>
-=======
-<a name="id766603"></a>
-=======
-<a name="id754106"></a>
-=======
-<a name="id750829"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id744275"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">fold</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">fold</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.iteration.functions.fold.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id537079"></a>
-            Example
-=======
-<a name="id789005"></a>
-=======
-<a name="id751539"></a>
-=======
-<a name="id743915"></a>
-=======
-<a name="id766718"></a>
-=======
-<a name="id754221"></a>
-=======
-<a name="id750944"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id744391"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.functions.fold.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">make_string</span>
 <span class="special">{</span>
@@ -374,8 +181,8 @@
     <span class="special">}</span>
 <span class="special">};</span>
 <span class="special">...</span>
-<span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>fold<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="string">""</span><span class="special">),</span> <span class="identifier">make_string</span><span class="special">())</span> <span class="special">==</span> <span class="string">"12"</span><span class="special">);</span>
+<span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="fold.html" title="fold"><code class="computeroutput"><span class="identifier">fold</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">,</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="string">""</span><span class="special">),</span> <span class="identifier">make_string</span><span class="special">())</span> <span class="special">==</span> <span class="string">"12"</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/for_each.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/for_each.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/functions/for_each.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>for_each</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="accumulate.html" title="accumulate">
+<link rel="prev" href="accumulate.html" title="accumulate">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,269 +22,126 @@
 <div class="spirit-nav">
 <a accesskey="p" href="accumulate.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.functions.for_each"></a>for_each
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="for_each">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.functions.for_each"></a><a class="link" href="for_each.html" title="for_each">for_each</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.iteration.functions.for_each.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id539334"></a>
-            Description
-=======
-<a name="id791161"></a>
-=======
-<a name="id753172"></a>
-=======
-<a name="id745548"></a>
-=======
-<a name="id768340"></a>
-=======
-<a name="id756934"></a>
-=======
-<a name="id753658"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id747104"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Applies a unary function object to each element of a sequence.
           </p>
 <a name="fusion.algorithm.iteration.functions.for_each.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id539364"></a>
-            Synopsis
-=======
-<a name="id791180"></a>
-=======
-<a name="id753191"></a>
-=======
-<a name="id745567"></a>
-=======
-<a name="id768359"></a>
-=======
-<a name="id756954"></a>
-=======
-<a name="id753677"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id747123"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::for_each<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">for_each</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">for_each</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">for_each</span><span class="special">(</span>
     <span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id539564"></a><p class="title"><b>Table 1.35. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id791320"></a><p class="title"><b>Table 1.35. Parameters</b></p>
-=======
-<a name="id753331"></a><p class="title"><b>Table 1.39. Parameters</b></p>
-=======
-<a name="id745707"></a><p class="title"><b>Table 1.39. Parameters</b></p>
-=======
-<a name="id768499"></a><p class="title"><b>Table&#160;1.39.&#160;Parameters</b></p>
-=======
-<a name="id757094"></a><p class="title"><b>Table&#160;1.39.&#160;Parameters</b></p>
-=======
-<a name="id753817"></a><p class="title"><b>Table&#160;1.39.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id747264"></a><p class="title"><b>Table&#160;1.39.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                  Sequence</a>, <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> must be a valid expression for
-                  each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-                  in <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                  Sequence</a>, <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> must be a valid expression for
+                  each element <code class="computeroutput"><span class="identifier">e</span></code>
+                  in <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
-                  A unary <a href="../../../functional/concepts/reg_callable.html" title=" Regular Callable
-        Object">Regular
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A unary <a class="link" href="../../../functional/concepts/reg_callable.html" title="Regular Callable Object">Regular
                   Callable Object</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.iteration.functions.for_each.expression_semantics"></a><h6>
-<a name="id539763"></a>
-            <a href="for_each.html#fusion.algorithm.iteration.functions.for_each.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.iteration.functions.for_each.expression_semantics"></a><h6>
-<a name="id753970"></a>
+<a name="id747416"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">for_each<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">void</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">void</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Calls <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-            in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Calls <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> for each element <code class="computeroutput"><span class="identifier">e</span></code>
+            in <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.iteration.functions.for_each.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id539918"></a>
-            Complexity
-=======
-<a name="id791577"></a>
-=======
-<a name="id753588"></a>
-=======
-<a name="id745964"></a>
-=======
-<a name="id768756"></a>
-=======
-<a name="id757351"></a>
-=======
-<a name="id754074"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id747520"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear, exactly <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> applications of <tt class="computeroutput"><span class="identifier">f</span></tt>.
+            Linear, exactly <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> applications of <code class="computeroutput"><span class="identifier">f</span></code>.
           </p>
 <a name="fusion.algorithm.iteration.functions.for_each.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id540012"></a>
-            Header
-=======
-<a name="id791637"></a>
-=======
-<a name="id753648"></a>
-=======
-<a name="id746024"></a>
-=======
-<a name="id768816"></a>
-=======
-<a name="id757411"></a>
-=======
-<a name="id754134"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id747580"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">for_each</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">for_each</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.iteration.functions.for_each.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id540179"></a>
-            Example
-=======
-<a name="id791752"></a>
-=======
-<a name="id753763"></a>
-=======
-<a name="id746139"></a>
-=======
-<a name="id768931"></a>
-=======
-<a name="id757526"></a>
-=======
-<a name="id754249"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id747696"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.functions.for_each.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">increment</span>
 <span class="special">{</span>
@@ -303,9 +152,9 @@
     <span class="special">}</span>
 <span class="special">};</span>
 <span class="special">...</span>
-vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
-for_each<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> <span class="identifier">increment</span><span class="special">());</span>
-<span class="identifier">assert</span><span class="special">(</span><span class="identifier">vec</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">));</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
+<a class="link" href="for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> <span class="identifier">increment</span><span class="special">());</span>
+<span class="identifier">assert</span><span class="special">(</span><span class="identifier">vec</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Metafunctions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../iteration.html" title="Iteration">
-<link rel="previous" href="functions/for_each.html" title="for_each">
+<link rel="prev" href="functions/for_each.html" title="for_each">
 <link rel="next" href="metafunctions/fold.html" title="fold">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="functions/for_each.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iteration.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="metafunctions/fold.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.iteration.metafunctions"></a>Metafunctions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Metafunctions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.iteration.metafunctions"></a><a class="link" href="metafunctions.html" title="Metafunctions">Metafunctions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">fold</span></dt>
 <dt><span class="section">accumulate</span></dt>
@@ -41,7 +34,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>accumulate</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="fold.html" title="fold">
+<link rel="prev" href="fold.html" title="fold">
 <link rel="next" href="for_each.html" title="for_each">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="fold.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="for_each.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.metafunctions.accumulate"></a>accumulate
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="accumulate">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.metafunctions.accumulate"></a><a class="link" href="accumulate.html" title="accumulate">accumulate</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.iteration.metafunctions.accumulate.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id541535"></a>
-            Description
-=======
-<a name="id793250"></a>
-=======
-<a name="id755807"></a>
-=======
-<a name="id748182"></a>
-=======
-<a name="id769882"></a>
-=======
-<a name="id758477"></a>
-=======
-<a name="id755200"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id748646"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of accumulate.
+            Returns the result type of <a class="link" href="../functions/accumulate.html" title="accumulate"><code class="computeroutput"><span class="identifier">accumulate</span></code></a>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.accumulate.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id541582"></a>
-            Synopsis
-=======
-<a name="id793281"></a>
-=======
-<a name="id755838"></a>
-=======
-<a name="id748214"></a>
-=======
-<a name="id769913"></a>
-=======
-<a name="id758508"></a>
-=======
-<a name="id755231"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id748678"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -108,86 +47,67 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id541715"></a><p class="title"><b>Table 1.37. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id793380"></a><p class="title"><b>Table 1.37. Parameters</b></p>
-=======
-<a name="id755937"></a><p class="title"><b>Table 1.41. Parameters</b></p>
-=======
-<a name="id748313"></a><p class="title"><b>Table 1.41. Parameters</b></p>
-=======
-<a name="id770013"></a><p class="title"><b>Table&#160;1.41.&#160;Parameters</b></p>
-=======
-<a name="id758608"></a><p class="title"><b>Table&#160;1.41.&#160;Parameters</b></p>
-=======
-<a name="id755331"></a><p class="title"><b>Table&#160;1.41.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id748777"></a><p class="title"><b>Table&#160;1.41.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The sequence to iterate
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">State</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">State</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
-                  The initial state for the first application of <tt class="computeroutput"><span class="identifier">F</span></tt>
-                </p></td>
+                </p>
+                </td>
+<td>
+                <p>
+                  The initial state for the first application of <code class="computeroutput"><span class="identifier">F</span></code>
+                </p>
+                </td>
 </tr>
 <tr>
-<<<<<<< .working
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">F</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E</span><span class="special">,</span><span class="identifier">S</span><span class="special">)&gt;::</span><span class="identifier">type</span></tt> is the return type of <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">,</span><span class="identifier">s</span><span class="special">)</span></tt>
-                  for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-                  of type <tt class="computeroutput"><span class="identifier">E</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>, and current state <tt class="computeroutput"><span class="identifier">s</span></tt> of type <tt class="computeroutput"><span class="identifier">S</span></tt>
-                </p></td>
-<td><p>
-=======
 <td>
                 <p>
                   <code class="computeroutput"><span class="identifier">F</span></code>
@@ -204,96 +124,40 @@
                 </td>
 <td>
                 <p>
->>>>>>> .merge-right.r57125
                   The operation to be applied on forward traversal
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.iteration.metafunctions.accumulate.expression_semantics"></a><h6>
-<a name="id542066"></a>
-            <a href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.iteration.metafunctions.accumulate.expression_semantics"></a><h6>
-<a name="id755590"></a>
+<a name="id749036"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::accumulate<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">State</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="accumulate.html" title="accumulate"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">accumulate</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">State</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type
+            <span class="bold"><strong>Return type</strong></span>: Any type
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the result of applying
-            <tt class="computeroutput"><span class="identifier">accumulate</span></tt> to a sequence
-            of type <tt class="computeroutput"><span class="identifier">Sequence</span></tt>, with
-            an initial state of type <tt class="computeroutput"><span class="identifier">State</span></tt>
-            and binary function object or function pointer of type <tt class="computeroutput"><span class="identifier">F</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the result of applying
+            <code class="computeroutput"><span class="identifier">accumulate</span></code> to a sequence
+            of type <code class="computeroutput"><span class="identifier">Sequence</span></code>, with
+            an initial state of type <code class="computeroutput"><span class="identifier">State</span></code>
+            and binary function object or function pointer of type <code class="computeroutput"><span class="identifier">F</span></code>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.accumulate.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id542240"></a>
-            Complexity
-=======
-<a name="id793752"></a>
-=======
-<a name="id756309"></a>
-=======
-<a name="id748685"></a>
-=======
-<a name="id770385"></a>
-=======
-<a name="id758980"></a>
-=======
-<a name="id755703"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id749149"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear, exactly <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> applications of <tt class="computeroutput"><span class="identifier">F</span></tt>.
+            Linear, exactly <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> applications of <code class="computeroutput"><span class="identifier">F</span></code>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.accumulate.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id542334"></a>
-            Header
-=======
-<a name="id793815"></a>
-=======
-<a name="id756372"></a>
-=======
-<a name="id748748"></a>
-=======
-<a name="id770447"></a>
-=======
-<a name="id759042"></a>
-=======
-<a name="id755765"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id749212"></a>
             <a class="link" href="accumulate.html#fusion.algorithm.iteration.metafunctions.accumulate.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">accumulate</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">accumulate</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/fold.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/fold.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/fold.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>fold</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="../metafunctions.html" title="Metafunctions">
+<link rel="prev" href="../metafunctions.html" title="Metafunctions">
 <link rel="next" href="accumulate.html" title="accumulate">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="accumulate.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.metafunctions.fold"></a>fold
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="fold">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.metafunctions.fold"></a><a class="link" href="fold.html" title="fold">fold</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.iteration.metafunctions.fold.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id540554"></a>
-            Description
-=======
-<a name="id792016"></a>
-=======
-<a name="id754027"></a>
-=======
-<a name="id746403"></a>
-=======
-<a name="id769195"></a>
-=======
-<a name="id757790"></a>
-=======
-<a name="id754513"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id747960"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of fold.
+            Returns the result type of <a class="link" href="../functions/fold.html" title="fold"><code class="computeroutput"><span class="identifier">fold</span></code></a>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.fold.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id540601"></a>
-            Synopsis
-=======
-<a name="id792045"></a>
-=======
-<a name="id754056"></a>
-=======
-<a name="id746432"></a>
-=======
-<a name="id769224"></a>
-=======
-<a name="id757819"></a>
-=======
-<a name="id754542"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id747989"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -108,86 +47,67 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id540735"></a><p class="title"><b>Table 1.36. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id792142"></a><p class="title"><b>Table 1.36. Parameters</b></p>
-=======
-<a name="id754153"></a><p class="title"><b>Table 1.40. Parameters</b></p>
-=======
-<a name="id746529"></a><p class="title"><b>Table 1.40. Parameters</b></p>
-=======
-<a name="id769322"></a><p class="title"><b>Table&#160;1.40.&#160;Parameters</b></p>
-=======
-<a name="id757916"></a><p class="title"><b>Table&#160;1.40.&#160;Parameters</b></p>
-=======
-<a name="id754640"></a><p class="title"><b>Table&#160;1.40.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id748086"></a><p class="title"><b>Table&#160;1.40.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The sequence to iterate
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">State</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">State</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
-                  The initial state for the first application of <tt class="computeroutput"><span class="identifier">F</span></tt>
-                </p></td>
+                </p>
+                </td>
+<td>
+                <p>
+                  The initial state for the first application of <code class="computeroutput"><span class="identifier">F</span></code>
+                </p>
+                </td>
 </tr>
 <tr>
-<<<<<<< .working
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">F</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E</span><span class="special">,</span><span class="identifier">S</span><span class="special">)&gt;::</span><span class="identifier">type</span></tt> is the return type of <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">,</span><span class="identifier">s</span><span class="special">)</span></tt>
-                  for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-                  of type <tt class="computeroutput"><span class="identifier">E</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>, and current state <tt class="computeroutput"><span class="identifier">s</span></tt> of type <tt class="computeroutput"><span class="identifier">S</span></tt>
-                </p></td>
-<td><p>
-=======
 <td>
                 <p>
                   <code class="computeroutput"><span class="identifier">F</span></code>
@@ -204,96 +124,40 @@
                 </td>
 <td>
                 <p>
->>>>>>> .merge-right.r57125
                   The operation to be applied on forward traversal
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.iteration.metafunctions.fold.expression_semantics"></a><h6>
-<a name="id541084"></a>
-            <a href="fold.html#fusion.algorithm.iteration.metafunctions.fold.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.iteration.metafunctions.fold.expression_semantics"></a><h6>
-<a name="id754899"></a>
+<a name="id748345"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::fold<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">State</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="fold.html" title="fold"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">fold</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">State</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type
+            <span class="bold"><strong>Return type</strong></span>: Any type
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the result of applying
-            <tt class="computeroutput"><span class="identifier">fold</span></tt> to a sequence of
-            type <tt class="computeroutput"><span class="identifier">Sequence</span></tt>, with an
-            initial state of type <tt class="computeroutput"><span class="identifier">State</span></tt>
-            and binary function object or function pointer of type <tt class="computeroutput"><span class="identifier">F</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the result of applying
+            <code class="computeroutput"><span class="identifier">fold</span></code> to a sequence of
+            type <code class="computeroutput"><span class="identifier">Sequence</span></code>, with an
+            initial state of type <code class="computeroutput"><span class="identifier">State</span></code>
+            and binary function object or function pointer of type <code class="computeroutput"><span class="identifier">F</span></code>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.fold.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id541254"></a>
-            Complexity
-=======
-<a name="id793061"></a>
-=======
-<a name="id755618"></a>
-=======
-<a name="id747994"></a>
-=======
-<a name="id769694"></a>
-=======
-<a name="id758288"></a>
-=======
-<a name="id755012"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id748458"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear, exactly <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> applications of <tt class="computeroutput"><span class="identifier">F</span></tt>.
+            Linear, exactly <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> applications of <code class="computeroutput"><span class="identifier">F</span></code>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.fold.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id541349"></a>
-            Header
-=======
-<a name="id793121"></a>
-=======
-<a name="id755678"></a>
-=======
-<a name="id748054"></a>
-=======
-<a name="id769754"></a>
-=======
-<a name="id758348"></a>
-=======
-<a name="id755072"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id748518"></a>
             <a class="link" href="fold.html#fusion.algorithm.iteration.metafunctions.fold.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">fold</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">fold</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>for_each</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="accumulate.html" title="accumulate">
+<link rel="prev" href="accumulate.html" title="accumulate">
 <link rel="next" href="../../query.html" title="Query">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="accumulate.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../query.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.iteration.metafunctions.for_each"></a>for_each
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="for_each">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.iteration.metafunctions.for_each"></a><a class="link" href="for_each.html" title="for_each">for_each</a>
+</h5></div></div></div>
 <p>
-            A metafunction returning the result type of applying for_each to a sequence. The
-            return type of for_each is always <tt class="computeroutput"><span class="keyword">void</span></tt>.
+            A metafunction returning the result type of applying <a class="link" href="../functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a> to a sequence. The
+            return type of <a class="link" href="../functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a> is always <code class="computeroutput"><span class="keyword">void</span></code>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.for_each.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id542575"></a>
-            Description
-=======
-<a name="id793976"></a>
-=======
-<a name="id756533"></a>
-=======
-<a name="id748908"></a>
-=======
-<a name="id770608"></a>
-=======
-<a name="id759203"></a>
-=======
-<a name="id755926"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id749372"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <a name="fusion.algorithm.iteration.metafunctions.for_each.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id542600"></a>
-            Synopsis
-=======
-<a name="id793994"></a>
-=======
-<a name="id756551"></a>
-=======
-<a name="id748926"></a>
-=======
-<a name="id770626"></a>
-=======
-<a name="id759221"></a>
-=======
-<a name="id755944"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id749390"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -109,160 +48,96 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id542720"></a><p class="title"><b>Table 1.38. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id794082"></a><p class="title"><b>Table 1.38. Parameters</b></p>
-=======
-<a name="id756639"></a><p class="title"><b>Table 1.42. Parameters</b></p>
-=======
-<a name="id749015"></a><p class="title"><b>Table 1.42. Parameters</b></p>
-=======
-<a name="id770715"></a><p class="title"><b>Table&#160;1.42.&#160;Parameters</b></p>
-=======
-<a name="id759310"></a><p class="title"><b>Table&#160;1.42.&#160;Parameters</b></p>
-=======
-<a name="id756033"></a><p class="title"><b>Table&#160;1.42.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id749479"></a><p class="title"><b>Table&#160;1.42.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">F</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">F</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.iteration.metafunctions.for_each.expression_semantics"></a><h6>
-<a name="id542860"></a>
-            <a href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.iteration.metafunctions.for_each.expression_semantics"></a><h6>
-<a name="id756147"></a>
+<a name="id749593"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::for_each<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">for_each</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">void</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">void</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the return type of
-            for_each for a sequence of type
-            <tt class="computeroutput"><span class="identifier">Sequence</span></tt> and a unary
-            function object <tt class="computeroutput"><span class="identifier">F</span></tt>. The
-            return type is always <tt class="computeroutput"><span class="keyword">void</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the return type of
+            <a class="link" href="../functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a> for a sequence of type
+            <code class="computeroutput"><span class="identifier">Sequence</span></code> and a unary
+            function object <code class="computeroutput"><span class="identifier">F</span></code>. The
+            return type is always <code class="computeroutput"><span class="keyword">void</span></code>.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.for_each.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id543040"></a>
-            Complexity
-=======
-<a name="id794310"></a>
-=======
-<a name="id756867"></a>
-=======
-<a name="id749243"></a>
-=======
-<a name="id770943"></a>
-=======
-<a name="id759538"></a>
-=======
-<a name="id756261"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id749707"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.iteration.metafunctions.for_each.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id543069"></a>
-            Header
-=======
-<a name="id794332"></a>
-=======
-<a name="id756889"></a>
-=======
-<a name="id749265"></a>
-=======
-<a name="id770964"></a>
-=======
-<a name="id759559"></a>
-=======
-<a name="id756282"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id749729"></a>
             <a class="link" href="for_each.html#fusion.algorithm.iteration.metafunctions.for_each.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">iteration</span><span class="special">/</span><span class="identifier">for_each</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">for_each</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Query</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../algorithm.html" title="Algorithm">
-<link rel="previous" href="iteration/metafunctions/for_each.html" title="for_each">
+<link rel="prev" href="iteration/metafunctions/for_each.html" title="for_each">
 <link rel="next" href="query/functions.html" title="Functions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="iteration/metafunctions/for_each.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../algorithm.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="query/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.algorithm.query"></a>Query
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Query">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.algorithm.query"></a><a class="link" href="query.html" title="Query">Query</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Functions</span></dt>
 <dt><span class="section">Metafunctions</span></dt>
@@ -40,24 +33,17 @@
 <p>
         The query algorithms provide support for searching and analyzing sequences.
       </p>
-<<<<<<< .working
-<a name="fusion.algorithm.query.header"></a><h4>
-<a name="id543262"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.algorithm.query.header"></a><h5>
-<a name="id749399"></a>
+<a name="id749863"></a>
         <a class="link" href="query.html#fusion.algorithm.query.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">query</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../query.html" title="Query">
-<link rel="previous" href="../query.html" title="Query">
+<link rel="prev" href="../query.html" title="Query">
 <link rel="next" href="functions/any.html" title="any">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../query.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../query.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="functions/any.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.query.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.query.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">any</span></dt>
 <dt><span class="section">all</span></dt>
@@ -45,7 +38,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/all.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/all.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/all.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>all</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="any.html" title="any">
+<link rel="prev" href="any.html" title="any">
 <link rel="next" href="none.html" title="none">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,273 +22,131 @@
 <div class="spirit-nav">
 <a accesskey="p" href="any.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="none.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.all"></a>all
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="all">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.all"></a><a class="link" href="all.html" title="all">all</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.functions.all.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id545520"></a>
-            Description
-=======
-<a name="id796555"></a>
-=======
-<a name="id758293"></a>
-=======
-<a name="id750669"></a>
-=======
-<a name="id773256"></a>
-=======
-<a name="id761782"></a>
-=======
-<a name="id758506"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id751952"></a>
             <a class="link" href="all.html#fusion.algorithm.query.functions.all.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            For a sequence <tt class="computeroutput"><span class="identifier">seq</span></tt> and
-            unary function object <tt class="computeroutput"><span class="identifier">f</span></tt>,
-            <tt class="computeroutput"><span class="identifier">all</span></tt> returns true if
-            <tt class="computeroutput"><span class="identifier">f</span></tt> returns true for every
-            element of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            For a sequence <code class="computeroutput"><span class="identifier">seq</span></code> and
+            unary function object <code class="computeroutput"><span class="identifier">f</span></code>,
+            <code class="computeroutput"><span class="identifier">all</span></code> returns true if
+            <code class="computeroutput"><span class="identifier">f</span></code> returns true for every
+            element of <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.query.functions.all.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id353686"></a>
-            Synopsis
-=======
-<a name="id796608"></a>
-=======
-<a name="id758346"></a>
-=======
-<a name="id750722"></a>
-=======
-<a name="id773309"></a>
-=======
-<a name="id761835"></a>
-=======
-<a name="id758558"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id752005"></a>
             <a class="link" href="all.html#fusion.algorithm.query.functions.all.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::all<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">all</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/all.html" title="all"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">all</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">all</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id546380"></a><p class="title"><b>Table 1.40. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id796744"></a><p class="title"><b>Table 1.40. Parameters</b></p>
-=======
-<a name="id758481"></a><p class="title"><b>Table 1.44. Parameters</b></p>
-=======
-<a name="id750857"></a><p class="title"><b>Table 1.44. Parameters</b></p>
-=======
-<a name="id773444"></a><p class="title"><b>Table&#160;1.44.&#160;Parameters</b></p>
-=======
-<a name="id761971"></a><p class="title"><b>Table&#160;1.44.&#160;Parameters</b></p>
-=======
-<a name="id758694"></a><p class="title"><b>Table&#160;1.44.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id752140"></a><p class="title"><b>Table&#160;1.44.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                  Sequence</a>, <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> is a valid expression, convertible
-                  to <tt class="computeroutput"><span class="keyword">bool</span></tt>, for every
-                  element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                  Sequence</a>, <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> is a valid expression, convertible
+                  to <code class="computeroutput"><span class="keyword">bool</span></code>, for every
+                  element <code class="computeroutput"><span class="identifier">e</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   The sequence to search
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A unary function object
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The search predicate
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.functions.all.expression_semantics"></a><h6>
-<a name="id546567"></a>
-            <a href="all.html#fusion.algorithm.query.functions.all.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.functions.all.expression_semantics"></a><h6>
-<a name="id758852"></a>
+<a name="id752299"></a>
             <a class="link" href="all.html#fusion.algorithm.query.functions.all.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">all<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="all.html" title="all"><code class="computeroutput"><span class="identifier">all</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns true if and only
-            if <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt>
-            evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt> for every
-            element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns true if and only
+            if <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code>
+            evaluates to <code class="computeroutput"><span class="keyword">true</span></code> for every
+            element <code class="computeroutput"><span class="identifier">e</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.query.functions.all.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id546716"></a>
-            Complexity
-=======
-<a name="id797014"></a>
-=======
-<a name="id758751"></a>
-=======
-<a name="id751127"></a>
-=======
-<a name="id773714"></a>
-=======
-<a name="id762241"></a>
-=======
-<a name="id758964"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id752410"></a>
             <a class="link" href="all.html#fusion.algorithm.query.functions.all.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
+            Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.all.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id546786"></a>
-            Header
-=======
-<a name="id797064"></a>
-=======
-<a name="id758802"></a>
-=======
-<a name="id751178"></a>
-=======
-<a name="id773765"></a>
-=======
-<a name="id762291"></a>
-=======
-<a name="id759014"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id752461"></a>
             <a class="link" href="all.html#fusion.algorithm.query.functions.all.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">all</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">all</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.all.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id546934"></a>
-            Example
-=======
-<a name="id797179"></a>
-=======
-<a name="id758917"></a>
-=======
-<a name="id751293"></a>
-=======
-<a name="id773880"></a>
-=======
-<a name="id762406"></a>
-=======
-<a name="id759130"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id752576"></a>
             <a class="link" href="all.html#fusion.algorithm.query.functions.all.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">odd</span>
 <span class="special">{</span>
@@ -307,8 +157,8 @@
     <span class="special">}</span>
 <span class="special">};</span>
 <span class="special">...</span>
-<span class="identifier">assert</span><span class="special">(</span>all<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">3</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
-<span class="identifier">assert</span><span class="special">(!</span>all<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="all.html" title="all"><code class="computeroutput"><span class="identifier">all</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">3</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
+<span class="identifier">assert</span><span class="special">(!</span><a class="link" href="all.html" title="all"><code class="computeroutput"><span class="identifier">all</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/any.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/any.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/any.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>any</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="../functions.html" title="Functions">
+<link rel="prev" href="../functions.html" title="Functions">
 <link rel="next" href="all.html" title="all">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,273 +22,131 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../functions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="all.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.any"></a>any
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="any">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.any"></a><a class="link" href="any.html" title="any">any</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.functions.any.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id543456"></a>
-            Description
-=======
-<a name="id794594"></a>
-=======
-<a name="id757151"></a>
-=======
-<a name="id749526"></a>
-=======
-<a name="id771226"></a>
-=======
-<a name="id759821"></a>
-=======
-<a name="id756544"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id749990"></a>
             <a class="link" href="any.html#fusion.algorithm.query.functions.any.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            For a sequence <tt class="computeroutput"><span class="identifier">seq</span></tt> and
-            unary function object <tt class="computeroutput"><span class="identifier">f</span></tt>,
-            <tt class="computeroutput"><span class="identifier">any</span></tt> returns true if
-            <tt class="computeroutput"><span class="identifier">f</span></tt> returns true for at
-            least one element of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            For a sequence <code class="computeroutput"><span class="identifier">seq</span></code> and
+            unary function object <code class="computeroutput"><span class="identifier">f</span></code>,
+            <code class="computeroutput"><span class="identifier">any</span></code> returns true if
+            <code class="computeroutput"><span class="identifier">f</span></code> returns true for at
+            least one element of <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.query.functions.any.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id543543"></a>
-            Synopsis
-=======
-<a name="id794646"></a>
-=======
-<a name="id757203"></a>
-=======
-<a name="id749579"></a>
-=======
-<a name="id771279"></a>
-=======
-<a name="id759874"></a>
-=======
-<a name="id756597"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id750043"></a>
             <a class="link" href="any.html#fusion.algorithm.query.functions.any.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::any<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">any</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/any.html" title="any"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">any</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">any</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id543734"></a><p class="title"><b>Table 1.39. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id794782"></a><p class="title"><b>Table 1.39. Parameters</b></p>
-=======
-<a name="id757339"></a><p class="title"><b>Table 1.43. Parameters</b></p>
-=======
-<a name="id749715"></a><p class="title"><b>Table 1.43. Parameters</b></p>
-=======
-<a name="id771414"></a><p class="title"><b>Table&#160;1.43.&#160;Parameters</b></p>
-=======
-<a name="id761102"></a><p class="title"><b>Table&#160;1.43.&#160;Parameters</b></p>
-=======
-<a name="id757825"></a><p class="title"><b>Table&#160;1.43.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id751272"></a><p class="title"><b>Table&#160;1.43.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                  Sequence</a>, <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> must be a valid expression, convertible
-                  to <tt class="computeroutput"><span class="keyword">bool</span></tt>, for each
-                  element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                  Sequence</a>, <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> must be a valid expression, convertible
+                  to <code class="computeroutput"><span class="keyword">bool</span></code>, for each
+                  element <code class="computeroutput"><span class="identifier">e</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   The sequence to search
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A unary function object
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The search predicate
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.functions.any.expression_semantics"></a><h6>
-<a name="id543934"></a>
-            <a href="any.html#fusion.algorithm.query.functions.any.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.functions.any.expression_semantics"></a><h6>
-<a name="id757984"></a>
+<a name="id751430"></a>
             <a class="link" href="any.html#fusion.algorithm.query.functions.any.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             semantics</a>
           </h6>
-<pre class="programlisting">any<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="any.html" title="any"><code class="computeroutput"><span class="identifier">any</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns true if and only
-            if <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt>
-            evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt> for some
-            element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns true if and only
+            if <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code>
+            evaluates to <code class="computeroutput"><span class="keyword">true</span></code> for some
+            element <code class="computeroutput"><span class="identifier">e</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.query.functions.any.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id544102"></a>
-            Complexity
-=======
-<a name="id795052"></a>
-=======
-<a name="id757883"></a>
-=======
-<a name="id750258"></a>
-=======
-<a name="id772846"></a>
-=======
-<a name="id761372"></a>
-=======
-<a name="id758095"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id751542"></a>
             <a class="link" href="any.html#fusion.algorithm.query.functions.any.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
+            Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.any.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id544184"></a>
-            Header
-=======
-<a name="id795102"></a>
-=======
-<a name="id757933"></a>
-=======
-<a name="id750309"></a>
-=======
-<a name="id772896"></a>
-=======
-<a name="id761422"></a>
-=======
-<a name="id758146"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id751592"></a>
             <a class="link" href="any.html#fusion.algorithm.query.functions.any.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">any</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">any</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.any.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id544349"></a>
-            Example
-=======
-<a name="id796310"></a>
-=======
-<a name="id758048"></a>
-=======
-<a name="id750424"></a>
-=======
-<a name="id773011"></a>
-=======
-<a name="id761538"></a>
-=======
-<a name="id758261"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id751707"></a>
             <a class="link" href="any.html#fusion.algorithm.query.functions.any.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">odd</span>
 <span class="special">{</span>
@@ -307,8 +157,8 @@
     <span class="special">}</span>
 <span class="special">};</span>
 <span class="special">...</span>
-<span class="identifier">assert</span><span class="special">(</span>any<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
-<span class="identifier">assert</span><span class="special">(!</span>any<span class="special">(</span>make_vector<span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">4</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="any.html" title="any"><code class="computeroutput"><span class="identifier">any</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
+<span class="identifier">assert</span><span class="special">(!</span><a class="link" href="any.html" title="any"><code class="computeroutput"><span class="identifier">any</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">4</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>count</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="find_if.html" title="find_if">
+<link rel="prev" href="find_if.html" title="find_if">
 <link rel="next" href="count_if.html" title="count_if">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,272 +22,130 @@
 <div class="spirit-nav">
 <a accesskey="p" href="find_if.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="count_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.count"></a>count
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="count">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.count"></a><a class="link" href="count.html" title="count">count</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.functions.count.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id550460"></a>
-            Description
-=======
-<a name="id801492"></a>
-=======
-<a name="id765424"></a>
-=======
-<a name="id757800"></a>
-=======
-<a name="id780387"></a>
-=======
-<a name="id767958"></a>
-=======
-<a name="id764681"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id758127"></a>
             <a class="link" href="count.html#fusion.algorithm.query.functions.count.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the number of elements of a given type within a sequence.
           </p>
 <a name="fusion.algorithm.query.functions.count.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id550488"></a>
-            Synopsis
-=======
-<a name="id801509"></a>
-=======
-<a name="id765441"></a>
-=======
-<a name="id757816"></a>
-=======
-<a name="id780404"></a>
-=======
-<a name="id767974"></a>
-=======
-<a name="id764698"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id758144"></a>
             <a class="link" href="count.html#fusion.algorithm.query.functions.count.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">T</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::count<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">count</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/count.html" title="count"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">count</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">count</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id550689"></a><p class="title"><b>Table 1.44. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id801654"></a><p class="title"><b>Table 1.44. Parameters</b></p>
-=======
-<a name="id765586"></a><p class="title"><b>Table 1.48. Parameters</b></p>
-=======
-<a name="id757962"></a><p class="title"><b>Table 1.48. Parameters</b></p>
-=======
-<a name="id780549"></a><p class="title"><b>Table&#160;1.48.&#160;Parameters</b></p>
-=======
-<a name="id768120"></a><p class="title"><b>Table&#160;1.48.&#160;Parameters</b></p>
-=======
-<a name="id764843"></a><p class="title"><b>Table&#160;1.48.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id758289"></a><p class="title"><b>Table&#160;1.48.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                  Sequence</a>, <tt class="computeroutput"><span class="identifier">e</span> <span class="special">==</span> <span class="identifier">t</span></tt>
-                  must be a valid expression, convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>,
-                  for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-                  in <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                  Sequence</a>, <code class="computeroutput"><span class="identifier">e</span> <span class="special">==</span> <span class="identifier">t</span></code>
+                  must be a valid expression, convertible to <code class="computeroutput"><span class="keyword">bool</span></code>,
+                  for each element <code class="computeroutput"><span class="identifier">e</span></code>
+                  in <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   The sequence to search
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The type to count
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.functions.count.expression_semantics"></a><h6>
-<a name="id550879"></a>
-            <a href="count.html#fusion.algorithm.query.functions.count.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.functions.count.expression_semantics"></a><h6>
-<a name="id764998"></a>
+<a name="id758444"></a>
             <a class="link" href="count.html#fusion.algorithm.query.functions.count.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">count<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="count.html" title="count"><code class="computeroutput"><span class="identifier">count</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">int</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">int</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the number of elements
-            of type <tt class="computeroutput"><span class="identifier">T</span></tt> and equal to
-            <tt class="computeroutput"><span class="identifier">t</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the number of elements
+            of type <code class="computeroutput"><span class="identifier">T</span></code> and equal to
+            <code class="computeroutput"><span class="identifier">t</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.query.functions.count.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551015"></a>
-            Complexity
-=======
-<a name="id801902"></a>
-=======
-<a name="id765834"></a>
-=======
-<a name="id758210"></a>
-=======
-<a name="id780797"></a>
-=======
-<a name="id769461"></a>
-=======
-<a name="id766184"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id759630"></a>
             <a class="link" href="count.html#fusion.algorithm.query.functions.count.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
+            Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.count.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551094"></a>
-            Header
-=======
-<a name="id801953"></a>
-=======
-<a name="id765885"></a>
-=======
-<a name="id758260"></a>
-=======
-<a name="id781940"></a>
-=======
-<a name="id769511"></a>
-=======
-<a name="id766234"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id759681"></a>
             <a class="link" href="count.html#fusion.algorithm.query.functions.count.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">count</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">count</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.count.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551257"></a>
-            Example
-=======
-<a name="id802068"></a>
-=======
-<a name="id766000"></a>
-=======
-<a name="id758376"></a>
-=======
-<a name="id782056"></a>
-=======
-<a name="id769626"></a>
-=======
-<a name="id766350"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id759796"></a>
             <a class="link" href="count.html#fusion.algorithm.query.functions.count.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1.0</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>count<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span><span class="number">2</span><span class="special">)</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1.0</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="count.html" title="count"><code class="computeroutput"><span class="identifier">count</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">,</span><span class="number">2</span><span class="special">)</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count_if.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/count_if.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>count_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="count.html" title="count">
+<link rel="prev" href="count.html" title="count">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,271 +22,129 @@
 <div class="spirit-nav">
 <a accesskey="p" href="count.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.count_if"></a>count_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="count_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.count_if"></a><a class="link" href="count_if.html" title="count_if">count_if</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.functions.count_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551462"></a>
-            Description
-=======
-<a name="id802213"></a>
-=======
-<a name="id766146"></a>
-=======
-<a name="id758521"></a>
-=======
-<a name="id782201"></a>
-=======
-<a name="id769772"></a>
-=======
-<a name="id766495"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id759941"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the number of elements within a sequence with a type for which
-            a given unary function object evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt>.
+            a given unary function object evaluates to <code class="computeroutput"><span class="keyword">true</span></code>.
           </p>
 <a name="fusion.algorithm.query.functions.count_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551502"></a>
-            Synopsis
-=======
-<a name="id802237"></a>
-=======
-<a name="id766170"></a>
-=======
-<a name="id758545"></a>
-=======
-<a name="id782225"></a>
-=======
-<a name="id769796"></a>
-=======
-<a name="id766519"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id759965"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::count_if<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">count_if</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/count_if.html" title="count_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">count_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">count_if</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id551692"></a><p class="title"><b>Table 1.45. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id804559"></a><p class="title"><b>Table 1.45. Parameters</b></p>
-=======
-<a name="id766306"></a><p class="title"><b>Table 1.49. Parameters</b></p>
-=======
-<a name="id758682"></a><p class="title"><b>Table 1.49. Parameters</b></p>
-=======
-<a name="id782362"></a><p class="title"><b>Table&#160;1.49.&#160;Parameters</b></p>
-=======
-<a name="id769932"></a><p class="title"><b>Table&#160;1.49.&#160;Parameters</b></p>
-=======
-<a name="id766656"></a><p class="title"><b>Table&#160;1.49.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id760102"></a><p class="title"><b>Table&#160;1.49.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                  Sequence</a>, <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> is a valid expression, convertible
-                  to <tt class="computeroutput"><span class="keyword">bool</span></tt>, for each
-                  element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                  Sequence</a>, <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> is a valid expression, convertible
+                  to <code class="computeroutput"><span class="keyword">bool</span></code>, for each
+                  element <code class="computeroutput"><span class="identifier">e</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   The sequence to search
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A unary function object
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The search predicate
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.functions.count_if.expression_semantics"></a><h6>
-<a name="id551887"></a>
-            <a href="count_if.html#fusion.algorithm.query.functions.count_if.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.functions.count_if.expression_semantics"></a><h6>
-<a name="id766814"></a>
+<a name="id760260"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">count_if<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">)</span>
+<pre class="programlisting"><a class="link" href="count_if.html" title="count_if"><code class="computeroutput"><span class="identifier">count_if</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">)</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">int</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">int</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the number of elements
-            in <tt class="computeroutput"><span class="identifier">seq</span></tt> where <tt class="computeroutput"><span class="identifier">f</span></tt> evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the number of elements
+            in <code class="computeroutput"><span class="identifier">seq</span></code> where <code class="computeroutput"><span class="identifier">f</span></code> evaluates to <code class="computeroutput"><span class="keyword">true</span></code>.
           </p>
 <a name="fusion.algorithm.query.functions.count_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552021"></a>
-            Complexity
-=======
-<a name="id804811"></a>
-=======
-<a name="id766558"></a>
-=======
-<a name="id758934"></a>
-=======
-<a name="id782614"></a>
-=======
-<a name="id770184"></a>
-=======
-<a name="id766908"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id760354"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
+            Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.count_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552099"></a>
-            Header
-=======
-<a name="id804861"></a>
-=======
-<a name="id766609"></a>
-=======
-<a name="id758985"></a>
-=======
-<a name="id782664"></a>
-=======
-<a name="id770235"></a>
-=======
-<a name="id766958"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id760404"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">count_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">count_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.count_if.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552264"></a>
-            Example
-=======
-<a name="id804977"></a>
-=======
-<a name="id766724"></a>
-=======
-<a name="id759100"></a>
-=======
-<a name="id782779"></a>
-=======
-<a name="id770350"></a>
-=======
-<a name="id767073"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id760520"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.functions.count_if.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>count_if<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span><span class="identifier">odd</span><span class="special">())</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="count_if.html" title="count_if"><code class="computeroutput"><span class="identifier">count_if</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">,</span><span class="identifier">odd</span><span class="special">())</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>find</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="none.html" title="none">
+<link rel="prev" href="none.html" title="none">
 <link rel="next" href="find_if.html" title="find_if">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="none.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="find_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.find"></a>find
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="find">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.find"></a><a class="link" href="find.html" title="find">find</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.functions.find.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id548407"></a>
-            Description
-=======
-<a name="id798323"></a>
-=======
-<a name="id763884"></a>
-=======
-<a name="id756260"></a>
-=======
-<a name="id778847"></a>
-=======
-<a name="id766418"></a>
-=======
-<a name="id763141"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id756588"></a>
             <a class="link" href="find.html#fusion.algorithm.query.functions.find.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Finds the first element of a given type within a sequence.
           </p>
 <a name="fusion.algorithm.query.functions.find.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id548433"></a>
-            Synopsis
-=======
-<a name="id798340"></a>
-=======
-<a name="id763901"></a>
-=======
-<a name="id756277"></a>
-=======
-<a name="id778864"></a>
-=======
-<a name="id766435"></a>
-=======
-<a name="id763158"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id756604"></a>
             <a class="link" href="find.html#fusion.algorithm.query.functions.find.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span>
@@ -111,196 +50,107 @@
 <span class="emphasis"><em>unspecified</em></span> <span class="identifier">find</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id548610"></a><p class="title"><b>Table 1.42. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id800124"></a><p class="title"><b>Table 1.42. Parameters</b></p>
-=======
-<a name="id764046"></a><p class="title"><b>Table 1.46. Parameters</b></p>
-=======
-<a name="id756422"></a><p class="title"><b>Table 1.46. Parameters</b></p>
-=======
-<a name="id779009"></a><p class="title"><b>Table&#160;1.46.&#160;Parameters</b></p>
-=======
-<a name="id766580"></a><p class="title"><b>Table&#160;1.46.&#160;Parameters</b></p>
-=======
-<a name="id763303"></a><p class="title"><b>Table&#160;1.46.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id756750"></a><p class="title"><b>Table&#160;1.46.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The sequence to search
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The type to search for
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.functions.find.expression_semantics"></a><h6>
-<a name="id548742"></a>
-            <a href="find.html#fusion.algorithm.query.functions.find.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.functions.find.expression_semantics"></a><h6>
-<a name="id763420"></a>
+<a name="id756866"></a>
             <a class="link" href="find.html#fusion.algorithm.query.functions.find.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">find<span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span>
+<pre class="programlisting"><a class="link" href="find.html" title="find"><code class="computeroutput"><span class="identifier">find</span></code></a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of the same iterator
-            category as the iterators of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+            category as the iterators of <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns an iterator to the
-            first element of <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            of type <tt class="computeroutput"><span class="identifier">T</span></tt>, or <tt class="computeroutput">end<span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></tt> if there is no such element. Equivalent
-            to <tt class="computeroutput">find_if<span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Returns an iterator to the
+            first element of <code class="computeroutput"><span class="identifier">seq</span></code>
+            of type <code class="computeroutput"><span class="identifier">T</span></code>, or <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></code> if there is no such element. Equivalent
+            to <code class="computeroutput"><a class="link" href="find_if.html" title="find_if"><code class="computeroutput"><span class="identifier">find_if</span></code></a><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span></code>
           </p>
 <a name="fusion.algorithm.query.functions.find.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id548963"></a>
-            Complexity
-=======
-<a name="id800408"></a>
-=======
-<a name="id764331"></a>
-=======
-<a name="id756706"></a>
-=======
-<a name="id779294"></a>
-=======
-<a name="id766864"></a>
-=======
-<a name="id763588"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id757034"></a>
             <a class="link" href="find.html#fusion.algorithm.query.functions.find.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
+            Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.find.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id549034"></a>
-            Header
-=======
-<a name="id800459"></a>
-=======
-<a name="id764381"></a>
-=======
-<a name="id756757"></a>
-=======
-<a name="id779344"></a>
-=======
-<a name="id766915"></a>
-=======
-<a name="id763638"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id757084"></a>
             <a class="link" href="find.html#fusion.algorithm.query.functions.find.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">find</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">find</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.find.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id549182"></a>
-            Example
-=======
-<a name="id800574"></a>
-=======
-<a name="id764496"></a>
-=======
-<a name="id756872"></a>
-=======
-<a name="id779459"></a>
-=======
-<a name="id767030"></a>
-=======
-<a name="id763753"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id757200"></a>
             <a class="link" href="find.html#fusion.algorithm.query.functions.find.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="char">'a'</span><span class="special">,</span><span class="char">'0'</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(*</span>find<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <span class="char">'0'</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>find<span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> end<span class="special">(</span><span class="identifier">vec</span><span class="special">));</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="char">'a'</span><span class="special">,</span><span class="char">'0'</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(*</span><a class="link" href="find.html" title="find"><code class="computeroutput"><span class="identifier">find</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <span class="char">'0'</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="find.html" title="find"><code class="computeroutput"><span class="identifier">find</span></code></a><span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find_if.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/find_if.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>find_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="find.html" title="find">
+<link rel="prev" href="find.html" title="find">
 <link rel="next" href="count.html" title="count">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,75 +22,22 @@
 <div class="spirit-nav">
 <a accesskey="p" href="find.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="count.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.find_if"></a>find_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="find_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.find_if"></a><a class="link" href="find_if.html" title="find_if">find_if</a>
+</h5></div></div></div>
 <p>
             Finds the first element within a sequence with a type for which a given
             <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
-            Lambda Expression</a> evaluates to <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>.
+            Lambda Expression</a> evaluates to <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>.
           </p>
 <a name="fusion.algorithm.query.functions.find_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id549491"></a>
-            Description
-=======
-<a name="id800795"></a>
-=======
-<a name="id764717"></a>
-=======
-<a name="id757093"></a>
-=======
-<a name="id779680"></a>
-=======
-<a name="id767251"></a>
-=======
-<a name="id763974"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id757420"></a>
             <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <a name="fusion.algorithm.query.functions.find_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id549513"></a>
-            Synopsis
-=======
-<a name="id800808"></a>
-=======
-<a name="id764730"></a>
-=======
-<a name="id757106"></a>
-=======
-<a name="id779693"></a>
-=======
-<a name="id767264"></a>
-=======
-<a name="id763987"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id757434"></a>
             <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">F</span><span class="special">,</span>
@@ -113,133 +52,94 @@
 <span class="emphasis"><em>unspecified</em></span> <span class="identifier">find_if</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id549709"></a><p class="title"><b>Table 1.43. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id800953"></a><p class="title"><b>Table 1.43. Parameters</b></p>
-=======
-<a name="id764876"></a><p class="title"><b>Table 1.47. Parameters</b></p>
-=======
-<a name="id757251"></a><p class="title"><b>Table 1.47. Parameters</b></p>
-=======
-<a name="id779838"></a><p class="title"><b>Table&#160;1.47.&#160;Parameters</b></p>
-=======
-<a name="id767409"></a><p class="title"><b>Table&#160;1.47.&#160;Parameters</b></p>
-=======
-<a name="id764132"></a><p class="title"><b>Table&#160;1.47.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id757579"></a><p class="title"><b>Table&#160;1.47.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The sequence to search
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">F</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">F</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A unary <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
                   Lambda Expression</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The search predicate
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.functions.find_if.expression_semantics"></a><h6>
-<a name="id549852"></a>
-            <a href="find_if.html#fusion.algorithm.query.functions.find_if.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.functions.find_if.expression_semantics"></a><h6>
-<a name="id764254"></a>
+<a name="id757700"></a>
             <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">find_if<span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span>
+<pre class="programlisting"><a class="link" href="find_if.html" title="find_if"><code class="computeroutput"><span class="identifier">find_if</span></code></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: An iterator of the same
-            iterator category as the iterators of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: An iterator of the same
+            iterator category as the iterators of <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the first element
-            of <tt class="computeroutput"><span class="identifier">seq</span></tt> for which <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
-            Lambda Expression</a> <tt class="computeroutput"><span class="identifier">F</span></tt>
-            evaluates to <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>, or <tt class="computeroutput">end<span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Returns the first element
+            of <code class="computeroutput"><span class="identifier">seq</span></code> for which <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
+            Lambda Expression</a> <code class="computeroutput"><span class="identifier">F</span></code>
+            evaluates to <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>, or <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></code>
             if there is no such element.
           </p>
 <a name="fusion.algorithm.query.functions.find_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id550050"></a>
-            Complexity
-=======
-<a name="id801209"></a>
-=======
-<a name="id765131"></a>
-=======
-<a name="id757507"></a>
-=======
-<a name="id780094"></a>
-=======
-<a name="id767665"></a>
-=======
-<a name="id764388"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id757834"></a>
             <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
+            Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> comparisons.
           </p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
@@ -250,37 +150,12 @@
             </li>
 </ol></div>
 <a name="fusion.algorithm.query.functions.find_if.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id550133"></a>
-            Example
-=======
-<a name="id801263"></a>
-=======
-<a name="id765195"></a>
-=======
-<a name="id757570"></a>
-=======
-<a name="id780158"></a>
-=======
-<a name="id767728"></a>
-=======
-<a name="id764452"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id757898"></a>
             <a class="link" href="find_if.html#fusion.algorithm.query.functions.find_if.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1.0</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(*</span>find_if<span class="special">&lt;</span><span class="identifier">is_integral</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>find_if<span class="special">&lt;</span><span class="identifier">is_class</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> end<span class="special">(</span><span class="identifier">vec</span><span class="special">));</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1.0</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(*</span><a class="link" href="find_if.html" title="find_if"><code class="computeroutput"><span class="identifier">find_if</span></code></a><span class="special">&lt;</span><span class="identifier">is_integral</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="find_if.html" title="find_if"><code class="computeroutput"><span class="identifier">find_if</span></code></a><span class="special">&lt;</span><span class="identifier">is_class</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/none.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/none.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/functions/none.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>none</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="all.html" title="all">
+<link rel="prev" href="all.html" title="all">
 <link rel="next" href="find.html" title="find">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,273 +22,131 @@
 <div class="spirit-nav">
 <a accesskey="p" href="all.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="find.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.functions.none"></a>none
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="none">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.functions.none"></a><a class="link" href="none.html" title="none">none</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.functions.none.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id547251"></a>
-            Description
-=======
-<a name="id797424"></a>
-=======
-<a name="id759162"></a>
-=======
-<a name="id751538"></a>
-=======
-<a name="id774125"></a>
-=======
-<a name="id762651"></a>
-=======
-<a name="id759374"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id752821"></a>
             <a class="link" href="none.html#fusion.algorithm.query.functions.none.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            For a sequence <tt class="computeroutput"><span class="identifier">seq</span></tt> and
-            unary function object <tt class="computeroutput"><span class="identifier">f</span></tt>,
-            <tt class="computeroutput"><span class="identifier">none</span></tt> returns true if
-            <tt class="computeroutput"><span class="identifier">f</span></tt> returns false for every
-            element of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            For a sequence <code class="computeroutput"><span class="identifier">seq</span></code> and
+            unary function object <code class="computeroutput"><span class="identifier">f</span></code>,
+            <code class="computeroutput"><span class="identifier">none</span></code> returns true if
+            <code class="computeroutput"><span class="identifier">f</span></code> returns false for every
+            element of <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.query.functions.none.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id547326"></a>
-            Synopsis
-=======
-<a name="id797477"></a>
-=======
-<a name="id759215"></a>
-=======
-<a name="id751590"></a>
-=======
-<a name="id774178"></a>
-=======
-<a name="id762704"></a>
-=======
-<a name="id759427"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id752874"></a>
             <a class="link" href="none.html#fusion.algorithm.query.functions.none.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::none<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">none</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/none.html" title="none"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">none</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">none</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id547496"></a><p class="title"><b>Table 1.41. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id797612"></a><p class="title"><b>Table 1.41. Parameters</b></p>
-=======
-<a name="id759350"></a><p class="title"><b>Table 1.45. Parameters</b></p>
-=======
-<a name="id751726"></a><p class="title"><b>Table 1.45. Parameters</b></p>
-=======
-<a name="id774313"></a><p class="title"><b>Table&#160;1.45.&#160;Parameters</b></p>
-=======
-<a name="id762840"></a><p class="title"><b>Table&#160;1.45.&#160;Parameters</b></p>
-=======
-<a name="id759563"></a><p class="title"><b>Table&#160;1.45.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id753009"></a><p class="title"><b>Table&#160;1.45.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                  Sequence</a>, <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> is a valid expression, convertible
-                  to <tt class="computeroutput"><span class="keyword">bool</span></tt>, for every
-                  element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                  Sequence</a>, <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> is a valid expression, convertible
+                  to <code class="computeroutput"><span class="keyword">bool</span></code>, for every
+                  element <code class="computeroutput"><span class="identifier">e</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   The sequence to search
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A unary function object
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The search predicate
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.functions.none.expression_semantics"></a><h6>
-<a name="id547683"></a>
-            <a href="none.html#fusion.algorithm.query.functions.none.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.functions.none.expression_semantics"></a><h6>
-<a name="id759721"></a>
+<a name="id753168"></a>
             <a class="link" href="none.html#fusion.algorithm.query.functions.none.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">none<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="none.html" title="none"><code class="computeroutput"><span class="identifier">none</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns true if and only
-            if <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt>
-            evaluates to <tt class="computeroutput"><span class="keyword">false</span></tt> for every
-            element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>. Result equivalent to <tt class="computeroutput"><span class="special">!</span><span class="identifier">any</span><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">)</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns true if and only
+            if <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code>
+            evaluates to <code class="computeroutput"><span class="keyword">false</span></code> for every
+            element <code class="computeroutput"><span class="identifier">e</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>. Result equivalent to <code class="computeroutput"><span class="special">!</span><span class="identifier">any</span><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">)</span></code>.
           </p>
 <a name="fusion.algorithm.query.functions.none.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id547871"></a>
-            Complexity
-=======
-<a name="id797912"></a>
-=======
-<a name="id759650"></a>
-=======
-<a name="id752026"></a>
-=======
-<a name="id774613"></a>
-=======
-<a name="id763140"></a>
-=======
-<a name="id759863"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id753309"></a>
             <a class="link" href="none.html#fusion.algorithm.query.functions.none.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
+            Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> comparisons.
           </p>
 <a name="fusion.algorithm.query.functions.none.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id547942"></a>
-            Header
-=======
-<a name="id797963"></a>
-=======
-<a name="id759701"></a>
-=======
-<a name="id752076"></a>
-=======
-<a name="id774664"></a>
-=======
-<a name="id763190"></a>
-=======
-<a name="id759913"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id753360"></a>
             <a class="link" href="none.html#fusion.algorithm.query.functions.none.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">none</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">none</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.query.functions.none.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id548090"></a>
-            Example
-=======
-<a name="id798078"></a>
-=======
-<a name="id759816"></a>
-=======
-<a name="id752192"></a>
-=======
-<a name="id774779"></a>
-=======
-<a name="id766173"></a>
-=======
-<a name="id762896"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id756343"></a>
             <a class="link" href="none.html#fusion.algorithm.query.functions.none.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">odd</span>
 <span class="special">{</span>
@@ -307,8 +157,8 @@
     <span class="special">}</span>
 <span class="special">};</span>
 <span class="special">...</span>
-<span class="identifier">assert</span><span class="special">(</span>none<span class="special">(</span>make_vector<span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">4</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
-<span class="identifier">assert</span><span class="special">(!</span>none<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="none.html" title="none"><code class="computeroutput"><span class="identifier">none</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">4</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
+<span class="identifier">assert</span><span class="special">(!</span><a class="link" href="none.html" title="none"><code class="computeroutput"><span class="identifier">none</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">()));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Metafunctions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../query.html" title="Query">
-<link rel="previous" href="functions/count_if.html" title="count_if">
+<link rel="prev" href="functions/count_if.html" title="count_if">
 <link rel="next" href="metafunctions/any.html" title="any">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="functions/count_if.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../query.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="metafunctions/any.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.query.metafunctions"></a>Metafunctions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Metafunctions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.query.metafunctions"></a><a class="link" href="metafunctions.html" title="Metafunctions">Metafunctions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">any</span></dt>
 <dt><span class="section">all</span></dt>
@@ -45,7 +38,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/all.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/all.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/all.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>all</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="any.html" title="any">
+<link rel="prev" href="any.html" title="any">
 <link rel="next" href="none.html" title="none">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="any.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="none.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.all"></a>all
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="all">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.all"></a><a class="link" href="all.html" title="all">all</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.metafunctions.all.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553205"></a>
-            Description
-=======
-<a name="id805629"></a>
-=======
-<a name="id767377"></a>
-=======
-<a name="id759753"></a>
-=======
-<a name="id783432"></a>
-=======
-<a name="id771003"></a>
-=======
-<a name="id767726"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761172"></a>
             <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            A metafunction returning the result type of all.
+            A metafunction returning the result type of <a class="link" href="../functions/all.html" title="all"><code class="computeroutput"><span class="identifier">all</span></code></a>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.all.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553252"></a>
-            Synopsis
-=======
-<a name="id805657"></a>
-=======
-<a name="id767404"></a>
-=======
-<a name="id759780"></a>
-=======
-<a name="id783460"></a>
-=======
-<a name="id771030"></a>
-=======
-<a name="id767754"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761200"></a>
             <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -108,164 +47,98 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553371"></a><p class="title"><b>Table 1.47. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id805743"></a><p class="title"><b>Table 1.47. Parameters</b></p>
-=======
-<a name="id767491"></a><p class="title"><b>Table 1.51. Parameters</b></p>
-=======
-<a name="id759867"></a><p class="title"><b>Table 1.51. Parameters</b></p>
-=======
-<a name="id783546"></a><p class="title"><b>Table&#160;1.51.&#160;Parameters</b></p>
-=======
-<a name="id771117"></a><p class="title"><b>Table&#160;1.51.&#160;Parameters</b></p>
-=======
-<a name="id767840"></a><p class="title"><b>Table&#160;1.51.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761286"></a><p class="title"><b>Table&#160;1.51.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">F</span></tt>
-                </p></td>
-<td><p>
-                  A model of unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">F</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
                   Function Object</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.metafunctions.all.expression_semantics"></a><h6>
-<a name="id553518"></a>
-            <a href="all.html#fusion.algorithm.query.metafunctions.all.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.metafunctions.all.expression_semantics"></a><h6>
-<a name="id767961"></a>
+<a name="id761408"></a>
             <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::all<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="all.html" title="all"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">all</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the return type of
-            all
-            given a sequence of type <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-            and a unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-            Function Object</a> of type <tt class="computeroutput"><span class="identifier">F</span></tt>.
-            The return type is always <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the return type of
+            <a class="link" href="../functions/all.html" title="all"><code class="computeroutput"><span class="identifier">all</span></code></a>
+            given a sequence of type <code class="computeroutput"><span class="identifier">Sequence</span></code>
+            and a unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
+            Function Object</a> of type <code class="computeroutput"><span class="identifier">F</span></code>.
+            The return type is always <code class="computeroutput"><span class="keyword">bool</span></code>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.all.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553703"></a>
-            Complexity
-=======
-<a name="id805983"></a>
-=======
-<a name="id767731"></a>
-=======
-<a name="id760107"></a>
-=======
-<a name="id783786"></a>
-=======
-<a name="id771357"></a>
-=======
-<a name="id768080"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761526"></a>
             <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.query.metafunctions.all.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553731"></a>
-            Header
-=======
-<a name="id806000"></a>
-=======
-<a name="id767748"></a>
-=======
-<a name="id760123"></a>
-=======
-<a name="id783803"></a>
-=======
-<a name="id771374"></a>
-=======
-<a name="id768097"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761543"></a>
             <a class="link" href="all.html#fusion.algorithm.query.metafunctions.all.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">all</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">all</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/any.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/any.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/any.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>any</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="../metafunctions.html" title="Metafunctions">
+<link rel="prev" href="../metafunctions.html" title="Metafunctions">
 <link rel="next" href="all.html" title="all">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="all.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.any"></a>any
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="any">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.any"></a><a class="link" href="any.html" title="any">any</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.metafunctions.any.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552495"></a>
-            Description
-=======
-<a name="id805133"></a>
-=======
-<a name="id766880"></a>
-=======
-<a name="id759256"></a>
-=======
-<a name="id782935"></a>
-=======
-<a name="id770506"></a>
-=======
-<a name="id767229"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id760676"></a>
             <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            A metafunction returning the result type of any.
+            A metafunction returning the result type of <a class="link" href="../functions/any.html" title="any"><code class="computeroutput"><span class="identifier">any</span></code></a>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.any.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552542"></a>
-            Synopsis
-=======
-<a name="id805160"></a>
-=======
-<a name="id766908"></a>
-=======
-<a name="id759283"></a>
-=======
-<a name="id782963"></a>
-=======
-<a name="id770534"></a>
-=======
-<a name="id767257"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id760703"></a>
             <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -108,164 +47,98 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552661"></a><p class="title"><b>Table 1.46. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id805247"></a><p class="title"><b>Table 1.46. Parameters</b></p>
-=======
-<a name="id766994"></a><p class="title"><b>Table 1.50. Parameters</b></p>
-=======
-<a name="id759370"></a><p class="title"><b>Table 1.50. Parameters</b></p>
-=======
-<a name="id783049"></a><p class="title"><b>Table&#160;1.50.&#160;Parameters</b></p>
-=======
-<a name="id770620"></a><p class="title"><b>Table&#160;1.50.&#160;Parameters</b></p>
-=======
-<a name="id767343"></a><p class="title"><b>Table&#160;1.50.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id760790"></a><p class="title"><b>Table&#160;1.50.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">F</span></tt>
-                </p></td>
-<td><p>
-                  A model of unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">F</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
                   Function Object</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.metafunctions.any.expression_semantics"></a><h6>
-<a name="id552810"></a>
-            <a href="any.html#fusion.algorithm.query.metafunctions.any.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.metafunctions.any.expression_semantics"></a><h6>
-<a name="id767464"></a>
+<a name="id760911"></a>
             <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::any<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="any.html" title="any"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">any</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the return type of
-            any
-            given a sequence of type <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-            and a unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-            Function Object</a> of type <tt class="computeroutput"><span class="identifier">F</span></tt>.
-            The return type is always <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the return type of
+            <a class="link" href="../functions/any.html" title="any"><code class="computeroutput"><span class="identifier">any</span></code></a>
+            given a sequence of type <code class="computeroutput"><span class="identifier">Sequence</span></code>
+            and a unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
+            Function Object</a> of type <code class="computeroutput"><span class="identifier">F</span></code>.
+            The return type is always <code class="computeroutput"><span class="keyword">bool</span></code>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.any.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id552995"></a>
-            Complexity
-=======
-<a name="id805487"></a>
-=======
-<a name="id767234"></a>
-=======
-<a name="id759610"></a>
-=======
-<a name="id783289"></a>
-=======
-<a name="id770860"></a>
-=======
-<a name="id767583"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761030"></a>
             <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.query.metafunctions.any.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553022"></a>
-            Header
-=======
-<a name="id805503"></a>
-=======
-<a name="id767251"></a>
-=======
-<a name="id759627"></a>
-=======
-<a name="id783306"></a>
-=======
-<a name="id770877"></a>
-=======
-<a name="id767600"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761046"></a>
             <a class="link" href="any.html#fusion.algorithm.query.metafunctions.any.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">any</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">any</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>count</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="find_if.html" title="find_if">
+<link rel="prev" href="find_if.html" title="find_if">
 <link rel="next" href="count_if.html" title="count_if">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="find_if.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="count_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.count"></a>count
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="count">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.count"></a><a class="link" href="count.html" title="count">count</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.metafunctions.count.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556161"></a>
-            Description
-=======
-<a name="id808381"></a>
-=======
-<a name="id770816"></a>
-=======
-<a name="id763192"></a>
-=======
-<a name="id785779"></a>
-=======
-<a name="id773077"></a>
-=======
-<a name="id769800"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763247"></a>
             <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            A metafunction that returns the result type of <tt class="computeroutput"><span class="identifier">count</span></tt>
+            A metafunction that returns the result type of <code class="computeroutput"><span class="identifier">count</span></code>
             given the sequence and search types.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556202"></a>
-            Synopsis
-=======
-<a name="id808408"></a>
-=======
-<a name="id770843"></a>
-=======
-<a name="id763218"></a>
-=======
-<a name="id785806"></a>
-=======
-<a name="id773103"></a>
-=======
-<a name="id769827"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763273"></a>
             <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -109,158 +48,94 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556320"></a><p class="title"><b>Table 1.51. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id808494"></a><p class="title"><b>Table 1.51. Parameters</b></p>
-=======
-<a name="id770929"></a><p class="title"><b>Table 1.55. Parameters</b></p>
-=======
-<a name="id763305"></a><p class="title"><b>Table 1.55. Parameters</b></p>
-=======
-<a name="id785892"></a><p class="title"><b>Table&#160;1.55.&#160;Parameters</b></p>
-=======
-<a name="id773190"></a><p class="title"><b>Table&#160;1.55.&#160;Parameters</b></p>
-=======
-<a name="id769913"></a><p class="title"><b>Table&#160;1.55.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763359"></a><p class="title"><b>Table&#160;1.55.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   heading Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.metafunctions.count.expression_semantics"></a><h6>
-<a name="id556458"></a>
-            <a href="count.html#fusion.algorithm.query.metafunctions.count.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.metafunctions.count.expression_semantics"></a><h6>
-<a name="id770029"></a>
+<a name="id763476"></a>
             <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::count<span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="count.html" title="count"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">count</span></code></a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">int</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">int</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the return type of
-            count. The return type is always
-            <tt class="computeroutput"><span class="keyword">int</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the return type of
+            <a class="link" href="../functions/count.html" title="count"><code class="computeroutput"><span class="identifier">count</span></code></a>. The return type is always
+            <code class="computeroutput"><span class="keyword">int</span></code>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556600"></a>
-            Complexity
-=======
-<a name="id808702"></a>
-=======
-<a name="id771137"></a>
-=======
-<a name="id763512"></a>
-=======
-<a name="id786100"></a>
-=======
-<a name="id773397"></a>
-=======
-<a name="id770121"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763567"></a>
             <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556627"></a>
-            Header
-=======
-<a name="id808719"></a>
-=======
-<a name="id771154"></a>
-=======
-<a name="id763529"></a>
-=======
-<a name="id786116"></a>
-=======
-<a name="id773414"></a>
-=======
-<a name="id770137"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763584"></a>
             <a class="link" href="count.html#fusion.algorithm.query.metafunctions.count.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">count</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">count</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count_if.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/count_if.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>count_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="count.html" title="count">
+<link rel="prev" href="count.html" title="count">
 <link rel="next" href="../../transformation.html" title="Transformation">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="count.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../transformation.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.count_if"></a>count_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="count_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.count_if"></a><a class="link" href="count_if.html" title="count_if">count_if</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.metafunctions.count_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556811"></a>
-            Description
-=======
-<a name="id808847"></a>
-=======
-<a name="id771282"></a>
-=======
-<a name="id763658"></a>
-=======
-<a name="id786245"></a>
-=======
-<a name="id773543"></a>
-=======
-<a name="id770266"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763712"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            A metafunction that returns the result type of <tt class="computeroutput"><span class="identifier">count_if</span></tt>
+            A metafunction that returns the result type of <code class="computeroutput"><span class="identifier">count_if</span></code>
             given the sequence and predicate types.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556853"></a>
-            Synopsis
-=======
-<a name="id808876"></a>
-=======
-<a name="id771311"></a>
-=======
-<a name="id763686"></a>
-=======
-<a name="id786274"></a>
-=======
-<a name="id773571"></a>
-=======
-<a name="id770295"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763741"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -109,158 +48,94 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id556972"></a><p class="title"><b>Table 1.52. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id808962"></a><p class="title"><b>Table 1.52. Parameters</b></p>
-=======
-<a name="id771397"></a><p class="title"><b>Table 1.56. Parameters</b></p>
-=======
-<a name="id763773"></a><p class="title"><b>Table 1.56. Parameters</b></p>
-=======
-<a name="id786360"></a><p class="title"><b>Table&#160;1.56.&#160;Parameters</b></p>
-=======
-<a name="id773658"></a><p class="title"><b>Table&#160;1.56.&#160;Parameters</b></p>
-=======
-<a name="id770381"></a><p class="title"><b>Table&#160;1.56.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763827"></a><p class="title"><b>Table&#160;1.56.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Pred</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Pred</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A unary function object
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.metafunctions.count_if.expression_semantics"></a><h6>
-<a name="id557111"></a>
-            <a href="count_if.html#fusion.algorithm.query.metafunctions.count_if.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.metafunctions.count_if.expression_semantics"></a><h6>
-<a name="id772954"></a>
+<a name="id766401"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::count_if<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="count_if.html" title="count_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">count_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">int</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">int</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the return type of
-            count_if. The return type is
-            always <tt class="computeroutput"><span class="keyword">int</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the return type of
+            <a class="link" href="../functions/count_if.html" title="count_if"><code class="computeroutput"><span class="identifier">count_if</span></code></a>. The return type is
+            always <code class="computeroutput"><span class="keyword">int</span></code>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id557263"></a>
-            Complexity
-=======
-<a name="id809177"></a>
-=======
-<a name="id771612"></a>
-=======
-<a name="id763988"></a>
-=======
-<a name="id787668"></a>
-=======
-<a name="id776331"></a>
-=======
-<a name="id773054"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id766500"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.query.metafunctions.count_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id557290"></a>
-            Header
-=======
-<a name="id809196"></a>
-=======
-<a name="id771631"></a>
-=======
-<a name="id764007"></a>
-=======
-<a name="id787687"></a>
-=======
-<a name="id776350"></a>
-=======
-<a name="id773073"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id766520"></a>
             <a class="link" href="count_if.html#fusion.algorithm.query.metafunctions.count_if.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">count_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">count_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>find</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="none.html" title="none">
+<link rel="prev" href="none.html" title="none">
 <link rel="next" href="find_if.html" title="find_if">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,79 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="none.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="find_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.find"></a>find
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="find">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.find"></a><a class="link" href="find.html" title="find">find</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.metafunctions.find.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554625"></a>
-            Description
-=======
-<a name="id806623"></a>
-=======
-<a name="id769736"></a>
-=======
-<a name="id762112"></a>
-=======
-<a name="id784699"></a>
-=======
-<a name="id771997"></a>
-=======
-<a name="id768720"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762167"></a>
             <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-<<<<<<< .working
-            Returns the result type of <tt class="computeroutput"><span class="identifier">find</span></tt>,
-            given the sequence and search types.
-=======
             Returns the result type of <a class="link" href="../functions/find.html" title="find"><code class="computeroutput"><span class="identifier">find</span></code></a>, given the sequence and
             search types.
->>>>>>> .merge-right.r57242
           </p>
 <a name="fusion.algorithm.query.metafunctions.find.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554666"></a>
-            Synopsis
-=======
-<a name="id807331"></a>
-=======
-<a name="id769764"></a>
-=======
-<a name="id762140"></a>
-=======
-<a name="id784727"></a>
-=======
-<a name="id772025"></a>
-=======
-<a name="id768748"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762194"></a>
             <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -114,160 +48,96 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554782"></a><p class="title"><b>Table 1.49. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id807417"></a><p class="title"><b>Table 1.49. Parameters</b></p>
-=======
-<a name="id769849"></a><p class="title"><b>Table 1.53. Parameters</b></p>
-=======
-<a name="id762225"></a><p class="title"><b>Table 1.53. Parameters</b></p>
-=======
-<a name="id784812"></a><p class="title"><b>Table&#160;1.53.&#160;Parameters</b></p>
-=======
-<a name="id772110"></a><p class="title"><b>Table&#160;1.53.&#160;Parameters</b></p>
-=======
-<a name="id768833"></a><p class="title"><b>Table&#160;1.53.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762279"></a><p class="title"><b>Table&#160;1.53.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  Model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.metafunctions.find.expression_semantics"></a><h6>
-<a name="id554920"></a>
-            <a href="find.html#fusion.algorithm.query.metafunctions.find.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.metafunctions.find.expression_semantics"></a><h6>
-<a name="id768949"></a>
+<a name="id762396"></a>
             <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::find<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="find.html" title="find"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">find</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of the same iterator
-            category as the iterators of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+            category as the iterators of <code class="computeroutput"><span class="identifier">Sequence</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns an iterator to the
-            first element of type <tt class="computeroutput"><span class="identifier">T</span></tt>
-            in <tt class="computeroutput"><span class="identifier">Sequence</span></tt>, or <tt class="computeroutput">result_of::end<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Returns an iterator to the
+            first element of type <code class="computeroutput"><span class="identifier">T</span></code>
+            in <code class="computeroutput"><span class="identifier">Sequence</span></code>, or <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
             if there is no such element.
           </p>
 <a name="fusion.algorithm.query.metafunctions.find.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555121"></a>
-            Complexity
-=======
-<a name="id807665"></a>
-=======
-<a name="id770098"></a>
-=======
-<a name="id762473"></a>
-=======
-<a name="id785060"></a>
-=======
-<a name="id772358"></a>
-=======
-<a name="id769081"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762528"></a>
             <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear, at most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
+            Linear, at most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> comparisons.
           </p>
 <a name="fusion.algorithm.query.metafunctions.find.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555202"></a>
-            Header
-=======
-<a name="id807715"></a>
-=======
-<a name="id770148"></a>
-=======
-<a name="id762524"></a>
-=======
-<a name="id785111"></a>
-=======
-<a name="id772409"></a>
-=======
-<a name="id769132"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762578"></a>
             <a class="link" href="find.html#fusion.algorithm.query.metafunctions.find.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">find</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">find</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find_if.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/find_if.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>find_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="find.html" title="find">
+<link rel="prev" href="find.html" title="find">
 <link rel="next" href="count.html" title="count">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,79 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="find.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="count.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.find_if"></a>find_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="find_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.find_if"></a><a class="link" href="find_if.html" title="find_if">find_if</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.metafunctions.find_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555388"></a>
-            Description
-=======
-<a name="id807844"></a>
-=======
-<a name="id770276"></a>
-=======
-<a name="id762652"></a>
-=======
-<a name="id785239"></a>
-=======
-<a name="id772537"></a>
-=======
-<a name="id769260"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762707"></a>
             <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-<<<<<<< .working
-            Returns the result type of <tt class="computeroutput"><span class="identifier">find_if</span></tt>
-            given the sequence and predicate types.
-=======
             Returns the result type of <a class="link" href="../functions/find_if.html" title="find_if"><code class="computeroutput"><span class="identifier">find_if</span></code></a> given the sequence and
             predicate types.
->>>>>>> .merge-right.r57242
           </p>
 <a name="fusion.algorithm.query.metafunctions.find_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555430"></a>
-            Synopsis
-=======
-<a name="id807871"></a>
-=======
-<a name="id770306"></a>
-=======
-<a name="id762682"></a>
-=======
-<a name="id785269"></a>
-=======
-<a name="id772567"></a>
-=======
-<a name="id769290"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762737"></a>
             <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -114,161 +48,97 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555547"></a><p class="title"><b>Table 1.50. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id807957"></a><p class="title"><b>Table 1.50. Parameters</b></p>
-=======
-<a name="id770392"></a><p class="title"><b>Table 1.54. Parameters</b></p>
-=======
-<a name="id762767"></a><p class="title"><b>Table 1.54. Parameters</b></p>
-=======
-<a name="id785354"></a><p class="title"><b>Table&#160;1.54.&#160;Parameters</b></p>
-=======
-<a name="id772652"></a><p class="title"><b>Table&#160;1.54.&#160;Parameters</b></p>
-=======
-<a name="id769375"></a><p class="title"><b>Table&#160;1.54.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762822"></a><p class="title"><b>Table&#160;1.54.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Pred</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Pred</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A model of <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
                   Lambda Expression</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's arguments
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.metafunctions.find_if.expression_semantics"></a><h6>
-<a name="id555695"></a>
-            <a href="find_if.html#fusion.algorithm.query.metafunctions.find_if.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.metafunctions.find_if.expression_semantics"></a><h6>
-<a name="id769494"></a>
+<a name="id762941"></a>
             <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::find_if<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="find_if.html" title="find_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">find_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of the same iterator
-            category as the iterators of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+            category as the iterators of <code class="computeroutput"><span class="identifier">Sequence</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns an iterator to the
-            first element in <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-            for which <tt class="computeroutput"><span class="identifier">Pred</span></tt> evaluates
-            to true. Returns <tt class="computeroutput">result_of::end<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></tt> if there is no such element.
+            <span class="bold"><strong>Semantics</strong></span>: Returns an iterator to the
+            first element in <code class="computeroutput"><span class="identifier">Sequence</span></code>
+            for which <code class="computeroutput"><span class="identifier">Pred</span></code> evaluates
+            to true. Returns <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></code> if there is no such element.
           </p>
 <a name="fusion.algorithm.query.metafunctions.find_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555896"></a>
-            Complexity
-=======
-<a name="id808205"></a>
-=======
-<a name="id770640"></a>
-=======
-<a name="id763016"></a>
-=======
-<a name="id785603"></a>
-=======
-<a name="id772901"></a>
-=======
-<a name="id769624"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763070"></a>
             <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Linear. At most <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></tt> comparisons.
+            Linear. At most <code class="computeroutput"><a class="link" href="../../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">value</span></code> comparisons.
           </p>
 <a name="fusion.algorithm.query.metafunctions.find_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id555976"></a>
-            Header
-=======
-<a name="id808255"></a>
-=======
-<a name="id770690"></a>
-=======
-<a name="id763066"></a>
-=======
-<a name="id785653"></a>
-=======
-<a name="id772951"></a>
-=======
-<a name="id769674"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id763121"></a>
             <a class="link" href="find_if.html#fusion.algorithm.query.metafunctions.find_if.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">find_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">find_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/none.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/none.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/query/metafunctions/none.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>none</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="all.html" title="all">
+<link rel="prev" href="all.html" title="all">
 <link rel="next" href="find.html" title="find">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="all.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="find.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.query.metafunctions.none"></a>none
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="none">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.query.metafunctions.none"></a><a class="link" href="none.html" title="none">none</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.query.metafunctions.none.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553914"></a>
-            Description
-=======
-<a name="id806126"></a>
-=======
-<a name="id767874"></a>
-=======
-<a name="id760249"></a>
-=======
-<a name="id783929"></a>
-=======
-<a name="id771500"></a>
-=======
-<a name="id768223"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761669"></a>
             <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            A metafunction returning the result type of none.
+            A metafunction returning the result type of <a class="link" href="../functions/none.html" title="none"><code class="computeroutput"><span class="identifier">none</span></code></a>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.none.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id553961"></a>
-            Synopsis
-=======
-<a name="id806154"></a>
-=======
-<a name="id767901"></a>
-=======
-<a name="id760277"></a>
-=======
-<a name="id783956"></a>
-=======
-<a name="id771527"></a>
-=======
-<a name="id768250"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761697"></a>
             <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -108,164 +47,98 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554080"></a><p class="title"><b>Table 1.48. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id806240"></a><p class="title"><b>Table 1.48. Parameters</b></p>
-=======
-<a name="id767988"></a><p class="title"><b>Table 1.52. Parameters</b></p>
-=======
-<a name="id760363"></a><p class="title"><b>Table 1.52. Parameters</b></p>
-=======
-<a name="id784043"></a><p class="title"><b>Table&#160;1.52.&#160;Parameters</b></p>
-=======
-<a name="id771614"></a><p class="title"><b>Table&#160;1.52.&#160;Parameters</b></p>
-=======
-<a name="id768337"></a><p class="title"><b>Table&#160;1.52.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id761784"></a><p class="title"><b>Table&#160;1.52.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">F</span></tt>
-                </p></td>
-<td><p>
-                  A model of unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">F</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
                   Function Object</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.query.metafunctions.none.expression_semantics"></a><h6>
-<a name="id554226"></a>
-            <a href="none.html#fusion.algorithm.query.metafunctions.none.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.query.metafunctions.none.expression_semantics"></a><h6>
-<a name="id768459"></a>
+<a name="id761905"></a>
             <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::none<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="none.html" title="none"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">none</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the return type of
-            none
-            given a sequence of type <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-            and a unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-            Function Object</a> of type <tt class="computeroutput"><span class="identifier">F</span></tt>.
-            The return type is always <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the return type of
+            <a class="link" href="../functions/none.html" title="none"><code class="computeroutput"><span class="identifier">none</span></code></a>
+            given a sequence of type <code class="computeroutput"><span class="identifier">Sequence</span></code>
+            and a unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
+            Function Object</a> of type <code class="computeroutput"><span class="identifier">F</span></code>.
+            The return type is always <code class="computeroutput"><span class="keyword">bool</span></code>.
           </p>
 <a name="fusion.algorithm.query.metafunctions.none.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554410"></a>
-            Complexity
-=======
-<a name="id806480"></a>
-=======
-<a name="id769594"></a>
-=======
-<a name="id761969"></a>
-=======
-<a name="id784556"></a>
-=======
-<a name="id771854"></a>
-=======
-<a name="id768577"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762024"></a>
             <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.query.metafunctions.none.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id554438"></a>
-            Header
-=======
-<a name="id806497"></a>
-=======
-<a name="id769610"></a>
-=======
-<a name="id761986"></a>
-=======
-<a name="id784573"></a>
-=======
-<a name="id771871"></a>
-=======
-<a name="id768594"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id762041"></a>
             <a class="link" href="none.html#fusion.algorithm.query.metafunctions.none.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">query</span><span class="special">/</span><span class="identifier">none</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">none</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Transformation</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../algorithm.html" title="Algorithm">
-<link rel="previous" href="query/metafunctions/count_if.html" title="count_if">
+<link rel="prev" href="query/metafunctions/count_if.html" title="count_if">
 <link rel="next" href="transformation/functions.html" title="Functions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="query/metafunctions/count_if.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../algorithm.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="transformation/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.algorithm.transformation"></a>Transformation
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Transformation">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.algorithm.transformation"></a><a class="link" href="transformation.html" title="Transformation">Transformation</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Functions</span></dt>
 <dt><span class="section">Metafunctions</span></dt>
@@ -42,35 +35,28 @@
         by performing some sort of transformation. In reality the new sequences are
         views onto the data in the original sequences.
       </p>
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
 <th align="left">Note</th>
 </tr>
-<tr><td colspan="2" align="left" valign="top"><p>
+<tr><td align="left" valign="top"><p>
           As the transformation algorithms return views onto their input arguments,
           it is important that the lifetime of the input arguments is greater than
           the period during which you wish to use the results.
         </p></td></tr>
 </table></div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.header"></a><h4>
-<a name="id557497"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.algorithm.transformation.header"></a><h5>
-<a name="id764147"></a>
+<a name="id766659"></a>
         <a class="link" href="transformation.html#fusion.algorithm.transformation.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../transformation.html" title="Transformation">
-<link rel="previous" href="../transformation.html" title="Transformation">
+<link rel="prev" href="../transformation.html" title="Transformation">
 <link rel="next" href="functions/filter.html" title="filter">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../transformation.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../transformation.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="functions/filter.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.transformation.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.transformation.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">filter</span></dt>
 <dt><span class="section">filter_if</span></dt>
@@ -57,7 +50,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/clear.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/clear.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/clear.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>clear</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="reverse.html" title="reverse">
+<link rel="prev" href="reverse.html" title="reverse">
 <link rel="next" href="erase.html" title="erase">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,254 +22,105 @@
 <div class="spirit-nav">
 <a accesskey="p" href="reverse.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="erase.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.clear"></a>clear
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="clear">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.clear"></a><a class="link" href="clear.html" title="clear">clear</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.clear.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id566884"></a>
-            Description
-=======
-<a name="id819010"></a>
-=======
-<a name="id780833"></a>
-=======
-<a name="id773209"></a>
-=======
-<a name="id796849"></a>
-=======
-<a name="id785512"></a>
-=======
-<a name="id782235"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775681"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            clear returns an empty sequence.
+            <a class="link" href="clear.html" title="clear"><code class="computeroutput"><span class="identifier">clear</span></code></a> returns an empty sequence.
           </p>
 <a name="fusion.algorithm.transformation.functions.clear.synposis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id566931"></a>
-            Synposis
-=======
-<a name="id819042"></a>
-=======
-<a name="id780864"></a>
-=======
-<a name="id773240"></a>
-=======
-<a name="id796880"></a>
-=======
-<a name="id785543"></a>
-=======
-<a name="id782266"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775712"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.synposis">Synposis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::clear<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">clear</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/clear.html" title="clear"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">clear</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">clear</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567084"></a><p class="title"><b>Table 1.62. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id819218"></a><p class="title"><b>Table 1.62. Parameters</b></p>
-=======
-<a name="id780972"></a><p class="title"><b>Table 1.66. Parameters</b></p>
-=======
-<a name="id773348"></a><p class="title"><b>Table 1.66. Parameters</b></p>
-=======
-<a name="id796988"></a><p class="title"><b>Table&#160;1.66.&#160;Parameters</b></p>
-=======
-<a name="id785651"></a><p class="title"><b>Table&#160;1.66.&#160;Parameters</b></p>
-=======
-<a name="id782374"></a><p class="title"><b>Table&#160;1.66.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775820"></a><p class="title"><b>Table&#160;1.66.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.clear.expression_semantics"></a><h6>
-<a name="id567188"></a>
-            <a href="clear.html#fusion.algorithm.transformation.functions.clear.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.clear.expression_semantics"></a><h6>
-<a name="id782457"></a>
+<a name="id775903"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">clear<span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="clear.html" title="clear"><code class="computeroutput"><span class="identifier">clear</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Expression Semantics</b></span>: Returns a sequence
+            <span class="bold"><strong>Expression Semantics</strong></span>: Returns a sequence
             with no elements.
           </p>
 <a name="fusion.algorithm.transformation.functions.clear.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567282"></a>
-            Complexity
-=======
-<a name="id819364"></a>
-=======
-<a name="id781117"></a>
-=======
-<a name="id773493"></a>
-=======
-<a name="id797133"></a>
-=======
-<a name="id785796"></a>
-=======
-<a name="id782519"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775966"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.functions.clear.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567311"></a>
-            Header
-=======
-<a name="id819383"></a>
-=======
-<a name="id781136"></a>
-=======
-<a name="id773512"></a>
-=======
-<a name="id797152"></a>
-=======
-<a name="id785815"></a>
-=======
-<a name="id782538"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775985"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">clear</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">clear</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.clear.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567478"></a>
-            Example
-=======
-<a name="id819498"></a>
-=======
-<a name="id781252"></a>
-=======
-<a name="id773627"></a>
-=======
-<a name="id797267"></a>
-=======
-<a name="id785930"></a>
-=======
-<a name="id782654"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id776100"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.functions.clear.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>clear<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> make_vector<span class="special">());</span>
+<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span><a class="link" href="clear.html" title="clear"><code class="computeroutput"><span class="identifier">clear</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">());</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>erase</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="clear.html" title="clear">
+<link rel="prev" href="clear.html" title="clear">
 <link rel="next" href="erase_key.html" title="erase_key">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,80 +22,27 @@
 <div class="spirit-nav">
 <a accesskey="p" href="clear.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="erase_key.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.erase"></a>erase
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="erase">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.erase"></a><a class="link" href="erase.html" title="erase">erase</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.erase.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567635"></a>
-            Description
-=======
-<a name="id819600"></a>
-=======
-<a name="id781354"></a>
-=======
-<a name="id773729"></a>
-=======
-<a name="id797369"></a>
-=======
-<a name="id786032"></a>
-=======
-<a name="id782756"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id776202"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence, containing all the elements of the original except
             those at a specified iterator, or between two iterators.
           </p>
 <a name="fusion.algorithm.transformation.functions.erase.synposis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id567666"></a>
-            Synposis
-=======
-<a name="id819622"></a>
-=======
-<a name="id781375"></a>
-=======
-<a name="id773751"></a>
-=======
-<a name="id797391"></a>
-=======
-<a name="id786054"></a>
-=======
-<a name="id782777"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id776224"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.synposis">Synposis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">First</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::erase<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">First</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">erase</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/erase.html" title="erase"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">erase</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">First</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">erase</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">First</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">it1</span><span class="special">);</span>
 
 <span class="keyword">template</span><span class="special">&lt;</span>
@@ -111,118 +50,102 @@
     <span class="keyword">typename</span> <span class="identifier">First</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">Last</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::erase<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">First</span><span class="special">,</span> <span class="identifier">Last</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">erase</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/erase.html" title="erase"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">erase</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">First</span><span class="special">,</span> <span class="identifier">Last</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">erase</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">First</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">it1</span><span class="special">,</span> <span class="identifier">Last</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">it2</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id568124"></a><p class="title"><b>Table 1.63. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id819954"></a><p class="title"><b>Table 1.63. Parameters</b></p>
-=======
-<a name="id781708"></a><p class="title"><b>Table 1.67. Parameters</b></p>
-=======
-<a name="id774083"></a><p class="title"><b>Table 1.67. Parameters</b></p>
-=======
-<a name="id797723"></a><p class="title"><b>Table&#160;1.67.&#160;Parameters</b></p>
-=======
-<a name="id786386"></a><p class="title"><b>Table&#160;1.67.&#160;Parameters</b></p>
-=======
-<a name="id783110"></a><p class="title"><b>Table&#160;1.67.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id776556"></a><p class="title"><b>Table&#160;1.67.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameters
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">it1</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">it1</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
-                  Iterator into <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
+                </p>
+                </td>
+<td>
+                <p>
+                  Iterator into <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">it2</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">it2</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
-                  Iterator into <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  after <tt class="computeroutput"><span class="identifier">it1</span></tt>
-                </p></td>
+                </p>
+                </td>
+<td>
+                <p>
+                  Iterator into <code class="computeroutput"><span class="identifier">seq</span></code>
+                  after <code class="computeroutput"><span class="identifier">it1</span></code>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.erase.expression_semantics"></a><h6>
-<a name="id568351"></a>
-            <a href="erase.html#fusion.algorithm.transformation.functions.erase.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.erase.expression_semantics"></a><h6>
-<a name="id783284"></a>
+<a name="id776730"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">erase<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">pos</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="erase.html" title="erase"><code class="computeroutput"><span class="identifier">erase</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">pos</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -237,20 +160,14 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            except the element at <tt class="computeroutput"><span class="identifier">pos</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>
+            except the element at <code class="computeroutput"><span class="identifier">pos</span></code>.
           </p>
-<pre class="programlisting">erase<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">last</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="erase.html" title="erase"><code class="computeroutput"><span class="identifier">erase</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">first</span><span class="special">,</span> <span class="identifier">last</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -265,106 +182,31 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, with
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
-            in their original order, except those in the range [<tt class="computeroutput"><span class="identifier">first</span></tt>,<tt class="computeroutput"><span class="identifier">last</span></tt>).
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, with
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
+            in their original order, except those in the range [<code class="computeroutput"><span class="identifier">first</span></code>,<code class="computeroutput"><span class="identifier">last</span></code>).
           </p>
 <a name="fusion.algorithm.transformation.functions.erase.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id568605"></a>
-            Complexity
-=======
-<a name="id820297"></a>
-=======
-<a name="id782106"></a>
-=======
-<a name="id774482"></a>
-=======
-<a name="id798122"></a>
-=======
-<a name="id786785"></a>
-=======
-<a name="id783508"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id776954"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.erase.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id568633"></a>
-            Header
-=======
-<a name="id820316"></a>
-=======
-<a name="id782125"></a>
-=======
-<a name="id774501"></a>
-=======
-<a name="id798141"></a>
-=======
-<a name="id786804"></a>
-=======
-<a name="id783527"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id776974"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">erase</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">erase</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.erase.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id568800"></a>
-            Example
-=======
-<a name="id820432"></a>
-=======
-<a name="id782240"></a>
-=======
-<a name="id774616"></a>
-=======
-<a name="id798256"></a>
-=======
-<a name="id786919"></a>
-=======
-<a name="id783642"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id777089"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.functions.erase.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">double</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2.0</span><span class="special">,</span> <span class="char">'c'</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>erase<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">vec</span><span class="special">)))</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'c'</span><span class="special">));<
/span>
-<span class="identifier">assert</span><span class="special">(</span>erase<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">vec</span><span class="special">)),</span> end<span class="special">(</span><span class="identifier">vec</span><span class="special">))</span> <span class="special">==</span> <a href="../../../container/generation/functions/make_vector.html" title="
make_vector"><tt class="computeroutput"><span class="identifier">make_vector</span></tt></a><span class="special">(</span><span class="number">1</span><span class="special">));</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">double</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2.0</span><span class="special">,</span> <span class="char">'c'</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="erase.html" title="erase"><code class="computeroutput"><span class="identifier">erase</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> <a class="link" href="../../../iterator/functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">)))</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="speci
al">,</span> <span class="char">'c'</span><span class="special">));</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="erase.html" title="erase"><code class="computeroutput"><span class="identifier">erase</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> <a class="link" href="../../../iterator/functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">)),</span> <a class="link" href="../../../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">))</span> <span class="special">==</span> <a cla
ss="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase_key.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/erase_key.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>erase_key</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="erase.html" title="erase">
+<link rel="prev" href="erase.html" title="erase">
 <link rel="next" href="insert.html" title="insert">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,88 +22,25 @@
 <div class="spirit-nav">
 <a accesskey="p" href="erase.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="insert.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.erase_key"></a>erase_key
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="erase_key">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.erase_key"></a><a class="link" href="erase_key.html" title="erase_key">erase_key</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.erase_key.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569251"></a>
-            Description
-=======
-<a name="id820735"></a>
-=======
-<a name="id782544"></a>
-=======
-<a name="id774920"></a>
-=======
-<a name="id798629"></a>
-=======
-<a name="id787292"></a>
-=======
-<a name="id784015"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id777461"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-<<<<<<< .working
-            For an <a href="../../../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
-            Sequence</a> <tt class="computeroutput"><span class="identifier">seq</span></tt>,
-            returns a <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a> containing all the elements of the original except those
-            with a given key.
-=======
             For an <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">associative</a>]
             <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
             <code class="computeroutput"><span class="identifier">seq</span></code>, returns a <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">associative</a>]
             <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
             containing all the elements of the original except those with a given
             key.
->>>>>>> .merge-right.r57242
           </p>
 <a name="fusion.algorithm.transformation.functions.erase_key.synposis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569311"></a>
-            Synposis
-=======
-<a name="id820774"></a>
-=======
-<a name="id782592"></a>
-=======
-<a name="id774968"></a>
-=======
-<a name="id798677"></a>
-=======
-<a name="id787340"></a>
-=======
-<a name="id784063"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id777509"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.synposis">Synposis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Key</span><span class="special">,</span>
@@ -120,59 +49,32 @@
 <span class="keyword">typename</span> <a class="link" href="../metafunctions/erase_key.html" title="erase_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">erase_key</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">erase_key</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569481"></a><p class="title"><b>Table 1.64. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id820898"></a><p class="title"><b>Table 1.64. Parameters</b></p>
-=======
-<a name="id783814"></a><p class="title"><b>Table 1.68. Parameters</b></p>
-=======
-<a name="id776190"></a><p class="title"><b>Table 1.68. Parameters</b></p>
-=======
-<a name="id798806"></a><p class="title"><b>Table&#160;1.68.&#160;Parameters</b></p>
-=======
-<a name="id787469"></a><p class="title"><b>Table&#160;1.68.&#160;Parameters</b></p>
-=======
-<a name="id784192"></a><p class="title"><b>Table&#160;1.68.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id777639"></a><p class="title"><b>Table&#160;1.68.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<<<<<<< .working
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
-=======
 <td>
                 <p>
                   <code class="computeroutput"><span class="identifier">seq</span></code>
@@ -182,145 +84,71 @@
                 <p>
                   A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a> and <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
->>>>>>> .merge-right.r57242
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Key</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Key</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Key to erase
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.erase_key.expression_semantics"></a><h6>
-<a name="id569620"></a>
-            <a href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.erase_key.expression_semantics"></a><h6>
-<a name="id784310"></a>
+<a name="id777756"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">erase_key<span class="special">&lt;</span><span class="identifier">Key</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="erase_key.html" title="erase_key"><code class="computeroutput"><span class="identifier">erase_key</span></code></a><span class="special">&lt;</span><span class="identifier">Key</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a> and <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
-            except those with key <tt class="computeroutput"><span class="identifier">Key</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
+            except those with key <code class="computeroutput"><span class="identifier">Key</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.erase_key.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569749"></a>
-            Complexity
-=======
-<a name="id821094"></a>
-=======
-<a name="id784020"></a>
-=======
-<a name="id776395"></a>
-=======
-<a name="id799011"></a>
-=======
-<a name="id787674"></a>
-=======
-<a name="id784398"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id777844"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.erase_key.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569777"></a>
-            Header
-=======
-<a name="id821116"></a>
-=======
-<a name="id784041"></a>
-=======
-<a name="id776417"></a>
-=======
-<a name="id799033"></a>
-=======
-<a name="id787696"></a>
-=======
-<a name="id784419"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id777866"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">erase_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">erase_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.erase_key.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id569944"></a>
-            Example
-=======
-<a name="id821236"></a>
-=======
-<a name="id784161"></a>
-=======
-<a name="id776537"></a>
-=======
-<a name="id799153"></a>
-=======
-<a name="id787816"></a>
-=======
-<a name="id784539"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id777986"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.functions.erase_key.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>erase_key<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span>make_map<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">long</span><span class="special">&gt;(</span><span class="char">'a'</span><span class="special">,</span> <span class="char">'b'</span><span class="special">))</span> <span class="special">==</span> make_map<span class="special">&lt;</span><span class="keyword">long</span><span class
="special">&gt;(</span><span class="char">'b'</span><span class="special">));</span>
+<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span><a class="link" href="erase_key.html" title="erase_key"><code class="computeroutput"><span class="identifier">erase_key</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><a class="link" href="../../../container/generation/functions/make_map.html" title="make_map"><code class="computeroutput"><span class="identifier">make_map</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">long</span><span class="special">&gt;(</span><span class="char">'a'</span><span class="special">,</span> <span class="char">'b'</span><span class="special">))</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_map.html" title="make_map"><code class="computeroutput"><span class="identifier">make_map</span></code></a><span class="special">&lt;
</span><span class="keyword">long</span><span class="special">&gt;(</span><span class="char">'b'</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>filter</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="../functions.html" title="Functions">
+<link rel="prev" href="../functions.html" title="Functions">
 <link rel="next" href="filter_if.html" title="filter_if">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,174 +22,101 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../functions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="filter_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.filter"></a>filter
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="filter">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.filter"></a><a class="link" href="filter.html" title="filter">filter</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.filter.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id557690"></a>
-            Description
-=======
-<a name="id809465"></a>
-=======
-<a name="id771900"></a>
-=======
-<a name="id764276"></a>
-=======
-<a name="id787956"></a>
-=======
-<a name="id776619"></a>
-=======
-<a name="id773342"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id766788"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             For a given sequence, filter returns a new sequences containing only
             the elements of a specified type.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id557721"></a>
-            Synopsis
-=======
-<a name="id809487"></a>
-=======
-<a name="id771922"></a>
-=======
-<a name="id764298"></a>
-=======
-<a name="id787977"></a>
-=======
-<a name="id776640"></a>
-=======
-<a name="id773364"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id766810"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::filter<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">filter</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/filter.html" title="filter"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">filter</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">filter</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id557902"></a><p class="title"><b>Table 1.53. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id811255"></a><p class="title"><b>Table 1.53. Parameters</b></p>
-=======
-<a name="id772052"></a><p class="title"><b>Table 1.57. Parameters</b></p>
-=======
-<a name="id764427"></a><p class="title"><b>Table 1.57. Parameters</b></p>
-=======
-<a name="id788107"></a><p class="title"><b>Table&#160;1.57.&#160;Parameters</b></p>
-=======
-<a name="id776770"></a><p class="title"><b>Table&#160;1.57.&#160;Parameters</b></p>
-=======
-<a name="id773493"></a><p class="title"><b>Table&#160;1.57.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id766940"></a><p class="title"><b>Table&#160;1.57.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The type to retain
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.filter.expression_semantics"></a><h6>
-<a name="id558039"></a>
-            <a href="filter.html#fusion.algorithm.transformation.functions.filter.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.filter.expression_semantics"></a><h6>
-<a name="id773606"></a>
+<a name="id767052"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">filter<span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="filter.html" title="filter"><code class="computeroutput"><span class="identifier">filter</span></code></a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -212,106 +131,31 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            of type <tt class="computeroutput"><span class="identifier">T</span></tt>. Equivalent
-            to <tt class="computeroutput">filter_if<span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">same_type</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>
+            of type <code class="computeroutput"><span class="identifier">T</span></code>. Equivalent
+            to <code class="computeroutput"><a class="link" href="filter_if.html" title="filter_if"><code class="computeroutput"><span class="identifier">filter_if</span></code></a><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">same_type</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558250"></a>
-            Complexity
-=======
-<a name="id811508"></a>
-=======
-<a name="id772332"></a>
-=======
-<a name="id764708"></a>
-=======
-<a name="id788388"></a>
-=======
-<a name="id777051"></a>
-=======
-<a name="id773774"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id767220"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558280"></a>
-            Header
-=======
-<a name="id811528"></a>
-=======
-<a name="id772352"></a>
-=======
-<a name="id764727"></a>
-=======
-<a name="id788407"></a>
-=======
-<a name="id777070"></a>
-=======
-<a name="id773793"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id767240"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">filter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">filter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.filter.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558447"></a>
-            Example
-=======
-<a name="id811645"></a>
-=======
-<a name="id772469"></a>
-=======
-<a name="id764845"></a>
-=======
-<a name="id788524"></a>
-=======
-<a name="id777188"></a>
-=======
-<a name="id773911"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id767357"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.functions.filter.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">long</span><span class="special">,</span><span class="keyword">long</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>filter<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">long</span><span class="special">,</span><span class="keyword">long</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="filter.html" title="filter"><code class="computeroutput"><span class="identifier">filter</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter_if.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/filter_if.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>filter_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="filter.html" title="filter">
+<link rel="prev" href="filter.html" title="filter">
 <link rel="next" href="transform.html" title="transform">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,176 +22,103 @@
 <div class="spirit-nav">
 <a accesskey="p" href="filter.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="transform.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.filter_if"></a>filter_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="filter_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.filter_if"></a><a class="link" href="filter_if.html" title="filter_if">filter_if</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.filter_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558709"></a>
-            Description
-=======
-<a name="id811829"></a>
-=======
-<a name="id772653"></a>
-=======
-<a name="id765029"></a>
-=======
-<a name="id788708"></a>
-=======
-<a name="id777371"></a>
-=======
-<a name="id774094"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id767541"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            For a given sequence, filter_if returns a new sequences
+            For a given sequence, <a class="link" href="filter_if.html" title="filter_if"><code class="computeroutput"><span class="identifier">filter_if</span></code></a> returns a new sequences
             containing only the elements with types for which a given <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
-            Lambda Expression</a> evaluates to <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>.
+            Lambda Expression</a> evaluates to <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558796"></a>
-            Synopsis
-=======
-<a name="id811886"></a>
-=======
-<a name="id772710"></a>
-=======
-<a name="id765086"></a>
-=======
-<a name="id788766"></a>
-=======
-<a name="id777429"></a>
-=======
-<a name="id774152"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id767598"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Pred</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::filter_if<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">filter_if</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/filter_if.html" title="filter_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">filter_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">filter_if</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id558979"></a><p class="title"><b>Table 1.54. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id812016"></a><p class="title"><b>Table 1.54. Parameters</b></p>
-=======
-<a name="id772840"></a><p class="title"><b>Table 1.58. Parameters</b></p>
-=======
-<a name="id765216"></a><p class="title"><b>Table 1.58. Parameters</b></p>
-=======
-<a name="id788895"></a><p class="title"><b>Table&#160;1.58.&#160;Parameters</b></p>
-=======
-<a name="id777558"></a><p class="title"><b>Table&#160;1.58.&#160;Parameters</b></p>
-=======
-<a name="id774282"></a><p class="title"><b>Table&#160;1.58.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id767728"></a><p class="title"><b>Table&#160;1.58.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Pred</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Pred</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A unary <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
                   Lambda Expression</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The predicate to filter by
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.filter_if.expression_semantics"></a><h6>
-<a name="id559127"></a>
-            <a href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.filter_if.expression_semantics"></a><h6>
-<a name="id774400"></a>
+<a name="id767847"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">filter_if<span class="special">&lt;</span><span class="identifier">Pred</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="filter_if.html" title="filter_if"><code class="computeroutput"><span class="identifier">filter_if</span></code></a><span class="special">&lt;</span><span class="identifier">Pred</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -214,107 +133,32 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            with types for which <tt class="computeroutput"><span class="identifier">Pred</span></tt>
-            evaluates to <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>. The order of the retained elements
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>
+            with types for which <code class="computeroutput"><span class="identifier">Pred</span></code>
+            evaluates to <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>. The order of the retained elements
             is the same as in the original sequence.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id559288"></a>
-            Complexity
-=======
-<a name="id812239"></a>
-=======
-<a name="id773091"></a>
-=======
-<a name="id765467"></a>
-=======
-<a name="id789146"></a>
-=======
-<a name="id777809"></a>
-=======
-<a name="id774532"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id767979"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.filter_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id559316"></a>
-            Header
-=======
-<a name="id812261"></a>
-=======
-<a name="id773112"></a>
-=======
-<a name="id765488"></a>
-=======
-<a name="id789168"></a>
-=======
-<a name="id777831"></a>
-=======
-<a name="id774554"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id768000"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">filter_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">filter_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.filter_if.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id559484"></a>
-            Example
-=======
-<a name="id812381"></a>
-=======
-<a name="id773232"></a>
-=======
-<a name="id765608"></a>
-=======
-<a name="id789288"></a>
-=======
-<a name="id777951"></a>
-=======
-<a name="id774674"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id768120"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.functions.filter_if.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3.0</span><span class="special">,</span><span class="number">4.0</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>filter_if<span class="special">&lt;</span><span class="identifier">is_integral</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3.0</span><span class="special">,</span><span class="number">4.0</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="filter_if.html" title="filter_if"><code class="computeroutput"><span class="identifier">filter_if</span></code></a><span class="special">&lt;</span><span class="identifier">is_integral</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>insert</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="erase_key.html" title="erase_key">
+<link rel="prev" href="erase_key.html" title="erase_key">
 <link rel="next" href="insert_range.html" title="insert_range">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="erase_key.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="insert_range.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.insert"></a>insert
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="insert">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.insert"></a><a class="link" href="insert.html" title="insert">insert</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.insert.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id570144"></a>
-            Description
-=======
-<a name="id822464"></a>
-=======
-<a name="id784297"></a>
-=======
-<a name="id776673"></a>
-=======
-<a name="id799289"></a>
-=======
-<a name="id787952"></a>
-=======
-<a name="id784675"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id778121"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence with all the elements of the original, an a new
             element inserted the position described by a given iterator.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert.synposis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id570175"></a>
-            Synposis
-=======
-<a name="id822486"></a>
-=======
-<a name="id784318"></a>
-=======
-<a name="id776694"></a>
-=======
-<a name="id799310"></a>
-=======
-<a name="id787973"></a>
-=======
-<a name="id784696"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id778143"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.synposis">Synposis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -108,111 +47,96 @@
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">Pos</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">pos</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id570363"></a><p class="title"><b>Table 1.65. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id822626"></a><p class="title"><b>Table 1.65. Parameters</b></p>
-=======
-<a name="id784514"></a><p class="title"><b>Table 1.69. Parameters</b></p>
-=======
-<a name="id776890"></a><p class="title"><b>Table 1.69. Parameters</b></p>
-=======
-<a name="id799506"></a><p class="title"><b>Table&#160;1.69.&#160;Parameters</b></p>
-=======
-<a name="id788169"></a><p class="title"><b>Table&#160;1.69.&#160;Parameters</b></p>
-=======
-<a name="id784892"></a><p class="title"><b>Table&#160;1.69.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id778338"></a><p class="title"><b>Table&#160;1.69.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">pos</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">pos</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The position to insert at
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">t</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">t</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The value to insert
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.insert.expression_semantics"></a><h6>
-<a name="id570546"></a>
-            <a href="insert.html#fusion.algorithm.transformation.functions.insert.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.insert.expression_semantics"></a><h6>
-<a name="id785041"></a>
+<a name="id778487"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">insert<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">p</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="insert.html" title="insert"><code class="computeroutput"><span class="identifier">insert</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">p</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -227,107 +151,32 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
             in their original order, and a new element with the type and value of
-            <tt class="computeroutput"><span class="identifier">t</span></tt> inserted at iterator
-            <tt class="computeroutput"><span class="identifier">pos</span></tt>.
+            <code class="computeroutput"><span class="identifier">t</span></code> inserted at iterator
+            <code class="computeroutput"><span class="identifier">pos</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id570697"></a>
-            Complexity
-=======
-<a name="id822874"></a>
-=======
-<a name="id784790"></a>
-=======
-<a name="id777166"></a>
-=======
-<a name="id799782"></a>
-=======
-<a name="id788445"></a>
-=======
-<a name="id785168"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id778614"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id570726"></a>
-            Header
-=======
-<a name="id822894"></a>
-=======
-<a name="id784809"></a>
-=======
-<a name="id777185"></a>
-=======
-<a name="id799801"></a>
-=======
-<a name="id788464"></a>
-=======
-<a name="id785187"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id778634"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">insert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">insert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.insert.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id570892"></a>
-            Example
-=======
-<a name="id823011"></a>
-=======
-<a name="id784927"></a>
-=======
-<a name="id777303"></a>
-=======
-<a name="id799919"></a>
-=======
-<a name="id788582"></a>
-=======
-<a name="id785305"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id778751"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.functions.insert.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>insert<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">vec</span><span class="special">)),</span> <span class="number">3</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,
</span><span class="number">3</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="insert.html" title="insert"><code class="computeroutput"><span class="identifier">insert</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> <a class="link" href="../../../iterator/functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">)),</span> <span class="number">3</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="s
pecial">(</span><span class="number">1</span><span class="special">,</span><span class="number">3</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert_range.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert_range.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/insert_range.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>insert_range</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="insert.html" title="insert">
+<link rel="prev" href="insert.html" title="insert">
 <link rel="next" href="join.html" title="join">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,191 +22,122 @@
 <div class="spirit-nav">
 <a accesskey="p" href="insert.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="join.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.insert_range"></a>insert_range
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="insert_range">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.insert_range"></a><a class="link" href="insert_range.html" title="insert_range">insert_range</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.insert_range.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id571178"></a>
-            Description
-=======
-<a name="id823204"></a>
-=======
-<a name="id785120"></a>
-=======
-<a name="id777496"></a>
-=======
-<a name="id800112"></a>
-=======
-<a name="id788775"></a>
-=======
-<a name="id785498"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id778944"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence with another sequence inserted at a specified
             iterator.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert_range.synposis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id571208"></a>
-            Synposis
-=======
-<a name="id823224"></a>
-=======
-<a name="id785139"></a>
-=======
-<a name="id777515"></a>
-=======
-<a name="id800131"></a>
-=======
-<a name="id788794"></a>
-=======
-<a name="id785517"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id778964"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.synposis">Synposis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">Pos</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">Range</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::insert_range<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Pos</span><span class="special">,</span> <span class="identifier">Range</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">insert_range</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/insert_range.html" title="insert_range"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">insert_range</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Pos</span><span class="special">,</span> <span class="identifier">Range</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">insert_range</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">Pos</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">pos</span><span class="special">,</span> <span class="identifier">Range</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">range</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id571477"></a><p class="title"><b>Table 1.66. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id823422"></a><p class="title"><b>Table 1.66. Parameters</b></p>
-=======
-<a name="id785337"></a><p class="title"><b>Table 1.70. Parameters</b></p>
-=======
-<a name="id777713"></a><p class="title"><b>Table 1.70. Parameters</b></p>
-=======
-<a name="id800329"></a><p class="title"><b>Table&#160;1.70.&#160;Parameters</b></p>
-=======
-<a name="id788992"></a><p class="title"><b>Table&#160;1.70.&#160;Parameters</b></p>
-=======
-<a name="id785715"></a><p class="title"><b>Table&#160;1.70.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id779162"></a><p class="title"><b>Table&#160;1.70.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">pos</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">pos</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The position to insert at
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">range</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">range</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Range to insert
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.insert_range.expression_semantics"></a><h6>
-<a name="id571670"></a>
-            <a href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.insert_range.expression_semantics"></a><h6>
-<a name="id785869"></a>
+<a name="id779315"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">insert<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">pos</span><span class="special">,</span> <span class="identifier">range</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="insert.html" title="insert"><code class="computeroutput"><span class="identifier">insert</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">pos</span><span class="special">,</span> <span class="identifier">range</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -229,107 +152,32 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
-            and the elements of <tt class="computeroutput"><span class="identifier">range</span></tt>
-            inserted at iterator <tt class="computeroutput"><span class="identifier">pos</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
+            and the elements of <code class="computeroutput"><span class="identifier">range</span></code>
+            inserted at iterator <code class="computeroutput"><span class="identifier">pos</span></code>.
             All elements retaining their ordering from the orignal sequences.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert_range.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id571824"></a>
-            Complexity
-=======
-<a name="id823672"></a>
-=======
-<a name="id785616"></a>
-=======
-<a name="id777991"></a>
-=======
-<a name="id800607"></a>
-=======
-<a name="id789270"></a>
-=======
-<a name="id785994"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id779440"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.insert_range.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id571852"></a>
-            Header
-=======
-<a name="id823692"></a>
-=======
-<a name="id785635"></a>
-=======
-<a name="id778011"></a>
-=======
-<a name="id800627"></a>
-=======
-<a name="id789290"></a>
-=======
-<a name="id786013"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id779459"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">insert_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">insert_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.insert_range.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id572019"></a>
-            Example
-=======
-<a name="id823812"></a>
-=======
-<a name="id785755"></a>
-=======
-<a name="id778131"></a>
-=======
-<a name="id800747"></a>
-=======
-<a name="id790502"></a>
-=======
-<a name="id787226"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id780672"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.functions.insert_range.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>insert_range<span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">vec</span><span class="special">)),</span> make_vector<span class="special">(</span><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">))</span> <span 
class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="insert_range.html" title="insert_range"><code class="computeroutput"><span class="identifier">insert_range</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> <a class="link" href="../../../iterator/functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">vec</span><span class="special">)),</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">3</span><span class="special">,</span
><span class="number">4</span><span class="special">))</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/join.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/join.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/join.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>join</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="insert_range.html" title="insert_range">
+<link rel="prev" href="insert_range.html" title="insert_range">
 <link rel="next" href="zip.html" title="zip">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,175 +22,101 @@
 <div class="spirit-nav">
 <a accesskey="p" href="insert_range.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="zip.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.join"></a>join
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="join">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.join"></a><a class="link" href="join.html" title="join">join</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.join.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id572345"></a>
-            Description
-=======
-<a name="id824034"></a>
-=======
-<a name="id785977"></a>
-=======
-<a name="id778626"></a>
-=======
-<a name="id802334"></a>
-=======
-<a name="id790724"></a>
-=======
-<a name="id787448"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id780894"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Takes 2 sequences and returns a sequence containing the elements of the
             first followed by the elements of the second.
           </p>
 <a name="fusion.algorithm.transformation.functions.join.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id572375"></a>
-            Synopsis
-=======
-<a name="id824053"></a>
-=======
-<a name="id786270"></a>
-=======
-<a name="id778645"></a>
-=======
-<a name="id802354"></a>
-=======
-<a name="id790744"></a>
-=======
-<a name="id787467"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id780913"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">LhSequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">RhSequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::join<span class="special">&lt;</span><span class="identifier">LhSequence</span><span class="special">,</span> <span class="identifier">RhSequence</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">join</span><span class="special">(</span><span class="identifier">LhSequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> <span class="identifier">RhSequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/join.html" title="join"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">join</span></code></a><span class="special">&lt;</span><span class="identifier">LhSequence</span><span class="special">,</span> <span class="identifier">RhSequence</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">join</span><span class="special">(</span><span class="identifier">LhSequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">lhs</span><span class="special">,</span> <span class="identifier">RhSequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id572579"></a><p class="title"><b>Table 1.67. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id824196"></a><p class="title"><b>Table 1.67. Parameters</b></p>
-=======
-<a name="id786412"></a><p class="title"><b>Table 1.71. Parameters</b></p>
-=======
-<a name="id778788"></a><p class="title"><b>Table 1.71. Parameters</b></p>
-=======
-<a name="id802496"></a><p class="title"><b>Table&#160;1.71.&#160;Parameters</b></p>
-=======
-<a name="id790886"></a><p class="title"><b>Table&#160;1.71.&#160;Parameters</b></p>
-=======
-<a name="id787610"></a><p class="title"><b>Table&#160;1.71.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id781056"></a><p class="title"><b>Table&#160;1.71.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">lhs</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">lhs</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">rhs</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">rhs</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.join.expression_semantics"></a><h6>
-<a name="id572726"></a>
-            <a href="join.html#fusion.algorithm.transformation.functions.join.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.join.expression_semantics"></a><h6>
-<a name="id787728"></a>
+<a name="id781175"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">join<span class="special">(</span><span class="identifier">lhs</span><span class="special">,</span> <span class="identifier">rhs</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="join.html" title="join"><code class="computeroutput"><span class="identifier">join</span></code></a><span class="special">(</span><span class="identifier">lhs</span><span class="special">,</span> <span class="identifier">rhs</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -214,107 +132,32 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
-            all the elements of <tt class="computeroutput"><span class="identifier">lhs</span></tt>
-            followed by all the elements of <tt class="computeroutput"><span class="identifier">rhs</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence containing
+            all the elements of <code class="computeroutput"><span class="identifier">lhs</span></code>
+            followed by all the elements of <code class="computeroutput"><span class="identifier">rhs</span></code>.
             The order of the elements is preserved.
           </p>
 <a name="fusion.algorithm.transformation.functions.join.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id572854"></a>
-            Complexity
-=======
-<a name="id824400"></a>
-=======
-<a name="id786650"></a>
-=======
-<a name="id779026"></a>
-=======
-<a name="id802734"></a>
-=======
-<a name="id791124"></a>
-=======
-<a name="id787847"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id781294"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.join.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id572884"></a>
-            Header
-=======
-<a name="id824419"></a>
-=======
-<a name="id786669"></a>
-=======
-<a name="id779045"></a>
-=======
-<a name="id802753"></a>
-=======
-<a name="id791143"></a>
-=======
-<a name="id787866"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id781313"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">join</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">join</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.join.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id573050"></a>
-            Example
-=======
-<a name="id824534"></a>
-=======
-<a name="id786784"></a>
-=======
-<a name="id779160"></a>
-=======
-<a name="id802868"></a>
-=======
-<a name="id791258"></a>
-=======
-<a name="id787982"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id781428"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.functions.join.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="char">'b'</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>join<span class="special">(</span><span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="char">'a'</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="char">'b'</span><span class="special">));</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="char">'b'</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="join.html" title="join"><code class="computeroutput"><span class="identifier">join</span></code></a><span class="special">(</span><span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="char">'a'</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="char">'b'</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_back.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_back.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>pop_back</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="zip.html" title="zip">
+<link rel="prev" href="zip.html" title="zip">
 <link rel="next" href="pop_front.html" title="pop_front">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,159 +22,80 @@
 <div class="spirit-nav">
 <a accesskey="p" href="zip.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="pop_front.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.pop_back"></a>pop_back
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="pop_back">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.pop_back"></a><a class="link" href="pop_back.html" title="pop_back">pop_back</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.pop_back.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id574644"></a>
-            Description
-=======
-<a name="id826744"></a>
-=======
-<a name="id787902"></a>
-=======
-<a name="id780277"></a>
-=======
-<a name="id803986"></a>
-=======
-<a name="id792376"></a>
-=======
-<a name="id789099"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id782545"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence, with the last element of the original removed.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_back.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id574674"></a>
-            Synopsis
-=======
-<a name="id826766"></a>
-=======
-<a name="id787923"></a>
-=======
-<a name="id780299"></a>
-=======
-<a name="id804007"></a>
-=======
-<a name="id792397"></a>
-=======
-<a name="id789120"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id782567"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::pop_back<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">pop_back</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/pop_back.html" title="pop_back"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">pop_back</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">pop_back</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id574828"></a><p class="title"><b>Table 1.69. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id826874"></a><p class="title"><b>Table 1.69. Parameters</b></p>
-=======
-<a name="id788031"></a><p class="title"><b>Table 1.73. Parameters</b></p>
-=======
-<a name="id780407"></a><p class="title"><b>Table 1.73. Parameters</b></p>
-=======
-<a name="id804115"></a><p class="title"><b>Table&#160;1.73.&#160;Parameters</b></p>
-=======
-<a name="id792505"></a><p class="title"><b>Table&#160;1.73.&#160;Parameters</b></p>
-=======
-<a name="id789228"></a><p class="title"><b>Table&#160;1.73.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id782675"></a><p class="title"><b>Table&#160;1.73.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.pop_back.expression_semantics"></a><h6>
-<a name="id574930"></a>
-            <a href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.pop_back.expression_semantics"></a><h6>
-<a name="id789311"></a>
+<a name="id782758"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">pop_back<span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="pop_back.html" title="pop_back"><code class="computeroutput"><span class="identifier">pop_back</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -197,105 +110,30 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
             except the last element. The elements in the new sequence are in the
-            same order as they were in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            same order as they were in <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_back.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id575047"></a>
-            Complexity
-=======
-<a name="id827032"></a>
-=======
-<a name="id788217"></a>
-=======
-<a name="id780593"></a>
-=======
-<a name="id804301"></a>
-=======
-<a name="id793511"></a>
-=======
-<a name="id790234"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id783681"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_back.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id575077"></a>
-            Header
-=======
-<a name="id827054"></a>
-=======
-<a name="id788239"></a>
-=======
-<a name="id780615"></a>
-=======
-<a name="id804323"></a>
-=======
-<a name="id793533"></a>
-=======
-<a name="id790256"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id783702"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">pop_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">pop_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.pop_back.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id575245"></a>
-            Example
-=======
-<a name="id827174"></a>
-=======
-<a name="id788359"></a>
-=======
-<a name="id780735"></a>
-=======
-<a name="id804990"></a>
-=======
-<a name="id793653"></a>
-=======
-<a name="id790376"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id783822"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.functions.pop_back.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span><span class="identifier">___pop_back__</span><span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
+<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span><span class="identifier">___pop_back__</span><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_front.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/pop_front.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>pop_front</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="pop_back.html" title="pop_back">
+<link rel="prev" href="pop_back.html" title="pop_back">
 <link rel="next" href="push_back.html" title="push_back">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,159 +22,80 @@
 <div class="spirit-nav">
 <a accesskey="p" href="pop_back.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="push_back.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.pop_front"></a>pop_front
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="pop_front">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.pop_front"></a><a class="link" href="pop_front.html" title="pop_front">pop_front</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.pop_front.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id575413"></a>
-            Description
-=======
-<a name="id827288"></a>
-=======
-<a name="id790112"></a>
-=======
-<a name="id782488"></a>
-=======
-<a name="id805104"></a>
-=======
-<a name="id793767"></a>
-=======
-<a name="id790490"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id783936"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence, with the first element of the original removed.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_front.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id575443"></a>
-            Synopsis
-=======
-<a name="id827309"></a>
-=======
-<a name="id790133"></a>
-=======
-<a name="id782509"></a>
-=======
-<a name="id805125"></a>
-=======
-<a name="id793788"></a>
-=======
-<a name="id790511"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id783958"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::pop_front<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">pop_front</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/pop_front.html" title="pop_front"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">pop_front</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">pop_front</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id575597"></a><p class="title"><b>Table 1.70. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id827417"></a><p class="title"><b>Table 1.70. Parameters</b></p>
-=======
-<a name="id790241"></a><p class="title"><b>Table 1.74. Parameters</b></p>
-=======
-<a name="id782617"></a><p class="title"><b>Table 1.74. Parameters</b></p>
-=======
-<a name="id805233"></a><p class="title"><b>Table&#160;1.74.&#160;Parameters</b></p>
-=======
-<a name="id793896"></a><p class="title"><b>Table&#160;1.74.&#160;Parameters</b></p>
-=======
-<a name="id790619"></a><p class="title"><b>Table&#160;1.74.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id784066"></a><p class="title"><b>Table&#160;1.74.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.pop_front.expression_semantics"></a><h6>
-<a name="id575701"></a>
-            <a href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.pop_front.expression_semantics"></a><h6>
-<a name="id790702"></a>
+<a name="id784149"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">pop_front<span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="pop_front.html" title="pop_front"><code class="computeroutput"><span class="identifier">pop_front</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -197,105 +110,30 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
             except the first element. The elements in the new sequence are in the
-            same order as they were in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            same order as they were in <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_front.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id575820"></a>
-            Complexity
-=======
-<a name="id827576"></a>
-=======
-<a name="id790427"></a>
-=======
-<a name="id782803"></a>
-=======
-<a name="id805419"></a>
-=======
-<a name="id794082"></a>
-=======
-<a name="id790805"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id784252"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.pop_front.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id575848"></a>
-            Header
-=======
-<a name="id827597"></a>
-=======
-<a name="id790449"></a>
-=======
-<a name="id782825"></a>
-=======
-<a name="id805441"></a>
-=======
-<a name="id794104"></a>
-=======
-<a name="id790827"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id784273"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">pop_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">pop_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.pop_front.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id576014"></a>
-            Example
-=======
-<a name="id827717"></a>
-=======
-<a name="id790569"></a>
-=======
-<a name="id782945"></a>
-=======
-<a name="id805561"></a>
-=======
-<a name="id794224"></a>
-=======
-<a name="id790947"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id784393"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.functions.pop_front.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>pop_front<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">));</span>
+<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span><a class="link" href="pop_front.html" title="pop_front"><code class="computeroutput"><span class="identifier">pop_front</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_back.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_back.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>push_back</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="pop_front.html" title="pop_front">
+<link rel="prev" href="pop_front.html" title="pop_front">
 <link rel="next" href="push_front.html" title="push_front">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,174 +22,101 @@
 <div class="spirit-nav">
 <a accesskey="p" href="pop_front.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="push_front.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.push_back"></a>push_back
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="push_back">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.push_back"></a><a class="link" href="push_back.html" title="push_back">push_back</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.push_back.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id576190"></a>
-            Description
-=======
-<a name="id827836"></a>
-=======
-<a name="id790688"></a>
-=======
-<a name="id783064"></a>
-=======
-<a name="id805680"></a>
-=======
-<a name="id794343"></a>
-=======
-<a name="id791066"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id784512"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence with an element added at the end.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_back.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id576220"></a>
-            Synopsis
-=======
-<a name="id827858"></a>
-=======
-<a name="id790709"></a>
-=======
-<a name="id783085"></a>
-=======
-<a name="id805701"></a>
-=======
-<a name="id794364"></a>
-=======
-<a name="id791087"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id784534"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">T</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::push_back<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">push_back</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">push_back</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">push_back</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id576426"></a><p class="title"><b>Table 1.71. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id828006"></a><p class="title"><b>Table 1.71. Parameters</b></p>
-=======
-<a name="id790857"></a><p class="title"><b>Table 1.75. Parameters</b></p>
-=======
-<a name="id783233"></a><p class="title"><b>Table 1.75. Parameters</b></p>
-=======
-<a name="id805849"></a><p class="title"><b>Table&#160;1.75.&#160;Parameters</b></p>
-=======
-<a name="id794512"></a><p class="title"><b>Table&#160;1.75.&#160;Parameters</b></p>
-=======
-<a name="id791235"></a><p class="title"><b>Table&#160;1.75.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id784681"></a><p class="title"><b>Table&#160;1.75.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">t</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">t</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The value to add to the end
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.push_back.expression_semantics"></a><h6>
-<a name="id576567"></a>
-            <a href="push_back.html#fusion.algorithm.transformation.functions.push_back.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.push_back.expression_semantics"></a><h6>
-<a name="id791349"></a>
+<a name="id784795"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">push_back<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -212,105 +131,30 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
-            and new element <tt class="computeroutput"><span class="identifier">t</span></tt> appended
-            to the end. The elements are in the same order as they were in <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
+            and new element <code class="computeroutput"><span class="identifier">t</span></code> appended
+            to the end. The elements are in the same order as they were in <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_back.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id576708"></a>
-            Complexity
-=======
-<a name="id828211"></a>
-=======
-<a name="id791090"></a>
-=======
-<a name="id783466"></a>
-=======
-<a name="id806082"></a>
-=======
-<a name="id794745"></a>
-=======
-<a name="id791468"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id784914"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_back.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id576737"></a>
-            Header
-=======
-<a name="id828232"></a>
-=======
-<a name="id791111"></a>
-=======
-<a name="id783487"></a>
-=======
-<a name="id806103"></a>
-=======
-<a name="id794766"></a>
-=======
-<a name="id791489"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id784936"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">push_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">push_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.push_back.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id576904"></a>
-            Example
-=======
-<a name="id828352"></a>
-=======
-<a name="id791231"></a>
-=======
-<a name="id783607"></a>
-=======
-<a name="id806223"></a>
-=======
-<a name="id794886"></a>
-=======
-<a name="id791609"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id785056"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.functions.push_back.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>push_back<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">),</span><span class="number">4</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</s
pan><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">));</span>
+<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span><a class="link" href="push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">),</span><span class="number">4</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><spa
n class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">,</span><span class="number">4</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_front.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/push_front.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>push_front</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="push_back.html" title="push_back">
+<link rel="prev" href="push_back.html" title="push_back">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,174 +22,101 @@
 <div class="spirit-nav">
 <a accesskey="p" href="push_back.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.push_front"></a>push_front
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="push_front">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.push_front"></a><a class="link" href="push_front.html" title="push_front">push_front</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.push_front.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id577112"></a>
-            Description
-=======
-<a name="id828490"></a>
-=======
-<a name="id791369"></a>
-=======
-<a name="id783745"></a>
-=======
-<a name="id806361"></a>
-=======
-<a name="id795024"></a>
-=======
-<a name="id791747"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id785194"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence with an element added at the beginning.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_front.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id577142"></a>
-            Synopsis
-=======
-<a name="id828510"></a>
-=======
-<a name="id791389"></a>
-=======
-<a name="id783764"></a>
-=======
-<a name="id806380"></a>
-=======
-<a name="id795043"></a>
-=======
-<a name="id791767"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id785213"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">T</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::push_front<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">push_front</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/push_front.html" title="push_front"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">push_front</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">push_front</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id577349"></a><p class="title"><b>Table 1.72. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id828660"></a><p class="title"><b>Table 1.72. Parameters</b></p>
-=======
-<a name="id791539"></a><p class="title"><b>Table 1.76. Parameters</b></p>
-=======
-<a name="id783914"></a><p class="title"><b>Table 1.76. Parameters</b></p>
-=======
-<a name="id806530"></a><p class="title"><b>Table&#160;1.76.&#160;Parameters</b></p>
-=======
-<a name="id795193"></a><p class="title"><b>Table&#160;1.76.&#160;Parameters</b></p>
-=======
-<a name="id791917"></a><p class="title"><b>Table&#160;1.76.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id785363"></a><p class="title"><b>Table&#160;1.76.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">t</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">t</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The value to add to the beginning
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.push_front.expression_semantics"></a><h6>
-<a name="id577488"></a>
-            <a href="push_front.html#fusion.algorithm.transformation.functions.push_front.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.push_front.expression_semantics"></a><h6>
-<a name="id792029"></a>
+<a name="id785476"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">push_back<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -212,106 +131,31 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
-            and new element <tt class="computeroutput"><span class="identifier">t</span></tt> appended
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
+            and new element <code class="computeroutput"><span class="identifier">t</span></code> appended
             to the beginning. The elements are in the same order as they were in
-            <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_front.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id577629"></a>
-            Complexity
-=======
-<a name="id828864"></a>
-=======
-<a name="id791770"></a>
-=======
-<a name="id784146"></a>
-=======
-<a name="id806762"></a>
-=======
-<a name="id795425"></a>
-=======
-<a name="id792148"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id785595"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.push_front.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id577657"></a>
-            Header
-=======
-<a name="id828885"></a>
-=======
-<a name="id791792"></a>
-=======
-<a name="id784168"></a>
-=======
-<a name="id806784"></a>
-=======
-<a name="id795447"></a>
-=======
-<a name="id792170"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id785616"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">push_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">push_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.push_front.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id577824"></a>
-            Example
-=======
-<a name="id829005"></a>
-=======
-<a name="id791912"></a>
-=======
-<a name="id784288"></a>
-=======
-<a name="id806904"></a>
-=======
-<a name="id795567"></a>
-=======
-<a name="id792290"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id785736"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.functions.push_front.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>push_front<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">),</span><span class="number">0</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">0</span><span class="special">,</span><span class="number">1</span><span class="special">,
</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">));</span>
+<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span><a class="link" href="push_front.html" title="push_front"><code class="computeroutput"><span class="identifier">push_front</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">),</span><span class="number">0</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">0</span><span class="special">,</span><
span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>remove</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="replace_if.html" title="replace_if">
+<link rel="prev" href="replace_if.html" title="replace_if">
 <link rel="next" href="remove_if.html" title="remove_if">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,174 +22,101 @@
 <div class="spirit-nav">
 <a accesskey="p" href="replace_if.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="remove_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.remove"></a>remove
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="remove">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.remove"></a><a class="link" href="remove.html" title="remove">remove</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.remove.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id564084"></a>
-            Description
-=======
-<a name="id817028"></a>
-=======
-<a name="id778699"></a>
-=======
-<a name="id771075"></a>
-=======
-<a name="id794754"></a>
-=======
-<a name="id783417"></a>
-=======
-<a name="id780140"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id773587"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence, with all the elements of the original sequence,
             except those of a given type.
           </p>
 <a name="fusion.algorithm.transformation.functions.remove.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id564115"></a>
-            Synopsis
-=======
-<a name="id817050"></a>
-=======
-<a name="id778720"></a>
-=======
-<a name="id771096"></a>
-=======
-<a name="id794776"></a>
-=======
-<a name="id783439"></a>
-=======
-<a name="id780162"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id773608"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::remove<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">replace</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/remove.html" title="remove"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">remove</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">replace</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id564298"></a><p class="title"><b>Table 1.59. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id817179"></a><p class="title"><b>Table 1.59. Parameters</b></p>
-=======
-<a name="id778850"></a><p class="title"><b>Table 1.63. Parameters</b></p>
-=======
-<a name="id771226"></a><p class="title"><b>Table 1.63. Parameters</b></p>
-=======
-<a name="id794905"></a><p class="title"><b>Table&#160;1.63.&#160;Parameters</b></p>
-=======
-<a name="id783568"></a><p class="title"><b>Table&#160;1.63.&#160;Parameters</b></p>
-=======
-<a name="id780292"></a><p class="title"><b>Table&#160;1.63.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id773738"></a><p class="title"><b>Table&#160;1.63.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Type to remove
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.remove.expression_semantics"></a><h6>
-<a name="id564434"></a>
-            <a href="remove.html#fusion.algorithm.transformation.functions.remove.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.remove.expression_semantics"></a><h6>
-<a name="id780404"></a>
+<a name="id773851"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">remove<span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="remove.html" title="remove"><code class="computeroutput"><span class="identifier">remove</span></code></a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -212,106 +131,31 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
-            in their original order, except those of type <tt class="computeroutput"><span class="identifier">T</span></tt>.
-            Equivalent to <tt class="computeroutput">remove_if<span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
+            in their original order, except those of type <code class="computeroutput"><span class="identifier">T</span></code>.
+            Equivalent to <code class="computeroutput"><a class="link" href="remove_if.html" title="remove_if"><code class="computeroutput"><span class="identifier">remove_if</span></code></a><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.remove.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id564647"></a>
-            Complexity
-=======
-<a name="id817432"></a>
-=======
-<a name="id779131"></a>
-=======
-<a name="id771507"></a>
-=======
-<a name="id795186"></a>
-=======
-<a name="id783849"></a>
-=======
-<a name="id780572"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id774019"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.remove.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id564677"></a>
-            Header
-=======
-<a name="id817452"></a>
-=======
-<a name="id779150"></a>
-=======
-<a name="id771526"></a>
-=======
-<a name="id795205"></a>
-=======
-<a name="id783868"></a>
-=======
-<a name="id780592"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id774038"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">remove</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">remove</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.remove.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id564843"></a>
-            Example
-=======
-<a name="id817569"></a>
-=======
-<a name="id779268"></a>
-=======
-<a name="id771643"></a>
-=======
-<a name="id795323"></a>
-=======
-<a name="id783986"></a>
-=======
-<a name="id780709"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id774156"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.functions.remove.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2.0</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>remove<span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">));</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2.0</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="remove.html" title="remove"><code class="computeroutput"><span class="identifier">remove</span></code></a><span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove_if.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/remove_if.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>remove_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="remove.html" title="remove">
+<link rel="prev" href="remove.html" title="remove">
 <link rel="next" href="reverse.html" title="reverse">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,175 +22,102 @@
 <div class="spirit-nav">
 <a accesskey="p" href="remove.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reverse.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.remove_if"></a>remove_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="remove_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.remove_if"></a><a class="link" href="remove_if.html" title="remove_if">remove_if</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.remove_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id565058"></a>
-            Description
-=======
-<a name="id817717"></a>
-=======
-<a name="id779415"></a>
-=======
-<a name="id771791"></a>
-=======
-<a name="id795470"></a>
-=======
-<a name="id784134"></a>
-=======
-<a name="id780857"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id774303"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence, containing all the elements of the original except
-            those where a given unary function object evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt>.
+            those where a given unary function object evaluates to <code class="computeroutput"><span class="keyword">true</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.remove_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id565101"></a>
-            Synopsis
-=======
-<a name="id817746"></a>
-=======
-<a name="id779444"></a>
-=======
-<a name="id771820"></a>
-=======
-<a name="id795499"></a>
-=======
-<a name="id784162"></a>
-=======
-<a name="id780886"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id774332"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Pred</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::remove_if<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">remove_if</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/remove_if.html" title="remove_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">remove_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">remove_if</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id565283"></a><p class="title"><b>Table 1.60. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id817875"></a><p class="title"><b>Table 1.60. Parameters</b></p>
-=======
-<a name="id779574"></a><p class="title"><b>Table 1.64. Parameters</b></p>
-=======
-<a name="id771949"></a><p class="title"><b>Table 1.64. Parameters</b></p>
-=======
-<a name="id795629"></a><p class="title"><b>Table&#160;1.64.&#160;Parameters</b></p>
-=======
-<a name="id784292"></a><p class="title"><b>Table&#160;1.64.&#160;Parameters</b></p>
-=======
-<a name="id781015"></a><p class="title"><b>Table&#160;1.64.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id774462"></a><p class="title"><b>Table&#160;1.64.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Pred</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Pred</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A model of unary <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
                   Lambda Expression</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Removal predicate
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.remove_if.expression_semantics"></a><h6>
-<a name="id565430"></a>
-            <a href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.remove_if.expression_semantics"></a><h6>
-<a name="id781133"></a>
+<a name="id774579"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">remove_if<span class="special">&lt;</span><span class="identifier">Pred</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="remove_if.html" title="remove_if"><code class="computeroutput"><span class="identifier">remove_if</span></code></a><span class="special">&lt;</span><span class="identifier">Pred</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -213,107 +132,32 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
             in their original order, except those elements with types for which
-            <tt class="computeroutput"><span class="identifier">Pred</span></tt> evaluates to <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>. Equivalent to <tt class="computeroutput">filter<span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">not_</span><span class="special">&lt;</span><span class="identifier">Pred</span><span class="special">&gt;</span>
-            <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span></tt>.
+            <code class="computeroutput"><span class="identifier">Pred</span></code> evaluates to <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>. Equivalent to <code class="computeroutput"><a class="link" href="filter.html" title="filter"><code class="computeroutput"><span class="identifier">filter</span></code></a><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">not_</span><span class="special">&lt;</span><span class="identifier">Pred</span><span class="special">&gt;</span>
+            <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.remove_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id565675"></a>
-            Complexity
-=======
-<a name="id818154"></a>
-=======
-<a name="id779880"></a>
-=======
-<a name="id772255"></a>
-=======
-<a name="id795935"></a>
-=======
-<a name="id784598"></a>
-=======
-<a name="id781321"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id774768"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.remove_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id565703"></a>
-            Header
-=======
-<a name="id818175"></a>
-=======
-<a name="id779901"></a>
-=======
-<a name="id772277"></a>
-=======
-<a name="id795956"></a>
-=======
-<a name="id784620"></a>
-=======
-<a name="id781343"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id774789"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">remove_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">remove_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.remove_if.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id565870"></a>
-            Example
-=======
-<a name="id818295"></a>
-=======
-<a name="id780021"></a>
-=======
-<a name="id772397"></a>
-=======
-<a name="id796076"></a>
-=======
-<a name="id784740"></a>
-=======
-<a name="id781463"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id774909"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.functions.remove_if.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">const</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2.0</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>remove_if<span class="special">&lt;</span><span class="identifier">is_floating_point</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">));</span>
+<pre class="programlisting"><span class="keyword">const</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2.0</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="remove_if.html" title="remove_if"><code class="computeroutput"><span class="identifier">remove_if</span></code></a><span class="special">&lt;</span><span class="identifier">is_floating_point</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">vec</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>replace</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="transform.html" title="transform">
+<link rel="prev" href="transform.html" title="transform">
 <link rel="next" href="replace_if.html" title="replace_if">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,287 +22,150 @@
 <div class="spirit-nav">
 <a accesskey="p" href="transform.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="replace_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.replace"></a>replace
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="replace">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.replace"></a><a class="link" href="replace.html" title="replace">replace</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.replace.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id561799"></a>
-            Description
-=======
-<a name="id814297"></a>
-=======
-<a name="id775968"></a>
-=======
-<a name="id768344"></a>
-=======
-<a name="id790931"></a>
-=======
-<a name="id779594"></a>
-=======
-<a name="id776317"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id769764"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Replaces each value within a sequence of a given type and value with
             a new value.
           </p>
 <a name="fusion.algorithm.transformation.functions.replace.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id561830"></a>
-            Synopsis
-=======
-<a name="id814319"></a>
-=======
-<a name="id775990"></a>
-=======
-<a name="id768365"></a>
-=======
-<a name="id790953"></a>
-=======
-<a name="id779616"></a>
-=======
-<a name="id776339"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id769785"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">T</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::replace<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">replace</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/replace.html" title="replace"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">replace</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">replace</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">old_value</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">new_value</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id562071"></a><p class="title"><b>Table 1.57. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id814493"></a><p class="title"><b>Table 1.57. Parameters</b></p>
-=======
-<a name="id776164"></a><p class="title"><b>Table 1.61. Parameters</b></p>
-=======
-<a name="id768539"></a><p class="title"><b>Table 1.61. Parameters</b></p>
-=======
-<a name="id791127"></a><p class="title"><b>Table&#160;1.61.&#160;Parameters</b></p>
-=======
-<a name="id779790"></a><p class="title"><b>Table&#160;1.61.&#160;Parameters</b></p>
-=======
-<a name="id776513"></a><p class="title"><b>Table&#160;1.61.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id769959"></a><p class="title"><b>Table&#160;1.61.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                  Sequence</a>, <tt class="computeroutput"><span class="identifier">e</span> <span class="special">==</span> <span class="identifier">old_value</span></tt>
-                  is a valid expression, convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>,
-                  for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-                  in <tt class="computeroutput"><span class="identifier">seq</span></tt> with type
-                  convertible to <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                  Sequence</a>, <code class="computeroutput"><span class="identifier">e</span> <span class="special">==</span> <span class="identifier">old_value</span></code>
+                  is a valid expression, convertible to <code class="computeroutput"><span class="keyword">bool</span></code>,
+                  for each element <code class="computeroutput"><span class="identifier">e</span></code>
+                  in <code class="computeroutput"><span class="identifier">seq</span></code> with type
+                  convertible to <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">old_value</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">old_value</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Value to replace
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">new_value</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">new_value</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Replacement value
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.replace.expression_semantics"></a><h6>
-<a name="id562318"></a>
-            <a href="replace.html#fusion.algorithm.transformation.functions.replace.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.replace.expression_semantics"></a><h6>
-<a name="id776702"></a>
+<a name="id770149"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">replace<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">old_value</span><span class="special">,</span> <span class="identifier">new_value</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="replace.html" title="replace"><code class="computeroutput"><span class="identifier">replace</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">old_value</span><span class="special">,</span> <span class="identifier">new_value</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence with
-            all the values of <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            with <tt class="computeroutput"><span class="identifier">new_value</span></tt> assigned
-            to elements with the same type and equal to <tt class="computeroutput"><span class="identifier">old_value</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence with
+            all the values of <code class="computeroutput"><span class="identifier">seq</span></code>
+            with <code class="computeroutput"><span class="identifier">new_value</span></code> assigned
+            to elements with the same type and equal to <code class="computeroutput"><span class="identifier">old_value</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.replace.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id562472"></a>
-            Complexity
-=======
-<a name="id814783"></a>
-=======
-<a name="id776454"></a>
-=======
-<a name="id768830"></a>
-=======
-<a name="id791417"></a>
-=======
-<a name="id780080"></a>
-=======
-<a name="id776803"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id770250"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.replace.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id562502"></a>
-            Header
-=======
-<a name="id814805"></a>
-=======
-<a name="id776476"></a>
-=======
-<a name="id768851"></a>
-=======
-<a name="id791439"></a>
-=======
-<a name="id780102"></a>
-=======
-<a name="id776825"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id770271"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">replace</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">replace</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.replace.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id562668"></a>
-            Example
-=======
-<a name="id814925"></a>
-=======
-<a name="id776596"></a>
-=======
-<a name="id768971"></a>
-=======
-<a name="id791559"></a>
-=======
-<a name="id780222"></a>
-=======
-<a name="id776945"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id770391"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.functions.replace.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>replace<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">),</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">3</span><span class="special">));</spa
n>
+<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span><a class="link" href="replace.html" title="replace"><code class="computeroutput"><span class="identifier">replace</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">),</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span cl
ass="number">3</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace_if.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/replace_if.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>replace_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="replace.html" title="replace">
+<link rel="prev" href="replace.html" title="replace">
 <link rel="next" href="remove.html" title="remove">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,285 +22,148 @@
 <div class="spirit-nav">
 <a accesskey="p" href="replace.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="remove.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.replace_if"></a>replace_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="replace_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.replace_if"></a><a class="link" href="replace_if.html" title="replace_if">replace_if</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.replace_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id562860"></a>
-            Description
-=======
-<a name="id815051"></a>
-=======
-<a name="id776722"></a>
-=======
-<a name="id769097"></a>
-=======
-<a name="id791685"></a>
-=======
-<a name="id780348"></a>
-=======
-<a name="id777071"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id770517"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Replaces each element of a given sequence for which an unary function
-            object evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt>
+            object evaluates to <code class="computeroutput"><span class="keyword">true</span></code>
             replaced with a new value.
           </p>
 <a name="fusion.algorithm.transformation.functions.replace_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id562902"></a>
-            Synopsis
-=======
-<a name="id815077"></a>
-=======
-<a name="id776748"></a>
-=======
-<a name="id769124"></a>
-=======
-<a name="id791711"></a>
-=======
-<a name="id780374"></a>
-=======
-<a name="id777097"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id770544"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::replace_if<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">F</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">replace_if</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/replace_if.html" title="replace_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">replace_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">F</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">replace_if</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">new_value</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id563158"></a><p class="title"><b>Table 1.58. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id815266"></a><p class="title"><b>Table 1.58. Parameters</b></p>
-=======
-<a name="id776936"></a><p class="title"><b>Table 1.62. Parameters</b></p>
-=======
-<a name="id769312"></a><p class="title"><b>Table 1.62. Parameters</b></p>
-=======
-<a name="id791899"></a><p class="title"><b>Table&#160;1.62.&#160;Parameters</b></p>
-=======
-<a name="id780562"></a><p class="title"><b>Table&#160;1.62.&#160;Parameters</b></p>
-=======
-<a name="id777286"></a><p class="title"><b>Table&#160;1.62.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id770732"></a><p class="title"><b>Table&#160;1.62.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
-                  A function object for which <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> is a valid expression, convertible
-                  to <tt class="computeroutput"><span class="keyword">bool</span></tt>, for each
-                  element <tt class="computeroutput"><span class="identifier">e</span></tt> in <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A function object for which <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> is a valid expression, convertible
+                  to <code class="computeroutput"><span class="keyword">bool</span></code>, for each
+                  element <code class="computeroutput"><span class="identifier">e</span></code> in <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">new_value</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">new_value</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Replacement value
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.replace_if.expression_semantics"></a><h6>
-<a name="id563396"></a>
-            <a href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.replace_if.expression_semantics"></a><h6>
-<a name="id779656"></a>
+<a name="id773102"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">replace_if<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">new_value</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="replace_if.html" title="replace_if"><code class="computeroutput"><span class="identifier">replace_if</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">new_value</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence with
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>,
-            with <tt class="computeroutput"><span class="identifier">new_value</span></tt> assigned
-            to each element for which <tt class="computeroutput"><span class="identifier">f</span></tt>
-            evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence with
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>,
+            with <code class="computeroutput"><span class="identifier">new_value</span></code> assigned
+            to each element for which <code class="computeroutput"><span class="identifier">f</span></code>
+            evaluates to <code class="computeroutput"><span class="keyword">true</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.replace_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id563560"></a>
-            Complexity
-=======
-<a name="id815558"></a>
-=======
-<a name="id778322"></a>
-=======
-<a name="id770698"></a>
-=======
-<a name="id794377"></a>
-=======
-<a name="id783040"></a>
-=======
-<a name="id779764"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id773210"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.replace_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id563587"></a>
-            Header
-=======
-<a name="id815580"></a>
-=======
-<a name="id778344"></a>
-=======
-<a name="id770719"></a>
-=======
-<a name="id794399"></a>
-=======
-<a name="id783062"></a>
-=======
-<a name="id779785"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id773232"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">replace_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">replace_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.replace_if.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id563754"></a>
-            Example
-=======
-<a name="id815700"></a>
-=======
-<a name="id778464"></a>
-=======
-<a name="id770839"></a>
-=======
-<a name="id794519"></a>
-=======
-<a name="id783182"></a>
-=======
-<a name="id779905"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id773352"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.functions.replace_if.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">odd</span>
 <span class="special">{</span>
@@ -319,7 +174,7 @@
     <span class="special">}</span>
 <span class="special">};</span>
 <span class="special">...</span>
-<span class="identifier">assert</span><span class="special">(</span>replace_if<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">(),</span> <span class="number">3</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">3</span><span class="special">,</span><span class="number">2</span><span class="special">));</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="replace_if.html" title="replace_if"><code class="computeroutput"><span class="identifier">replace_if</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">),</span> <span class="identifier">odd</span><span class="special">(),</span> <span class="number">3</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">3</span><span class="special">,</span><span class="number
">2</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/reverse.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/reverse.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/reverse.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>reverse</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="remove_if.html" title="remove_if">
+<link rel="prev" href="remove_if.html" title="remove_if">
 <link rel="next" href="clear.html" title="clear">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,159 +22,80 @@
 <div class="spirit-nav">
 <a accesskey="p" href="remove_if.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="clear.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.reverse"></a>reverse
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="reverse">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.reverse"></a><a class="link" href="reverse.html" title="reverse">reverse</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.reverse.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id566112"></a>
-            Description
-=======
-<a name="id818462"></a>
-=======
-<a name="id780188"></a>
-=======
-<a name="id772564"></a>
-=======
-<a name="id796243"></a>
-=======
-<a name="id784906"></a>
-=======
-<a name="id781630"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775076"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns a new sequence with the elements of the original in reverse order.
           </p>
 <a name="fusion.algorithm.transformation.functions.reverse.synposis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id566141"></a>
-            Synposis
-=======
-<a name="id818484"></a>
-=======
-<a name="id780210"></a>
-=======
-<a name="id772585"></a>
-=======
-<a name="id796265"></a>
-=======
-<a name="id784928"></a>
-=======
-<a name="id781651"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775098"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.synposis">Synposis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::reverse<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">reverse</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/reverse.html" title="reverse"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">reverse</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">reverse</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id566294"></a><p class="title"><b>Table 1.61. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id818592"></a><p class="title"><b>Table 1.61. Parameters</b></p>
-=======
-<a name="id780318"></a><p class="title"><b>Table 1.65. Parameters</b></p>
-=======
-<a name="id772693"></a><p class="title"><b>Table 1.65. Parameters</b></p>
-=======
-<a name="id796373"></a><p class="title"><b>Table&#160;1.65.&#160;Parameters</b></p>
-=======
-<a name="id785036"></a><p class="title"><b>Table&#160;1.65.&#160;Parameters</b></p>
-=======
-<a name="id781760"></a><p class="title"><b>Table&#160;1.65.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775206"></a><p class="title"><b>Table&#160;1.65.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.reverse.expression_semantics"></a><h6>
-<a name="id566398"></a>
-            <a href="reverse.html#fusion.algorithm.transformation.functions.reverse.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.reverse.expression_semantics"></a><h6>
-<a name="id781842"></a>
+<a name="id775289"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">reverse<span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="reverse.html" title="reverse"><code class="computeroutput"><span class="identifier">reverse</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -202,104 +115,29 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence containing
-            all the elements of <tt class="computeroutput"><span class="identifier">seq</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence containing
+            all the elements of <code class="computeroutput"><span class="identifier">seq</span></code>
             in reverse order.
           </p>
 <a name="fusion.algorithm.transformation.functions.reverse.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id566502"></a>
-            Complexity
-=======
-<a name="id818743"></a>
-=======
-<a name="id780565"></a>
-=======
-<a name="id772941"></a>
-=======
-<a name="id796581"></a>
-=======
-<a name="id785244"></a>
-=======
-<a name="id781967"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775414"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.reverse.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id566531"></a>
-            Header
-=======
-<a name="id818764"></a>
-=======
-<a name="id780587"></a>
-=======
-<a name="id772963"></a>
-=======
-<a name="id796603"></a>
-=======
-<a name="id785266"></a>
-=======
-<a name="id781989"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775435"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">reverse</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">reverse</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.reverse.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id566697"></a>
-            Example
-=======
-<a name="id818884"></a>
-=======
-<a name="id780707"></a>
-=======
-<a name="id773083"></a>
-=======
-<a name="id796723"></a>
-=======
-<a name="id785386"></a>
-=======
-<a name="id782109"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id775555"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.functions.reverse.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span>reverse<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">3</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">1</span><span class="special">));</span>

+<pre class="programlisting"><span class="identifier">assert</span><span class="special">(</span><a class="link" href="reverse.html" title="reverse"><code class="computeroutput"><span class="identifier">reverse</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">))</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">3</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span clas
s="number">1</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/transform.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/transform.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/transform.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>transform</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="filter_if.html" title="filter_if">
+<link rel="prev" href="filter_if.html" title="filter_if">
 <link rel="next" href="replace.html" title="replace">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,212 +22,119 @@
 <div class="spirit-nav">
 <a accesskey="p" href="filter_if.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="replace.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.transform"></a>transform
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="transform">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.transform"></a><a class="link" href="transform.html" title="transform">transform</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.transform.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id559775"></a>
-            Description
-=======
-<a name="id812584"></a>
-=======
-<a name="id773435"></a>
-=======
-<a name="id765811"></a>
-=======
-<a name="id789490"></a>
-=======
-<a name="id778154"></a>
-=======
-<a name="id774877"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id768323"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            For a sequence <tt class="computeroutput"><span class="identifier">seq</span></tt> and
-            function object or function pointer <tt class="computeroutput"><span class="identifier">f</span></tt>,
-            <tt class="computeroutput"><span class="identifier">transform</span></tt> returns a new
-            sequence with elements created by applying <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> to each element of <tt class="computeroutput"><span class="identifier">e</span></tt>
-            of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            For a sequence <code class="computeroutput"><span class="identifier">seq</span></code> and
+            function object or function pointer <code class="computeroutput"><span class="identifier">f</span></code>,
+            <code class="computeroutput"><span class="identifier">transform</span></code> returns a new
+            sequence with elements created by applying <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> to each element of <code class="computeroutput"><span class="identifier">e</span></code>
+            of <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.transform.unary_version_synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id559891"></a>
-            <a href="transform.html#fusion.algorithm.transformation.functions.transform.unary_version_synopsis">Unary
-=======
-<a name="id812657"></a>
-=======
-<a name="id773508"></a>
-=======
-<a name="id765884"></a>
-=======
-<a name="id789564"></a>
-=======
-<a name="id778227"></a>
-=======
-<a name="id774950"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id768396"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.unary_version_synopsis">Unary
->>>>>>> .merge-right.r57125
             version synopsis</a>
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::transform<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">transform</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">transform</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">transform</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id560094"></a><p class="title"><b>Table 1.55. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id812798"></a><p class="title"><b>Table 1.55. Parameters</b></p>
-=======
-<a name="id773650"></a><p class="title"><b>Table 1.59. Parameters</b></p>
-=======
-<a name="id766026"></a><p class="title"><b>Table 1.59. Parameters</b></p>
-=======
-<a name="id789705"></a><p class="title"><b>Table&#160;1.59.&#160;Parameters</b></p>
-=======
-<a name="id778368"></a><p class="title"><b>Table&#160;1.59.&#160;Parameters</b></p>
-=======
-<a name="id775092"></a><p class="title"><b>Table&#160;1.59.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id768538"></a><p class="title"><b>Table&#160;1.59.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt>
-                  is a valid expression for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-                  of <tt class="computeroutput"><span class="identifier">seq</span></tt>. <tt class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E</span><span class="special">)&gt;::</span><span class="identifier">type</span></tt> is the return type of <tt class="computeroutput"><span class="identifier">f</span></tt> when called with a value of
-                  each element type <tt class="computeroutput"><span class="identifier">E</span></tt>.
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code>
+                  is a valid expression for each element <code class="computeroutput"><span class="identifier">e</span></code>
+                  of <code class="computeroutput"><span class="identifier">seq</span></code>. <code class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E</span><span class="special">)&gt;::</span><span class="identifier">type</span></code> is the return type of <code class="computeroutput"><span class="identifier">f</span></code> when called with a value of
+                  each element type <code class="computeroutput"><span class="identifier">E</span></code>.
+                </p>
+                </td>
+<td>
+                <p>
                   Transformation function
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.transform.expression_semantics"></a><h6>
-<a name="id560365"></a>
-            <a href="transform.html#fusion.algorithm.transformation.functions.transform.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.transform.expression_semantics"></a><h6>
-<a name="id775295"></a>
+<a name="id768741"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">transform<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            the return values of <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-            within <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            the return values of <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> for each element <code class="computeroutput"><span class="identifier">e</span></code>
+            within <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.functions.transform.binary_version_synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id560521"></a>
-            <a href="transform.html#fusion.algorithm.transformation.functions.transform.binary_version_synopsis">Binary
-=======
-<a name="id813101"></a>
-=======
-<a name="id775045"></a>
-=======
-<a name="id767421"></a>
-=======
-<a name="id790008"></a>
-=======
-<a name="id778671"></a>
-=======
-<a name="id775394"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id768841"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.binary_version_synopsis">Binary
->>>>>>> .merge-right.r57125
             version synopsis</a>
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
@@ -243,200 +142,121 @@
     <span class="keyword">typename</span> <span class="identifier">Sequence2</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::transform<span class="special">&lt;</span><span class="identifier">Sequence1</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Sequence2</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">transform</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">transform</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence1</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Sequence2</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">transform</span><span class="special">(</span>
     <span class="identifier">Sequence1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">Sequence2</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq2</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id560785"></a><p class="title"><b>Table 1.56. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id813290"></a><p class="title"><b>Table 1.56. Parameters</b></p>
-=======
-<a name="id775235"></a><p class="title"><b>Table 1.60. Parameters</b></p>
-=======
-<a name="id767611"></a><p class="title"><b>Table 1.60. Parameters</b></p>
-=======
-<a name="id790198"></a><p class="title"><b>Table&#160;1.60.&#160;Parameters</b></p>
-=======
-<a name="id778861"></a><p class="title"><b>Table&#160;1.60.&#160;Parameters</b></p>
-=======
-<a name="id775584"></a><p class="title"><b>Table&#160;1.60.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id769030"></a><p class="title"><b>Table&#160;1.60.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq1</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq1</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq2</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq2</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span><span class="identifier">e2</span><span class="special">)</span></tt>
-                  is a valid expression for each pair of elements <tt class="computeroutput"><span class="identifier">e1</span></tt>
-                  of <tt class="computeroutput"><span class="identifier">seq1</span></tt> and <tt class="computeroutput"><span class="identifier">e2</span></tt> of <tt class="computeroutput"><span class="identifier">seq2</span></tt>.
-                  <tt class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E1</span><span class="special">,</span><span class="identifier">E2</span><span class="special">)&gt;::</span><span class="identifier">type</span></tt> is the return type of <tt class="computeroutput"><span class="identifier">f</span></tt> when called with elements of
-                  type <tt class="computeroutput"><span class="identifier">E1</span></tt> and <tt class="computeroutput"><span class="identifier">E2</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span><span class="identifier">e2</span><span class="special">)</span></code>
+                  is a valid expression for each pair of elements <code class="computeroutput"><span class="identifier">e1</span></code>
+                  of <code class="computeroutput"><span class="identifier">seq1</span></code> and <code class="computeroutput"><span class="identifier">e2</span></code> of <code class="computeroutput"><span class="identifier">seq2</span></code>.
+                  <code class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E1</span><span class="special">,</span><span class="identifier">E2</span><span class="special">)&gt;::</span><span class="identifier">type</span></code> is the return type of <code class="computeroutput"><span class="identifier">f</span></code> when called with elements of
+                  type <code class="computeroutput"><span class="identifier">E1</span></code> and <code class="computeroutput"><span class="identifier">E2</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Transformation function
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<br class="table-break"><p>
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            the return values of <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span> <span class="identifier">e2</span><span class="special">)</span></tt> for each pair of elements <tt class="computeroutput"><span class="identifier">e1</span></tt> and <tt class="computeroutput"><span class="identifier">e2</span></tt>
-            within <tt class="computeroutput"><span class="identifier">seq1</span></tt> and <tt class="computeroutput"><span class="identifier">seq2</span></tt> respectively.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            the return values of <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span> <span class="identifier">e2</span><span class="special">)</span></code> for each pair of elements <code class="computeroutput"><span class="identifier">e1</span></code> and <code class="computeroutput"><span class="identifier">e2</span></code>
+            within <code class="computeroutput"><span class="identifier">seq1</span></code> and <code class="computeroutput"><span class="identifier">seq2</span></code> respectively.
           </p>
 <a name="fusion.algorithm.transformation.functions.transform.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id561272"></a>
-            Complexity
-=======
-<a name="id813917"></a>
-=======
-<a name="id775588"></a>
-=======
-<a name="id767963"></a>
-=======
-<a name="id790551"></a>
-=======
-<a name="id779214"></a>
-=======
-<a name="id775937"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id769383"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.transform.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id561300"></a>
-            Header
-=======
-<a name="id813938"></a>
-=======
-<a name="id775609"></a>
-=======
-<a name="id767985"></a>
-=======
-<a name="id790572"></a>
-=======
-<a name="id779235"></a>
-=======
-<a name="id775958"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id769405"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">transform</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">transform</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.transform.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id561466"></a>
-            Example
-=======
-<a name="id814058"></a>
-=======
-<a name="id775729"></a>
-=======
-<a name="id768105"></a>
-=======
-<a name="id790692"></a>
-=======
-<a name="id779355"></a>
-=======
-<a name="id776078"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id769525"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.functions.transform.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">triple</span>
 <span class="special">{</span>
@@ -448,7 +268,7 @@
     <span class="special">};</span>
 <span class="special">};</span>
 <span class="special">...</span>
-<span class="identifier">assert</span><span class="special">(</span>transform<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">),</span> <span class="identifier">triple</span><span class="special">())</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">3</span><span class="special">,</span><span class="number">6</span><span class="special">,</span><span class=
"number">9</span><span class="special">));</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">),</span> <span class="identifier">triple</span><span class="special">())</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">3</span><span class="special">,</span><span class="number"
>6</span><span class="special">,</span><span class="number">9</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/zip.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/zip.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/functions/zip.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>zip</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="join.html" title="join">
+<link rel="prev" href="join.html" title="join">
 <link rel="next" href="pop_back.html" title="pop_back">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="join.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="pop_back.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.functions.zip"></a>zip
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="zip">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.functions.zip"></a><a class="link" href="zip.html" title="zip">zip</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.functions.zip.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id573361"></a>
-            Description
-=======
-<a name="id825843"></a>
-=======
-<a name="id787000"></a>
-=======
-<a name="id779376"></a>
-=======
-<a name="id803084"></a>
-=======
-<a name="id791474"></a>
-=======
-<a name="id788198"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id781644"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Zips sequences together to form a single sequence, whos members are tuples
             of the members of the component sequences.
           </p>
 <a name="fusion.algorithm.transformation.functions.zip.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id573392"></a>
-            Synopsis
-=======
-<a name="id825862"></a>
-=======
-<a name="id787020"></a>
-=======
-<a name="id779395"></a>
-=======
-<a name="id803104"></a>
-=======
-<a name="id791494"></a>
-=======
-<a name="id788217"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id781663"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence1</span><span class="special">,</span>
@@ -105,192 +44,96 @@
     <span class="special">...</span>
     <span class="keyword">typename</span> <span class="identifier">SequenceN</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::zip<span class="special">&lt;</span><span class="identifier">Sequence1</span><span class="special">,</span> <span class="identifier">Sequence2</span><span class="special">,</span> <span class="special">...</span> <span class="identifier">SequenceN</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/zip.html" title="zip"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">zip</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence1</span><span class="special">,</span> <span class="identifier">Sequence2</span><span class="special">,</span> <span class="special">...</span> <span class="identifier">SequenceN</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">zip</span><span class="special">(</span><span class="identifier">Sequence1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">Sequence2</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq2</span><span class="special">,</span> <span class="special">...</span> <span class="identifier">SequenceN</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seqN</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id573673"></a><p class="title"><b>Table 1.68. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id826064"></a><p class="title"><b>Table 1.68. Parameters</b></p>
-=======
-<a name="id787221"></a><p class="title"><b>Table 1.72. Parameters</b></p>
-=======
-<a name="id779597"></a><p class="title"><b>Table 1.72. Parameters</b></p>
-=======
-<a name="id803305"></a><p class="title"><b>Table&#160;1.72.&#160;Parameters</b></p>
-=======
-<a name="id791695"></a><p class="title"><b>Table&#160;1.72.&#160;Parameters</b></p>
-=======
-<a name="id788418"></a><p class="title"><b>Table&#160;1.72.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id781865"></a><p class="title"><b>Table&#160;1.72.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq1</span></tt> to <tt class="computeroutput"><span class="identifier">seqN</span></tt>
-                </p></td>
-<td><p>
-                  Each sequence is a model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq1</span></code> to <code class="computeroutput"><span class="identifier">seqN</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Each sequence is a model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>.
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.functions.zip.expression_semantics"></a><h6>
-<a name="id573789"></a>
-            <a href="zip.html#fusion.algorithm.transformation.functions.zip.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.functions.zip.expression_semantics"></a><h6>
-<a name="id788508"></a>
+<a name="id781955"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">zip<span class="special">(</span><span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">seq2</span><span class="special">,</span> <span class="special">...</span> <span class="identifier">seqN</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="zip.html" title="zip"><code class="computeroutput"><span class="identifier">zip</span></code></a><span class="special">(</span><span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">seq2</span><span class="special">,</span> <span class="special">...</span> <span class="identifier">seqN</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
-            tuples of elements from sequences <tt class="computeroutput"><span class="identifier">seq1</span></tt>
-            to <tt class="computeroutput"><span class="identifier">seqN</span></tt>. For example,
-            applying zip to tuples <tt class="computeroutput"><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">)</span></tt>
-            and <tt class="computeroutput"><span class="special">(</span><span class="char">'a'</span><span class="special">,</span> <span class="char">'b'</span><span class="special">,</span>
-            <span class="char">'c'</span><span class="special">)</span></tt>
-            would return <tt class="computeroutput"><span class="special">((</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">),(</span><span class="number">2</span><span class="special">,</span> <span class="char">'b'</span><span class="special">),(</span><span class="number">3</span><span class="special">,</span>
-            <span class="char">'c'</span><span class="special">))</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence containing
+            tuples of elements from sequences <code class="computeroutput"><span class="identifier">seq1</span></code>
+            to <code class="computeroutput"><span class="identifier">seqN</span></code>. For example,
+            applying zip to tuples <code class="computeroutput"><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">)</span></code>
+            and <code class="computeroutput"><span class="special">(</span><span class="char">'a'</span><span class="special">,</span> <span class="char">'b'</span><span class="special">,</span>
+            <span class="char">'c'</span><span class="special">)</span></code>
+            would return <code class="computeroutput"><span class="special">((</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">),(</span><span class="number">2</span><span class="special">,</span> <span class="char">'b'</span><span class="special">),(</span><span class="number">3</span><span class="special">,</span>
+            <span class="char">'c'</span><span class="special">))</span></code>
           </p>
 <a name="fusion.algorithm.transformation.functions.zip.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id574094"></a>
-            Complexity
-=======
-<a name="id826367"></a>
-=======
-<a name="id787525"></a>
-=======
-<a name="id779901"></a>
-=======
-<a name="id803609"></a>
-=======
-<a name="id791999"></a>
-=======
-<a name="id788722"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id782168"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.functions.zip.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id574124"></a>
-            Header
-=======
-<a name="id826386"></a>
-=======
-<a name="id787544"></a>
-=======
-<a name="id779920"></a>
-=======
-<a name="id803628"></a>
-=======
-<a name="id792018"></a>
-=======
-<a name="id788741"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id782188"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">zip</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">zip</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.functions.zip.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id574290"></a>
-            Example
-=======
-<a name="id826502"></a>
-=======
-<a name="id787659"></a>
-=======
-<a name="id780035"></a>
-=======
-<a name="id803743"></a>
-=======
-<a name="id792133"></a>
-=======
-<a name="id788856"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id782303"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.functions.zip.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="char">'b'</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>zip<span class="special">(</span><span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">)</span> <span class="special">==</span> make_vector<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">),</span><a href="../../../container/generation/functions/make_vector.html" title="make_vector"><tt class="computeroutput"><span class="identifier">make_vect
or</span></tt></a><span class="special">(</span><span class="char">'a'</span><span class="special">,</span> <span class="char">'b'</span><span class="special">));</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="char">'b'</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="zip.html" title="zip"><code class="computeroutput"><span class="identifier">zip</span></code></a><span class="special">(</span><span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">),</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vecto
r"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="char">'a'</span><span class="special">,</span> <span class="char">'b'</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Metafunctions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../transformation.html" title="Transformation">
-<link rel="previous" href="functions/push_front.html" title="push_front">
+<link rel="prev" href="functions/push_front.html" title="push_front">
 <link rel="next" href="metafunctions/filter.html" title="filter">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="functions/push_front.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../transformation.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="metafunctions/filter.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.algorithm.transformation.metafunctions"></a>Metafunctions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Metafunctions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.algorithm.transformation.metafunctions"></a><a class="link" href="metafunctions.html" title="Metafunctions">Metafunctions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">filter</span></dt>
 <dt><span class="section">filter_if</span></dt>
@@ -57,7 +50,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/clear.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/clear.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/clear.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>clear</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="reverse.html" title="reverse">
+<link rel="prev" href="reverse.html" title="reverse">
 <link rel="next" href="erase.html" title="erase">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="reverse.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="erase.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.clear"></a>clear
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="clear">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.clear"></a><a class="link" href="clear.html" title="clear">clear</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.clear.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id585070"></a>
-            Description
-=======
-<a name="id836158"></a>
-=======
-<a name="id800323"></a>
-=======
-<a name="id792699"></a>
-=======
-<a name="id815343"></a>
-=======
-<a name="id805099"></a>
-=======
-<a name="id801822"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id795268"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.metafunctions.clear.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of clear, given the input sequence
+            Returns the result type of <a class="link" href="../functions/clear.html" title="clear"><code class="computeroutput"><span class="identifier">clear</span></code></a>, given the input sequence
             type.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.clear.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id585117"></a>
-            Synopsis
-=======
-<a name="id836189"></a>
-=======
-<a name="id800354"></a>
-=======
-<a name="id792730"></a>
-=======
-<a name="id815375"></a>
-=======
-<a name="id805130"></a>
-=======
-<a name="id801853"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id795300"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.metafunctions.clear.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -108,143 +47,73 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id585216"></a><p class="title"><b>Table 1.82. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id836264"></a><p class="title"><b>Table 1.82. Parameters</b></p>
-=======
-<a name="id800428"></a><p class="title"><b>Table 1.86. Parameters</b></p>
-=======
-<a name="id792804"></a><p class="title"><b>Table 1.86. Parameters</b></p>
-=======
-<a name="id815449"></a><p class="title"><b>Table&#160;1.86.&#160;Parameters</b></p>
-=======
-<a name="id805204"></a><p class="title"><b>Table&#160;1.86.&#160;Parameters</b></p>
-=======
-<a name="id801928"></a><p class="title"><b>Table&#160;1.86.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id795374"></a><p class="title"><b>Table&#160;1.86.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.clear.expression_semantics"></a><h6>
-<a name="id585310"></a>
-            <a href="clear.html#fusion.algorithm.transformation.metafunctions.clear.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.clear.expression_semantics"></a><h6>
-<a name="id802006"></a>
+<a name="id795452"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.metafunctions.clear.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::clear<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="clear.html" title="clear"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">clear</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns an empty sequence.
+            <span class="bold"><strong>Semantics</strong></span>: Returns an empty sequence.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.clear.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id585422"></a>
-            Complexity
-=======
-<a name="id836414"></a>
-=======
-<a name="id800578"></a>
-=======
-<a name="id792954"></a>
-=======
-<a name="id815599"></a>
-=======
-<a name="id805354"></a>
-=======
-<a name="id802078"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id795524"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.metafunctions.clear.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.clear.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id585450"></a>
-            Header
-=======
-<a name="id836435"></a>
-=======
-<a name="id800600"></a>
-=======
-<a name="id792976"></a>
-=======
-<a name="id815621"></a>
-=======
-<a name="id805376"></a>
-=======
-<a name="id802099"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id795546"></a>
             <a class="link" href="clear.html#fusion.algorithm.transformation.metafunctions.clear.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">clear</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">clear</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>erase</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="clear.html" title="clear">
+<link rel="prev" href="clear.html" title="clear">
 <link rel="next" href="erase_key.html" title="erase_key">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="clear.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="erase_key.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.erase"></a>erase
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="erase">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.erase"></a><a class="link" href="erase.html" title="erase">erase</a>
+</h5></div></div></div>
 <p>
-            Returns the result type of erase, given the input sequence
+            Returns the result type of <a class="link" href="../functions/erase.html" title="erase"><code class="computeroutput"><span class="identifier">erase</span></code></a>, given the input sequence
             and range delimiting iterator types.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.erase.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id585660"></a>
-            Description
-=======
-<a name="id836580"></a>
-=======
-<a name="id800744"></a>
-=======
-<a name="id793120"></a>
-=======
-<a name="id815765"></a>
-=======
-<a name="id805520"></a>
-=======
-<a name="id802243"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id795690"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.metafunctions.erase.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <a name="fusion.algorithm.transformation.metafunctions.erase.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id585683"></a>
-            Synopsis
-=======
-<a name="id836598"></a>
-=======
-<a name="id800762"></a>
-=======
-<a name="id793138"></a>
-=======
-<a name="id815783"></a>
-=======
-<a name="id805538"></a>
-=======
-<a name="id802261"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id795708"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.metafunctions.erase.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -109,113 +48,97 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id585826"></a><p class="title"><b>Table 1.83. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id836706"></a><p class="title"><b>Table 1.83. Parameters</b></p>
-=======
-<a name="id800870"></a><p class="title"><b>Table 1.87. Parameters</b></p>
-=======
-<a name="id793246"></a><p class="title"><b>Table 1.87. Parameters</b></p>
-=======
-<a name="id815891"></a><p class="title"><b>Table&#160;1.87.&#160;Parameters</b></p>
-=======
-<a name="id805646"></a><p class="title"><b>Table&#160;1.87.&#160;Parameters</b></p>
-=======
-<a name="id802369"></a><p class="title"><b>Table&#160;1.87.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id795816"></a><p class="title"><b>Table&#160;1.87.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">It1</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">It1</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">It2</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">It2</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.erase.expression_semantics"></a><h6>
-<a name="id586020"></a>
-            <a href="erase.html#fusion.algorithm.transformation.metafunctions.erase.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.erase.expression_semantics"></a><h6>
-<a name="id802524"></a>
+<a name="id795970"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.metafunctions.erase.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::erase<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">It1</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="erase.html" title="erase"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">erase</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">It1</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -230,81 +153,30 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence with
-            the element at <tt class="computeroutput"><span class="identifier">It1</span></tt> removed.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence with
+            the element at <code class="computeroutput"><span class="identifier">It1</span></code> removed.
           </p>
-<pre class="programlisting">result_of::erase<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="erase.html" title="erase"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">erase</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence with
-            the elements between <tt class="computeroutput"><span class="identifier">It1</span></tt>
-            and <tt class="computeroutput"><span class="identifier">It2</span></tt> removed.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence with
+            the elements between <code class="computeroutput"><span class="identifier">It1</span></code>
+            and <code class="computeroutput"><span class="identifier">It2</span></code> removed.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.erase.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id586284"></a>
-            Complexity
-=======
-<a name="id837038"></a>
-=======
-<a name="id801230"></a>
-=======
-<a name="id793606"></a>
-=======
-<a name="id816251"></a>
-=======
-<a name="id806006"></a>
-=======
-<a name="id802729"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id796176"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.metafunctions.erase.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.erase.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id586312"></a>
-            Header
-=======
-<a name="id837060"></a>
-=======
-<a name="id801252"></a>
-=======
-<a name="id793627"></a>
-=======
-<a name="id816272"></a>
-=======
-<a name="id806028"></a>
-=======
-<a name="id802751"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id796197"></a>
             <a class="link" href="erase.html#fusion.algorithm.transformation.metafunctions.erase.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">erase</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">erase</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>erase_key</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="erase.html" title="erase">
+<link rel="prev" href="erase.html" title="erase">
 <link rel="next" href="insert.html" title="insert">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="erase.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="insert.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.erase_key"></a>erase_key
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="erase_key">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.erase_key"></a><a class="link" href="erase_key.html" title="erase_key">erase_key</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.erase_key.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id586501"></a>
-            Description
-=======
-<a name="id837188"></a>
-=======
-<a name="id801380"></a>
-=======
-<a name="id793756"></a>
-=======
-<a name="id816401"></a>
-=======
-<a name="id806156"></a>
-=======
-<a name="id802879"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id796326"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of erase_key, given the sequence
+            Returns the result type of <a class="link" href="../functions/erase_key.html" title="erase_key"><code class="computeroutput"><span class="identifier">erase_key</span></code></a>, given the sequence
             and key types.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.erase_key.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id586549"></a>
-            Synopsis
-=======
-<a name="id837216"></a>
-=======
-<a name="id801408"></a>
-=======
-<a name="id793783"></a>
-=======
-<a name="id816428"></a>
-=======
-<a name="id806184"></a>
-=======
-<a name="id802907"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id796353"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -109,59 +48,32 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id586667"></a><p class="title"><b>Table 1.84. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id837301"></a><p class="title"><b>Table 1.84. Parameters</b></p>
-=======
-<a name="id801493"></a><p class="title"><b>Table 1.88. Parameters</b></p>
-=======
-<a name="id793869"></a><p class="title"><b>Table 1.88. Parameters</b></p>
-=======
-<a name="id816513"></a><p class="title"><b>Table&#160;1.88.&#160;Parameters</b></p>
-=======
-<a name="id806269"></a><p class="title"><b>Table&#160;1.88.&#160;Parameters</b></p>
-=======
-<a name="id802992"></a><p class="title"><b>Table&#160;1.88.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id796438"></a><p class="title"><b>Table&#160;1.88.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<<<<<<< .working
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
-=======
 <td>
                 <p>
                   <code class="computeroutput"><span class="identifier">Sequence</span></code>
@@ -171,115 +83,62 @@
                 <p>
                   A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a> and <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
->>>>>>> .merge-right.r57242
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Key</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Key</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Key type
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.erase_key.expression_semantics"></a><h6>
-<a name="id586805"></a>
-            <a href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.erase_key.expression_semantics"></a><h6>
-<a name="id803110"></a>
+<a name="id796556"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::erase_key<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="erase_key.html" title="erase_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">erase_key</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
-=======
             <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a> and <a class="link" href="../../../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
->>>>>>> .merge-right.r57242
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence with the
-            elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>,
-            except those with key <tt class="computeroutput"><span class="identifier">Key</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence with the
+            elements of <code class="computeroutput"><span class="identifier">Sequence</span></code>,
+            except those with key <code class="computeroutput"><span class="identifier">Key</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.erase_key.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id586949"></a>
-            Complexity
-=======
-<a name="id837506"></a>
-=======
-<a name="id801708"></a>
-=======
-<a name="id794083"></a>
-=======
-<a name="id816728"></a>
-=======
-<a name="id807030"></a>
-=======
-<a name="id803753"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id797200"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.erase_key.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id586979"></a>
-            Header
-=======
-<a name="id837525"></a>
-=======
-<a name="id801727"></a>
-=======
-<a name="id794103"></a>
-=======
-<a name="id816747"></a>
-=======
-<a name="id807049"></a>
-=======
-<a name="id803773"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id797219"></a>
             <a class="link" href="erase_key.html#fusion.algorithm.transformation.metafunctions.erase_key.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">erase_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">erase_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>filter</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="../metafunctions.html" title="Metafunctions">
+<link rel="prev" href="../metafunctions.html" title="Metafunctions">
 <link rel="next" href="filter_if.html" title="filter_if">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="filter_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.filter"></a>filter
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="filter">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.filter"></a><a class="link" href="filter.html" title="filter">filter</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.filter.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id578050"></a>
-            Description
-=======
-<a name="id829154"></a>
-=======
-<a name="id792061"></a>
-=======
-<a name="id784436"></a>
-=======
-<a name="id807052"></a>
-=======
-<a name="id796876"></a>
-=======
-<a name="id793600"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id787046"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.metafunctions.filter.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of filter given the sequence type
+            Returns the result type of <a class="link" href="../functions/filter.html" title="filter"><code class="computeroutput"><span class="identifier">filter</span></code></a> given the sequence type
             and type to retain.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.filter.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id578098"></a>
-            Synopsis
-=======
-<a name="id829183"></a>
-=======
-<a name="id792089"></a>
-=======
-<a name="id784465"></a>
-=======
-<a name="id808788"></a>
-=======
-<a name="id796905"></a>
-=======
-<a name="id793628"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id787075"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.metafunctions.filter.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -109,98 +48,78 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id578214"></a><p class="title"><b>Table 1.73. Parameter</b></p>
-<table class="table" summary="Parameter">
-=======
-<a name="id829270"></a><p class="title"><b>Table 1.73. Parameter</b></p>
-=======
-<a name="id792177"></a><p class="title"><b>Table 1.77. Parameter</b></p>
-=======
-<a name="id784553"></a><p class="title"><b>Table 1.77. Parameter</b></p>
-=======
-<a name="id808876"></a><p class="title"><b>Table&#160;1.77.&#160;Parameter</b></p>
-=======
-<a name="id796993"></a><p class="title"><b>Table&#160;1.77.&#160;Parameter</b></p>
-=======
-<a name="id793716"></a><p class="title"><b>Table&#160;1.77.&#160;Parameter</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id787162"></a><p class="title"><b>Table&#160;1.77.&#160;Parameter</b></p>
 <div class="table-contents"><table class="table" summary="Parameter">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Type to retain
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.filter.expression_semantics"></a><h6>
-<a name="id578354"></a>
-            <a href="filter.html#fusion.algorithm.transformation.metafunctions.filter.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.filter.expression_semantics"></a><h6>
-<a name="id793829"></a>
+<a name="id787275"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.metafunctions.filter.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::filter<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="filter.html" title="filter"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">filter</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -215,72 +134,22 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
-            the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-            that are of type <tt class="computeroutput"><span class="identifier">T</span></tt>. Equivalent
-            to <tt class="computeroutput">result_of::filter_if<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span>
-            <span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence containing
+            the elements of <code class="computeroutput"><span class="identifier">Sequence</span></code>
+            that are of type <code class="computeroutput"><span class="identifier">T</span></code>. Equivalent
+            to <code class="computeroutput"><a class="link" href="filter_if.html" title="filter_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">filter_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span>
+            <span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.filter.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id578611"></a>
-            Complexity
-=======
-<a name="id829556"></a>
-=======
-<a name="id793105"></a>
-=======
-<a name="id785481"></a>
-=======
-<a name="id809189"></a>
-=======
-<a name="id797306"></a>
-=======
-<a name="id794029"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id787476"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.metafunctions.filter.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.filter.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id578640"></a>
-            Header
-=======
-<a name="id829578"></a>
-=======
-<a name="id793127"></a>
-=======
-<a name="id785502"></a>
-=======
-<a name="id809211"></a>
-=======
-<a name="id797328"></a>
-=======
-<a name="id794051"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id787497"></a>
             <a class="link" href="filter.html#fusion.algorithm.transformation.metafunctions.filter.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">filter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">filter</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>filter_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="filter.html" title="filter">
+<link rel="prev" href="filter.html" title="filter">
 <link rel="next" href="transform.html" title="transform">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,75 +22,22 @@
 <div class="spirit-nav">
 <a accesskey="p" href="filter.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="transform.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.filter_if"></a>filter_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="filter_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.filter_if"></a><a class="link" href="filter_if.html" title="filter_if">filter_if</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.filter_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id578827"></a>
-            Description
-=======
-<a name="id829706"></a>
-=======
-<a name="id793255"></a>
-=======
-<a name="id785631"></a>
-=======
-<a name="id809339"></a>
-=======
-<a name="id797456"></a>
-=======
-<a name="id794179"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id787626"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of filter_if given the sequence
+            Returns the result type of <a class="link" href="../functions/filter_if.html" title="filter_if"><code class="computeroutput"><span class="identifier">filter_if</span></code></a> given the sequence
             and unary <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
             Lambda Expression</a> predicate type.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.filter_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id578884"></a>
-            Synopsis
-=======
-<a name="id829737"></a>
-=======
-<a name="id793286"></a>
-=======
-<a name="id785662"></a>
-=======
-<a name="id809370"></a>
-=======
-<a name="id797487"></a>
-=======
-<a name="id794210"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id787657"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -110,99 +49,79 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id579002"></a><p class="title"><b>Table 1.74. Parameter</b></p>
-<table class="table" summary="Parameter">
-=======
-<a name="id829822"></a><p class="title"><b>Table 1.74. Parameter</b></p>
-=======
-<a name="id793372"></a><p class="title"><b>Table 1.78. Parameter</b></p>
-=======
-<a name="id785747"></a><p class="title"><b>Table 1.78. Parameter</b></p>
-=======
-<a name="id809456"></a><p class="title"><b>Table&#160;1.78.&#160;Parameter</b></p>
-=======
-<a name="id797572"></a><p class="title"><b>Table&#160;1.78.&#160;Parameter</b></p>
-=======
-<a name="id794296"></a><p class="title"><b>Table&#160;1.78.&#160;Parameter</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id787742"></a><p class="title"><b>Table&#160;1.78.&#160;Parameter</b></p>
 <div class="table-contents"><table class="table" summary="Parameter">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Pred</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Pred</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A unary <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
                   Lambda Expression</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Type to retain
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.filter_if.expression_semantics"></a><h6>
-<a name="id579146"></a>
-            <a href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.filter_if.expression_semantics"></a><h6>
-<a name="id794413"></a>
+<a name="id787860"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::filter_if<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="filter_if.html" title="filter_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">filter_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -217,71 +136,21 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
-            the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-            for which <tt class="computeroutput"><span class="identifier">Pred</span></tt> evaluates
-            to <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence containing
+            the elements of <code class="computeroutput"><span class="identifier">Sequence</span></code>
+            for which <code class="computeroutput"><span class="identifier">Pred</span></code> evaluates
+            to <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.filter_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id579326"></a>
-            Complexity
-=======
-<a name="id831489"></a>
-=======
-<a name="id793632"></a>
-=======
-<a name="id786008"></a>
-=======
-<a name="id809716"></a>
-=======
-<a name="id797833"></a>
-=======
-<a name="id794556"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id788002"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.filter_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id579356"></a>
-            Header
-=======
-<a name="id831509"></a>
-=======
-<a name="id793651"></a>
-=======
-<a name="id786027"></a>
-=======
-<a name="id809735"></a>
-=======
-<a name="id797852"></a>
-=======
-<a name="id794575"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id788022"></a>
             <a class="link" href="filter_if.html#fusion.algorithm.transformation.metafunctions.filter_if.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">filter_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">filter_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>insert</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="erase_key.html" title="erase_key">
+<link rel="prev" href="erase_key.html" title="erase_key">
 <link rel="next" href="insert_range.html" title="insert_range">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="erase_key.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="insert_range.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.insert"></a>insert
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="insert">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.insert"></a><a class="link" href="insert.html" title="insert">insert</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.insert.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id587169"></a>
-            Description
-=======
-<a name="id837654"></a>
-=======
-<a name="id801855"></a>
-=======
-<a name="id794231"></a>
-=======
-<a name="id817422"></a>
-=======
-<a name="id807178"></a>
-=======
-<a name="id803901"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id797347"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.metafunctions.insert.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of insert, given the sequence,
+            Returns the result type of <a class="link" href="../functions/insert.html" title="insert"><code class="computeroutput"><span class="identifier">insert</span></code></a>, given the sequence,
             position iterator and insertion types.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.insert.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id587219"></a>
-            Synopsis
-=======
-<a name="id837682"></a>
-=======
-<a name="id801884"></a>
-=======
-<a name="id794260"></a>
-=======
-<a name="id817451"></a>
-=======
-<a name="id807207"></a>
-=======
-<a name="id803930"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id797376"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.metafunctions.insert.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -110,111 +49,96 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id587355"></a><p class="title"><b>Table 1.85. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id837783"></a><p class="title"><b>Table 1.85. Parameters</b></p>
-=======
-<a name="id802532"></a><p class="title"><b>Table 1.89. Parameters</b></p>
-=======
-<a name="id794907"></a><p class="title"><b>Table 1.89. Parameters</b></p>
-=======
-<a name="id817552"></a><p class="title"><b>Table&#160;1.89.&#160;Parameters</b></p>
-=======
-<a name="id807307"></a><p class="title"><b>Table&#160;1.89.&#160;Parameters</b></p>
-=======
-<a name="id804031"></a><p class="title"><b>Table&#160;1.89.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id797477"></a><p class="title"><b>Table&#160;1.89.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Position</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Position</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.insert.expression_semantics"></a><h6>
-<a name="id587539"></a>
-            <a href="insert.html#fusion.algorithm.transformation.metafunctions.insert.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.insert.expression_semantics"></a><h6>
-<a name="id804181"></a>
+<a name="id797627"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.metafunctions.insert.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::insert<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Position</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="insert.html" title="insert"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">insert</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Position</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -229,71 +153,21 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence with an
-            element of type <tt class="computeroutput"><span class="identifier">T</span></tt> inserted
-            at position <tt class="computeroutput"><span class="identifier">Position</span></tt>
-            in <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence with an
+            element of type <code class="computeroutput"><span class="identifier">T</span></code> inserted
+            at position <code class="computeroutput"><span class="identifier">Position</span></code>
+            in <code class="computeroutput"><span class="identifier">Sequence</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.insert.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id587707"></a>
-            Complexity
-=======
-<a name="id838045"></a>
-=======
-<a name="id802821"></a>
-=======
-<a name="id795196"></a>
-=======
-<a name="id817841"></a>
-=======
-<a name="id807597"></a>
-=======
-<a name="id804320"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id797766"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.metafunctions.insert.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.insert.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id587736"></a>
-            Header
-=======
-<a name="id838066"></a>
-=======
-<a name="id802842"></a>
-=======
-<a name="id795218"></a>
-=======
-<a name="id817863"></a>
-=======
-<a name="id807618"></a>
-=======
-<a name="id804341"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id797788"></a>
             <a class="link" href="insert.html#fusion.algorithm.transformation.metafunctions.insert.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">insert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">insert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>insert_range</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="insert.html" title="insert">
+<link rel="prev" href="insert.html" title="insert">
 <link rel="next" href="join.html" title="join">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="insert.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="join.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.insert_range"></a>insert_range
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="insert_range">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.insert_range"></a><a class="link" href="insert_range.html" title="insert_range">insert_range</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.insert_range.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id587921"></a>
-            Description
-=======
-<a name="id838200"></a>
-=======
-<a name="id802976"></a>
-=======
-<a name="id795351"></a>
-=======
-<a name="id817996"></a>
-=======
-<a name="id807751"></a>
-=======
-<a name="id804475"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id797921"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of insert_range, given the input
+            Returns the result type of <a class="link" href="../functions/insert_range.html" title="insert_range"><code class="computeroutput"><span class="identifier">insert_range</span></code></a>, given the input
             sequence, position iterator and insertion range types.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.insert_range.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id587970"></a>
-            Synopsis
-=======
-<a name="id838226"></a>
-=======
-<a name="id803002"></a>
-=======
-<a name="id795378"></a>
-=======
-<a name="id818022"></a>
-=======
-<a name="id807778"></a>
-=======
-<a name="id804501"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id797947"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -110,113 +49,97 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id588106"></a><p class="title"><b>Table 1.86. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id838324"></a><p class="title"><b>Table 1.86. Parameters</b></p>
-=======
-<a name="id803100"></a><p class="title"><b>Table 1.90. Parameters</b></p>
-=======
-<a name="id795476"></a><p class="title"><b>Table 1.90. Parameters</b></p>
-=======
-<a name="id818121"></a><p class="title"><b>Table&#160;1.90.&#160;Parameters</b></p>
-=======
-<a name="id807876"></a><p class="title"><b>Table&#160;1.90.&#160;Parameters</b></p>
-=======
-<a name="id804599"></a><p class="title"><b>Table&#160;1.90.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id798046"></a><p class="title"><b>Table&#160;1.90.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Position</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Position</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Range</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Range</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.insert_range.expression_semantics"></a><h6>
-<a name="id588300"></a>
-            <a href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.insert_range.expression_semantics"></a><h6>
-<a name="id804754"></a>
+<a name="id798201"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::insert_range<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Position</span><span class="special">,</span> <span class="identifier">Range</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="insert_range.html" title="insert_range"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">insert_range</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Position</span><span class="special">,</span> <span class="identifier">Range</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -231,71 +154,21 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence with the
-            elements of <tt class="computeroutput"><span class="identifier">Range</span></tt> inserted
-            at position <tt class="computeroutput"><span class="identifier">Position</span></tt>
-            into <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence with the
+            elements of <code class="computeroutput"><span class="identifier">Range</span></code> inserted
+            at position <code class="computeroutput"><span class="identifier">Position</span></code>
+            into <code class="computeroutput"><span class="identifier">Sequence</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.insert_range.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id588469"></a>
-            Complexity
-=======
-<a name="id838590"></a>
-=======
-<a name="id803393"></a>
-=======
-<a name="id795769"></a>
-=======
-<a name="id818414"></a>
-=======
-<a name="id808169"></a>
-=======
-<a name="id804892"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id798339"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.insert_range.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id588499"></a>
-            Header
-=======
-<a name="id838606"></a>
-=======
-<a name="id803410"></a>
-=======
-<a name="id795786"></a>
-=======
-<a name="id818430"></a>
-=======
-<a name="id808186"></a>
-=======
-<a name="id804909"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id798355"></a>
             <a class="link" href="insert_range.html#fusion.algorithm.transformation.metafunctions.insert_range.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">insert_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">insert_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/join.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/join.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/join.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>join</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="insert_range.html" title="insert_range">
+<link rel="prev" href="insert_range.html" title="insert_range">
 <link rel="next" href="zip.html" title="zip">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="insert_range.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="zip.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.join"></a>join
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="join">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.join"></a><a class="link" href="join.html" title="join">join</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.join.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id588688"></a>
-            Description
-=======
-<a name="id840442"></a>
-=======
-<a name="id803538"></a>
-=======
-<a name="id795914"></a>
-=======
-<a name="id818559"></a>
-=======
-<a name="id808314"></a>
-=======
-<a name="id805037"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id798484"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.metafunctions.join.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the result of joining 2 sequences, given the sequence types.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.join.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id588718"></a>
-            Synopsis
-=======
-<a name="id840464"></a>
-=======
-<a name="id803560"></a>
-=======
-<a name="id795936"></a>
-=======
-<a name="id818580"></a>
-=======
-<a name="id808336"></a>
-=======
-<a name="id805059"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id798505"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.metafunctions.join.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">LhSequence</span><span class="special">,</span>
@@ -108,45 +47,14 @@
 <span class="special">};</span>
 </pre>
 <a name="fusion.algorithm.transformation.metafunctions.join.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id588844"></a>
-            <a href="join.html#fusion.algorithm.transformation.metafunctions.join.expression_semantics">Expression
-=======
-<a name="id840555"></a>
-=======
-<a name="id803651"></a>
-=======
-<a name="id796027"></a>
-=======
-<a name="id818672"></a>
-=======
-<a name="id808427"></a>
-=======
-<a name="id805150"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id798597"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.metafunctions.join.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::join<span class="special">&lt;</span><span class="identifier">LhSequence</span><span class="special">,</span> <span class="identifier">RhSequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="join.html" title="join"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">join</span></code></a><span class="special">&lt;</span><span class="identifier">LhSequence</span><span class="special">,</span> <span class="identifier">RhSequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -162,71 +70,21 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
-            the elements of <tt class="computeroutput"><span class="identifier">LhSequence</span></tt>
-            followed by the elements of <tt class="computeroutput"><span class="identifier">RhSequence</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence containing
+            the elements of <code class="computeroutput"><span class="identifier">LhSequence</span></code>
+            followed by the elements of <code class="computeroutput"><span class="identifier">RhSequence</span></code>.
             The order of the elements in the 2 sequences is preserved.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.join.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id588991"></a>
-            Complexity
-=======
-<a name="id840651"></a>
-=======
-<a name="id803782"></a>
-=======
-<a name="id796158"></a>
-=======
-<a name="id818802"></a>
-=======
-<a name="id808558"></a>
-=======
-<a name="id805281"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id798727"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.metafunctions.join.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.join.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id589020"></a>
-            Header
-=======
-<a name="id840672"></a>
-=======
-<a name="id803804"></a>
-=======
-<a name="id796179"></a>
-=======
-<a name="id818824"></a>
-=======
-<a name="id808579"></a>
-=======
-<a name="id805303"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id798749"></a>
             <a class="link" href="join.html#fusion.algorithm.transformation.metafunctions.join.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">join</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">join</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>pop_back</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="zip.html" title="zip">
+<link rel="prev" href="zip.html" title="zip">
 <link rel="next" href="pop_front.html" title="pop_front">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="zip.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="pop_front.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.pop_back"></a>pop_back
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="pop_back">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.pop_back"></a><a class="link" href="pop_back.html" title="pop_back">pop_back</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.pop_back.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id589911"></a>
-            Description
-=======
-<a name="id841304"></a>
-=======
-<a name="id804435"></a>
-=======
-<a name="id796810"></a>
-=======
-<a name="id819455"></a>
-=======
-<a name="id809279"></a>
-=======
-<a name="id806003"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799449"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of pop_back, given the input sequence
+            Returns the result type of <a class="link" href="../functions/pop_back.html" title="pop_back"><code class="computeroutput"><span class="identifier">pop_back</span></code></a>, given the input sequence
             type.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.pop_back.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id589958"></a>
-            Synopsis
-=======
-<a name="id841332"></a>
-=======
-<a name="id804464"></a>
-=======
-<a name="id796839"></a>
-=======
-<a name="id819484"></a>
-=======
-<a name="id809308"></a>
-=======
-<a name="id806031"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799478"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -108,85 +47,59 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id590058"></a><p class="title"><b>Table 1.87. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id841407"></a><p class="title"><b>Table 1.87. Parameters</b></p>
-=======
-<a name="id804538"></a><p class="title"><b>Table 1.91. Parameters</b></p>
-=======
-<a name="id796914"></a><p class="title"><b>Table 1.91. Parameters</b></p>
-=======
-<a name="id820720"></a><p class="title"><b>Table&#160;1.91.&#160;Parameters</b></p>
-=======
-<a name="id809383"></a><p class="title"><b>Table&#160;1.91.&#160;Parameters</b></p>
-=======
-<a name="id806106"></a><p class="title"><b>Table&#160;1.91.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799552"></a><p class="title"><b>Table&#160;1.91.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.pop_back.expression_semantics"></a><h6>
-<a name="id590163"></a>
-            <a href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.pop_back.expression_semantics"></a><h6>
-<a name="id806189"></a>
+<a name="id799635"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::pop_back<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="pop_back.html" title="pop_back"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">pop_back</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -201,70 +114,20 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence with all
-            the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence with all
+            the elements of <code class="computeroutput"><span class="identifier">Sequence</span></code>
             except the last element.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.pop_back.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id590286"></a>
-            Complexity
-=======
-<a name="id841568"></a>
-=======
-<a name="id805887"></a>
-=======
-<a name="id798263"></a>
-=======
-<a name="id820908"></a>
-=======
-<a name="id809571"></a>
-=======
-<a name="id806294"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799741"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.pop_back.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id590316"></a>
-            Header
-=======
-<a name="id841587"></a>
-=======
-<a name="id805907"></a>
-=======
-<a name="id798282"></a>
-=======
-<a name="id820927"></a>
-=======
-<a name="id809590"></a>
-=======
-<a name="id806313"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799760"></a>
             <a class="link" href="pop_back.html#fusion.algorithm.transformation.metafunctions.pop_back.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">pop_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">pop_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>pop_front</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="pop_back.html" title="pop_back">
+<link rel="prev" href="pop_back.html" title="pop_back">
 <link rel="next" href="push_back.html" title="push_back">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="pop_back.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="push_back.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.pop_front"></a>pop_front
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="pop_front">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.pop_front"></a><a class="link" href="pop_front.html" title="pop_front">pop_front</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.pop_front.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id590503"></a>
-            Description
-=======
-<a name="id841715"></a>
-=======
-<a name="id806035"></a>
-=======
-<a name="id798411"></a>
-=======
-<a name="id821056"></a>
-=======
-<a name="id809719"></a>
-=======
-<a name="id806442"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799888"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of pop_front, given the input sequence
+            Returns the result type of <a class="link" href="../functions/pop_front.html" title="pop_front"><code class="computeroutput"><span class="identifier">pop_front</span></code></a>, given the input sequence
             type.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.pop_front.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id590551"></a>
-            Synopsis
-=======
-<a name="id841742"></a>
-=======
-<a name="id806061"></a>
-=======
-<a name="id798437"></a>
-=======
-<a name="id821082"></a>
-=======
-<a name="id809745"></a>
-=======
-<a name="id806468"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799915"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -108,85 +47,59 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id590651"></a><p class="title"><b>Table 1.88. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id841814"></a><p class="title"><b>Table 1.88. Parameters</b></p>
-=======
-<a name="id806133"></a><p class="title"><b>Table 1.92. Parameters</b></p>
-=======
-<a name="id798509"></a><p class="title"><b>Table 1.92. Parameters</b></p>
-=======
-<a name="id821154"></a><p class="title"><b>Table&#160;1.92.&#160;Parameters</b></p>
-=======
-<a name="id809817"></a><p class="title"><b>Table&#160;1.92.&#160;Parameters</b></p>
-=======
-<a name="id806540"></a><p class="title"><b>Table&#160;1.92.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799987"></a><p class="title"><b>Table&#160;1.92.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.pop_front.expression_semantics"></a><h6>
-<a name="id590754"></a>
-            <a href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.pop_front.expression_semantics"></a><h6>
-<a name="id806623"></a>
+<a name="id800069"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::pop_front<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="pop_front.html" title="pop_front"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">pop_front</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -201,44 +114,19 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence with all
-            the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence with all
+            the elements of <code class="computeroutput"><span class="identifier">Sequence</span></code>
             except the first element.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.pop_front.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id590877"></a>
-            Complexity
-=======
-<a name="id841974"></a>
-=======
-<a name="id806322"></a>
-=======
-<a name="id798698"></a>
-=======
-<a name="id821342"></a>
-=======
-<a name="id810005"></a>
-=======
-<a name="id806729"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id800175"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.pop_front.header"></a><h6>
-<a name="id806748"></a>
+<a name="id800194"></a>
             <a class="link" href="pop_front.html#fusion.algorithm.transformation.metafunctions.pop_front.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">pop_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>push_back</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="pop_front.html" title="pop_front">
+<link rel="prev" href="pop_front.html" title="pop_front">
 <link rel="next" href="push_front.html" title="push_front">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="pop_front.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="push_front.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.push_back"></a>push_back
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="push_back">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.push_back"></a><a class="link" href="push_back.html" title="push_back">push_back</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.push_back.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id590932"></a>
-            Description
-=======
-<a name="id842006"></a>
-=======
-<a name="id806469"></a>
-=======
-<a name="id798845"></a>
-=======
-<a name="id821490"></a>
-=======
-<a name="id810153"></a>
-=======
-<a name="id806876"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id800323"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of push_back, given the types of
+            Returns the result type of <a class="link" href="../functions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a>, given the types of
             the input sequence and element to push.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.push_back.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id590982"></a>
-            Synopsis
-=======
-<a name="id842032"></a>
-=======
-<a name="id806496"></a>
-=======
-<a name="id798872"></a>
-=======
-<a name="id821516"></a>
-=======
-<a name="id810179"></a>
-=======
-<a name="id806903"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id800349"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -109,98 +48,78 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id591099"></a><p class="title"><b>Table 1.89. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id842117"></a><p class="title"><b>Table 1.89. Parameters</b></p>
-=======
-<a name="id806581"></a><p class="title"><b>Table 1.93. Parameters</b></p>
-=======
-<a name="id798957"></a><p class="title"><b>Table 1.93. Parameters</b></p>
-=======
-<a name="id821602"></a><p class="title"><b>Table&#160;1.93.&#160;Parameters</b></p>
-=======
-<a name="id810265"></a><p class="title"><b>Table&#160;1.93.&#160;Parameters</b></p>
-=======
-<a name="id806988"></a><p class="title"><b>Table&#160;1.93.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id800434"></a><p class="title"><b>Table&#160;1.93.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.push_back.expression_semantics"></a><h6>
-<a name="id591239"></a>
-            <a href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.push_back.expression_semantics"></a><h6>
-<a name="id807102"></a>
+<a name="id800548"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::push_back<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">push_back</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -215,45 +134,20 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence with the
-            elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-            and an element of type <tt class="computeroutput"><span class="identifier">T</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence with the
+            elements of <code class="computeroutput"><span class="identifier">Sequence</span></code>
+            and an element of type <code class="computeroutput"><span class="identifier">T</span></code>
             added to the end.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.push_back.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id591384"></a>
-            Complexity
-=======
-<a name="id842324"></a>
-=======
-<a name="id806815"></a>
-=======
-<a name="id799191"></a>
-=======
-<a name="id821836"></a>
-=======
-<a name="id810499"></a>
-=======
-<a name="id807222"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id800668"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.push_back.header"></a><h6>
-<a name="id807241"></a>
+<a name="id800687"></a>
             <a class="link" href="push_back.html#fusion.algorithm.transformation.metafunctions.push_back.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">push_back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>push_front</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="push_back.html" title="push_back">
+<link rel="prev" href="push_back.html" title="push_back">
 <link rel="next" href="../../../tuple.html" title="Tuple">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="push_back.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../../tuple.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.push_front"></a>push_front
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="push_front">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.push_front"></a><a class="link" href="push_front.html" title="push_front">push_front</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.push_front.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id591438"></a>
-            Description
-=======
-<a name="id842360"></a>
-=======
-<a name="id806967"></a>
-=======
-<a name="id799343"></a>
-=======
-<a name="id821988"></a>
-=======
-<a name="id810651"></a>
-=======
-<a name="id807374"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id800821"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of push_front, given the types
+            Returns the result type of <a class="link" href="../functions/push_front.html" title="push_front"><code class="computeroutput"><span class="identifier">push_front</span></code></a>, given the types
             of the input sequence and element to push.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.push_front.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id591488"></a>
-            Synopsis
-=======
-<a name="id842386"></a>
-=======
-<a name="id806994"></a>
-=======
-<a name="id799370"></a>
-=======
-<a name="id822014"></a>
-=======
-<a name="id810677"></a>
-=======
-<a name="id807401"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id800847"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -109,98 +48,78 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id591605"></a><p class="title"><b>Table 1.90. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id842471"></a><p class="title"><b>Table 1.90. Parameters</b></p>
-=======
-<a name="id807079"></a><p class="title"><b>Table 1.94. Parameters</b></p>
-=======
-<a name="id799455"></a><p class="title"><b>Table 1.94. Parameters</b></p>
-=======
-<a name="id822100"></a><p class="title"><b>Table&#160;1.94.&#160;Parameters</b></p>
-=======
-<a name="id810763"></a><p class="title"><b>Table&#160;1.94.&#160;Parameters</b></p>
-=======
-<a name="id807486"></a><p class="title"><b>Table&#160;1.94.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id800932"></a><p class="title"><b>Table&#160;1.94.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.push_front.expression_semantics"></a><h6>
-<a name="id591745"></a>
-            <a href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.push_front.expression_semantics"></a><h6>
-<a name="id807600"></a>
+<a name="id801046"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::push_front<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="push_front.html" title="push_front"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">push_front</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -215,45 +134,20 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence with the
-            elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-            and an element of type <tt class="computeroutput"><span class="identifier">T</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence with the
+            elements of <code class="computeroutput"><span class="identifier">Sequence</span></code>
+            and an element of type <code class="computeroutput"><span class="identifier">T</span></code>
             added to the beginning.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.push_front.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id591890"></a>
-            Complexity
-=======
-<a name="id843841"></a>
-=======
-<a name="id807315"></a>
-=======
-<a name="id799691"></a>
-=======
-<a name="id822336"></a>
-=======
-<a name="id810999"></a>
-=======
-<a name="id807722"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id801169"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.push_front.header"></a><h6>
-<a name="id807741"></a>
+<a name="id801188"></a>
             <a class="link" href="push_front.html#fusion.algorithm.transformation.metafunctions.push_front.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">push_front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>remove</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="replace_if.html" title="replace_if">
+<link rel="prev" href="replace_if.html" title="replace_if">
 <link rel="next" href="remove_if.html" title="remove_if">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="replace_if.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="remove_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.remove"></a>remove
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="remove">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.remove"></a><a class="link" href="remove.html" title="remove">remove</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.remove.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id582961"></a>
-            Description
-=======
-<a name="id834671"></a>
-=======
-<a name="id798411"></a>
-=======
-<a name="id790787"></a>
-=======
-<a name="id812311"></a>
-=======
-<a name="id802066"></a>
-=======
-<a name="id798789"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id792236"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.metafunctions.remove.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of remove, given the sequence and
+            Returns the result type of <a class="link" href="../functions/remove.html" title="remove"><code class="computeroutput"><span class="identifier">remove</span></code></a>, given the sequence and
             removal types.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.remove.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id583010"></a>
-            Synopsis
-=======
-<a name="id834701"></a>
-=======
-<a name="id798441"></a>
-=======
-<a name="id790817"></a>
-=======
-<a name="id812341"></a>
-=======
-<a name="id802096"></a>
-=======
-<a name="id798819"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id792266"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.metafunctions.remove.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -109,98 +48,78 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id583126"></a><p class="title"><b>Table 1.79. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id834789"></a><p class="title"><b>Table 1.79. Parameters</b></p>
-=======
-<a name="id798529"></a><p class="title"><b>Table 1.83. Parameters</b></p>
-=======
-<a name="id790905"></a><p class="title"><b>Table 1.83. Parameters</b></p>
-=======
-<a name="id812428"></a><p class="title"><b>Table&#160;1.83.&#160;Parameters</b></p>
-=======
-<a name="id802184"></a><p class="title"><b>Table&#160;1.83.&#160;Parameters</b></p>
-=======
-<a name="id798907"></a><p class="title"><b>Table&#160;1.83.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id792353"></a><p class="title"><b>Table&#160;1.83.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Remove elements of this type
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.remove.expression_semantics"></a><h6>
-<a name="id583263"></a>
-            <a href="remove.html#fusion.algorithm.transformation.metafunctions.remove.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.remove.expression_semantics"></a><h6>
-<a name="id799020"></a>
+<a name="id792466"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.metafunctions.remove.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::remove<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="remove.html" title="remove"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">remove</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -215,72 +134,22 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
-            the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-            not of type <tt class="computeroutput"><span class="identifier">T</span></tt>. Equivalent
-            to <tt class="computeroutput">result_of::replace_if<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span>
-            <span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence containing
+            the elements of <code class="computeroutput"><span class="identifier">Sequence</span></code>
+            not of type <code class="computeroutput"><span class="identifier">T</span></code>. Equivalent
+            to <code class="computeroutput"><a class="link" href="replace_if.html" title="replace_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">replace_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span>
+            <span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.remove.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id583520"></a>
-            Complexity
-=======
-<a name="id835077"></a>
-=======
-<a name="id798845"></a>
-=======
-<a name="id791220"></a>
-=======
-<a name="id812744"></a>
-=======
-<a name="id802499"></a>
-=======
-<a name="id799223"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id792669"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.metafunctions.remove.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.remove.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id583549"></a>
-            Header
-=======
-<a name="id835098"></a>
-=======
-<a name="id798866"></a>
-=======
-<a name="id791242"></a>
-=======
-<a name="id812766"></a>
-=======
-<a name="id802521"></a>
-=======
-<a name="id799244"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id792691"></a>
             <a class="link" href="remove.html#fusion.algorithm.transformation.metafunctions.remove.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">remove</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">remove</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>remove_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="remove.html" title="remove">
+<link rel="prev" href="remove.html" title="remove">
 <link rel="next" href="reverse.html" title="reverse">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,75 +22,22 @@
 <div class="spirit-nav">
 <a accesskey="p" href="remove.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reverse.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.remove_if"></a>remove_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="remove_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.remove_if"></a><a class="link" href="remove_if.html" title="remove_if">remove_if</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.remove_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id583737"></a>
-            Description
-=======
-<a name="id835227"></a>
-=======
-<a name="id798995"></a>
-=======
-<a name="id791370"></a>
-=======
-<a name="id812894"></a>
-=======
-<a name="id802649"></a>
-=======
-<a name="id799373"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id792819"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of remove_if, given the input sequence
+            Returns the result type of <a class="link" href="../functions/remove_if.html" title="remove_if"><code class="computeroutput"><span class="identifier">remove_if</span></code></a>, given the input sequence
             and unary <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
             Lambda Expression</a> predicate types.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.remove_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id583793"></a>
-            Synopsis
-=======
-<a name="id835258"></a>
-=======
-<a name="id799026"></a>
-=======
-<a name="id791402"></a>
-=======
-<a name="id812925"></a>
-=======
-<a name="id802681"></a>
-=======
-<a name="id799404"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id792850"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -110,99 +49,79 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id583911"></a><p class="title"><b>Table 1.80. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id835343"></a><p class="title"><b>Table 1.80. Parameters</b></p>
-=======
-<a name="id799111"></a><p class="title"><b>Table 1.84. Parameters</b></p>
-=======
-<a name="id791487"></a><p class="title"><b>Table 1.84. Parameters</b></p>
-=======
-<a name="id813010"></a><p class="title"><b>Table&#160;1.84.&#160;Parameters</b></p>
-=======
-<a name="id802766"></a><p class="title"><b>Table&#160;1.84.&#160;Parameters</b></p>
-=======
-<a name="id799489"></a><p class="title"><b>Table&#160;1.84.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id792935"></a><p class="title"><b>Table&#160;1.84.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Pred</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Pred</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   A model of unary <a href="http://www.boost.org/libs/mpl/doc/refmanual/lambda-expression.html" target="_top">MPL
                   Lambda Expression</a>
-                </p></td>
-<td><p>
-                  Remove elements which evaluate to <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>
-                </p></td>
+                </p>
+                </td>
+<td>
+                <p>
+                  Remove elements which evaluate to <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.remove_if.expression_semantics"></a><h6>
-<a name="id584087"></a>
-            <a href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.remove_if.expression_semantics"></a><h6>
-<a name="id801062"></a>
+<a name="id794509"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::remove_if<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="remove_if.html" title="remove_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">remove_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Pred</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -217,71 +136,21 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence containing
-            the elements of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-            for which <tt class="computeroutput"><span class="identifier">Pred</span></tt> evaluates
-            to <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence containing
+            the elements of <code class="computeroutput"><span class="identifier">Sequence</span></code>
+            for which <code class="computeroutput"><span class="identifier">Pred</span></code> evaluates
+            to <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.remove_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id584268"></a>
-            Complexity
-=======
-<a name="id835598"></a>
-=======
-<a name="id799393"></a>
-=======
-<a name="id791769"></a>
-=======
-<a name="id814727"></a>
-=======
-<a name="id804482"></a>
-=======
-<a name="id801205"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id794652"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.remove_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id584298"></a>
-            Header
-=======
-<a name="id835617"></a>
-=======
-<a name="id799412"></a>
-=======
-<a name="id792130"></a>
-=======
-<a name="id814746"></a>
-=======
-<a name="id804501"></a>
-=======
-<a name="id801224"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id794671"></a>
             <a class="link" href="remove_if.html#fusion.algorithm.transformation.metafunctions.remove_if.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">remove_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">remove_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>replace</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="transform.html" title="transform">
+<link rel="prev" href="transform.html" title="transform">
 <link rel="next" href="replace_if.html" title="replace_if">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="transform.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="replace_if.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.replace"></a>replace
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="replace">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.replace"></a><a class="link" href="replace.html" title="replace">replace</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.replace.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id581560"></a>
-            Description
-=======
-<a name="id833067"></a>
-=======
-<a name="id797423"></a>
-=======
-<a name="id789798"></a>
-=======
-<a name="id811322"></a>
-=======
-<a name="id801077"></a>
-=======
-<a name="id797801"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id791247"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.metafunctions.replace.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of replace, given the types of
+            Returns the result type of <a class="link" href="../functions/replace.html" title="replace"><code class="computeroutput"><span class="identifier">replace</span></code></a>, given the types of
             the input sequence and element to replace.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.replace.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id581610"></a>
-            Synopsis
-=======
-<a name="id833096"></a>
-=======
-<a name="id797451"></a>
-=======
-<a name="id789827"></a>
-=======
-<a name="id811351"></a>
-=======
-<a name="id801106"></a>
-=======
-<a name="id797829"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id791276"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.metafunctions.replace.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -109,159 +48,94 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id581727"></a><p class="title"><b>Table 1.77. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id833184"></a><p class="title"><b>Table 1.77. Parameters</b></p>
-=======
-<a name="id797539"></a><p class="title"><b>Table 1.81. Parameters</b></p>
-=======
-<a name="id789915"></a><p class="title"><b>Table 1.81. Parameters</b></p>
-=======
-<a name="id811438"></a><p class="title"><b>Table&#160;1.81.&#160;Parameters</b></p>
-=======
-<a name="id801194"></a><p class="title"><b>Table&#160;1.81.&#160;Parameters</b></p>
-=======
-<a name="id797917"></a><p class="title"><b>Table&#160;1.81.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id791363"></a><p class="title"><b>Table&#160;1.81.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The type of the search and replacement objects
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.replace.expression_semantics"></a><h6>
-<a name="id581868"></a>
-            <a href="replace.html#fusion.algorithm.transformation.metafunctions.replace.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.replace.expression_semantics"></a><h6>
-<a name="id798030"></a>
+<a name="id791476"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.metafunctions.replace.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::replace<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="replace.html" title="replace"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">replace</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the return type of
-            replace.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the return type of
+            <a class="link" href="../functions/replace.html" title="replace"><code class="computeroutput"><span class="identifier">replace</span></code></a>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.replace.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id582006"></a>
-            Complexity
-=======
-<a name="id833383"></a>
-=======
-<a name="id797738"></a>
-=======
-<a name="id790114"></a>
-=======
-<a name="id811638"></a>
-=======
-<a name="id801393"></a>
-=======
-<a name="id798116"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id791563"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.metafunctions.replace.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.replace.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id582036"></a>
-            Header
-=======
-<a name="id833402"></a>
-=======
-<a name="id797757"></a>
-=======
-<a name="id790133"></a>
-=======
-<a name="id811657"></a>
-=======
-<a name="id801412"></a>
-=======
-<a name="id798135"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id791582"></a>
             <a class="link" href="replace.html#fusion.algorithm.transformation.metafunctions.replace.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">replace</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">replace</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>replace_if</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="replace.html" title="replace">
+<link rel="prev" href="replace.html" title="replace">
 <link rel="next" href="remove.html" title="remove">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,76 +22,22 @@
 <div class="spirit-nav">
 <a accesskey="p" href="replace.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="remove.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.replace_if"></a>replace_if
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="replace_if">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.replace_if"></a><a class="link" href="replace_if.html" title="replace_if">replace_if</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.replace_if.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id582222"></a>
-            Description
-=======
-<a name="id833535"></a>
-=======
-<a name="id797891"></a>
-=======
-<a name="id790266"></a>
-=======
-<a name="id811790"></a>
-=======
-<a name="id801545"></a>
-=======
-<a name="id798269"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id791715"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of replace_if, given the types
-            of the sequence, <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+            Returns the result type of <a class="link" href="../functions/replace_if.html" title="replace_if"><code class="computeroutput"><span class="identifier">replace_if</span></code></a>, given the types
+            of the sequence, <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
             Function Object</a> predicate and replacement object.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.replace_if.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id582281"></a>
-            Synopsis
-=======
-<a name="id833567"></a>
-=======
-<a name="id797922"></a>
-=======
-<a name="id790298"></a>
-=======
-<a name="id811821"></a>
-=======
-<a name="id801577"></a>
-=======
-<a name="id798300"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id791746"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
@@ -111,172 +49,112 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id582414"></a><p class="title"><b>Table 1.78. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id833664"></a><p class="title"><b>Table 1.78. Parameters</b></p>
-=======
-<a name="id798019"></a><p class="title"><b>Table 1.82. Parameters</b></p>
-=======
-<a name="id790395"></a><p class="title"><b>Table 1.82. Parameters</b></p>
-=======
-<a name="id811918"></a><p class="title"><b>Table&#160;1.82.&#160;Parameters</b></p>
-=======
-<a name="id801674"></a><p class="title"><b>Table&#160;1.82.&#160;Parameters</b></p>
-=======
-<a name="id798397"></a><p class="title"><b>Table&#160;1.82.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id791843"></a><p class="title"><b>Table&#160;1.82.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">F</span></tt>
-                </p></td>
-<td><p>
-                  A model of unary <a href="../../../functional/concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">F</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of unary <a class="link" href="../../../functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
                   Function Object</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Replacement predicate
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">T</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">T</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The type of the replacement object
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.replace_if.expression_semantics"></a><h6>
-<a name="id582597"></a>
-            <a href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.replace_if.expression_semantics"></a><h6>
-<a name="id798546"></a>
+<a name="id791992"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::replace_if<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">F</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="replace_if.html" title="replace_if"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">replace_if</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span><span class="identifier">F</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the return type of
-            replace_if.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the return type of
+            <a class="link" href="../functions/replace_if.html" title="replace_if"><code class="computeroutput"><span class="identifier">replace_if</span></code></a>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.replace_if.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id582746"></a>
-            Complexity
-=======
-<a name="id834524"></a>
-=======
-<a name="id798264"></a>
-=======
-<a name="id790640"></a>
-=======
-<a name="id812163"></a>
-=======
-<a name="id801919"></a>
-=======
-<a name="id798642"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id792088"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.replace_if.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id582775"></a>
-            Header
-=======
-<a name="id834543"></a>
-=======
-<a name="id798283"></a>
-=======
-<a name="id790659"></a>
-=======
-<a name="id812182"></a>
-=======
-<a name="id801938"></a>
-=======
-<a name="id798661"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id792107"></a>
             <a class="link" href="replace_if.html#fusion.algorithm.transformation.metafunctions.replace_if.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">replace_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">replace_if</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>reverse</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="remove_if.html" title="remove_if">
+<link rel="prev" href="remove_if.html" title="remove_if">
 <link rel="next" href="clear.html" title="clear">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="remove_if.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="clear.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.reverse"></a>reverse
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="reverse">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.reverse"></a><a class="link" href="reverse.html" title="reverse">reverse</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.reverse.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id584483"></a>
-            Description
-=======
-<a name="id835745"></a>
-=======
-<a name="id799882"></a>
-=======
-<a name="id792258"></a>
-=======
-<a name="id814874"></a>
-=======
-<a name="id804630"></a>
-=======
-<a name="id801353"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id794799"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of reverse, given the input sequence
+            Returns the result type of <a class="link" href="../functions/reverse.html" title="reverse"><code class="computeroutput"><span class="identifier">reverse</span></code></a>, given the input sequence
             type.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.reverse.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id584530"></a>
-            Synopsis
-=======
-<a name="id835774"></a>
-=======
-<a name="id799911"></a>
-=======
-<a name="id792287"></a>
-=======
-<a name="id814903"></a>
-=======
-<a name="id804658"></a>
-=======
-<a name="id801382"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id794828"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span>
@@ -108,85 +47,59 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id584629"></a><p class="title"><b>Table 1.81. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id835848"></a><p class="title"><b>Table 1.81. Parameters</b></p>
-=======
-<a name="id799986"></a><p class="title"><b>Table 1.85. Parameters</b></p>
-=======
-<a name="id792361"></a><p class="title"><b>Table 1.85. Parameters</b></p>
-=======
-<a name="id814977"></a><p class="title"><b>Table&#160;1.85.&#160;Parameters</b></p>
-=======
-<a name="id804733"></a><p class="title"><b>Table&#160;1.85.&#160;Parameters</b></p>
-=======
-<a name="id801456"></a><p class="title"><b>Table&#160;1.85.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id794902"></a><p class="title"><b>Table&#160;1.85.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.reverse.expression_semantics"></a><h6>
-<a name="id584731"></a>
-            <a href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.reverse.expression_semantics"></a><h6>
-<a name="id801539"></a>
+<a name="id794985"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::reverse<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="reverse.html" title="reverse"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">reverse</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-            Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -206,69 +119,19 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a sequence with the
-            elements in the reverse order to <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a sequence with the
+            elements in the reverse order to <code class="computeroutput"><span class="identifier">Sequence</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.reverse.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id584854"></a>
-            Complexity
-=======
-<a name="id836008"></a>
-=======
-<a name="id800173"></a>
-=======
-<a name="id792549"></a>
-=======
-<a name="id815193"></a>
-=======
-<a name="id804949"></a>
-=======
-<a name="id801672"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id795118"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.reverse.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id584884"></a>
-            Header
-=======
-<a name="id836027"></a>
-=======
-<a name="id800192"></a>
-=======
-<a name="id792568"></a>
-=======
-<a name="id815213"></a>
-=======
-<a name="id804968"></a>
-=======
-<a name="id801691"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id795138"></a>
             <a class="link" href="reverse.html#fusion.algorithm.transformation.metafunctions.reverse.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">reverse</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">reverse</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/transform.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/transform.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/transform.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>transform</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="filter_if.html" title="filter_if">
+<link rel="prev" href="filter_if.html" title="filter_if">
 <link rel="next" href="replace.html" title="replace">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,182 +22,109 @@
 <div class="spirit-nav">
 <a accesskey="p" href="filter_if.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="replace.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.transform"></a>transform
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="transform">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.transform"></a><a class="link" href="transform.html" title="transform">transform</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.transform.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id579541"></a>
-            Description
-=======
-<a name="id831637"></a>
-=======
-<a name="id793780"></a>
-=======
-<a name="id786155"></a>
-=======
-<a name="id809864"></a>
-=======
-<a name="id797980"></a>
-=======
-<a name="id794704"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id788150"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            For a sequence <tt class="computeroutput"><span class="identifier">seq</span></tt> and
-            function object or function pointer <tt class="computeroutput"><span class="identifier">f</span></tt>,
-            <tt class="computeroutput"><span class="identifier">transform</span></tt> returns a new
-            sequence with elements created by applying <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> to each element of <tt class="computeroutput"><span class="identifier">e</span></tt>
-            of <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            For a sequence <code class="computeroutput"><span class="identifier">seq</span></code> and
+            function object or function pointer <code class="computeroutput"><span class="identifier">f</span></code>,
+            <code class="computeroutput"><span class="identifier">transform</span></code> returns a new
+            sequence with elements created by applying <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> to each element of <code class="computeroutput"><span class="identifier">e</span></code>
+            of <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.transform.unary_version_synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id579655"></a>
-            <a href="transform.html#fusion.algorithm.transformation.metafunctions.transform.unary_version_synopsis">Unary
-=======
-<a name="id831708"></a>
-=======
-<a name="id793850"></a>
-=======
-<a name="id786226"></a>
-=======
-<a name="id809934"></a>
-=======
-<a name="id798051"></a>
-=======
-<a name="id794774"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id788221"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.unary_version_synopsis">Unary
->>>>>>> .merge-right.r57125
             version synopsis</a>
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::transform<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">transform</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="transform.html" title="transform"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">transform</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">transform</span><span class="special">(</span>
     <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id579855"></a><p class="title"><b>Table 1.75. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id831849"></a><p class="title"><b>Table 1.75. Parameters</b></p>
-=======
-<a name="id793992"></a><p class="title"><b>Table 1.79. Parameters</b></p>
-=======
-<a name="id786368"></a><p class="title"><b>Table 1.79. Parameters</b></p>
-=======
-<a name="id810076"></a><p class="title"><b>Table&#160;1.79.&#160;Parameters</b></p>
-=======
-<a name="id798193"></a><p class="title"><b>Table&#160;1.79.&#160;Parameters</b></p>
-=======
-<a name="id794916"></a><p class="title"><b>Table&#160;1.79.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id788362"></a><p class="title"><b>Table&#160;1.79.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt>
-                  is a valid expression for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-                  of <tt class="computeroutput"><span class="identifier">seq</span></tt>. <tt class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E</span><span class="special">)&gt;::</span><span class="identifier">type</span></tt> is the return type of <tt class="computeroutput"><span class="identifier">f</span></tt> when called with a value of
-                  each element type <tt class="computeroutput"><span class="identifier">E</span></tt>.
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code>
+                  is a valid expression for each element <code class="computeroutput"><span class="identifier">e</span></code>
+                  of <code class="computeroutput"><span class="identifier">seq</span></code>. <code class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E</span><span class="special">)&gt;::</span><span class="identifier">type</span></code> is the return type of <code class="computeroutput"><span class="identifier">f</span></code> when called with a value of
+                  each element type <code class="computeroutput"><span class="identifier">E</span></code>.
+                </p>
+                </td>
+<td>
+                <p>
                   Transformation function
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.algorithm.transformation.metafunctions.transform.expression_semantics"></a><h6>
-<a name="id580126"></a>
-            <a href="transform.html#fusion.algorithm.transformation.metafunctions.transform.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.algorithm.transformation.metafunctions.transform.expression_semantics"></a><h6>
-<a name="id795119"></a>
+<a name="id788565"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">transform<span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../functions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">,</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a>
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -220,38 +139,13 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            the return values of <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></tt> for each element <tt class="computeroutput"><span class="identifier">e</span></tt>
-            within <tt class="computeroutput"><span class="identifier">seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            the return values of <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e</span><span class="special">)</span></code> for each element <code class="computeroutput"><span class="identifier">e</span></code>
+            within <code class="computeroutput"><span class="identifier">seq</span></code>.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.transform.binary_version_synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id580282"></a>
-            <a href="transform.html#fusion.algorithm.transformation.metafunctions.transform.binary_version_synopsis">Binary
-=======
-<a name="id832152"></a>
-=======
-<a name="id794322"></a>
-=======
-<a name="id786698"></a>
-=======
-<a name="id810406"></a>
-=======
-<a name="id798523"></a>
-=======
-<a name="id795246"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id788692"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.binary_version_synopsis">Binary
->>>>>>> .merge-right.r57125
             version synopsis</a>
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
@@ -259,200 +153,121 @@
     <span class="keyword">typename</span> <span class="identifier">Sequence2</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">F</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::transform<span class="special">&lt;</span><span class="identifier">Sequence1</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Sequence2</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">transform</span><span class="special">(</span>
+<span class="keyword">typename</span> <a class="link" href="transform.html" title="transform"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">transform</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence1</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Sequence2</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">transform</span><span class="special">(</span>
     <span class="identifier">Sequence1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">Sequence2</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq2</span><span class="special">,</span> <span class="identifier">F</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id580547"></a><p class="title"><b>Table 1.76. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id832341"></a><p class="title"><b>Table 1.76. Parameters</b></p>
-=======
-<a name="id794512"></a><p class="title"><b>Table 1.80. Parameters</b></p>
-=======
-<a name="id786887"></a><p class="title"><b>Table 1.80. Parameters</b></p>
-=======
-<a name="id810596"></a><p class="title"><b>Table&#160;1.80.&#160;Parameters</b></p>
-=======
-<a name="id798712"></a><p class="title"><b>Table&#160;1.80.&#160;Parameters</b></p>
-=======
-<a name="id795436"></a><p class="title"><b>Table&#160;1.80.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id788882"></a><p class="title"><b>Table&#160;1.80.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq1</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq1</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">seq2</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">seq2</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Operation's argument
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span><span class="identifier">e2</span><span class="special">)</span></tt>
-                  is a valid expression for each pair of elements <tt class="computeroutput"><span class="identifier">e1</span></tt>
-                  of <tt class="computeroutput"><span class="identifier">seq1</span></tt> and <tt class="computeroutput"><span class="identifier">e2</span></tt> of <tt class="computeroutput"><span class="identifier">seq2</span></tt>.
-                  <tt class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E1</span><span class="special">,</span><span class="identifier">E2</span><span class="special">)&gt;::</span><span class="identifier">type</span></tt> is the return type of <tt class="computeroutput"><span class="identifier">f</span></tt> when called with elements of
-                  type <tt class="computeroutput"><span class="identifier">E1</span></tt> and <tt class="computeroutput"><span class="identifier">E2</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span><span class="identifier">e2</span><span class="special">)</span></code>
+                  is a valid expression for each pair of elements <code class="computeroutput"><span class="identifier">e1</span></code>
+                  of <code class="computeroutput"><span class="identifier">seq1</span></code> and <code class="computeroutput"><span class="identifier">e2</span></code> of <code class="computeroutput"><span class="identifier">seq2</span></code>.
+                  <code class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F</span><span class="special">(</span><span class="identifier">E1</span><span class="special">,</span><span class="identifier">E2</span><span class="special">)&gt;::</span><span class="identifier">type</span></code> is the return type of <code class="computeroutput"><span class="identifier">f</span></code> when called with elements of
+                  type <code class="computeroutput"><span class="identifier">E1</span></code> and <code class="computeroutput"><span class="identifier">E2</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Transformation function
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<p>
-            <span class="bold"><b>Return type</b></span>: A model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<br class="table-break"><p>
+            <span class="bold"><strong>Return type</strong></span>: A model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
             Sequence</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a new sequence, containing
-            the return values of <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span> <span class="identifier">e2</span><span class="special">)</span></tt> for each pair of elements <tt class="computeroutput"><span class="identifier">e1</span></tt> and <tt class="computeroutput"><span class="identifier">e2</span></tt>
-            within <tt class="computeroutput"><span class="identifier">seq1</span></tt> and <tt class="computeroutput"><span class="identifier">seq2</span></tt> respectively.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a new sequence, containing
+            the return values of <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">e1</span><span class="special">,</span> <span class="identifier">e2</span><span class="special">)</span></code> for each pair of elements <code class="computeroutput"><span class="identifier">e1</span></code> and <code class="computeroutput"><span class="identifier">e2</span></code>
+            within <code class="computeroutput"><span class="identifier">seq1</span></code> and <code class="computeroutput"><span class="identifier">seq2</span></code> respectively.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.transform.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id581034"></a>
-            Complexity
-=======
-<a name="id832692"></a>
-=======
-<a name="id794862"></a>
-=======
-<a name="id787238"></a>
-=======
-<a name="id810946"></a>
-=======
-<a name="id800702"></a>
-=======
-<a name="id797425"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id790871"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant. Returns a view which is lazily evaluated.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.transform.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id581061"></a>
-            Header
-=======
-<a name="id832711"></a>
-=======
-<a name="id794881"></a>
-=======
-<a name="id787257"></a>
-=======
-<a name="id810965"></a>
-=======
-<a name="id800721"></a>
-=======
-<a name="id797444"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id790891"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">transform</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">transform</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.algorithm.transformation.metafunctions.transform.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id581227"></a>
-            Example
-=======
-<a name="id832831"></a>
-=======
-<a name="id795001"></a>
-=======
-<a name="id787377"></a>
-=======
-<a name="id811086"></a>
-=======
-<a name="id800841"></a>
-=======
-<a name="id797564"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id791011"></a>
             <a class="link" href="transform.html#fusion.algorithm.transformation.metafunctions.transform.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">triple</span>
 <span class="special">{</span>
@@ -464,7 +279,7 @@
     <span class="special">};</span>
 <span class="special">};</span>
 <span class="special">...</span>
-<span class="identifier">assert</span><span class="special">(</span>transform<span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">),</span> <span class="identifier">triple</span><span class="special">())</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">3</span><span class="special">,</span><span class="number">6</span><span class="special">,</span
><span class="number">9</span><span class="special">));</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="../functions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a><span class="special">(</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">),</span> <span class="identifier">triple</span><span class="special">())</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">3</span><span class="special">,</span><span c
lass="number">6</span><span class="special">,</span><span class="number">9</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/zip.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/zip.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/algorithm/transformation/metafunctions/zip.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>zip</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="join.html" title="join">
+<link rel="prev" href="join.html" title="join">
 <link rel="next" href="pop_back.html" title="pop_back">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,74 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="join.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="pop_back.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.algorithm.transformation.metafunctions.zip"></a>zip
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="zip">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.algorithm.transformation.metafunctions.zip"></a><a class="link" href="zip.html" title="zip">zip</a>
+</h5></div></div></div>
 <a name="fusion.algorithm.transformation.metafunctions.zip.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id589205"></a>
-            Description
-=======
-<a name="id840803"></a>
-=======
-<a name="id803934"></a>
-=======
-<a name="id796310"></a>
-=======
-<a name="id818955"></a>
-=======
-<a name="id808710"></a>
-=======
-<a name="id805433"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id798880"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.metafunctions.zip.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Zips sequences together to form a single sequence, whos members are tuples
             of the members of the component sequences.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.zip.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id589236"></a>
-            Synopsis
-=======
-<a name="id840825"></a>
-=======
-<a name="id803956"></a>
-=======
-<a name="id796332"></a>
-=======
-<a name="id818976"></a>
-=======
-<a name="id808732"></a>
-=======
-<a name="id805455"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id798901"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.metafunctions.zip.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Sequence1</span><span class="special">,</span>
@@ -111,112 +50,37 @@
 <span class="special">};</span>
 </pre>
 <a name="fusion.algorithm.transformation.metafunctions.zip.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id589385"></a>
-            <a href="zip.html#fusion.algorithm.transformation.metafunctions.zip.expression_semantics">Expression
-=======
-<a name="id840934"></a>
-=======
-<a name="id804065"></a>
-=======
-<a name="id796441"></a>
-=======
-<a name="id819086"></a>
-=======
-<a name="id808841"></a>
-=======
-<a name="id805564"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799011"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.metafunctions.zip.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
-<pre class="programlisting">result_of::zip<span class="special">&lt;</span><span class="identifier">Sequence1</span><span class="special">,</span> <span class="identifier">Sequence2</span><span class="special">,</span> <span class="special">...</span> <span class="identifier">SequenceN</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><a class="link" href="zip.html" title="zip"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">zip</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence1</span><span class="special">,</span> <span class="identifier">Sequence2</span><span class="special">,</span> <span class="special">...</span> <span class="identifier">SequenceN</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A model of the most restrictive
-            traversal category of sequences <tt class="computeroutput"><span class="identifier">Sequence1</span></tt>
-            to <tt class="computeroutput"><span class="identifier">SequenceN</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: A model of the most restrictive
+            traversal category of sequences <code class="computeroutput"><span class="identifier">Sequence1</span></code>
+            to <code class="computeroutput"><span class="identifier">SequenceN</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Return a sequence containing
+            <span class="bold"><strong>Semantics</strong></span>: Return a sequence containing
             tuples of elements from each sequence. For example, applying zip to tuples
-            <tt class="computeroutput"><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span>
-            <span class="number">3</span><span class="special">)</span></tt>
-            and <tt class="computeroutput"><span class="special">(</span><span class="char">'a'</span><span class="special">,</span> <span class="char">'b'</span><span class="special">,</span>
-            <span class="char">'c'</span><span class="special">)</span></tt>
-            would return <tt class="computeroutput"><span class="special">((</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">),(</span><span class="number">2</span><span class="special">,</span> <span class="char">'b'</span><span class="special">),(</span><span class="number">3</span><span class="special">,</span>
-            <span class="char">'c'</span><span class="special">))</span></tt>
+            <code class="computeroutput"><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span>
+            <span class="number">3</span><span class="special">)</span></code>
+            and <code class="computeroutput"><span class="special">(</span><span class="char">'a'</span><span class="special">,</span> <span class="char">'b'</span><span class="special">,</span>
+            <span class="char">'c'</span><span class="special">)</span></code>
+            would return <code class="computeroutput"><span class="special">((</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">),(</span><span class="number">2</span><span class="special">,</span> <span class="char">'b'</span><span class="special">),(</span><span class="number">3</span><span class="special">,</span>
+            <span class="char">'c'</span><span class="special">))</span></code>
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.zip.complexity"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id589698"></a>
-            Complexity
-=======
-<a name="id841154"></a>
-=======
-<a name="id804285"></a>
-=======
-<a name="id796660"></a>
-=======
-<a name="id819305"></a>
-=======
-<a name="id809061"></a>
-=======
-<a name="id805784"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799230"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.metafunctions.zip.complexity">Complexity</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Constant.
           </p>
 <a name="fusion.algorithm.transformation.metafunctions.zip.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id589725"></a>
-            Header
-=======
-<a name="id841175"></a>
-=======
-<a name="id804306"></a>
-=======
-<a name="id796682"></a>
-=======
-<a name="id819327"></a>
-=======
-<a name="id809082"></a>
-=======
-<a name="id805805"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id799252"></a>
             <a class="link" href="zip.html#fusion.algorithm.transformation.metafunctions.zip.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">algorithm</span><span class="special">/</span><span class="identifier">transformation</span><span class="special">/</span><span class="identifier">zip</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">zip</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/change_log.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/change_log.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/change_log.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Change log</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="notes.html" title="Notes">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="notes.html" title="Notes">
 <link rel="next" href="acknowledgements.html" title="Acknowledgements">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,48 +22,53 @@
 <div class="spirit-nav">
 <a accesskey="p" href="notes.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="acknowledgements.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.change_log"></a>Change log
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Change log">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.change_log"></a><a class="link" href="change_log.html" title="Change log">Change log</a>
+</h2></div></div></div>
 <p>
       This section summarizes significant changes to the Fusion library.
     </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-        Sep 27, 2006: Added <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">tuple</span></tt>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+        Sep 27, 2006: Added <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">tuple</span></code>
         support. (Joel de Guzman)
       </li>
-<li>
-        Nov 17, 2006: Added <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">variant</span></tt>
+<li class="listitem">
+        Nov 17, 2006: Added <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">variant</span></code>
         support. (Joel de Guzman)
       </li>
-<li>
+<li class="listitem">
         Feb 15, 2007: Added functional module. (Tobias Schwinger)
       </li>
-<li>
-        APRIL 2, 2007: Added struct adapter. (Joel de Guzman)
+<li class="listitem">
+        April 2, 2007: Added struct adapter. (Joel de Guzman)
       </li>
-<li>
+<li class="listitem">
         May 8, 2007: Added associative struct adapter. (Dan Marsden)
       </li>
-<li>
-        Dec 20, 2007: Removed <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">variant</span></tt>
+<li class="listitem">
+        Dec 20, 2007: Removed <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">variant</span></code>
         support. After thorough investigation, I think now that the move to make
         variant a fusion sequence is rather quirky. A variant will always have a
         size==1 regardless of the number of types it can contain and there's no way
         to know at compile time what it contains. Iterating over its types is simply
-        wrong. All these imply that the variant is <span class="bold"><b>not</b></span>
+        wrong. All these imply that the variant is <span class="bold"><strong>not</strong></span>
         a fusion sequence. (Joel de Guzman)
       </li>
+<li class="listitem">
+        Oct 12, 2009: The accumulator is the first argument to the functor of <a class="link" href="algorithm/iteration/functions/fold.html" title="fold"><code class="computeroutput"><span class="identifier">fold</span></code></a>
+        and <a class="link" href="algorithm/iteration/functions/accumulate.html" title="accumulate"><code class="computeroutput"><span class="identifier">accumulate</span></code></a>. (Christopher Schmidt)
+      </li>
+<li class="listitem">
+        Oct 30, 2009: Added support for associative iterators and views. (Christopher
+        Schmidt)
+      </li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Container</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="sequence/operator/comparison/greater_than_equal.html" title="greater
-          than equal">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="sequence/operator/comparison/greater_than_equal.html" title="greater than equal">
 <link rel="next" href="container/vector.html" title="vector">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="sequence/operator/comparison/greater_than_equal.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="container/vector.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.container"></a>Container
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Container">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.container"></a><a class="link" href="container.html" title="Container">Container</a>
+</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">vector</span></dt>
 <dt><span class="section">cons</span></dt>
@@ -53,27 +45,20 @@
 </dl></div>
 <p>
       Fusion provides a few predefined sequences out of the box. These <span class="emphasis"><em>containers</em></span>
-      actually hold heterogenously typed data; unlike Views.
+      actually hold heterogenously typed data; unlike <a class="link" href="view.html" title="View">Views</a>.
       These containers are more or less counterparts of those in STL.
     </p>
-<<<<<<< .working
-<a name="fusion.container.header"></a><h3>
-<a name="id478616"></a>
-      Header
-    </h3>
-=======
 <a name="fusion.container.header"></a><h4>
-<a name="id684983"></a>
+<a name="id685083"></a>
       <a class="link" href="container.html#fusion.container.header">Header</a>
     </h4>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">container</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/cons.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/cons.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/cons.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>cons</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../container.html" title="Container">
-<link rel="previous" href="vector.html" title="vector">
+<link rel="prev" href="vector.html" title="vector">
 <link rel="next" href="list.html" title="list">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,79 +22,43 @@
 <div class="spirit-nav">
 <a accesskey="p" href="vector.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="list.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.container.cons"></a>cons
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.container.cons.description"></a><h4>
-<a name="id481484"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="cons">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.container.cons"></a><a class="link" href="cons.html" title="cons">cons</a>
 </h3></div></div></div>
 <a name="fusion.container.cons.description"></a><h5>
-<a name="id687663"></a>
+<a name="id689948"></a>
         <a class="link" href="cons.html#fusion.container.cons.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        <tt class="computeroutput"><span class="identifier">cons</span></tt> is a simple <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-        Sequence</a>. It is a lisp style recursive list structure where <tt class="computeroutput"><span class="identifier">car</span></tt> is the <span class="emphasis"><em>head</em></span> and
-        <tt class="computeroutput"><span class="identifier">cdr</span></tt> is the <span class="emphasis"><em>tail</em></span>:
-        usually another cons structure or <tt class="computeroutput"><span class="identifier">nil</span></tt>:
-        the empty list. Fusion's list is built on top of this more
-        primitive data structure. It is more efficient than vector when the target sequence
+        <code class="computeroutput"><span class="identifier">cons</span></code> is a simple <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+        Sequence</a>. It is a lisp style recursive list structure where <code class="computeroutput"><span class="identifier">car</span></code> is the <span class="emphasis"><em>head</em></span> and
+        <code class="computeroutput"><span class="identifier">cdr</span></code> is the <span class="emphasis"><em>tail</em></span>:
+        usually another cons structure or <code class="computeroutput"><span class="identifier">nil</span></code>:
+        the empty list. Fusion's <a class="link" href="list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a> is built on top of this more
+        primitive data structure. It is more efficient than <a class="link" href="vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a> when the target sequence
         is constructed piecemeal (a data at a time). The runtime cost of access to
-        each element is peculiarly constant (see <a href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive
+        each element is peculiarly constant (see <a class="link" href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive
         Inlined Functions</a>).
       </p>
-<<<<<<< .working
-<a name="fusion.container.cons.header"></a><h4>
-<a name="id481626"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.container.cons.header"></a><h5>
-<a name="id687744"></a>
+<a name="id690030"></a>
         <a class="link" href="cons.html#fusion.container.cons.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">/</span><span class="identifier">cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.container.cons.synopsis"></a><h4>
-<a name="id481791"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.container.cons.synopsis"></a><h5>
-<a name="id687860"></a>
+<a name="id690145"></a>
         <a class="link" href="cons.html#fusion.container.cons.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Car</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Cdr</span> <span class="special">=</span> <span class="identifier">nil</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">cons</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.container.cons.template_parameters"></a><h4>
-<a name="id481898"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.container.cons.template_parameters"></a><h5>
-<a name="id687934"></a>
+<a name="id690219"></a>
         <a class="link" href="cons.html#fusion.container.cons.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -106,106 +66,105 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Car</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Car</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Head type
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Cdr</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Cdr</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Tail type
-              </p></td>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">nil</span></tt>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">nil</span></code>
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.container.cons.model_of"></a><h4>
-<a name="id482046"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a></li></ul></div>
-<div class="variablelist">
-=======
 <a name="fusion.container.cons.model_of"></a><h5>
-<a name="id688054"></a>
+<a name="id690339"></a>
         <a class="link" href="cons.html#fusion.container.cons.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a></li></ul></div>
 <div class="variablelist" title="Notation">
->>>>>>> .merge-right.r57125
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">nil</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">nil</span></code></span></dt>
 <dd><p>
-            An empty <tt class="computeroutput"><span class="identifier">cons</span></tt>
+            An empty <code class="computeroutput"><span class="identifier">cons</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">C</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">C</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">cons</span></tt> type
+            A <code class="computeroutput"><span class="identifier">cons</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">l</span></tt>,
-        <tt class="computeroutput"><span class="identifier">l2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">l</span></code>,
+        <code class="computeroutput"><span class="identifier">l2</span></code></span></dt>
 <dd><p>
-            Instances of <tt class="computeroutput"><span class="identifier">cons</span></tt>
+            Instances of <code class="computeroutput"><span class="identifier">cons</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">car</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">car</span></code></span></dt>
 <dd><p>
             An arbitrary data
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">cdr</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">cdr</span></code></span></dt>
 <dd><p>
-            Another <tt class="computeroutput"><span class="identifier">cons</span></tt> list
+            Another <code class="computeroutput"><span class="identifier">cons</span></code> list
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>
+            A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">N</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">N</span></code></span></dt>
 <dd><p>
             An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
             Integral Constant</a>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.container.cons.expression_semantics"></a><h4>
-<a name="id482328"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.container.cons.expression_semantics"></a><h5>
-<a name="id688258"></a>
+<a name="id690543"></a>
         <a class="link" href="cons.html#fusion.container.cons.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-        defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+        defined in <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
         Sequence</a>.
       </p>
 <div class="informaltable"><table class="table">
@@ -214,114 +173,136 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">nil</span><span class="special">()</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">nil</span><span class="special">()</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Creates an empty list.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">C</span><span class="special">()</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">C</span><span class="special">()</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Creates a cons with default constructed elements.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">C</span><span class="special">(</span><span class="identifier">car</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a cons with <tt class="computeroutput"><span class="identifier">car</span></tt>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">C</span><span class="special">(</span><span class="identifier">car</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a cons with <code class="computeroutput"><span class="identifier">car</span></code>
                 head and default constructed tail.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">C</span><span class="special">(</span><span class="identifier">car</span><span class="special">,</span>
-                <span class="identifier">cdr</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a cons with <tt class="computeroutput"><span class="identifier">car</span></tt>
-                head and <tt class="computeroutput"><span class="identifier">cdr</span></tt> tail.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">C</span><span class="special">(</span><span class="identifier">car</span><span class="special">,</span>
+                <span class="identifier">cdr</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a cons with <code class="computeroutput"><span class="identifier">car</span></code>
+                head and <code class="computeroutput"><span class="identifier">cdr</span></code> tail.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">C</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a cons from a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                Sequence</a>, <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">C</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a cons from a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                Sequence</a>, <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">l</span> <span class="special">=</span>
-                <span class="identifier">s</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a cons, <tt class="computeroutput"><span class="identifier">l</span></tt>,
-                from a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                Sequence</a>, <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">l</span> <span class="special">=</span>
+                <span class="identifier">s</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a cons, <code class="computeroutput"><span class="identifier">l</span></code>,
+                from a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                Sequence</a>, <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput">at<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                The Nth element from the beginning of the sequence; see at.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><a class="link" href="../sequence/intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                The Nth element from the beginning of the sequence; see <a class="link" href="../sequence/intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<div class="sidebar"><p>
-        <span class="inlinemediaobject"><img src="images/note.png" alt="note"></span> <tt class="computeroutput">at<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span></tt> is provided
+<div class="sidebar">
+<p class="title"><b></b></p>
+<p>
+        <span class="inlinemediaobject"><img src="../../images/note.png" alt="note"></span> <code class="computeroutput"><a class="link" href="../sequence/intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span></code> is provided
         for convenience and compatibility with the original Boost.Tuple
-        library, despite <tt class="computeroutput"><span class="identifier">cons</span></tt> being
-        a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>
-        only (<tt class="computeroutput"><span class="identifier">at</span></tt> is supposed to be
-        a <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-        Access Sequence</a> requirement). The runtime complexity of at is constant (see <a href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive
+        library, despite <code class="computeroutput"><span class="identifier">cons</span></code> being
+        a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
+        only (<code class="computeroutput"><span class="identifier">at</span></code> is supposed to be
+        a <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+        Access Sequence</a> requirement). The runtime complexity of <a class="link" href="../sequence/intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a> is constant (see <a class="link" href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive
         Inlined Functions</a>).
-<<<<<<< .working
-      </p></div>
-<a name="fusion.container.cons.example"></a><h4>
-<a name="id482977"></a>
-        Example
-      </h4>
-=======
       </p>
 </div>
 <a name="fusion.container.cons.example"></a><h5>
-<a name="id688721"></a>
+<a name="id691006"></a>
         <a class="link" href="cons.html#fusion.container.cons.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">cons</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="identifier">cons</span><span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">l</span><span class="special">(</span><span class="number">12</span><span class="special">,</span> <span class="identifier">cons</span><span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;(</span><span class="number">5.5f</span><span class="special">));</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Conversion</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../container.html" title="Container">
-<link rel="previous" href="generation/metafunctions/map_tie.html" title="map_tie">
+<link rel="prev" href="generation/metafunctions/map_tie.html" title="map_tie">
 <link rel="next" href="conversion/functions.html" title="Functions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,38 +22,28 @@
 <div class="spirit-nav">
 <a accesskey="p" href="generation/metafunctions/map_tie.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="conversion/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.container.conversion"></a>Conversion
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Conversion">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.container.conversion"></a><a class="link" href="conversion.html" title="Conversion">Conversion</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Functions</span></dt>
 <dt><span class="section">Metafunctions</span></dt>
 </dl></div>
 <p>
-        All fusion sequences can be converted to one of the Container
+        All fusion sequences can be converted to one of the <a class="link" href="../container.html" title="Container">Container</a>
         types using one of these conversion functions.
       </p>
-<<<<<<< .working
-<a name="fusion.container.conversion.header"></a><h4>
-<a name="id511157"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.container.conversion.header"></a><h5>
-<a name="id717528"></a>
+<a name="id718747"></a>
         <a class="link" href="conversion.html#fusion.container.conversion.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/functions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/functions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../conversion.html" title="Conversion">
-<link rel="previous" href="../conversion.html" title="Conversion">
+<link rel="prev" href="../conversion.html" title="Conversion">
 <link rel="next" href="functions/as_list.html" title="as_list">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../conversion.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../conversion.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="functions/as_list.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.container.conversion.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.container.conversion.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">as_list</span></dt>
 <dt><span class="section">as_vector</span></dt>
@@ -42,7 +35,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_list.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_list.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_list.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>as_list</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="../functions.html" title="Functions">
+<link rel="prev" href="../functions.html" title="Functions">
 <link rel="next" href="as_vector.html" title="as_vector">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../functions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="as_vector.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.conversion.functions.as_list"></a>as_list
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="as_list">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.conversion.functions.as_list"></a><a class="link" href="as_list.html" title="as_list">as_list</a>
+</h5></div></div></div>
 <a name="fusion.container.conversion.functions.as_list.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id511286"></a>
-            Description
-=======
-<a name="id762982"></a>
-=======
-<a name="id725258"></a>
-=======
-<a name="id717612"></a>
-=======
-<a name="id739995"></a>
-=======
-<a name="id728662"></a>
-=======
-<a name="id725385"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id718831"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Convert a fusion sequence to a list.
+            Convert a fusion sequence to a <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>.
           </p>
 <a name="fusion.container.conversion.functions.as_list.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id511333"></a>
-            Synopsis
-=======
-<a name="id763010"></a>
-=======
-<a name="id725287"></a>
-=======
-<a name="id717641"></a>
-=======
-<a name="id740024"></a>
-=======
-<a name="id728690"></a>
-=======
-<a name="id725414"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id718860"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_list</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -107,33 +46,8 @@
 <span class="identifier">as_list</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.container.conversion.functions.as_list.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id511589"></a>
-            Parameters
-=======
-<a name="id763193"></a>
-=======
-<a name="id725470"></a>
-=======
-<a name="id717824"></a>
-=======
-<a name="id740207"></a>
-=======
-<a name="id728873"></a>
-=======
-<a name="id725596"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id719042"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,129 +56,66 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     An instance of Sequence
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence to convert.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.conversion.functions.as_list.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id511694"></a>
-            <a href="as_list.html#fusion.container.conversion.functions.as_list.expression_semantics">Expression
-=======
-<a name="id763279"></a>
-=======
-<a name="id725556"></a>
-=======
-<a name="id717910"></a>
-=======
-<a name="id740293"></a>
-=======
-<a name="id728959"></a>
-=======
-<a name="id725682"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id719129"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">as_list</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: result_of::as_list<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../metafunctions/as_list.html" title="as_list"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_list</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Convert a fusion sequence,
-            <tt class="computeroutput"><span class="identifier">seq</span></tt>, to a list.
+            <span class="bold"><strong>Semantics</strong></span>: Convert a fusion sequence,
+            <code class="computeroutput"><span class="identifier">seq</span></code>, to a <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>.
           </p>
 <a name="fusion.container.conversion.functions.as_list.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id511852"></a>
-            Header
-=======
-<a name="id763379"></a>
-=======
-<a name="id725656"></a>
-=======
-<a name="id718010"></a>
-=======
-<a name="id740393"></a>
-=======
-<a name="id729059"></a>
-=======
-<a name="id725782"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id719228"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">as_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.conversion.functions.as_list.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id512018"></a>
-            Example
-=======
-<a name="id763494"></a>
-=======
-<a name="id725771"></a>
-=======
-<a name="id718125"></a>
-=======
-<a name="id740508"></a>
-=======
-<a name="id729174"></a>
-=======
-<a name="id725897"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id719344"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.functions.as_list.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">as_list</span><span class="special">(</span>make_vector<span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">))</span>
+<pre class="programlisting"><span class="identifier">as_list</span><span class="special">(</span><a class="link" href="../../generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">))</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_map.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_map.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_map.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>as_map</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="as_set.html" title="as_set">
+<link rel="prev" href="as_set.html" title="as_set">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="as_set.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.conversion.functions.as_map"></a>as_map
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="as_map">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.conversion.functions.as_map"></a><a class="link" href="as_map.html" title="as_map">as_map</a>
+</h5></div></div></div>
 <a name="fusion.container.conversion.functions.as_map.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id513836"></a>
-            Description
-=======
-<a name="id764820"></a>
-=======
-<a name="id727097"></a>
-=======
-<a name="id719451"></a>
-=======
-<a name="id742858"></a>
-=======
-<a name="id730500"></a>
-=======
-<a name="id727224"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720670"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Convert a fusion sequence to a map.
+            Convert a fusion sequence to a <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a>.
           </p>
 <a name="fusion.container.conversion.functions.as_map.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id513883"></a>
-            Synopsis
-=======
-<a name="id764849"></a>
-=======
-<a name="id727126"></a>
-=======
-<a name="id719480"></a>
-=======
-<a name="id742887"></a>
-=======
-<a name="id730529"></a>
-=======
-<a name="id727252"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720699"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_map</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -107,33 +46,8 @@
 <span class="identifier">as_map</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.container.conversion.functions.as_map.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id514138"></a>
-            Parameters
-=======
-<a name="id765029"></a>
-=======
-<a name="id727306"></a>
-=======
-<a name="id719660"></a>
-=======
-<a name="id743067"></a>
-=======
-<a name="id730709"></a>
-=======
-<a name="id727432"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720879"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,136 +56,73 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     An instance of Sequence
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence to convert.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.conversion.functions.as_map.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id514243"></a>
-            <a href="as_map.html#fusion.container.conversion.functions.as_map.expression_semantics">Expression
-=======
-<a name="id765113"></a>
-=======
-<a name="id727390"></a>
-=======
-<a name="id719744"></a>
-=======
-<a name="id743151"></a>
-=======
-<a name="id730793"></a>
-=======
-<a name="id727516"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720963"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">as_map</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: result_of::as_map<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../metafunctions/as_map.html" title="as_map"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_map</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Convert a fusion sequence,
-            <tt class="computeroutput"><span class="identifier">seq</span></tt>, to a map.
+            <span class="bold"><strong>Semantics</strong></span>: Convert a fusion sequence,
+            <code class="computeroutput"><span class="identifier">seq</span></code>, to a <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a>.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: The elements of the sequence
+            <span class="bold"><strong>Precondition</strong></span>: The elements of the sequence
             are assumed to be __fusion<span class="underline">pair</span>_s.
-            There may be no duplicate fusion::pair key types.
+            There may be no duplicate <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a> key types.
           </p>
 <a name="fusion.container.conversion.functions.as_map.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id514447"></a>
-            Header
-=======
-<a name="id765243"></a>
-=======
-<a name="id727520"></a>
-=======
-<a name="id719874"></a>
-=======
-<a name="id743281"></a>
-=======
-<a name="id730923"></a>
-=======
-<a name="id727646"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721092"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">map</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">as_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.conversion.functions.as_map.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id514613"></a>
-            Example
-=======
-<a name="id765358"></a>
-=======
-<a name="id727635"></a>
-=======
-<a name="id719989"></a>
-=======
-<a name="id743396"></a>
-=======
-<a name="id731038"></a>
-=======
-<a name="id727761"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721208"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.functions.as_map.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">as_map</span><span class="special">(</span>make_vector<span class="special">(</span>
-    make_pair<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="char">'X'</span><span class="special">)</span>
-  <span class="special">,</span> make_pair<span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;(</span><span class="string">"Men"</span><span class="special">)))</span>
+<pre class="programlisting"><span class="identifier">as_map</span><span class="special">(</span><a class="link" href="../../generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span>
+    <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">make_pair</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="char">'X'</span><span class="special">)</span>
+  <span class="special">,</span> <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">make_pair</span></code></a><span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;(</span><span class="string">"Men"</span><span class="special">)))</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_set.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_set.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_set.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>as_set</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="as_vector.html" title="as_vector">
+<link rel="prev" href="as_vector.html" title="as_vector">
 <link rel="next" href="as_map.html" title="as_map">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="as_vector.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="as_map.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.conversion.functions.as_set"></a>as_set
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="as_set">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.conversion.functions.as_set"></a><a class="link" href="as_set.html" title="as_set">as_set</a>
+</h5></div></div></div>
 <a name="fusion.container.conversion.functions.as_set.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id512981"></a>
-            Description
-=======
-<a name="id764160"></a>
-=======
-<a name="id726506"></a>
-=======
-<a name="id718860"></a>
-=======
-<a name="id742267"></a>
-=======
-<a name="id729909"></a>
-=======
-<a name="id726632"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720078"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Convert a fusion sequence to a set.
+            Convert a fusion sequence to a <a class="link" href="../../set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a>.
           </p>
 <a name="fusion.container.conversion.functions.as_set.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id513027"></a>
-            Synopsis
-=======
-<a name="id764189"></a>
-=======
-<a name="id726534"></a>
-=======
-<a name="id718888"></a>
-=======
-<a name="id742295"></a>
-=======
-<a name="id729938"></a>
-=======
-<a name="id726661"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720107"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_set</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -107,33 +46,8 @@
 <span class="identifier">as_set</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.container.conversion.functions.as_set.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id513282"></a>
-            Parameters
-=======
-<a name="id764438"></a>
-=======
-<a name="id726714"></a>
-=======
-<a name="id719068"></a>
-=======
-<a name="id742475"></a>
-=======
-<a name="id730118"></a>
-=======
-<a name="id726841"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720287"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,133 +56,70 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     An instance of Sequence
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence to convert.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.conversion.functions.as_set.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id513387"></a>
-            <a href="as_set.html#fusion.container.conversion.functions.as_set.expression_semantics">Expression
-=======
-<a name="id764522"></a>
-=======
-<a name="id726798"></a>
-=======
-<a name="id719152"></a>
-=======
-<a name="id742559"></a>
-=======
-<a name="id730202"></a>
-=======
-<a name="id726925"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720371"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">as_set</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: result_of::as_set<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../metafunctions/as_set.html" title="as_set"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_set</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Convert a fusion sequence,
-            <tt class="computeroutput"><span class="identifier">seq</span></tt>, to a set.
+            <span class="bold"><strong>Semantics</strong></span>: Convert a fusion sequence,
+            <code class="computeroutput"><span class="identifier">seq</span></code>, to a <a class="link" href="../../set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a>.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: There may be no duplicate
+            <span class="bold"><strong>Precondition</strong></span>: There may be no duplicate
             key types.
           </p>
 <a name="fusion.container.conversion.functions.as_set.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id513556"></a>
-            Header
-=======
-<a name="id764631"></a>
-=======
-<a name="id726908"></a>
-=======
-<a name="id719262"></a>
-=======
-<a name="id742669"></a>
-=======
-<a name="id730311"></a>
-=======
-<a name="id727034"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720480"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">set</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">as_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.conversion.functions.as_set.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id513722"></a>
-            Example
-=======
-<a name="id764746"></a>
-=======
-<a name="id727023"></a>
-=======
-<a name="id719377"></a>
-=======
-<a name="id742784"></a>
-=======
-<a name="id730426"></a>
-=======
-<a name="id727149"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720596"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.functions.as_set.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">as_set</span><span class="special">(</span>make_vector<span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">))</span>
+<pre class="programlisting"><span class="identifier">as_set</span><span class="special">(</span><a class="link" href="../../generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">))</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_vector.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_vector.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/functions/as_vector.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>as_vector</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="as_list.html" title="as_list">
+<link rel="prev" href="as_list.html" title="as_list">
 <link rel="next" href="as_set.html" title="as_set">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="as_list.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="as_set.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.conversion.functions.as_vector"></a>as_vector
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="as_vector">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.conversion.functions.as_vector"></a><a class="link" href="as_vector.html" title="as_vector">as_vector</a>
+</h5></div></div></div>
 <a name="fusion.container.conversion.functions.as_vector.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id512133"></a>
-            Description
-=======
-<a name="id763568"></a>
-=======
-<a name="id725845"></a>
-=======
-<a name="id718199"></a>
-=======
-<a name="id740582"></a>
-=======
-<a name="id729248"></a>
-=======
-<a name="id725972"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id719418"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Convert a fusion sequence to a vector.
+            Convert a fusion sequence to a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>.
           </p>
 <a name="fusion.container.conversion.functions.as_vector.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id512180"></a>
-            Synopsis
-=======
-<a name="id763600"></a>
-=======
-<a name="id725876"></a>
-=======
-<a name="id718230"></a>
-=======
-<a name="id740613"></a>
-=======
-<a name="id729280"></a>
-=======
-<a name="id726003"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id719449"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_vector</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
@@ -107,33 +46,8 @@
 <span class="identifier">as_vector</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.container.conversion.functions.as_vector.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id512435"></a>
-            Parameters
-=======
-<a name="id763784"></a>
-=======
-<a name="id726061"></a>
-=======
-<a name="id718415"></a>
-=======
-<a name="id740798"></a>
-=======
-<a name="id729464"></a>
-=======
-<a name="id726188"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id719634"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,129 +56,66 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     An instance of Sequence
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence to convert.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.conversion.functions.as_vector.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id512541"></a>
-            <a href="as_vector.html#fusion.container.conversion.functions.as_vector.expression_semantics">Expression
-=======
-<a name="id763871"></a>
-=======
-<a name="id726148"></a>
-=======
-<a name="id718502"></a>
-=======
-<a name="id740885"></a>
-=======
-<a name="id729551"></a>
-=======
-<a name="id726274"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id719720"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">as_vector</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: result_of::as_vector<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../metafunctions/as_vector.html" title="as_vector"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_vector</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Convert a fusion sequence,
-            <tt class="computeroutput"><span class="identifier">seq</span></tt>, to a vector.
+            <span class="bold"><strong>Semantics</strong></span>: Convert a fusion sequence,
+            <code class="computeroutput"><span class="identifier">seq</span></code>, to a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>.
           </p>
 <a name="fusion.container.conversion.functions.as_vector.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id512700"></a>
-            Header
-=======
-<a name="id763970"></a>
-=======
-<a name="id726247"></a>
-=======
-<a name="id718601"></a>
-=======
-<a name="id742077"></a>
-=======
-<a name="id729719"></a>
-=======
-<a name="id726442"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id719889"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">vector</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">as_vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.conversion.functions.as_vector.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id512866"></a>
-            Example
-=======
-<a name="id764086"></a>
-=======
-<a name="id726431"></a>
-=======
-<a name="id718785"></a>
-=======
-<a name="id742192"></a>
-=======
-<a name="id729834"></a>
-=======
-<a name="id726558"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id720004"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.functions.as_vector.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">as_vector</span><span class="special">(</span>make_list<span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">))</span>
+<pre class="programlisting"><span class="identifier">as_vector</span><span class="special">(</span><a class="link" href="../../generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a><span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">))</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Metafunctions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../conversion.html" title="Conversion">
-<link rel="previous" href="functions/as_map.html" title="as_map">
+<link rel="prev" href="functions/as_map.html" title="as_map">
 <link rel="next" href="metafunctions/as_list.html" title="as_list">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="functions/as_map.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../conversion.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="metafunctions/as_list.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.container.conversion.metafunctions"></a>Metafunctions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Metafunctions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.container.conversion.metafunctions"></a><a class="link" href="metafunctions.html" title="Metafunctions">Metafunctions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">as_list</span></dt>
 <dt><span class="section">as_vector</span></dt>
@@ -42,7 +35,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_list.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_list.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_list.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>as_list</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="../metafunctions.html" title="Metafunctions">
+<link rel="prev" href="../metafunctions.html" title="Metafunctions">
 <link rel="next" href="as_vector.html" title="as_vector">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,105 +22,27 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="as_vector.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.conversion.metafunctions.as_list"></a>as_list
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="as_list">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.conversion.metafunctions.as_list"></a><a class="link" href="as_list.html" title="as_list">as_list</a>
+</h5></div></div></div>
 <a name="fusion.container.conversion.metafunctions.as_list.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id514801"></a>
-            Description
-=======
-<a name="id765479"></a>
-=======
-<a name="id727756"></a>
-=======
-<a name="id720110"></a>
-=======
-<a name="id743517"></a>
-=======
-<a name="id731159"></a>
-=======
-<a name="id727882"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721329"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of as_list.
+            Returns the result type of <a class="link" href="../functions/as_list.html" title="as_list"><code class="computeroutput"><span class="identifier">as_list</span></code></a>.
           </p>
 <a name="fusion.container.conversion.metafunctions.as_list.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id514849"></a>
-            Synopsis
-=======
-<a name="id765510"></a>
-=======
-<a name="id727787"></a>
-=======
-<a name="id720141"></a>
-=======
-<a name="id743548"></a>
-=======
-<a name="id731190"></a>
-=======
-<a name="id727914"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721360"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">as_list</span><span class="special">;</span>
 </pre>
 <a name="fusion.container.conversion.metafunctions.as_list.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id514927"></a>
-            Parameters
-=======
-<a name="id765567"></a>
-=======
-<a name="id727844"></a>
-=======
-<a name="id720198"></a>
-=======
-<a name="id743605"></a>
-=======
-<a name="id731247"></a>
-=======
-<a name="id727970"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721416"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -137,130 +51,67 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                  </p></td>
-<td><p>
-                    A fusion Sequence
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    A fusion <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence type to convert.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.conversion.metafunctions.as_list.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id515042"></a>
-            <a href="as_list.html#fusion.container.conversion.metafunctions.as_list.expression_semantics">Expression
-=======
-<a name="id765657"></a>
-=======
-<a name="id727934"></a>
-=======
-<a name="id720288"></a>
-=======
-<a name="id743695"></a>
-=======
-<a name="id731337"></a>
-=======
-<a name="id728060"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721506"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_list</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">;</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A list with same elements as the
-            input sequence, <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: A <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a> with same elements as the
+            input sequence, <code class="computeroutput"><span class="identifier">Sequence</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Convert a fusion sequence,
-            <tt class="computeroutput"><span class="identifier">Sequence</span></tt>, to a list.
+            <span class="bold"><strong>Semantics</strong></span>: Convert a fusion sequence,
+            <code class="computeroutput"><span class="identifier">Sequence</span></code>, to a <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>.
           </p>
 <a name="fusion.container.conversion.metafunctions.as_list.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id515196"></a>
-            Header
-=======
-<a name="id765756"></a>
-=======
-<a name="id728033"></a>
-=======
-<a name="id720387"></a>
-=======
-<a name="id743794"></a>
-=======
-<a name="id731436"></a>
-=======
-<a name="id728160"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721606"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">as_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.conversion.metafunctions.as_list.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id515362"></a>
-            Example
-=======
-<a name="id765876"></a>
-=======
-<a name="id728153"></a>
-=======
-<a name="id720507"></a>
-=======
-<a name="id743914"></a>
-=======
-<a name="id731556"></a>
-=======
-<a name="id728280"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721726"></a>
             <a class="link" href="as_list.html#fusion.container.conversion.metafunctions.as_list.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_list</span><span class="special">&lt;</span>vector<span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_list</span><span class="special">&lt;</span><a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_map.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_map.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_map.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>as_map</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="as_set.html" title="as_set">
+<link rel="prev" href="as_set.html" title="as_set">
 <link rel="next" href="../../../view.html" title="View">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,105 +22,27 @@
 <div class="spirit-nav">
 <a accesskey="p" href="as_set.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../../view.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.conversion.metafunctions.as_map"></a>as_map
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="as_map">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.conversion.metafunctions.as_map"></a><a class="link" href="as_map.html" title="as_map">as_map</a>
+</h5></div></div></div>
 <a name="fusion.container.conversion.metafunctions.as_map.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id516868"></a>
-            Description
-=======
-<a name="id768703"></a>
-=======
-<a name="id729888"></a>
-=======
-<a name="id722242"></a>
-=======
-<a name="id745717"></a>
-=======
-<a name="id734247"></a>
-=======
-<a name="id730970"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id724416"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of as_map.
+            Returns the result type of <a class="link" href="../functions/as_map.html" title="as_map"><code class="computeroutput"><span class="identifier">as_map</span></code></a>.
           </p>
 <a name="fusion.container.conversion.metafunctions.as_map.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id516916"></a>
-            Synopsis
-=======
-<a name="id768734"></a>
-=======
-<a name="id729919"></a>
-=======
-<a name="id722273"></a>
-=======
-<a name="id745748"></a>
-=======
-<a name="id734278"></a>
-=======
-<a name="id731001"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id724447"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">as_map</span><span class="special">;</span>
 </pre>
 <a name="fusion.container.conversion.metafunctions.as_map.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id516994"></a>
-            Parameters
-=======
-<a name="id768791"></a>
-=======
-<a name="id729975"></a>
-=======
-<a name="id722329"></a>
-=======
-<a name="id745804"></a>
-=======
-<a name="id734334"></a>
-=======
-<a name="id731057"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id724504"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -137,137 +51,74 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                  </p></td>
-<td><p>
-                    A fusion Sequence
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    A fusion <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence to convert.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.conversion.metafunctions.as_map.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id517108"></a>
-            <a href="as_map.html#fusion.container.conversion.metafunctions.as_map.expression_semantics">Expression
-=======
-<a name="id768881"></a>
-=======
-<a name="id730065"></a>
-=======
-<a name="id722419"></a>
-=======
-<a name="id745894"></a>
-=======
-<a name="id734424"></a>
-=======
-<a name="id731147"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id724594"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_map</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">;</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A map with same elements as the
-            input sequence, <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: A <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a> with same elements as the
+            input sequence, <code class="computeroutput"><span class="identifier">Sequence</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Convert a fusion sequence,
-            <tt class="computeroutput"><span class="identifier">Sequence</span></tt>, to a map.
+            <span class="bold"><strong>Semantics</strong></span>: Convert a fusion sequence,
+            <code class="computeroutput"><span class="identifier">Sequence</span></code>, to a <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a>.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: The elements of the sequence
+            <span class="bold"><strong>Precondition</strong></span>: The elements of the sequence
             are assumed to be __fusion<span class="underline">pair</span>_s.
-            There may be no duplicate fusion::pair key types.
+            There may be no duplicate <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a> key types.
           </p>
 <a name="fusion.container.conversion.metafunctions.as_map.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id517307"></a>
-            Header
-=======
-<a name="id769008"></a>
-=======
-<a name="id730192"></a>
-=======
-<a name="id722546"></a>
-=======
-<a name="id746022"></a>
-=======
-<a name="id734551"></a>
-=======
-<a name="id731275"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id724721"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">map</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">as_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.conversion.metafunctions.as_map.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id517474"></a>
-            Example
-=======
-<a name="id769126"></a>
-=======
-<a name="id730310"></a>
-=======
-<a name="id722664"></a>
-=======
-<a name="id746139"></a>
-=======
-<a name="id734669"></a>
-=======
-<a name="id731392"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id724839"></a>
             <a class="link" href="as_map.html#fusion.container.conversion.metafunctions.as_map.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_map</span><span class="special">&lt;</span>vector<span class="special">&lt;</span>
-    fusion::pair<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span>
-  <span class="special">,</span> fusion::pair<span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_map</span><span class="special">&lt;</span><a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span>
+    <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span>
+  <span class="special">,</span> <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_set.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_set.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_set.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>as_set</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="as_vector.html" title="as_vector">
+<link rel="prev" href="as_vector.html" title="as_vector">
 <link rel="next" href="as_map.html" title="as_map">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,105 +22,27 @@
 <div class="spirit-nav">
 <a accesskey="p" href="as_vector.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="as_map.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.conversion.metafunctions.as_set"></a>as_set
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="as_set">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.conversion.metafunctions.as_set"></a><a class="link" href="as_set.html" title="as_set">as_set</a>
+</h5></div></div></div>
 <a name="fusion.container.conversion.metafunctions.as_set.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id516171"></a>
-            Description
-=======
-<a name="id766442"></a>
-=======
-<a name="id729402"></a>
-=======
-<a name="id721756"></a>
-=======
-<a name="id745231"></a>
-=======
-<a name="id733761"></a>
-=======
-<a name="id730484"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id723930"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of as_set.
+            Returns the result type of <a class="link" href="../functions/as_set.html" title="as_set"><code class="computeroutput"><span class="identifier">as_set</span></code></a>.
           </p>
 <a name="fusion.container.conversion.metafunctions.as_set.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id516219"></a>
-            Synopsis
-=======
-<a name="id768248"></a>
-=======
-<a name="id729433"></a>
-=======
-<a name="id721787"></a>
-=======
-<a name="id745262"></a>
-=======
-<a name="id733792"></a>
-=======
-<a name="id730515"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id723961"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">as_set</span><span class="special">;</span>
 </pre>
 <a name="fusion.container.conversion.metafunctions.as_set.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id516297"></a>
-            Parameters
-=======
-<a name="id768305"></a>
-=======
-<a name="id729489"></a>
-=======
-<a name="id721843"></a>
-=======
-<a name="id745318"></a>
-=======
-<a name="id733848"></a>
-=======
-<a name="id730571"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id724018"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -137,134 +51,71 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                  </p></td>
-<td><p>
-                    A fusion Sequence
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    A fusion <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence to convert.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.conversion.metafunctions.as_set.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id516412"></a>
-            <a href="as_set.html#fusion.container.conversion.metafunctions.as_set.expression_semantics">Expression
-=======
-<a name="id768395"></a>
-=======
-<a name="id729579"></a>
-=======
-<a name="id721933"></a>
-=======
-<a name="id745408"></a>
-=======
-<a name="id733938"></a>
-=======
-<a name="id730661"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id724108"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_set</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">;</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A set with same elements as the
-            input sequence, <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: A <a class="link" href="../../set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a> with same elements as the
+            input sequence, <code class="computeroutput"><span class="identifier">Sequence</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Convert a fusion sequence,
-            <tt class="computeroutput"><span class="identifier">Sequence</span></tt>, to a set.
+            <span class="bold"><strong>Semantics</strong></span>: Convert a fusion sequence,
+            <code class="computeroutput"><span class="identifier">Sequence</span></code>, to a <a class="link" href="../../set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a>.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: There may be no duplicate
+            <span class="bold"><strong>Precondition</strong></span>: There may be no duplicate
             key types.
           </p>
 <a name="fusion.container.conversion.metafunctions.as_set.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id516578"></a>
-            Header
-=======
-<a name="id768502"></a>
-=======
-<a name="id729686"></a>
-=======
-<a name="id722040"></a>
-=======
-<a name="id745515"></a>
-=======
-<a name="id734045"></a>
-=======
-<a name="id730768"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id724215"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">set</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">as_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.conversion.metafunctions.as_set.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id516744"></a>
-            Example
-=======
-<a name="id768619"></a>
-=======
-<a name="id729804"></a>
-=======
-<a name="id722158"></a>
-=======
-<a name="id745633"></a>
-=======
-<a name="id734163"></a>
-=======
-<a name="id730886"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id724332"></a>
             <a class="link" href="as_set.html#fusion.container.conversion.metafunctions.as_set.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_set</span><span class="special">&lt;</span>vector<span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_set</span><span class="special">&lt;</span><a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_vector.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_vector.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/conversion/metafunctions/as_vector.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>as_vector</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="as_list.html" title="as_list">
+<link rel="prev" href="as_list.html" title="as_list">
 <link rel="next" href="as_set.html" title="as_set">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,105 +22,27 @@
 <div class="spirit-nav">
 <a accesskey="p" href="as_list.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="as_set.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.conversion.metafunctions.as_vector"></a>as_vector
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="as_vector">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.conversion.metafunctions.as_vector"></a><a class="link" href="as_vector.html" title="as_vector">as_vector</a>
+</h5></div></div></div>
 <a name="fusion.container.conversion.metafunctions.as_vector.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id515486"></a>
-            Description
-=======
-<a name="id765960"></a>
-=======
-<a name="id728237"></a>
-=======
-<a name="id720591"></a>
-=======
-<a name="id743998"></a>
-=======
-<a name="id731640"></a>
-=======
-<a name="id728364"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721810"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of as_vector.
+            Returns the result type of <a class="link" href="../functions/as_vector.html" title="as_vector"><code class="computeroutput"><span class="identifier">as_vector</span></code></a>.
           </p>
 <a name="fusion.container.conversion.metafunctions.as_vector.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id515533"></a>
-            Synopsis
-=======
-<a name="id765992"></a>
-=======
-<a name="id728268"></a>
-=======
-<a name="id720622"></a>
-=======
-<a name="id744029"></a>
-=======
-<a name="id731672"></a>
-=======
-<a name="id728395"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721841"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">as_vector</span><span class="special">;</span>
 </pre>
 <a name="fusion.container.conversion.metafunctions.as_vector.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id515612"></a>
-            Parameters
-=======
-<a name="id766048"></a>
-=======
-<a name="id728325"></a>
-=======
-<a name="id720679"></a>
-=======
-<a name="id744086"></a>
-=======
-<a name="id731728"></a>
-=======
-<a name="id728451"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721898"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -137,130 +51,67 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                  </p></td>
-<td><p>
-                    A fusion Sequence
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    A fusion <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence to convert.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.conversion.metafunctions.as_vector.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id515724"></a>
-            <a href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.expression_semantics">Expression
-=======
-<a name="id766138"></a>
-=======
-<a name="id728415"></a>
-=======
-<a name="id720769"></a>
-=======
-<a name="id744176"></a>
-=======
-<a name="id731818"></a>
-=======
-<a name="id728541"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id721988"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_vector</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">;</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A vector with same elements as
-            the input sequence, <tt class="computeroutput"><span class="identifier">Sequence</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: A <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a> with same elements as
+            the input sequence, <code class="computeroutput"><span class="identifier">Sequence</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Convert a fusion sequence,
-            <tt class="computeroutput"><span class="identifier">Sequence</span></tt>, to a vector.
+            <span class="bold"><strong>Semantics</strong></span>: Convert a fusion sequence,
+            <code class="computeroutput"><span class="identifier">Sequence</span></code>, to a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>.
           </p>
 <a name="fusion.container.conversion.metafunctions.as_vector.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id515879"></a>
-            Header
-=======
-<a name="id766238"></a>
-=======
-<a name="id728514"></a>
-=======
-<a name="id720868"></a>
-=======
-<a name="id745027"></a>
-=======
-<a name="id733557"></a>
-=======
-<a name="id730280"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id723726"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">vector</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">as_vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.conversion.metafunctions.as_vector.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id516046"></a>
-            Example
-=======
-<a name="id766358"></a>
-=======
-<a name="id729318"></a>
-=======
-<a name="id721672"></a>
-=======
-<a name="id745147"></a>
-=======
-<a name="id733677"></a>
-=======
-<a name="id730400"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id723846"></a>
             <a class="link" href="as_vector.html#fusion.container.conversion.metafunctions.as_vector.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_vector</span><span class="special">&lt;</span>list<span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
+<pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">as_vector</span><span class="special">&lt;</span><a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Generation</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../container.html" title="Container">
-<link rel="previous" href="map.html" title="map">
+<link rel="prev" href="map.html" title="map">
 <link rel="next" href="generation/functions.html" title="Functions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,38 +22,28 @@
 <div class="spirit-nav">
 <a accesskey="p" href="map.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="generation/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.container.generation"></a>Generation
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Generation">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.container.generation"></a><a class="link" href="generation.html" title="Generation">Generation</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Functions</span></dt>
 <dt><span class="section">MetaFunctions</span></dt>
 </dl></div>
 <p>
-        These are the functions that you can use to generate various forms of Container from elemental values.
+        These are the functions that you can use to generate various forms of <a class="link" href="../container.html" title="Container">Container</a> from elemental values.
       </p>
-<<<<<<< .working
-<a name="fusion.container.generation.header"></a><h4>
-<a name="id488901"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.container.generation.header"></a><h5>
-<a name="id695384"></a>
+<a name="id697686"></a>
         <a class="link" href="generation.html#fusion.container.generation.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">generation</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../generation.html" title="Generation">
-<link rel="previous" href="../generation.html" title="Generation">
+<link rel="prev" href="../generation.html" title="Generation">
 <link rel="next" href="functions/make_list.html" title="make_list">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../generation.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../generation.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="functions/make_list.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.container.generation.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.container.generation.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">make_list</span></dt>
 <dt><span class="section">make_cons</span></dt>
@@ -47,7 +40,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions/list_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/list_tie.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/list_tie.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>list_tie</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="tiers.html" title="Tiers">
+<link rel="prev" href="tiers.html" title="Tiers">
 <link rel="next" href="vector_tie.html" title="vector_tie">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,116 +22,38 @@
 <div class="spirit-nav">
 <a accesskey="p" href="tiers.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="vector_tie.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.functions.list_tie"></a>list_tie
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="list_tie">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.functions.list_tie"></a><a class="link" href="list_tie.html" title="list_tie">list_tie</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.functions.list_tie.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id495882"></a>
-            Description
-=======
-<a name="id747130"></a>
-=======
-<a name="id709543"></a>
-=======
-<a name="id701897"></a>
-=======
-<a name="id723167"></a>
-=======
-<a name="id712942"></a>
-=======
-<a name="id709666"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id703112"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Constructs a tie using a list sequence.
+            Constructs a tie using a <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a> sequence.
           </p>
 <a name="fusion.container.generation.functions.list_tie.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id495928"></a>
-            Synopsis
-=======
-<a name="id747159"></a>
-=======
-<a name="id709572"></a>
-=======
-<a name="id701926"></a>
-=======
-<a name="id723196"></a>
-=======
-<a name="id719018"></a>
-=======
-<a name="id715741"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id709188"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
-list<span class="special">&lt;</span><span class="identifier">T0</span><span class="special">&amp;,</span> <span class="identifier">T1</span><span class="special">&amp;,...</span> <span class="identifier">TN</span><span class="special">&amp;&gt;</span>
+<a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">&amp;,</span> <span class="identifier">T1</span><span class="special">&amp;,...</span> <span class="identifier">TN</span><span class="special">&amp;&gt;</span>
 <span class="identifier">list_tie</span><span class="special">(</span><span class="identifier">T0</span><span class="special">&amp;</span> <span class="identifier">x0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">&amp;</span> <span class="identifier">x1</span><span class="special">...</span> <span class="identifier">TN</span><span class="special">&amp;</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
             before including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.functions.list_tie.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id496242"></a>
-            Parameters
-=======
-<a name="id747378"></a>
-=======
-<a name="id714742"></a>
-=======
-<a name="id707096"></a>
-=======
-<a name="id730571"></a>
-=======
-<a name="id719238"></a>
-=======
-<a name="id715961"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id709407"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -148,129 +62,66 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
                     <span class="identifier">x1</span><span class="special">,...</span>
-                    <span class="identifier">xN</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
-                    The arguments to <tt class="computeroutput"><span class="identifier">list_tie</span></tt>
-                  </p></td>
+                    <span class="identifier">xN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments to <code class="computeroutput"><span class="identifier">list_tie</span></code>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.generation.functions.list_tie.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id496416"></a>
-            <a href="list_tie.html#fusion.container.generation.functions.list_tie.expression_semantics">Expression
-=======
-<a name="id748878"></a>
-=======
-<a name="id714875"></a>
-=======
-<a name="id707229"></a>
-=======
-<a name="id730705"></a>
-=======
-<a name="id719371"></a>
-=======
-<a name="id716094"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id709540"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">list_tie</span><span class="special">(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: list&lt;T0&amp;, T1&amp;,...
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>&lt;T0&amp;, T1&amp;,...
             TN&amp;&gt;
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a list of references from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a> of references from <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></code>.
           </p>
 <a name="fusion.container.generation.functions.list_tie.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id496583"></a>
-            Header
-=======
-<a name="id748987"></a>
-=======
-<a name="id714984"></a>
-=======
-<a name="id707339"></a>
-=======
-<a name="id730814"></a>
-=======
-<a name="id719480"></a>
-=======
-<a name="id716203"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id709650"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">list_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">list_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.functions.list_tie.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id496750"></a>
-            Example
-=======
-<a name="id749102"></a>
-=======
-<a name="id715100"></a>
-=======
-<a name="id707454"></a>
-=======
-<a name="id730929"></a>
-=======
-<a name="id719595"></a>
-=======
-<a name="id716318"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id709765"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.functions.list_tie.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">123</span><span class="special">;</span>
 <span class="keyword">double</span> <span class="identifier">d</span> <span class="special">=</span> <span class="number">123.456</span><span class="special">;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_cons.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_cons.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_cons.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>make_cons</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="make_list.html" title="make_list">
+<link rel="prev" href="make_list.html" title="make_list">
 <link rel="next" href="make_vector.html" title="make_vector">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,112 +22,34 @@
 <div class="spirit-nav">
 <a accesskey="p" href="make_list.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="make_vector.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.functions.make_cons"></a>make_cons
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="make_cons">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.functions.make_cons"></a><a class="link" href="make_cons.html" title="make_cons">make_cons</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.functions.make_cons.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id490215"></a>
-            Description
-=======
-<a name="id741938"></a>
-=======
-<a name="id703942"></a>
-=======
-<a name="id696296"></a>
-=======
-<a name="id718658"></a>
-=======
-<a name="id708433"></a>
-=======
-<a name="id705156"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id698603"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Create a cons
-            from <tt class="computeroutput"><span class="identifier">car</span></tt> (<span class="emphasis"><em>head</em></span>)
-            and optional <tt class="computeroutput"><span class="identifier">cdr</span></tt> (<span class="emphasis"><em>tail</em></span>).
+            Create a <a class="link" href="../../cons.html" title="cons"><code class="computeroutput"><span class="identifier">cons</span></code></a>
+            from <code class="computeroutput"><span class="identifier">car</span></code> (<span class="emphasis"><em>head</em></span>)
+            and optional <code class="computeroutput"><span class="identifier">cdr</span></code> (<span class="emphasis"><em>tail</em></span>).
           </p>
 <a name="fusion.container.generation.functions.make_cons.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id490293"></a>
-            Synopsis
-=======
-<a name="id741991"></a>
-=======
-<a name="id703995"></a>
-=======
-<a name="id696349"></a>
-=======
-<a name="id718710"></a>
-=======
-<a name="id708486"></a>
-=======
-<a name="id705209"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id698656"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Car</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::make_cons<span class="special">&lt;</span><span class="identifier">Car</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/make_cons.html" title="make_cons"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_cons</span></code></a><span class="special">&lt;</span><span class="identifier">Car</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_cons</span><span class="special">(</span><span class="identifier">Car</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">car</span><span class="special">);</span>
 
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Car</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Cdr</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::make_cons<span class="special">&lt;</span><span class="identifier">Car</span><span class="special">,</span> <span class="identifier">Cdr</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/make_cons.html" title="make_cons"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_cons</span></code></a><span class="special">&lt;</span><span class="identifier">Car</span><span class="special">,</span> <span class="identifier">Cdr</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_cons</span><span class="special">(</span><span class="identifier">Car</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">car</span><span class="special">,</span> <span class="identifier">Cdr</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">cdr</span><span class="special">);</span>
 </pre>
 <a name="fusion.container.generation.functions.make_cons.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id490624"></a>
-            Parameters
-=======
-<a name="id742229"></a>
-=======
-<a name="id704232"></a>
-=======
-<a name="id696586"></a>
-=======
-<a name="id718948"></a>
-=======
-<a name="id708724"></a>
-=======
-<a name="id705447"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id698893"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -144,176 +58,94 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">car</span></tt>
-                  </p></td>
-<td><p>
-                    Instance of <tt class="computeroutput"><span class="identifier">Car</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">car</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instance of <code class="computeroutput"><span class="identifier">Car</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The list's head
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">cdr</span></tt>
-                  </p></td>
-<td><p>
-                    Instance of <tt class="computeroutput"><span class="identifier">Cdr</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">cdr</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instance of <code class="computeroutput"><span class="identifier">Cdr</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The list's tail (optional)
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.container.generation.functions.make_cons.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id490788"></a>
-            <a href="make_cons.html#fusion.container.generation.functions.make_cons.expression_semantics">Expression
-=======
-<a name="id742358"></a>
-=======
-<a name="id704362"></a>
-=======
-<a name="id696716"></a>
-=======
-<a name="id719078"></a>
-=======
-<a name="id708853"></a>
-=======
-<a name="id705576"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id699023"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">make_cons</span><span class="special">(</span><span class="identifier">car</span><span class="special">,</span> <span class="identifier">cdr</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: result_of::make_cons<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">Car</span><span class="special">,</span> <span class="identifier">Cdr</span><span class="special">&gt;::</span><span class="identifier">type</span></tt> or result_of::make_cons<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">Car</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../metafunctions/make_cons.html" title="make_cons"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_cons</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">Car</span><span class="special">,</span> <span class="identifier">Cdr</span><span class="special">&gt;::</span><span class="identifier">type</span></code> or <a class="link" href="../metafunctions/make_cons.html" title="make_cons"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_cons</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">Car</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a cons from <tt class="computeroutput"><span class="identifier">car</span></tt>
-            (<span class="emphasis"><em>head</em></span>) and optional <tt class="computeroutput"><span class="identifier">cdr</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../cons.html" title="cons"><code class="computeroutput"><span class="identifier">cons</span></code></a> from <code class="computeroutput"><span class="identifier">car</span></code>
+            (<span class="emphasis"><em>head</em></span>) and optional <code class="computeroutput"><span class="identifier">cdr</span></code>
             (<span class="emphasis"><em>tail</em></span>).
           </p>
 <a name="fusion.container.generation.functions.make_cons.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id491040"></a>
-            Header
-=======
-<a name="id742523"></a>
-=======
-<a name="id704526"></a>
-=======
-<a name="id696880"></a>
-=======
-<a name="id719242"></a>
-=======
-<a name="id709018"></a>
-=======
-<a name="id705741"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id699187"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.functions.make_cons.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id491206"></a>
-            Example
-=======
-<a name="id742638"></a>
-=======
-<a name="id704642"></a>
-=======
-<a name="id696996"></a>
-=======
-<a name="id719357"></a>
-=======
-<a name="id709133"></a>
-=======
-<a name="id705856"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id699302"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">make_cons</span><span class="special">(</span><span class="char">'x'</span><span class="special">,</span> <span class="identifier">make_cons</span><span class="special">(</span><span class="number">123</span><span class="special">))</span>
 </pre>
 <a name="fusion.container.generation.functions.make_cons.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id491279"></a>
-            <a href="make_cons.html#fusion.container.generation.functions.make_cons.see_also">See
-=======
-<a name="id742688"></a>
-=======
-<a name="id704692"></a>
-=======
-<a name="id697046"></a>
-=======
-<a name="id719408"></a>
-=======
-<a name="id709183"></a>
-=======
-<a name="id705906"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id699353"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.functions.make_cons.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
 <p>
-            boost::ref
+            <a class="link" href="../../../notes.html#fusion.notes.boost__ref"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">ref</span></code></a>
           </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_list.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_list.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_list.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>make_list</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="../functions.html" title="Functions">
+<link rel="prev" href="../functions.html" title="Functions">
 <link rel="next" href="make_cons.html" title="make_cons">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,117 +22,39 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../functions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="make_cons.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.functions.make_list"></a>make_list
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="make_list">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.functions.make_list"></a><a class="link" href="make_list.html" title="make_list">make_list</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.functions.make_list.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id489095"></a>
-            Description
-=======
-<a name="id741155"></a>
-=======
-<a name="id703159"></a>
-=======
-<a name="id695513"></a>
-=======
-<a name="id717875"></a>
-=======
-<a name="id707646"></a>
-=======
-<a name="id704369"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id697815"></a>
             <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Create a list
+            Create a <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>
             from one or more values.
           </p>
 <a name="fusion.container.generation.functions.make_list.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id489141"></a>
-            Synopsis
-=======
-<a name="id741187"></a>
-=======
-<a name="id703190"></a>
-=======
-<a name="id695544"></a>
-=======
-<a name="id717906"></a>
-=======
-<a name="id707677"></a>
-=======
-<a name="id704400"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id697846"></a>
             <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::make_list<span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_list</span></code></a><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_list</span><span class="special">(</span><span class="identifier">T0</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">x0</span><span class="special">,</span> <span class="identifier">T1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">x1</span><span class="special">...</span> <span class="identifier">TN</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
             before including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.functions.make_list.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id489503"></a>
-            Parameters
-=======
-<a name="id741439"></a>
-=======
-<a name="id703442"></a>
-=======
-<a name="id695796"></a>
-=======
-<a name="id718158"></a>
-=======
-<a name="id707929"></a>
-=======
-<a name="id704652"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id698098"></a>
             <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -149,163 +63,75 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
                     <span class="identifier">x1</span><span class="special">,...</span>
-                    <span class="identifier">xN</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
-                    The arguments to <tt class="computeroutput"><span class="identifier">make_list</span></tt>
-                  </p></td>
+                    <span class="identifier">xN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments to <code class="computeroutput"><span class="identifier">make_list</span></code>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.generation.functions.make_list.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id489676"></a>
-            <a href="make_list.html#fusion.container.generation.functions.make_list.expression_semantics">Expression
-=======
-<a name="id741572"></a>
-=======
-<a name="id703575"></a>
-=======
-<a name="id695930"></a>
-=======
-<a name="id718291"></a>
-=======
-<a name="id708067"></a>
-=======
-<a name="id704790"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id698237"></a>
             <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">make_list</span><span class="special">(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: result_of::make_list<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../metafunctions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_list</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a list from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a> from <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></code>.
           </p>
 <a name="fusion.container.generation.functions.make_list.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id489899"></a>
-            Header
-=======
-<a name="id741722"></a>
-=======
-<a name="id703726"></a>
-=======
-<a name="id696080"></a>
-=======
-<a name="id718442"></a>
-=======
-<a name="id708217"></a>
-=======
-<a name="id704940"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id698387"></a>
             <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.functions.make_list.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id490065"></a>
-            Example
-=======
-<a name="id741837"></a>
-=======
-<a name="id703841"></a>
-=======
-<a name="id696195"></a>
-=======
-<a name="id718557"></a>
-=======
-<a name="id708332"></a>
-=======
-<a name="id705056"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id698502"></a>
             <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">make_list</span><span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">,</span> <span class="number">12.5</span><span class="special">)</span>
 </pre>
 <a name="fusion.container.generation.functions.make_list.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id490139"></a>
-            <a href="make_list.html#fusion.container.generation.functions.make_list.see_also">See
-=======
-<a name="id741889"></a>
-=======
-<a name="id703893"></a>
-=======
-<a name="id696247"></a>
-=======
-<a name="id718608"></a>
-=======
-<a name="id708384"></a>
-=======
-<a name="id705107"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id698554"></a>
             <a class="link" href="make_list.html#fusion.container.generation.functions.make_list.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
 <p>
-            boost::ref
+            <a class="link" href="../../../notes.html#fusion.notes.boost__ref"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">ref</span></code></a>
           </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_map.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_map.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_map.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>make_map</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="make_set.html" title="make_set">
+<link rel="prev" href="make_set.html" title="make_set">
 <link rel="next" href="tiers.html" title="Tiers">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,119 +22,41 @@
 <div class="spirit-nav">
 <a accesskey="p" href="make_set.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tiers.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.functions.make_map"></a>make_map
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="make_map">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.functions.make_map"></a><a class="link" href="make_map.html" title="make_map">make_map</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.functions.make_map.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id493601"></a>
-            Description
-=======
-<a name="id745541"></a>
-=======
-<a name="id707954"></a>
-=======
-<a name="id700309"></a>
-=======
-<a name="id721578"></a>
-=======
-<a name="id711354"></a>
-=======
-<a name="id708077"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id701523"></a>
             <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Create a map
+            Create a <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a>
             from one or more key/data pairs.
           </p>
 <a name="fusion.container.generation.functions.make_map.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id493648"></a>
-            Synopsis
-=======
-<a name="id745571"></a>
-=======
-<a name="id707984"></a>
-=======
-<a name="id700339"></a>
-=======
-<a name="id721608"></a>
-=======
-<a name="id711384"></a>
-=======
-<a name="id708107"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id701553"></a>
             <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">K0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">KN</span>
   <span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::make_map<span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K0</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">,</span> <span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/make_map.html" title="make_map"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_map</span></code></a><span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K0</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">,</span> <span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_map</span><span class="special">(</span><span class="identifier">T0</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">x0</span><span class="special">,</span> <span class="identifier">T1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">x1</span><span class="special">...</span> <span class="identifier">TN</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt> before
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code> before
             including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_MAP_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.functions.make_map.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id494095"></a>
-            Parameters
-=======
-<a name="id745888"></a>
-=======
-<a name="id708301"></a>
-=======
-<a name="id700655"></a>
-=======
-<a name="id721925"></a>
-=======
-<a name="id711700"></a>
-=======
-<a name="id708424"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id701870"></a>
             <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -151,186 +65,104 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">K0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">K0</span><span class="special">,</span>
                     <span class="identifier">K1</span><span class="special">,...</span>
-                    <span class="identifier">KN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">KN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The key types
-                  </p></td>
-<td><p>
-                    Keys associated with <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt>
-                  </p></td>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Keys associated with <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></code>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
                     <span class="identifier">x1</span><span class="special">,...</span>
-                    <span class="identifier">xN</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
-                    The arguments to <tt class="computeroutput"><span class="identifier">make_map</span></tt>
-                  </p></td>
+                    <span class="identifier">xN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments to <code class="computeroutput"><span class="identifier">make_map</span></code>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.container.generation.functions.make_map.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id494360"></a>
-            <a href="make_map.html#fusion.container.generation.functions.make_map.expression_semantics">Expression
-=======
-<a name="id746092"></a>
-=======
-<a name="id708505"></a>
-=======
-<a name="id700859"></a>
-=======
-<a name="id722129"></a>
-=======
-<a name="id711904"></a>
-=======
-<a name="id708628"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id702074"></a>
             <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">make_map</span><span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">&gt;(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: result_of::make_map<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K0</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">,</span> <span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../metafunctions/make_map.html" title="make_map"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_map</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K0</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">,</span> <span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a map from <tt class="computeroutput"><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span></tt>
-            keys and <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a> from <code class="computeroutput"><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span></code>
+            keys and <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
             <span class="identifier">x1</span><span class="special">,...</span>
-            <span class="identifier">xN</span></tt> data.
+            <span class="identifier">xN</span></code> data.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: There may be no duplicate
+            <span class="bold"><strong>Precondition</strong></span>: There may be no duplicate
             key types.
           </p>
 <a name="fusion.container.generation.functions.make_map.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id494693"></a>
-            Header
-=======
-<a name="id746325"></a>
-=======
-<a name="id708738"></a>
-=======
-<a name="id701092"></a>
-=======
-<a name="id722362"></a>
-=======
-<a name="id712137"></a>
-=======
-<a name="id708860"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id702307"></a>
             <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.functions.make_map.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id494860"></a>
-            Example
-=======
-<a name="id746440"></a>
-=======
-<a name="id708853"></a>
-=======
-<a name="id701207"></a>
-=======
-<a name="id722477"></a>
-=======
-<a name="id712252"></a>
-=======
-<a name="id708976"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id702422"></a>
             <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">make_map</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;(</span><span class="char">'X'</span><span class="special">,</span> <span class="string">"Men"</span><span class="special">)</span>
 </pre>
 <a name="fusion.container.generation.functions.make_map.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id494945"></a>
-            <a href="make_map.html#fusion.container.generation.functions.make_map.see_also">See
-=======
-<a name="id746496"></a>
-=======
-<a name="id708910"></a>
-=======
-<a name="id701264"></a>
-=======
-<a name="id722533"></a>
-=======
-<a name="id712309"></a>
-=======
-<a name="id709032"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id702478"></a>
             <a class="link" href="make_map.html#fusion.container.generation.functions.make_map.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
 <p>
-            boost::ref,
-            fusion::pair
+            <a class="link" href="../../../notes.html#fusion.notes.boost__ref"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">ref</span></code></a>,
+            <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a>
           </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_set.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_set.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_set.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>make_set</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="make_vector.html" title="make_vector">
+<link rel="prev" href="make_vector.html" title="make_vector">
 <link rel="next" href="make_map.html" title="make_map">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,117 +22,39 @@
 <div class="spirit-nav">
 <a accesskey="p" href="make_vector.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="make_map.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.functions.make_set"></a>make_set
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="make_set">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.functions.make_set"></a><a class="link" href="make_set.html" title="make_set">make_set</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.functions.make_set.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id492472"></a>
-            Description
-=======
-<a name="id743530"></a>
-=======
-<a name="id705533"></a>
-=======
-<a name="id697887"></a>
-=======
-<a name="id720249"></a>
-=======
-<a name="id710024"></a>
-=======
-<a name="id706748"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id700194"></a>
             <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Create a set
+            Create a <a class="link" href="../../set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a>
             from one or more values.
           </p>
 <a name="fusion.container.generation.functions.make_set.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id492518"></a>
-            Synopsis
-=======
-<a name="id743558"></a>
-=======
-<a name="id705562"></a>
-=======
-<a name="id697916"></a>
-=======
-<a name="id720278"></a>
-=======
-<a name="id710053"></a>
-=======
-<a name="id706776"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id700223"></a>
             <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::make_set<span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/make_set.html" title="make_set"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_set</span></code></a><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_set</span><span class="special">(</span><span class="identifier">T0</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">x0</span><span class="special">,</span> <span class="identifier">T1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">x1</span><span class="special">...</span> <span class="identifier">TN</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></tt> before
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></code> before
             including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_SET_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.functions.make_set.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id492877"></a>
-            Parameters
-=======
-<a name="id743808"></a>
-=======
-<a name="id705812"></a>
-=======
-<a name="id698166"></a>
-=======
-<a name="id721074"></a>
-=======
-<a name="id710850"></a>
-=======
-<a name="id707573"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id701019"></a>
             <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -149,167 +63,79 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
                     <span class="identifier">x1</span><span class="special">,...</span>
-                    <span class="identifier">xN</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
-                    The arguments to <tt class="computeroutput"><span class="identifier">make_set</span></tt>
-                  </p></td>
+                    <span class="identifier">xN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments to <code class="computeroutput"><span class="identifier">make_set</span></code>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.generation.functions.make_set.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id493051"></a>
-            <a href="make_set.html#fusion.container.generation.functions.make_set.expression_semantics">Expression
-=======
-<a name="id743941"></a>
-=======
-<a name="id707584"></a>
-=======
-<a name="id699938"></a>
-=======
-<a name="id721207"></a>
-=======
-<a name="id710983"></a>
-=======
-<a name="id707706"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id701152"></a>
             <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">make_set</span><span class="special">(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: result_of::make_set<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../metafunctions/make_set.html" title="make_set"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_set</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a set from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a> from <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: There may be no duplicate
+            <span class="bold"><strong>Precondition</strong></span>: There may be no duplicate
             key types.
           </p>
 <a name="fusion.container.generation.functions.make_set.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id493285"></a>
-            Header
-=======
-<a name="id745330"></a>
-=======
-<a name="id707743"></a>
-=======
-<a name="id700097"></a>
-=======
-<a name="id721367"></a>
-=======
-<a name="id711142"></a>
-=======
-<a name="id707866"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id701312"></a>
             <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.functions.make_set.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id493452"></a>
-            Example
-=======
-<a name="id745445"></a>
-=======
-<a name="id707858"></a>
-=======
-<a name="id700213"></a>
-=======
-<a name="id721482"></a>
-=======
-<a name="id711258"></a>
-=======
-<a name="id707981"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id701427"></a>
             <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">make_set</span><span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">,</span> <span class="number">12.5</span><span class="special">)</span>
 </pre>
 <a name="fusion.container.generation.functions.make_set.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id493526"></a>
-            <a href="make_set.html#fusion.container.generation.functions.make_set.see_also">See
-=======
-<a name="id745494"></a>
-=======
-<a name="id707908"></a>
-=======
-<a name="id700262"></a>
-=======
-<a name="id721531"></a>
-=======
-<a name="id711307"></a>
-=======
-<a name="id708030"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id701476"></a>
             <a class="link" href="make_set.html#fusion.container.generation.functions.make_set.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
 <p>
-            boost::ref
+            <a class="link" href="../../../notes.html#fusion.notes.boost__ref"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">ref</span></code></a>
           </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_vector.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_vector.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/make_vector.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>make_vector</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="make_cons.html" title="make_cons">
+<link rel="prev" href="make_cons.html" title="make_cons">
 <link rel="next" href="make_set.html" title="make_set">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,117 +22,39 @@
 <div class="spirit-nav">
 <a accesskey="p" href="make_cons.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="make_set.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.functions.make_vector"></a>make_vector
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="make_vector">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.functions.make_vector"></a><a class="link" href="make_vector.html" title="make_vector">make_vector</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.functions.make_vector.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id491353"></a>
-            Description
-=======
-<a name="id742738"></a>
-=======
-<a name="id704741"></a>
-=======
-<a name="id697095"></a>
-=======
-<a name="id719457"></a>
-=======
-<a name="id709232"></a>
-=======
-<a name="id705956"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id699402"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Create a vector
+            Create a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>
             from one or more values.
           </p>
 <a name="fusion.container.generation.functions.make_vector.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id491399"></a>
-            Synopsis
-=======
-<a name="id742769"></a>
-=======
-<a name="id704772"></a>
-=======
-<a name="id697126"></a>
-=======
-<a name="id719488"></a>
-=======
-<a name="id709264"></a>
-=======
-<a name="id705987"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id699433"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::make_vector<span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_vector</span></code></a><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_vector</span><span class="special">(</span><span class="identifier">T0</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">x0</span><span class="special">,</span> <span class="identifier">T1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">x1</span><span class="special">...</span> <span class="identifier">TN</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
             before including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_VECTOR_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.functions.make_vector.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id491757"></a>
-            Parameters
-=======
-<a name="id743021"></a>
-=======
-<a name="id705024"></a>
-=======
-<a name="id697378"></a>
-=======
-<a name="id719740"></a>
-=======
-<a name="id709516"></a>
-=======
-<a name="id706239"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id699685"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -149,163 +63,75 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
                     <span class="identifier">x1</span><span class="special">,...</span>
-                    <span class="identifier">xN</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
-                    The arguments to <tt class="computeroutput"><span class="identifier">make_vector</span></tt>
-                  </p></td>
+                    <span class="identifier">xN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments to <code class="computeroutput"><span class="identifier">make_vector</span></code>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.generation.functions.make_vector.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id491931"></a>
-            <a href="make_vector.html#fusion.container.generation.functions.make_vector.expression_semantics">Expression
-=======
-<a name="id743154"></a>
-=======
-<a name="id705158"></a>
-=======
-<a name="id697512"></a>
-=======
-<a name="id719873"></a>
-=======
-<a name="id709649"></a>
-=======
-<a name="id706372"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id699818"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">make_vector</span><span class="special">(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: result_of::make_vector<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../metafunctions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_vector</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a vector from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a> from <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></code>.
           </p>
 <a name="fusion.container.generation.functions.make_vector.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id492155"></a>
-            Header
-=======
-<a name="id743306"></a>
-=======
-<a name="id705310"></a>
-=======
-<a name="id697664"></a>
-=======
-<a name="id720026"></a>
-=======
-<a name="id709801"></a>
-=======
-<a name="id706524"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id699971"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.functions.make_vector.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id492322"></a>
-            Example
-=======
-<a name="id743426"></a>
-=======
-<a name="id705430"></a>
-=======
-<a name="id697784"></a>
-=======
-<a name="id720146"></a>
-=======
-<a name="id709921"></a>
-=======
-<a name="id706644"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id700091"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">make_vector</span><span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">,</span> <span class="number">12.5</span><span class="special">)</span>
 </pre>
 <a name="fusion.container.generation.functions.make_vector.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id492397"></a>
-            <a href="make_vector.html#fusion.container.generation.functions.make_vector.see_also">See
-=======
-<a name="id743480"></a>
-=======
-<a name="id705484"></a>
-=======
-<a name="id697838"></a>
-=======
-<a name="id720200"></a>
-=======
-<a name="id709975"></a>
-=======
-<a name="id706698"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id700145"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.functions.make_vector.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
 <p>
-            boost::ref
+            <a class="link" href="../../../notes.html#fusion.notes.boost__ref"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">ref</span></code></a>
           </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions/map_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/map_tie.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/map_tie.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>map_tie</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="vector_tie.html" title="vector_tie">
+<link rel="prev" href="vector_tie.html" title="vector_tie">
 <link rel="next" href="../metafunctions.html" title="MetaFunctions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,116 +22,38 @@
 <div class="spirit-nav">
 <a accesskey="p" href="vector_tie.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.functions.map_tie"></a>map_tie
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="map_tie">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.functions.map_tie"></a><a class="link" href="map_tie.html" title="map_tie">map_tie</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.functions.map_tie.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id497901"></a>
-            Description
-=======
-<a name="id749917"></a>
-=======
-<a name="id715914"></a>
-=======
-<a name="id708269"></a>
-=======
-<a name="id731744"></a>
-=======
-<a name="id720410"></a>
-=======
-<a name="id717133"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id710580"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Constructs a tie using a map sequence.
+            Constructs a tie using a <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a> sequence.
           </p>
 <a name="fusion.container.generation.functions.map_tie.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id497948"></a>
-            Synopsis
-=======
-<a name="id749946"></a>
-=======
-<a name="id715943"></a>
-=======
-<a name="id708297"></a>
-=======
-<a name="id731773"></a>
-=======
-<a name="id720439"></a>
-=======
-<a name="id717162"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id710608"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">K0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">KN</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">D0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">D1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">DN</span><span class="special">&gt;</span>
-map<span class="special">&lt;</span>pair<span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">D0</span><span class="special">&amp;&gt;,</span> pair<span class="special">&lt;</span><span class="identifier">K1</span><span class="special">,</span> <span class="identifier">D1</span><span class="special">&amp;&gt;,...</span> pair<span class="special">&lt;</span><span class="identifier">KN</span><span class="special">,</span> <span class="identifier">DN</span><span class="special">&amp;&gt;</spa
n> <span class="special">&gt;</span>
+<a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a><span class="special">&lt;</span><a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">D0</span><span class="special">&amp;&gt;,</span> <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="identifier">K1</span><span class="special">,</span> <span class="identifier">D1</span><span class="special">&amp;&gt;,...</span> <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="identifier">KN</span><span class="special">,</span> <s
pan class="identifier">DN</span><span class="special">&amp;&gt;</span> <span class="special">&gt;</span>
 <span class="identifier">map_tie</span><span class="special">(</span><span class="identifier">D0</span><span class="special">&amp;</span> <span class="identifier">d0</span><span class="special">,</span> <span class="identifier">D1</span><span class="special">&amp;</span> <span class="identifier">d1</span><span class="special">...</span> <span class="identifier">DN</span><span class="special">&amp;</span> <span class="identifier">dN</span><span class="special">);</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>, and a corresponding number of key types.
-            You may define the preprocessor constant <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>, and a corresponding number of key types.
+            You may define the preprocessor constant <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
             before including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_MAP_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.functions.map_tie.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id498415"></a>
-            Parameters
-=======
-<a name="id750271"></a>
-=======
-<a name="id716268"></a>
-=======
-<a name="id708623"></a>
-=======
-<a name="id732098"></a>
-=======
-<a name="id720764"></a>
-=======
-<a name="id717487"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id710934"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -148,146 +62,89 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">K0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">K0</span><span class="special">,</span>
                     <span class="identifier">K1</span><span class="special">,...</span>
-                    <span class="identifier">KN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">KN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
-                    The key types associated with each of the <tt class="computeroutput"><span class="identifier">x1</span><span class="special">,</span><span class="identifier">x2</span><span class="special">,...,</span><span class="identifier">xN</span></tt>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The key types associated with each of the <code class="computeroutput"><span class="identifier">x1</span><span class="special">,</span><span class="identifier">x2</span><span class="special">,...,</span><span class="identifier">xN</span></code>
                     values
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
                     <span class="identifier">x1</span><span class="special">,...</span>
-                    <span class="identifier">xN</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
-                    The arguments to <tt class="computeroutput"><span class="identifier">map_tie</span></tt>
-                  </p></td>
+                    <span class="identifier">xN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments to <code class="computeroutput"><span class="identifier">map_tie</span></code>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.container.generation.functions.map_tie.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id498679"></a>
-            <a href="map_tie.html#fusion.container.generation.functions.map_tie.expression_semantics">Expression
-=======
-<a name="id750474"></a>
-=======
-<a name="id716471"></a>
-=======
-<a name="id708825"></a>
-=======
-<a name="id732301"></a>
-=======
-<a name="id720967"></a>
-=======
-<a name="id717690"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id711136"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">map_tie</span><span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">&gt;(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: map&lt;pair&lt;K0, D0&amp;&gt;, pair&lt;K1,
-            D1&amp;&gt;,... pair&lt;KN,
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a>&lt;<a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a>&lt;K0, D0&amp;&gt;, <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a>&lt;K1,
+            D1&amp;&gt;,... <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a>&lt;KN,
             DN&amp;&gt; &gt;
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a map of references from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt> with keys <tt class="computeroutput"><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a> of references from <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></code> with keys <code class="computeroutput"><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span></code>
           </p>
 <a name="fusion.container.generation.functions.map_tie.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id498961"></a>
-            Header
-=======
-<a name="id750660"></a>
-=======
-<a name="id716657"></a>
-=======
-<a name="id709011"></a>
-=======
-<a name="id732487"></a>
-=======
-<a name="id721153"></a>
-=======
-<a name="id717876"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id711322"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">map_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">map_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.functions.map_tie.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id499127"></a>
-            Example
-=======
-<a name="id750775"></a>
-=======
-<a name="id716772"></a>
-=======
-<a name="id709127"></a>
-=======
-<a name="id732602"></a>
-=======
-<a name="id721337"></a>
-=======
-<a name="id718060"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id711506"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.functions.map_tie.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">int_key</span><span class="special">;</span>
 <span class="keyword">struct</span> <span class="identifier">double_key</span><span class="special">;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions/tiers.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/tiers.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/tiers.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Tiers</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="make_map.html" title="make_map">
+<link rel="prev" href="make_map.html" title="make_map">
 <link rel="next" href="list_tie.html" title="list_tie">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,45 +22,34 @@
 <div class="spirit-nav">
 <a accesskey="p" href="make_map.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="list_tie.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.functions.tiers"></a>Tiers
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="Tiers">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.functions.tiers"></a><a class="link" href="tiers.html" title="Tiers">Tiers</a>
+</h5></div></div></div>
 <p>
             Tiers are sequences, where all elements are non-const reference types.
             They are constructed with a call to a couple of <span class="emphasis"><em>tie</em></span>
             function templates. The succeeding sections document the various <span class="emphasis"><em>tier</em></span>
             flavors.
           </p>
-<div class="itemizedlist"><ul type="disc">
-<li>list_tie</li>
-<li>vector_tie</li>
-<li>map_tie</li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="list_tie.html" title="list_tie"><code class="computeroutput"><span class="identifier">list_tie</span></code></a></li>
+<li class="listitem"><a class="link" href="vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">vector_tie</span></code></a></li>
+<li class="listitem"><a class="link" href="vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">map_tie</span></code></a></li>
 </ul></div>
 <p>
             Example:
           </p>
 <pre class="programlisting"><span class="keyword">int</span> <span class="identifier">i</span><span class="special">;</span> <span class="keyword">char</span> <span class="identifier">c</span><span class="special">;</span> <span class="keyword">double</span> <span class="identifier">d</span><span class="special">;</span>
   <span class="special">...</span>
-vector_tie<span class="special">(</span><span class="identifier">i</span><span class="special">,</span> <span class="identifier">c</span><span class="special">,</span> <span class="identifier">a</span><span class="special">);</span>
+<a class="link" href="vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">vector_tie</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">,</span> <span class="identifier">c</span><span class="special">,</span> <span class="identifier">a</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            The vector_tie function creates
-            a vector
-            of type <tt class="computeroutput">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&amp;,</span> <span class="keyword">char</span><span class="special">&amp;,</span> <span class="keyword">double</span><span class="special">&amp;&gt;</span></tt>. The same result could be achieved
-            with the call make_vector(ref(i), ref(c), ref(a))
-            <sup>[<a name="id495412" href="#ftn.id495412">9</a>]</sup>
-=======
             The <a class="link" href="vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">vector_tie</span></code></a> function creates
             a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>
             of type <code class="computeroutput"><a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&amp;,</span> <span class="keyword">char</span><span class="special">&amp;,</span> <span class="keyword">double</span><span class="special">&amp;&gt;</span></code>. The same result could be achieved
             with the call <a class="link" href="make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a>(ref(i), ref(c), ref(a))
-            <sup>[<a name="id709333" href="#ftn.id709333" class="footnote">9</a>]</sup>
->>>>>>> .merge-right.r57125
+            <sup>[<a name="id702780" href="#ftn.id702780" class="footnote">9</a>]</sup>
             .
           </p>
 <p>
@@ -76,7 +57,7 @@
             variables. E.g.:
           </p>
 <pre class="programlisting"><span class="keyword">int</span> <span class="identifier">i</span><span class="special">;</span> <span class="keyword">char</span> <span class="identifier">c</span><span class="special">;</span> <span class="keyword">double</span> <span class="identifier">d</span><span class="special">;</span>
-vector_tie<span class="special">(</span><span class="identifier">i</span><span class="special">,</span> <span class="identifier">c</span><span class="special">,</span> <span class="identifier">d</span><span class="special">)</span> <span class="special">=</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="char">'a'</span><span class="special">,</span> <span class="number">5.5</span><span class="special">);</span>
+<a class="link" href="vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">vector_tie</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">,</span> <span class="identifier">c</span><span class="special">,</span> <span class="identifier">d</span><span class="special">)</span> <span class="special">=</span> <a class="link" href="make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="char">'a'</span><span class="special">,</span> <span class="number">5.5</span><span class="special">);</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">i</span> <span class="special">&lt;&lt;</span> <span class="string">" "</span> <span class="special">&lt;&lt;</span>  <span class="identifier">c</span> <span class="special">&lt;&lt;</span> <span class="string">" "</span> <span class="special">&lt;&lt;</span> <span class="identifier">d</span><span class="special">;</span>
 </pre>
 <p>
@@ -85,33 +66,8 @@
             when calling functions which return sequences.
           </p>
 <a name="fusion.container.generation.functions.tiers.ignore"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id495712"></a>
-            Ignore
-=======
-<a name="id747017"></a>
-=======
-<a name="id709430"></a>
-=======
-<a name="id701785"></a>
-=======
-<a name="id723054"></a>
-=======
-<a name="id712830"></a>
-=======
-<a name="id709553"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id702999"></a>
             <a class="link" href="tiers.html#fusion.container.generation.functions.tiers.ignore">Ignore</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             There is also an object called <span class="emphasis"><em>ignore</em></span> which allows
@@ -120,37 +76,13 @@
             example:
           </p>
 <pre class="programlisting"><span class="keyword">char</span> <span class="identifier">c</span><span class="special">;</span>
-vector_tie<span class="special">(</span><span class="identifier">ignore</span><span class="special">,</span> <span class="identifier">c</span><span class="special">)</span> <span class="special">=</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
+<a class="link" href="vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">vector_tie</span></code></a><span class="special">(</span><span class="identifier">ignore</span><span class="special">,</span> <span class="identifier">c</span><span class="special">)</span> <span class="special">=</span> <a class="link" href="make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
 </pre>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<div class="footnote"><p><sup>[<a name="ftn.id495412" href="#id495412">9</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id746798" href="#id746798" class="para">9</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id709211" href="#id709211" class="para">9</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id701565" href="#id701565" class="para">9</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id722834" href="#id722834" class="para">9</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id712610" href="#id712610" class="para">9</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id709333" href="#id709333" class="para">9</a>] </sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
->>>>>>> .merge-right.r57125
+<div class="footnote"><p><sup>[<a name="ftn.id702780" href="#id702780" class="para">9</a>] </sup>
                 see Boost.Ref
-                for details about <tt class="computeroutput"><span class="identifier">ref</span></tt>
+                for details about <code class="computeroutput"><span class="identifier">ref</span></code>
               </p></div>
 </div>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/functions/vector_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/functions/vector_tie.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/functions/vector_tie.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>vector_tie</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="list_tie.html" title="list_tie">
+<link rel="prev" href="list_tie.html" title="list_tie">
 <link rel="next" href="map_tie.html" title="map_tie">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,116 +22,38 @@
 <div class="spirit-nav">
 <a accesskey="p" href="list_tie.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="map_tie.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.functions.vector_tie"></a>vector_tie
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="vector_tie">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.functions.vector_tie"></a><a class="link" href="vector_tie.html" title="vector_tie">vector_tie</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.functions.vector_tie.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id496890"></a>
-            Description
-=======
-<a name="id749202"></a>
-=======
-<a name="id715199"></a>
-=======
-<a name="id707553"></a>
-=======
-<a name="id731029"></a>
-=======
-<a name="id719695"></a>
-=======
-<a name="id716418"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id709864"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Constructs a tie using a vector sequence.
+            Constructs a tie using a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a> sequence.
           </p>
 <a name="fusion.container.generation.functions.vector_tie.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id496938"></a>
-            Synopsis
-=======
-<a name="id749233"></a>
-=======
-<a name="id715230"></a>
-=======
-<a name="id707585"></a>
-=======
-<a name="id731060"></a>
-=======
-<a name="id719726"></a>
-=======
-<a name="id716449"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id709896"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
-vector<span class="special">&lt;</span><span class="identifier">T0</span><span class="special">&amp;,</span> <span class="identifier">T1</span><span class="special">&amp;,...</span> <span class="identifier">TN</span><span class="special">&amp;&gt;</span>
+<a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">&amp;,</span> <span class="identifier">T1</span><span class="special">&amp;,...</span> <span class="identifier">TN</span><span class="special">&amp;&gt;</span>
 <span class="identifier">vector_tie</span><span class="special">(</span><span class="identifier">T0</span><span class="special">&amp;</span> <span class="identifier">x0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">&amp;</span> <span class="identifier">x1</span><span class="special">...</span> <span class="identifier">TN</span><span class="special">&amp;</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
             before including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_VECTOR_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.functions.vector_tie.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id497252"></a>
-            Parameters
-=======
-<a name="id749455"></a>
-=======
-<a name="id715452"></a>
-=======
-<a name="id707807"></a>
-=======
-<a name="id731282"></a>
-=======
-<a name="id719948"></a>
-=======
-<a name="id716671"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id710118"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -148,129 +62,66 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span>
                     <span class="identifier">x1</span><span class="special">,...</span>
-                    <span class="identifier">xN</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
-                    The arguments to <tt class="computeroutput"><span class="identifier">vector_tie</span></tt>
-                  </p></td>
+                    <span class="identifier">xN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments to <code class="computeroutput"><span class="identifier">vector_tie</span></code>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.generation.functions.vector_tie.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id497426"></a>
-            <a href="vector_tie.html#fusion.container.generation.functions.vector_tie.expression_semantics">Expression
-=======
-<a name="id749588"></a>
-=======
-<a name="id715586"></a>
-=======
-<a name="id707940"></a>
-=======
-<a name="id731415"></a>
-=======
-<a name="id720081"></a>
-=======
-<a name="id716804"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id710251"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">vector_tie</span><span class="special">(</span><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: vector&lt;T0&amp;, T1&amp;,...
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>&lt;T0&amp;, T1&amp;,...
             TN&amp;&gt;
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a vector of references from <tt class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a> of references from <code class="computeroutput"><span class="identifier">x0</span><span class="special">,</span> <span class="identifier">x1</span><span class="special">,...</span> <span class="identifier">xN</span></code>.
           </p>
 <a name="fusion.container.generation.functions.vector_tie.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id497592"></a>
-            Header
-=======
-<a name="id749697"></a>
-=======
-<a name="id715695"></a>
-=======
-<a name="id708049"></a>
-=======
-<a name="id731524"></a>
-=======
-<a name="id720190"></a>
-=======
-<a name="id716914"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id710360"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">vector_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">vector_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.functions.vector_tie.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id497759"></a>
-            Example
-=======
-<a name="id749815"></a>
-=======
-<a name="id715812"></a>
-=======
-<a name="id708167"></a>
-=======
-<a name="id731642"></a>
-=======
-<a name="id720308"></a>
-=======
-<a name="id717031"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id710478"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.functions.vector_tie.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">123</span><span class="special">;</span>
 <span class="keyword">double</span> <span class="identifier">d</span> <span class="special">=</span> <span class="number">123.456</span><span class="special">;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>MetaFunctions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../generation.html" title="Generation">
-<link rel="previous" href="functions/map_tie.html" title="map_tie">
+<link rel="prev" href="functions/map_tie.html" title="map_tie">
 <link rel="next" href="metafunctions/make_list.html" title="make_list">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="functions/map_tie.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../generation.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="metafunctions/make_list.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.container.generation.metafunctions"></a>MetaFunctions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="MetaFunctions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.container.generation.metafunctions"></a><a class="link" href="metafunctions.html" title="MetaFunctions">MetaFunctions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">make_list</span></dt>
 <dt><span class="section">make_cons</span></dt>
@@ -46,7 +39,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/list_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/list_tie.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/list_tie.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>list_tie</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="MetaFunctions">
-<link rel="previous" href="make_map.html" title="make_map">
+<link rel="prev" href="make_map.html" title="make_map">
 <link rel="next" href="vector_tie.html" title="vector_tie">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,115 +22,37 @@
 <div class="spirit-nav">
 <a accesskey="p" href="make_map.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="vector_tie.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.metafunctions.list_tie"></a>list_tie
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="list_tie">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.metafunctions.list_tie"></a><a class="link" href="list_tie.html" title="list_tie">list_tie</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.metafunctions.list_tie.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id508299"></a>
-            Description
-=======
-<a name="id760890"></a>
-=======
-<a name="id721528"></a>
-=======
-<a name="id713882"></a>
-=======
-<a name="id737221"></a>
-=======
-<a name="id725887"></a>
-=======
-<a name="id722610"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id716056"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of list_tie.
+            Returns the result type of <a class="link" href="../functions/list_tie.html" title="list_tie"><code class="computeroutput"><span class="identifier">list_tie</span></code></a>.
           </p>
 <a name="fusion.container.generation.metafunctions.list_tie.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id508347"></a>
-            Synopsis
-=======
-<a name="id760921"></a>
-=======
-<a name="id721559"></a>
-=======
-<a name="id713913"></a>
-=======
-<a name="id737252"></a>
-=======
-<a name="id725918"></a>
-=======
-<a name="id722641"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id716088"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">list_tie</span><span class="special">;</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
             before including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.list_tie.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id508550"></a>
-            Parameters
-=======
-<a name="id761061"></a>
-=======
-<a name="id721699"></a>
-=======
-<a name="id714054"></a>
-=======
-<a name="id737392"></a>
-=======
-<a name="id726058"></a>
-=======
-<a name="id722782"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id716228"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -147,129 +61,66 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
                     <span class="identifier">T1</span><span class="special">,...</span>
-                    <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
-                    The arguments to <tt class="computeroutput"><span class="identifier">list_tie</span></tt>
-                  </p></td>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments to <code class="computeroutput"><span class="identifier">list_tie</span></code>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.generation.metafunctions.list_tie.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id508691"></a>
-            <a href="list_tie.html#fusion.container.generation.metafunctions.list_tie.expression_semantics">Expression
-=======
-<a name="id761170"></a>
-=======
-<a name="id721809"></a>
-=======
-<a name="id714163"></a>
-=======
-<a name="id737501"></a>
-=======
-<a name="id726168"></a>
-=======
-<a name="id722891"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id716337"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">list_tie</span><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">;</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: list&lt;T0&amp;, T1&amp;,...
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>&lt;T0&amp;, T1&amp;,...
             TN&amp;&gt;
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a list of references from <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a> of references from <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>.
           </p>
 <a name="fusion.container.generation.metafunctions.list_tie.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id508877"></a>
-            Header
-=======
-<a name="id761296"></a>
-=======
-<a name="id721935"></a>
-=======
-<a name="id714289"></a>
-=======
-<a name="id737627"></a>
-=======
-<a name="id726294"></a>
-=======
-<a name="id723017"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id716463"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">list_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">list_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.list_tie.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id509045"></a>
-            Example
-=======
-<a name="id761416"></a>
-=======
-<a name="id722055"></a>
-=======
-<a name="id714409"></a>
-=======
-<a name="id737747"></a>
-=======
-<a name="id726414"></a>
-=======
-<a name="id723137"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id716583"></a>
             <a class="link" href="list_tie.html#fusion.container.generation.metafunctions.list_tie.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">list_tie</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_cons.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_cons.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_cons.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>make_cons</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="MetaFunctions">
-<link rel="previous" href="make_list.html" title="make_list">
+<link rel="prev" href="make_list.html" title="make_list">
 <link rel="next" href="make_vector.html" title="make_vector">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,105 +22,27 @@
 <div class="spirit-nav">
 <a accesskey="p" href="make_list.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="make_vector.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.metafunctions.make_cons"></a>make_cons
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="make_cons">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.metafunctions.make_cons"></a><a class="link" href="make_cons.html" title="make_cons">make_cons</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.metafunctions.make_cons.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id500230"></a>
-            Description
-=======
-<a name="id752300"></a>
-=======
-<a name="id718708"></a>
-=======
-<a name="id711062"></a>
-=======
-<a name="id733376"></a>
-=======
-<a name="id722111"></a>
-=======
-<a name="id718834"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id712280"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of make_cons.
+            Returns the result type of <a class="link" href="../functions/make_cons.html" title="make_cons"><code class="computeroutput"><span class="identifier">make_cons</span></code></a>.
           </p>
 <a name="fusion.container.generation.metafunctions.make_cons.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id500278"></a>
-            Synopsis
-=======
-<a name="id752331"></a>
-=======
-<a name="id718739"></a>
-=======
-<a name="id711093"></a>
-=======
-<a name="id733408"></a>
-=======
-<a name="id722142"></a>
-=======
-<a name="id718865"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id712312"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Car</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Cdr</span> <span class="special">=</span> <span class="identifier">nil</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">make_cons</span><span class="special">;</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_cons.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id500386"></a>
-            Parameters
-=======
-<a name="id752411"></a>
-=======
-<a name="id718818"></a>
-=======
-<a name="id711172"></a>
-=======
-<a name="id733487"></a>
-=======
-<a name="id722221"></a>
-=======
-<a name="id718944"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id712391"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -137,143 +51,86 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">Car</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">Car</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The list's head type
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">Cdr</span></tt>
-                  </p></td>
-<td><p>
-                    A <tt class="computeroutput"><span class="identifier">cons</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">Cdr</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    A <code class="computeroutput"><span class="identifier">cons</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The list's tail type (optional)
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.container.generation.metafunctions.make_cons.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id500538"></a>
-            <a href="make_cons.html#fusion.container.generation.metafunctions.make_cons.expression_semantics">Expression
-=======
-<a name="id752534"></a>
-=======
-<a name="id718942"></a>
-=======
-<a name="id711296"></a>
-=======
-<a name="id733610"></a>
-=======
-<a name="id722345"></a>
-=======
-<a name="id719068"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id712514"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_cons</span><span class="special">&lt;</span><span class="identifier">Car</span><span class="special">,</span> <span class="identifier">Cdr</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A cons with head element, <tt class="computeroutput"><span class="identifier">Car</span></tt>, of type converted following the
-            rules for <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
-            conversion</em></span></a>, and tail, <tt class="computeroutput"><span class="identifier">Cdr</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: A <a class="link" href="../../cons.html" title="cons"><code class="computeroutput"><span class="identifier">cons</span></code></a> with head element, <code class="computeroutput"><span class="identifier">Car</span></code>, of type converted following the
+            rules for <a class="link" href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+            conversion</em></span></a>, and tail, <code class="computeroutput"><span class="identifier">Cdr</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a cons from <tt class="computeroutput"><span class="identifier">Car</span></tt>
-            (<span class="emphasis"><em>head</em></span>) and optional <tt class="computeroutput"><span class="identifier">Cdr</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../cons.html" title="cons"><code class="computeroutput"><span class="identifier">cons</span></code></a> from <code class="computeroutput"><span class="identifier">Car</span></code>
+            (<span class="emphasis"><em>head</em></span>) and optional <code class="computeroutput"><span class="identifier">Cdr</span></code>
             (<span class="emphasis"><em>tail</em></span>).
           </p>
 <a name="fusion.container.generation.metafunctions.make_cons.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id500740"></a>
-            Header
-=======
-<a name="id752667"></a>
-=======
-<a name="id719075"></a>
-=======
-<a name="id711429"></a>
-=======
-<a name="id733744"></a>
-=======
-<a name="id722478"></a>
-=======
-<a name="id719201"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id712648"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_cons</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_cons.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id500907"></a>
-            Example
-=======
-<a name="id752787"></a>
-=======
-<a name="id719195"></a>
-=======
-<a name="id711549"></a>
-=======
-<a name="id733864"></a>
-=======
-<a name="id722598"></a>
-=======
-<a name="id719321"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id712768"></a>
             <a class="link" href="make_cons.html#fusion.container.generation.metafunctions.make_cons.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_cons</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_cons</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_list.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_list.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_list.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>make_list</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="MetaFunctions">
-<link rel="previous" href="../metafunctions.html" title="MetaFunctions">
+<link rel="prev" href="../metafunctions.html" title="MetaFunctions">
 <link rel="next" href="make_cons.html" title="make_cons">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,115 +22,37 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="make_cons.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.metafunctions.make_list"></a>make_list
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="make_list">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.metafunctions.make_list"></a><a class="link" href="make_list.html" title="make_list">make_list</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.metafunctions.make_list.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id499351"></a>
-            Description
-=======
-<a name="id750932"></a>
-=======
-<a name="id718091"></a>
-=======
-<a name="id710445"></a>
-=======
-<a name="id732760"></a>
-=======
-<a name="id721494"></a>
-=======
-<a name="id718217"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id711664"></a>
             <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of make_list.
+            Returns the result type of <a class="link" href="../functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a>.
           </p>
 <a name="fusion.container.generation.metafunctions.make_list.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id499398"></a>
-            Synopsis
-=======
-<a name="id750963"></a>
-=======
-<a name="id718122"></a>
-=======
-<a name="id710476"></a>
-=======
-<a name="id732791"></a>
-=======
-<a name="id721525"></a>
-=======
-<a name="id718248"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id711695"></a>
             <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">make_list</span><span class="special">;</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
             before including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_list.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id499601"></a>
-            Parameters
-=======
-<a name="id751855"></a>
-=======
-<a name="id718262"></a>
-=======
-<a name="id710616"></a>
-=======
-<a name="id732931"></a>
-=======
-<a name="id721666"></a>
-=======
-<a name="id718389"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id711835"></a>
             <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -147,130 +61,67 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
                     <span class="identifier">T1</span><span class="special">,...</span>
-                    <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
-                    Template arguments to <tt class="computeroutput"><span class="identifier">make_list</span></tt>
-                  </p></td>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Template arguments to <code class="computeroutput"><span class="identifier">make_list</span></code>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.generation.metafunctions.make_list.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id499743"></a>
-            <a href="make_list.html#fusion.container.generation.metafunctions.make_list.expression_semantics">Expression
-=======
-<a name="id751964"></a>
-=======
-<a name="id718372"></a>
-=======
-<a name="id710726"></a>
-=======
-<a name="id733040"></a>
-=======
-<a name="id721775"></a>
-=======
-<a name="id718498"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id711944"></a>
             <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_list</span><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A list with elements of types
-            converted following the rules for <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+            <span class="bold"><strong>Return type</strong></span>: A <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a> with elements of types
+            converted following the rules for <a class="link" href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
             conversion</em></span></a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a list from <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a> from <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>.
           </p>
 <a name="fusion.container.generation.metafunctions.make_list.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id499935"></a>
-            Header
-=======
-<a name="id752093"></a>
-=======
-<a name="id718500"></a>
-=======
-<a name="id710854"></a>
-=======
-<a name="id733169"></a>
-=======
-<a name="id721903"></a>
-=======
-<a name="id718626"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id712073"></a>
             <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_list.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id500103"></a>
-            Example
-=======
-<a name="id752213"></a>
-=======
-<a name="id718620"></a>
-=======
-<a name="id710974"></a>
-=======
-<a name="id733289"></a>
-=======
-<a name="id722023"></a>
-=======
-<a name="id718746"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id712193"></a>
             <a class="link" href="make_list.html#fusion.container.generation.metafunctions.make_list.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_list</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">(&amp;)[</span><span class="number">7</span><span class="special">],</span> <span class="keyword">double</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_map.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_map.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_map.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>make_map</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="MetaFunctions">
-<link rel="previous" href="make_set.html" title="make_set">
+<link rel="prev" href="make_set.html" title="make_set">
 <link rel="next" href="list_tie.html" title="list_tie">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="make_set.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="list_tie.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.metafunctions.make_map"></a>make_map
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="make_map">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.metafunctions.make_map"></a><a class="link" href="make_map.html" title="make_map">make_map</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.metafunctions.make_map.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id507053"></a>
-            Description
-=======
-<a name="id760004"></a>
-=======
-<a name="id720642"></a>
-=======
-<a name="id712996"></a>
-=======
-<a name="id736335"></a>
-=======
-<a name="id725001"></a>
-=======
-<a name="id721724"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id715171"></a>
             <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of make_map.
+            Returns the result type of <a class="link" href="../functions/make_map.html" title="make_map"><code class="computeroutput"><span class="identifier">make_map</span></code></a>.
           </p>
 <a name="fusion.container.generation.metafunctions.make_map.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id507101"></a>
-            Synopsis
-=======
-<a name="id760035"></a>
-=======
-<a name="id720673"></a>
-=======
-<a name="id713028"></a>
-=======
-<a name="id736366"></a>
-=======
-<a name="id725032"></a>
-=======
-<a name="id721756"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id715202"></a>
             <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">K0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">KN</span>
@@ -104,43 +43,18 @@
 <span class="keyword">struct</span> <span class="identifier">make_map</span><span class="special">;</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt> before
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code> before
             including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_MAP_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_map.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id507362"></a>
-            Parameters
-=======
-<a name="id760218"></a>
-=======
-<a name="id720856"></a>
-=======
-<a name="id713210"></a>
-=======
-<a name="id736549"></a>
-=======
-<a name="id725215"></a>
-=======
-<a name="id721938"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id715384"></a>
             <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -149,184 +63,102 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">K0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">K0</span><span class="special">,</span>
                     <span class="identifier">K1</span><span class="special">,...</span>
-                    <span class="identifier">KN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">KN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
-                    Keys associated with <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>
-                  </p></td>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Keys associated with <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
                     <span class="identifier">T1</span><span class="special">,...</span>
-                    <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
-                    Data associated with keys <tt class="computeroutput"><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span></tt>
-                  </p></td>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Data associated with keys <code class="computeroutput"><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span></code>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.container.generation.metafunctions.make_map.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id507615"></a>
-            <a href="make_map.html#fusion.container.generation.metafunctions.make_map.expression_semantics">Expression
-=======
-<a name="id760414"></a>
-=======
-<a name="id721053"></a>
-=======
-<a name="id713407"></a>
-=======
-<a name="id736745"></a>
-=======
-<a name="id725412"></a>
-=======
-<a name="id722135"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id715581"></a>
             <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">resulf_of</span><span class="special">::</span><span class="identifier">make_map</span><span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">,</span> <span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">;</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: result_of::make_map<tt class="computeroutput"><span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K0</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">,</span> <span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="make_map.html" title="make_map"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_map</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K0</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">,</span> <span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: A map with fusion::pair elements where the <tt class="computeroutput"><span class="identifier">second_type</span></tt> is converted following
-            the rules for <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+            <span class="bold"><strong>Semantics</strong></span>: A <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a> with <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a> elements where the <code class="computeroutput"><span class="identifier">second_type</span></code> is converted following
+            the rules for <a class="link" href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
             conversion</em></span></a>.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: There may be no duplicate
+            <span class="bold"><strong>Precondition</strong></span>: There may be no duplicate
             key types.
           </p>
 <a name="fusion.container.generation.metafunctions.make_map.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id507952"></a>
-            Header
-=======
-<a name="id760647"></a>
-=======
-<a name="id721285"></a>
-=======
-<a name="id713640"></a>
-=======
-<a name="id736978"></a>
-=======
-<a name="id725644"></a>
-=======
-<a name="id722368"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id715814"></a>
             <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_map.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id508120"></a>
-            Example
-=======
-<a name="id760767"></a>
-=======
-<a name="id721405"></a>
-=======
-<a name="id713760"></a>
-=======
-<a name="id737098"></a>
-=======
-<a name="id725764"></a>
-=======
-<a name="id722488"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id715934"></a>
             <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_map</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">double</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_map.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id508222"></a>
-            <a href="make_map.html#fusion.container.generation.metafunctions.make_map.see_also">See
-=======
-<a name="id760840"></a>
-=======
-<a name="id721479"></a>
-=======
-<a name="id713833"></a>
-=======
-<a name="id737171"></a>
-=======
-<a name="id725838"></a>
-=======
-<a name="id722561"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id716007"></a>
             <a class="link" href="make_map.html#fusion.container.generation.metafunctions.make_map.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
 <p>
-            fusion::pair
+            <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a>
           </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_set.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_set.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_set.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>make_set</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="MetaFunctions">
-<link rel="previous" href="make_vector.html" title="make_vector">
+<link rel="prev" href="make_vector.html" title="make_vector">
 <link rel="next" href="make_map.html" title="make_map">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,115 +22,37 @@
 <div class="spirit-nav">
 <a accesskey="p" href="make_vector.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="make_map.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.metafunctions.make_set"></a>make_set
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="make_set">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.metafunctions.make_set"></a><a class="link" href="make_set.html" title="make_set">make_set</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.metafunctions.make_set.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id506183"></a>
-            Description
-=======
-<a name="id753483"></a>
-=======
-<a name="id719891"></a>
-=======
-<a name="id712245"></a>
-=======
-<a name="id734560"></a>
-=======
-<a name="id723294"></a>
-=======
-<a name="id720017"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id713464"></a>
             <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of make_set.
+            Returns the result type of <a class="link" href="../functions/make_set.html" title="make_set"><code class="computeroutput"><span class="identifier">make_set</span></code></a>.
           </p>
 <a name="fusion.container.generation.metafunctions.make_set.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id506230"></a>
-            Synopsis
-=======
-<a name="id753515"></a>
-=======
-<a name="id719922"></a>
-=======
-<a name="id712276"></a>
-=======
-<a name="id734591"></a>
-=======
-<a name="id723325"></a>
-=======
-<a name="id720048"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id713495"></a>
             <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">make_set</span><span class="special">;</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></tt> before
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></code> before
             including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_SET_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_set.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id506434"></a>
-            Parameters
-=======
-<a name="id753655"></a>
-=======
-<a name="id720062"></a>
-=======
-<a name="id712416"></a>
-=======
-<a name="id734731"></a>
-=======
-<a name="id724558"></a>
-=======
-<a name="id721282"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id714728"></a>
             <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -147,134 +61,71 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
                     <span class="identifier">T1</span><span class="special">,...</span>
-                    <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
-                    The arguments to <tt class="computeroutput"><span class="identifier">make_set</span></tt>
-                  </p></td>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments to <code class="computeroutput"><span class="identifier">make_set</span></code>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.generation.metafunctions.make_set.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id506575"></a>
-            <a href="make_set.html#fusion.container.generation.metafunctions.make_set.expression_semantics">Expression
-=======
-<a name="id753764"></a>
-=======
-<a name="id720172"></a>
-=======
-<a name="id712526"></a>
-=======
-<a name="id736001"></a>
-=======
-<a name="id724668"></a>
-=======
-<a name="id721391"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id714837"></a>
             <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_set</span><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A set with elements of types converted
-            following the rules for <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+            <span class="bold"><strong>Return type</strong></span>: A <a class="link" href="../../set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a> with elements of types converted
+            following the rules for <a class="link" href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
             conversion</em></span></a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a set from <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a> from <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: There may be no duplicate
+            <span class="bold"><strong>Precondition</strong></span>: There may be no duplicate
             key types.
           </p>
 <a name="fusion.container.generation.metafunctions.make_set.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id506775"></a>
-            Header
-=======
-<a name="id753902"></a>
-=======
-<a name="id720447"></a>
-=======
-<a name="id712801"></a>
-=======
-<a name="id736139"></a>
-=======
-<a name="id724806"></a>
-=======
-<a name="id721529"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id714975"></a>
             <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_set.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id506942"></a>
-            Example
-=======
-<a name="id759928"></a>
-=======
-<a name="id720567"></a>
-=======
-<a name="id712921"></a>
-=======
-<a name="id736259"></a>
-=======
-<a name="id724926"></a>
-=======
-<a name="id721649"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id715095"></a>
             <a class="link" href="make_set.html#fusion.container.generation.metafunctions.make_set.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_set</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_vector.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_vector.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/make_vector.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>make_vector</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="MetaFunctions">
-<link rel="previous" href="make_cons.html" title="make_cons">
+<link rel="prev" href="make_cons.html" title="make_cons">
 <link rel="next" href="make_set.html" title="make_set">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,115 +22,37 @@
 <div class="spirit-nav">
 <a accesskey="p" href="make_cons.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="make_set.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.metafunctions.make_vector"></a>make_vector
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="make_vector">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.metafunctions.make_vector"></a><a class="link" href="make_vector.html" title="make_vector">make_vector</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.metafunctions.make_vector.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id501039"></a>
-            Description
-=======
-<a name="id752874"></a>
-=======
-<a name="id719281"></a>
-=======
-<a name="id711635"></a>
-=======
-<a name="id733950"></a>
-=======
-<a name="id722684"></a>
-=======
-<a name="id719408"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id712854"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of make_vector.
+            Returns the result type of <a class="link" href="../functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a>.
           </p>
 <a name="fusion.container.generation.metafunctions.make_vector.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id501087"></a>
-            Synopsis
-=======
-<a name="id752903"></a>
-=======
-<a name="id719310"></a>
-=======
-<a name="id711664"></a>
-=======
-<a name="id733979"></a>
-=======
-<a name="id722713"></a>
-=======
-<a name="id719436"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id712883"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">make_vector</span><span class="special">;</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
             before including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_VECTOR_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_vector.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id501291"></a>
-            Parameters
-=======
-<a name="id753041"></a>
-=======
-<a name="id719448"></a>
-=======
-<a name="id711802"></a>
-=======
-<a name="id734117"></a>
-=======
-<a name="id722851"></a>
-=======
-<a name="id719574"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id713021"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -147,130 +61,67 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
                     <span class="identifier">T1</span><span class="special">,...</span>
-                    <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
-                    Template arguments to <tt class="computeroutput"><span class="identifier">make_vector</span></tt>
-                  </p></td>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Template arguments to <code class="computeroutput"><span class="identifier">make_vector</span></code>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.generation.metafunctions.make_vector.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id501431"></a>
-            <a href="make_vector.html#fusion.container.generation.metafunctions.make_vector.expression_semantics">Expression
-=======
-<a name="id753147"></a>
-=======
-<a name="id719555"></a>
-=======
-<a name="id711909"></a>
-=======
-<a name="id734224"></a>
-=======
-<a name="id722958"></a>
-=======
-<a name="id719681"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id713128"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_vector</span><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A vector with elements of types
-            converted following the rules for <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+            <span class="bold"><strong>Return type</strong></span>: A <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a> with elements of types
+            converted following the rules for <a class="link" href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
             conversion</em></span></a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a vector from <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a> from <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>.
           </p>
 <a name="fusion.container.generation.metafunctions.make_vector.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id505889"></a>
-            Header
-=======
-<a name="id753276"></a>
-=======
-<a name="id719683"></a>
-=======
-<a name="id712037"></a>
-=======
-<a name="id734352"></a>
-=======
-<a name="id723086"></a>
-=======
-<a name="id719810"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id713256"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.make_vector.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id506056"></a>
-            Example
-=======
-<a name="id753396"></a>
-=======
-<a name="id719803"></a>
-=======
-<a name="id712157"></a>
-=======
-<a name="id734472"></a>
-=======
-<a name="id723206"></a>
-=======
-<a name="id719930"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id713376"></a>
             <a class="link" href="make_vector.html#fusion.container.generation.metafunctions.make_vector.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">char</span><span class="special">(&amp;)[</span><span class="number">7</span><span class="special">],</span> <span class="keyword">double</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/map_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/map_tie.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/map_tie.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>map_tie</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="MetaFunctions">
-<link rel="previous" href="vector_tie.html" title="vector_tie">
+<link rel="prev" href="vector_tie.html" title="vector_tie">
 <link rel="next" href="../../conversion.html" title="Conversion">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,115 +22,37 @@
 <div class="spirit-nav">
 <a accesskey="p" href="vector_tie.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../conversion.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.metafunctions.map_tie"></a>map_tie
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="map_tie">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.metafunctions.map_tie"></a><a class="link" href="map_tie.html" title="map_tie">map_tie</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.metafunctions.map_tie.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id509992"></a>
-            Description
-=======
-<a name="id762073"></a>
-=======
-<a name="id724350"></a>
-=======
-<a name="id716704"></a>
-=======
-<a name="id739087"></a>
-=======
-<a name="id727753"></a>
-=======
-<a name="id724476"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id717923"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of map_tie.
+            Returns the result type of <a class="link" href="../functions/vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">map_tie</span></code></a>.
           </p>
 <a name="fusion.container.generation.metafunctions.map_tie.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id510041"></a>
-            Synopsis
-=======
-<a name="id762104"></a>
-=======
-<a name="id724381"></a>
-=======
-<a name="id716735"></a>
-=======
-<a name="id739118"></a>
-=======
-<a name="id727784"></a>
-=======
-<a name="id724508"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id717954"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">K0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">KN</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">D0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">D1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">DN</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">map_tie</span><span class="special">;</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt> before
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code> before
             including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_MAP_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.map_tie.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id510297"></a>
-            Parameters
-=======
-<a name="id762284"></a>
-=======
-<a name="id724561"></a>
-=======
-<a name="id716915"></a>
-=======
-<a name="id739298"></a>
-=======
-<a name="id727964"></a>
-=======
-<a name="id724688"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id718134"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -147,145 +61,88 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">K0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">K0</span><span class="special">,</span>
                     <span class="identifier">K1</span><span class="special">,...</span>
-                    <span class="identifier">KN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">KN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
-                    The key types for <tt class="computeroutput"><span class="identifier">map_tie</span></tt>
-                  </p></td>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The key types for <code class="computeroutput"><span class="identifier">map_tie</span></code>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">D0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">D0</span><span class="special">,</span>
                     <span class="identifier">D1</span><span class="special">,...</span>
-                    <span class="identifier">DN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">DN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
-                    The arguments types for <tt class="computeroutput"><span class="identifier">map_tie</span></tt>
-                  </p></td>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments types for <code class="computeroutput"><span class="identifier">map_tie</span></code>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.container.generation.metafunctions.map_tie.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id510508"></a>
-            <a href="map_tie.html#fusion.container.generation.metafunctions.map_tie.expression_semantics">Expression
-=======
-<a name="id762448"></a>
-=======
-<a name="id724724"></a>
-=======
-<a name="id717078"></a>
-=======
-<a name="id739461"></a>
-=======
-<a name="id728128"></a>
-=======
-<a name="id724851"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id718297"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">map_tie</span><span class="special">&lt;</span><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span><span class="special">,</span> <span class="identifier">D0</span><span class="special">,</span> <span class="identifier">D1</span><span class="special">,...</span> <span class="identifier">DN</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">;</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: map&lt;pair&lt;K0, D0&amp;&gt;, pair&lt;K1,
-            D1&amp;&gt;,... pair&lt;KN,
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a>&lt;<a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a>&lt;K0, D0&amp;&gt;, <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a>&lt;K1,
+            D1&amp;&gt;,... <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a>&lt;KN,
             DN&amp;&gt; &gt;
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a map of references from <tt class="computeroutput"><span class="identifier">D0</span><span class="special">,</span> <span class="identifier">D1</span><span class="special">,...</span> <span class="identifier">DN</span></tt> with keys <tt class="computeroutput"><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a> of references from <code class="computeroutput"><span class="identifier">D0</span><span class="special">,</span> <span class="identifier">D1</span><span class="special">,...</span> <span class="identifier">DN</span></code> with keys <code class="computeroutput"><span class="identifier">K0</span><span class="special">,</span> <span class="identifier">K1</span><span class="special">,...</span> <span class="identifier">KN</span></code>
           </p>
 <a name="fusion.container.generation.metafunctions.map_tie.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id510810"></a>
-            Header
-=======
-<a name="id762652"></a>
-=======
-<a name="id724928"></a>
-=======
-<a name="id717282"></a>
-=======
-<a name="id739665"></a>
-=======
-<a name="id728332"></a>
-=======
-<a name="id725055"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id718501"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">map_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">map_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.map_tie.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id510978"></a>
-            Example
-=======
-<a name="id762772"></a>
-=======
-<a name="id725048"></a>
-=======
-<a name="id717402"></a>
-=======
-<a name="id739785"></a>
-=======
-<a name="id728452"></a>
-=======
-<a name="id725175"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id718621"></a>
             <a class="link" href="map_tie.html#fusion.container.generation.metafunctions.map_tie.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">int_key</span><span class="special">;</span>
 <span class="keyword">struct</span> <span class="identifier">double_key</span><span class="special">;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/vector_tie.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/vector_tie.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/generation/metafunctions/vector_tie.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>vector_tie</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="MetaFunctions">
-<link rel="previous" href="list_tie.html" title="list_tie">
+<link rel="prev" href="list_tie.html" title="list_tie">
 <link rel="next" href="map_tie.html" title="map_tie">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,115 +22,37 @@
 <div class="spirit-nav">
 <a accesskey="p" href="list_tie.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="map_tie.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.container.generation.metafunctions.vector_tie"></a>vector_tie
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="vector_tie">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.container.generation.metafunctions.vector_tie"></a><a class="link" href="vector_tie.html" title="vector_tie">vector_tie</a>
+</h5></div></div></div>
 <a name="fusion.container.generation.metafunctions.vector_tie.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id509147"></a>
-            Description
-=======
-<a name="id761481"></a>
-=======
-<a name="id722119"></a>
-=======
-<a name="id714474"></a>
-=======
-<a name="id737812"></a>
-=======
-<a name="id726478"></a>
-=======
-<a name="id723202"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id716648"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of vector_tie.
+            Returns the result type of <a class="link" href="../functions/vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">vector_tie</span></code></a>.
           </p>
 <a name="fusion.container.generation.metafunctions.vector_tie.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id509194"></a>
-            Synopsis
-=======
-<a name="id761510"></a>
-=======
-<a name="id722148"></a>
-=======
-<a name="id714502"></a>
-=======
-<a name="id737841"></a>
-=======
-<a name="id726507"></a>
-=======
-<a name="id723230"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id716677"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">vector_tie</span><span class="special">;</span>
 </pre>
 <p>
-            The variadic function accepts <tt class="computeroutput"><span class="number">0</span></tt>
-            to <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
-            elements, where <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
-            is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>. You may define the preprocessor constant
-            <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
+            The variadic function accepts <code class="computeroutput"><span class="number">0</span></code>
+            to <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
+            elements, where <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
+            is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>. You may define the preprocessor constant
+            <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
             before including any Fusion header to change the default. Example:
           </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_VECTOR_SIZE</span> <span class="number">20</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.vector_tie.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id509397"></a>
-            Parameters
-=======
-<a name="id761650"></a>
-=======
-<a name="id722289"></a>
-=======
-<a name="id714643"></a>
-=======
-<a name="id737981"></a>
-=======
-<a name="id726648"></a>
-=======
-<a name="id723371"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id716817"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -147,129 +61,66 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span>
                     <span class="identifier">T1</span><span class="special">,...</span>
-                    <span class="identifier">TN</span></tt>
-                  </p></td>
-<td><p>
+                    <span class="identifier">TN</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
-                    The arguments to <tt class="computeroutput"><span class="identifier">vector_tie</span></tt>
-                  </p></td>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    The arguments to <code class="computeroutput"><span class="identifier">vector_tie</span></code>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.container.generation.metafunctions.vector_tie.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id509537"></a>
-            <a href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.expression_semantics">Expression
-=======
-<a name="id761760"></a>
-=======
-<a name="id722398"></a>
-=======
-<a name="id714752"></a>
-=======
-<a name="id738091"></a>
-=======
-<a name="id727440"></a>
-=======
-<a name="id724163"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id717610"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">vector_tie</span><span class="special">&lt;</span><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">;</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: vector&lt;T0&amp;, T1&amp;,...
+            <span class="bold"><strong>Return type</strong></span>: <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>&lt;T0&amp;, T1&amp;,...
             TN&amp;&gt;
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Create a vector of references from <tt class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Create a <a class="link" href="../../vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a> of references from <code class="computeroutput"><span class="identifier">T0</span><span class="special">,</span> <span class="identifier">T1</span><span class="special">,...</span> <span class="identifier">TN</span></code>.
           </p>
 <a name="fusion.container.generation.metafunctions.vector_tie.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id509724"></a>
-            Header
-=======
-<a name="id761886"></a>
-=======
-<a name="id724163"></a>
-=======
-<a name="id716517"></a>
-=======
-<a name="id738900"></a>
-=======
-<a name="id727566"></a>
-=======
-<a name="id724289"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id717736"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">vector_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">vector_tie</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.container.generation.metafunctions.vector_tie.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id509891"></a>
-            Example
-=======
-<a name="id762006"></a>
-=======
-<a name="id724283"></a>
-=======
-<a name="id716637"></a>
-=======
-<a name="id739020"></a>
-=======
-<a name="id727686"></a>
-=======
-<a name="id724409"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id717856"></a>
             <a class="link" href="vector_tie.html#fusion.container.generation.metafunctions.vector_tie.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">vector_tie</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/container/list.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/list.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/list.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>list</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../container.html" title="Container">
-<link rel="previous" href="cons.html" title="cons">
+<link rel="prev" href="cons.html" title="cons">
 <link rel="next" href="set.html" title="set">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,63 +22,34 @@
 <div class="spirit-nav">
 <a accesskey="p" href="cons.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="set.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.container.list"></a>list
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.container.list.description"></a><h4>
-<a name="id483306"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="list">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.container.list"></a><a class="link" href="list.html" title="list">list</a>
 </h3></div></div></div>
 <a name="fusion.container.list.description"></a><h5>
-<a name="id688953"></a>
+<a name="id691238"></a>
         <a class="link" href="list.html#fusion.container.list.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        <tt class="computeroutput"><span class="identifier">list</span></tt> is a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-        Sequence</a> of heterogenous typed data built on top of cons. It is more efficient than
-        vector
+        <code class="computeroutput"><span class="identifier">list</span></code> is a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+        Sequence</a> of heterogenous typed data built on top of <a class="link" href="cons.html" title="cons"><code class="computeroutput"><span class="identifier">cons</span></code></a>. It is more efficient than
+        <a class="link" href="vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>
         when the target sequence is constructed piecemeal (a data at a time). The
-        runtime cost of access to each element is peculiarly constant (see Recursive Inlined Functions).
+        runtime cost of access to each element is peculiarly constant (see <a class="link" href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive Inlined Functions</a>).
       </p>
-<<<<<<< .working
-<a name="fusion.container.list.header"></a><h4>
-<a name="id483401"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.container.list.header"></a><h5>
-<a name="id689006"></a>
+<a name="id691291"></a>
         <a class="link" href="list.html#fusion.container.list.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">list</span><span class="special">/</span><span class="identifier">list_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">list_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.container.list.synopsis"></a><h4>
-<a name="id483692"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.container.list.synopsis"></a><h5>
-<a name="id689212"></a>
+<a name="id691498"></a>
         <a class="link" href="list.html#fusion.container.list.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">T0</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
   <span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
@@ -93,31 +60,24 @@
 <span class="keyword">struct</span> <span class="identifier">list</span><span class="special">;</span>
 </pre>
 <p>
-        The variadic class interface accepts <tt class="computeroutput"><span class="number">0</span></tt>
-        to <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt> elements,
-        where <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
-        is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>.
+        The variadic class interface accepts <code class="computeroutput"><span class="number">0</span></code>
+        to <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code> elements,
+        where <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
+        is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>.
         Example:
       </p>
 <pre class="programlisting"><span class="identifier">list</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span>
 </pre>
 <p>
-        You may define the preprocessor constant <tt class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></tt>
+        You may define the preprocessor constant <code class="computeroutput"><span class="identifier">FUSION_MAX_LIST_SIZE</span></code>
         before including any Fusion header to change the default. Example:
       </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_LIST_SIZE</span> <span class="number">20</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.container.list.template_parameters"></a><h4>
-<a name="id484018"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.container.list.template_parameters"></a><h5>
-<a name="id690538"></a>
+<a name="id691730"></a>
         <a class="link" href="list.html#fusion.container.list.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -125,85 +85,78 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">T0</span></tt>...<tt class="computeroutput"><span class="identifier">TN</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">T0</span></code>...<code class="computeroutput"><span class="identifier">TN</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Element types
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 <span class="emphasis"><em>unspecified-type</em></span>
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.container.list.model_of"></a><h4>
-<a name="id484136"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a></li></ul></div>
-<div class="variablelist">
-=======
 <a name="fusion.container.list.model_of"></a><h5>
-<a name="id690631"></a>
+<a name="id691824"></a>
         <a class="link" href="list.html#fusion.container.list.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a></li></ul></div>
 <div class="variablelist" title="Notation">
->>>>>>> .merge-right.r57125
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">L</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">L</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">list</span></tt> type
+            A <code class="computeroutput"><span class="identifier">list</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">l</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">l</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">list</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">list</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">e0</span></tt>...<tt class="computeroutput"><span class="identifier">en</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">e0</span></code>...<code class="computeroutput"><span class="identifier">en</span></code></span></dt>
 <dd><p>
             Heterogeneous values
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>
+            A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">N</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">N</span></code></span></dt>
 <dd><p>
             An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
             Integral Constant</a>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.container.list.expression_semantics"></a><h4>
-<a name="id484349"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.container.list.expression_semantics"></a><h5>
-<a name="id690785"></a>
+<a name="id691978"></a>
         <a class="link" href="list.html#fusion.container.list.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-        defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+        defined in <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
         Sequence</a>.
       </p>
 <div class="informaltable"><table class="table">
@@ -212,95 +165,109 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">L</span><span class="special">()</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">L</span><span class="special">()</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Creates a list with default constructed elements.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">L</span><span class="special">(</span><span class="identifier">e0</span><span class="special">,</span> <span class="identifier">e1</span><span class="special">,...</span>
-                <span class="identifier">en</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a list with elements <tt class="computeroutput"><span class="identifier">e0</span></tt>...<tt class="computeroutput"><span class="identifier">en</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">L</span><span class="special">(</span><span class="identifier">e0</span><span class="special">,</span> <span class="identifier">e1</span><span class="special">,...</span>
+                <span class="identifier">en</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a list with elements <code class="computeroutput"><span class="identifier">e0</span></code>...<code class="computeroutput"><span class="identifier">en</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">L</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a list from a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                Sequence</a>, <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">L</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a list from a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                Sequence</a>, <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">l</span> <span class="special">=</span>
-                <span class="identifier">s</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a list, <tt class="computeroutput"><span class="identifier">l</span></tt>,
-                from a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                Sequence</a>, <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">l</span> <span class="special">=</span>
+                <span class="identifier">s</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a list, <code class="computeroutput"><span class="identifier">l</span></code>,
+                from a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                Sequence</a>, <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput">at<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                The Nth element from the beginning of the sequence; see at.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><a class="link" href="../sequence/intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                The Nth element from the beginning of the sequence; see <a class="link" href="../sequence/intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<div class="sidebar"><p>
-        <span class="inlinemediaobject"><img src="images/note.png" alt="note"></span> <tt class="computeroutput">at<span class="special">&lt;</span><span class="identifier">n</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span></tt> is provided
+<div class="sidebar">
+<p class="title"><b></b></p>
+<p>
+        <span class="inlinemediaobject"><img src="../../images/note.png" alt="note"></span> <code class="computeroutput"><a class="link" href="../sequence/intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">n</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span></code> is provided
         for convenience and compatibility with the original Boost.Tuple
-        library, despite <tt class="computeroutput"><span class="identifier">list</span></tt> being
-        a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>
-        only (at is supposed to be a <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-        Access Sequence</a> requirement). The runtime complexity of at is constant (see <a href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive
+        library, despite <code class="computeroutput"><span class="identifier">list</span></code> being
+        a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
+        only (<a class="link" href="../sequence/intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a> is supposed to be a <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+        Access Sequence</a> requirement). The runtime complexity of <a class="link" href="../sequence/intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a> is constant (see <a class="link" href="../notes.html#fusion.notes.recursive_inlined_functions">Recursive
         Inlined Functions</a>).
-<<<<<<< .working
-      </p></div>
-<a name="fusion.container.list.example"></a><h4>
-<a name="id484925"></a>
-        Example
-      </h4>
-=======
       </p>
 </div>
 <a name="fusion.container.list.example"></a><h5>
-<a name="id691189"></a>
+<a name="id692382"></a>
         <a class="link" href="list.html#fusion.container.list.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">list</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">l</span><span class="special">(</span><span class="number">12</span><span class="special">,</span> <span class="number">5.5f</span><span class="special">);</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">l</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/map.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/map.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/map.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>map</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../container.html" title="Container">
-<link rel="previous" href="set.html" title="set">
+<link rel="prev" href="set.html" title="set">
 <link rel="next" href="generation.html" title="Generation">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,65 +22,36 @@
 <div class="spirit-nav">
 <a accesskey="p" href="set.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="generation.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.container.map"></a>map
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.container.map.description"></a><h4>
-<a name="id486951"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="map">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.container.map"></a><a class="link" href="map.html" title="map">map</a>
 </h3></div></div></div>
 <a name="fusion.container.map.description"></a><h5>
-<a name="id694005"></a>
+<a name="id696307"></a>
         <a class="link" href="map.html#fusion.container.map.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        map is an <a href="../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
+        map is an <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
         Sequence</a> of heteregenous typed data elements. Each element is a key/data
-        pair (see fusion::pair)
+        pair (see <a class="link" href="../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a>)
         where the key has no data (type only). Type identity is used to impose an
         equivalence relation on keys. A map may contain at most one element for each
         key. Membership testing and element key lookup has constant runtime complexity
-        (see Overloaded Functions).
+        (see <a class="link" href="../notes.html#fusion.notes.overloaded_functions">Overloaded Functions</a>).
       </p>
-<<<<<<< .working
-<a name="fusion.container.map.header"></a><h4>
-<a name="id487031"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.container.map.header"></a><h5>
-<a name="id694048"></a>
+<a name="id696350"></a>
         <a class="link" href="map.html#fusion.container.map.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">map</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">map_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">map_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.container.map.synopsis"></a><h4>
-<a name="id487311"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.container.map.synopsis"></a><h5>
-<a name="id694247"></a>
+<a name="id696549"></a>
         <a class="link" href="map.html#fusion.container.map.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">T0</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
   <span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
@@ -95,31 +62,24 @@
 <span class="keyword">struct</span> <span class="identifier">map</span><span class="special">;</span>
 </pre>
 <p>
-        The variadic class interface accepts <tt class="computeroutput"><span class="number">0</span></tt>
-        to <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt> elements,
-        where <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
-        is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>.
+        The variadic class interface accepts <code class="computeroutput"><span class="number">0</span></code>
+        to <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code> elements,
+        where <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
+        is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>.
         Example:
       </p>
-<pre class="programlisting"><span class="identifier">map</span><span class="special">&lt;</span>pair<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> pair<span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> pair<span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+<pre class="programlisting"><span class="identifier">map</span><span class="special">&lt;</span><a class="link" href="../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> <a class="link" href="../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> <a class="link" href="../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="special">&gt;</span
>
 </pre>
 <p>
-        You may define the preprocessor constant <tt class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></tt>
+        You may define the preprocessor constant <code class="computeroutput"><span class="identifier">FUSION_MAX_MAP_SIZE</span></code>
         before including any Fusion header to change the default. Example:
       </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_MAP_SIZE</span> <span class="number">20</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.container.map.template_parameters"></a><h4>
-<a name="id487736"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.container.map.template_parameters"></a><h5>
-<a name="id694546"></a>
+<a name="id696848"></a>
         <a class="link" href="map.html#fusion.container.map.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -127,87 +87,78 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">T0</span></tt>...<tt class="computeroutput"><span class="identifier">TN</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">T0</span></code>...<code class="computeroutput"><span class="identifier">TN</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Element types
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 <span class="emphasis"><em>unspecified-type</em></span>
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.container.map.model_of"></a><h4>
-<a name="id487853"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
-=======
 <a name="fusion.container.map.model_of"></a><h5>
-<a name="id694640"></a>
+<a name="id696942"></a>
         <a class="link" href="map.html#fusion.container.map.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem"><a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
->>>>>>> .merge-right.r57125
           Sequence</a></li>
-<li><a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a></li>
+<li class="listitem"><a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a></li>
 </ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">M</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">M</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">map</span></tt> type
+            A <code class="computeroutput"><span class="identifier">map</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">m</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">m</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">map</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">map</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">e0</span></tt>...<tt class="computeroutput"><span class="identifier">en</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">e0</span></code>...<code class="computeroutput"><span class="identifier">en</span></code></span></dt>
 <dd><p>
-            Heterogeneous key/value pairs (see fusion::pair)
+            Heterogeneous key/value pairs (see <a class="link" href="../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a>)
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>
+            A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.container.map.expression_semantics"></a><h4>
-<a name="id488074"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.container.map.expression_semantics"></a><h5>
-<a name="id694796"></a>
+<a name="id697098"></a>
         <a class="link" href="map.html#fusion.container.map.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-        defined in <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-        Access Sequence</a> and <a href="../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
+        defined in <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+        Access Sequence</a> and <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
         Sequence</a>.
       </p>
 <div class="informaltable"><table class="table">
@@ -216,82 +167,93 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">M</span><span class="special">()</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">M</span><span class="special">()</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Creates a map with default constructed elements.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">M</span><span class="special">(</span><span class="identifier">e0</span><span class="special">,</span> <span class="identifier">e1</span><span class="special">,...</span>
-                <span class="identifier">en</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a map with element pairs <tt class="computeroutput"><span class="identifier">e0</span></tt>...<tt class="computeroutput"><span class="identifier">en</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">M</span><span class="special">(</span><span class="identifier">e0</span><span class="special">,</span> <span class="identifier">e1</span><span class="special">,...</span>
+                <span class="identifier">en</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a map with element pairs <code class="computeroutput"><span class="identifier">e0</span></code>...<code class="computeroutput"><span class="identifier">en</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">M</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a map from a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                Sequence</a> <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">M</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a map from a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                Sequence</a> <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">m</span> <span class="special">=</span>
-                <span class="identifier">s</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a map, <tt class="computeroutput"><span class="identifier">m</span></tt>,
-                from a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                Sequence</a> <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">m</span> <span class="special">=</span>
+                <span class="identifier">s</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a map, <code class="computeroutput"><span class="identifier">m</span></code>,
+                from a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                Sequence</a> <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.container.map.example"></a><h4>
-<a name="id488420"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.container.map.example"></a><h5>
-<a name="id695049"></a>
+<a name="id697351"></a>
         <a class="link" href="map.html#fusion.container.map.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">map</span><span class="special">&lt;</span>
-    pair<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span>
-  <span class="special">,</span> pair<span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+    <a class="link" href="../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span>
+  <span class="special">,</span> <a class="link" href="../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="special">&gt;</span>
 <span class="identifier">map_type</span><span class="special">;</span>
 
 <span class="identifier">map_type</span> <span class="identifier">m</span><span class="special">(</span>
-    make_pair<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="char">'X'</span><span class="special">)</span>
-  <span class="special">,</span> make_pair<span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;(</span><span class="string">"Men"</span><span class="special">));</span>
+    <a class="link" href="../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">make_pair</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="char">'X'</span><span class="special">)</span>
+  <span class="special">,</span> <a class="link" href="../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">make_pair</span></code></a><span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;(</span><span class="string">"Men"</span><span class="special">));</span>
 
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_key<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">m</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_key<span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;(</span><span class="identifier">m</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">m</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="keyword">double</span><span class="special">&gt;(</span><span class="identifier">m</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/set.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/set.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/set.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>set</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../container.html" title="Container">
-<link rel="previous" href="list.html" title="list">
+<link rel="prev" href="list.html" title="list">
 <link rel="next" href="map.html" title="map">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,64 +22,35 @@
 <div class="spirit-nav">
 <a accesskey="p" href="list.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="map.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.container.set"></a>set
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.container.set.description"></a><h4>
-<a name="id485216"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="set">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.container.set"></a><a class="link" href="set.html" title="set">set</a>
 </h3></div></div></div>
 <a name="fusion.container.set.description"></a><h5>
-<a name="id691394"></a>
+<a name="id692587"></a>
         <a class="link" href="set.html#fusion.container.set.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        set is an <a href="../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
+        set is an <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
         Sequence</a> of heteregenous typed data elements. Type identity is used
         to impose an equivalence relation on keys. The element's type is its key.
         A set may contain at most one element for each key. Membership testing and
-        element key lookup has constant runtime complexity (see <a href="../notes.html#fusion.notes.overloaded_functions">Overloaded
+        element key lookup has constant runtime complexity (see <a class="link" href="../notes.html#fusion.notes.overloaded_functions">Overloaded
         Functions</a>).
       </p>
-<<<<<<< .working
-<a name="fusion.container.set.header"></a><h4>
-<a name="id485264"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.container.set.header"></a><h5>
-<a name="id691421"></a>
+<a name="id692614"></a>
         <a class="link" href="set.html#fusion.container.set.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">set</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">set_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">set_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.container.set.synopsis"></a><h4>
-<a name="id485545"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.container.set.synopsis"></a><h5>
-<a name="id691620"></a>
+<a name="id692813"></a>
         <a class="link" href="set.html#fusion.container.set.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">T0</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
   <span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
@@ -94,31 +61,24 @@
 <span class="keyword">struct</span> <span class="identifier">set</span><span class="special">;</span>
 </pre>
 <p>
-        The variadic class interface accepts <tt class="computeroutput"><span class="number">0</span></tt>
-        to <tt class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></tt> elements,
-        where <tt class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></tt>
-        is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>.
+        The variadic class interface accepts <code class="computeroutput"><span class="number">0</span></code>
+        to <code class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></code> elements,
+        where <code class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></code>
+        is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>.
         Example:
       </p>
 <pre class="programlisting"><span class="identifier">set</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span>
 </pre>
 <p>
-        You may define the preprocessor constant <tt class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></tt>
+        You may define the preprocessor constant <code class="computeroutput"><span class="identifier">FUSION_MAX_SET_SIZE</span></code>
         before including any Fusion header to change the default. Example:
       </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_SET_SIZE</span> <span class="number">20</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.container.set.template_parameters"></a><h4>
-<a name="id485872"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.container.set.template_parameters"></a><h5>
-<a name="id691853"></a>
+<a name="id693046"></a>
         <a class="link" href="set.html#fusion.container.set.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -126,87 +86,78 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">T0</span></tt>...<tt class="computeroutput"><span class="identifier">TN</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">T0</span></code>...<code class="computeroutput"><span class="identifier">TN</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Element types
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 <span class="emphasis"><em>unspecified-type</em></span>
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.container.set.model_of"></a><h4>
-<a name="id485989"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
-=======
 <a name="fusion.container.set.model_of"></a><h5>
-<a name="id691946"></a>
+<a name="id693139"></a>
         <a class="link" href="set.html#fusion.container.set.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem"><a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
->>>>>>> .merge-right.r57125
           Sequence</a></li>
-<li><a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a></li>
+<li class="listitem"><a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a></li>
 </ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">S</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">S</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">set</span></tt> type
+            A <code class="computeroutput"><span class="identifier">set</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">set</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">set</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">e0</span></tt>...<tt class="computeroutput"><span class="identifier">en</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">e0</span></code>...<code class="computeroutput"><span class="identifier">en</span></code></span></dt>
 <dd><p>
             Heterogeneous values
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">fs</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">fs</span></code></span></dt>
 <dd><p>
-            A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>
+            A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.container.set.expression_semantics"></a><h4>
-<a name="id486183"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.container.set.expression_semantics"></a><h5>
-<a name="id692086"></a>
+<a name="id693278"></a>
         <a class="link" href="set.html#fusion.container.set.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-        defined in <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-        Access Sequence</a> and <a href="../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
+        defined in <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+        Access Sequence</a> and <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
         Sequence</a>.
       </p>
 <div class="informaltable"><table class="table">
@@ -215,76 +166,87 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">S</span><span class="special">()</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">S</span><span class="special">()</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Creates a set with default constructed elements.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">S</span><span class="special">(</span><span class="identifier">e0</span><span class="special">,</span> <span class="identifier">e1</span><span class="special">,...</span>
-                <span class="identifier">en</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a set with elements <tt class="computeroutput"><span class="identifier">e0</span></tt>...<tt class="computeroutput"><span class="identifier">en</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">S</span><span class="special">(</span><span class="identifier">e0</span><span class="special">,</span> <span class="identifier">e1</span><span class="special">,...</span>
+                <span class="identifier">en</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a set with elements <code class="computeroutput"><span class="identifier">e0</span></code>...<code class="computeroutput"><span class="identifier">en</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">S</span><span class="special">(</span><span class="identifier">fs</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a set from a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                Sequence</a> <tt class="computeroutput"><span class="identifier">fs</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">S</span><span class="special">(</span><span class="identifier">fs</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a set from a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                Sequence</a> <code class="computeroutput"><span class="identifier">fs</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">s</span> <span class="special">=</span>
-                <span class="identifier">fs</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a set, <tt class="computeroutput"><span class="identifier">s</span></tt>,
-                from a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                Sequence</a> <tt class="computeroutput"><span class="identifier">fs</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">s</span> <span class="special">=</span>
+                <span class="identifier">fs</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a set, <code class="computeroutput"><span class="identifier">s</span></code>,
+                from a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                Sequence</a> <code class="computeroutput"><span class="identifier">fs</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.container.set.example"></a><h4>
-<a name="id486530"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.container.set.example"></a><h5>
-<a name="id692339"></a>
+<a name="id693532"></a>
         <a class="link" href="set.html#fusion.container.set.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">set</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">S</span><span class="special">;</span>
 <span class="identifier">S</span> <span class="identifier">s</span><span class="special">(</span><span class="number">12</span><span class="special">,</span> <span class="number">5.5f</span><span class="special">);</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_key<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_key<span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> result_of::has_key<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;::</span><span class="identifier">value</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/metafunctions/has_key.html" title="has_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">has_key</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;::</span><span class="identifier">value</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/container/vector.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/container/vector.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/container/vector.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>vector</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../container.html" title="Container">
-<link rel="previous" href="../container.html" title="Container">
+<link rel="prev" href="../container.html" title="Container">
 <link rel="next" href="cons.html" title="cons">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,48 +22,26 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../container.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../container.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="cons.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.container.vector"></a>vector
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.container.vector.description"></a><h4>
-<a name="id478776"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="vector">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.container.vector"></a><a class="link" href="vector.html" title="vector">vector</a>
 </h3></div></div></div>
 <a name="fusion.container.vector.description"></a><h5>
-<a name="id685093"></a>
+<a name="id685194"></a>
         <a class="link" href="vector.html#fusion.container.vector.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        <tt class="computeroutput"><span class="identifier">vector</span></tt> is a <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+        <code class="computeroutput"><span class="identifier">vector</span></code> is a <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
         Access Sequence</a> of heterogenous typed data structured as a simple
-        <tt class="computeroutput"><span class="keyword">struct</span></tt> where each element is
-        held as a member variable. <tt class="computeroutput"><span class="identifier">vector</span></tt>
+        <code class="computeroutput"><span class="keyword">struct</span></code> where each element is
+        held as a member variable. <code class="computeroutput"><span class="identifier">vector</span></code>
         is the simplest of the Fusion sequence container, and in many cases the most
         efficient.
       </p>
-<<<<<<< .working
-<a name="fusion.container.vector.header"></a><h4>
-<a name="id478852"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.container.vector.header"></a><h5>
-<a name="id685139"></a>
+<a name="id685239"></a>
         <a class="link" href="vector.html#fusion.container.vector.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">vector</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">vector</span><span class="special">/</span><span class="identifier">vector_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -85,19 +59,12 @@
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">container</span><span class="special">/</span><span class="identifier">vector</span><span class="special">/</span><span class="identifier">vector50</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">vector50</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.container.vector.synopsis"></a><h4>
-<a name="id479828"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.container.vector.synopsis"></a><h5>
-<a name="id685841"></a>
+<a name="id685941"></a>
         <a class="link" href="vector.html#fusion.container.vector.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        <span class="bold"><b>Numbered forms</b></span>
+        <span class="bold"><strong>Numbered forms</strong></span>
       </p>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">vector0</span><span class="special">;</span>
 
@@ -116,7 +83,7 @@
 <span class="keyword">struct</span> <span class="identifier">vectorN</span><span class="special">;</span>
 </pre>
 <p>
-        <span class="bold"><b>Variadic form</b></span>
+        <span class="bold"><strong>Variadic form</strong></span>
       </p>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">T0</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span>
@@ -133,31 +100,24 @@
 <pre class="programlisting"><span class="identifier">vector3</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span>
 </pre>
 <p>
-        The variadic form accepts <tt class="computeroutput"><span class="number">0</span></tt> to
-        <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt> elements,
-        where <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
-        is a user definable predefined maximum that defaults to <tt class="computeroutput"><span class="number">10</span></tt>.
+        The variadic form accepts <code class="computeroutput"><span class="number">0</span></code> to
+        <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code> elements,
+        where <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
+        is a user definable predefined maximum that defaults to <code class="computeroutput"><span class="number">10</span></code>.
         Example:
       </p>
 <pre class="programlisting"><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span>
 </pre>
 <p>
-        You may define the preprocessor constant <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>
+        You may define the preprocessor constant <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>
         before including any Fusion header to change the default. Example:
       </p>
 <pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">FUSION_MAX_VECTOR_SIZE</span> <span class="number">20</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.container.vector.template_parameters"></a><h4>
-<a name="id480553"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.container.vector.template_parameters"></a><h5>
-<a name="id686370"></a>
+<a name="id689270"></a>
         <a class="link" href="vector.html#fusion.container.vector.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -165,80 +125,74 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">T0</span></tt>...<tt class="computeroutput"><span class="identifier">TN</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">T0</span></code>...<code class="computeroutput"><span class="identifier">TN</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Element types
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 <span class="emphasis"><em>unspecified</em></span>
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.container.vector.model_of"></a><h4>
-<a name="id480672"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-=======
 <a name="fusion.container.vector.model_of"></a><h5>
-<a name="id687078"></a>
+<a name="id689364"></a>
         <a class="link" href="vector.html#fusion.container.vector.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
->>>>>>> .merge-right.r57125
           Access Sequence</a></li></ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">v</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">v</span></code></span></dt>
 <dd><p>
-            Instance of <tt class="computeroutput"><span class="identifier">vector</span></tt>
+            Instance of <code class="computeroutput"><span class="identifier">vector</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">V</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">V</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">vector</span></tt> type
+            A <code class="computeroutput"><span class="identifier">vector</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">e0</span></tt>...<tt class="computeroutput"><span class="identifier">en</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">e0</span></code>...<code class="computeroutput"><span class="identifier">en</span></code></span></dt>
 <dd><p>
             Heterogeneous values
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>
+            A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.container.vector.expression_semantics"></a><h4>
-<a name="id480855"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.container.vector.expression_semantics"></a><h5>
-<a name="id687209"></a>
+<a name="id689494"></a>
         <a class="link" href="vector.html#fusion.container.vector.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-        defined in <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+        defined in <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
         Access Sequence</a>.
       </p>
 <div class="informaltable"><table class="table">
@@ -247,74 +201,85 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">V</span><span class="special">()</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">V</span><span class="special">()</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Creates a vector with default constructed elements.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">V</span><span class="special">(</span><span class="identifier">e0</span><span class="special">,</span> <span class="identifier">e1</span><span class="special">,...</span>
-                <span class="identifier">en</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a vector with elements <tt class="computeroutput"><span class="identifier">e0</span></tt>...<tt class="computeroutput"><span class="identifier">en</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">V</span><span class="special">(</span><span class="identifier">e0</span><span class="special">,</span> <span class="identifier">e1</span><span class="special">,...</span>
+                <span class="identifier">en</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a vector with elements <code class="computeroutput"><span class="identifier">e0</span></code>...<code class="computeroutput"><span class="identifier">en</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">V</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a vector from a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                Sequence</a>, <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">V</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a vector from a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                Sequence</a>, <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">v</span> <span class="special">=</span>
-                <span class="identifier">s</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a vector, <tt class="computeroutput"><span class="identifier">v</span></tt>,
-                from a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-                Sequence</a>, <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">v</span> <span class="special">=</span>
+                <span class="identifier">s</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a vector, <code class="computeroutput"><span class="identifier">v</span></code>,
+                from a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+                Sequence</a>, <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.container.vector.example"></a><h4>
-<a name="id481192"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.container.vector.example"></a><h5>
-<a name="id687458"></a>
+<a name="id689743"></a>
         <a class="link" href="vector.html#fusion.container.vector.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">12</span><span class="special">,</span> <span class="number">5.5f</span><span class="special">);</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> at_c<span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/extension.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/extension.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/extension.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Extension</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="tuple/pairs.html" title="Pairs">
-<link rel="next" href="extension/ext_full.html" title=" The Full Extension Mechanism">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="tuple/pairs.html" title="Pairs">
+<link rel="next" href="extension/ext_full.html" title="The Full Extension Mechanism">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="tuple/pairs.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="extension/ext_full.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.extension"></a>Extension
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Extension">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.extension"></a><a class="link" href="extension.html" title="Extension">Extension</a>
+</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"> The Full Extension Mechanism</span></dt>
 <dt><span class="section">Sequence Facade</span></dt>
@@ -41,7 +34,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/extension/ext_full.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/extension/ext_full.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/extension/ext_full.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,20 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title> The Full Extension Mechanism</title>
+<title>The Full Extension Mechanism</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../extension.html" title="Extension">
-<link rel="previous" href="../extension.html" title="Extension">
+<link rel="prev" href="../extension.html" title="Extension">
 <link rel="next" href="sequence_facade.html" title="Sequence Facade">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,46 +22,36 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../extension.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../extension.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="sequence_facade.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.extension.ext_full"></a> The Full Extension Mechanism
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="The Full Extension Mechanism">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.extension.ext_full"></a><a class="link" href="ext_full.html" title="The Full Extension Mechanism"> The Full Extension Mechanism</a>
+</h3></div></div></div>
 <p>
         The Fusion library is designed to be extensible, new sequences types can
-        easily be added. In fact, the library support for <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>,
-        <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></tt> and MPL
+        easily be added. In fact, the library support for <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code>,
+        <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code> and MPL
         sequences is entirely provided using the extension mechanism.
       </p>
 <p>
         The process for adding a new sequence type to Fusion is:
       </p>
-<div class="orderedlist"><ol type="1">
-<li>
-          Enable the tag dispatching
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+          Enable the <a class="link" href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag dispatching</em></span></a>
           mechanism used by Fusion for your sequence type
         </li>
-<li>
+<li class="listitem">
           Design an iterator type for the sequence
         </li>
-<li>
+<li class="listitem">
           Provide specialized behaviour for the intrinsic operations of the new Fusion
           sequence
         </li>
 </ol></div>
-<<<<<<< .working
-<a name="fusion.extension.ext_full.our_example"></a><h4>
-<a name="id599358"></a>
-        Our example
-      </h4>
-=======
 <a name="fusion.extension.ext_full.our_example"></a><h5>
-<a name="id831346"></a>
+<a name="id810179"></a>
         <a class="link" href="ext_full.html#fusion.extension.ext_full.our_example">Our example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         In order to illustrate enabling a new sequence type for use with Fusion,
         we are going to use the type:
@@ -91,25 +73,18 @@
 <p>
         We are going to pretend that this type has been provided by a 3rd party library,
         and therefore cannot be modified. We shall work through all the necessary
-        steps to enable <tt class="computeroutput"><span class="identifier">example_struct</span></tt>
-        to serve as an <a href="../sequence/concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
-        Sequence</a> as described in the <a href="../quick_start.html" title="Quick Start">Quick
+        steps to enable <code class="computeroutput"><span class="identifier">example_struct</span></code>
+        to serve as an <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
+        Sequence</a> as described in the <a class="link" href="../quick_start.html" title="Quick Start">Quick
         Start</a> guide.
       </p>
-<<<<<<< .working
-<a name="fusion.extension.ext_full.enabling_tag_dispatching"></a><h4>
-<a name="id599647"></a>
-        <a href="ext_full.html#fusion.extension.ext_full.enabling_tag_dispatching">Enabling
-=======
 <a name="fusion.extension.ext_full.enabling_tag_dispatching"></a><h5>
-<a name="id831550"></a>
+<a name="id810383"></a>
         <a class="link" href="ext_full.html#fusion.extension.ext_full.enabling_tag_dispatching">Enabling
->>>>>>> .merge-right.r57125
         Tag Dispatching</a>
-      </h4>
+      </h5>
 <p>
-        The Fusion extensibility mechanism uses <a href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
+        The Fusion extensibility mechanism uses <a class="link" href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
         dispatching</em></span></a> to call the correct code for a given sequence
         type. In order to exploit the tag dispatching mechanism we must first declare
         a new tag type for the mechanism to use. For example:
@@ -119,9 +94,9 @@
 </span><span class="special">}</span>
 </pre>
 <p>
-        Next we need to enable the <tt class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span></tt>
+        Next we need to enable the <code class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span></code>
         metafunction to return our newly chosen tag type for operations involving
-        our sequence. This is done by specializing <tt class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span></tt>
+        our sequence. This is done by specializing <code class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span></code>
         for our sequence type.
       </p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">support</span><span class="special">/</span><span class="identifier">tag_of_fwd</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -136,34 +111,28 @@
 <span class="special">}}}</span>
 </pre>
 <p>
-        <tt class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span></tt> also has a second template argument,
-        that can be used in conjuction with <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">enable_if</span></tt>
+        <code class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span></code> also has a second template argument,
+        that can be used in conjuction with <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">enable_if</span></code>
         to provide tag support for groups of related types. This feature is not necessary
         for our sequence, but for an example see the code in:
       </p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">adapted</span><span class="special">/</span><span class="identifier">array</span><span class="special">/</span><span class="identifier">tag_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">tag_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.extension.ext_full.designing_a_suitable_iterator"></a><h4>
-<a name="id600268"></a>
-        <a href="ext_full.html#fusion.extension.ext_full.designing_a_suitable_iterator">Designing
-=======
 <a name="fusion.extension.ext_full.designing_a_suitable_iterator"></a><h5>
-<a name="id831986"></a>
+<a name="id810818"></a>
         <a class="link" href="ext_full.html#fusion.extension.ext_full.designing_a_suitable_iterator">Designing
->>>>>>> .merge-right.r57125
         a suitable iterator</a>
-      </h4>
+      </h5>
 <p>
         We need an iterator to describe positions, and provide access to the data
         within our sequence. As it is straightforward to do, we are going to provide
         a random access iterator in our example.
       </p>
 <p>
-        We will use a simple design, in which the 2 members of <tt class="computeroutput"><span class="identifier">example_struct</span></tt>
-        are given numbered indices, 0 for <tt class="computeroutput"><span class="identifier">name</span></tt>
-        and 1 for <tt class="computeroutput"><span class="identifier">age</span></tt> respectively.
+        We will use a simple design, in which the 2 members of <code class="computeroutput"><span class="identifier">example_struct</span></code>
+        are given numbered indices, 0 for <code class="computeroutput"><span class="identifier">name</span></code>
+        and 1 for <code class="computeroutput"><span class="identifier">age</span></code> respectively.
       </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Struct</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">Pos</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">example_struct_iterator</span>
@@ -183,49 +152,43 @@
 <p>
         A quick summary of the details of our iterator:
       </p>
-<div class="orderedlist"><ol type="1">
-<li>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
           The iterator is parameterized by the type it is iterating over, and the
           index of the current element.
         </li>
-<li>
-          The typedefs <tt class="computeroutput"><span class="identifier">struct_type</span></tt>
-          and <tt class="computeroutput"><span class="identifier">index</span></tt> provide convenient
+<li class="listitem">
+          The typedefs <code class="computeroutput"><span class="identifier">struct_type</span></code>
+          and <code class="computeroutput"><span class="identifier">index</span></code> provide convenient
           access to information we will need later in the implementation.
         </li>
-<li>
-          The typedef <tt class="computeroutput"><span class="identifier">category</span></tt> allows
-          the <tt class="computeroutput"><span class="identifier">traits</span><span class="special">::</span>category_of</tt>
+<li class="listitem">
+          The typedef <code class="computeroutput"><span class="identifier">category</span></code> allows
+          the <code class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><a class="link" href="../support/category_of.html" title="category_of"><code class="computeroutput"><span class="identifier">category_of</span></code></a></code>
           metafunction to establish the traversal category of the iterator.
         </li>
-<li>
-          The constructor stores a reference to the <tt class="computeroutput"><span class="identifier">example_struct</span></tt>
+<li class="listitem">
+          The constructor stores a reference to the <code class="computeroutput"><span class="identifier">example_struct</span></code>
           being iterated over.
         </li>
 </ol></div>
 <p>
-        We also need to enable <a href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
+        We also need to enable <a class="link" href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
         dispatching</em></span></a> for our iterator type, with another specialization
-        of <tt class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span></tt>.
+        of <code class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span></code>.
       </p>
 <p>
         In isolation, the iterator implementation is pretty dry. Things should become
         clearer as we add features to our implementation.
       </p>
-<<<<<<< .working
-<a name="fusion.extension.ext_full.a_first_couple_of_instructive_features"></a><h4>
-<a name="id600925"></a>
-        <a href="ext_full.html#fusion.extension.ext_full.a_first_couple_of_instructive_features">A
-=======
 <a name="fusion.extension.ext_full.a_first_couple_of_instructive_features"></a><h5>
-<a name="id832444"></a>
+<a name="id811277"></a>
         <a class="link" href="ext_full.html#fusion.extension.ext_full.a_first_couple_of_instructive_features">A
->>>>>>> .merge-right.r57125
         first couple of instructive features</a>
-      </h4>
+      </h5>
 <p>
-        To start with, we will get the result_of::value_of metafunction working. To
-        do this, we provide a specialization of the <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">extension</span><span class="special">::</span><span class="identifier">value_of_impl</span></tt>
+        To start with, we will get the <a class="link" href="../iterator/metafunctions/value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a> metafunction working. To
+        do this, we provide a specialization of the <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">extension</span><span class="special">::</span><span class="identifier">value_of_impl</span></code>
         template for our iterator's tag type.
       </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;&gt;</span>
@@ -249,43 +212,29 @@
 </pre>
 <p>
         The implementation itself is pretty simple, it just uses 2 partial specializations
-        to provide the type of the 2 different members of <tt class="computeroutput"><span class="identifier">example_struct</span></tt>,
+        to provide the type of the 2 different members of <code class="computeroutput"><span class="identifier">example_struct</span></code>,
         based on the index of the iterator.
       </p>
 <p>
-<<<<<<< .working
-        To understand how <tt class="computeroutput"><span class="identifier">value_of_impl</span></tt>
-        is used by the library we will look at the implementation of value_of:
-=======
         To understand how <code class="computeroutput"><span class="identifier">value_of_impl</span></code>
-        is used by the library we will look at the implementation of __value<span class="underline">of</span>_:
->>>>>>> .merge-right.r57242
+        is used by the library we will look at the implementation of <a class="link" href="../iterator/metafunctions/value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a>:
       </p>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Iterator</span><span class="special">&gt;</span>
-<<<<<<< .working
-<span class="keyword">struct</span> value_of
-=======
-<span class="keyword">struct</span> <span class="identifier">__value_of__</span>
->>>>>>> .merge-right.r57242
+<span class="keyword">struct</span> <span class="identifier">value_of</span>
     <span class="special">:</span> <span class="identifier">extension</span><span class="special">::</span><span class="identifier">value_of_impl</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">detail</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span><span class="identifier">Iterator</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span>
         <span class="keyword">template</span> <span class="identifier">apply</span><span class="special">&lt;</span><span class="identifier">Iterator</span><span class="special">&gt;</span>
 <span class="special">{};</span>
 </pre>
 <p>
-<<<<<<< .working
-        So value_of
-        uses tag dispatching
+        So <a class="link" href="../iterator/metafunctions/value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a>
+        uses <a class="link" href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag dispatching</em></span></a>
         to select an <a href="http://www.boost.org/libs/mpl/doc/refmanual/metafunction-class.html" target="_top">MPL
-=======
-        So __value<span class="underline">of</span>_ uses <a class="link" href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
-        dispatching</em></span></a> to select an <a href="http://www.boost.org/libs/mpl/doc/refmanual/metafunction-class.html" target="_top">MPL
->>>>>>> .merge-right.r57242
         Metafunction Class</a> to provide its functionality. You will notice
         this pattern throughout the implementation of Fusion.
       </p>
 <p>
         Ok, lets enable dereferencing of our iterator. In this case we must provide
-        a suitable specialization of <tt class="computeroutput"><span class="identifier">deref_impl</span></tt>.
+        a suitable specialization of <code class="computeroutput"><span class="identifier">deref_impl</span></code>.
       </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">deref_impl</span><span class="special">&lt;</span><span class="identifier">example</span><span class="special">::</span><span class="identifier">example_struct_iterator_tag</span><span class="special">&gt;</span>
@@ -322,16 +271,16 @@
 <span class="special">}</span>
 </pre>
 <p>
-        The use of <tt class="computeroutput"><span class="identifier">deref_impl</span></tt> is
-        very similar to that of <tt class="computeroutput"><span class="identifier">value_of_impl</span></tt>,
-        but it also provides some runtime functionality this time via the <tt class="computeroutput"><span class="identifier">call</span></tt> static member function. To see how
-        <tt class="computeroutput"><span class="identifier">deref_impl</span></tt> is used, lets
-        have a look at the implementation of deref:
+        The use of <code class="computeroutput"><span class="identifier">deref_impl</span></code> is
+        very similar to that of <code class="computeroutput"><span class="identifier">value_of_impl</span></code>,
+        but it also provides some runtime functionality this time via the <code class="computeroutput"><span class="identifier">call</span></code> static member function. To see how
+        <code class="computeroutput"><span class="identifier">deref_impl</span></code> is used, lets
+        have a look at the implementation of <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a>:
       </p>
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
 <span class="special">{</span>
     <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Iterator</span><span class="special">&gt;</span>
-    <span class="keyword">struct</span> deref
+    <span class="keyword">struct</span> <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a>
         <span class="special">:</span> <span class="identifier">extension</span><span class="special">::</span><span class="identifier">deref_impl</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">detail</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span><span class="identifier">Iterator</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span>
             <span class="keyword">template</span> <span class="identifier">apply</span><span class="special">&lt;</span><span class="identifier">Iterator</span><span class="special">&gt;</span>
     <span class="special">{};</span>
@@ -339,76 +288,48 @@
 
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Iterator</span><span class="special">&gt;</span>
 <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span><span class="special">&lt;</span><span class="identifier">Iterator</span><span class="special">&gt;::</span><span class="identifier">type</span>
-deref<span class="special">(</span><span class="identifier">Iterator</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">)</span>
+<a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><span class="identifier">Iterator</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">)</span>
 <span class="special">{</span>
     <span class="keyword">typedef</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span><span class="special">&lt;</span><span class="identifier">Iterator</span><span class="special">&gt;</span> <span class="identifier">deref_meta</span><span class="special">;</span>
     <span class="keyword">return</span> <span class="identifier">deref_meta</span><span class="special">::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">i</span><span class="special">);</span>
 <span class="special">}</span>
 </pre>
 <p>
-<<<<<<< .working
-        So again result_of::deref uses <a href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
-        dispatching</em></span></a> in exactly the same way as the value_of implementation. The runtime
-        functionality used by deref is provided by the <tt class="computeroutput"><span class="identifier">call</span></tt> static function of the selected <a href="http://www.boost.org/libs/mpl/doc/refmanual/metafunction-class.html" target="_top">MPL
-=======
         So again <a class="link" href="../iterator/metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a> uses <a class="link" href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
-        dispatching</em></span></a> in exactly the same way as the __value<span class="underline">of</span>_ implementation. The runtime functionality
-        used by <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a>
-        is provided by the <code class="computeroutput"><span class="identifier">call</span></code> static
-        function of the selected <a href="http://www.boost.org/libs/mpl/doc/refmanual/metafunction-class.html" target="_top">MPL
->>>>>>> .merge-right.r57242
+        dispatching</em></span></a> in exactly the same way as the <a class="link" href="../iterator/metafunctions/value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a> implementation. The runtime
+        functionality used by <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a> is provided by the <code class="computeroutput"><span class="identifier">call</span></code> static function of the selected <a href="http://www.boost.org/libs/mpl/doc/refmanual/metafunction-class.html" target="_top">MPL
         Metafunction Class</a>.
       </p>
 <p>
-        The actual implementation of <tt class="computeroutput"><span class="identifier">deref_impl</span></tt>
-        is slightly more complex than that of <tt class="computeroutput"><span class="identifier">value_of_impl</span></tt>.
-        We also need to implement the <tt class="computeroutput"><span class="identifier">call</span></tt>
+        The actual implementation of <code class="computeroutput"><span class="identifier">deref_impl</span></code>
+        is slightly more complex than that of <code class="computeroutput"><span class="identifier">value_of_impl</span></code>.
+        We also need to implement the <code class="computeroutput"><span class="identifier">call</span></code>
         function, which returns a reference to the appropriate member of the underlying
-        sequence. We also require a little bit of metaprogramming to return <tt class="computeroutput"><span class="keyword">const</span></tt> references if the underlying sequence
+        sequence. We also require a little bit of metaprogramming to return <code class="computeroutput"><span class="keyword">const</span></code> references if the underlying sequence
         is const.
       </p>
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../../../../doc/html/images/note.png"></td>
 <th align="left">Note</th>
 </tr>
-<tr><td colspan="2" align="left" valign="top"><p>
+<tr><td align="left" valign="top"><p>
           Although there is a fair amount of left to do to produce a fully fledged
-<<<<<<< .working
-          Fusion sequence, value_of and deref illustrate all the signficant
+          Fusion sequence, <a class="link" href="../iterator/metafunctions/value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a> and <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a> illustrate all the signficant
           concepts required. The remainder of the process is very repetitive, simply
-          requiring implementation of a suitable <tt class="computeroutput"><span class="identifier">xxxx_impl</span></tt>
-          for each feature <tt class="computeroutput"><span class="identifier">xxxx</span></tt>.
-=======
-          Fusion sequence, __value<span class="underline">of</span>_ and
-          <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a>
-          illustrate all the signficant concepts required. The remainder of the process
-          is very repetitive, simply requiring implementation of a suitable <code class="computeroutput"><span class="identifier">xxxx_impl</span></code> for each feature <code class="computeroutput"><span class="identifier">xxxx</span></code>.
->>>>>>> .merge-right.r57242
+          requiring implementation of a suitable <code class="computeroutput"><span class="identifier">xxxx_impl</span></code>
+          for each feature <code class="computeroutput"><span class="identifier">xxxx</span></code>.
         </p></td></tr>
 </table></div>
-<<<<<<< .working
-<a name="fusion.extension.ext_full.implementing_the_remaining_iterator_functionality"></a><h4>
-<a name="id603230"></a>
-        <a href="ext_full.html#fusion.extension.ext_full.implementing_the_remaining_iterator_functionality">Implementing
-=======
 <a name="fusion.extension.ext_full.implementing_the_remaining_iterator_functionality"></a><h5>
-<a name="id834035"></a>
+<a name="id812915"></a>
         <a class="link" href="ext_full.html#fusion.extension.ext_full.implementing_the_remaining_iterator_functionality">Implementing
->>>>>>> .merge-right.r57125
         the remaining iterator functionality</a>
-      </h4>
+      </h5>
 <p>
-<<<<<<< .working
-        Ok, now we have seen the way value_of and deref work, everything else will
+        Ok, now we have seen the way <a class="link" href="../iterator/metafunctions/value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a> and <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a> work, everything else will
         work in pretty much the same way. Lets start with forward iteration, by providing
-        a <tt class="computeroutput"><span class="identifier">next_impl</span></tt>:
-=======
-        Ok, now we have seen the way __value<span class="underline">of</span>_
-        and <a class="link" href="../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a>
-        work, everything else will work in pretty much the same way. Lets start with
-        forward iteration, by providing a <code class="computeroutput"><span class="identifier">next_impl</span></code>:
->>>>>>> .merge-right.r57242
+        a <code class="computeroutput"><span class="identifier">next_impl</span></code>:
       </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">next_impl</span><span class="special">&lt;</span><span class="identifier">example</span><span class="special">::</span><span class="identifier">example_struct_iterator_tag</span><span class="special">&gt;</span>
@@ -429,46 +350,37 @@
 <span class="special">};</span>
 </pre>
 <p>
-        This should be very familiar from our <tt class="computeroutput"><span class="identifier">deref_impl</span></tt>
+        This should be very familiar from our <code class="computeroutput"><span class="identifier">deref_impl</span></code>
         implementation, we will be using this approach again and again now. Our design
-        is simply to increment the <tt class="computeroutput"><span class="identifier">index</span></tt>
+        is simply to increment the <code class="computeroutput"><span class="identifier">index</span></code>
         counter to move on to the next element. The various other iterator manipulations
-        we need to perform will all just involve simple calculations with the <tt class="computeroutput"><span class="identifier">index</span></tt> variables.
+        we need to perform will all just involve simple calculations with the <code class="computeroutput"><span class="identifier">index</span></code> variables.
       </p>
 <p>
-        We also need to provide a suitable <tt class="computeroutput"><span class="identifier">equal_to_impl</span></tt>
-        so that iterators can be correctly compared. A <a href="../iterator/concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
-        Iterator</a> will also need an implementation of <tt class="computeroutput"><span class="identifier">prior_impl</span></tt>.
-        For a <a href="../iterator/concepts/random_access_iterator.html" title="Random
-        Access Iterator">Random
-        Access Iterator</a> <tt class="computeroutput"><span class="identifier">distance_impl</span></tt>
-        and <tt class="computeroutput"><span class="identifier">advance_impl</span></tt> also need
+        We also need to provide a suitable <code class="computeroutput"><span class="identifier">equal_to_impl</span></code>
+        so that iterators can be correctly compared. A <a class="link" href="../iterator/concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+        Iterator</a> will also need an implementation of <code class="computeroutput"><span class="identifier">prior_impl</span></code>.
+        For a <a class="link" href="../iterator/concepts/random_access_iterator.html" title="Random Access Iterator">Random
+        Access Iterator</a> <code class="computeroutput"><span class="identifier">distance_impl</span></code>
+        and <code class="computeroutput"><span class="identifier">advance_impl</span></code> also need
         to be provided in order to satisfy the necessary complexity guarantees. As
-        our iterator is a <a href="../iterator/concepts/random_access_iterator.html" title="Random
-        Access Iterator">Random
+        our iterator is a <a class="link" href="../iterator/concepts/random_access_iterator.html" title="Random Access Iterator">Random
         Access Iterator</a> we will have to implement all of these functions.
       </p>
 <p>
-        Full implementations of <tt class="computeroutput"><span class="identifier">prior_impl</span></tt>,
-        <tt class="computeroutput"><span class="identifier">advance_impl</span></tt>, <tt class="computeroutput"><span class="identifier">distance_impl</span></tt> and <tt class="computeroutput"><span class="identifier">equal_to_impl</span></tt>
+        Full implementations of <code class="computeroutput"><span class="identifier">prior_impl</span></code>,
+        <code class="computeroutput"><span class="identifier">advance_impl</span></code>, <code class="computeroutput"><span class="identifier">distance_impl</span></code> and <code class="computeroutput"><span class="identifier">equal_to_impl</span></code>
         are provided in the example code.
       </p>
-<<<<<<< .working
-<a name="fusion.extension.ext_full.implementing_the_intrinsic_functions_of_the_sequence"></a><h4>
-<a name="id603878"></a>
-        <a href="ext_full.html#fusion.extension.ext_full.implementing_the_intrinsic_functions_of_the_sequence">Implementing
-=======
 <a name="fusion.extension.ext_full.implementing_the_intrinsic_functions_of_the_sequence"></a><h5>
-<a name="id834467"></a>
+<a name="id813359"></a>
         <a class="link" href="ext_full.html#fusion.extension.ext_full.implementing_the_intrinsic_functions_of_the_sequence">Implementing
->>>>>>> .merge-right.r57125
         the intrinsic functions of the sequence</a>
-      </h4>
+      </h5>
 <p>
         In order that Fusion can correctly identify our sequence as a Fusion sequence,
-        we need to enable <tt class="computeroutput"><span class="identifier">is_sequence</span></tt>
-        for our sequence type. As usual we just create an <tt class="computeroutput"><span class="identifier">impl</span></tt>
+        we need to enable <code class="computeroutput"><span class="identifier">is_sequence</span></code>
+        for our sequence type. As usual we just create an <code class="computeroutput"><span class="identifier">impl</span></code>
         type specialized for our sequence tag:
       </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;&gt;</span>
@@ -479,14 +391,14 @@
 <span class="special">};</span>
 </pre>
 <p>
-        We've some similar formalities to complete, providing <tt class="computeroutput"><span class="identifier">category_of_impl</span></tt>
-        so Fusion can correctly identify our sequence type, and <tt class="computeroutput"><span class="identifier">is_view_impl</span></tt>
-        so Fusion can correctly identify our sequence as not being a View
+        We've some similar formalities to complete, providing <code class="computeroutput"><span class="identifier">category_of_impl</span></code>
+        so Fusion can correctly identify our sequence type, and <code class="computeroutput"><span class="identifier">is_view_impl</span></code>
+        so Fusion can correctly identify our sequence as not being a <a class="link" href="../view.html" title="View">View</a>
         type. Implementations are provide in the example code.
       </p>
 <p>
         Now we've completed some formalities, on to more interesting features. Lets
-        get begin working so that we can get
+        get <a class="link" href="../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a> working so that we can get
         an iterator to start accessing the data in our sequence.
       </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;&gt;</span>
@@ -508,39 +420,31 @@
 <p>
         The implementation uses the same ideas we have applied throughout, in this
         case we are just creating one of the iterators we developed earlier, pointing
-        to the first element in the sequence. The implementation of end is very similar, and is provided
+        to the first element in the sequence. The implementation of <a class="link" href="../sequence/intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a> is very similar, and is provided
         in the example code.
       </p>
 <p>
-        For our <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-        Access Sequence</a> we will also need to implement <tt class="computeroutput"><span class="identifier">size_impl</span></tt>,
-        <tt class="computeroutput"><span class="identifier">value_at_impl</span></tt> and <tt class="computeroutput"><span class="identifier">at_impl</span></tt>.
-      </p>
-<<<<<<< .working
-<a name="fusion.extension.ext_full.enabling_our_type_as_an_associative_container"></a><h4>
-<a name="id604481"></a>
-        <a href="ext_full.html#fusion.extension.ext_full.enabling_our_type_as_an_associative_container">Enabling
-=======
-<a name="fusion.extension.ext_full.enabling_our_type_as_an_associative_container"></a><h5>
-<a name="id834878"></a>
-        <a class="link" href="ext_full.html#fusion.extension.ext_full.enabling_our_type_as_an_associative_container">Enabling
->>>>>>> .merge-right.r57125
-        our type as an associative container</a>
-      </h4>
-<p>
-        In order for <tt class="computeroutput"><span class="identifier">example_struct</span></tt>
-        to serve as an associative container, we need to enable 3 lookup features,
-        at_key, value_at_key and has_key. We also need to provide
-        an implementation of the <tt class="computeroutput"><span class="identifier">is_associative</span></tt>
-        trait so that our sequence can be correctly identified as an associative
-        container.
-      </p>
-<p>
-        To implement <tt class="computeroutput"><span class="identifier">at_key_impl</span></tt>
-        we need to associate the <tt class="computeroutput"><span class="identifier">fields</span><span class="special">::</span><span class="identifier">age</span></tt> and
-        <tt class="computeroutput"><span class="identifier">fields</span><span class="special">::</span><span class="identifier">age</span></tt> types described in the <a href="../quick_start.html" title="Quick Start">Quick
-        Start</a> guide with the appropriate members of <tt class="computeroutput"><span class="identifier">example_struct</span></tt>.
+        For our <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+        Access Sequence</a> we will also need to implement <code class="computeroutput"><span class="identifier">size_impl</span></code>,
+        <code class="computeroutput"><span class="identifier">value_at_impl</span></code> and <code class="computeroutput"><span class="identifier">at_impl</span></code>.
+      </p>
+<a name="fusion.extension.ext_full.enabling_our_type_as_an_associative_sequence"></a><h5>
+<a name="id813771"></a>
+        <a class="link" href="ext_full.html#fusion.extension.ext_full.enabling_our_type_as_an_associative_sequence">Enabling
+        our type as an associative sequence</a>
+      </h5>
+<p>
+        In order for <code class="computeroutput"><span class="identifier">example_struct</span></code>
+        to serve as an associative forward sequence, we need to adapt the traversal
+        category of our sequence and our iterator accordingly and enable 3 intrinsic
+        sequence lookup features, <a class="link" href="../sequence/intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a>, <a class="link" href="../sequence/intrinsic/metafunctions/value_at_key.html" title="value_at_key"><code class="computeroutput"><span class="identifier">value_at_key</span></code></a> and <a class="link" href="../sequence/intrinsic/functions/has_key.html" title="has_key"><code class="computeroutput"><span class="identifier">has_key</span></code></a>. We also need to enable
+        3 iterator lookup features, <a class="link" href="../iterator/metafunctions/key_of.html" title="key_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">key_of</span></code></a>, <a class="link" href="../iterator/metafunctions/value_of_data.html" title="value_of_data"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of_data</span></code></a> and <a class="link" href="../iterator/functions/deref_data.html" title="deref_data"><code class="computeroutput"><span class="identifier">deref_data</span></code></a>.
+      </p>
+<p>
+        To implement <code class="computeroutput"><span class="identifier">at_key_impl</span></code>
+        we need to associate the <code class="computeroutput"><span class="identifier">fields</span><span class="special">::</span><span class="identifier">name</span></code>
+        and <code class="computeroutput"><span class="identifier">fields</span><span class="special">::</span><span class="identifier">age</span></code> types described in the <a class="link" href="../quick_start.html" title="Quick Start">Quick
+        Start</a> guide with the appropriate members of <code class="computeroutput"><span class="identifier">example_struct</span></code>.
         Our implementation is as follows:
       </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;&gt;</span>
@@ -582,34 +486,25 @@
 </pre>
 <p>
         Its all very similar to the implementations we've seen previously, such as
-        <tt class="computeroutput"><span class="identifier">deref_impl</span></tt> and <tt class="computeroutput"><span class="identifier">value_of_impl</span></tt>. Instead of identifying the
+        <code class="computeroutput"><span class="identifier">deref_impl</span></code> and <code class="computeroutput"><span class="identifier">value_of_impl</span></code>. Instead of identifying the
         members by index or position, we are now selecting them using the types
-        <tt class="computeroutput"><span class="identifier">fields</span><span class="special">::</span><span class="identifier">name</span></tt> and <tt class="computeroutput"><span class="identifier">fields</span><span class="special">::</span><span class="identifier">age</span></tt>.
-        The implementations of <tt class="computeroutput"><span class="identifier">value_at_key_impl</span></tt>
-        and <tt class="computeroutput"><span class="identifier">has_key_impl</span></tt> are equally
-        straightforward, and are provided in the example code, along with an implementation
-        of <tt class="computeroutput"><span class="identifier">is_associative_impl</span></tt>.
-      </p>
-<<<<<<< .working
-<a name="fusion.extension.ext_full.summary"></a><h4>
-<a name="id605488"></a>
-        Summary
-      </h4>
-=======
+        <code class="computeroutput"><span class="identifier">fields</span><span class="special">::</span><span class="identifier">name</span></code> and <code class="computeroutput"><span class="identifier">fields</span><span class="special">::</span><span class="identifier">age</span></code>.
+        The implementations of the other functions are equally straightforward, and
+        are provided in the example code.
+      </p>
 <a name="fusion.extension.ext_full.summary"></a><h5>
-<a name="id836875"></a>
+<a name="id815714"></a>
         <a class="link" href="ext_full.html#fusion.extension.ext_full.summary">Summary</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         We've now worked through the entire process for adding a new random access
-        sequence and we've also enabled our type to serve as an associative container.
+        sequence and we've also enabled our type to serve as an associative sequence.
         The implementation was slightly longwinded, but followed a simple repeating
         pattern.
       </p>
 <p>
-        The support for <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>, MPL
-        sequences, and <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></tt> all use the same approach, and provide
+        The support for <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code>, MPL
+        sequences, and <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code> all use the same approach, and provide
         additional examples of the approach for a variety of types.
       </p>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/extension/iterator_facade.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/extension/iterator_facade.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/extension/iterator_facade.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Iterator Facade</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../extension.html" title="Extension">
-<link rel="previous" href="sequence_facade.html" title="Sequence Facade">
+<link rel="prev" href="sequence_facade.html" title="Sequence Facade">
 <link rel="next" href="../functional.html" title="Functional">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,58 +22,30 @@
 <div class="spirit-nav">
 <a accesskey="p" href="sequence_facade.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../extension.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../functional.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.extension.iterator_facade"></a>Iterator Facade
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.extension.iterator_facade.description"></a><h4>
-<a name="id607099"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="Iterator Facade">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.extension.iterator_facade"></a><a class="link" href="iterator_facade.html" title="Iterator Facade">Iterator Facade</a>
 </h3></div></div></div>
 <a name="fusion.extension.iterator_facade.description"></a><h5>
-<a name="id823411"></a>
+<a name="id816858"></a>
         <a class="link" href="iterator_facade.html#fusion.extension.iterator_facade.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        The iterator_facade
+        The <a class="link" href="iterator_facade.html" title="Iterator Facade"><code class="computeroutput"><span class="identifier">iterator_facade</span></code></a>
         template provides an intrusive mechanism for producing a conforming Fusion
         iterator.
       </p>
-<<<<<<< .working
-<a name="fusion.extension.iterator_facade.synopsis"></a><h4>
-<a name="id607146"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.extension.iterator_facade.synopsis"></a><h5>
-<a name="id823438"></a>
+<a name="id816884"></a>
         <a class="link" href="iterator_facade.html#fusion.extension.iterator_facade.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Derived</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">TravesalTag</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">iterator_facade</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.extension.iterator_facade.usage"></a><h4>
-<a name="id607239"></a>
-        Usage
-      </h4>
-=======
 <a name="fusion.extension.iterator_facade.usage"></a><h5>
-<a name="id823501"></a>
+<a name="id816948"></a>
         <a class="link" href="iterator_facade.html#fusion.extension.iterator_facade.usage">Usage</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         The user of iterator_facade derives his iterator type from a specialization
         of iterator_facade and passes the derived iterator type as the first template
@@ -93,244 +57,309 @@
         type.
       </p>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id607264"></a><p class="title"><b>Table 1.93. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id858314"></a><p class="title"><b>Table 1.93. Parameters</b></p>
-=======
-<a name="id821953"></a><p class="title"><b>Table 1.97. Parameters</b></p>
-=======
-<a name="id814329"></a><p class="title"><b>Table 1.97. Parameters</b></p>
-=======
-<a name="id838126"></a><p class="title"><b>Table&#160;1.97.&#160;Parameters</b></p>
-=======
-<a name="id826795"></a><p class="title"><b>Table&#160;1.97.&#160;Parameters</b></p>
-=======
-<a name="id823518"></a><p class="title"><b>Table&#160;1.97.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id816965"></a><p class="title"><b>Table&#160;1.97.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+            <p>
               Name
-            </p></th>
-<th><p>
+            </p>
+            </th>
+<th>
+            <p>
               Description
-            </p></th>
+            </p>
+            </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span></tt>, <tt class="computeroutput"><span class="identifier">It</span></tt>, <tt class="computeroutput"><span class="identifier">It1</span></tt>,
-              <tt class="computeroutput"><span class="identifier">It2</span></tt>
-            </p></td>
-<td><p>
-              A type derived from iterator_facade
-            </p></td>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span></code>, <code class="computeroutput"><span class="identifier">It</span></code>, <code class="computeroutput"><span class="identifier">It1</span></code>,
+              <code class="computeroutput"><span class="identifier">It2</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              A type derived from <a class="link" href="iterator_facade.html" title="Iterator Facade"><code class="computeroutput"><span class="identifier">iterator_facade</span></code></a>
+            </p>
+            </td>
 </tr>
 <tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">N</span></tt>
-            </p></td>
-<td><p>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">N</span></code>
+            </p>
+            </td>
+<td>
+            <p>
               An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
               Integral Constant</a>
-            </p></td>
+            </p>
+            </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<div class="table">
-<a name="id607422"></a><p class="title"><b>Table 1.94. Key Expressions</b></p>
-<table class="table" summary="Key Expressions">
-=======
 <br class="table-break"><div class="table">
-<a name="id823639"></a><p class="title"><b>Table&#160;1.98.&#160;Key Expressions</b></p>
+<a name="id817086"></a><p class="title"><b>Table&#160;1.98.&#160;Key Expressions</b></p>
 <div class="table-contents"><table class="table" summary="Key Expressions">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+            <p>
               Expression
-            </p></th>
-<th><p>
+            </p>
+            </th>
+<th>
+            <p>
               Result
-            </p></th>
-<th><p>
+            </p>
+            </th>
+<th>
+            <p>
               Default
-            </p></th>
+            </p>
+            </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">value_of</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The element stored at iterator position <tt class="computeroutput"><span class="identifier">It</span></tt>
-            </p></td>
-<td><p>
-              None
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">deref</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The type returned when dereferencing an iterator of type <tt class="computeroutput"><span class="identifier">It</span></tt>
-            </p></td>
-<td><p>
-              None
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">deref</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it</span><span class="special">)</span></tt>
-            </p></td>
-<td><p>
-              Dereferences iterator <tt class="computeroutput"><span class="identifier">it</span></tt>
-            </p></td>
-<td><p>
-              None
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">next</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The type of the next element from <tt class="computeroutput"><span class="identifier">It</span></tt>
-            </p></td>
-<td><p>
-              None
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">next</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it</span><span class="special">)</span></tt>
-            </p></td>
-<td><p>
-              The next iterator after <tt class="computeroutput"><span class="identifier">it</span></tt>
-            </p></td>
-<td><p>
-              None
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">prior</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The type of the next element from <tt class="computeroutput"><span class="identifier">It</span></tt>
-            </p></td>
-<td><p>
-              None
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">prior</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it</span><span class="special">)</span></tt>
-            </p></td>
-<td><p>
-              The next iterator after <tt class="computeroutput"><span class="identifier">it</span></tt>
-            </p></td>
-<td><p>
-              None
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">advance</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The type of an iterator advanced <tt class="computeroutput"><span class="identifier">N</span></tt>
-              elements from <tt class="computeroutput"><span class="identifier">It</span></tt>
-            </p></td>
-<td><p>
-              Implemented in terms of <tt class="computeroutput"><span class="identifier">next</span></tt>
-              and <tt class="computeroutput"><span class="identifier">prior</span></tt>
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">advance</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it</span><span class="special">)</span></tt>
-            </p></td>
-<td><p>
-              An iterator advanced <tt class="computeroutput"><span class="identifier">N</span></tt>
-              elements from <tt class="computeroutput"><span class="identifier">it</span></tt>
-            </p></td>
-<td><p>
-              Implemented in terms of <tt class="computeroutput"><span class="identifier">next</span></tt>
-              and <tt class="computeroutput"><span class="identifier">prior</span></tt>
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">distance</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The distance between iterators of type <tt class="computeroutput"><span class="identifier">It1</span></tt>
-              and <tt class="computeroutput"><span class="identifier">It2</span></tt> as an <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">value_of</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The element stored at iterator position <code class="computeroutput"><span class="identifier">It</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              None
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">deref</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The type returned when dereferencing an iterator of type <code class="computeroutput"><span class="identifier">It</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              None
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">deref</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it</span><span class="special">)</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              Dereferences iterator <code class="computeroutput"><span class="identifier">it</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              None
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">next</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The type of the next element from <code class="computeroutput"><span class="identifier">It</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              None
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">next</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it</span><span class="special">)</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The next iterator after <code class="computeroutput"><span class="identifier">it</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              None
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">prior</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The type of the next element from <code class="computeroutput"><span class="identifier">It</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              None
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">prior</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it</span><span class="special">)</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The next iterator after <code class="computeroutput"><span class="identifier">it</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              None
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">advance</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The type of an iterator advanced <code class="computeroutput"><span class="identifier">N</span></code>
+              elements from <code class="computeroutput"><span class="identifier">It</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              Implemented in terms of <code class="computeroutput"><span class="identifier">next</span></code>
+              and <code class="computeroutput"><span class="identifier">prior</span></code>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">advance</span><span class="special">&lt;</span><span class="identifier">It</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it</span><span class="special">)</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              An iterator advanced <code class="computeroutput"><span class="identifier">N</span></code>
+              elements from <code class="computeroutput"><span class="identifier">it</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              Implemented in terms of <code class="computeroutput"><span class="identifier">next</span></code>
+              and <code class="computeroutput"><span class="identifier">prior</span></code>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">distance</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The distance between iterators of type <code class="computeroutput"><span class="identifier">It1</span></code>
+              and <code class="computeroutput"><span class="identifier">It2</span></code> as an <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
               Integral Constant</a>
-            </p></td>
-<td><p>
+            </p>
+            </td>
+<td>
+            <p>
               None
-            </p></td>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">distance</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it1</span><span class="special">,</span> <span class="identifier">it2</span><span class="special">)</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The distance between iterator <code class="computeroutput"><span class="identifier">it1</span></code>
+              and <code class="computeroutput"><span class="identifier">it2</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              None
+            </p>
+            </td>
 </tr>
 <tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">distance</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it1</span><span class="special">,</span> <span class="identifier">it2</span><span class="special">)</span></tt>
-            </p></td>
-<td><p>
-              The distance between iterator <tt class="computeroutput"><span class="identifier">it1</span></tt>
-              and <tt class="computeroutput"><span class="identifier">it2</span></tt>
-            </p></td>
-<td><p>
-              None
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">equal_to</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The distance between iterators of type <tt class="computeroutput"><span class="identifier">It1</span></tt>
-              and <tt class="computeroutput"><span class="identifier">It2</span></tt>
-            </p></td>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">same_type</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">equal_to</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it1</span><span class="special">,</span> <span class="identifier">it2</span><span class="special">)</span></tt>
-            </p></td>
-<td><p>
-              The distance between iterators <tt class="computeroutput"><span class="identifier">it1</span></tt>
-              and <tt class="computeroutput"><span class="identifier">it2</span></tt>
-            </p></td>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">same_type</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">()</span></tt>
-            </p></td>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">equal_to</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The distance between iterators of type <code class="computeroutput"><span class="identifier">It1</span></code>
+              and <code class="computeroutput"><span class="identifier">It2</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">same_type</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">iterator</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">equal_to</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">it1</span><span class="special">,</span> <span class="identifier">it2</span><span class="special">)</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The distance between iterators <code class="computeroutput"><span class="identifier">it1</span></code>
+              and <code class="computeroutput"><span class="identifier">it2</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">same_type</span><span class="special">&lt;</span><span class="identifier">It1</span><span class="special">,</span> <span class="identifier">It2</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">()</span></code>
+            </p>
+            </td>
 </tr>
 <tr>
 <td>
@@ -403,35 +432,21 @@
             </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.extension.iterator_facade.header"></a><h4>
-<a name="id608981"></a>
-        Header
-      </h4>
-=======
 <br class="table-break"><a name="fusion.extension.iterator_facade.header"></a><h5>
-<a name="id825613"></a>
+<a name="id819059"></a>
         <a class="link" href="iterator_facade.html#fusion.extension.iterator_facade.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">iterator_facade</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">iterator_facade</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.extension.iterator_facade.example"></a><h4>
-<a name="id609138"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.extension.iterator_facade.example"></a><h5>
-<a name="id825721"></a>
+<a name="id819167"></a>
         <a class="link" href="iterator_facade.html#fusion.extension.iterator_facade.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        A full working example using iterator_facade is provided in triple.cpp
+        A full working example using <a class="link" href="iterator_facade.html" title="Iterator Facade"><code class="computeroutput"><span class="identifier">iterator_facade</span></code></a> is provided in triple.cpp
         in the extension examples.
       </p>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/extension/sequence_facade.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/extension/sequence_facade.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/extension/sequence_facade.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Sequence Facade</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../extension.html" title="Extension">
-<link rel="previous" href="ext_full.html" title=" The Full Extension Mechanism">
+<link rel="prev" href="ext_full.html" title="The Full Extension Mechanism">
 <link rel="next" href="iterator_facade.html" title="Iterator Facade">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,64 +22,36 @@
 <div class="spirit-nav">
 <a accesskey="p" href="ext_full.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../extension.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="iterator_facade.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.extension.sequence_facade"></a>Sequence Facade
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.extension.sequence_facade.description"></a><h4>
-<a name="id605596"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="Sequence Facade">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.extension.sequence_facade"></a><a class="link" href="sequence_facade.html" title="Sequence Facade">Sequence Facade</a>
 </h3></div></div></div>
 <a name="fusion.extension.sequence_facade.description"></a><h5>
-<a name="id822333"></a>
+<a name="id815779"></a>
         <a class="link" href="sequence_facade.html#fusion.extension.sequence_facade.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        The sequence_facade
+        The <a class="link" href="sequence_facade.html" title="Sequence Facade"><code class="computeroutput"><span class="identifier">sequence_facade</span></code></a>
         template provides an intrusive mechanism for producing a conforming Fusion
         iterator.
       </p>
-<<<<<<< .working
-<a name="fusion.extension.sequence_facade.synopsis"></a><h4>
-<a name="id605644"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.extension.sequence_facade.synopsis"></a><h5>
-<a name="id822359"></a>
+<a name="id815805"></a>
         <a class="link" href="sequence_facade.html#fusion.extension.sequence_facade.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Derived</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">TravesalTag</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">IsView</span> <span class="special">=</span> <span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">sequence_facade</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.extension.sequence_facade.usage"></a><h4>
-<a name="id605777"></a>
-        Usage
-      </h4>
-=======
 <a name="fusion.extension.sequence_facade.usage"></a><h5>
-<a name="id822453"></a>
+<a name="id815899"></a>
         <a class="link" href="sequence_facade.html#fusion.extension.sequence_facade.usage">Usage</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        The user of sequence_facade derives his sequence
-        type from a specialization of sequence_facade and passes the derived
+        The user of <a class="link" href="sequence_facade.html" title="Sequence Facade"><code class="computeroutput"><span class="identifier">sequence_facade</span></code></a> derives his sequence
+        type from a specialization of <a class="link" href="sequence_facade.html" title="Sequence Facade"><code class="computeroutput"><span class="identifier">sequence_facade</span></code></a> and passes the derived
         sequence type as the first template parameter. The second template parameter
         should be the traversal category of the sequence being implemented. The 3rd
-        parameter should be set to <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>
+        parameter should be set to <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>
         if the sequence is a view.
       </p>
 <p>
@@ -95,195 +59,202 @@
         type.
       </p>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id605864"></a><p class="title"><b>Table 1.91. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id857300"></a><p class="title"><b>Table 1.91. Parameters</b></p>
-=======
-<a name="id820939"></a><p class="title"><b>Table 1.95. Parameters</b></p>
-=======
-<a name="id813315"></a><p class="title"><b>Table 1.95. Parameters</b></p>
-=======
-<a name="id837112"></a><p class="title"><b>Table&#160;1.95.&#160;Parameters</b></p>
-=======
-<a name="id825781"></a><p class="title"><b>Table&#160;1.95.&#160;Parameters</b></p>
-=======
-<a name="id822504"></a><p class="title"><b>Table&#160;1.95.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id815951"></a><p class="title"><b>Table&#160;1.95.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+            <p>
               Name
-            </p></th>
-<th><p>
+            </p>
+            </th>
+<th>
+            <p>
               Description
-            </p></th>
+            </p>
+            </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">sequence</span></tt>, <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-            </p></td>
-<td><p>
-              A type derived from sequence_facade
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">N</span></tt>
-            </p></td>
-<td><p>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">sequence</span></code>, <code class="computeroutput"><span class="identifier">Seq</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              A type derived from <a class="link" href="sequence_facade.html" title="Sequence Facade"><code class="computeroutput"><span class="identifier">sequence_facade</span></code></a>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">N</span></code>
+            </p>
+            </td>
+<td>
+            <p>
               An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
               Integral Constant</a>
-            </p></td>
+            </p>
+            </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<div class="table">
-<a name="id605998"></a><p class="title"><b>Table 1.92. Key Expressions</b></p>
-<table class="table" summary="Key Expressions">
-=======
 <br class="table-break"><div class="table">
-<a name="id822611"></a><p class="title"><b>Table&#160;1.96.&#160;Key Expressions</b></p>
+<a name="id816057"></a><p class="title"><b>Table&#160;1.96.&#160;Key Expressions</b></p>
 <div class="table-contents"><table class="table" summary="Key Expressions">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+            <p>
               Expression
-            </p></th>
-<th><p>
+            </p>
+            </th>
+<th>
+            <p>
               Result
-            </p></th>
+            </p>
+            </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">begin</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The type of an iterator to the beginning of a sequence of type <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">begin</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></tt>
-            </p></td>
-<td><p>
-              An iterator to the beginning of sequence <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">end</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The type of an iterator to the end of a sequence of type <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">end</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></tt>
-            </p></td>
-<td><p>
-              An iterator to the end of sequence <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">size</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The size of a sequence of type <tt class="computeroutput"><span class="identifier">Seq</span></tt>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">begin</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The type of an iterator to the beginning of a sequence of type <code class="computeroutput"><span class="identifier">Seq</span></code>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">begin</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              An iterator to the beginning of sequence <code class="computeroutput"><span class="identifier">seq</span></code>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">end</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The type of an iterator to the end of a sequence of type <code class="computeroutput"><span class="identifier">Seq</span></code>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">end</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              An iterator to the end of sequence <code class="computeroutput"><span class="identifier">seq</span></code>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">size</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The size of a sequence of type <code class="computeroutput"><span class="identifier">Seq</span></code>
               as an <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
               Integral Constant</a>
-            </p></td>
+            </p>
+            </td>
 </tr>
 <tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">size</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></tt>
-            </p></td>
-<td><p>
-              The size of sequence <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">at</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The type of element <tt class="computeroutput"><span class="identifier">N</span></tt>
-              in a sequence of type <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">at</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></tt>
-            </p></td>
-<td><p>
-              Element <tt class="computeroutput"><span class="identifier">N</span></tt> in sequence
-              <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            </p></td>
-</tr>
-<tr>
-<td><p>
-              <tt class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">value_at</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-            </p></td>
-<td><p>
-              The type of the <tt class="computeroutput"><span class="identifier">N</span></tt>th
-              element in a sequence of type <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-            </p></td>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">size</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The size of sequence <code class="computeroutput"><span class="identifier">seq</span></code>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">at</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The type of element <code class="computeroutput"><span class="identifier">N</span></code>
+              in a sequence of type <code class="computeroutput"><span class="identifier">Seq</span></code>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">at</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">call</span><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              Element <code class="computeroutput"><span class="identifier">N</span></code> in sequence
+              <code class="computeroutput"><span class="identifier">seq</span></code>
+            </p>
+            </td>
+</tr>
+<tr>
+<td>
+            <p>
+              <code class="computeroutput"><span class="identifier">sequence</span><span class="special">::</span><span class="keyword">template</span> <span class="identifier">value_at</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+            </p>
+            </td>
+<td>
+            <p>
+              The type of the <code class="computeroutput"><span class="identifier">N</span></code>th
+              element in a sequence of type <code class="computeroutput"><span class="identifier">Seq</span></code>
+            </p>
+            </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.extension.sequence_facade.include"></a><h4>
-<a name="id606877"></a>
-        Include
-      </h4>
-=======
 <br class="table-break"><a name="fusion.extension.sequence_facade.include"></a><h5>
-<a name="id823266"></a>
+<a name="id816713"></a>
         <a class="link" href="sequence_facade.html#fusion.extension.sequence_facade.include">Include</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">sequence_facade</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">sequence_facade</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.extension.sequence_facade.example"></a><h4>
-<a name="id607033"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.extension.sequence_facade.example"></a><h5>
-<a name="id823374"></a>
+<a name="id816821"></a>
         <a class="link" href="sequence_facade.html#fusion.extension.sequence_facade.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        A full working example using sequence_facade is provided in triple.cpp
+        A full working example using <a class="link" href="sequence_facade.html" title="Sequence Facade"><code class="computeroutput"><span class="identifier">sequence_facade</span></code></a> is provided in triple.cpp
         in the extension examples.
       </p>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/functional.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Functional</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="extension/iterator_facade.html" title="Iterator Facade">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="extension/iterator_facade.html" title="Iterator Facade">
 <link rel="next" href="functional/concepts.html" title="Concepts">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="extension/iterator_facade.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="functional/concepts.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.functional"></a>Functional
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Functional">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.functional"></a><a class="link" href="functional.html" title="Functional">Functional</a>
+</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Concepts</span></dt>
 <dd><dl>
@@ -69,30 +62,17 @@
       Components to call functions and function objects and to make Fusion code callable
       through a function object interface.
     </p>
-<<<<<<< .working
-<a name="fusion.functional.header"></a><h3>
-<a name="id609210"></a>
-      Header
-    </h3>
-=======
 <a name="fusion.functional.header"></a><h4>
-<a name="id816312"></a>
+<a name="id819209"></a>
       <a class="link" href="functional.html#fusion.functional.header">Header</a>
     </h4>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.fused_and_unfused_forms"></a><h3>
-<a name="id609292"></a>
-      <a href="functional.html#fusion.functional.fused_and_unfused_forms">Fused and unfused
-=======
 <a name="fusion.functional.fused_and_unfused_forms"></a><h4>
-<a name="id816367"></a>
+<a name="id819264"></a>
       <a class="link" href="functional.html#fusion.functional.fused_and_unfused_forms">Fused and unfused
->>>>>>> .merge-right.r57125
       forms</a>
-    </h3>
+    </h4>
 <p>
       What is a function call?
     </p>
@@ -102,37 +82,31 @@
       It is a name and a tuple written next to each other, left-to-right.
     </p>
 <p>
-      Although the C++ syntax does not allow to replace <tt class="literal">(a,b,c)</tt>
-      with some Fusion Sequence, introducing
+      Although the C++ syntax does not allow to replace <code class="literal">(a,b,c)</code>
+      with some Fusion <a class="link" href="sequence.html" title="Sequence">Sequence</a>, introducing
       yet another function provides a solution:
     </p>
 <pre class="programlisting"><span class="identifier">invoke</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span><span class="identifier">my_sequence</span><span class="special">)</span>
 </pre>
 <p>
-      Alternatively it is possible to apply a simple transformation to <tt class="literal">f</tt>
+      Alternatively it is possible to apply a simple transformation to <code class="literal">f</code>
       in order to achieve the same effect:
     </p>
 <pre class="programlisting"><span class="identifier">f</span> <span class="identifier">tuple</span> <span class="special">&lt;=&gt;</span> f' <span class="special">(</span><span class="identifier">tuple</span><span class="special">)</span>
 </pre>
 <p>
-      Now, <tt class="literal">f'</tt> is an unary function that takes the arguments to
-      <tt class="computeroutput"><span class="identifier">f</span></tt> as a tuple; <tt class="literal">f'</tt>
-      is the <span class="emphasis"><em>fused</em></span> form of <tt class="computeroutput"><span class="identifier">f</span></tt>.
+      Now, <code class="literal">f'</code> is an unary function that takes the arguments to
+      <code class="computeroutput"><span class="identifier">f</span></code> as a tuple; <code class="literal">f'</code>
+      is the <span class="emphasis"><em>fused</em></span> form of <code class="computeroutput"><span class="identifier">f</span></code>.
       Reading the above equivalence right-to-left to get the inverse transformation,
-      <tt class="computeroutput"><span class="identifier">f</span></tt> is the <span class="emphasis"><em>unfused</em></span>
-      form of <tt class="literal">f'</tt>.
+      <code class="computeroutput"><span class="identifier">f</span></code> is the <span class="emphasis"><em>unfused</em></span>
+      form of <code class="literal">f'</code>.
     </p>
-<<<<<<< .working
-<a name="fusion.functional.calling_functions_and_function_objects"></a><h3>
-<a name="id609552"></a>
-      <a href="functional.html#fusion.functional.calling_functions_and_function_objects">Calling
-=======
 <a name="fusion.functional.calling_functions_and_function_objects"></a><h4>
-<a name="id816552"></a>
+<a name="id819449"></a>
       <a class="link" href="functional.html#fusion.functional.calling_functions_and_function_objects">Calling
->>>>>>> .merge-right.r57125
       functions and function objects</a>
-    </h3>
+    </h4>
 <p>
       Having generic C++ code call back arbitrary functions provided by the client
       used to be a heavily repetitive task, as different functions can differ in
@@ -145,9 +119,8 @@
     </p>
 <p>
       Transforming an unfused function into its fused counterpart allows n-ary calls
-      from an algorithm that invokes an unary <a href="functional/concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-      Function Object</a> with Sequence
+      from an algorithm that invokes an unary <a class="link" href="functional/concepts/poly.html" title="Polymorphic Function Object">Polymorphic
+      Function Object</a> with <a class="link" href="sequence.html" title="Sequence">Sequence</a>
       arguments.
     </p>
 <p>
@@ -159,17 +132,11 @@
 <p>
       Constructors can be called applying Boost.Functional/Factory.
     </p>
-<<<<<<< .working
-<a name="fusion.functional.making_fusion_code_callable_through_a_function_object_interface"></a><h3>
-<a name="id609639"></a>
-      <a href="functional.html#fusion.functional.making_fusion_code_callable_through_a_function_object_interface">Making
-=======
 <a name="fusion.functional.making_fusion_code_callable_through_a_function_object_interface"></a><h4>
-<a name="id816596"></a>
+<a name="id819494"></a>
       <a class="link" href="functional.html#fusion.functional.making_fusion_code_callable_through_a_function_object_interface">Making
->>>>>>> .merge-right.r57125
       Fusion code callable through a function object interface</a>
-    </h3>
+    </h4>
 <p>
       Transforming a fused function into its unfused counterpart allows to create
       function objects to accept arbitrary calls. In other words, an unary function
@@ -189,7 +156,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Adapters</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Adapters</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../functional.html" title="Functional">
-<link rel="previous" href="invocation/limits.html" title="Limits">
+<link rel="prev" href="invocation/limits.html" title="Limits">
 <link rel="next" href="adapters/fused.html" title="fused">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="invocation/limits.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functional.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="adapters/fused.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.functional.adapters"></a> Adapters
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Adapters">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.functional.adapters"></a><a class="link" href="adapters.html" title="Adapters"> Adapters</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">fused</span></dt>
 <dt><span class="section">fused_procedure</span></dt>
@@ -47,7 +40,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>fused</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../adapters.html" title=" Adapters">
-<link rel="previous" href="../adapters.html" title=" Adapters">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../adapters.html" title="Adapters">
+<link rel="prev" href="../adapters.html" title="Adapters">
 <link rel="next" href="fused_procedure.html" title="fused_procedure">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,92 +22,55 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../adapters.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="fused_procedure.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.adapters.fused"></a>fused
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.adapters.fused.description"></a><h5>
-<a name="id617699"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="fused">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.functional.adapters.fused"></a><a class="link" href="fused.html" title="fused">fused</a>
 </h4></div></div></div>
 <a name="fusion.functional.adapters.fused.description"></a><h6>
-<a name="id826228"></a>
+<a name="id826918"></a>
           <a class="link" href="fused.html#fusion.functional.adapters.fused.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          An unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-          Object</a> adapter template for <a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred
-          Callable Object</a> target functions. It takes a <a href="../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+          An unary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
+          Object</a> adapter template for <a class="link" href="../concepts/def_callable.html" title="Deferred Callable Object">Deferred
+          Callable Object</a> target functions. It takes a <a class="link" href="../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
           Sequence</a> that contains the arguments for the target function.
         </p>
 <p>
           The type of the target function is allowed to be const qualified or a reference.
           Const qualification is preserved and propagated appropriately (in other
-          words, only const versions of <tt class="literal">operator()</tt> can be used
+          words, only const versions of <code class="literal">operator()</code> can be used
           for a target function object that is const or, if the target function object
           is held by value, the adapter is const - these semantics have nothing to
           do with the const qualification of a member function, which is referring
-          to the type of object pointed to by <tt class="literal">this</tt> which is specified
+          to the type of object pointed to by <code class="literal">this</code> which is specified
           with the first element in the sequence passed to the adapter).
         </p>
 <p>
           If the target function is a pointer to a class members, the corresponding
           object can be specified as a reference, pointer, or smart pointer. In case
-          of the latter, a freestanding <tt class="literal">get_pointer</tt> function must
-          be defined (Boost provides this function for <tt class="literal">std::auto_ptr</tt>
-          and boost::shared_ptr).
+          of the latter, a freestanding <code class="literal">get_pointer</code> function must
+          be defined (Boost provides this function for <code class="literal">std::auto_ptr</code>
+          and boost::shared_ptr).
         </p>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused.header"></a><h5>
-<a name="id617829"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.functional.adapters.fused.header"></a><h6>
-<a name="id826303"></a>
+<a name="id826993"></a>
           <a class="link" href="fused.html#fusion.functional.adapters.fused.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">fused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused.synopsis"></a><h5>
-<a name="id617932"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.functional.adapters.fused.synopsis"></a><h6>
-<a name="id826373"></a>
+<a name="id827063"></a>
           <a class="link" href="fused.html#fusion.functional.adapters.fused.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">&gt;</span>
 <span class="keyword">class</span> <span class="identifier">fused</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused.template_parameters"></a><h5>
-<a name="id618009"></a>
-          <a href="fused.html#fusion.functional.adapters.fused.template_parameters">Template
-=======
 <a name="fusion.functional.adapters.fused.template_parameters"></a><h6>
-<a name="id826425"></a>
+<a name="id827115"></a>
           <a class="link" href="fused.html#fusion.functional.adapters.fused.template_parameters">Template
->>>>>>> .merge-right.r57125
           parameters</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -119,159 +78,146 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Default
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Function</span></tt>
-                </p></td>
-<td><p>
-                  A <a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Function</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A <a class="link" href="../concepts/def_callable.html" title="Deferred Callable Object">Deferred
                   Callable Object</a>
-                </p></td>
-<td><p>
-                </p></td>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused.model_of"></a><h5>
-<a name="id618123"></a>
-          Model of
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-=======
 <a name="fusion.functional.adapters.fused.model_of"></a><h6>
-<a name="id826512"></a>
+<a name="id827202"></a>
           <a class="link" href="fused.html#fusion.functional.adapters.fused.model_of">Model of</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem"><a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
->>>>>>> .merge-right.r57125
             Object</a></li>
-<li><a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred Callable
+<li class="listitem"><a class="link" href="../concepts/def_callable.html" title="Deferred Callable Object">Deferred Callable
             Object</a></li>
 </ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">R</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">R</span></code></span></dt>
 <dd><p>
-              A possibly const qualified <a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred
+              A possibly const qualified <a class="link" href="../concepts/def_callable.html" title="Deferred Callable Object">Deferred
               Callable Object</a> type or reference type thereof
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">r</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">r</span></code></span></dt>
 <dd><p>
-              An object convertible to <tt class="computeroutput"><span class="identifier">R</span></tt>
+              An object convertible to <code class="computeroutput"><span class="identifier">R</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-              A Sequence of arguments that
-              are accepted by <tt class="computeroutput"><span class="identifier">r</span></tt>
+              A <a class="link" href="../../sequence.html" title="Sequence">Sequence</a> of arguments that
+              are accepted by <code class="computeroutput"><span class="identifier">r</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
 <dd><p>
-              An instance of <tt class="computeroutput"><span class="identifier">fused</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;</span></tt>
+              An instance of <code class="computeroutput"><span class="identifier">fused</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;</span></code>
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused.expression_semantics"></a><h5>
-<a name="id618340"></a>
-          <a href="fused.html#fusion.functional.adapters.fused.expression_semantics">Expression
-=======
 <a name="fusion.functional.adapters.fused.expression_semantics"></a><h6>
-<a name="id826667"></a>
+<a name="id827357"></a>
           <a class="link" href="fused.html#fusion.functional.adapters.fused.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">fused</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;(</span><span class="identifier">r</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">fused</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;(</span><span class="identifier">r</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Creates a fused function as described above, initializes the target
-                  function with <tt class="computeroutput"><span class="identifier">r</span></tt>.
-                </p></td>
+                  function with <code class="computeroutput"><span class="identifier">r</span></code>.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">fused</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;()</span></tt>
-                </p></td>
-<td><p>
-                  Creates a fused function as described above, attempts to use <tt class="computeroutput"><span class="identifier">R</span></tt>'s default constructor.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">fused</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;()</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Creates a fused function as described above, attempts to use <code class="computeroutput"><span class="identifier">R</span></code>'s default constructor.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  Calls <tt class="computeroutput"><span class="identifier">r</span></tt> with the
-                  elements in <tt class="computeroutput"><span class="identifier">s</span></tt> as
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Calls <code class="computeroutput"><span class="identifier">r</span></code> with the
+                  elements in <code class="computeroutput"><span class="identifier">s</span></code> as
                   its arguments.
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused.example"></a><h5>
-<a name="id618593"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="identifier">fused</span><span class="special">&lt;</span> std::plus<span class="special">&lt;</span><span class="keyword">long</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">f</span><span class="special">;</span>
-<span class="identifier">assert</span><span class="special">(</span><span class="identifier">f</span><span class="special">(</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2l</span><span class="special">))</span> <span class="special">==</span> <span class="number">3l</span><span class="special">);</span>
-=======
 <a name="fusion.functional.adapters.fused.example"></a><h6>
-<a name="id826854"></a>
+<a name="id827544"></a>
           <a class="link" href="fused.html#fusion.functional.adapters.fused.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="identifier">fused</span><span class="special">&lt;</span> std::plus<span class="special">&lt;</span><span class="keyword">long</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">f</span><span class="special">;</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">f</span><span class="special">(</span><a class="link" href="../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2l</span><span class="special">))</span> <span class="special">==</span> <span class="number">3l</span><span class="special">);</span>
->>>>>>> .merge-right.r57125
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused.see_also"></a><h5>
-<a name="id618768"></a>
-          See also
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>fused_procedure</li>
-<li>fused_function_object</li>
-<li>invoke</li>
-<li><a href="../generation/functions/mk_fused.html" title="
-          make_fused"><tt class="computeroutput"><span class="identifier">make_fused</span></tt></a></li>
-<li>deduce</li>
-=======
 <a name="fusion.functional.adapters.fused.see_also"></a><h6>
-<a name="id826975"></a>
+<a name="id827665"></a>
           <a class="link" href="fused.html#fusion.functional.adapters.fused.see_also">See also</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
@@ -280,12 +226,11 @@
 <li class="listitem"><a class="link" href="../invocation/functions/invoke.html" title="invoke"><code class="computeroutput"><span class="identifier">invoke</span></code></a></li>
 <li class="listitem"><a class="link" href="../generation/functions/mk_fused.html" title="make_fused"><code class="computeroutput"><span class="identifier">make_fused</span></code></a></li>
 <li class="listitem"><a class="link" href="../../support/deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li>
->>>>>>> .merge-right.r57125
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_function_object.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_function_object.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_function_object.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>fused_function_object</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../adapters.html" title=" Adapters">
-<link rel="previous" href="fused_procedure.html" title="fused_procedure">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../adapters.html" title="Adapters">
+<link rel="prev" href="fused_procedure.html" title="fused_procedure">
 <link rel="next" href="unfused.html" title="unfused">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,82 +22,45 @@
 <div class="spirit-nav">
 <a accesskey="p" href="fused_procedure.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unfused.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.adapters.fused_function_object"></a>fused_function_object
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.adapters.fused_function_object.description"></a><h5>
-<a name="id620581"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="fused_function_object">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.functional.adapters.fused_function_object"></a><a class="link" href="fused_function_object.html" title="fused_function_object">fused_function_object</a>
 </h4></div></div></div>
 <a name="fusion.functional.adapters.fused_function_object.description"></a><h6>
-<a name="id828234"></a>
+<a name="id830017"></a>
           <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          An unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-          Object</a> adapter template for a <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-          Function Object</a> target function. It takes a <a href="../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+          An unary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
+          Object</a> adapter template for a <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
+          Function Object</a> target function. It takes a <a class="link" href="../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
           Sequence</a> that contains the arguments for the target function.
         </p>
 <p>
           The type of the target function is allowed to be const qualified or a reference.
           Const qualification is preserved and propagated appropriately (in other
-          words, only const versions of <tt class="literal">operator()</tt> can be used
+          words, only const versions of <code class="literal">operator()</code> can be used
           for an target function object that is const or, if the target function
           object is held by value, the adapter is const).
         </p>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_function_object.header"></a><h5>
-<a name="id620655"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.functional.adapters.fused_function_object.header"></a><h6>
-<a name="id828277"></a>
+<a name="id830060"></a>
           <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">fused_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_function_object.synopsis"></a><h5>
-<a name="id620759"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.functional.adapters.fused_function_object.synopsis"></a><h6>
-<a name="id828349"></a>
+<a name="id830132"></a>
           <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Function</span><span class="special">&gt;</span>
 <span class="keyword">class</span> <span class="identifier">fused_function_object</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_function_object.template_parameters"></a><h5>
-<a name="id620839"></a>
-          <a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.template_parameters">Template
-=======
 <a name="fusion.functional.adapters.fused_function_object.template_parameters"></a><h6>
-<a name="id829223"></a>
+<a name="id830186"></a>
           <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.template_parameters">Template
->>>>>>> .merge-right.r57125
           parameters</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -109,143 +68,148 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Default
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Function</span></tt>
-                </p></td>
-<td><p>
-                  <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Function</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
                   Object</a> type
-                </p></td>
-<td><p>
-                </p></td>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_function_object.model_of"></a><h5>
-<a name="id620953"></a>
-          <a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.model_of">Model
-=======
 <a name="fusion.functional.adapters.fused_function_object.model_of"></a><h6>
-<a name="id829313"></a>
+<a name="id830276"></a>
           <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.model_of">Model
->>>>>>> .merge-right.r57125
           of</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
+        </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
             Object</a></li>
-<li><a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred Callable
+<li class="listitem"><a class="link" href="../concepts/def_callable.html" title="Deferred Callable Object">Deferred Callable
             Object</a></li>
 </ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">R</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">R</span></code></span></dt>
 <dd><p>
-              A possibly const qualified <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+              A possibly const qualified <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
               Function Object</a> type or reference type thereof
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">r</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">r</span></code></span></dt>
 <dd><p>
-              An object convertible to <tt class="computeroutput"><span class="identifier">R</span></tt>
+              An object convertible to <code class="computeroutput"><span class="identifier">R</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-              A Sequence of arguments that
-              are accepted by <tt class="computeroutput"><span class="identifier">r</span></tt>
+              A <a class="link" href="../../sequence.html" title="Sequence">Sequence</a> of arguments that
+              are accepted by <code class="computeroutput"><span class="identifier">r</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
 <dd><p>
-              An instance of <tt class="computeroutput"><span class="identifier">fused</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;</span></tt>
+              An instance of <code class="computeroutput"><span class="identifier">fused</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;</span></code>
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_function_object.expression_semantics"></a><h5>
-<a name="id621172"></a>
-          <a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.expression_semantics">Expression
-=======
 <a name="fusion.functional.adapters.fused_function_object.expression_semantics"></a><h6>
-<a name="id829470"></a>
+<a name="id830433"></a>
           <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">fused_function_object</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;(</span><span class="identifier">r</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">fused_function_object</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;(</span><span class="identifier">r</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Creates a fused function as described above, initializes the target
-                  function with <tt class="computeroutput"><span class="identifier">r</span></tt>.
-                </p></td>
+                  function with <code class="computeroutput"><span class="identifier">r</span></code>.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">fused_function_object</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;()</span></tt>
-                </p></td>
-<td><p>
-                  Creates a fused function as described above, attempts to use <tt class="computeroutput"><span class="identifier">R</span></tt>'s default constructor.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">fused_function_object</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;()</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Creates a fused function as described above, attempts to use <code class="computeroutput"><span class="identifier">R</span></code>'s default constructor.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  Calls <tt class="computeroutput"><span class="identifier">r</span></tt> with the
-                  elements in <tt class="computeroutput"><span class="identifier">s</span></tt> as
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Calls <code class="computeroutput"><span class="identifier">r</span></code> with the
+                  elements in <code class="computeroutput"><span class="identifier">s</span></code> as
                   its arguments.
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_function_object.example"></a><h5>
-<a name="id621426"></a>
-          Example
-        </h5>
-=======
 <a name="fusion.functional.adapters.fused_function_object.example"></a><h6>
-<a name="id829660"></a>
+<a name="id830623"></a>
           <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.example">Example</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">SeqOfSeqs</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Func</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::transform<span class="special">&lt;</span> <span class="identifier">zip_view</span><span class="special">&lt;</span><span class="identifier">SeqOfSeqs</span><span class="special">&gt;</span> <span class="keyword">const</span><span class="special">,</span>
+<span class="keyword">typename</span> <a class="link" href="../../algorithm/transformation/metafunctions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">transform</span></code></a><span class="special">&lt;</span> <span class="identifier">zip_view</span><span class="special">&lt;</span><span class="identifier">SeqOfSeqs</span><span class="special">&gt;</span> <span class="keyword">const</span><span class="special">,</span>
     <span class="identifier">fused_function_object</span><span class="special">&lt;</span><span class="identifier">Func</span> <span class="keyword">const</span> <span class="special">&amp;&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">n_ary_transform</span><span class="special">(</span><span class="identifier">SeqOfSeqs</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">Func</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">f</span><span class="special">)</span>
 <span class="special">{</span>
-    <span class="keyword">return</span> transform<span class="special">(</span><span class="identifier">zip_view</span><span class="special">&lt;</span><span class="identifier">SeqOfSeqs</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">),</span>
+    <span class="keyword">return</span> <a class="link" href="../../algorithm/transformation/functions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a><span class="special">(</span><span class="identifier">zip_view</span><span class="special">&lt;</span><span class="identifier">SeqOfSeqs</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">),</span>
         <span class="identifier">fused_function_object</span><span class="special">&lt;</span><span class="identifier">Func</span> <span class="keyword">const</span> <span class="special">&amp;&gt;(</span><span class="identifier">f</span><span class="special">));</span>
 <span class="special">}</span>
 
@@ -267,36 +231,28 @@
 
 <span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
 <span class="special">{</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">a</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">2.0f</span><span class="special">);</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">b</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1.5f</span><span class="special">);</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">c</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">0.5f</span><span class="special">);</span>
-    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">c</span> <span class="special">==</span> <span class="identifier">n_ary_transform</span><span class="special">(</span>vector_tie<span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">sub</span><span class="special">()));</span>
+    <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">a</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">2.0f</span><span class="special">);</span>
+    <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">b</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1.5f</span><span class="special">);</span>
+    <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">c</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">0.5f</span><span class="special">);</span>
+    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">c</span> <span class="special">==</span> <span class="identifier">n_ary_transform</span><span class="special">(</span><a class="link" href="../../container/generation/functions/vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">vector_tie</span></code></a><span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">sub</span><span class="special">()));</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_function_object.see_also"></a><h5>
-<a name="id622481"></a>
-          <a href="fused_function_object.html#fusion.functional.adapters.fused_function_object.see_also">See
-=======
 <a name="fusion.functional.adapters.fused_function_object.see_also"></a><h6>
-<a name="id830432"></a>
+<a name="id831395"></a>
           <a class="link" href="fused_function_object.html#fusion.functional.adapters.fused_function_object.see_also">See
->>>>>>> .merge-right.r57125
           also</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>fused</li>
-<li>fused_procedure</li>
-<li><a href="../invocation/functions/invoke_fobj.html" title="
-          invoke_function_object"><tt class="computeroutput"><span class="identifier">invoke_function_object</span></tt></a></li>
-<li><a href="../generation/functions/mk_fused_fobj.html" title="
-          make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a></li>
-<li>deduce</li>
+        </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="fused.html" title="fused"><code class="computeroutput"><span class="identifier">fused</span></code></a></li>
+<li class="listitem"><a class="link" href="fused_procedure.html" title="fused_procedure"><code class="computeroutput"><span class="identifier">fused_procedure</span></code></a></li>
+<li class="listitem"><a class="link" href="../invocation/functions/invoke_fobj.html" title="invoke_function_object"><code class="computeroutput"><span class="identifier">invoke_function_object</span></code></a></li>
+<li class="listitem"><a class="link" href="../generation/functions/mk_fused_fobj.html" title="make_fused_function_object"><code class="computeroutput"><span class="identifier">make_fused_function_object</span></code></a></li>
+<li class="listitem"><a class="link" href="../../support/deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_procedure.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_procedure.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/fused_procedure.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>fused_procedure</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../adapters.html" title=" Adapters">
-<link rel="previous" href="fused.html" title="fused">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../adapters.html" title="Adapters">
+<link rel="prev" href="fused.html" title="fused">
 <link rel="next" href="fused_function_object.html" title="fused_function_object">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,99 +22,63 @@
 <div class="spirit-nav">
 <a accesskey="p" href="fused.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="fused_function_object.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.adapters.fused_procedure"></a>fused_procedure
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.adapters.fused_procedure.description"></a><h5>
-<a name="id618918"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="fused_procedure">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.functional.adapters.fused_procedure"></a><a class="link" href="fused_procedure.html" title="fused_procedure">fused_procedure</a>
 </h4></div></div></div>
 <a name="fusion.functional.adapters.fused_procedure.description"></a><h6>
-<a name="id827069"></a>
+<a name="id827759"></a>
           <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          An unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-          Object</a> adapter template for <a href="../concepts/callable.html" title=" Callable Object">Callable
-          Object</a> target functions. It takes a <a href="../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+          An unary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
+          Object</a> adapter template for <a class="link" href="../concepts/callable.html" title="Callable Object">Callable
+          Object</a> target functions. It takes a <a class="link" href="../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
           Sequence</a> that contains the arguments for the target function.
         </p>
 <p>
-          The result is discared and the adapter's return type is <tt class="computeroutput"><span class="keyword">void</span></tt>.
+          The result is discared and the adapter's return type is <code class="computeroutput"><span class="keyword">void</span></code>.
         </p>
 <p>
           The type of the target function is allowed to be const qualified or a reference.
           Const qualification is preserved and propagated appropriately (in other
-          words, only const versions of <tt class="literal">operator()</tt> can be used
+          words, only const versions of <code class="literal">operator()</code> can be used
           for a target function object that is const or, if the target function object
           is held by value, the adapter is const - these semantics have nothing to
           do with the const qualification of a member function, which is referring
-          to the type of object pointed to by <tt class="literal">this</tt> which is specified
+          to the type of object pointed to by <code class="literal">this</code> which is specified
           with the first element in the sequence passed to the adapter).
         </p>
 <p>
           If the target function is a pointer to a members function, the corresponding
           object can be specified as a reference, pointer, or smart pointer. In case
-          of the latter, a freestanding <tt class="literal">get_pointer</tt> function must
-          be defined (Boost provides this function for <tt class="literal">std::auto_ptr</tt>
-          and boost::shared_ptr).
+          of the latter, a freestanding <code class="literal">get_pointer</code> function must
+          be defined (Boost provides this function for <code class="literal">std::auto_ptr</code>
+          and boost::shared_ptr).
         </p>
 <p>
           The target function must not be a pointer to a member object (dereferencing
           such a pointer without returning anything does not make sense, so this
           case is not implemented).
         </p>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_procedure.header"></a><h5>
-<a name="id619075"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.functional.adapters.fused_procedure.header"></a><h6>
-<a name="id827159"></a>
+<a name="id827849"></a>
           <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">fused_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_procedure.synopsis"></a><h5>
-<a name="id619178"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.functional.adapters.fused_procedure.synopsis"></a><h6>
-<a name="id827229"></a>
+<a name="id827919"></a>
           <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">&gt;</span>
 <span class="keyword">class</span> <span class="identifier">fused_procedure</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_procedure.template_parameters"></a><h5>
-<a name="id619256"></a>
-          <a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.template_parameters">Template
-=======
 <a name="fusion.functional.adapters.fused_procedure.template_parameters"></a><h6>
-<a name="id827283"></a>
+<a name="id827973"></a>
           <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.template_parameters">Template
->>>>>>> .merge-right.r57125
           parameters</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -126,174 +86,173 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Default
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Function</span></tt>
-                </p></td>
-<td><p>
-                  Callable Object
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Function</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="../concepts/callable.html" title="Callable Object">Callable Object</a>
                   type
-                </p></td>
-<td><p>
-                </p></td>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_procedure.model_of"></a><h5>
-<a name="id619369"></a>
-          <a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.model_of">Model
-=======
 <a name="fusion.functional.adapters.fused_procedure.model_of"></a><h6>
-<a name="id827373"></a>
+<a name="id828063"></a>
           <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.model_of">Model
->>>>>>> .merge-right.r57125
           of</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
+        </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
             Object</a></li>
-<li><a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred Callable
+<li class="listitem"><a class="link" href="../concepts/def_callable.html" title="Deferred Callable Object">Deferred Callable
             Object</a></li>
 </ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">R</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">R</span></code></span></dt>
 <dd><p>
-              A possibly const qualified <a href="../concepts/callable.html" title=" Callable Object">Callable
+              A possibly const qualified <a class="link" href="../concepts/callable.html" title="Callable Object">Callable
               Object</a> type or reference type thereof
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">r</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">r</span></code></span></dt>
 <dd><p>
-              An object convertible to <tt class="computeroutput"><span class="identifier">R</span></tt>
+              An object convertible to <code class="computeroutput"><span class="identifier">R</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-              A Sequence of arguments that
-              are accepted by <tt class="computeroutput"><span class="identifier">r</span></tt>
+              A <a class="link" href="../../sequence.html" title="Sequence">Sequence</a> of arguments that
+              are accepted by <code class="computeroutput"><span class="identifier">r</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
 <dd><p>
-              An instance of <tt class="computeroutput"><span class="identifier">fused</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;</span></tt>
+              An instance of <code class="computeroutput"><span class="identifier">fused</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;</span></code>
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_procedure.expression_semantics"></a><h5>
-<a name="id619587"></a>
-          <a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.expression_semantics">Expression
-=======
 <a name="fusion.functional.adapters.fused_procedure.expression_semantics"></a><h6>
-<a name="id827530"></a>
+<a name="id828220"></a>
           <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">fused_procedure</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;(</span><span class="identifier">r</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">fused_procedure</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;(</span><span class="identifier">r</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Creates a fused function as described above, initializes the target
-                  function with <tt class="computeroutput"><span class="identifier">r</span></tt>.
-                </p></td>
+                  function with <code class="computeroutput"><span class="identifier">r</span></code>.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">fused_procedure</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;()</span></tt>
-                </p></td>
-<td><p>
-                  Creates a fused function as described above, attempts to use <tt class="computeroutput"><span class="identifier">R</span></tt>'s default constructor.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">fused_procedure</span><span class="special">&lt;</span><span class="identifier">R</span><span class="special">&gt;()</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Creates a fused function as described above, attempts to use <code class="computeroutput"><span class="identifier">R</span></code>'s default constructor.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  Calls <tt class="computeroutput"><span class="identifier">r</span></tt> with the
-                  elements in <tt class="computeroutput"><span class="identifier">s</span></tt> as
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Calls <code class="computeroutput"><span class="identifier">r</span></code> with the
+                  elements in <code class="computeroutput"><span class="identifier">s</span></code> as
                   its arguments.
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_procedure.example"></a><h5>
-<a name="id619843"></a>
-          Example
-        </h5>
-=======
 <a name="fusion.functional.adapters.fused_procedure.example"></a><h6>
-<a name="id827719"></a>
+<a name="id828409"></a>
           <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.example">Example</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">SequenceOfSequences</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Func</span><span class="special">&gt;</span>
 <span class="keyword">void</span> <span class="identifier">n_ary_for_each</span><span class="special">(</span><span class="identifier">SequenceOfSequences</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">,</span> <span class="identifier">Func</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">f</span><span class="special">)</span>
 <span class="special">{</span>
-    for_each<span class="special">(</span>zip_view<span class="special">&lt;</span><span class="identifier">SequenceOfSequences</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">),</span>
+    <a class="link" href="../../algorithm/iteration/functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a><span class="special">(</span><a class="link" href="../../view/zip_view.html" title="zip_view"><code class="computeroutput"><span class="identifier">zip_view</span></code></a><span class="special">&lt;</span><span class="identifier">SequenceOfSequences</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">),</span>
         <span class="identifier">fused_procedure</span><span class="special">&lt;</span><span class="identifier">Func</span> <span class="keyword">const</span> <span class="special">&amp;&gt;(</span><span class="identifier">f</span><span class="special">));</span>
 <span class="special">}</span>
 
 <span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
 <span class="special">{</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">a</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">2.0f</span><span class="special">);</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">b</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1.5f</span><span class="special">);</span>
+    <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">a</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">2.0f</span><span class="special">);</span>
+    <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">b</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1.5f</span><span class="special">);</span>
     <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">;</span>
-    <span class="identifier">n_ary_for_each</span><span class="special">(</span>vector_tie<span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">_1</span> <span class="special">-=</span> <span class="identifier">_2</span><span class="special">);</span>
-    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">a</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">0.5f</span><span class="special">));</span>
+    <span class="identifier">n_ary_for_each</span><span class="special">(</span><a class="link" href="../../container/generation/functions/vector_tie.html" title="vector_tie"><code class="computeroutput"><span class="identifier">vector_tie</span></code></a><span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">_1</span> <span class="special">-=</span> <span class="identifier">_2</span><span class="special">);</span>
+    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">a</span> <span class="special">==</span> <a class="link" href="../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">0.5f</span><span class="special">));</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.fused_procedure.see_also"></a><h5>
-<a name="id620448"></a>
-          <a href="fused_procedure.html#fusion.functional.adapters.fused_procedure.see_also">See
-=======
 <a name="fusion.functional.adapters.fused_procedure.see_also"></a><h6>
-<a name="id828151"></a>
+<a name="id829934"></a>
           <a class="link" href="fused_procedure.html#fusion.functional.adapters.fused_procedure.see_also">See
->>>>>>> .merge-right.r57125
           also</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>fused</li>
-<li>fused_function_object</li>
-<li><a href="../invocation/functions/invoke_proc.html" title="
-          invoke_procedure"><tt class="computeroutput"><span class="identifier">invoke_procedure</span></tt></a></li>
-<li><a href="../generation/functions/mk_fused_proc.html" title="
-          make_fused_procedure"><tt class="computeroutput"><span class="identifier">make_fused_procedure</span></tt></a></li>
+        </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="fused.html" title="fused"><code class="computeroutput"><span class="identifier">fused</span></code></a></li>
+<li class="listitem"><a class="link" href="fused_function_object.html" title="fused_function_object"><code class="computeroutput"><span class="identifier">fused_function_object</span></code></a></li>
+<li class="listitem"><a class="link" href="../invocation/functions/invoke_proc.html" title="invoke_procedure"><code class="computeroutput"><span class="identifier">invoke_procedure</span></code></a></li>
+<li class="listitem"><a class="link" href="../generation/functions/mk_fused_proc.html" title="make_fused_procedure"><code class="computeroutput"><span class="identifier">make_fused_procedure</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/limits.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/limits.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/limits.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Limits</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../adapters.html" title=" Adapters">
-<link rel="previous" href="unfused_typed.html" title="unfused_typed">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../adapters.html" title="Adapters">
+<link rel="prev" href="unfused_typed.html" title="unfused_typed">
 <link rel="next" href="../generation.html" title="Generation">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,58 +22,37 @@
 <div class="spirit-nav">
 <a accesskey="p" href="unfused_typed.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../generation.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.adapters.limits"></a>Limits
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.adapters.limits.header"></a><h5>
-<a name="id626930"></a>
-          Header
-        </h5>
-=======
 <div class="section" title="Limits">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.functional.adapters.limits"></a><a class="link" href="limits.html" title="Limits">Limits</a>
 </h4></div></div></div>
 <a name="fusion.functional.adapters.limits.header"></a><h6>
-<a name="id836902"></a>
+<a name="id837596"></a>
           <a class="link" href="limits.html#fusion.functional.adapters.limits.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">limits</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.limits.macros"></a><h5>
-<a name="id627034"></a>
-          Macros
-        </h5>
-=======
 <a name="fusion.functional.adapters.limits.macros"></a><h6>
-<a name="id836972"></a>
+<a name="id837666"></a>
           <a class="link" href="limits.html#fusion.functional.adapters.limits.macros">Macros</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           The following macros can be defined to change the maximum arity. The value
-          used for these macros must not exceed <tt class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></tt>.
+          used for these macros must not exceed <code class="computeroutput"><span class="identifier">FUSION_MAX_VECTOR_SIZE</span></code>.
           The default is 6.
         </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
             BOOST_FUSION_UNFUSED_MAX_ARITY
           </li>
-<li>
+<li class="listitem">
             BOOST_FUSION_UNFUSED_TYPE_MAX_ARITY
           </li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>unfused</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../adapters.html" title=" Adapters">
-<link rel="previous" href="fused_function_object.html" title="fused_function_object">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../adapters.html" title="Adapters">
+<link rel="prev" href="fused_function_object.html" title="fused_function_object">
 <link rel="next" href="unfused_typed.html" title="unfused_typed">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,42 +22,25 @@
 <div class="spirit-nav">
 <a accesskey="p" href="fused_function_object.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unfused_typed.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.adapters.unfused"></a>unfused
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.adapters.unfused.description"></a><h5>
-<a name="id622635"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="unfused">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.functional.adapters.unfused"></a><a class="link" href="unfused.html" title="unfused">unfused</a>
 </h4></div></div></div>
 <a name="fusion.functional.adapters.unfused.description"></a><h6>
-<a name="id830528"></a>
+<a name="id831491"></a>
           <a class="link" href="unfused.html#fusion.functional.adapters.unfused.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          An n-ary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-          Object</a> adapter template for an unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+          An n-ary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
+          Object</a> adapter template for an unary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
           Function Object</a> target function. When called, its arguments are
-          bundled to a <a href="../../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+          bundled to a <a class="link" href="../../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
           Access Sequence</a> of references that is passed to the target function
           object.
         </p>
 <p>
           The nullary overload of the call operator can be removed by setting the
-          second template parameter to <tt class="computeroutput"><span class="keyword">false</span></tt>,
+          second template parameter to <code class="computeroutput"><span class="keyword">false</span></code>,
           which is very useful if the result type computation would result in a compile
           error, otherwise (nullary call operator's prototypes can't be templates
           and thus are instantiated as early as the class template).
@@ -73,48 +52,28 @@
 <p>
           The type of the target function is allowed to be const qualified or a reference.
           Const qualification is preserved and propagated appropriately. In other
-          words, only const versions of <tt class="literal">operator()</tt> can be used
+          words, only const versions of <code class="literal">operator()</code> can be used
           if the target function object is const - or, in case the target function
           object is held by value, the adapter is const.
         </p>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused.header"></a><h5>
-<a name="id622744"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.functional.adapters.unfused.header"></a><h6>
-<a name="id830586"></a>
+<a name="id831549"></a>
           <a class="link" href="unfused.html#fusion.functional.adapters.unfused.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">unfused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused.synopsis"></a><h5>
-<a name="id622847"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.functional.adapters.unfused.synopsis"></a><h6>
-<a name="id830656"></a>
+<a name="id831619"></a>
           <a class="link" href="unfused.html#fusion.functional.adapters.unfused.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Function</span><span class="special">,</span> <span class="keyword">bool</span> <span class="identifier">AllowNullary</span> <span class="special">=</span> <span class="keyword">true</span><span class="special">&gt;</span>
 <span class="keyword">class</span> <span class="identifier">unfused</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused.template_parameters"></a><h5>
-<a name="id622953"></a>
-          <a href="unfused.html#fusion.functional.adapters.unfused.template_parameters">Template
-=======
 <a name="fusion.functional.adapters.unfused.template_parameters"></a><h6>
-<a name="id830730"></a>
+<a name="id831693"></a>
           <a class="link" href="unfused.html#fusion.functional.adapters.unfused.template_parameters">Template
->>>>>>> .merge-right.r57125
           parameters</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -122,156 +81,164 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Default
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Function</span></tt>
-                </p></td>
-<td><p>
-                  A unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Function</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A unary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
                   Function Object</a>
-                </p></td>
-<td><p>
-                </p></td>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">AllowNullary</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">AllowNullary</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Boolean constant
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   true
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused.model_of"></a><h5>
-<a name="id623102"></a>
-          Model of
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-=======
 <a name="fusion.functional.adapters.unfused.model_of"></a><h6>
-<a name="id830848"></a>
+<a name="id833727"></a>
           <a class="link" href="unfused.html#fusion.functional.adapters.unfused.model_of">Model of</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem"><a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
->>>>>>> .merge-right.r57125
             Object</a></li>
-<li><a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred Callable
+<li class="listitem"><a class="link" href="../concepts/def_callable.html" title="Deferred Callable Object">Deferred Callable
             Object</a></li>
 </ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
 <dd><p>
-              A possibly const qualified, unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+              A possibly const qualified, unary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
               Function Object</a> type or reference type thereof
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
 <dd><p>
-              An object convertible to <tt class="computeroutput"><span class="identifier">F</span></tt>
+              An object convertible to <code class="computeroutput"><span class="identifier">F</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">UL</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">UL</span></code></span></dt>
 <dd><p>
-              The type <tt class="computeroutput"><span class="identifier">unfused</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;</span></tt>
+              The type <code class="computeroutput"><span class="identifier">unfused</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">ul</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">ul</span></code></span></dt>
 <dd><p>
-              An instance of <tt class="computeroutput"><span class="identifier">UL</span></tt>,
-              initialized with <tt class="computeroutput"><span class="identifier">f</span></tt>
+              An instance of <code class="computeroutput"><span class="identifier">UL</span></code>,
+              initialized with <code class="computeroutput"><span class="identifier">f</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code></span></dt>
 <dd><p>
-              Arguments to <tt class="computeroutput"><span class="identifier">ul</span></tt>
+              Arguments to <code class="computeroutput"><span class="identifier">ul</span></code>
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused.expression_semantics"></a><h5>
-<a name="id623371"></a>
-          <a href="unfused.html#fusion.functional.adapters.unfused.expression_semantics">Expression
-=======
 <a name="fusion.functional.adapters.unfused.expression_semantics"></a><h6>
-<a name="id831038"></a>
+<a name="id833917"></a>
           <a class="link" href="unfused.html#fusion.functional.adapters.unfused.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">UL</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">UL</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Creates a fused function as described above, initializes the target
-                  function with <tt class="computeroutput"><span class="identifier">f</span></tt>.
-                </p></td>
+                  function with <code class="computeroutput"><span class="identifier">f</span></code>.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">UL</span><span class="special">()</span></tt>
-                </p></td>
-<td><p>
-                  Creates a fused function as described above, attempts to use <tt class="computeroutput"><span class="identifier">F</span></tt>'s default constructor.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">UL</span><span class="special">()</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Creates a fused function as described above, attempts to use <code class="computeroutput"><span class="identifier">F</span></code>'s default constructor.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">ul</span><span class="special">(</span><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  Calls <tt class="computeroutput"><span class="identifier">f</span></tt> with a
-                  Sequence that contains references
-                  to the arguments <tt class="computeroutput"><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span></tt>.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">ul</span><span class="special">(</span><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Calls <code class="computeroutput"><span class="identifier">f</span></code> with a
+                  <a class="link" href="../../sequence.html" title="Sequence">Sequence</a> that contains references
+                  to the arguments <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code>.
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused.example"></a><h5>
-<a name="id623635"></a>
-          Example
-        </h5>
-=======
 <a name="fusion.functional.adapters.unfused.example"></a><h6>
-<a name="id831231"></a>
+<a name="id834110"></a>
           <a class="link" href="unfused.html#fusion.functional.adapters.unfused.example">Example</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">fused_incrementer</span>
 <span class="special">{</span>
     <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
@@ -283,7 +250,7 @@
     <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
     <span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Seq</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span> <span class="keyword">const</span>
     <span class="special">{</span>
-        for_each<span class="special">(</span><span class="identifier">s</span><span class="special">,++</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">::</span><span class="identifier">_1</span><span class="special">);</span>
+        <a class="link" href="../../algorithm/iteration/functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">,++</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">::</span><span class="identifier">_1</span><span class="special">);</span>
     <span class="special">}</span>
 <span class="special">};</span>
 
@@ -295,29 +262,18 @@
     <span class="identifier">assert</span><span class="special">(</span><span class="identifier">a</span> <span class="special">==</span> <span class="number">3</span> <span class="special">&amp;&amp;</span> <span class="identifier">b</span> <span class="special">==</span> <span class="char">'Y'</span><span class="special">);</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused.see_also"></a><h5>
-<a name="id624132"></a>
-          See also
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>unfused_typed</li>
-<li><a href="../generation/functions/mk_unfused.html" title="
-          make_unfused"><tt class="computeroutput"><span class="identifier">make_unfused</span></tt></a></li>
-=======
 <a name="fusion.functional.adapters.unfused.see_also"></a><h6>
-<a name="id834329"></a>
+<a name="id834477"></a>
           <a class="link" href="unfused.html#fusion.functional.adapters.unfused.see_also">See also</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem"><a class="link" href="unfused_typed.html" title="unfused_typed"><code class="computeroutput"><span class="identifier">unfused_typed</span></code></a></li>
 <li class="listitem"><a class="link" href="../generation/functions/mk_unfused.html" title="make_unfused"><code class="computeroutput"><span class="identifier">make_unfused</span></code></a></li>
->>>>>>> .merge-right.r57125
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Deleted: branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_generic.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_generic.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
+++ (empty file)
@@ -1,298 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>unfused_generic</title>
-<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../adapters.html" title=" Adapters">
-<link rel="prev" href="fused_function_object.html" title="fused_function_object">
-<link rel="next" href="unfused_lvalue_args.html" title="unfused_lvalue_args">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="fused_function_object.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unfused_lvalue_args.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="fusion.functional.adapters.unfused_generic"></a>unfused_generic</h4></div></div></div>
-<a name="fusion.functional.adapters.unfused_generic.description"></a><h5>
-<a name="id666486"></a>
-          Description
-        </h5>
-<p>
-          An n-ary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-          Object</a> adapter template for an unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-          Function Object</a> target function. When called, its arguments are
-          bundled to a <a href="../../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-          Access Sequence</a> of references that is passed to the target function.
-          Non-const LValue arguments are transported as references to non-const,
-          otherwise references to const are used.
-        </p>
-<div class="sidebar"><p>
-          <span class="inlinemediaobject"><img src="../../../images/tip.png" alt="tip"></span> Detecting mutable LValues on a per-argument basis
-          is currently a compile time expensive operation (see <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm" target="_top">The
-          Forwarding Problem</a> for details). Therefore, there are two, lightweight
-          and more restricted variants of this class template, unfused_lvalue_args and unfused_rvalue_args.
-        </p></div>
-<p>
-          The type of the target function is allowed to be const qualified or a reference.
-          Const qualification is preserved and propagated appropriately (in other
-          words, only const versions of <tt class="literal">operator()</tt> can be used
-          if the target function object is const - or, in case the target function
-          object is held by value, the adapter is const).
-        </p>
-<p>
-          /functional/adapter/unfused_generic.hpp&gt;
-        </p>
-<a name="fusion.functional.adapters.unfused_generic.synopsis"></a><h5>
-<a name="id666643"></a>
-          Synopsis
-        </h5>
-<pre class="programlisting">
-<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Function</span><span class="special">&gt;</span>
-<span class="keyword">class</span> <span class="identifier">unfused_generic</span><span class="special">;</span>
-</pre>
-<a name="fusion.functional.adapters.unfused_generic.template_parameters"></a><h5>
-<a name="id666724"></a>
-          <a href="unfused_generic.html#fusion.functional.adapters.unfused_generic.template_parameters">Template
-          parameters</a>
-        </h5>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Parameter
-                </p>
-                </th>
-<th>
-                <p>
-                  Description
-                </p>
-                </th>
-<th>
-                <p>
-                  Default
-                </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">Function</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  An unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-                  Function Object</a>
-                </p>
-                </td>
-<td>
-                <p>
-                </p>
-                </td>
-</tr></tbody>
-</table></div>
-<a name="fusion.functional.adapters.unfused_generic.model_of"></a><h5>
-<a name="id666840"></a>
-          <a href="unfused_generic.html#fusion.functional.adapters.unfused_generic.model_of">Model
-          of</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-            Object</a></li>
-<li><a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred Callable
-            Object</a></li>
-</ul></div>
-<div class="variablelist">
-<p class="title"><b>Notation</b></p>
-<dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt></span></dt>
-<dd><p>
-              A possibly const qualified, unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-              Function Object</a> type or reference type thereof
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
-<dd><p>
-              An object convertible to <tt class="computeroutput"><span class="identifier">F</span></tt>
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">UG</span></tt></span></dt>
-<dd><p>
-              The type <tt class="computeroutput"><span class="identifier">unfused_generic</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;</span></tt>
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">ug</span></tt></span></dt>
-<dd><p>
-              An instance of <tt class="computeroutput"><span class="identifier">UG</span></tt>,
-              initialized with <tt class="computeroutput"><span class="identifier">f</span></tt>
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span></tt></span></dt>
-<dd><p>
-              Arguments to <tt class="computeroutput"><span class="identifier">ug</span></tt>
-            </p></dd>
-</dl>
-</div>
-<a name="fusion.functional.adapters.unfused_generic.expression_semantics"></a><h5>
-<a name="id667108"></a>
-          <a href="unfused_generic.html#fusion.functional.adapters.unfused_generic.expression_semantics">Expression
-          Semantics</a>
-        </h5>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Expression
-                </p>
-                </th>
-<th>
-                <p>
-                  Semantics
-                </p>
-                </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">UG</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  Creates a fused function as described above, initializes the target
-                  function with <tt class="computeroutput"><span class="identifier">f</span></tt>.
-                </p>
-                </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">UG</span><span class="special">()</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  Creates a fused function as described above, attempts to use <tt class="computeroutput"><span class="identifier">F</span></tt>'s default constructor.
-                </p>
-                </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">ug</span><span class="special">(</span><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  Calls <tt class="computeroutput"><span class="identifier">f</span></tt> with a
-                  Sequence that contains references
-                  to the arguments <tt class="computeroutput"><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span></tt>.
-                </p>
-                </td>
-</tr>
-</tbody>
-</table></div>
-<a name="fusion.functional.adapters.unfused_generic.example"></a><h5>
-<a name="id667374"></a>
-          Example
-        </h5>
-<pre class="programlisting">
-<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
-<span class="keyword">class</span> <span class="identifier">fused_bound_1st</span>
-<span class="special">{</span>
-    <span class="keyword">typename</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">deduce</span><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">fnc_deferred</span><span class="special">;</span>
-    <span class="keyword">typename</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">deduce</span><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>        <span class="identifier">xxx_bound</span><span class="special">;</span>
-<span class="keyword">public</span><span class="special">:</span>
-
-    <span class="identifier">fused_bound_1st</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">deferred</span><span class="special">,</span> <span class="identifier">T</span> <span class="identifier">bound</span><span class="special">)</span>
-        <span class="special">:</span> <span class="identifier">fnc_deferred</span><span class="special">(</span><span class="identifier">deferred</span><span class="special">),</span> <span class="identifier">xxx_bound</span><span class="special">(</span><span class="identifier">bound</span><span class="special">)</span>
-    <span class="special">{</span> <span class="special">}</span>
-
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sig</span><span class="special">&gt;</span>
-    <span class="keyword">struct</span> <span class="identifier">result</span><span class="special">;</span>
-
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Self</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">struct</span> <span class="identifier">result</span><span class="special">&lt;</span> <span class="identifier">Self</span><span class="special">(</span><span class="identifier">Seq</span><span class="special">)</span> <span class="special">&gt;</span>
-        <span class="special">:</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke</span><span class="special">&lt;</span> <span class="identifier">Function</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">push_front</span><span class="special">&lt;</span>
-            <span class="keyword">typename</span> <span class="identifier">remove_reference</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="special">&gt;</span>
-    <span class="special">{</span> <span class="special">};</span>
-
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">typename</span> <span class="identifier">result</span><span class="special">&lt;</span> <span class="keyword">void</span><span class="special">(</span><span class="identifier">Seq</span><span class="special">)</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Seq</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span> <span class="keyword">const</span>
-    <span class="special">{</span>
-        <span class="keyword">return</span> <span class="identifier">invoke</span><span class="special">(</span><span class="identifier">fnc_deferred</span><span class="special">,</span> <span class="identifier">push_front</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span><span class="identifier">xxx_bound</span><span class="special">));</span>
-    <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
-<span class="identifier">unfused_generic</span><span class="special">&lt;</span> <span class="identifier">fused_bound_1st</span><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;</span>
-<span class="identifier">bind_1st</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">T</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">x</span><span class="special">)</span>
-<span class="special">{</span>
-    <span class="keyword">return</span> <span class="identifier">unfused_generic</span><span class="special">&lt;</span> <span class="identifier">fused_bound_1st</span><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;(</span>
-        <span class="identifier">fused_bound_1st</span><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">f</span><span class="special">,</span><span class="identifier">x</span><span class="special">)</span> <span class="special">);</span>
-<span class="special">}</span>
-
-<span class="keyword">int</span> <span class="identifier">test_func</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">a</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">b</span><span class="special">,</span> <span class="keyword">int</span> <span class="identifier">c</span><span class="special">)</span>
-<span class="special">{</span>
-    <span class="keyword">return</span> <span class="identifier">a</span><span class="special">+</span><span class="identifier">b</span><span class="special">+</span><span class="identifier">c</span><span class="special">;</span>
-<span class="special">}</span>
-
-<span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">bind_1st</span><span class="special">(&amp;</span> <span class="identifier">test_func</span><span class="special">,</span><span class="number">3</span><span class="special">)(-</span><span class="number">2</span><span class="special">,-</span><span class="number">1</span><span class="special">)</span> <span class="special">==</span> <span class="number">0</span><span class="special">);</span>
-    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">bind_1st</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">plus</span><span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;(),</span> <span class="number">1</span><span class="special">)(</span><span class="number">0.5f</span><span class="special">)</span> <span class="special">==</span> <span class="number">1.5f</span><span class="special">);</span>
-<span class="special">}</span>
-</pre>
-<a name="fusion.functional.adapters.unfused_generic.see_also"></a><h5>
-<a name="id668770"></a>
-          <a href="unfused_generic.html#fusion.functional.adapters.unfused_generic.see_also">See
-          also</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>unfused_lvalue_args</li>
-<li>unfused_rvalue_args</li>
-<li>unfused_typed</li>
-<li>deduce</li>
-<li>deduce_sequence</li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
-      Schwinger<p>
-        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)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="fused_function_object.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unfused_lvalue_args.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_lvalue_args.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_lvalue_args.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
+++ (empty file)
@@ -1,266 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>unfused_lvalue_args</title>
-<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../adapters.html" title=" Adapters">
-<link rel="prev" href="unfused_generic.html" title="unfused_generic">
-<link rel="next" href="unfused_rvalue_args.html" title="unfused_rvalue_args">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="unfused_generic.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unfused_rvalue_args.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="fusion.functional.adapters.unfused_lvalue_args"></a>unfused_lvalue_args</h4></div></div></div>
-<a name="fusion.functional.adapters.unfused_lvalue_args.description"></a><h5>
-<a name="id668928"></a>
-          Description
-        </h5>
-<p>
-          An n-ary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-          Object</a> adapter template for an unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-          Function Object</a> target function. When called, its arguments are
-          bundled to a <a href="../../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-          Access Sequence</a> of references that is passed to the target function
-          object. Only LValue arguments are accepted.
-        </p>
-<p>
-          The type of the target function is allowed to be const qualified or a reference.
-          Const qualification is preserved and propagated appropriately (in other
-          words, only const versions of <tt class="literal">operator()</tt> can be used
-          if the target function object is const - or, in case the target function
-          object is held by value, the adapter is const).
-        </p>
-<p>
-          /functional/adapter/unfused_lvalue_args.hpp&gt;
-        </p>
-<a name="fusion.functional.adapters.unfused_lvalue_args.synopsis"></a><h5>
-<a name="id669012"></a>
-          Synopsis
-        </h5>
-<pre class="programlisting">
-<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Function</span><span class="special">&gt;</span>
-<span class="keyword">class</span> <span class="identifier">unfused_lvalue_args</span><span class="special">;</span>
-</pre>
-<a name="fusion.functional.adapters.unfused_lvalue_args.template_parameters"></a><h5>
-<a name="id669094"></a>
-          <a href="unfused_lvalue_args.html#fusion.functional.adapters.unfused_lvalue_args.template_parameters">Template
-          parameters</a>
-        </h5>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Parameter
-                </p>
-                </th>
-<th>
-                <p>
-                  Description
-                </p>
-                </th>
-<th>
-                <p>
-                  Default
-                </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">Function</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  A unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-                  Function Object</a>
-                </p>
-                </td>
-<td>
-                <p>
-                </p>
-                </td>
-</tr></tbody>
-</table></div>
-<a name="fusion.functional.adapters.unfused_lvalue_args.model_of"></a><h5>
-<a name="id669209"></a>
-          <a href="unfused_lvalue_args.html#fusion.functional.adapters.unfused_lvalue_args.model_of">Model
-          of</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-            Object</a></li>
-<li><a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred Callable
-            Object</a></li>
-</ul></div>
-<div class="variablelist">
-<p class="title"><b>Notation</b></p>
-<dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt></span></dt>
-<dd><p>
-              A possibly const qualified, unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-              Function Object</a> type or reference type thereof
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
-<dd><p>
-              An object convertible to <tt class="computeroutput"><span class="identifier">F</span></tt>
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">UL</span></tt></span></dt>
-<dd><p>
-              The type <tt class="computeroutput"><span class="identifier">unfused_lvalue_args</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;</span></tt>
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">ul</span></tt></span></dt>
-<dd><p>
-              An instance of <tt class="computeroutput"><span class="identifier">UL</span></tt>,
-              initialized with <tt class="computeroutput"><span class="identifier">f</span></tt>
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span></tt></span></dt>
-<dd><p>
-              Arguments to <tt class="computeroutput"><span class="identifier">ul</span></tt>
-            </p></dd>
-</dl>
-</div>
-<a name="fusion.functional.adapters.unfused_lvalue_args.expression_semantics"></a><h5>
-<a name="id669479"></a>
-          <a href="unfused_lvalue_args.html#fusion.functional.adapters.unfused_lvalue_args.expression_semantics">Expression
-          Semantics</a>
-        </h5>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Expression
-                </p>
-                </th>
-<th>
-                <p>
-                  Semantics
-                </p>
-                </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">UL</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  Creates a fused function as described above, initializes the target
-                  function with <tt class="computeroutput"><span class="identifier">f</span></tt>.
-                </p>
-                </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">UL</span><span class="special">()</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  Creates a fused function as described above, attempts to use <tt class="computeroutput"><span class="identifier">F</span></tt>'s default constructor.
-                </p>
-                </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">ul</span><span class="special">(</span><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  Calls <tt class="computeroutput"><span class="identifier">f</span></tt> with a
-                  Sequence that contains references
-                  to the arguments <tt class="computeroutput"><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span></tt>.
-                </p>
-                </td>
-</tr>
-</tbody>
-</table></div>
-<a name="fusion.functional.adapters.unfused_lvalue_args.example"></a><h5>
-<a name="id669746"></a>
-          Example
-        </h5>
-<pre class="programlisting">
-<span class="keyword">struct</span> <span class="identifier">fused_incrementer</span>
-<span class="special">{</span>
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">struct</span> <span class="identifier">result</span>
-    <span class="special">{</span>
-        <span class="keyword">typedef</span> <span class="keyword">void</span> <span class="identifier">type</span><span class="special">;</span>
-    <span class="special">};</span>
-
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Seq</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span> <span class="keyword">const</span>
-    <span class="special">{</span>
-        for_each<span class="special">(</span><span class="identifier">s</span><span class="special">,++</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">::</span><span class="identifier">_1</span><span class="special">);</span>
-    <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="identifier">unfused_lvalue_args</span><span class="special">&lt;</span><span class="identifier">fused_incrementer</span><span class="special">&gt;</span> <span class="identifier">increment</span><span class="special">;</span>
-    <span class="keyword">int</span> <span class="identifier">a</span> <span class="special">=</span> <span class="number">2</span><span class="special">;</span> <span class="keyword">char</span> <span class="identifier">b</span> <span class="special">=</span> <span class="char">'X'</span><span class="special">;</span>
-    <span class="identifier">increment</span><span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">);</span>
-    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">a</span> <span class="special">==</span> <span class="number">3</span> <span class="special">&amp;&amp;</span> <span class="identifier">b</span> <span class="special">==</span> <span class="char">'Y'</span><span class="special">);</span>
-<span class="special">}</span>
-</pre>
-<a name="fusion.functional.adapters.unfused_lvalue_args.see_also"></a><h5>
-<a name="id670245"></a>
-          <a href="unfused_lvalue_args.html#fusion.functional.adapters.unfused_lvalue_args.see_also">See
-          also</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>unfused_rvalue_args</li>
-<li>unfused_generic</li>
-<li>unfused_typed</li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
-      Schwinger<p>
-        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)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="unfused_generic.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unfused_rvalue_args.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_rvalue_args.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_rvalue_args.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
+++ (empty file)
@@ -1,266 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>unfused_rvalue_args</title>
-<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../adapters.html" title=" Adapters">
-<link rel="prev" href="unfused_lvalue_args.html" title="unfused_lvalue_args">
-<link rel="next" href="unfused_typed.html" title="unfused_typed">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="unfused_lvalue_args.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unfused_typed.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h4 class="title">
-<a name="fusion.functional.adapters.unfused_rvalue_args"></a>unfused_rvalue_args</h4></div></div></div>
-<a name="fusion.functional.adapters.unfused_rvalue_args.description"></a><h5>
-<a name="id670359"></a>
-          Description
-        </h5>
-<p>
-          An n-ary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-          Object</a> adapter template for an unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-          Function Object</a> target function. When called, its arguments are
-          bundled to a <a href="../../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-          Access Sequence</a> of references that is passed to the target function
-          object. All referenced objects in the sequence are const qualified.
-        </p>
-<p>
-          The type of the target function is allowed to be const qualified or a reference.
-          Const qualification is preserved and propagated appropriately (in other
-          words, only const versions of <tt class="literal">operator()</tt> can be used
-          if the target function object is const - or, in case the target function
-          object is held by value, the adapter is const).
-        </p>
-<p>
-          /functional/adapter/unfused_rvalue_args.hpp&gt;
-        </p>
-<a name="fusion.functional.adapters.unfused_rvalue_args.synopsis"></a><h5>
-<a name="id670443"></a>
-          Synopsis
-        </h5>
-<pre class="programlisting">
-<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Function</span><span class="special">&gt;</span>
-<span class="keyword">class</span> <span class="identifier">unfused_rvalue_args</span><span class="special">;</span>
-</pre>
-<a name="fusion.functional.adapters.unfused_rvalue_args.template_parameters"></a><h5>
-<a name="id670525"></a>
-          <a href="unfused_rvalue_args.html#fusion.functional.adapters.unfused_rvalue_args.template_parameters">Template
-          parameters</a>
-        </h5>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Parameter
-                </p>
-                </th>
-<th>
-                <p>
-                  Description
-                </p>
-                </th>
-<th>
-                <p>
-                  Default
-                </p>
-                </th>
-</tr></thead>
-<tbody><tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">Function</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  A unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-                  Function Object</a>
-                </p>
-                </td>
-<td>
-                <p>
-                </p>
-                </td>
-</tr></tbody>
-</table></div>
-<a name="fusion.functional.adapters.unfused_rvalue_args.model_of"></a><h5>
-<a name="id670641"></a>
-          <a href="unfused_rvalue_args.html#fusion.functional.adapters.unfused_rvalue_args.model_of">Model
-          of</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-            Object</a></li>
-<li><a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred Callable
-            Object</a></li>
-</ul></div>
-<div class="variablelist">
-<p class="title"><b>Notation</b></p>
-<dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt></span></dt>
-<dd><p>
-              A possibly const qualified, unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-              Function Object</a> type or reference type thereof
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
-<dd><p>
-              An object convertible to <tt class="computeroutput"><span class="identifier">F</span></tt>
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">UR</span></tt></span></dt>
-<dd><p>
-              The type <tt class="computeroutput"><span class="identifier">unfused_rvalue_args</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;</span></tt>
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">ur</span></tt></span></dt>
-<dd><p>
-              An instance of <tt class="computeroutput"><span class="identifier">UR</span></tt>,
-              initialized with <tt class="computeroutput"><span class="identifier">f</span></tt>
-            </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span></tt></span></dt>
-<dd><p>
-              Arguments to <tt class="computeroutput"><span class="identifier">ur</span></tt>
-            </p></dd>
-</dl>
-</div>
-<a name="fusion.functional.adapters.unfused_rvalue_args.expression_semantics"></a><h5>
-<a name="id670911"></a>
-          <a href="unfused_rvalue_args.html#fusion.functional.adapters.unfused_rvalue_args.expression_semantics">Expression
-          Semantics</a>
-        </h5>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                <p>
-                  Expression
-                </p>
-                </th>
-<th>
-                <p>
-                  Semantics
-                </p>
-                </th>
-</tr></thead>
-<tbody>
-<tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">UR</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  Creates a fused function as described above, initializes the target
-                  function with <tt class="computeroutput"><span class="identifier">f</span></tt>.
-                </p>
-                </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">UR</span><span class="special">()</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  Creates a fused function as described above, attempts to use <tt class="computeroutput"><span class="identifier">F</span></tt>'s default constructor.
-                </p>
-                </td>
-</tr>
-<tr>
-<td>
-                <p>
-                  <tt class="computeroutput"><span class="identifier">ur</span><span class="special">(</span><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></tt>
-                </p>
-                </td>
-<td>
-                <p>
-                  Calls <tt class="computeroutput"><span class="identifier">f</span></tt> with a
-                  Sequence that contains references
-                  to the arguments <tt class="computeroutput"><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span></tt>.
-                </p>
-                </td>
-</tr>
-</tbody>
-</table></div>
-<a name="fusion.functional.adapters.unfused_rvalue_args.example"></a><h5>
-<a name="id671178"></a>
-          Example
-        </h5>
-<pre class="programlisting">
-<span class="keyword">struct</span> <span class="identifier">sequence_printer</span>
-<span class="special">{</span>
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">struct</span> <span class="identifier">result</span>
-    <span class="special">{</span>
-        <span class="keyword">typedef</span> <span class="keyword">void</span> <span class="identifier">type</span><span class="special">;</span>
-    <span class="special">};</span>
-
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Seq</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span> <span class="keyword">const</span>
-    <span class="special">{</span>
-        <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">s</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-    <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="identifier">unfused_rvalue_args</span><span class="special">&lt;</span><span class="identifier">sequence_printer</span><span class="special">&gt;</span> <span class="identifier">print</span><span class="special">;</span>
-    <span class="identifier">print</span><span class="special">(</span><span class="number">24</span><span class="special">,</span><span class="string">"bottles of beer in"</span><span class="special">,</span><span class="char">'a'</span><span class="special">,</span><span class="string">"box."</span><span class="special">);</span>
-<span class="special">}</span>
-</pre>
-<a name="fusion.functional.adapters.unfused_rvalue_args.see_also"></a><h5>
-<a name="id671575"></a>
-          <a href="unfused_rvalue_args.html#fusion.functional.adapters.unfused_rvalue_args.see_also">See
-          also</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>unfused_lvalue_args</li>
-<li>unfused_generic</li>
-<li>unfused_typed</li>
-<li>deduce</li>
-<li>deduce_sequence</li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
-      Schwinger<p>
-        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)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="unfused_lvalue_args.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="unfused_typed.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_typed.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_typed.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/adapters/unfused_typed.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>unfused_typed</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../adapters.html" title=" Adapters">
-<link rel="previous" href="unfused.html" title="unfused">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../adapters.html" title="Adapters">
+<link rel="prev" href="unfused.html" title="unfused">
 <link rel="next" href="limits.html" title="Limits">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,100 +22,67 @@
 <div class="spirit-nav">
 <a accesskey="p" href="unfused.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../adapters.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="limits.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.adapters.unfused_typed"></a>unfused_typed
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.adapters.unfused_typed.description"></a><h5>
-<a name="id624223"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="unfused_typed">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.functional.adapters.unfused_typed"></a><a class="link" href="unfused_typed.html" title="unfused_typed">unfused_typed</a>
 </h4></div></div></div>
 <a name="fusion.functional.adapters.unfused_typed.description"></a><h6>
-<a name="id834383"></a>
+<a name="id834531"></a>
           <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          An n-ary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-          Object</a> adapter template for an unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+          An n-ary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
+          Object</a> adapter template for an unary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
           Function Object</a> target function. When called, its arguments are
-          bundled to a <a href="../../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+          bundled to a <a class="link" href="../../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
           Access Sequence</a> that is passed to the target function object.
         </p>
 <p>
           The call operators of esulting function objects are strictly typed (in
-          other words, non-templatized) with the types from a Sequence.
+          other words, non-templatized) with the types from a <a class="link" href="../../sequence.html" title="Sequence">Sequence</a>.
         </p>
 <p>
           The type of the target function is allowed to be const qualified or a reference.
           Const qualification is preserved and propagated appropriately (in other
-          words, only const versions of <tt class="literal">operator()</tt> can be used
+          words, only const versions of <code class="literal">operator()</code> can be used
           if the target function object is const - or, in case the target function
           object is held by value, the adapter is const).
         </p>
-<div class="sidebar"><p>
-          <span class="inlinemediaobject"><img src="images/note.png" alt="note"></span> For Microsoft Visual C++ 7.1 (Visual Studio 2003)
+<div class="sidebar">
+<p class="title"><b></b></p>
+<p>
+          <span class="inlinemediaobject"><img src="../../../images/note.png" alt="note"></span> For Microsoft Visual C++ 7.1 (Visual Studio 2003)
           the detection of the Function Object's const qualification easily causes
           an internal error. Therefore the adapter is always treated as if it was
           const.
-        </p></div>
-<div class="sidebar"><p>
-          <span class="inlinemediaobject"><img src="images/tip.png" alt="tip"></span> If the type sequence passed to this template contains
+        </p>
+</div>
+<div class="sidebar">
+<p class="title"><b></b></p>
+<p>
+          <span class="inlinemediaobject"><img src="../../../images/tip.png" alt="tip"></span> If the type sequence passed to this template contains
           non-reference elements, the element is copied only once - the call operator's
           signature is optimized automatically to avoid by-value parameters.
-<<<<<<< .working
-        </p></div>
-<a name="fusion.functional.adapters.unfused_typed.header"></a><h5>
-<a name="id624371"></a>
-          Header
-        </h5>
-=======
         </p>
 </div>
 <a name="fusion.functional.adapters.unfused_typed.header"></a><h6>
-<a name="id834477"></a>
+<a name="id834625"></a>
           <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">adapter</span><span class="special">/</span><span class="identifier">unfused_typed</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused_typed.synopsis"></a><h5>
-<a name="id624474"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.functional.adapters.unfused_typed.synopsis"></a><h6>
-<a name="id834546"></a>
+<a name="id834695"></a>
           <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Function</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">class</span> <span class="identifier">unfused_typed</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused_typed.template_parameters"></a><h5>
-<a name="id624570"></a>
-          <a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.template_parameters">Template
-=======
 <a name="fusion.functional.adapters.unfused_typed.template_parameters"></a><h6>
-<a name="id834614"></a>
+<a name="id834762"></a>
           <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.template_parameters">Template
->>>>>>> .merge-right.r57125
           parameters</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -127,160 +90,171 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Default
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Function</span></tt>
-                </p></td>
-<td><p>
-                  A unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Function</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A unary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
                   Function Object</a>
-                </p></td>
-<td><p>
-                </p></td>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-                </p></td>
-<td><p>
-                  A Sequence
-                </p></td>
-<td><p>
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Sequence</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A <a class="link" href="../../sequence.html" title="Sequence">Sequence</a>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused_typed.model_of"></a><h5>
-<a name="id624726"></a>
-          <a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.model_of">Model
-=======
 <a name="fusion.functional.adapters.unfused_typed.model_of"></a><h6>
-<a name="id834738"></a>
+<a name="id834887"></a>
           <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.model_of">Model
->>>>>>> .merge-right.r57125
           of</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
+        </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
             Object</a></li>
-<li><a href="../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred Callable
+<li class="listitem"><a class="link" href="../concepts/def_callable.html" title="Deferred Callable Object">Deferred Callable
             Object</a></li>
 </ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
 <dd><p>
-              A possibly const qualified, unary <a href="../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+              A possibly const qualified, unary <a class="link" href="../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
               Function Object</a> type or reference type thereof
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
 <dd><p>
-              An object convertible to <tt class="computeroutput"><span class="identifier">F</span></tt>
+              An object convertible to <code class="computeroutput"><span class="identifier">F</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">S</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">S</span></code></span></dt>
 <dd><p>
-              A Sequence of parameter types
+              A <a class="link" href="../../sequence.html" title="Sequence">Sequence</a> of parameter types
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">UT</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">UT</span></code></span></dt>
 <dd><p>
-              The type <tt class="computeroutput"><span class="identifier">unfused_typed</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">,</span><span class="identifier">S</span><span class="special">&gt;</span></tt>
+              The type <code class="computeroutput"><span class="identifier">unfused_typed</span><span class="special">&lt;</span><span class="identifier">F</span><span class="special">,</span><span class="identifier">S</span><span class="special">&gt;</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">ut</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">ut</span></code></span></dt>
 <dd><p>
-              An instance of <tt class="computeroutput"><span class="identifier">UT</span></tt>,
-              initialized with <tt class="computeroutput"><span class="identifier">f</span></tt>
+              An instance of <code class="computeroutput"><span class="identifier">UT</span></code>,
+              initialized with <code class="computeroutput"><span class="identifier">f</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code></span></dt>
 <dd><p>
-              Arguments to <tt class="computeroutput"><span class="identifier">ut</span></tt>, convertible
-              to the types in <tt class="computeroutput"><span class="identifier">S</span></tt>
+              Arguments to <code class="computeroutput"><span class="identifier">ut</span></code>, convertible
+              to the types in <code class="computeroutput"><span class="identifier">S</span></code>
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused_typed.expression_semantics"></a><h5>
-<a name="id625048"></a>
-          <a href="unfused_typed.html#fusion.functional.adapters.unfused_typed.expression_semantics">Expression
-=======
 <a name="fusion.functional.adapters.unfused_typed.expression_semantics"></a><h6>
-<a name="id834968"></a>
+<a name="id835116"></a>
           <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">UT</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">UT</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Creates a fused function as described above, initializes the target
-                  function with <tt class="computeroutput"><span class="identifier">f</span></tt>.
-                </p></td>
+                  function with <code class="computeroutput"><span class="identifier">f</span></code>.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">UT</span><span class="special">()</span></tt>
-                </p></td>
-<td><p>
-                  Creates a fused function as described above, attempts to use <tt class="computeroutput"><span class="identifier">F</span></tt>'s default constructor.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">UT</span><span class="special">()</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Creates a fused function as described above, attempts to use <code class="computeroutput"><span class="identifier">F</span></code>'s default constructor.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">ut</span><span class="special">(</span><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  Calls <tt class="computeroutput"><span class="identifier">f</span></tt> with an
-                  instance of <tt class="computeroutput"><span class="identifier">S</span></tt> (or
-                  a subsequence of <tt class="computeroutput"><span class="identifier">S</span></tt>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">ut</span><span class="special">(</span><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Calls <code class="computeroutput"><span class="identifier">f</span></code> with an
+                  instance of <code class="computeroutput"><span class="identifier">S</span></code> (or
+                  a subsequence of <code class="computeroutput"><span class="identifier">S</span></code>
                   starting at the first element, if fewer arguments are given and
-                  the overload hasn't been disabled) initialized with <tt class="computeroutput"><span class="identifier">a0</span></tt>...<tt class="computeroutput"><span class="identifier">aN</span></tt>.
-                </p></td>
+                  the overload hasn't been disabled) initialized with <code class="computeroutput"><span class="identifier">a0</span></code>...<code class="computeroutput"><span class="identifier">aN</span></code>.
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused_typed.example"></a><h5>
-<a name="id625330"></a>
-          Example
-        </h5>
-=======
 <a name="fusion.functional.adapters.unfused_typed.example"></a><h6>
-<a name="id835172"></a>
+<a name="id835320"></a>
           <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.example">Example</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">add_assign</span> <span class="comment">// applies operator+=
 </span><span class="special">{</span>
     <span class="keyword">typedef</span> <span class="keyword">void</span> <span class="identifier">result_type</span><span class="special">;</span> <span class="comment">// for simplicity
@@ -345,30 +319,19 @@
     <span class="identifier">assert</span><span class="special">(</span><span class="identifier">a</span> <span class="special">==</span> <span class="number">8</span> <span class="special">&amp;&amp;</span> <span class="identifier">b</span> <span class="special">==</span> <span class="char">'Z'</span><span class="special">);</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.adapters.unfused_typed.see_also"></a><h5>
-<a name="id626820"></a>
-          See also
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>unfused</li>
-<li>deduce</li>
-<li>deduce_sequence</li>
-=======
 <a name="fusion.functional.adapters.unfused_typed.see_also"></a><h6>
-<a name="id836835"></a>
+<a name="id837529"></a>
           <a class="link" href="unfused_typed.html#fusion.functional.adapters.unfused_typed.see_also">See also</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem"><a class="link" href="unfused.html" title="unfused"><code class="computeroutput"><span class="identifier">unfused</span></code></a></li>
 <li class="listitem"><a class="link" href="../../support/deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li>
 <li class="listitem"><a class="link" href="../../support/deduce_sequence.html" title="deduce_sequence"><code class="computeroutput"><span class="identifier">deduce_sequence</span></code></a></li>
->>>>>>> .merge-right.r57125
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/concepts.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/concepts.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/concepts.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Concepts</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../functional.html" title="Functional">
-<link rel="previous" href="../functional.html" title="Functional">
-<link rel="next" href="concepts/callable.html" title=" Callable Object">
+<link rel="prev" href="../functional.html" title="Functional">
+<link rel="next" href="concepts/callable.html" title="Callable Object">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../functional.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functional.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="concepts/callable.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.functional.concepts"></a>Concepts
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Concepts">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.functional.concepts"></a><a class="link" href="concepts.html" title="Concepts">Concepts</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"> Callable Object</span></dt>
 <dt><span class="section"><a href="concepts/reg_callable.html"> Regular Callable
@@ -45,7 +38,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/concepts/callable.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/concepts/callable.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/concepts/callable.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,18 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Callable Object</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Callable Object</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="../concepts.html" title="Concepts">
-<link rel="next" href="reg_callable.html" title=" Regular Callable
-        Object">
+<link rel="prev" href="../concepts.html" title="Concepts">
+<link rel="next" href="reg_callable.html" title="Regular Callable Object">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -27,68 +22,38 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../concepts.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reg_callable.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.concepts.callable"></a> Callable Object
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.concepts.callable.description"></a><h5>
-<a name="id609740"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="Callable Object">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.functional.concepts.callable"></a><a class="link" href="callable.html" title="Callable Object"> Callable Object</a>
 </h4></div></div></div>
 <a name="fusion.functional.concepts.callable.description"></a><h6>
-<a name="id816649"></a>
+<a name="id819546"></a>
           <a class="link" href="callable.html#fusion.functional.concepts.callable.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           A pointer to a function, a pointer to member function, a pointer to member
           data, or a class type whose objects can appear immediately to the left
           of a function call operator.
         </p>
-<<<<<<< .working
-<a name="fusion.functional.concepts.callable.models"></a><h5>
-<a name="id609771"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>
-=======
 <a name="fusion.functional.concepts.callable.models"></a><h6>
-<a name="id816666"></a>
+<a name="id819563"></a>
           <a class="link" href="callable.html#fusion.functional.concepts.callable.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
->>>>>>> .merge-right.r57125
             function pointer types
           </li>
-<li>
+<li class="listitem">
             member (function or data) pointer types
           </li>
-<li>
+<li class="listitem">
             all kinds of function objects
           </li>
 </ul></div>
-<<<<<<< .working
-<a name="fusion.functional.concepts.callable.examples"></a><h5>
-<a name="id609812"></a>
-          Examples
-        </h5>
-=======
 <a name="fusion.functional.concepts.callable.examples"></a><h6>
-<a name="id816695"></a>
+<a name="id819592"></a>
           <a class="link" href="callable.html#fusion.functional.concepts.callable.examples">Examples</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="special">&amp;</span> <span class="identifier">a_free_function</span>
 <span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
 <span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_nonstatic_data_member</span>
@@ -97,13 +62,12 @@
 <span class="comment">// using namespace boost;
 </span><span class="identifier">bind</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(),</span> <span class="identifier">_1</span><span class="special">,</span> <span class="number">5</span><span class="special">)</span>
 <span class="identifier">lambda</span><span class="special">::</span><span class="identifier">_1</span> <span class="special">+=</span> <span class="identifier">lambda</span><span class="special">::</span><span class="identifier">_2</span><span class="special">;</span>
-<span class="identifier">fusion</span><span class="special">::</span><a href="../generation/functions/mk_fused_fobj.html" title="
-          make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;())</span>
+<span class="identifier">fusion</span><span class="special">::</span><a class="link" href="../generation/functions/mk_fused_fobj.html" title="make_fused_function_object"><code class="computeroutput"><span class="identifier">make_fused_function_object</span></code></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;())</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/concepts/def_callable.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/concepts/def_callable.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/concepts/def_callable.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,20 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Deferred
-        Callable Object</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Deferred Callable Object</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="reg_callable.html" title=" Regular Callable
-        Object">
-<link rel="next" href="poly.html" title=" Polymorphic Function
-        Object">
+<link rel="prev" href="reg_callable.html" title="Regular Callable Object">
+<link rel="next" href="poly.html" title="Polymorphic Function Object">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -29,150 +22,118 @@
 <div class="spirit-nav">
 <a accesskey="p" href="reg_callable.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="poly.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.concepts.def_callable"></a><a href="def_callable.html" title=" Deferred
-        Callable Object"> Deferred
+<div class="section" title="Deferred Callable Object">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.concepts.def_callable"></a><a class="link" href="def_callable.html" title="Deferred Callable Object"> Deferred
         Callable Object</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.concepts.def_callable.description"></a><h5>
-<a name="id610834"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.functional.concepts.def_callable.description"></a><h6>
-<a name="id817426"></a>
+<a name="id820334"></a>
           <a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          Callable Object
+          <a class="link" href="callable.html" title="Callable Object">Callable Object</a>
           types that work with Boost.ResultOf
           to determine the result of a call.
         </p>
-<<<<<<< .working
-<a name="fusion.functional.concepts.def_callable.refinement_of"></a><h5>
-<a name="id610880"></a>
-          <a href="def_callable.html#fusion.functional.concepts.def_callable.refinement_of">Refinement
-=======
 <a name="fusion.functional.concepts.def_callable.refinement_of"></a><h6>
-<a name="id817452"></a>
+<a name="id820360"></a>
           <a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.refinement_of">Refinement
->>>>>>> .merge-right.r57125
           of</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc"><li>Callable Object</li></ul></div>
-<div class="sidebar"><p>
-          note Once C++ supports the <tt class="literal">decltype</tt> keyword, all models
-          of Callable Object
-          will also be models of <a href="def_callable.html" title=" Deferred
-        Callable Object">Deferred
+        </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="callable.html" title="Callable Object">Callable Object</a></li></ul></div>
+<div class="sidebar">
+<p class="title"><b></b></p>
+<p>
+          note Once C++ supports the <code class="literal">decltype</code> keyword, all models
+          of <a class="link" href="callable.html" title="Callable Object">Callable Object</a>
+          will also be models of <a class="link" href="def_callable.html" title="Deferred Callable Object">Deferred
           Callable Object</a>, because function objects won't need client-side
-          support for <tt class="computeroutput"><span class="identifier">result_of</span></tt>.
-        </p></div>
-<div class="variablelist">
+          support for <code class="computeroutput"><span class="identifier">result_of</span></code>.
+        </p>
+</div>
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
 <dd><p>
               A possibly const qualified Deferred Callable Object type
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">A1</span>
-          <span class="special">...</span><span class="identifier">AN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">A1</span>
+          <span class="special">...</span><span class="identifier">AN</span></code></span></dt>
 <dd><p>
               Argument types
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">a1</span>
-          <span class="special">...</span><span class="identifier">aN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">a1</span>
+          <span class="special">...</span><span class="identifier">aN</span></code></span></dt>
 <dd><p>
-              Objects or references to objects with types <tt class="computeroutput"><span class="identifier">A1</span>
-              <span class="special">...</span><span class="identifier">AN</span></tt>
+              Objects or references to objects with types <code class="computeroutput"><span class="identifier">A1</span>
+              <span class="special">...</span><span class="identifier">AN</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">T1</span>
-          <span class="special">...</span><span class="identifier">TN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">T1</span>
+          <span class="special">...</span><span class="identifier">TN</span></code></span></dt>
 <dd><p>
-              <tt class="computeroutput"><span class="identifier">T</span></tt>i is <tt class="computeroutput"><span class="identifier">A</span></tt>i <tt class="computeroutput"><span class="special">&amp;</span></tt>
-              if <tt class="computeroutput"><span class="identifier">a</span></tt>i is an LValue,
-              same as <tt class="computeroutput"><span class="identifier">A</span></tt>i, otherwise
+              <code class="computeroutput"><span class="identifier">T</span></code>i is <code class="computeroutput"><span class="identifier">A</span></code>i <code class="computeroutput"><span class="special">&amp;</span></code>
+              if <code class="computeroutput"><span class="identifier">a</span></code>i is an LValue,
+              same as <code class="computeroutput"><span class="identifier">A</span></code>i, otherwise
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.functional.concepts.def_callable.expression_requirements"></a><h5>
-<a name="id611182"></a>
-          <a href="def_callable.html#fusion.functional.concepts.def_callable.expression_requirements">Expression
-=======
 <a name="fusion.functional.concepts.def_callable.expression_requirements"></a><h6>
-<a name="id817667"></a>
+<a name="id820575"></a>
           <a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.expression_requirements">Expression
->>>>>>> .merge-right.r57125
           requirements</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Type
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  boost::result_of<tt class="computeroutput"><span class="special">&lt;</span> <span class="identifier">F</span><span class="special">(</span><span class="identifier">T1</span>
-                  <span class="special">...</span><span class="identifier">TN</span><span class="special">)</span> <span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
-                  Result of a call with <tt class="computeroutput"><span class="identifier">A1</span>
-                  <span class="special">...</span><span class="identifier">AN</span></tt>-typed
+<td>
+                <p>
+                  boost::result_of<code class="computeroutput"><span class="special">&lt;</span> <span class="identifier">F</span><span class="special">(</span><span class="identifier">T1</span>
+                  <span class="special">...</span><span class="identifier">TN</span><span class="special">)</span> <span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Result of a call with <code class="computeroutput"><span class="identifier">A1</span>
+                  <span class="special">...</span><span class="identifier">AN</span></code>-typed
                   arguments
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.concepts.def_callable.models"></a><h5>
-<a name="id611364"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>
-<a href="poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-=======
 <a name="fusion.functional.concepts.def_callable.models"></a><h6>
-<a name="id820004"></a>
+<a name="id820712"></a>
           <a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
 <a class="link" href="poly.html" title="Polymorphic Function Object">Polymorphic Function
->>>>>>> .merge-right.r57125
             Object</a> types
           </li>
-<li>
+<li class="listitem">
             member (function or data) pointer types
           </li>
 </ul></div>
-<<<<<<< .working
-<a name="fusion.functional.concepts.def_callable.examples"></a><h5>
-<a name="id611409"></a>
-          Examples
-        </h5>
-=======
 <a name="fusion.functional.concepts.def_callable.examples"></a><h6>
-<a name="id820034"></a>
+<a name="id820742"></a>
           <a class="link" href="def_callable.html#fusion.functional.concepts.def_callable.examples">Examples</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="special">&amp;</span> <span class="identifier">a_free_function</span>
 <span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
 <span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_nonstatic_data_member</span>
@@ -181,13 +142,12 @@
 <span class="comment">// using namespace boost;
 </span><span class="identifier">bind</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(),</span> <span class="identifier">_1</span><span class="special">,</span> <span class="number">5</span><span class="special">)</span>
 <span class="comment">// Note: Boost.Lambda expressions don't work with __boost_result_of__
-</span><span class="identifier">fusion</span><span class="special">::</span><a href="../generation/functions/mk_fused_fobj.html" title="
-          make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;())</span>
+</span><span class="identifier">fusion</span><span class="special">::</span><a class="link" href="../generation/functions/mk_fused_fobj.html" title="make_fused_function_object"><code class="computeroutput"><span class="identifier">make_fused_function_object</span></code></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;())</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/concepts/poly.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/concepts/poly.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/concepts/poly.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,18 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Polymorphic Function
-        Object</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Polymorphic Function Object</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="def_callable.html" title=" Deferred
-        Callable Object">
+<link rel="prev" href="def_callable.html" title="Deferred Callable Object">
 <link rel="next" href="../invocation.html" title="Invocation">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,93 +22,66 @@
 <div class="spirit-nav">
 <a accesskey="p" href="def_callable.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../invocation.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.concepts.poly"></a><a href="poly.html" title=" Polymorphic Function
-        Object"> Polymorphic Function
+<div class="section" title="Polymorphic Function Object">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.concepts.poly"></a><a class="link" href="poly.html" title="Polymorphic Function Object"> Polymorphic Function
         Object</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.concepts.poly.description"></a><h5>
-<a name="id611708"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.functional.concepts.poly.description"></a><h6>
-<a name="id820240"></a>
+<a name="id820948"></a>
           <a class="link" href="poly.html#fusion.functional.concepts.poly.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          A non-member-pointer <a href="def_callable.html" title=" Deferred
-        Callable Object">Deferred
+          A non-member-pointer <a class="link" href="def_callable.html" title="Deferred Callable Object">Deferred
           Callable Object</a> type.
         </p>
-<<<<<<< .working
-<a name="fusion.functional.concepts.poly.refinement_of"></a><h5>
-<a name="id611746"></a>
-          <a href="poly.html#fusion.functional.concepts.poly.refinement_of">Refinement
-=======
 <a name="fusion.functional.concepts.poly.refinement_of"></a><h6>
-<a name="id820262"></a>
+<a name="id820970"></a>
           <a class="link" href="poly.html#fusion.functional.concepts.poly.refinement_of">Refinement
->>>>>>> .merge-right.r57125
           of</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="reg_callable.html" title=" Regular Callable
-        Object">Regular Callable
+        </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="reg_callable.html" title="Regular Callable Object">Regular Callable
             Object</a></li>
-<li><a href="def_callable.html" title=" Deferred
-        Callable Object">Deferred Callable
+<li class="listitem"><a class="link" href="def_callable.html" title="Deferred Callable Object">Deferred Callable
             Object</a></li>
 </ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
 <dd><p>
               A possibly const-qualified Polymorphic Function Object type
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
 <dd><p>
               An object or reference to an object of type F
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">A1</span>
-          <span class="special">...</span><span class="identifier">AN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">A1</span>
+          <span class="special">...</span><span class="identifier">AN</span></code></span></dt>
 <dd><p>
               Argument types
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">a1</span>
-          <span class="special">...</span><span class="identifier">aN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">a1</span>
+          <span class="special">...</span><span class="identifier">aN</span></code></span></dt>
 <dd><p>
-              Objects or references to objects with types <tt class="computeroutput"><span class="identifier">A1</span>
-              <span class="special">...</span><span class="identifier">AN</span></tt>
+              Objects or references to objects with types <code class="computeroutput"><span class="identifier">A1</span>
+              <span class="special">...</span><span class="identifier">AN</span></code>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">T1</span>
-          <span class="special">...</span><span class="identifier">TN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">T1</span>
+          <span class="special">...</span><span class="identifier">TN</span></code></span></dt>
 <dd><p>
-              <tt class="computeroutput"><span class="identifier">T</span></tt>i is <tt class="computeroutput"><span class="identifier">A</span></tt>i <tt class="computeroutput"><span class="special">&amp;</span></tt>
-              if <tt class="computeroutput"><span class="identifier">a</span></tt>i is an LValue,
-              same as <tt class="computeroutput"><span class="identifier">A</span></tt>i, otherwise
+              <code class="computeroutput"><span class="identifier">T</span></code>i is <code class="computeroutput"><span class="identifier">A</span></code>i <code class="computeroutput"><span class="special">&amp;</span></code>
+              if <code class="computeroutput"><span class="identifier">a</span></code>i is an LValue,
+              same as <code class="computeroutput"><span class="identifier">A</span></code>i, otherwise
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.functional.concepts.poly.expression_requirements"></a><h5>
-<a name="id612034"></a>
-          <a href="poly.html#fusion.functional.concepts.poly.expression_requirements">Expression
-=======
 <a name="fusion.functional.concepts.poly.expression_requirements"></a><h6>
-<a name="id820471"></a>
+<a name="id821178"></a>
           <a class="link" href="poly.html#fusion.functional.concepts.poly.expression_requirements">Expression
->>>>>>> .merge-right.r57125
           requirements</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -122,79 +89,74 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Return Type
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Runtime Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">a1</span><span class="special">,</span>
-                  <span class="special">...</span><span class="identifier">aN</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">result_of</span><span class="special">&lt;</span>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">a1</span><span class="special">,</span>
+                  <span class="special">...</span><span class="identifier">aN</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">result_of</span><span class="special">&lt;</span>
                   <span class="identifier">F</span><span class="special">(</span><span class="identifier">T1</span><span class="special">,</span>
-                  <span class="special">...</span><span class="identifier">TN</span><span class="special">)</span> <span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+                  <span class="special">...</span><span class="identifier">TN</span><span class="special">)</span> <span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Unspecified
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.concepts.poly.models"></a><h5>
-<a name="id612231"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>
-=======
 <a name="fusion.functional.concepts.poly.models"></a><h6>
-<a name="id820623"></a>
+<a name="id821331"></a>
           <a class="link" href="poly.html#fusion.functional.concepts.poly.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
->>>>>>> .merge-right.r57125
             function pointers
           </li>
-<li>
+<li class="listitem">
             function objects of the Standard Library
           </li>
-<li>
-            all Fusion functional adapters
+<li class="listitem">
+            all Fusion <a class="link" href="../adapters.html" title="Adapters">functional adapters</a>
 </li>
 </ul></div>
-<<<<<<< .working
-<a name="fusion.functional.concepts.poly.examples"></a><h5>
-<a name="id612283"></a>
-          Examples
-        </h5>
-=======
 <a name="fusion.functional.concepts.poly.examples"></a><h6>
-<a name="id820656"></a>
+<a name="id821363"></a>
           <a class="link" href="poly.html#fusion.functional.concepts.poly.examples">Examples</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="special">&amp;</span> <span class="identifier">a_free_function</span>
 <span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;()</span>
 <span class="comment">// using namespace boost;
 </span><span class="identifier">bind</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(),</span> <span class="identifier">_1</span><span class="special">,</span> <span class="number">5</span><span class="special">)</span>
 <span class="comment">// Note: Boost.Lambda expressions don't work with __boost_result_of__
-</span><span class="identifier">fusion</span><span class="special">::</span><a href="../generation/functions/mk_fused_fobj.html" title="
-          make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;())</span>
+</span><span class="identifier">fusion</span><span class="special">::</span><a class="link" href="../generation/functions/mk_fused_fobj.html" title="make_fused_function_object"><code class="computeroutput"><span class="identifier">make_fused_function_object</span></code></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;())</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/concepts/reg_callable.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/concepts/reg_callable.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/concepts/reg_callable.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,19 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Regular Callable
-        Object</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Regular Callable Object</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="callable.html" title=" Callable Object">
-<link rel="next" href="def_callable.html" title=" Deferred
-        Callable Object">
+<link rel="prev" href="callable.html" title="Callable Object">
+<link rel="next" href="def_callable.html" title="Deferred Callable Object">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -28,79 +22,55 @@
 <div class="spirit-nav">
 <a accesskey="p" href="callable.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="def_callable.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.concepts.reg_callable"></a><a href="reg_callable.html" title=" Regular Callable
-        Object"> Regular Callable
+<div class="section" title="Regular Callable Object">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.concepts.reg_callable"></a><a class="link" href="reg_callable.html" title="Regular Callable Object"> Regular Callable
         Object</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.concepts.reg_callable.description"></a><h5>
-<a name="id610148"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.functional.concepts.reg_callable.description"></a><h6>
-<a name="id816930"></a>
+<a name="id819827"></a>
           <a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          A non-member-pointer <a href="callable.html" title=" Callable Object">Callable
+          A non-member-pointer <a class="link" href="callable.html" title="Callable Object">Callable
           Object</a> type: A pointer to a function or a class type whose objects
           can appear immediately to the left of a function call operator.
         </p>
-<<<<<<< .working
-<a name="fusion.functional.concepts.reg_callable.refinement_of"></a><h5>
-<a name="id610189"></a>
-          <a href="reg_callable.html#fusion.functional.concepts.reg_callable.refinement_of">Refinement
-=======
 <a name="fusion.functional.concepts.reg_callable.refinement_of"></a><h6>
-<a name="id816952"></a>
+<a name="id819849"></a>
           <a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.refinement_of">Refinement
->>>>>>> .merge-right.r57125
           of</a>
-        </h5>
-<div class="itemizedlist"><ul type="disc"><li>Callable Object</li></ul></div>
-<div class="variablelist">
+        </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="callable.html" title="Callable Object">Callable Object</a></li></ul></div>
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
 <dd><p>
               A possibly const qualified Deferred Callable Object type
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
 <dd><p>
               An object or reference to an object of type F
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">A1</span>
-          <span class="special">...</span><span class="identifier">AN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">A1</span>
+          <span class="special">...</span><span class="identifier">AN</span></code></span></dt>
 <dd><p>
               Argument types
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">a1</span>
-          <span class="special">...</span><span class="identifier">aN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">a1</span>
+          <span class="special">...</span><span class="identifier">aN</span></code></span></dt>
 <dd><p>
-              Objects or references to objects with types <tt class="computeroutput"><span class="identifier">A1</span>
-              <span class="special">...</span><span class="identifier">AN</span></tt>
+              Objects or references to objects with types <code class="computeroutput"><span class="identifier">A1</span>
+              <span class="special">...</span><span class="identifier">AN</span></code>
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.functional.concepts.reg_callable.expression_requirements"></a><h5>
-<a name="id610374"></a>
-          <a href="reg_callable.html#fusion.functional.concepts.reg_callable.expression_requirements">Expression
-=======
 <a name="fusion.functional.concepts.reg_callable.expression_requirements"></a><h6>
-<a name="id817092"></a>
+<a name="id819989"></a>
           <a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.expression_requirements">Expression
->>>>>>> .merge-right.r57125
           requirements</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -108,74 +78,69 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Return Type
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Runtime Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">a1</span><span class="special">,</span>
-                  <span class="special">...</span><span class="identifier">aN</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">a1</span><span class="special">,</span>
+                  <span class="special">...</span><span class="identifier">aN</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Unspecified
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Unspecified
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.functional.concepts.reg_callable.models"></a><h5>
-<a name="id610508"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>
-=======
 <a name="fusion.functional.concepts.reg_callable.models"></a><h6>
-<a name="id817200"></a>
+<a name="id820097"></a>
           <a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
->>>>>>> .merge-right.r57125
             function pointer types
           </li>
-<li>
+<li class="listitem">
             all kinds of function objects
           </li>
 </ul></div>
-<<<<<<< .working
-<a name="fusion.functional.concepts.reg_callable.examples"></a><h5>
-<a name="id610545"></a>
-          Examples
-        </h5>
-=======
 <a name="fusion.functional.concepts.reg_callable.examples"></a><h6>
-<a name="id817224"></a>
+<a name="id820132"></a>
           <a class="link" href="reg_callable.html#fusion.functional.concepts.reg_callable.examples">Examples</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="special">&amp;</span> <span class="identifier">a_free_function</span>
 <span class="special">&amp;</span> <span class="identifier">a_class</span><span class="special">::</span><span class="identifier">a_static_member_function</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;()</span>
 <span class="comment">// using namespace boost;
 </span><span class="identifier">bind</span><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(),</span> <span class="identifier">_1</span><span class="special">,</span> <span class="number">5</span><span class="special">)</span>
 <span class="identifier">lambda</span><span class="special">::</span><span class="identifier">_1</span> <span class="special">+=</span> <span class="identifier">lambda</span><span class="special">::</span><span class="identifier">_2</span><span class="special">;</span>
-<span class="identifier">fusion</span><span class="special">::</span><a href="../generation/functions/mk_fused_fobj.html" title="
-          make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;())</span>
+<span class="identifier">fusion</span><span class="special">::</span><a class="link" href="../generation/functions/mk_fused_fobj.html" title="make_fused_function_object"><code class="computeroutput"><span class="identifier">make_fused_function_object</span></code></a><span class="special">(</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">less</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;())</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Generation</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../functional.html" title="Functional">
-<link rel="previous" href="adapters/limits.html" title="Limits">
+<link rel="prev" href="adapters/limits.html" title="Limits">
 <link rel="next" href="generation/functions.html" title="Functions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="adapters/limits.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functional.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="generation/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.functional.generation"></a>Generation
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Generation">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.functional.generation"></a><a class="link" href="generation.html" title="Generation">Generation</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Functions</span></dt>
 <dt><span class="section">Metafunctions</span></dt>
@@ -40,7 +33,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/functions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,18 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../generation.html" title="Generation">
-<link rel="previous" href="../generation.html" title="Generation">
-<link rel="next" href="functions/mk_fused.html" title="
-          make_fused">
+<link rel="prev" href="../generation.html" title="Generation">
+<link rel="next" href="functions/mk_fused.html" title="make_fused">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -27,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../generation.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../generation.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="functions/mk_fused.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.generation.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.generation.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="functions/mk_fused.html">
           make_fused</a></span></dt>
@@ -47,7 +39,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,23 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          make_fused</title>
+<title>make_fused</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="../functions.html" title="Functions">
-<link rel="next" href="mk_fused_proc.html" title="
-          make_fused_procedure">
+<link rel="prev" href="../functions.html" title="Functions">
+<link rel="next" href="mk_fused_proc.html" title="make_fused_procedure">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -32,112 +22,31 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../functions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_fused_proc.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.generation.functions.mk_fused"></a><a href="mk_fused.html" title="
-          make_fused">
+<div class="section" title="make_fused">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.generation.functions.mk_fused"></a><a class="link" href="mk_fused.html" title="make_fused">
           make_fused</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.generation.functions.mk_fused.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id627145"></a>
-            Description
-=======
-<a name="id878022"></a>
-=======
-<a name="id844666"></a>
-=======
-<a name="id837041"></a>
-=======
-<a name="id859313"></a>
-=======
-<a name="id847566"></a>
-=======
-<a name="id844289"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id837736"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Creates a fused adapter for a given <a href="../../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred Callable Object</a>.
-            The usual <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+            Creates a <a class="link" href="../../adapters/fused.html" title="fused"><code class="computeroutput"><span class="identifier">fused</span></code></a> adapter for a given <a class="link" href="../../concepts/def_callable.html" title="Deferred Callable Object">Deferred Callable Object</a>.
+            The usual <a class="link" href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
             conversion</em></span></a> is applied to the target function.
           </p>
 <a name="fusion.functional.generation.functions.mk_fused.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id627211"></a>
-            Synopsis
-=======
-<a name="id878064"></a>
-=======
-<a name="id844708"></a>
-=======
-<a name="id837083"></a>
-=======
-<a name="id859355"></a>
-=======
-<a name="id847608"></a>
-=======
-<a name="id844331"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id837778"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
-<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_fused.html" title="
-          make_fused"><tt class="computeroutput"><span class="identifier">make_fused</span></tt></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">inline</span> <span class="keyword">typename</span> <a class="link" href="../metafunctions/mk_fused.html" title="make_fused"><code class="computeroutput"><span class="identifier">make_fused</span></code></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_fused</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_fused.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id627363"></a>
-            Parameters
-=======
-<a name="id878171"></a>
-=======
-<a name="id844814"></a>
-=======
-<a name="id837190"></a>
-=======
-<a name="id859462"></a>
-=======
-<a name="id847715"></a>
-=======
-<a name="id844438"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id837884"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -146,175 +55,85 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">f</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">f</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/def_callable.html" title="Deferred Callable Object">Deferred
                     Callable Object</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The function to transform.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.functional.generation.functions.mk_fused.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id627478"></a>
-            <a href="mk_fused.html#fusion.functional.generation.functions.mk_fused.expression_semantics">Expression
-=======
-<a name="id878261"></a>
-=======
-<a name="id844904"></a>
-=======
-<a name="id837280"></a>
-=======
-<a name="id859552"></a>
-=======
-<a name="id847805"></a>
-=======
-<a name="id844528"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id837974"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">make_fused</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A specialization of fused.
+            <span class="bold"><strong>Return type</strong></span>: A specialization of <a class="link" href="../../adapters/fused.html" title="fused"><code class="computeroutput"><span class="identifier">fused</span></code></a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a fused adapter for <tt class="computeroutput"><span class="identifier">f</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a <a class="link" href="../../adapters/fused.html" title="fused"><code class="computeroutput"><span class="identifier">fused</span></code></a> adapter for <code class="computeroutput"><span class="identifier">f</span></code>.
           </p>
 <a name="fusion.functional.generation.functions.mk_fused.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id627600"></a>
-            Header
-=======
-<a name="id878336"></a>
-=======
-<a name="id844980"></a>
-=======
-<a name="id837356"></a>
-=======
-<a name="id859628"></a>
-=======
-<a name="id847880"></a>
-=======
-<a name="id844604"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id838050"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_fused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_fused.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id627766"></a>
-            Example
-=======
-<a name="id878452"></a>
-=======
-<a name="id845095"></a>
-=======
-<a name="id837471"></a>
-=======
-<a name="id859743"></a>
-=======
-<a name="id847996"></a>
-=======
-<a name="id844719"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id838165"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">float</span> <span class="identifier">sub</span><span class="special">(</span><span class="keyword">float</span> <span class="identifier">a</span><span class="special">,</span> <span class="keyword">float</span> <span class="identifier">b</span><span class="special">)</span> <span class="special">{</span> <span class="keyword">return</span> <span class="identifier">a</span> <span class="special">-</span> <span class="identifier">b</span><span class="special">;</span> <span class="special">}</span>
 
 <span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
 <span class="special">{</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">a</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">2.0f</span><span class="special">);</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">b</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1.5f</span><span class="special">);</span>
-    vector<span class="special">&lt;</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">c</span><span class="special">(</span><span class="number">1.0f</span><span class="special">,</span><span class="number">0.5f</span><span class="special">);</span>
-    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">c</span> <span class="special">==</span> transform<span class="special">(</span>zip<span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">make_fused</span><span class="special">(&amp;</span> <span class="identifier">sub</span><span class="special">)));</span>
-    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">c</span> <span class="special">==</span> transform<span class="special">(</span>zip<span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">make_fused</span><span class="special">(</span>std::minus<span class="special">&lt;</span><span class="keyword">float</span><span class="special">&gt;())));</span>
+    <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">a</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">2.0f</span><span class="special">);</span>
+    <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">b</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1.5f</span><span class="special">);</span>
+    <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">c</span><span class="special">(</span><span class="number">1.0f</span><span class="special">,</span><span class="number">0.5f</span><span class="special">);</span>
+    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">c</span> <span class="special">==</span> <a class="link" href="../../../algorithm/transformation/functions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a><span class="special">(</span><a class="link" href="../../../algorithm/transformation/functions/zip.html" title="zip"><code class="computeroutput"><span class="identifier">zip</span></code></a><span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">make_fused</span><span class="special">(&amp;</span> <span class="identifier">sub</span><span class="special">)));</span>
+    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">c</span> <span class="special">==</span> <a class="link" href="../../../algorithm/transformation/functions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a><span class="special">(</span><a class="link" href="../../../algorithm/transformation/functions/zip.html" title="zip"><code class="computeroutput"><span class="identifier">zip</span></code></a><span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">make_fused</span><span class="special">(</span>std::minus<span class="special">&lt;</span><span class="keyword">float</span><span c
lass="special">&gt;())));</span>
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_fused.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id628366"></a>
-            <a href="mk_fused.html#fusion.functional.generation.functions.mk_fused.see_also">See
-=======
-<a name="id878880"></a>
-=======
-<a name="id845524"></a>
-=======
-<a name="id837899"></a>
-=======
-<a name="id860171"></a>
-=======
-<a name="id848424"></a>
-=======
-<a name="id845147"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id838594"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.functions.mk_fused.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>fused</li>
-<li>deduce</li>
-<li><a href="../metafunctions/mk_fused.html" title="
-          make_fused"><tt class="computeroutput"><span class="identifier">make_fused</span></tt></a></li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../../adapters/fused.html" title="fused"><code class="computeroutput"><span class="identifier">fused</span></code></a></li>
+<li class="listitem"><a class="link" href="../../../support/deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li>
+<li class="listitem"><a class="link" href="../metafunctions/mk_fused.html" title="make_fused"><code class="computeroutput"><span class="identifier">make_fused</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_fobj.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,24 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          make_fused_function_object</title>
+<title>make_fused_function_object</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="mk_fused_proc.html" title="
-          make_fused_procedure">
-<link rel="next" href="mk_unfused.html" title="
-          make_unfused">
+<link rel="prev" href="mk_fused_proc.html" title="make_fused_procedure">
+<link rel="next" href="mk_unfused.html" title="make_unfused">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -33,113 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="mk_fused_proc.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_unfused.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.generation.functions.mk_fused_fobj"></a><a href="mk_fused_fobj.html" title="
-          make_fused_function_object">
+<div class="section" title="make_fused_function_object">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.generation.functions.mk_fused_fobj"></a><a class="link" href="mk_fused_fobj.html" title="make_fused_function_object">
           make_fused_function_object</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.generation.functions.mk_fused_fobj.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id629481"></a>
-            Description
-=======
-<a name="id879926"></a>
-=======
-<a name="id846296"></a>
-=======
-<a name="id838672"></a>
-=======
-<a name="id860944"></a>
-=======
-<a name="id850290"></a>
-=======
-<a name="id847013"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id840459"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Creates a fused_function_object adapter
-            for a given <a href="../../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred
-            Callable Object</a>. The usual <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+            Creates a <a class="link" href="../../adapters/fused_function_object.html" title="fused_function_object"><code class="computeroutput"><span class="identifier">fused_function_object</span></code></a> adapter
+            for a given <a class="link" href="../../concepts/def_callable.html" title="Deferred Callable Object">Deferred
+            Callable Object</a>. The usual <a class="link" href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
             conversion</em></span></a> is applied to the target function.
           </p>
 <a name="fusion.functional.generation.functions.mk_fused_fobj.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id629550"></a>
-            Synopsis
-=======
-<a name="id879966"></a>
-=======
-<a name="id846336"></a>
-=======
-<a name="id838712"></a>
-=======
-<a name="id860984"></a>
-=======
-<a name="id850329"></a>
-=======
-<a name="id847052"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id840499"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
-<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_fused_fobj.html" title="
-          make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">inline</span> <span class="keyword">typename</span> <a class="link" href="../metafunctions/mk_fused_fobj.html" title="make_fused_function_object"><code class="computeroutput"><span class="identifier">make_fused_function_object</span></code></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_fused_function_object</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_fused_fobj.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id629701"></a>
-            Parameters
-=======
-<a name="id880075"></a>
-=======
-<a name="id846445"></a>
-=======
-<a name="id838821"></a>
-=======
-<a name="id861093"></a>
-=======
-<a name="id850438"></a>
-=======
-<a name="id847162"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id840608"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -148,129 +56,65 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">f</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">f</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
                     Function Object</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The function to transform.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.functional.generation.functions.mk_fused_fobj.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id629814"></a>
-            <a href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.expression_semantics">Expression
-=======
-<a name="id880165"></a>
-=======
-<a name="id846535"></a>
-=======
-<a name="id838911"></a>
-=======
-<a name="id862276"></a>
-=======
-<a name="id850528"></a>
-=======
-<a name="id847252"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id840698"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">make_fused_function_object</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A specialization of fused_function_object.
+            <span class="bold"><strong>Return type</strong></span>: A specialization of <a class="link" href="../../adapters/fused_function_object.html" title="fused_function_object"><code class="computeroutput"><span class="identifier">fused_function_object</span></code></a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a fused_function_object adapter
-            for <tt class="computeroutput"><span class="identifier">f</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a <a class="link" href="../../adapters/fused_function_object.html" title="fused_function_object"><code class="computeroutput"><span class="identifier">fused_function_object</span></code></a> adapter
+            for <code class="computeroutput"><span class="identifier">f</span></code>.
           </p>
 <a name="fusion.functional.generation.functions.mk_fused_fobj.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id629938"></a>
-            Header
-=======
-<a name="id880243"></a>
-=======
-<a name="id846613"></a>
-=======
-<a name="id838989"></a>
-=======
-<a name="id862354"></a>
-=======
-<a name="id850606"></a>
-=======
-<a name="id847330"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id840776"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_fused_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_fused_fobj.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id630105"></a>
-            Example
-=======
-<a name="id880363"></a>
-=======
-<a name="id847280"></a>
-=======
-<a name="id839656"></a>
-=======
-<a name="id862474"></a>
-=======
-<a name="id850726"></a>
-=======
-<a name="id847450"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id840896"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">sub</span>
 <span class="special">{</span>
@@ -290,47 +134,21 @@
 
 <span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
 <span class="special">{</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">a</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">2.0f</span><span class="special">);</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">b</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1.5f</span><span class="special">);</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">c</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">0.5f</span><span class="special">);</span>
-    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">c</span> <span class="special">==</span> transform<span class="special">(</span>zip<span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">make_fused_function_object</span><span class="special">(</span><span class="identifier">sub</span><span class="special">())));</span>
+    <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">a</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">2.0f</span><span class="special">);</span>
+    <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">b</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1.5f</span><span class="special">);</span>
+    <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">c</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">0.5f</span><span class="special">);</span>
+    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">c</span> <span class="special">==</span> <a class="link" href="../../../algorithm/transformation/functions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a><span class="special">(</span><a class="link" href="../../../algorithm/transformation/functions/zip.html" title="zip"><code class="computeroutput"><span class="identifier">zip</span></code></a><span class="special">(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">),</span> <span class="identifier">make_fused_function_object</span><span class="special">(</span><span class="identifier">sub</span><span class="special">())));</span>
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_fused_fobj.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id630842"></a>
-            <a href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.see_also">See
-=======
-<a name="id880903"></a>
-=======
-<a name="id847820"></a>
-=======
-<a name="id840196"></a>
-=======
-<a name="id863014"></a>
-=======
-<a name="id851266"></a>
-=======
-<a name="id847990"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id841436"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.functions.mk_fused_fobj.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>fused_function_object</li>
-<li>deduce</li>
-<li><a href="../metafunctions/mk_fused_fobj.html" title="
-          make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a></li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../../adapters/fused_function_object.html" title="fused_function_object"><code class="computeroutput"><span class="identifier">fused_function_object</span></code></a></li>
+<li class="listitem"><a class="link" href="../../../support/deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li>
+<li class="listitem"><a class="link" href="../metafunctions/mk_fused_fobj.html" title="make_fused_function_object"><code class="computeroutput"><span class="identifier">make_fused_function_object</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_proc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_proc.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_fused_proc.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,24 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          make_fused_procedure</title>
+<title>make_fused_procedure</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="mk_fused.html" title="
-          make_fused">
-<link rel="next" href="mk_fused_fobj.html" title="
-          make_fused_function_object">
+<link rel="prev" href="mk_fused.html" title="make_fused">
+<link rel="next" href="mk_fused_fobj.html" title="make_fused_function_object">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -33,113 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="mk_fused.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_fused_fobj.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.generation.functions.mk_fused_proc"></a><a href="mk_fused_proc.html" title="
-          make_fused_procedure">
+<div class="section" title="make_fused_procedure">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.generation.functions.mk_fused_proc"></a><a class="link" href="mk_fused_proc.html" title="make_fused_procedure">
           make_fused_procedure</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.generation.functions.mk_fused_proc.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id628477"></a>
-            Description
-=======
-<a name="id878950"></a>
-=======
-<a name="id845593"></a>
-=======
-<a name="id837969"></a>
-=======
-<a name="id860241"></a>
-=======
-<a name="id848494"></a>
-=======
-<a name="id845217"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id838663"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Creates a fused_procedure adapter for
-            a given <a href="../../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred
-            Callable Object</a>. The usual <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+            Creates a <a class="link" href="../../adapters/fused_procedure.html" title="fused_procedure"><code class="computeroutput"><span class="identifier">fused_procedure</span></code></a> adapter for
+            a given <a class="link" href="../../concepts/def_callable.html" title="Deferred Callable Object">Deferred
+            Callable Object</a>. The usual <a class="link" href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
             conversion</em></span></a> applied to the target function.
           </p>
 <a name="fusion.functional.generation.functions.mk_fused_proc.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id628545"></a>
-            Synopsis
-=======
-<a name="id878989"></a>
-=======
-<a name="id845633"></a>
-=======
-<a name="id838008"></a>
-=======
-<a name="id860280"></a>
-=======
-<a name="id848533"></a>
-=======
-<a name="id845256"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id838703"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
-<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_fused_proc.html" title="
-          make_fused_procedure"><tt class="computeroutput"><span class="identifier">make_fused_procedure</span></tt></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">inline</span> <span class="keyword">typename</span> <a class="link" href="../metafunctions/mk_fused_proc.html" title="make_fused_procedure"><code class="computeroutput"><span class="identifier">make_fused_procedure</span></code></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_fused_procedure</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_fused_proc.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id628696"></a>
-            Parameters
-=======
-<a name="id879098"></a>
-=======
-<a name="id845742"></a>
-=======
-<a name="id838118"></a>
-=======
-<a name="id860390"></a>
-=======
-<a name="id848642"></a>
-=======
-<a name="id845366"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id838812"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -148,169 +56,80 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">f</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/callable.html" title=" Callable Object">Callable
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">f</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/callable.html" title="Callable Object">Callable
                     Object</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The function to transform.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.functional.generation.functions.mk_fused_proc.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id628810"></a>
-            <a href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.expression_semantics">Expression
-=======
-<a name="id879188"></a>
-=======
-<a name="id845832"></a>
-=======
-<a name="id838208"></a>
-=======
-<a name="id860480"></a>
-=======
-<a name="id848732"></a>
-=======
-<a name="id845456"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id838902"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">make_fused_procedure</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A specialization of fused_procedure.
+            <span class="bold"><strong>Return type</strong></span>: A specialization of <a class="link" href="../../adapters/fused_procedure.html" title="fused_procedure"><code class="computeroutput"><span class="identifier">fused_procedure</span></code></a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a fused_procedure adapter for
-            <tt class="computeroutput"><span class="identifier">f</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a <a class="link" href="../../adapters/fused_procedure.html" title="fused_procedure"><code class="computeroutput"><span class="identifier">fused_procedure</span></code></a> adapter for
+            <code class="computeroutput"><span class="identifier">f</span></code>.
           </p>
 <a name="fusion.functional.generation.functions.mk_fused_proc.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id628932"></a>
-            Header
-=======
-<a name="id879540"></a>
-=======
-<a name="id845910"></a>
-=======
-<a name="id838286"></a>
-=======
-<a name="id860558"></a>
-=======
-<a name="id848810"></a>
-=======
-<a name="id845534"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id838980"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_fused_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_fused_proc.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id629099"></a>
-            Example
-=======
-<a name="id879660"></a>
-=======
-<a name="id846030"></a>
-=======
-<a name="id838406"></a>
-=======
-<a name="id860678"></a>
-=======
-<a name="id848930"></a>
-=======
-<a name="id845654"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id839100"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
 <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">;</span>
 <span class="identifier">make_fused_procedure</span><span class="special">(</span><span class="identifier">_1</span> <span class="special">+=</span> <span class="identifier">_2</span> <span class="special">-</span> <span class="identifier">_3</span><span class="special">)(</span><span class="identifier">v</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>front<span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">0</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="../../../sequence/intrinsic/functions/front.html" title="front"><code class="computeroutput"><span class="identifier">front</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">0</span><span class="special">);</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_fused_proc.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id629366"></a>
-            <a href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.see_also">See
-=======
-<a name="id879854"></a>
-=======
-<a name="id846224"></a>
-=======
-<a name="id838600"></a>
-=======
-<a name="id860872"></a>
-=======
-<a name="id850218"></a>
-=======
-<a name="id846941"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id840387"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.functions.mk_fused_proc.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>fused_procedure</li>
-<li>deduce</li>
-<li><a href="../metafunctions/mk_fused_proc.html" title="
-          make_fused_procedure"><tt class="computeroutput"><span class="identifier">make_fused_procedure</span></tt></a></li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../../adapters/fused_procedure.html" title="fused_procedure"><code class="computeroutput"><span class="identifier">fused_procedure</span></code></a></li>
+<li class="listitem"><a class="link" href="../../../support/deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li>
+<li class="listitem"><a class="link" href="../metafunctions/mk_fused_proc.html" title="make_fused_procedure"><code class="computeroutput"><span class="identifier">make_fused_procedure</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,22 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          make_unfused</title>
+<title>make_unfused</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="mk_fused_fobj.html" title="
-          make_fused_function_object">
+<link rel="prev" href="mk_fused_fobj.html" title="make_fused_function_object">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,113 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="mk_fused_fobj.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.generation.functions.mk_unfused"></a><a href="mk_unfused.html" title="
-          make_unfused">
+<div class="section" title="make_unfused">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.generation.functions.mk_unfused"></a><a class="link" href="mk_unfused.html" title="make_unfused">
           make_unfused</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.generation.functions.mk_unfused.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id630954"></a>
-            Description
-=======
-<a name="id880978"></a>
-=======
-<a name="id847894"></a>
-=======
-<a name="id840270"></a>
-=======
-<a name="id863088"></a>
-=======
-<a name="id851341"></a>
-=======
-<a name="id848064"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id841510"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Creates a unfused adapter for a given,
-            unary <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-            Object</a>. The usual <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+            Creates a <a class="link" href="../../adapters/unfused.html" title="unfused"><code class="computeroutput"><span class="identifier">unfused</span></code></a> adapter for a given,
+            unary <a class="link" href="../../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
+            Object</a>. The usual <a class="link" href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
             conversion</em></span></a> is applied to the target function.
           </p>
 <a name="fusion.functional.generation.functions.mk_unfused.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id631022"></a>
-            Synopsis
-=======
-<a name="id881020"></a>
-=======
-<a name="id847936"></a>
-=======
-<a name="id840312"></a>
-=======
-<a name="id863130"></a>
-=======
-<a name="id851383"></a>
-=======
-<a name="id848106"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id841552"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
-<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_unfused.html" title="
-          make_unfused"><tt class="computeroutput"><span class="identifier">make_unfused</span></tt></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">inline</span> <span class="keyword">typename</span> <a class="link" href="../metafunctions/mk_unfused.html" title="make_unfused"><code class="computeroutput"><span class="identifier">make_unfused</span></code></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_unfused</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_unfused.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id631173"></a>
-            Parameters
-=======
-<a name="id881126"></a>
-=======
-<a name="id848043"></a>
-=======
-<a name="id840419"></a>
-=======
-<a name="id863237"></a>
-=======
-<a name="id851490"></a>
-=======
-<a name="id848213"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id841659"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -147,128 +56,64 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">f</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">f</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
                     Function Object</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The function to transform.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.functional.generation.functions.mk_unfused.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id631289"></a>
-            <a href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.expression_semantics">Expression
-=======
-<a name="id881216"></a>
-=======
-<a name="id848133"></a>
-=======
-<a name="id840509"></a>
-=======
-<a name="id863327"></a>
-=======
-<a name="id851580"></a>
-=======
-<a name="id848303"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id841749"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">make_unfused</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: A specialization of unfused.
+            <span class="bold"><strong>Return type</strong></span>: A specialization of <a class="link" href="../../adapters/unfused.html" title="unfused"><code class="computeroutput"><span class="identifier">unfused</span></code></a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns a unfused adapter for <tt class="computeroutput"><span class="identifier">f</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns a <a class="link" href="../../adapters/unfused.html" title="unfused"><code class="computeroutput"><span class="identifier">unfused</span></code></a> adapter for <code class="computeroutput"><span class="identifier">f</span></code>.
           </p>
 <a name="fusion.functional.generation.functions.mk_unfused.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id631410"></a>
-            Header
-=======
-<a name="id881294"></a>
-=======
-<a name="id848211"></a>
-=======
-<a name="id840587"></a>
-=======
-<a name="id863405"></a>
-=======
-<a name="id851658"></a>
-=======
-<a name="id848381"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id841827"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_unfused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_unfused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_unfused.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id631577"></a>
-            Example
-=======
-<a name="id881414"></a>
-=======
-<a name="id848331"></a>
-=======
-<a name="id840707"></a>
-=======
-<a name="id863525"></a>
-=======
-<a name="id851778"></a>
-=======
-<a name="id848501"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id841947"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">fused_incrementer</span>
 <span class="special">{</span>
@@ -281,7 +126,7 @@
     <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
     <span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Seq</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span> <span class="keyword">const</span>
     <span class="special">{</span>
-        for_each<span class="special">(</span><span class="identifier">s</span><span class="special">,++</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">::</span><span class="identifier">_1</span><span class="special">);</span>
+        <a class="link" href="../../../algorithm/iteration/functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">,++</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">::</span><span class="identifier">_1</span><span class="special">);</span>
     <span class="special">}</span>
 <span class="special">};</span>
 
@@ -293,40 +138,14 @@
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.generation.functions.mk_unfused.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id632050"></a>
-            <a href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.see_also">See
-=======
-<a name="id884501"></a>
-=======
-<a name="id848686"></a>
-=======
-<a name="id841062"></a>
-=======
-<a name="id863880"></a>
-=======
-<a name="id852133"></a>
-=======
-<a name="id848856"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842302"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.functions.mk_unfused.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>unfused</li>
-<li>deduce</li>
-<li><a href="../metafunctions/mk_unfused.html" title="
-          make_unfused"><tt class="computeroutput"><span class="identifier">make_unfused</span></tt></a></li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../../adapters/unfused.html" title="unfused"><code class="computeroutput"><span class="identifier">unfused</span></code></a></li>
+<li class="listitem"><a class="link" href="../../../support/deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li>
+<li class="listitem"><a class="link" href="../metafunctions/mk_unfused.html" title="make_unfused"><code class="computeroutput"><span class="identifier">make_unfused</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Deleted: branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_genrc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_genrc.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
+++ (empty file)
@@ -1,186 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>
-          make_unfused_generic</title>
-<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../functions.html" title="Functions">
-<link rel="prev" href="mk_fused_fobj.html" title="
-          make_fused_function_object">
-<link rel="next" href="mk_unfused_lvargs.html" title="
-          make_unfused_lvalue_args">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_fused_fobj.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_unfused_lvargs.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="fusion.functional.generation.functions.mk_unfused_genrc"></a><a href="mk_unfused_genrc.html" title="
-          make_unfused_generic">
-          make_unfused_generic</a></h5></div></div></div>
-<a name="fusion.functional.generation.functions.mk_unfused_genrc.description"></a><h6>
-<a name="id678317"></a>
-            Description
-          </h6>
-<p>
-            Creates a unfused_generic adapter for
-            a given, unary <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-            Function Object</a>. The usual <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
-            conversion</em></span></a> is applied to the target function.
-          </p>
-<a name="fusion.functional.generation.functions.mk_unfused_genrc.synopsis"></a><h6>
-<a name="id678386"></a>
-            Synopsis
-          </h6>
-<pre class="programlisting">
-<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
-<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_unfused_genrc.html" title="
-          make_unfused_generic"><tt class="computeroutput"><span class="identifier">make_unfused_generic</span></tt></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
-<span class="identifier">make_unfused_generic</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
-</pre>
-<a name="fusion.functional.generation.functions.mk_unfused_genrc.parameters"></a><h6>
-<a name="id678544"></a>
-            Parameters
-          </h6>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Parameter
-                  </p>
-                  </th>
-<th>
-                  <p>
-                    Requirement
-                  </p>
-                  </th>
-<th>
-                  <p>
-                    Description
-                  </p>
-                  </th>
-</tr></thead>
-<tbody><tr>
-<td>
-                  <p>
-                    <tt class="computeroutput"><span class="identifier">f</span></tt>
-                  </p>
-                  </td>
-<td>
-                  <p>
-                    Model of <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-                    Function Object</a>
-                  </p>
-                  </td>
-<td>
-                  <p>
-                    The function to transform.
-                  </p>
-                  </td>
-</tr></tbody>
-</table></div>
-<a name="fusion.functional.generation.functions.mk_unfused_genrc.expression_semantics"></a><h6>
-<a name="id678661"></a>
-            <a href="mk_unfused_genrc.html#fusion.functional.generation.functions.mk_unfused_genrc.expression_semantics">Expression
-            Semantics</a>
-          </h6>
-<pre class="programlisting">
-<span class="identifier">make_unfused_generic</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
-</pre>
-<p>
-            <span class="bold"><b>Return type</b></span>: A specialization of unfused_generic.
-          </p>
-<p>
-            <span class="bold"><b>Semantics</b></span>: Returns a unfused_generic adapter for
-            <tt class="computeroutput"><span class="identifier">f</span></tt>.
-          </p>
-<a name="fusion.functional.generation.functions.mk_unfused_genrc.header"></a><h6>
-<a name="id678786"></a>
-            Header
-          </h6>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_unfused_generic</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_unfused_generic</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<a name="fusion.functional.generation.functions.mk_unfused_genrc.example"></a><h6>
-<a name="id678956"></a>
-            Example
-          </h6>
-<pre class="programlisting">
-<span class="keyword">struct</span> <span class="identifier">bottles_song</span>
-<span class="special">{</span>
-    <span class="keyword">typedef</span> <span class="keyword">void</span> <span class="identifier">result_type</span><span class="special">;</span>
-
-    <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Seq</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span> <span class="keyword">const</span>
-    <span class="special">{</span>
-        <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span><span class="number">0</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">n</span> <span class="special">=</span> <span class="identifier">at_c</span><span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">);</span>
-        <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span><span class="number">1</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">what</span> <span class="special">=</span> <span class="identifier">at_c</span><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">);</span>
-
-        <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span>
-            <span class="special">&lt;&lt;</span> <span class="identifier">n</span> <span class="special">&lt;&lt;</span> <span class="string">" bottles of "</span> <span class="special">&lt;&lt;</span> <span class="identifier">what</span> <span class="special">&lt;&lt;</span> <span class="string">" on the wall.\n"</span>
-            <span class="special">&lt;&lt;</span> <span class="identifier">n</span> <span class="special">&lt;&lt;</span> <span class="string">" bottles of "</span> <span class="special">&lt;&lt;</span> <span class="identifier">what</span> <span class="special">&lt;&lt;</span> <span class="string">"!\n"</span>
-            <span class="special">&lt;&lt;</span> <span class="string">"Take one down - pass it around.\n"</span><span class="special">;</span>
-
-        <span class="identifier">n</span> <span class="special">-=</span> <span class="number">1</span><span class="special">;</span> <span class="comment">// glug glug...
-</span>
-        <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span>
-            <span class="special">&lt;&lt;</span> <span class="identifier">n</span> <span class="special">&lt;&lt;</span> <span class="string">" bottles of "</span> <span class="special">&lt;&lt;</span> <span class="identifier">what</span> <span class="special">&lt;&lt;</span> <span class="string">" on the wall.\n"</span>
-            <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-    <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="keyword">unsigned</span> <span class="identifier">n_milk</span> <span class="special">=</span> <span class="number">99</span><span class="special">;</span>
-    <span class="keyword">for</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <span class="number">0</span><span class="special">;</span> <span class="identifier">i</span> <span class="special">&lt;</span> <span class="number">3</span><span class="special">;</span> <span class="special">++</span><span class="identifier">i</span><span class="special">)</span>
-        <span class="identifier">make_unfused_generic</span><span class="special">(</span><span class="identifier">bottles_song</span><span class="special">())(</span><span class="identifier">n_milk</span><span class="special">,</span><span class="string">"milk"</span><span class="special">);</span>
-    <span class="comment">// 96 bottles left for me
-</span><span class="special">}</span>
-</pre>
-<a name="fusion.functional.generation.functions.mk_unfused_genrc.see_also"></a><h6>
-<a name="id679760"></a>
-            <a href="mk_unfused_genrc.html#fusion.functional.generation.functions.mk_unfused_genrc.see_also">See
-            also</a>
-          </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>unfused_generic</li>
-<li>deduce</li>
-<li><a href="../metafunctions/mk_unfused_genrc.html" title="
-          make_unfused_generic"><tt class="computeroutput"><span class="identifier">make_unfused_generic</span></tt></a></li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
-      Schwinger<p>
-        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)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_fused_fobj.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_unfused_lvargs.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_lvargs.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_lvargs.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
+++ (empty file)
@@ -1,177 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>
-          make_unfused_lvalue_args</title>
-<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../functions.html" title="Functions">
-<link rel="prev" href="mk_unfused_genrc.html" title="
-          make_unfused_generic">
-<link rel="next" href="mk_unfused_rvargs.html" title="
-          make_unfused_rvalue_args">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_unfused_genrc.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_unfused_rvargs.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="fusion.functional.generation.functions.mk_unfused_lvargs"></a><a href="mk_unfused_lvargs.html" title="
-          make_unfused_lvalue_args">
-          make_unfused_lvalue_args</a></h5></div></div></div>
-<a name="fusion.functional.generation.functions.mk_unfused_lvargs.description"></a><h6>
-<a name="id679879"></a>
-            Description
-          </h6>
-<p>
-            Creates a unfused_lvalue_args adapter
-            for a given, unary <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-            Function Object</a>. The usual <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
-            conversion</em></span></a> is applied to the target function.
-          </p>
-<a name="fusion.functional.generation.functions.mk_unfused_lvargs.synopsis"></a><h6>
-<a name="id679949"></a>
-            Synopsis
-          </h6>
-<pre class="programlisting">
-<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
-<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_unfused_lvargs.html" title="
-          make_unfused_lvalue_args"><tt class="computeroutput"><span class="identifier">make_unfused_lvalue_args</span></tt></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
-<span class="identifier">make_unfused_lvalue_args</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
-</pre>
-<a name="fusion.functional.generation.functions.mk_unfused_lvargs.parameters"></a><h6>
-<a name="id680106"></a>
-            Parameters
-          </h6>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Parameter
-                  </p>
-                  </th>
-<th>
-                  <p>
-                    Requirement
-                  </p>
-                  </th>
-<th>
-                  <p>
-                    Description
-                  </p>
-                  </th>
-</tr></thead>
-<tbody><tr>
-<td>
-                  <p>
-                    <tt class="computeroutput"><span class="identifier">f</span></tt>
-                  </p>
-                  </td>
-<td>
-                  <p>
-                    Model of <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-                    Function Object</a>
-                  </p>
-                  </td>
-<td>
-                  <p>
-                    The function to transform.
-                  </p>
-                  </td>
-</tr></tbody>
-</table></div>
-<a name="fusion.functional.generation.functions.mk_unfused_lvargs.expression_semantics"></a><h6>
-<a name="id680222"></a>
-            <a href="mk_unfused_lvargs.html#fusion.functional.generation.functions.mk_unfused_lvargs.expression_semantics">Expression
-            Semantics</a>
-          </h6>
-<pre class="programlisting">
-<span class="identifier">make_unfused_lvalue_args</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
-</pre>
-<p>
-            <span class="bold"><b>Return type</b></span>: A specialization of unfused_lvalue_args.
-          </p>
-<p>
-            <span class="bold"><b>Semantics</b></span>: Returns a unfused_lvalue_args adapter
-            for <tt class="computeroutput"><span class="identifier">f</span></tt>.
-          </p>
-<a name="fusion.functional.generation.functions.mk_unfused_lvargs.header"></a><h6>
-<a name="id680348"></a>
-            Header
-          </h6>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_unfused_lvalue_args</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_unfused_lvalue_args</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<a name="fusion.functional.generation.functions.mk_unfused_lvargs.example"></a><h6>
-<a name="id680522"></a>
-            Example
-          </h6>
-<pre class="programlisting">
-<span class="keyword">struct</span> <span class="identifier">fused_incrementer</span>
-<span class="special">{</span>
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">struct</span> <span class="identifier">result</span>
-    <span class="special">{</span>
-        <span class="keyword">typedef</span> <span class="keyword">void</span> <span class="identifier">type</span><span class="special">;</span>
-    <span class="special">};</span>
-
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Seq</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span> <span class="keyword">const</span>
-    <span class="special">{</span>
-        for_each<span class="special">(</span><span class="identifier">s</span><span class="special">,++</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">::</span><span class="identifier">_1</span><span class="special">);</span>
-    <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="keyword">int</span> <span class="identifier">a</span> <span class="special">=</span> <span class="number">2</span><span class="special">;</span> <span class="keyword">char</span> <span class="identifier">b</span> <span class="special">=</span> <span class="char">'X'</span><span class="special">;</span>
-    <span class="identifier">make_unfused_lvalue_args</span><span class="special">(</span><span class="identifier">fused_incrementer</span><span class="special">())(</span><span class="identifier">a</span><span class="special">,</span><span class="identifier">b</span><span class="special">);</span>
-    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">a</span> <span class="special">==</span> <span class="number">3</span> <span class="special">&amp;&amp;</span> <span class="identifier">b</span> <span class="special">==</span> <span class="char">'Y'</span><span class="special">);</span>
-<span class="special">}</span>
-</pre>
-<a name="fusion.functional.generation.functions.mk_unfused_lvargs.see_also"></a><h6>
-<a name="id681000"></a>
-            <a href="mk_unfused_lvargs.html#fusion.functional.generation.functions.mk_unfused_lvargs.see_also">See
-            also</a>
-          </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>unfused_lvalue_args</li>
-<li>deduce</li>
-<li><a href="../metafunctions/mk_unfused_lvargs.html" title="
-          make_unfused_lvalue_args"><tt class="computeroutput"><span class="identifier">make_unfused_lvalue_args</span></tt></a></li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
-      Schwinger<p>
-        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)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_unfused_genrc.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_unfused_rvargs.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_rvargs.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/functions/mk_unfused_rvargs.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
+++ (empty file)
@@ -1,175 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>
-          make_unfused_rvalue_args</title>
-<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../functions.html" title="Functions">
-<link rel="prev" href="mk_unfused_lvargs.html" title="
-          make_unfused_lvalue_args">
-<link rel="next" href="../metafunctions.html" title="Metafunctions">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_unfused_lvargs.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="fusion.functional.generation.functions.mk_unfused_rvargs"></a><a href="mk_unfused_rvargs.html" title="
-          make_unfused_rvalue_args">
-          make_unfused_rvalue_args</a></h5></div></div></div>
-<a name="fusion.functional.generation.functions.mk_unfused_rvargs.description"></a><h6>
-<a name="id681117"></a>
-            Description
-          </h6>
-<p>
-            Creates a unfused_rvalue_args adapter
-            for a given, unary <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-            Function Object</a>. The usual <a href="../../../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
-            conversion</em></span></a> is applied to the target function.
-          </p>
-<a name="fusion.functional.generation.functions.mk_unfused_rvargs.synopsis"></a><h6>
-<a name="id681187"></a>
-            Synopsis
-          </h6>
-<pre class="programlisting">
-<span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
-<span class="keyword">inline</span> <span class="keyword">typename</span> <a href="../metafunctions/mk_unfused_rvargs.html" title="
-          make_unfused_rvalue_args"><tt class="computeroutput"><span class="identifier">make_unfused_rvalue_args</span></tt></a><span class="special">&lt;</span><span class="identifier">F</span><span class="special">&gt;::</span><span class="identifier">type</span>
-<span class="identifier">make_unfused_rvalue_args</span><span class="special">(</span><span class="identifier">F</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">f</span><span class="special">);</span>
-</pre>
-<a name="fusion.functional.generation.functions.mk_unfused_rvargs.parameters"></a><h6>
-<a name="id681344"></a>
-            Parameters
-          </h6>
-<div class="informaltable"><table class="table">
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<thead><tr>
-<th>
-                  <p>
-                    Parameter
-                  </p>
-                  </th>
-<th>
-                  <p>
-                    Requirement
-                  </p>
-                  </th>
-<th>
-                  <p>
-                    Description
-                  </p>
-                  </th>
-</tr></thead>
-<tbody><tr>
-<td>
-                  <p>
-                    <tt class="computeroutput"><span class="identifier">f</span></tt>
-                  </p>
-                  </td>
-<td>
-                  <p>
-                    Model of <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
-                    Function Object</a>
-                  </p>
-                  </td>
-<td>
-                  <p>
-                    The function to transform.
-                  </p>
-                  </td>
-</tr></tbody>
-</table></div>
-<a name="fusion.functional.generation.functions.mk_unfused_rvargs.expression_semantics"></a><h6>
-<a name="id681460"></a>
-            <a href="mk_unfused_rvargs.html#fusion.functional.generation.functions.mk_unfused_rvargs.expression_semantics">Expression
-            Semantics</a>
-          </h6>
-<pre class="programlisting">
-<span class="identifier">make_unfused_rvalue_args</span><span class="special">(</span><span class="identifier">f</span><span class="special">);</span>
-</pre>
-<p>
-            <span class="bold"><b>Return type</b></span>: A specialization of unfused_rvalue_args.
-          </p>
-<p>
-            <span class="bold"><b>Semantics</b></span>: Returns a unfused_rvalue_args adapter
-            for <tt class="computeroutput"><span class="identifier">f</span></tt>.
-          </p>
-<a name="fusion.functional.generation.functions.mk_unfused_rvargs.header"></a><h6>
-<a name="id681585"></a>
-            Header
-          </h6>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_unfused_rvalue_args</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_unfused_rvalue_args</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<a name="fusion.functional.generation.functions.mk_unfused_rvargs.example"></a><h6>
-<a name="id681757"></a>
-            Example
-          </h6>
-<pre class="programlisting">
-<span class="keyword">struct</span> <span class="identifier">sequence_printer</span>
-<span class="special">{</span>
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">struct</span> <span class="identifier">result</span>
-    <span class="special">{</span>
-        <span class="keyword">typedef</span> <span class="keyword">void</span> <span class="identifier">type</span><span class="special">;</span>
-    <span class="special">};</span>
-
-    <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
-    <span class="keyword">void</span> <span class="keyword">operator</span><span class="special">()(</span><span class="identifier">Seq</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">)</span> <span class="keyword">const</span>
-    <span class="special">{</span>
-        <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">s</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
-    <span class="special">}</span>
-<span class="special">};</span>
-
-<span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
-<span class="special">{</span>
-    <span class="identifier">make_unfused_rvalue_args</span><span class="special">(</span><span class="identifier">sequence_printer</span><span class="special">())</span>
-        <span class="special">(</span><span class="number">24</span><span class="special">,</span><span class="string">"bottles of beer in"</span><span class="special">,</span><span class="char">'a'</span><span class="special">,</span><span class="string">"box."</span><span class="special">);</span>
-<span class="special">}</span>
-</pre>
-<a name="fusion.functional.generation.functions.mk_unfused_rvargs.see_also"></a><h6>
-<a name="id682139"></a>
-            <a href="mk_unfused_rvargs.html#fusion.functional.generation.functions.mk_unfused_rvargs.see_also">See
-            also</a>
-          </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>unfused_rvalue_args</li>
-<li>deduce</li>
-<li><a href="../metafunctions/mk_unfused_rvargs.html" title="
-          make_unfused_rvalue_args"><tt class="computeroutput"><span class="identifier">make_unfused_rvalue_args</span></tt></a></li>
-</ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
-      Schwinger<p>
-        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)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_unfused_lvargs.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,19 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Metafunctions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../generation.html" title="Generation">
-<link rel="previous" href="functions/mk_unfused.html" title="
-          make_unfused">
-<link rel="next" href="metafunctions/mk_fused.html" title="
-          make_fused">
+<link rel="prev" href="functions/mk_unfused.html" title="make_unfused">
+<link rel="next" href="metafunctions/mk_fused.html" title="make_fused">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -28,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="functions/mk_unfused.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../generation.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="metafunctions/mk_fused.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.generation.metafunctions"></a>Metafunctions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Metafunctions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.generation.metafunctions"></a><a class="link" href="metafunctions.html" title="Metafunctions">Metafunctions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="metafunctions/mk_fused.html">
           make_fused</a></span></dt>
@@ -48,7 +39,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,23 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          make_fused</title>
+<title>make_fused</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="../metafunctions.html" title="Metafunctions">
-<link rel="next" href="mk_fused_proc.html" title="
-          make_fused_procedure">
+<link rel="prev" href="../metafunctions.html" title="Metafunctions">
+<link rel="next" href="mk_fused_proc.html" title="make_fused_procedure">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -32,108 +22,28 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_fused_proc.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.generation.metafunctions.mk_fused"></a><a href="mk_fused.html" title="
-          make_fused">
+<div class="section" title="make_fused">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.generation.metafunctions.mk_fused"></a><a class="link" href="mk_fused.html" title="make_fused">
           make_fused</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.generation.metafunctions.mk_fused.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id632181"></a>
-            Description
-=======
-<a name="id884584"></a>
-=======
-<a name="id848769"></a>
-=======
-<a name="id841145"></a>
-=======
-<a name="id863963"></a>
-=======
-<a name="id852216"></a>
-=======
-<a name="id848939"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842385"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of <a href="../functions/mk_fused.html" title="
-          make_fused"><tt class="computeroutput"><span class="identifier">make_fused</span></tt></a>.
+            Returns the result type of <a class="link" href="../functions/mk_fused.html" title="make_fused"><code class="computeroutput"><span class="identifier">make_fused</span></code></a>.
           </p>
 <a name="fusion.functional.generation.metafunctions.mk_fused.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id632229"></a>
-            Header
-=======
-<a name="id884615"></a>
-=======
-<a name="id848800"></a>
-=======
-<a name="id841176"></a>
-=======
-<a name="id863994"></a>
-=======
-<a name="id852247"></a>
-=======
-<a name="id848971"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842417"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_fused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.generation.metafunctions.mk_fused.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id632397"></a>
-            Synopsis
-=======
-<a name="id884735"></a>
-=======
-<a name="id848920"></a>
-=======
-<a name="id841296"></a>
-=======
-<a name="id864114"></a>
-=======
-<a name="id852367"></a>
-=======
-<a name="id849091"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842537"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
 <span class="special">{</span>
@@ -145,37 +55,11 @@
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.generation.metafunctions.mk_fused.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id632528"></a>
-            <a href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.see_also">See
-=======
-<a name="id884832"></a>
-=======
-<a name="id849017"></a>
-=======
-<a name="id841393"></a>
-=======
-<a name="id864211"></a>
-=======
-<a name="id852465"></a>
-=======
-<a name="id849188"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842634"></a>
             <a class="link" href="mk_fused.html#fusion.functional.generation.metafunctions.mk_fused.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_fused.html" title="
-          make_fused"><tt class="computeroutput"><span class="identifier">make_fused</span></tt></a></li></ul></div>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../functions/mk_fused.html" title="make_fused"><code class="computeroutput"><span class="identifier">make_fused</span></code></a></li></ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_fobj.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,24 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          make_fused_function_object</title>
+<title>make_fused_function_object</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="mk_fused_proc.html" title="
-          make_fused_procedure">
-<link rel="next" href="mk_unfused.html" title="
-          make_unfused">
+<link rel="prev" href="mk_fused_proc.html" title="make_fused_procedure">
+<link rel="next" href="mk_unfused.html" title="make_unfused">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -33,108 +22,28 @@
 <div class="spirit-nav">
 <a accesskey="p" href="mk_fused_proc.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_unfused.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.generation.metafunctions.mk_fused_fobj"></a><a href="mk_fused_fobj.html" title="
-          make_fused_function_object">
+<div class="section" title="make_fused_function_object">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.generation.metafunctions.mk_fused_fobj"></a><a class="link" href="mk_fused_fobj.html" title="make_fused_function_object">
           make_fused_function_object</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.generation.metafunctions.mk_fused_fobj.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id633013"></a>
-            Description
-=======
-<a name="id885164"></a>
-=======
-<a name="id849350"></a>
-=======
-<a name="id841726"></a>
-=======
-<a name="id865636"></a>
-=======
-<a name="id852797"></a>
-=======
-<a name="id849520"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842967"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of <a href="../functions/mk_fused_fobj.html" title="
-          make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a>.
+            Returns the result type of <a class="link" href="../functions/mk_fused_fobj.html" title="make_fused_function_object"><code class="computeroutput"><span class="identifier">make_fused_function_object</span></code></a>.
           </p>
 <a name="fusion.functional.generation.metafunctions.mk_fused_fobj.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id633061"></a>
-            Header
-=======
-<a name="id885193"></a>
-=======
-<a name="id849379"></a>
-=======
-<a name="id842847"></a>
-=======
-<a name="id865665"></a>
-=======
-<a name="id852826"></a>
-=======
-<a name="id849549"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842995"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_fused_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.generation.metafunctions.mk_fused_fobj.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id633228"></a>
-            Synopsis
-=======
-<a name="id885311"></a>
-=======
-<a name="id850589"></a>
-=======
-<a name="id842965"></a>
-=======
-<a name="id865783"></a>
-=======
-<a name="id852943"></a>
-=======
-<a name="id849667"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id843113"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
 <span class="special">{</span>
@@ -146,37 +55,11 @@
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.generation.metafunctions.mk_fused_fobj.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id633359"></a>
-            <a href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.see_also">See
-=======
-<a name="id885403"></a>
-=======
-<a name="id850681"></a>
-=======
-<a name="id843057"></a>
-=======
-<a name="id865875"></a>
-=======
-<a name="id853036"></a>
-=======
-<a name="id849759"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id843205"></a>
             <a class="link" href="mk_fused_fobj.html#fusion.functional.generation.metafunctions.mk_fused_fobj.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_fused_fobj.html" title="
-          make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a></li></ul></div>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../functions/mk_fused_fobj.html" title="make_fused_function_object"><code class="computeroutput"><span class="identifier">make_fused_function_object</span></code></a></li></ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_fused_proc.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,24 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          make_fused_procedure</title>
+<title>make_fused_procedure</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="mk_fused.html" title="
-          make_fused">
-<link rel="next" href="mk_fused_fobj.html" title="
-          make_fused_function_object">
+<link rel="prev" href="mk_fused.html" title="make_fused">
+<link rel="next" href="mk_fused_fobj.html" title="make_fused_function_object">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -33,108 +22,28 @@
 <div class="spirit-nav">
 <a accesskey="p" href="mk_fused.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_fused_fobj.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.generation.metafunctions.mk_fused_proc"></a><a href="mk_fused_proc.html" title="
-          make_fused_procedure">
+<div class="section" title="make_fused_procedure">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.generation.metafunctions.mk_fused_proc"></a><a class="link" href="mk_fused_proc.html" title="make_fused_procedure">
           make_fused_procedure</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.generation.metafunctions.mk_fused_proc.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id632597"></a>
-            Description
-=======
-<a name="id884880"></a>
-=======
-<a name="id849065"></a>
-=======
-<a name="id841441"></a>
-=======
-<a name="id864259"></a>
-=======
-<a name="id852513"></a>
-=======
-<a name="id849236"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842682"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of <a href="../functions/mk_fused_proc.html" title="
-          make_fused_procedure"><tt class="computeroutput"><span class="identifier">make_fused_procedure</span></tt></a>.
+            Returns the result type of <a class="link" href="../functions/mk_fused_proc.html" title="make_fused_procedure"><code class="computeroutput"><span class="identifier">make_fused_procedure</span></code></a>.
           </p>
 <a name="fusion.functional.generation.metafunctions.mk_fused_proc.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id632645"></a>
-            Header
-=======
-<a name="id884909"></a>
-=======
-<a name="id849094"></a>
-=======
-<a name="id841470"></a>
-=======
-<a name="id864288"></a>
-=======
-<a name="id852541"></a>
-=======
-<a name="id849265"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842711"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_fused_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_fused_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.generation.metafunctions.mk_fused_proc.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id632813"></a>
-            Synopsis
-=======
-<a name="id885026"></a>
-=======
-<a name="id849212"></a>
-=======
-<a name="id841588"></a>
-=======
-<a name="id865498"></a>
-=======
-<a name="id852659"></a>
-=======
-<a name="id849382"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842829"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
 <span class="special">{</span>
@@ -146,37 +55,11 @@
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.generation.metafunctions.mk_fused_proc.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id632945"></a>
-            <a href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.see_also">See
-=======
-<a name="id885119"></a>
-=======
-<a name="id849304"></a>
-=======
-<a name="id841680"></a>
-=======
-<a name="id865591"></a>
-=======
-<a name="id852751"></a>
-=======
-<a name="id849475"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id842921"></a>
             <a class="link" href="mk_fused_proc.html#fusion.functional.generation.metafunctions.mk_fused_proc.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_fused_proc.html" title="
-          make_fused_procedure"><tt class="computeroutput"><span class="identifier">make_fused_procedure</span></tt></a></li></ul></div>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../functions/mk_fused_proc.html" title="make_fused_procedure"><code class="computeroutput"><span class="identifier">make_fused_procedure</span></code></a></li></ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,22 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          make_unfused</title>
+<title>make_unfused</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="mk_fused_fobj.html" title="
-          make_fused_function_object">
+<link rel="prev" href="mk_fused_fobj.html" title="make_fused_function_object">
 <link rel="next" href="../../../notes.html" title="Notes">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,108 +22,28 @@
 <div class="spirit-nav">
 <a accesskey="p" href="mk_fused_fobj.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../../notes.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.generation.metafunctions.mk_unfused"></a><a href="mk_unfused.html" title="
-          make_unfused">
+<div class="section" title="make_unfused">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.generation.metafunctions.mk_unfused"></a><a class="link" href="mk_unfused.html" title="make_unfused">
           make_unfused</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.generation.metafunctions.mk_unfused.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id633430"></a>
-            Description
-=======
-<a name="id885444"></a>
-=======
-<a name="id850722"></a>
-=======
-<a name="id843098"></a>
-=======
-<a name="id865916"></a>
-=======
-<a name="id853077"></a>
-=======
-<a name="id849800"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id843246"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of <a href="../functions/mk_unfused.html" title="
-          make_unfused"><tt class="computeroutput"><span class="identifier">make_unfused</span></tt></a>.
+            Returns the result type of <a class="link" href="../functions/mk_unfused.html" title="make_unfused"><code class="computeroutput"><span class="identifier">make_unfused</span></code></a>.
           </p>
 <a name="fusion.functional.generation.metafunctions.mk_unfused.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id633478"></a>
-            Header
-=======
-<a name="id885473"></a>
-=======
-<a name="id850751"></a>
-=======
-<a name="id843127"></a>
-=======
-<a name="id865945"></a>
-=======
-<a name="id853105"></a>
-=======
-<a name="id849829"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id843275"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_unfused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_unfused</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.generation.metafunctions.mk_unfused.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id633645"></a>
-            Synopsis
-=======
-<a name="id885593"></a>
-=======
-<a name="id850871"></a>
-=======
-<a name="id843247"></a>
-=======
-<a name="id866065"></a>
-=======
-<a name="id853225"></a>
-=======
-<a name="id849949"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id843395"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
 <span class="special">{</span>
@@ -145,37 +55,11 @@
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.generation.metafunctions.mk_unfused.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id633775"></a>
-            <a href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.see_also">See
-=======
-<a name="id885690"></a>
-=======
-<a name="id850968"></a>
-=======
-<a name="id843344"></a>
-=======
-<a name="id866162"></a>
-=======
-<a name="id853323"></a>
-=======
-<a name="id850046"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id843492"></a>
             <a class="link" href="mk_unfused.html#fusion.functional.generation.metafunctions.mk_unfused.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_unfused.html" title="
-          make_unfused"><tt class="computeroutput"><span class="identifier">make_unfused</span></tt></a></li></ul></div>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../functions/mk_unfused.html" title="make_unfused"><code class="computeroutput"><span class="identifier">make_unfused</span></code></a></li></ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>

Deleted: branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_genrc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_genrc.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
+++ (empty file)
@@ -1,85 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>
-          make_unfused_generic</title>
-<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="prev" href="mk_fused_fobj.html" title="
-          make_fused_function_object">
-<link rel="next" href="mk_unfused_lvargs.html" title="
-          make_unfused_lvalue_args">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_fused_fobj.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_unfused_lvargs.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="fusion.functional.generation.metafunctions.mk_unfused_genrc"></a><a href="mk_unfused_genrc.html" title="
-          make_unfused_generic">
-          make_unfused_generic</a></h5></div></div></div>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_genrc.description"></a><h6>
-<a name="id683563"></a>
-            Description
-          </h6>
-<p>
-            Returns the result type of <a href="../functions/mk_unfused_genrc.html" title="
-          make_unfused_generic"><tt class="computeroutput"><span class="identifier">make_unfused_generic</span></tt></a>.
-          </p>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_genrc.header"></a><h6>
-<a name="id683614"></a>
-            Header
-          </h6>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_unfused_generic</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_unfused_generic</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_genrc.synopsis"></a><h6>
-<a name="id683786"></a>
-            Synopsis
-          </h6>
-<pre class="programlisting">
-<span class="keyword">namespace</span> <span class="identifier">result_of</span>
-<span class="special">{</span>
-    <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">&gt;</span>
-    <span class="keyword">struct</span> <span class="identifier">make_unfused_generic</span>
-    <span class="special">{</span>
-        <span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">type</span><span class="special">;</span>
-    <span class="special">};</span>
-<span class="special">}</span>
-</pre>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_genrc.see_also"></a><h6>
-<a name="id683922"></a>
-            <a href="mk_unfused_genrc.html#fusion.functional.generation.metafunctions.mk_unfused_genrc.see_also">See
-            also</a>
-          </h6>
-<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_unfused_genrc.html" title="
-          make_unfused_generic"><tt class="computeroutput"><span class="identifier">make_unfused_generic</span></tt></a></li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
-      Schwinger<p>
-        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)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_fused_fobj.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_unfused_lvargs.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_lvargs.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_lvargs.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
+++ (empty file)
@@ -1,85 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>
-          make_unfused_lvalue_args</title>
-<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="prev" href="mk_unfused_genrc.html" title="
-          make_unfused_generic">
-<link rel="next" href="mk_unfused_rvargs.html" title="
-          make_unfused_rvalue_args">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_unfused_genrc.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_unfused_rvargs.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="fusion.functional.generation.metafunctions.mk_unfused_lvargs"></a><a href="mk_unfused_lvargs.html" title="
-          make_unfused_lvalue_args">
-          make_unfused_lvalue_args</a></h5></div></div></div>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_lvargs.description"></a><h6>
-<a name="id683995"></a>
-            Description
-          </h6>
-<p>
-            Returns the result type of <a href="../functions/mk_unfused_lvargs.html" title="
-          make_unfused_lvalue_args"><tt class="computeroutput"><span class="identifier">make_unfused_lvalue_args</span></tt></a>.
-          </p>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_lvargs.header"></a><h6>
-<a name="id684047"></a>
-            Header
-          </h6>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_unfused_lvalue_args</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_unfused_lvalue_args</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_lvargs.synopsis"></a><h6>
-<a name="id684218"></a>
-            Synopsis
-          </h6>
-<pre class="programlisting">
-<span class="keyword">namespace</span> <span class="identifier">result_of</span>
-<span class="special">{</span>
-    <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">&gt;</span>
-    <span class="keyword">struct</span> <span class="identifier">make_unfused_lvalue_args</span>
-    <span class="special">{</span>
-        <span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">type</span><span class="special">;</span>
-    <span class="special">};</span>
-<span class="special">}</span>
-</pre>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_lvargs.see_also"></a><h6>
-<a name="id684352"></a>
-            <a href="mk_unfused_lvargs.html#fusion.functional.generation.metafunctions.mk_unfused_lvargs.see_also">See
-            also</a>
-          </h6>
-<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_unfused_lvargs.html" title="
-          make_unfused_lvalue_args"><tt class="computeroutput"><span class="identifier">make_unfused_lvalue_args</span></tt></a></li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
-      Schwinger<p>
-        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)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_unfused_genrc.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="mk_unfused_rvargs.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Deleted: branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_rvargs.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/generation/metafunctions/mk_unfused_rvargs.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
+++ (empty file)
@@ -1,84 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>
-          make_unfused_rvalue_args</title>
-<link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="prev" href="mk_unfused_lvargs.html" title="
-          make_unfused_lvalue_args">
-<link rel="next" href="../../../notes.html" title="Notes">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_unfused_lvargs.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../../notes.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en">
-<div class="titlepage"><div><div><h5 class="title">
-<a name="fusion.functional.generation.metafunctions.mk_unfused_rvargs"></a><a href="mk_unfused_rvargs.html" title="
-          make_unfused_rvalue_args">
-          make_unfused_rvalue_args</a></h5></div></div></div>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_rvargs.description"></a><h6>
-<a name="id684427"></a>
-            Description
-          </h6>
-<p>
-            Returns the result type of <a href="../functions/mk_unfused_rvargs.html" title="
-          make_unfused_rvalue_args"><tt class="computeroutput"><span class="identifier">make_unfused_rvalue_args</span></tt></a>.
-          </p>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_rvargs.header"></a><h6>
-<a name="id684479"></a>
-            Header
-          </h6>
-<pre class="programlisting">
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">generation</span><span class="special">/</span><span class="identifier">make_unfused_rvalue_args</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-<span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">make_unfused_rvalue_args</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
-</pre>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_rvargs.synopsis"></a><h6>
-<a name="id684650"></a>
-            Synopsis
-          </h6>
-<pre class="programlisting">
-<span class="keyword">namespace</span> <span class="identifier">result_of</span>
-<span class="special">{</span>
-    <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">&gt;</span>
-    <span class="keyword">struct</span> <span class="identifier">make_unfused_rvalue_args</span>
-    <span class="special">{</span>
-        <span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">type</span><span class="special">;</span>
-    <span class="special">};</span>
-<span class="special">}</span>
-</pre>
-<a name="fusion.functional.generation.metafunctions.mk_unfused_rvargs.see_also"></a><h6>
-<a name="id684784"></a>
-            <a href="mk_unfused_rvargs.html#fusion.functional.generation.metafunctions.mk_unfused_rvargs.see_also">See
-            also</a>
-          </h6>
-<div class="itemizedlist"><ul type="disc"><li><a href="../functions/mk_unfused_rvargs.html" title="
-          make_unfused_rvalue_args"><tt class="computeroutput"><span class="identifier">make_unfused_rvalue_args</span></tt></a></li></ul></div>
-</div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
-      Schwinger<p>
-        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)
-      </p>
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="mk_unfused_lvargs.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../../notes.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Invocation</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../functional.html" title="Functional">
-<link rel="previous" href="concepts/poly.html" title=" Polymorphic Function
-        Object">
+<link rel="prev" href="concepts/poly.html" title="Polymorphic Function Object">
 <link rel="next" href="invocation/functions.html" title="Functions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="concepts/poly.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functional.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="invocation/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.functional.invocation"></a>Invocation
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Invocation">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.functional.invocation"></a><a class="link" href="invocation.html" title="Invocation">Invocation</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Functions</span></dt>
 <dt><span class="section">Metafunctions</span></dt>
@@ -42,7 +34,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../invocation.html" title="Invocation">
-<link rel="previous" href="../invocation.html" title="Invocation">
+<link rel="prev" href="../invocation.html" title="Invocation">
 <link rel="next" href="functions/invoke.html" title="invoke">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../invocation.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../invocation.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="functions/invoke.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.invocation.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.invocation.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">invoke</span></dt>
 <dt><span class="section"><a href="functions/invoke_proc.html">
@@ -43,7 +36,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,20 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>invoke</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="../functions.html" title="Functions">
-<link rel="next" href="invoke_proc.html" title="
-          invoke_procedure">
+<link rel="prev" href="../functions.html" title="Functions">
+<link rel="next" href="invoke_proc.html" title="invoke_procedure">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -31,46 +22,17 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../functions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="invoke_proc.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.invocation.functions.invoke"></a>invoke
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="invoke">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.invocation.functions.invoke"></a><a class="link" href="invoke.html" title="invoke">invoke</a>
+</h5></div></div></div>
 <a name="fusion.functional.invocation.functions.invoke.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id612575"></a>
-            Description
-=======
-<a name="id863812"></a>
-=======
-<a name="id828476"></a>
-=======
-<a name="id820851"></a>
-=======
-<a name="id842590"></a>
-=======
-<a name="id831389"></a>
-=======
-<a name="id828112"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id821559"></a>
             <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Calls a <a href="../../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred
-            Callable Object</a> with the arguments from a Sequence.
+            Calls a <a class="link" href="../../concepts/def_callable.html" title="Deferred Callable Object">Deferred
+            Callable Object</a> with the arguments from a <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>.
           </p>
 <p>
             The first template parameter can be specialized explicitly to avoid copying
@@ -79,84 +41,34 @@
 <p>
             If the target function is a pointer to a class members, the corresponding
             object can be specified as a reference, pointer, or smart pointer. In
-            case of the latter, a freestanding <tt class="literal">get_pointer</tt> function
-            must be defined (Boost provides this function for <tt class="literal">std::auto_ptr</tt>
-            and boost::shared_ptr).
+            case of the latter, a freestanding <code class="literal">get_pointer</code> function
+            must be defined (Boost provides this function for <code class="literal">std::auto_ptr</code>
+            and boost::shared_ptr).
           </p>
 <p>
             Constructors can be called applying Boost.Functional/Factory.
           </p>
 <a name="fusion.functional.invocation.functions.invoke.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id612688"></a>
-            Synopsis
-=======
-<a name="id863883"></a>
-=======
-<a name="id828546"></a>
-=======
-<a name="id820922"></a>
-=======
-<a name="id842661"></a>
-=======
-<a name="id831460"></a>
-=======
-<a name="id828183"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id821630"></a>
             <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span>
     <span class="keyword">class</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::invoke<span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/invoke.html" title="invoke"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke</span></code></a><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">invoke</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
 
 <span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span>
     <span class="keyword">class</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::invoke<span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/invoke.html" title="invoke"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke</span></code></a><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">invoke</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
 </pre>
 <a name="fusion.functional.invocation.functions.invoke.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id613062"></a>
-            Parameters
-=======
-<a name="id864150"></a>
-=======
-<a name="id828813"></a>
-=======
-<a name="id821188"></a>
-=======
-<a name="id842927"></a>
-=======
-<a name="id831726"></a>
-=======
-<a name="id828450"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id821896"></a>
             <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -165,188 +77,101 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">f</span></tt>
-                  </p></td>
-<td><p>
-                    A <a href="../../concepts/def_callable.html" title=" Deferred
-        Callable Object">Deferred
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">f</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    A <a class="link" href="../../concepts/def_callable.html" title="Deferred Callable Object">Deferred
                     Callable Object</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The function to call.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">s</span></tt>
-                  </p></td>
-<td><p>
-                    A <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">s</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    A <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The arguments.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.functional.invocation.functions.invoke.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id613223"></a>
-            <a href="invoke.html#fusion.functional.invocation.functions.invoke.expression_semantics">Expression
-=======
-<a name="id864276"></a>
-=======
-<a name="id828939"></a>
-=======
-<a name="id821314"></a>
-=======
-<a name="id843053"></a>
-=======
-<a name="id831852"></a>
-=======
-<a name="id828576"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id822022"></a>
             <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">invoke</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span><span class="identifier">s</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Return type of <tt class="computeroutput"><span class="identifier">f</span></tt> when invoked with the elements in
-            <tt class="computeroutput"><span class="identifier">s</span></tt> as its arguments.
+            <span class="bold"><strong>Return type</strong></span>: Return type of <code class="computeroutput"><span class="identifier">f</span></code> when invoked with the elements in
+            <code class="computeroutput"><span class="identifier">s</span></code> as its arguments.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Invokes <tt class="computeroutput"><span class="identifier">f</span></tt>
-            with the elements in <tt class="computeroutput"><span class="identifier">s</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Invokes <code class="computeroutput"><span class="identifier">f</span></code>
+            with the elements in <code class="computeroutput"><span class="identifier">s</span></code>
             as arguments and returns the result of the call expression.
           </p>
 <a name="fusion.functional.invocation.functions.invoke.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id613356"></a>
-            Header
-=======
-<a name="id864361"></a>
-=======
-<a name="id829024"></a>
-=======
-<a name="id821400"></a>
-=======
-<a name="id843139"></a>
-=======
-<a name="id831938"></a>
-=======
-<a name="id828661"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id822107"></a>
             <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">invocation</span><span class="special">/</span><span class="identifier">invoke</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.invocation.functions.invoke.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id613459"></a>
-            Example
-=======
-<a name="id864704"></a>
-=======
-<a name="id829094"></a>
-=======
-<a name="id821469"></a>
-=======
-<a name="id843208"></a>
-=======
-<a name="id832007"></a>
-=======
-<a name="id828730"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id822177"></a>
             <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">std::plus<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">add</span><span class="special">;</span>
-<span class="identifier">assert</span><span class="special">(</span><span class="identifier">invoke</span><span class="special">(</span><span class="identifier">add</span><span class="special">,</span>make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1</span><span class="special">))</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
+<pre class="programlisting">std::plus<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">add</span><span class="special">;</span>
+<span class="identifier">assert</span><span class="special">(</span><span class="identifier">invoke</span><span class="special">(</span><span class="identifier">add</span><span class="special">,</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">1</span><span class="special">))</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
 </pre>
 <a name="fusion.functional.invocation.functions.invoke.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id613626"></a>
-            <a href="invoke.html#fusion.functional.invocation.functions.invoke.see_also">See
-=======
-<a name="id864819"></a>
-=======
-<a name="id829209"></a>
-=======
-<a name="id821584"></a>
-=======
-<a name="id843323"></a>
-=======
-<a name="id832122"></a>
-=======
-<a name="id828846"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id822292"></a>
             <a class="link" href="invoke.html#fusion.functional.invocation.functions.invoke.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="invoke_proc.html" title="
-          invoke_procedure"><tt class="computeroutput"><span class="identifier">invoke_procedure</span></tt></a></li>
-<li><a href="invoke_fobj.html" title="
-          invoke_function_object"><tt class="computeroutput"><span class="identifier">invoke_function_object</span></tt></a></li>
-<li>result_of::invoke</li>
-<li>fused</li>
-<li><a href="../../generation/functions/mk_fused.html" title="
-          make_fused"><tt class="computeroutput"><span class="identifier">make_fused</span></tt></a></li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="invoke_proc.html" title="invoke_procedure"><code class="computeroutput"><span class="identifier">invoke_procedure</span></code></a></li>
+<li class="listitem"><a class="link" href="invoke_fobj.html" title="invoke_function_object"><code class="computeroutput"><span class="identifier">invoke_function_object</span></code></a></li>
+<li class="listitem"><a class="link" href="../metafunctions/invoke.html" title="invoke"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke</span></code></a></li>
+<li class="listitem"><a class="link" href="../../adapters/fused.html" title="fused"><code class="computeroutput"><span class="identifier">fused</span></code></a></li>
+<li class="listitem"><a class="link" href="../../generation/functions/mk_fused.html" title="make_fused"><code class="computeroutput"><span class="identifier">make_fused</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_fobj.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_fobj.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_fobj.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,22 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          invoke_function_object</title>
+<title>invoke_function_object</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="invoke_proc.html" title="
-          invoke_procedure">
+<link rel="prev" href="invoke_proc.html" title="invoke_procedure">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,48 +22,18 @@
 <div class="spirit-nav">
 <a accesskey="p" href="invoke_proc.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.invocation.functions.invoke_fobj"></a><a href="invoke_fobj.html" title="
-          invoke_function_object">
+<div class="section" title="invoke_function_object">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.invocation.functions.invoke_fobj"></a><a class="link" href="invoke_fobj.html" title="invoke_function_object">
           invoke_function_object</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.invocation.functions.invoke_fobj.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id615066"></a>
-            Description
-=======
-<a name="id865819"></a>
-=======
-<a name="id830912"></a>
-=======
-<a name="id823288"></a>
-=======
-<a name="id846102"></a>
-=======
-<a name="id834761"></a>
-=======
-<a name="id831484"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id824931"></a>
             <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Calls a <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic Function
-            Object</a> with the arguments from a Sequence.
+            Calls a <a class="link" href="../../concepts/poly.html" title="Polymorphic Function Object">Polymorphic Function
+            Object</a> with the arguments from a <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>.
           </p>
 <p>
             The first template parameter can be specialized explicitly to avoid copying
@@ -83,78 +43,26 @@
             Constructors can be called applying Boost.Functional/Factory.
           </p>
 <a name="fusion.functional.invocation.functions.invoke_fobj.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id615129"></a>
-            Synopsis
-=======
-<a name="id865862"></a>
-=======
-<a name="id830956"></a>
-=======
-<a name="id823331"></a>
-=======
-<a name="id846145"></a>
-=======
-<a name="id834804"></a>
-=======
-<a name="id831527"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id824974"></a>
             <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span>
     <span class="keyword">class</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> <a href="../metafunctions/invoke_fobj.html" title="
-          invoke_function_object"><tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_function_object</span></tt></a><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/invoke_fobj.html" title="invoke_function_object"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_function_object</span></code></a><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">invoke_function_object</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
 
 <span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span>
     <span class="keyword">class</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> <a href="../metafunctions/invoke_fobj.html" title="
-          invoke_function_object"><tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_function_object</span></tt></a><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/invoke_fobj.html" title="invoke_function_object"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_function_object</span></code></a><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">invoke_function_object</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
 </pre>
 <a name="fusion.functional.invocation.functions.invoke_fobj.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id615507"></a>
-            Parameters
-=======
-<a name="id866131"></a>
-=======
-<a name="id831224"></a>
-=======
-<a name="id823600"></a>
-=======
-<a name="id846414"></a>
-=======
-<a name="id835073"></a>
-=======
-<a name="id831796"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id825243"></a>
             <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -163,145 +71,86 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">f</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/poly.html" title=" Polymorphic Function
-        Object">Polymorphic
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">f</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/poly.html" title="Polymorphic Function Object">Polymorphic
                     Function Object</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The function object to call.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">s</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">s</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The arguments.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.functional.invocation.functions.invoke_fobj.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id615667"></a>
-            <a href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.expression_semantics">Expression
-=======
-<a name="id866256"></a>
-=======
-<a name="id831349"></a>
-=======
-<a name="id823725"></a>
-=======
-<a name="id846539"></a>
-=======
-<a name="id835198"></a>
-=======
-<a name="id831921"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id825367"></a>
             <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">invoke_function_object</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span><span class="identifier">s</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Return type of <tt class="computeroutput"><span class="identifier">f</span></tt> when invoked with the elements in
-            <tt class="computeroutput"><span class="identifier">s</span></tt> as its arguments.
+            <span class="bold"><strong>Return type</strong></span>: Return type of <code class="computeroutput"><span class="identifier">f</span></code> when invoked with the elements in
+            <code class="computeroutput"><span class="identifier">s</span></code> as its arguments.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Invokes <tt class="computeroutput"><span class="identifier">f</span></tt>
-            with the elements in <tt class="computeroutput"><span class="identifier">s</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Invokes <code class="computeroutput"><span class="identifier">f</span></code>
+            with the elements in <code class="computeroutput"><span class="identifier">s</span></code>
             as arguments and returns the result of the call expression.
           </p>
 <a name="fusion.functional.invocation.functions.invoke_fobj.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id615801"></a>
-            Header
-=======
-<a name="id866343"></a>
-=======
-<a name="id831437"></a>
-=======
-<a name="id823813"></a>
-=======
-<a name="id846626"></a>
-=======
-<a name="id835285"></a>
-=======
-<a name="id832009"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id825455"></a>
             <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">invocation</span><span class="special">/</span><span class="identifier">invoke_function_object</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.invocation.functions.invoke_fobj.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id615906"></a>
-            Example
-=======
-<a name="id866418"></a>
-=======
-<a name="id831511"></a>
-=======
-<a name="id823887"></a>
-=======
-<a name="id846701"></a>
-=======
-<a name="id835360"></a>
-=======
-<a name="id832083"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id825529"></a>
             <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">sub</span>
 <span class="special">{</span>
@@ -322,48 +171,20 @@
 <span class="keyword">void</span> <span class="identifier">try_it</span><span class="special">()</span>
 <span class="special">{</span>
     <span class="identifier">sub</span> <span class="identifier">f</span><span class="special">;</span>
-    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">f</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">1</span><span class="special">)</span> <span class="special">==</span> <span class="identifier">invoke_function_object</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span>make_vector<span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">1</span><span class="special">)));</span>
+    <span class="identifier">assert</span><span class="special">(</span><span class="identifier">f</span><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">1</span><span class="special">)</span> <span class="special">==</span> <span class="identifier">invoke_function_object</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span><a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">2</span><span class="special">,</span><span class="number">1</span><span class="special">)));</span>
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.invocation.functions.invoke_fobj.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id616452"></a>
-            <a href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.see_also">See
-=======
-<a name="id866824"></a>
-=======
-<a name="id831918"></a>
-=======
-<a name="id824294"></a>
-=======
-<a name="id847107"></a>
-=======
-<a name="id835767"></a>
-=======
-<a name="id832490"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id825936"></a>
             <a class="link" href="invoke_fobj.html#fusion.functional.invocation.functions.invoke_fobj.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>invoke</li>
-<li><a href="invoke_proc.html" title="
-          invoke_procedure"><tt class="computeroutput"><span class="identifier">invoke_procedure</span></tt></a></li>
-<li><a href="../metafunctions/invoke_fobj.html" title="
-          invoke_function_object"><tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_function_object</span></tt></a></li>
-<li>fused_function_object</li>
-<li><a href="../../generation/functions/mk_fused_fobj.html" title="
-          make_fused_function_object"><tt class="computeroutput"><span class="identifier">make_fused_function_object</span></tt></a></li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="invoke.html" title="invoke"><code class="computeroutput"><span class="identifier">invoke</span></code></a></li>
+<li class="listitem"><a class="link" href="invoke_proc.html" title="invoke_procedure"><code class="computeroutput"><span class="identifier">invoke_procedure</span></code></a></li>
+<li class="listitem"><a class="link" href="../metafunctions/invoke_fobj.html" title="invoke_function_object"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_function_object</span></code></a></li>
+<li class="listitem"><a class="link" href="../../adapters/fused_function_object.html" title="fused_function_object"><code class="computeroutput"><span class="identifier">fused_function_object</span></code></a></li>
+<li class="listitem"><a class="link" href="../../generation/functions/mk_fused_fobj.html" title="make_fused_function_object"><code class="computeroutput"><span class="identifier">make_fused_function_object</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_proc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_proc.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/functions/invoke_proc.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,23 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          invoke_procedure</title>
+<title>invoke_procedure</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="invoke.html" title="invoke">
-<link rel="next" href="invoke_fobj.html" title="
-          invoke_function_object">
+<link rel="prev" href="invoke.html" title="invoke">
+<link rel="next" href="invoke_fobj.html" title="invoke_function_object">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -32,47 +22,18 @@
 <div class="spirit-nav">
 <a accesskey="p" href="invoke.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="invoke_fobj.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.invocation.functions.invoke_proc"></a><a href="invoke_proc.html" title="
-          invoke_procedure">
+<div class="section" title="invoke_procedure">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.invocation.functions.invoke_proc"></a><a class="link" href="invoke_proc.html" title="invoke_procedure">
           invoke_procedure</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.invocation.functions.invoke_proc.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id613797"></a>
-            Description
-=======
-<a name="id864922"></a>
-=======
-<a name="id829312"></a>
-=======
-<a name="id821688"></a>
-=======
-<a name="id843427"></a>
-=======
-<a name="id833865"></a>
-=======
-<a name="id830588"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id824034"></a>
             <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Calls a <a href="../../concepts/callable.html" title=" Callable Object">Callable
-            Object</a> with the arguments from a Sequence.
+            Calls a <a class="link" href="../../concepts/callable.html" title="Callable Object">Callable
+            Object</a> with the arguments from a <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>.
             The result of the call is ignored.
           </p>
 <p>
@@ -82,8 +43,8 @@
 <p>
             For pointers to class members corresponding object can be specified as
             a reference, pointer, or smart pointer. In case of the latter, a freestanding
-            <tt class="literal">get_pointer</tt> function must be defined (Boost provides
-            this function for <tt class="literal">std::auto_ptr</tt> and boost::shared_ptr).
+            <code class="literal">get_pointer</code> function must be defined (Boost provides
+            this function for <code class="literal">std::auto_ptr</code> and boost::shared_ptr).
           </p>
 <p>
             The target function must not be a pointer to a member object (dereferencing
@@ -91,78 +52,26 @@
             isn't implemented).
           </p>
 <a name="fusion.functional.invocation.functions.invoke_proc.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id613906"></a>
-            Synopsis
-=======
-<a name="id864992"></a>
-=======
-<a name="id829382"></a>
-=======
-<a name="id821757"></a>
-=======
-<a name="id843496"></a>
-=======
-<a name="id833934"></a>
-=======
-<a name="id830657"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id824104"></a>
             <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span>
     <span class="keyword">class</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> <a href="../metafunctions/invoke_proc.html" title="
-          invoke_procedure"><tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_procedure</span></tt></a><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/invoke_proc.html" title="invoke_procedure"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_procedure</span></code></a><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">invoke_procedure</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
 
 <span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Function</span><span class="special">,</span>
     <span class="keyword">class</span> <span class="identifier">Sequence</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> <a href="../metafunctions/invoke_proc.html" title="
-          invoke_procedure"><tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_procedure</span></tt></a><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/invoke_proc.html" title="invoke_procedure"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_procedure</span></code></a><span class="special">&lt;</span><span class="identifier">Function</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">invoke_procedure</span><span class="special">(</span><span class="identifier">Function</span> <span class="identifier">f</span><span class="special">,</span> <span class="identifier">Sequence</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
 </pre>
 <a name="fusion.functional.invocation.functions.invoke_proc.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id614281"></a>
-            Parameters
-=======
-<a name="id865261"></a>
-=======
-<a name="id829650"></a>
-=======
-<a name="id822026"></a>
-=======
-<a name="id845544"></a>
-=======
-<a name="id834203"></a>
-=======
-<a name="id830926"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id824373"></a>
             <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -171,188 +80,102 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">f</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/callable.html" title=" Callable Object">Callable
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">f</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/callable.html" title="Callable Object">Callable
                     Object</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The function to call.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">s</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">s</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The arguments.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.functional.invocation.functions.invoke_proc.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id614439"></a>
-            <a href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.expression_semantics">Expression
-=======
-<a name="id865387"></a>
-=======
-<a name="id829776"></a>
-=======
-<a name="id822152"></a>
-=======
-<a name="id845670"></a>
-=======
-<a name="id834329"></a>
-=======
-<a name="id831052"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id824499"></a>
             <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">invoke_procedure</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span><span class="identifier">s</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">void</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">void</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Invokes <tt class="computeroutput"><span class="identifier">f</span></tt>
-            with the elements in <tt class="computeroutput"><span class="identifier">s</span></tt>
+            <span class="bold"><strong>Semantics</strong></span>: Invokes <code class="computeroutput"><span class="identifier">f</span></code>
+            with the elements in <code class="computeroutput"><span class="identifier">s</span></code>
             as arguments.
           </p>
 <a name="fusion.functional.invocation.functions.invoke_proc.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id614557"></a>
-            Header
-=======
-<a name="id865467"></a>
-=======
-<a name="id830561"></a>
-=======
-<a name="id822937"></a>
-=======
-<a name="id845750"></a>
-=======
-<a name="id834409"></a>
-=======
-<a name="id831133"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id824579"></a>
             <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">booost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">invocation</span><span class="special">/</span><span class="identifier">invoke_procedure</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.functional.invocation.functions.invoke_proc.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id614660"></a>
-            Example
-=======
-<a name="id865542"></a>
-=======
-<a name="id830635"></a>
-=======
-<a name="id823011"></a>
-=======
-<a name="id845825"></a>
-=======
-<a name="id834484"></a>
-=======
-<a name="id831207"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id824653"></a>
             <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
 <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">;</span>
 <span class="identifier">invoke_procedure</span><span class="special">(</span><span class="identifier">_1</span> <span class="special">+=</span> <span class="identifier">_2</span><span class="special">,</span> <span class="identifier">v</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>front<span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="../../../sequence/intrinsic/functions/front.html" title="front"><code class="computeroutput"><span class="identifier">front</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
 </pre>
 <a name="fusion.functional.invocation.functions.invoke_proc.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id614897"></a>
-            <a href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.see_also">See
-=======
-<a name="id865713"></a>
-=======
-<a name="id830807"></a>
-=======
-<a name="id823183"></a>
-=======
-<a name="id845996"></a>
-=======
-<a name="id834655"></a>
-=======
-<a name="id831379"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id824825"></a>
             <a class="link" href="invoke_proc.html#fusion.functional.invocation.functions.invoke_proc.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>invoke</li>
-<li><a href="invoke_fobj.html" title="
-          invoke_function_object"><tt class="computeroutput"><span class="identifier">invoke_function_object</span></tt></a></li>
-<li><a href="../metafunctions/invoke_proc.html" title="
-          invoke_procedure"><tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_procedure</span></tt></a></li>
-<li>fused_procedure</li>
-<li><a href="../../generation/functions/mk_fused_proc.html" title="
-          make_fused_procedure"><tt class="computeroutput"><span class="identifier">make_fused_procedure</span></tt></a></li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="invoke.html" title="invoke"><code class="computeroutput"><span class="identifier">invoke</span></code></a></li>
+<li class="listitem"><a class="link" href="invoke_fobj.html" title="invoke_function_object"><code class="computeroutput"><span class="identifier">invoke_function_object</span></code></a></li>
+<li class="listitem"><a class="link" href="../metafunctions/invoke_proc.html" title="invoke_procedure"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">invoke_procedure</span></code></a></li>
+<li class="listitem"><a class="link" href="../../adapters/fused_procedure.html" title="fused_procedure"><code class="computeroutput"><span class="identifier">fused_procedure</span></code></a></li>
+<li class="listitem"><a class="link" href="../../generation/functions/mk_fused_proc.html" title="make_fused_procedure"><code class="computeroutput"><span class="identifier">make_fused_procedure</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/limits.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/limits.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/limits.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,18 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Limits</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../invocation.html" title="Invocation">
-<link rel="previous" href="metafunctions/invoke_fobj.html" title="
-          invoke_function_object">
-<link rel="next" href="../adapters.html" title=" Adapters">
+<link rel="prev" href="metafunctions/invoke_fobj.html" title="invoke_function_object">
+<link rel="next" href="../adapters.html" title="Adapters">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -27,60 +22,39 @@
 <div class="spirit-nav">
 <a accesskey="p" href="metafunctions/invoke_fobj.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../invocation.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../adapters.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.invocation.limits"></a>Limits
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.functional.invocation.limits.header"></a><h5>
-<a name="id617510"></a>
-          Header
-        </h5>
-=======
 <div class="section" title="Limits">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.functional.invocation.limits"></a><a class="link" href="limits.html" title="Limits">Limits</a>
 </h4></div></div></div>
 <a name="fusion.functional.invocation.limits.header"></a><h6>
-<a name="id825008"></a>
+<a name="id826791"></a>
           <a class="link" href="limits.html#fusion.functional.invocation.limits.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">functional</span><span class="special">/</span><span class="identifier">invocation</span><span class="special">/</span><span class="identifier">limits</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.functional.invocation.limits.macros"></a><h5>
-<a name="id617613"></a>
-          Macros
-        </h5>
-=======
 <a name="fusion.functional.invocation.limits.macros"></a><h6>
-<a name="id826170"></a>
+<a name="id826860"></a>
           <a class="link" href="limits.html#fusion.functional.invocation.limits.macros">Macros</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           The following macros can be defined to change the maximum arity. The default
           is 6.
         </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
             BOOST_FUSION_INVOKE_MAX_ARITY
           </li>
-<li>
+<li class="listitem">
             BOOST_FUSION_INVOKE_PROCEDURE_MAX_ARITY
           </li>
-<li>
+<li class="listitem">
             BOOST_FUSION_INVOKE_FUNCTION_OBJECT_MAX_ARITY
           </li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Metafunctions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../invocation.html" title="Invocation">
-<link rel="previous" href="functions/invoke_fobj.html" title="
-          invoke_function_object">
+<link rel="prev" href="functions/invoke_fobj.html" title="invoke_function_object">
 <link rel="next" href="metafunctions/invoke.html" title="invoke">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="functions/invoke_fobj.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../invocation.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="metafunctions/invoke.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.functional.invocation.metafunctions"></a>Metafunctions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Metafunctions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.functional.invocation.metafunctions"></a><a class="link" href="metafunctions.html" title="Metafunctions">Metafunctions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">invoke</span></dt>
 <dt><span class="section"><a href="metafunctions/invoke_proc.html">
@@ -44,7 +36,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,20 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>invoke</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="../metafunctions.html" title="Metafunctions">
-<link rel="next" href="invoke_proc.html" title="
-          invoke_procedure">
+<link rel="prev" href="../metafunctions.html" title="Metafunctions">
+<link rel="next" href="invoke_proc.html" title="invoke_procedure">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -31,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="invoke_proc.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.invocation.metafunctions.invoke"></a>invoke
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="invoke">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.invocation.metafunctions.invoke"></a><a class="link" href="invoke.html" title="invoke">invoke</a>
+</h5></div></div></div>
 <a name="fusion.functional.invocation.metafunctions.invoke.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id616641"></a>
-            Description
-=======
-<a name="id868720"></a>
-=======
-<a name="id832034"></a>
-=======
-<a name="id824410"></a>
-=======
-<a name="id847224"></a>
-=======
-<a name="id835883"></a>
-=======
-<a name="id832606"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id826053"></a>
             <a class="link" href="invoke.html#fusion.functional.invocation.metafunctions.invoke.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of invoke.
+            Returns the result type of <a class="link" href="../functions/invoke.html" title="invoke"><code class="computeroutput"><span class="identifier">invoke</span></code></a>.
           </p>
 <a name="fusion.functional.invocation.metafunctions.invoke.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id616689"></a>
-            Synopsis
-=======
-<a name="id868751"></a>
-=======
-<a name="id832066"></a>
-=======
-<a name="id824441"></a>
-=======
-<a name="id847255"></a>
-=======
-<a name="id835914"></a>
-=======
-<a name="id832637"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id826084"></a>
             <a class="link" href="invoke.html#fusion.functional.invocation.metafunctions.invoke.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
 <span class="special">{</span>
@@ -112,38 +50,13 @@
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.invocation.metafunctions.invoke.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id616840"></a>
-            <a href="invoke.html#fusion.functional.invocation.metafunctions.invoke.see_also">See
-=======
-<a name="id868864"></a>
-=======
-<a name="id832178"></a>
-=======
-<a name="id824554"></a>
-=======
-<a name="id847368"></a>
-=======
-<a name="id836167"></a>
-=======
-<a name="id832891"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id826337"></a>
             <a class="link" href="invoke.html#fusion.functional.invocation.metafunctions.invoke.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>invoke</li>
-<li>fused</li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../functions/invoke.html" title="invoke"><code class="computeroutput"><span class="identifier">invoke</span></code></a></li>
+<li class="listitem"><a class="link" href="../../adapters/fused.html" title="fused"><code class="computeroutput"><span class="identifier">fused</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_fobj.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,22 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          invoke_function_object</title>
+<title>invoke_function_object</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="invoke_proc.html" title="
-          invoke_procedure">
+<link rel="prev" href="invoke_proc.html" title="invoke_procedure">
 <link rel="next" href="../limits.html" title="Limits">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,76 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="invoke_proc.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../limits.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.invocation.metafunctions.invoke_fobj"></a><a href="invoke_fobj.html" title="
-          invoke_function_object">
+<div class="section" title="invoke_function_object">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.invocation.metafunctions.invoke_fobj"></a><a class="link" href="invoke_fobj.html" title="invoke_function_object">
           invoke_function_object</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.invocation.metafunctions.invoke_fobj.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id617219"></a>
-            Description
-=======
-<a name="id869118"></a>
-=======
-<a name="id832433"></a>
-=======
-<a name="id824809"></a>
-=======
-<a name="id847622"></a>
-=======
-<a name="id836422"></a>
-=======
-<a name="id833145"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id826591"></a>
             <a class="link" href="invoke_fobj.html#fusion.functional.invocation.metafunctions.invoke_fobj.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of <a href="../functions/invoke_fobj.html" title="
-          invoke_function_object"><tt class="computeroutput"><span class="identifier">invoke_function_object</span></tt></a>.
+            Returns the result type of <a class="link" href="../functions/invoke_fobj.html" title="invoke_function_object"><code class="computeroutput"><span class="identifier">invoke_function_object</span></code></a>.
           </p>
 <a name="fusion.functional.invocation.metafunctions.invoke_fobj.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id617267"></a>
-            Synopsis
-=======
-<a name="id869147"></a>
-=======
-<a name="id832462"></a>
-=======
-<a name="id824837"></a>
-=======
-<a name="id847651"></a>
-=======
-<a name="id836451"></a>
-=======
-<a name="id833174"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id826620"></a>
             <a class="link" href="invoke_fobj.html#fusion.functional.invocation.metafunctions.invoke_fobj.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
 <span class="special">{</span>
@@ -116,39 +51,13 @@
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.invocation.metafunctions.invoke_fobj.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id617418"></a>
-            <a href="invoke_fobj.html#fusion.functional.invocation.metafunctions.invoke_fobj.see_also">See
-=======
-<a name="id869260"></a>
-=======
-<a name="id832574"></a>
-=======
-<a name="id824950"></a>
-=======
-<a name="id847764"></a>
-=======
-<a name="id836563"></a>
-=======
-<a name="id833287"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id826733"></a>
             <a class="link" href="invoke_fobj.html#fusion.functional.invocation.metafunctions.invoke_fobj.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../functions/invoke_fobj.html" title="
-          invoke_function_object"><tt class="computeroutput"><span class="identifier">invoke_function_object</span></tt></a></li>
-<li>fused_function_object</li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../functions/invoke_fobj.html" title="invoke_function_object"><code class="computeroutput"><span class="identifier">invoke_function_object</span></code></a></li>
+<li class="listitem"><a class="link" href="../../adapters/fused_function_object.html" title="fused_function_object"><code class="computeroutput"><span class="identifier">fused_function_object</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/functional/invocation/metafunctions/invoke_proc.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,23 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>
-          invoke_procedure</title>
+<title>invoke_procedure</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="invoke.html" title="invoke">
-<link rel="next" href="invoke_fobj.html" title="
-          invoke_function_object">
+<link rel="prev" href="invoke.html" title="invoke">
+<link rel="next" href="invoke_fobj.html" title="invoke_function_object">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -32,76 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="invoke.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="invoke_fobj.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.functional.invocation.metafunctions.invoke_proc"></a><a href="invoke_proc.html" title="
-          invoke_procedure">
+<div class="section" title="invoke_procedure">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.functional.invocation.metafunctions.invoke_proc"></a><a class="link" href="invoke_proc.html" title="invoke_procedure">
           invoke_procedure</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <a name="fusion.functional.invocation.metafunctions.invoke_proc.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id616931"></a>
-            Description
-=======
-<a name="id868920"></a>
-=======
-<a name="id832235"></a>
-=======
-<a name="id824611"></a>
-=======
-<a name="id847424"></a>
-=======
-<a name="id836224"></a>
-=======
-<a name="id832947"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id826393"></a>
             <a class="link" href="invoke_proc.html#fusion.functional.invocation.metafunctions.invoke_proc.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of <a href="../functions/invoke_proc.html" title="
-          invoke_procedure"><tt class="computeroutput"><span class="identifier">invoke_procedure</span></tt></a>.
+            Returns the result type of <a class="link" href="../functions/invoke_proc.html" title="invoke_procedure"><code class="computeroutput"><span class="identifier">invoke_procedure</span></code></a>.
           </p>
 <a name="fusion.functional.invocation.metafunctions.invoke_proc.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id616979"></a>
-            Synopsis
-=======
-<a name="id868949"></a>
-=======
-<a name="id832264"></a>
-=======
-<a name="id824639"></a>
-=======
-<a name="id847453"></a>
-=======
-<a name="id836253"></a>
-=======
-<a name="id832976"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id826422"></a>
             <a class="link" href="invoke_proc.html#fusion.functional.invocation.metafunctions.invoke_proc.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">result_of</span>
 <span class="special">{</span>
@@ -116,39 +51,13 @@
 <span class="special">}</span>
 </pre>
 <a name="fusion.functional.invocation.metafunctions.invoke_proc.see_also"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id617129"></a>
-            <a href="invoke_proc.html#fusion.functional.invocation.metafunctions.invoke_proc.see_also">See
-=======
-<a name="id869062"></a>
-=======
-<a name="id832376"></a>
-=======
-<a name="id824752"></a>
-=======
-<a name="id847566"></a>
-=======
-<a name="id836365"></a>
-=======
-<a name="id833089"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id826535"></a>
             <a class="link" href="invoke_proc.html#fusion.functional.invocation.metafunctions.invoke_proc.see_also">See
->>>>>>> .merge-right.r57125
             also</a>
           </h6>
-<div class="itemizedlist"><ul type="disc">
-<li><a href="../functions/invoke_proc.html" title="
-          invoke_procedure"><tt class="computeroutput"><span class="identifier">invoke_procedure</span></tt></a></li>
-<li>fused_procedure</li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><a class="link" href="../functions/invoke_proc.html" title="invoke_procedure"><code class="computeroutput"><span class="identifier">invoke_procedure</span></code></a></li>
+<li class="listitem"><a class="link" href="../../adapters/fused_procedure.html" title="fused_procedure"><code class="computeroutput"><span class="identifier">fused_procedure</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/introduction.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/introduction.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/introduction.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,19 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Introduction</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
-<link rel="previous" href="preface.html" title="Preface">
+<link rel="prev" href="preface.html" title="Preface">
 <link rel="next" href="quick_start.html" title="Quick Start">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -31,20 +22,17 @@
 <div class="spirit-nav">
 <a accesskey="p" href="preface.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="quick_start.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.introduction"></a>Introduction
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Introduction">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.introduction"></a><a class="link" href="introduction.html" title="Introduction">Introduction</a>
+</h2></div></div></div>
 <p>
       An advantage other languages such as Python and Lisp/ Scheme, ML and Haskell,
       etc., over C++ is the ability to have heterogeneous containers that can hold
       arbitrary element types. All the containers in the standard library can only
-      hold a specific type. A <tt class="computeroutput"><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span></tt>
-      can only hold <tt class="computeroutput"><span class="keyword">int</span></tt>s. A <tt class="computeroutput"><span class="identifier">list</span><span class="special">&lt;</span><span class="identifier">X</span><span class="special">&gt;</span></tt> can
-      only hold elements of type <tt class="computeroutput"><span class="identifier">X</span></tt>,
+      hold a specific type. A <code class="computeroutput"><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span></code>
+      can only hold <code class="computeroutput"><span class="keyword">int</span></code>s. A <code class="computeroutput"><span class="identifier">list</span><span class="special">&lt;</span><span class="identifier">X</span><span class="special">&gt;</span></code> can
+      only hold elements of type <code class="computeroutput"><span class="identifier">X</span></code>,
       and so on.
     </p>
 <p>
@@ -54,8 +42,8 @@
       on virtual functions to provide polymorphic behavior since the actual type
       is erased as soon as you store a pointer to a derived class to a pointer to
       its base. The held objects must be related: you cannot hold objects of unrelated
-      types such as <tt class="computeroutput"><span class="keyword">char</span></tt>, <tt class="computeroutput"><span class="keyword">int</span></tt>, <tt class="computeroutput"><span class="keyword">class</span>
-      <span class="identifier">X</span></tt>, <tt class="computeroutput"><span class="keyword">float</span></tt>,
+      types such as <code class="computeroutput"><span class="keyword">char</span></code>, <code class="computeroutput"><span class="keyword">int</span></code>, <code class="computeroutput"><span class="keyword">class</span>
+      <span class="identifier">X</span></code>, <code class="computeroutput"><span class="keyword">float</span></code>,
       etc. Oh sure you can use something like Boost.Any
       to hold arbitrary types, but then you pay more in terms of runtime costs and
       due to the fact that you practically erased all type information, you'll have
@@ -64,7 +52,7 @@
 <p>
       The Boost.Tuple
       library written by <a href="http://www.boost.org/people/jaakko_jarvi.htm" target="_top">Jaakko
-      Jarvi</a> provides heterogeneous containers in C++. The <tt class="computeroutput"><span class="identifier">tuple</span></tt>
+      Jarvi</a> provides heterogeneous containers in C++. The <code class="computeroutput"><span class="identifier">tuple</span></code>
       is a basic data structure that can hold heterogeneous types. It's a good first
       step, but it's not complete. What's missing are the algorithms. It's nice that
       we can store and retrieve data to and from tuples, pass them around as arguments
@@ -102,23 +90,23 @@
       fusion algorithms are functional in nature such that algorithms are non mutating
       (no side effects). However, due to the high cost of returning full sequences
       such as vectors and lists, <span class="emphasis"><em>Views</em></span> are returned from Fusion
-      algorithms instead. For example, the transform algorithm does not actually
-      return a transformed version of the original sequence. transform returns a transform_view. This view holds a
+      algorithms instead. For example, the <a class="link" href="algorithm/transformation/functions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a> algorithm does not actually
+      return a transformed version of the original sequence. <a class="link" href="algorithm/transformation/functions/transform.html" title="transform"><code class="computeroutput"><span class="identifier">transform</span></code></a> returns a <a class="link" href="view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a>. This view holds a
       reference to the original sequence plus the transform function. Iteration over
-      the transform_view
+      the <a class="link" href="view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a>
       will apply the transform function over the sequence elements on demand. This
       <span class="emphasis"><em>lazy</em></span> evaluation scheme allows us to chain as many algorithms
       as we want without incurring a high runtime penalty.
     </p>
 <p>
       The <span class="emphasis"><em>lazy</em></span> evaluation scheme where algorithms return views
-      allows operations such as push_back to be totally generic. In
-      Fusion, push_back is actually a generic algorithm
-      that works on all sequences. Given an input sequence <tt class="computeroutput"><span class="identifier">s</span></tt>
-      and a value <tt class="computeroutput"><span class="identifier">x</span></tt>, Fusion's push_back algorithm simply returns
-      a joint_view:
-      a view that holds a reference to the original sequence <tt class="computeroutput"><span class="identifier">s</span></tt>
-      and the value <tt class="computeroutput"><span class="identifier">x</span></tt>. Functions
+      allows operations such as <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a> to be totally generic. In
+      Fusion, <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a> is actually a generic algorithm
+      that works on all sequences. Given an input sequence <code class="computeroutput"><span class="identifier">s</span></code>
+      and a value <code class="computeroutput"><span class="identifier">x</span></code>, Fusion's <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a> algorithm simply returns
+      a <a class="link" href="view/joint_view.html" title="joint_view"><code class="computeroutput"><span class="identifier">joint_view</span></code></a>:
+      a view that holds a reference to the original sequence <code class="computeroutput"><span class="identifier">s</span></code>
+      and the value <code class="computeroutput"><span class="identifier">x</span></code>. Functions
       that were once sequence specific and need to be implemented N times over N
       different sequences are now implemented only once.
     </p>
@@ -129,31 +117,7 @@
       sequences are fully compatible with Fusion. You can work with Fusion sequences
       on MPL if you
       wish to work solely on types
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-      <sup>[<a name="id353558" href="#ftn.id353558">1</a>]</sup>
-=======
-      <sup>[<a name="id658337" href="#ftn.id658337" class="footnote">1</a>]</sup>
-=======
-      <sup>[<a name="id614097" href="#ftn.id614097" class="footnote">1</a>]</sup>
-=======
-      <sup>[<a name="id606451" href="#ftn.id606451" class="footnote">1</a>]</sup>
-=======
-      <sup>[<a name="id629406" href="#ftn.id629406" class="footnote">1</a>]</sup>
-=======
-      <sup>[<a name="id618004" href="#ftn.id618004" class="footnote">1</a>]</sup>
-=======
-      <sup>[<a name="id614727" href="#ftn.id614727" class="footnote">1</a>]</sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
->>>>>>> .merge-right.r57125
+      <sup>[<a name="id608174" href="#ftn.id608174" class="footnote">1</a>]</sup>
       . In MPL, Fusion
       sequences follow MPL's
       sequence-type preserving semantics (i.e. algorithms preserve the original sequence
@@ -168,34 +132,10 @@
     </p>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<div class="footnote"><p><sup>[<a name="ftn.id353558" href="#id353558">1</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id658337" href="#id658337" class="para">1</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id614097" href="#id614097" class="para">1</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id606451" href="#id606451" class="para">1</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id629406" href="#id629406" class="para">1</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id618004" href="#id618004" class="para">1</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id614727" href="#id614727" class="para">1</a>] </sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
->>>>>>> .merge-right.r57125
+<div class="footnote"><p><sup>[<a name="ftn.id608174" href="#id608174" class="para">1</a>] </sup>
           Choose MPL
           over fusion when doing pure type calculations. Once the static type calculation
-          is finished, you can instantiate a fusion sequence (see Conversion)
+          is finished, you can instantiate a fusion sequence (see <a class="link" href="container/conversion/functions.html" title="Functions">Conversion</a>)
           for the runtime part.
         </p></div>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Iterator</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="support/pair.html" title="pair">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="support/pair.html" title="pair">
 <link rel="next" href="iterator/concepts.html" title="Concepts">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="support/pair.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="iterator/concepts.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.iterator"></a>Iterator
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Iterator">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.iterator"></a><a class="link" href="iterator.html" title="Iterator">Iterator</a>
+</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Concepts</span></dt>
 <dd><dl>
@@ -85,26 +78,19 @@
       iterators are a fundamental concept in Fusion. As with MPL
       and STL
       iterators describe positions, and provide access to data within an underlying
-      Sequence.
+      <a class="link" href="sequence.html" title="Sequence">Sequence</a>.
     </p>
-<<<<<<< .working
-<a name="fusion.iterator.header"></a><h3>
-<a name="id420232"></a>
-      Header
-    </h3>
-=======
 <a name="fusion.iterator.header"></a><h4>
-<a name="id619474"></a>
+<a name="id621177"></a>
       <a class="link" href="iterator.html#fusion.iterator.header">Header</a>
     </h4>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/concepts.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/concepts.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/concepts.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,18 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Concepts</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../iterator.html" title="Iterator">
-<link rel="previous" href="../iterator.html" title="Iterator">
-<link rel="next" href="concepts/forward_iterator.html" title="Forward
-        Iterator">
+<link rel="prev" href="../iterator.html" title="Iterator">
+<link rel="next" href="concepts/forward_iterator.html" title="Forward Iterator">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -27,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../iterator.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="concepts/forward_iterator.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.iterator.concepts"></a>Concepts
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Concepts">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.iterator.concepts"></a><a class="link" href="concepts.html" title="Concepts">Concepts</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="concepts/forward_iterator.html">Forward
         Iterator</a></span></dt>
@@ -45,16 +37,11 @@
         Iterator</a></span></dt>
 </dl></div>
 <p>
-        Fusion iterators are divided into different traversal categories. <a href="concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
-        Iterator</a> is the most basic concept. <a href="concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
-        Iterator</a> is a refinement of <a href="concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
-        Iterator</a>. <a href="concepts/random_access_iterator.html" title="Random
-        Access Iterator">Random
-        Access Iterator</a> is a refinement of <a href="concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+        Fusion iterators are divided into different traversal categories. <a class="link" href="concepts/forward_iterator.html" title="Forward Iterator">Forward
+        Iterator</a> is the most basic concept. <a class="link" href="concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+        Iterator</a> is a refinement of <a class="link" href="concepts/forward_iterator.html" title="Forward Iterator">Forward
+        Iterator</a>. <a class="link" href="concepts/random_access_iterator.html" title="Random Access Iterator">Random
+        Access Iterator</a> is a refinement of <a class="link" href="concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
         Iterator</a>. <a class="link" href="concepts/associative_iterator.html" title="Associative Iterator">Associative
         Iterator</a> is a refinement of <a class="link" href="concepts/forward_iterator.html" title="Forward Iterator">Forward
         Iterator</a>, <a class="link" href="concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
@@ -64,7 +51,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/concepts/bidirectional_iterator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/concepts/bidirectional_iterator.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/concepts/bidirectional_iterator.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,20 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Bidirectional
-        Iterator</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Bidirectional Iterator</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="forward_iterator.html" title="Forward
-        Iterator">
-<link rel="next" href="random_access_iterator.html" title="Random
-        Access Iterator">
+<link rel="prev" href="forward_iterator.html" title="Forward Iterator">
+<link rel="next" href="random_access_iterator.html" title="Random Access Iterator">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -29,82 +22,56 @@
 <div class="spirit-nav">
 <a accesskey="p" href="forward_iterator.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="random_access_iterator.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.concepts.bidirectional_iterator"></a><a href="bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+<div class="section" title="Bidirectional Iterator">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.concepts.bidirectional_iterator"></a><a class="link" href="bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
         Iterator</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.concepts.bidirectional_iterator.description"></a><h5>
-<a name="id423358"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.iterator.concepts.bidirectional_iterator.description"></a><h6>
-<a name="id623077"></a>
+<a name="id623689"></a>
           <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          A Bidirectional Iterator traverses a Sequence
+          A Bidirectional Iterator traverses a <a class="link" href="../../sequence.html" title="Sequence">Sequence</a>
           allowing movement in either direction one element at a time.
         </p>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">i</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">i</span></code></span></dt>
 <dd><p>
               A Bidirectional Iterator
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">I</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">I</span></code></span></dt>
 <dd><p>
               A Bidirectional Iterator type
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">M</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">M</span></code></span></dt>
 <dd><p>
               An MPL
               integral constant
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">N</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">N</span></code></span></dt>
 <dd><p>
               An integral constant
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.bidirectional_iterator.refinement_of"></a><h5>
-<a name="id423503"></a>
-          <a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.refinement_of">Refinement
-=======
 <a name="fusion.iterator.concepts.bidirectional_iterator.refinement_of"></a><h6>
-<a name="id623189"></a>
+<a name="id623800"></a>
           <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.refinement_of">Refinement
->>>>>>> .merge-right.r57125
           of</a>
-        </h5>
+        </h6>
 <p>
-          <a href="forward_iterator.html" title="Forward
-        Iterator">Forward Iterator</a>
+          <a class="link" href="forward_iterator.html" title="Forward Iterator">Forward Iterator</a>
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.bidirectional_iterator.expression_requirements"></a><h5>
-<a name="id423540"></a>
-          <a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.expression_requirements">Expression
-=======
 <a name="fusion.iterator.concepts.bidirectional_iterator.expression_requirements"></a><h6>
-<a name="id623213"></a>
+<a name="id623824"></a>
           <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.expression_requirements">Expression
->>>>>>> .merge-right.r57125
           requirements</a>
-        </h5>
+        </h6>
 <p>
-          In addition to the requirements defined in <a href="forward_iterator.html" title="Forward
-        Iterator">Forward
+          In addition to the requirements defined in <a class="link" href="forward_iterator.html" title="Forward Iterator">Forward
           Iterator</a>, the following expressions must be valid:
         </p>
 <div class="informaltable"><table class="table">
@@ -114,119 +81,140 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Return type
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Runtime Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">next<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">prior<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">advance_c<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">advance<span class="special">&lt;</span><span class="identifier">M</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/advance.html" title="advance"><code class="computeroutput"><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">M</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.bidirectional_iterator.meta_expressions"></a><h5>
-<a name="id423922"></a>
-          <a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.meta_expressions">Meta
-=======
 <a name="fusion.iterator.concepts.bidirectional_iterator.meta_expressions"></a><h6>
-<a name="id623490"></a>
+<a name="id624102"></a>
           <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.meta_expressions">Meta
->>>>>>> .merge-right.r57125
           Expressions</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Compile Time Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput">result_of::prior<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">prior</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.bidirectional_iterator.expression_semantics"></a><h5>
-<a name="id424055"></a>
-          <a href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.expression_semantics">Expression
-=======
 <a name="fusion.iterator.concepts.bidirectional_iterator.expression_semantics"></a><h6>
-<a name="id623590"></a>
+<a name="id624201"></a>
           <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <p>
           The semantics of an expression are defined only where they differ from,
-          or are not defined in <a href="forward_iterator.html" title="Forward
-        Iterator">Forward
+          or are not defined in <a class="link" href="forward_iterator.html" title="Forward Iterator">Forward
           Iterator</a>
         </p>
 <div class="informaltable"><table class="table">
@@ -235,91 +223,79 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput">prior<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  An iterator to the element preceding <tt class="computeroutput"><span class="identifier">i</span></tt>
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  An iterator to the element preceding <code class="computeroutput"><span class="identifier">i</span></code>
+                </p>
+                </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.bidirectional_iterator.invariants"></a><h5>
-<a name="id424198"></a>
-          Invariants
-        </h5>
-=======
 <a name="fusion.iterator.concepts.bidirectional_iterator.invariants"></a><h6>
-<a name="id623695"></a>
+<a name="id624307"></a>
           <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.invariants">Invariants</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          In addition to the invariants of <a href="forward_iterator.html" title="Forward
-        Iterator">Forward
+          In addition to the invariants of <a class="link" href="forward_iterator.html" title="Forward Iterator">Forward
           Iterator</a>, the following invariants always hold:
         </p>
-<div class="itemizedlist"><ul type="disc">
-<li><tt class="computeroutput">prior<span class="special">(</span>next<span class="special">(</span><span class="identifier">i</span><span class="special">))</span> <span class="special">==</span> <span class="identifier">i</span> <span class="special">&amp;&amp;</span> prior<span class="special">(</span>next<span class="special">(</span><span class="identifier">i</span><span class="special">))</span> <span class="special">==</span> next<span c
lass="special">(</span>prior<span class="special">(</span><span class="identifier">i</span><span class="special">))</span></tt></li>
-<li><tt class="computeroutput">prior<span class="special">(</span><span class="identifier">i</span><span class="special">)</span> <span class="special">==</span> advance_c<span class="special">&lt;-</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt></li>
-<li>
-            Using <tt class="computeroutput">prior</tt> to traverse a sequence
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><code class="computeroutput"><a class="link" href="../functions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><a class="link" href="../functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">))</span> <span class="special">==</span> <span class="identifier">i</span> <span class="special">&amp;&amp;</span> <a class="link" href="../functions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><a class="link" href="../functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">))</span> <span class="special">==</span> <a class="link" href="../functions/nex
t.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../functions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">))</span></code></li>
+<li class="listitem"><code class="computeroutput"><a class="link" href="../functions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../functions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">advance_c</span></code></a><span class="special">&lt;-</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code></li>
+<li class="listitem">
+            Using <code class="computeroutput"><a class="link" href="../functions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a></code> to traverse a sequence
             will never return a previously seen position
           </li>
 </ul></div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.bidirectional_iterator.models"></a><h5>
-<a name="id424535"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>
-std::pair
-=======
 <a name="fusion.iterator.concepts.bidirectional_iterator.models"></a><h6>
-<a name="id623920"></a>
+<a name="id624531"></a>
           <a class="link" href="bidirectional_iterator.html#fusion.iterator.concepts.bidirectional_iterator.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
 <a class="link" href="../../adapted/std__pair.html" title="std::pair"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a>
->>>>>>> .merge-right.r57125
             iterator
           </li>
-<li>
-boost::array
+<li class="listitem">
+<a class="link" href="../../adapted/boost__array.html" title="boost::array"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code></a>
             iterator
           </li>
-<li>
-vector
+<li class="listitem">
+<a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>
             iterator
           </li>
-<li>
-iterator_range
-            (where adapted sequence is a <a href="../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+<li class="listitem">
+<a class="link" href="../../view/iterator_range.html" title="iterator_range"><code class="computeroutput"><span class="identifier">iterator_range</span></code></a>
+            (where adapted sequence is a <a class="link" href="../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
             Sequence</a>)
           </li>
-<li>
-transform_view
-            (where adapted sequence is a <a href="../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+<li class="listitem">
+<a class="link" href="../../view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a>
+            (where adapted sequence is a <a class="link" href="../../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
             Sequence</a>)
           </li>
-<li>reverse_view</li>
+<li class="listitem"><a class="link" href="../../view/reverse_view.html" title="reverse_view"><code class="computeroutput"><span class="identifier">reverse_view</span></code></a></li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/concepts/forward_iterator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/concepts/forward_iterator.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/concepts/forward_iterator.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,19 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Forward
-        Iterator</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Forward Iterator</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="../concepts.html" title="Concepts">
-<link rel="next" href="bidirectional_iterator.html" title="Bidirectional
-        Iterator">
+<link rel="prev" href="../concepts.html" title="Concepts">
+<link rel="next" href="bidirectional_iterator.html" title="Bidirectional Iterator">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -28,67 +22,49 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../concepts.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="bidirectional_iterator.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.concepts.forward_iterator"></a><a href="forward_iterator.html" title="Forward
-        Iterator">Forward
+<div class="section" title="Forward Iterator">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.concepts.forward_iterator"></a><a class="link" href="forward_iterator.html" title="Forward Iterator">Forward
         Iterator</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.concepts.forward_iterator.description"></a><h5>
-<a name="id420469"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.iterator.concepts.forward_iterator.description"></a><h6>
-<a name="id619640"></a>
+<a name="id621344"></a>
           <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          A Forward Iterator traverses a Sequence
+          A Forward Iterator traverses a <a class="link" href="../../sequence.html" title="Sequence">Sequence</a>
           allowing movement in only one direction through it's elements, one element
           at a time.
         </p>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">i</span></tt>,
-          <tt class="computeroutput"><span class="identifier">j</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">i</span></code>,
+          <code class="computeroutput"><span class="identifier">j</span></code></span></dt>
 <dd><p>
               Forward Iterators
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">I</span></tt>,
-          <tt class="computeroutput"><span class="identifier">J</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">I</span></code>,
+          <code class="computeroutput"><span class="identifier">J</span></code></span></dt>
 <dd><p>
               Forward Iterator types
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">M</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">M</span></code></span></dt>
 <dd><p>
               An MPL
               integral constant
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">N</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">N</span></code></span></dt>
 <dd><p>
               An integral constant
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.forward_iterator.expression_requirements"></a><h5>
-<a name="id420641"></a>
-          <a href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.expression_requirements">Expression
-=======
 <a name="fusion.iterator.concepts.forward_iterator.expression_requirements"></a><h6>
-<a name="id619760"></a>
+<a name="id621464"></a>
           <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.expression_requirements">Expression
->>>>>>> .merge-right.r57125
           requirements</a>
-        </h5>
+        </h6>
 <p>
           A type models Forward Iterator if, in addition to being CopyConstructable,
           the following expressions are valid:
@@ -100,401 +76,491 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Return type
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Runtime Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">next<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">i</span> <span class="special">==</span>
-                  <span class="identifier">j</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">i</span> <span class="special">==</span>
+                  <span class="identifier">j</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Convertible to bool
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">i</span> <span class="special">!=</span>
-                  <span class="identifier">j</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">i</span> <span class="special">!=</span>
+                  <span class="identifier">j</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Convertible to bool
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">advance_c<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">advance<span class="special">&lt;</span><span class="identifier">M</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/advance.html" title="advance"><code class="computeroutput"><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">M</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">distance<span class="special">(</span><span class="identifier">i</span><span class="special">,</span>
-                  <span class="identifier">j</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput">result_of::distance<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span>
-                  <span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/distance.html" title="distance"><code class="computeroutput"><span class="identifier">distance</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">,</span>
+                  <span class="identifier">j</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/distance.html" title="distance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">distance</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span>
+                  <span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">deref<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput">result_of::deref<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="special">*</span><span class="identifier">i</span></tt>
-                </p></td>
-<td><p>
-                  <tt class="computeroutput">result_of::deref<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="special">*</span><span class="identifier">i</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.forward_iterator.meta_expressions"></a><h5>
-<a name="id421381"></a>
-          <a href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.meta_expressions">Meta
-=======
 <a name="fusion.iterator.concepts.forward_iterator.meta_expressions"></a><h6>
-<a name="id620306"></a>
+<a name="id622010"></a>
           <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.meta_expressions">Meta
->>>>>>> .merge-right.r57125
           Expressions</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Compile Time Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::next<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::equal_to<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span>
-                  <span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span>
+                  <span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::advance_c<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span>
-                  <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span>
+                  <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Linear
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::advance<span class="special">&lt;</span><span class="identifier">I</span> <span class="special">,</span><span class="identifier">M</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/advance.html" title="advance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">I</span> <span class="special">,</span><span class="identifier">M</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Linear
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::distance<span class="special">&lt;</span><span class="identifier">I</span> <span class="special">,</span><span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/distance.html" title="distance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">distance</span></code></a><span class="special">&lt;</span><span class="identifier">I</span> <span class="special">,</span><span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Linear
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::deref<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::value_of<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.forward_iterator.expression_semantics"></a><h5>
-<a name="id421980"></a>
-          <a href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.expression_semantics">Expression
-=======
 <a name="fusion.iterator.concepts.forward_iterator.expression_semantics"></a><h6>
-<a name="id622116"></a>
+<a name="id622728"></a>
           <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">next<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  An iterator to the element following <tt class="computeroutput"><span class="identifier">i</span></tt>
-                </p></td>
-</tr>
-<tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">i</span> <span class="special">==</span>
-                  <span class="identifier">j</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  An iterator to the element following <code class="computeroutput"><span class="identifier">i</span></code>
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">i</span> <span class="special">==</span>
+                  <span class="identifier">j</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Iterator equality comparison
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">i</span> <span class="special">!=</span>
-                  <span class="identifier">j</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">i</span> <span class="special">!=</span>
+                  <span class="identifier">j</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Iterator inequality comparison
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">advance_c<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  An iterator n elements after <tt class="computeroutput"><span class="identifier">i</span></tt>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  An iterator n elements after <code class="computeroutput"><span class="identifier">i</span></code>
                   in the sequence
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">advance<span class="special">&lt;</span><span class="identifier">M</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  Equivalent to <tt class="computeroutput"><span class="identifier">advance_c</span><span class="special">&lt;</span><span class="identifier">M</span><span class="special">::</span><span class="identifier">value</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-</tr>
-<tr>
-<td><p>
-                  <tt class="computeroutput">distance<span class="special">(</span><span class="identifier">i</span><span class="special">,</span>
-                  <span class="identifier">j</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  The number of elements between <tt class="computeroutput"><span class="identifier">i</span></tt>
-                  and <tt class="computeroutput"><span class="identifier">j</span></tt>
-                </p></td>
-</tr>
-<tr>
-<td><p>
-                  <tt class="computeroutput">deref<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  The element at position<tt class="computeroutput"><span class="identifier">i</span></tt>
-                </p></td>
-</tr>
-<tr>
-<td><p>
-                  <tt class="computeroutput"><span class="special">*</span><span class="identifier">i</span></tt>
-                </p></td>
-<td><p>
-                  Equivalent to <tt class="computeroutput"><span class="identifier">deref</span><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/advance.html" title="advance"><code class="computeroutput"><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">M</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Equivalent to <code class="computeroutput"><span class="identifier">advance_c</span><span class="special">&lt;</span><span class="identifier">M</span><span class="special">::</span><span class="identifier">value</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/distance.html" title="distance"><code class="computeroutput"><span class="identifier">distance</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">,</span>
+                  <span class="identifier">j</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  The number of elements between <code class="computeroutput"><span class="identifier">i</span></code>
+                  and <code class="computeroutput"><span class="identifier">j</span></code>
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  The element at position<code class="computeroutput"><span class="identifier">i</span></code>
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="special">*</span><span class="identifier">i</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Equivalent to <code class="computeroutput"><span class="identifier">deref</span><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.forward_iterator.invariants"></a><h5>
-<a name="id422585"></a>
-          Invariants
-        </h5>
-=======
 <a name="fusion.iterator.concepts.forward_iterator.invariants"></a><h6>
-<a name="id622569"></a>
+<a name="id623180"></a>
           <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.invariants">Invariants</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           The following invariants always hold:
         </p>
-<div class="itemizedlist"><ul type="disc">
-<li><tt class="computeroutput"><span class="special">!(</span><span class="identifier">i</span>
-            <span class="special">==</span> <span class="identifier">j</span><span class="special">)</span> <span class="special">==</span> <span class="special">(</span><span class="identifier">i</span> <span class="special">!=</span> <span class="identifier">j</span><span class="special">)</span></tt></li>
-<li><tt class="computeroutput">next<span class="special">(</span><span class="identifier">i</span><span class="special">)</span> <span class="special">==</span> advance_c<span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt></li>
-<li><tt class="computeroutput">distance<span class="special">(</span><span class="identifier">i</span><span class="special">,</span> advance_c<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">))</span> <span class="special">==</span> <span class="identifier">N</span></tt></li>
-<li>
-            Using <tt class="computeroutput">next</tt> to traverse the
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><code class="computeroutput"><span class="special">!(</span><span class="identifier">i</span>
+            <span class="special">==</span> <span class="identifier">j</span><span class="special">)</span> <span class="special">==</span> <span class="special">(</span><span class="identifier">i</span> <span class="special">!=</span> <span class="identifier">j</span><span class="special">)</span></code></li>
+<li class="listitem"><code class="computeroutput"><a class="link" href="../functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="../functions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code></li>
+<li class="listitem"><code class="computeroutput"><a class="link" href="../functions/distance.html" title="distance"><code class="computeroutput"><span class="identifier">distance</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">,</span> <a class="link" href="../functions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">))</span> <span class="special">==</span> <span class="identifier">N</span></code></li>
+<li class="listitem">
+            Using <code class="computeroutput"><a class="link" href="../functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a></code> to traverse the
             sequence will never return to a previously seen position
           </li>
-<li>
-<tt class="computeroutput">deref<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt> is equivalent to <tt class="computeroutput"><span class="special">*</span><span class="identifier">i</span></tt>
+<li class="listitem">
+<code class="computeroutput"><a class="link" href="../functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code> is equivalent to <code class="computeroutput"><span class="special">*</span><span class="identifier">i</span></code>
 </li>
-<li>
-            If <tt class="computeroutput"><span class="identifier">i</span> <span class="special">==</span>
-            <span class="identifier">j</span></tt> then <tt class="computeroutput"><span class="special">*</span><span class="identifier">i</span></tt> is equivalent to <tt class="computeroutput"><span class="special">*</span><span class="identifier">j</span></tt>
+<li class="listitem">
+            If <code class="computeroutput"><span class="identifier">i</span> <span class="special">==</span>
+            <span class="identifier">j</span></code> then <code class="computeroutput"><span class="special">*</span><span class="identifier">i</span></code> is equivalent to <code class="computeroutput"><span class="special">*</span><span class="identifier">j</span></code>
 </li>
 </ul></div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.forward_iterator.models"></a><h5>
-<a name="id423010"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>
-std::pair
-=======
 <a name="fusion.iterator.concepts.forward_iterator.models"></a><h6>
-<a name="id622861"></a>
+<a name="id623473"></a>
           <a class="link" href="forward_iterator.html#fusion.iterator.concepts.forward_iterator.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
 <a class="link" href="../../adapted/std__pair.html" title="std::pair"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a>
->>>>>>> .merge-right.r57125
             iterator
           </li>
-<li>
-boost::array
+<li class="listitem">
+<a class="link" href="../../adapted/boost__array.html" title="boost::array"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code></a>
             iterator
           </li>
-<li>
-vector
+<li class="listitem">
+<a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>
             iterator
           </li>
-<li>
-cons
+<li class="listitem">
+<a class="link" href="../../container/cons.html" title="cons"><code class="computeroutput"><span class="identifier">cons</span></code></a>
             iterator
           </li>
-<li>
-list
+<li class="listitem">
+<a class="link" href="../../container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>
             iterator
           </li>
-<li>
-set
+<li class="listitem">
+<a class="link" href="../../container/set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a>
             iterator
           </li>
-<li>
-map
+<li class="listitem">
+<a class="link" href="../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a>
             iterator
           </li>
-<li>
-single_view
+<li class="listitem">
+<a class="link" href="../../view/single_view.html" title="single_view"><code class="computeroutput"><span class="identifier">single_view</span></code></a>
             iterator
           </li>
-<li>
-filter_view
+<li class="listitem">
+<a class="link" href="../../view/filter_view.html" title="filter_view"><code class="computeroutput"><span class="identifier">filter_view</span></code></a>
             iterator
           </li>
-<li>
-iterator_range
+<li class="listitem">
+<a class="link" href="../../view/iterator_range.html" title="iterator_range"><code class="computeroutput"><span class="identifier">iterator_range</span></code></a>
             iterator
           </li>
-<li>
-joint_view
+<li class="listitem">
+<a class="link" href="../../view/joint_view.html" title="joint_view"><code class="computeroutput"><span class="identifier">joint_view</span></code></a>
             iterator
           </li>
-<li>
-transform_view
+<li class="listitem">
+<a class="link" href="../../view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a>
             iterator
           </li>
-<li>
-reverse_view
+<li class="listitem">
+<a class="link" href="../../view/reverse_view.html" title="reverse_view"><code class="computeroutput"><span class="identifier">reverse_view</span></code></a>
             iterator
           </li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/concepts/random_access_iterator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/concepts/random_access_iterator.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/concepts/random_access_iterator.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,18 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Random
-        Access Iterator</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Random Access Iterator</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="bidirectional_iterator.html" title="Bidirectional
-        Iterator">
+<link rel="prev" href="bidirectional_iterator.html" title="Bidirectional Iterator">
 <link rel="next" href="associative_iterator.html" title="Associative Iterator">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,86 +22,60 @@
 <div class="spirit-nav">
 <a accesskey="p" href="bidirectional_iterator.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="associative_iterator.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.concepts.random_access_iterator"></a><a href="random_access_iterator.html" title="Random
-        Access Iterator">Random
+<div class="section" title="Random Access Iterator">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.concepts.random_access_iterator"></a><a class="link" href="random_access_iterator.html" title="Random Access Iterator">Random
         Access Iterator</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.concepts.random_access_iterator.description"></a><h5>
-<a name="id424748"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.iterator.concepts.random_access_iterator.description"></a><h6>
-<a name="id624053"></a>
+<a name="id624664"></a>
           <a class="link" href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          A Random Access Iterator traverses a Sequence
+          A Random Access Iterator traverses a <a class="link" href="../../sequence.html" title="Sequence">Sequence</a>
           moving in either direction, permitting efficient arbitrary distance movements
           back and forward through the sequence.
         </p>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">i</span></tt>,
-          <tt class="computeroutput"><span class="identifier">j</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">i</span></code>,
+          <code class="computeroutput"><span class="identifier">j</span></code></span></dt>
 <dd><p>
               Random Access Iterators
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">I</span></tt>,
-          <tt class="computeroutput"><span class="identifier">J</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">I</span></code>,
+          <code class="computeroutput"><span class="identifier">J</span></code></span></dt>
 <dd><p>
               Random Access Iterator types
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">M</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">M</span></code></span></dt>
 <dd><p>
               An MPL
               integral constant
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">N</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">N</span></code></span></dt>
 <dd><p>
               An integral constant
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.random_access_iterator.refinement_of"></a><h5>
-<a name="id424917"></a>
-          <a href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.refinement_of">Refinement
-=======
 <a name="fusion.iterator.concepts.random_access_iterator.refinement_of"></a><h6>
-<a name="id624179"></a>
+<a name="id626429"></a>
           <a class="link" href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.refinement_of">Refinement
->>>>>>> .merge-right.r57125
           of</a>
-        </h5>
+        </h6>
 <p>
-          <a href="bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+          <a class="link" href="bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
           Iterator</a>
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.random_access_iterator.expression_requirements"></a><h5>
-<a name="id424955"></a>
-          <a href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.expression_requirements">Expression
-=======
 <a name="fusion.iterator.concepts.random_access_iterator.expression_requirements"></a><h6>
-<a name="id624203"></a>
+<a name="id626453"></a>
           <a class="link" href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.expression_requirements">Expression
->>>>>>> .merge-right.r57125
           requirements</a>
-        </h5>
+        </h6>
 <p>
-          In addition to the requirements defined in <a href="bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+          In addition to the requirements defined in <a class="link" href="bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
           Iterator</a>, the following expressions must be valid:
         </p>
 <div class="informaltable"><table class="table">
@@ -117,174 +85,197 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Return type
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Runtime Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">next<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="random_access_iterator.html" title="Random
-        Access Iterator">Random
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="random_access_iterator.html" title="Random Access Iterator">Random
                   Access Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">prior<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="random_access_iterator.html" title="Random
-        Access Iterator">Random
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="random_access_iterator.html" title="Random Access Iterator">Random
                   Access Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">advance_c<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="random_access_iterator.html" title="Random
-        Access Iterator">Random
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="random_access_iterator.html" title="Random Access Iterator">Random
                   Access Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">advance<span class="special">&lt;</span><span class="identifier">M</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="random_access_iterator.html" title="Random
-        Access Iterator">Random
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../functions/advance.html" title="advance"><code class="computeroutput"><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">M</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="random_access_iterator.html" title="Random Access Iterator">Random
                   Access Iterator</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.random_access_iterator.meta_expressions"></a><h5>
-<a name="id425335"></a>
-          <a href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.meta_expressions">Meta
-=======
 <a name="fusion.iterator.concepts.random_access_iterator.meta_expressions"></a><h6>
-<a name="id625095"></a>
+<a name="id626731"></a>
           <a class="link" href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.meta_expressions">Meta
->>>>>>> .merge-right.r57125
           Expressions</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Compile Time Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::advance_c<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span>
-                  <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span>
+                  <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::advance<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span>
-                  <span class="identifier">M</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/advance.html" title="advance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span>
+                  <span class="identifier">M</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::distance<span class="special">&lt;</span><span class="identifier">I</span> <span class="special">,</span><span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../metafunctions/distance.html" title="distance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">distance</span></code></a><span class="special">&lt;</span><span class="identifier">I</span> <span class="special">,</span><span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.iterator.concepts.random_access_iterator.models"></a><h5>
-<a name="id425639"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>
-vector
-=======
 <a name="fusion.iterator.concepts.random_access_iterator.models"></a><h6>
-<a name="id625323"></a>
+<a name="id626959"></a>
           <a class="link" href="random_access_iterator.html#fusion.iterator.concepts.random_access_iterator.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
 <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>
->>>>>>> .merge-right.r57125
             iterator
           </li>
-<li>
-std::pair
+<li class="listitem">
+<a class="link" href="../../adapted/std__pair.html" title="std::pair"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a>
             iterator
           </li>
-<li>
-boost::array
+<li class="listitem">
+<a class="link" href="../../adapted/boost__array.html" title="boost::array"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">array</span></code></a>
             iterator
           </li>
-<li>
-iterator_range
-            iterator (where adapted sequence is a <a href="../../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+<li class="listitem">
+<a class="link" href="../../view/iterator_range.html" title="iterator_range"><code class="computeroutput"><span class="identifier">iterator_range</span></code></a>
+            iterator (where adapted sequence is a <a class="link" href="../../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
             Access Sequence</a>)
           </li>
-<li>
-transform_view
-            iterator (where adapted sequence is a <a href="../../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+<li class="listitem">
+<a class="link" href="../../view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a>
+            iterator (where adapted sequence is a <a class="link" href="../../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
             Access Sequence</a>)
           </li>
-<li>
-reverse_view
-            iterator (where adapted sequence is a <a href="../../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+<li class="listitem">
+<a class="link" href="../../view/reverse_view.html" title="reverse_view"><code class="computeroutput"><span class="identifier">reverse_view</span></code></a>
+            iterator (where adapted sequence is a <a class="link" href="../../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
             Access Sequence</a>)
           </li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,21 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../iterator.html" title="Iterator">
-<<<<<<< .working
-<link rel="previous" href="concepts/random_access_iterator.html" title="Random
-        Access Iterator">
-=======
 <link rel="prev" href="concepts/associative_iterator.html" title="Associative Iterator">
->>>>>>> .merge-right.r57242
 <link rel="next" href="functions/deref.html" title="deref">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -31,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="concepts/associative_iterator.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="functions/deref.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.iterator.functions"></a>Functions
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.iterator.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">deref</span></dt>
 <dt><span class="section">next</span></dt>
@@ -55,7 +43,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>advance</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="distance.html" title="distance">
+<link rel="prev" href="distance.html" title="distance">
 <link rel="next" href="advance_c.html" title="advance_c">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,177 +22,126 @@
 <div class="spirit-nav">
 <a accesskey="p" href="distance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="advance_c.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.functions.advance"></a>advance
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.functions.advance.description"></a><h5>
-<a name="id429699"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="advance">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.functions.advance"></a><a class="link" href="advance.html" title="advance">advance</a>
 </h4></div></div></div>
 <a name="fusion.iterator.functions.advance.description"></a><h6>
-<a name="id637460"></a>
+<a name="id630906"></a>
           <a class="link" href="advance.html#fusion.iterator.functions.advance.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Moves an iterator by a specified distance.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.advance.synopsis"></a><h5>
-<a name="id429727"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.functions.advance.synopsis"></a><h6>
-<a name="id637478"></a>
+<a name="id630924"></a>
           <a class="link" href="advance.html#fusion.iterator.functions.advance.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">M</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::advance<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">M</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">advance</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/advance.html" title="advance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">M</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">advance</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id429898"></a><p class="title"><b>Table 1.6. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id682242"></a><p class="title"><b>Table 1.6. Parameters</b></p>
-=======
-<a name="id638149"></a><p class="title"><b>Table 1.6. Parameters</b></p>
-=======
-<a name="id630503"></a><p class="title"><b>Table 1.6. Parameters</b></p>
-=======
-<a name="id653103"></a><p class="title"><b>Table&#160;1.6.&#160;Parameters</b></p>
-=======
-<a name="id640877"></a><p class="title"><b>Table&#160;1.6.&#160;Parameters</b></p>
-=======
-<a name="id637600"></a><p class="title"><b>Table&#160;1.6.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id631046"></a><p class="title"><b>Table&#160;1.6.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">i</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">i</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Iterator to move relative to
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">N</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">N</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
                 Integral Constant</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Number of positions to move
-              </p></td>
+              </p>
+              </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.functions.advance.expression_semantics"></a><h5>
-<a name="id430042"></a>
-          <a href="advance.html#fusion.iterator.functions.advance.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.functions.advance.expression_semantics"></a><h6>
-<a name="id637719"></a>
+<a name="id631165"></a>
           <a class="link" href="advance.html#fusion.iterator.functions.advance.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">advance<span class="special">&lt;</span><span class="identifier">M</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">);</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="advance.html" title="advance"><code class="computeroutput"><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">M</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: A model of the same iterator
-          concept as <tt class="computeroutput"><span class="identifier">i</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+          concept as <code class="computeroutput"><span class="identifier">i</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns an iterator to the
-          element <tt class="computeroutput"><span class="identifier">M</span></tt> positions from
-          <tt class="computeroutput"><span class="identifier">i</span></tt>. If <tt class="computeroutput"><span class="identifier">i</span></tt>
-          is a <a href="../concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
-          Iterator</a> then <tt class="computeroutput"><span class="identifier">M</span></tt>
+          <span class="bold"><strong>Semantics</strong></span>: Returns an iterator to the
+          element <code class="computeroutput"><span class="identifier">M</span></code> positions from
+          <code class="computeroutput"><span class="identifier">i</span></code>. If <code class="computeroutput"><span class="identifier">i</span></code>
+          is a <a class="link" href="../concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+          Iterator</a> then <code class="computeroutput"><span class="identifier">M</span></code>
           may be negative.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.advance.header"></a><h5>
-<a name="id430203"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.functions.advance.header"></a><h6>
-<a name="id637821"></a>
+<a name="id631267"></a>
           <a class="link" href="advance.html#fusion.iterator.functions.advance.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.functions.advance.example"></a><h5>
-<a name="id430357"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.functions.advance.example"></a><h6>
-<a name="id639022"></a>
+<a name="id632468"></a>
           <a class="link" href="advance.html#fusion.iterator.functions.advance.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
 <span class="identifier">vec</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span>advance<span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;</span> <span class="special">&gt;(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="advance.html" title="advance"><code class="computeroutput"><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;</span> <span class="special">&gt;(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance_c.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance_c.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/advance_c.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>advance_c</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="advance.html" title="advance">
+<link rel="prev" href="advance.html" title="advance">
 <link rel="next" href="deref_data.html" title="deref_data">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,176 +22,125 @@
 <div class="spirit-nav">
 <a accesskey="p" href="advance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="deref_data.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.functions.advance_c"></a>advance_c
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.functions.advance_c.description"></a><h5>
-<a name="id430651"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="advance_c">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.functions.advance_c"></a><a class="link" href="advance_c.html" title="advance_c">advance_c</a>
 </h4></div></div></div>
 <a name="fusion.iterator.functions.advance_c.description"></a><h6>
-<a name="id639223"></a>
+<a name="id632670"></a>
           <a class="link" href="advance_c.html#fusion.iterator.functions.advance_c.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Moves an iterator by a specified distance.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.advance_c.synopsis"></a><h5>
-<a name="id430680"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.functions.advance_c.synopsis"></a><h6>
-<a name="id639241"></a>
+<a name="id632688"></a>
           <a class="link" href="advance_c.html#fusion.iterator.functions.advance_c.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
     <span class="keyword">int</span> <span class="identifier">N</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::advance_c<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">advance_c</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">advance_c</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id430850"></a><p class="title"><b>Table 1.7. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id682913"></a><p class="title"><b>Table 1.7. Parameters</b></p>
-=======
-<a name="id638820"></a><p class="title"><b>Table 1.7. Parameters</b></p>
-=======
-<a name="id631175"></a><p class="title"><b>Table 1.7. Parameters</b></p>
-=======
-<a name="id654866"></a><p class="title"><b>Table&#160;1.7.&#160;Parameters</b></p>
-=======
-<a name="id642640"></a><p class="title"><b>Table&#160;1.7.&#160;Parameters</b></p>
-=======
-<a name="id639364"></a><p class="title"><b>Table&#160;1.7.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id632810"></a><p class="title"><b>Table&#160;1.7.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">i</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">i</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Iterator to move relative to
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">N</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">N</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Integer constant
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Number of positions to move
-              </p></td>
+              </p>
+              </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.functions.advance_c.expression_semantics"></a><h5>
-<a name="id430988"></a>
-          <a href="advance_c.html#fusion.iterator.functions.advance_c.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.functions.advance_c.expression_semantics"></a><h6>
-<a name="id639480"></a>
+<a name="id632926"></a>
           <a class="link" href="advance_c.html#fusion.iterator.functions.advance_c.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">advance_c<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">);</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">i</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: A model of the same iterator
-          concept as <tt class="computeroutput"><span class="identifier">i</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+          concept as <code class="computeroutput"><span class="identifier">i</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns an iterator to the
-          element <tt class="computeroutput"><span class="identifier">N</span></tt> positions from
-          <tt class="computeroutput"><span class="identifier">i</span></tt>. If <tt class="computeroutput"><span class="identifier">i</span></tt>
-          is a <a href="../concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
-          Iterator</a> then <tt class="computeroutput"><span class="identifier">N</span></tt>
+          <span class="bold"><strong>Semantics</strong></span>: Returns an iterator to the
+          element <code class="computeroutput"><span class="identifier">N</span></code> positions from
+          <code class="computeroutput"><span class="identifier">i</span></code>. If <code class="computeroutput"><span class="identifier">i</span></code>
+          is a <a class="link" href="../concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+          Iterator</a> then <code class="computeroutput"><span class="identifier">N</span></code>
           may be negative.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.advance_c.header"></a><h5>
-<a name="id431151"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.functions.advance_c.header"></a><h6>
-<a name="id639584"></a>
+<a name="id633031"></a>
           <a class="link" href="advance_c.html#fusion.iterator.functions.advance_c.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.functions.advance_c.example"></a><h5>
-<a name="id431306"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.functions.advance_c.example"></a><h6>
-<a name="id639692"></a>
+<a name="id633139"></a>
           <a class="link" href="advance_c.html#fusion.iterator.functions.advance_c.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
 <span class="identifier">vec</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span>advance_c<span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/deref.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>deref</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="../functions.html" title="Functions">
+<link rel="prev" href="../functions.html" title="Functions">
 <link rel="next" href="next.html" title="next">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,159 +22,103 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../functions.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="next.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.functions.deref"></a>deref
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.functions.deref.description"></a><h5>
-<a name="id425893"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="deref">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.functions.deref"></a><a class="link" href="deref.html" title="deref">deref</a>
 </h4></div></div></div>
 <a name="fusion.iterator.functions.deref.description"></a><h6>
-<a name="id634266"></a>
+<a name="id627712"></a>
           <a class="link" href="deref.html#fusion.iterator.functions.deref.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Deferences an iterator.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.deref.synopsis"></a><h5>
-<a name="id425922"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.functions.deref.synopsis"></a><h6>
-<a name="id634283"></a>
+<a name="id627729"></a>
           <a class="link" href="deref.html#fusion.iterator.functions.deref.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::deref<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">deref</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">deref</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id426066"></a><p class="title"><b>Table 1.2. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id679025"></a><p class="title"><b>Table 1.2. Parameters</b></p>
-=======
-<a name="id633840"></a><p class="title"><b>Table 1.2. Parameters</b></p>
-=======
-<a name="id626194"></a><p class="title"><b>Table 1.2. Parameters</b></p>
-=======
-<a name="id649886"></a><p class="title"><b>Table&#160;1.2.&#160;Parameters</b></p>
-=======
-<a name="id637660"></a><p class="title"><b>Table&#160;1.2.&#160;Parameters</b></p>
-=======
-<a name="id634383"></a><p class="title"><b>Table&#160;1.2.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id627830"></a><p class="title"><b>Table&#160;1.2.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">i</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">i</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's argument
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.functions.deref.expression_semantics"></a><h5>
-<a name="id426167"></a>
-          <a href="deref.html#fusion.iterator.functions.deref.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.functions.deref.expression_semantics"></a><h6>
-<a name="id634465"></a>
+<a name="id627911"></a>
           <a class="link" href="deref.html#fusion.iterator.functions.deref.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">deref<span class="special">(</span><span class="identifier">i</span><span class="special">);</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: <tt class="computeroutput">result_of::deref<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
+          <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><a class="link" href="../metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Dereferences the iterator
-          <tt class="computeroutput"><span class="identifier">i</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Dereferences the iterator
+          <code class="computeroutput"><span class="identifier">i</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.deref.header"></a><h5>
-<a name="id426312"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.functions.deref.header"></a><h6>
-<a name="id634560"></a>
+<a name="id628006"></a>
           <a class="link" href="deref.html#fusion.iterator.functions.deref.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.functions.deref.example"></a><h5>
-<a name="id426466"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&amp;&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.functions.deref.example"></a><h6>
-<a name="id634668"></a>
+<a name="id628114"></a>
           <a class="link" href="deref.html#fusion.iterator.functions.deref.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&amp;&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
 <span class="keyword">int</span> <span class="identifier">i</span><span class="special">(</span><span class="number">0</span><span class="special">);</span>
 <span class="identifier">vec</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="identifier">i</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">))</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">0</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(&amp;(</span>deref<span class="special">(</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">))))</span> <span class="special">==</span> <span class="special">&amp;</span><span class="identifier">i</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">))</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">0</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(&amp;(</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">))))</span> <span class="special">==</span> <span class="special">&amp;</span><span class="identifier">i</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/functions/distance.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/distance.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/distance.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>distance</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="prior.html" title="prior">
+<link rel="prev" href="prior.html" title="prior">
 <link rel="next" href="advance.html" title="advance">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,157 +22,101 @@
 <div class="spirit-nav">
 <a accesskey="p" href="prior.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="advance.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.functions.distance"></a>distance
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.functions.distance.description"></a><h5>
-<a name="id428768"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="distance">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.functions.distance"></a><a class="link" href="distance.html" title="distance">distance</a>
 </h4></div></div></div>
 <a name="fusion.iterator.functions.distance.description"></a><h6>
-<a name="id636810"></a>
+<a name="id630257"></a>
           <a class="link" href="distance.html#fusion.iterator.functions.distance.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Returns the distance between 2 iterators.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.distance.synopsis"></a><h5>
-<a name="id428797"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.functions.distance.synopsis"></a><h6>
-<a name="id636828"></a>
+<a name="id630275"></a>
           <a class="link" href="distance.html#fusion.iterator.functions.distance.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">J</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::distance<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">distance</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">J</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">j</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/distance.html" title="distance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">distance</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">distance</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">J</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">j</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id428996"></a><p class="title"><b>Table 1.5. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id681614"></a><p class="title"><b>Table 1.5. Parameters</b></p>
-=======
-<a name="id637522"></a><p class="title"><b>Table 1.5. Parameters</b></p>
-=======
-<a name="id629876"></a><p class="title"><b>Table 1.5. Parameters</b></p>
-=======
-<a name="id652475"></a><p class="title"><b>Table&#160;1.5.&#160;Parameters</b></p>
-=======
-<a name="id640249"></a><p class="title"><b>Table&#160;1.5.&#160;Parameters</b></p>
-=======
-<a name="id636972"></a><p class="title"><b>Table&#160;1.5.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id630419"></a><p class="title"><b>Table&#160;1.5.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">i</span></tt>, <tt class="computeroutput"><span class="identifier">j</span></tt>
-              </p></td>
-<td><p>
-                Models of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">i</span></code>, <code class="computeroutput"><span class="identifier">j</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Models of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a> into the same sequence
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 The start and end points of the distance to be measured
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.functions.distance.expression_semantics"></a><h5>
-<a name="id429110"></a>
-          <a href="distance.html#fusion.iterator.functions.distance.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.functions.distance.expression_semantics"></a><h6>
-<a name="id637061"></a>
+<a name="id630508"></a>
           <a class="link" href="distance.html#fusion.iterator.functions.distance.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">distance<span class="special">(</span><span class="identifier">i</span><span class="special">,</span><span class="identifier">j</span><span class="special">);</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="distance.html" title="distance"><code class="computeroutput"><span class="identifier">distance</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">,</span><span class="identifier">j</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">int</span></tt>
+          <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">int</span></code>
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns the distance between
-          iterators <tt class="computeroutput"><span class="identifier">i</span></tt> and <tt class="computeroutput"><span class="identifier">j</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns the distance between
+          iterators <code class="computeroutput"><span class="identifier">i</span></code> and <code class="computeroutput"><span class="identifier">j</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.distance.header"></a><h5>
-<a name="id429236"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.functions.distance.header"></a><h6>
-<a name="id637144"></a>
+<a name="id630590"></a>
           <a class="link" href="distance.html#fusion.iterator.functions.distance.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">distance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">distance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.functions.distance.example"></a><h5>
-<a name="id429393"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.functions.distance.example"></a><h6>
-<a name="id637252"></a>
+<a name="id630698"></a>
           <a class="link" href="distance.html#fusion.iterator.functions.distance.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
 <span class="identifier">vec</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>distance<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">),</span> next<span class="special">(</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">))))</span> <span class="special">==</span> <span class="number">2</spa
n><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="distance.html" title="distance"><code class="computeroutput"><span class="identifier">distance</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">),</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span cl
ass="special">))))</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/functions/next.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/next.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/next.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>next</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="deref.html" title="deref">
+<link rel="prev" href="deref.html" title="deref">
 <link rel="next" href="prior.html" title="prior">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,159 +22,103 @@
 <div class="spirit-nav">
 <a accesskey="p" href="deref.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="prior.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.functions.next"></a>next
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.functions.next.description"></a><h5>
-<a name="id426912"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="next">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.functions.next"></a><a class="link" href="next.html" title="next">next</a>
 </h4></div></div></div>
 <a name="fusion.iterator.functions.next.description"></a><h6>
-<a name="id634970"></a>
+<a name="id628417"></a>
           <a class="link" href="next.html#fusion.iterator.functions.next.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Moves an iterator 1 position forwards.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.next.synopsis"></a><h5>
-<a name="id426939"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.functions.next.synopsis"></a><h6>
-<a name="id634988"></a>
+<a name="id628435"></a>
           <a class="link" href="next.html#fusion.iterator.functions.next.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::next<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">next</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">next</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id427082"></a><p class="title"><b>Table 1.3. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id679731"></a><p class="title"><b>Table 1.3. Parameters</b></p>
-=======
-<a name="id634546"></a><p class="title"><b>Table 1.3. Parameters</b></p>
-=======
-<a name="id626900"></a><p class="title"><b>Table 1.3. Parameters</b></p>
-=======
-<a name="id650592"></a><p class="title"><b>Table&#160;1.3.&#160;Parameters</b></p>
-=======
-<a name="id638366"></a><p class="title"><b>Table&#160;1.3.&#160;Parameters</b></p>
-=======
-<a name="id635089"></a><p class="title"><b>Table&#160;1.3.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id628535"></a><p class="title"><b>Table&#160;1.3.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">i</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">i</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's argument
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.functions.next.expression_semantics"></a><h5>
-<a name="id427182"></a>
-          <a href="next.html#fusion.iterator.functions.next.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.functions.next.expression_semantics"></a><h6>
-<a name="id635717"></a>
+<a name="id629164"></a>
           <a class="link" href="next.html#fusion.iterator.functions.next.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <pre class="programlisting"><span class="identifier">next</span><span class="special">(</span><span class="identifier">i</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: A model of the same iterator
-          concept as <tt class="computeroutput"><span class="identifier">i</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+          concept as <code class="computeroutput"><span class="identifier">i</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns an iterator to the
-          next element after <tt class="computeroutput"><span class="identifier">i</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns an iterator to the
+          next element after <code class="computeroutput"><span class="identifier">i</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.next.header"></a><h5>
-<a name="id427278"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.functions.next.header"></a><h6>
-<a name="id635782"></a>
+<a name="id629228"></a>
           <a class="link" href="next.html#fusion.iterator.functions.next.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">next</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">next</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.functions.next.example"></a><h5>
-<a name="id427434"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.functions.next.example"></a><h6>
-<a name="id635890"></a>
+<a name="id629336"></a>
           <a class="link" href="next.html#fusion.iterator.functions.next.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
 <span class="identifier">vec</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">,</span><span class="number">3</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">))</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span>next<span class="special">(</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">))))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">))</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">))))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/functions/prior.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/functions/prior.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/functions/prior.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>prior</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="next.html" title="next">
+<link rel="prev" href="next.html" title="next">
 <link rel="next" href="distance.html" title="distance">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,158 +22,102 @@
 <div class="spirit-nav">
 <a accesskey="p" href="next.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="distance.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.functions.prior"></a>prior
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.functions.prior.description"></a><h5>
-<a name="id427883"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="prior">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.functions.prior"></a><a class="link" href="prior.html" title="prior">prior</a>
 </h4></div></div></div>
 <a name="fusion.iterator.functions.prior.description"></a><h6>
-<a name="id636195"></a>
+<a name="id629641"></a>
           <a class="link" href="prior.html#fusion.iterator.functions.prior.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Moves an iterator 1 position backwards.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.prior.synopsis"></a><h5>
-<a name="id427911"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.functions.prior.synopsis"></a><h6>
-<a name="id636213"></a>
+<a name="id629659"></a>
           <a class="link" href="prior.html#fusion.iterator.functions.prior.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::prior<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">prior</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">prior</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">prior</span><span class="special">(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id428053"></a><p class="title"><b>Table 1.4. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id680955"></a><p class="title"><b>Table 1.4. Parameters</b></p>
-=======
-<a name="id636863"></a><p class="title"><b>Table 1.4. Parameters</b></p>
-=======
-<a name="id629217"></a><p class="title"><b>Table 1.4. Parameters</b></p>
-=======
-<a name="id651816"></a><p class="title"><b>Table&#160;1.4.&#160;Parameters</b></p>
-=======
-<a name="id639590"></a><p class="title"><b>Table&#160;1.4.&#160;Parameters</b></p>
-=======
-<a name="id636314"></a><p class="title"><b>Table&#160;1.4.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id629760"></a><p class="title"><b>Table&#160;1.4.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">i</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">i</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's argument
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.functions.prior.expression_semantics"></a><h5>
-<a name="id428154"></a>
-          <a href="prior.html#fusion.iterator.functions.prior.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.functions.prior.expression_semantics"></a><h6>
-<a name="id636395"></a>
+<a name="id629842"></a>
           <a class="link" href="prior.html#fusion.iterator.functions.prior.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">prior<span class="special">(</span><span class="identifier">i</span><span class="special">);</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: A model of the same iterator
-          concept as <tt class="computeroutput"><span class="identifier">i</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+          concept as <code class="computeroutput"><span class="identifier">i</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns an iterator to the
-          element prior to <tt class="computeroutput"><span class="identifier">i</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns an iterator to the
+          element prior to <code class="computeroutput"><span class="identifier">i</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.functions.prior.header"></a><h5>
-<a name="id428260"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.functions.prior.header"></a><h6>
-<a name="id636465"></a>
+<a name="id629911"></a>
           <a class="link" href="prior.html#fusion.iterator.functions.prior.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">prior</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">prior</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.functions.prior.example"></a><h5>
-<a name="id428415"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.functions.prior.example"></a><h6>
-<a name="id636573"></a>
+<a name="id630019"></a>
           <a class="link" href="prior.html#fusion.iterator.functions.prior.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
 <span class="identifier">vec</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span>prior<span class="special">(</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">))))</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">))))</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Metafunctions</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../iterator.html" title="Iterator">
-<link rel="previous" href="operator/operator_inequality.html" title=" Operator
-        !=">
+<link rel="prev" href="operator/operator_inequality.html" title="Operator !=">
 <link rel="next" href="metafunctions/value_of.html" title="value_of">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="operator/operator_inequality.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="metafunctions/value_of.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.iterator.metafunctions"></a>Metafunctions
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Metafunctions">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.iterator.metafunctions"></a><a class="link" href="metafunctions.html" title="Metafunctions">Metafunctions</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">value_of</span></dt>
 <dt><span class="section">deref</span></dt>
@@ -50,7 +42,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>advance</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="distance.html" title="distance">
+<link rel="prev" href="distance.html" title="distance">
 <link rel="next" href="advance_c.html" title="advance_c">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,42 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="distance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="advance_c.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.metafunctions.advance"></a>advance
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.metafunctions.advance.description"></a><h5>
-<a name="id439778"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="advance">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.metafunctions.advance"></a><a class="link" href="advance.html" title="advance">advance</a>
 </h4></div></div></div>
 <a name="fusion.iterator.metafunctions.advance.description"></a><h6>
-<a name="id648520"></a>
+<a name="id641967"></a>
           <a class="link" href="advance.html#fusion.iterator.metafunctions.advance.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Moves an iterator a specified distance.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.advance.synopsis"></a><h5>
-<a name="id439807"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.advance.synopsis"></a><h6>
-<a name="id648538"></a>
+<a name="id641985"></a>
           <a class="link" href="advance.html#fusion.iterator.metafunctions.advance.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">M</span>
@@ -76,138 +47,105 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id439923"></a><p class="title"><b>Table 1.17. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id690363"></a><p class="title"><b>Table 1.17. Parameters</b></p>
-=======
-<a name="id647671"></a><p class="title"><b>Table 1.18. Parameters</b></p>
-=======
-<a name="id640571"></a><p class="title"><b>Table 1.18. Parameters</b></p>
-=======
-<a name="id664058"></a><p class="title"><b>Table&#160;1.18.&#160;Parameters</b></p>
-=======
-<a name="id651900"></a><p class="title"><b>Table&#160;1.18.&#160;Parameters</b></p>
-=======
-<a name="id648624"></a><p class="title"><b>Table&#160;1.18.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id642070"></a><p class="title"><b>Table&#160;1.18.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">I</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">I</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Iterator to move relative to
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">M</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">M</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Model of <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
                 Integral Constant</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Number of positions to move
-              </p></td>
+              </p>
+              </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.advance.expression_semantics"></a><h5>
-<a name="id440068"></a>
-          <a href="advance.html#fusion.iterator.metafunctions.advance.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.metafunctions.advance.expression_semantics"></a><h6>
-<a name="id648745"></a>
+<a name="id642191"></a>
           <a class="link" href="advance.html#fusion.iterator.metafunctions.advance.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">result_of::advance<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">M</span><span class="special">&gt;::</span><span class="identifier">type</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="advance.html" title="advance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">M</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: A model of the same iterator
-          concept as <tt class="computeroutput"><span class="identifier">I</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+          concept as <code class="computeroutput"><span class="identifier">I</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns an iterator a distance
-          <tt class="computeroutput"><span class="identifier">M</span></tt> from <tt class="computeroutput"><span class="identifier">I</span></tt>.
-          If <tt class="computeroutput"><span class="identifier">I</span></tt> is a <a href="../concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
-          Iterator</a> then <tt class="computeroutput"><span class="identifier">M</span></tt>
+          <span class="bold"><strong>Semantics</strong></span>: Returns an iterator a distance
+          <code class="computeroutput"><span class="identifier">M</span></code> from <code class="computeroutput"><span class="identifier">I</span></code>.
+          If <code class="computeroutput"><span class="identifier">I</span></code> is a <a class="link" href="../concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+          Iterator</a> then <code class="computeroutput"><span class="identifier">M</span></code>
           may be negative.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.advance.header"></a><h5>
-<a name="id440244"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.advance.header"></a><h6>
-<a name="id648860"></a>
+<a name="id642306"></a>
           <a class="link" href="advance.html#fusion.iterator.metafunctions.advance.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.advance.example"></a><h5>
-<a name="id440398"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::begin<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.metafunctions.advance.example"></a><h6>
-<a name="id648968"></a>
+<a name="id642414"></a>
           <a class="link" href="advance.html#fusion.iterator.metafunctions.advance.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span>result_of::equal_to<span class="special">&lt;</span>result_of::advance<span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="identifier">third</span><span class="special">&gt;));
</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><a class="link" href="equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special">&lt;</span><a class="link" href="advance.html" title="advance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="identifier">third</
span><span class="special">&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance_c.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance_c.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/advance_c.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>advance_c</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="advance.html" title="advance">
+<link rel="prev" href="advance.html" title="advance">
 <link rel="next" href="key_of.html" title="key_of">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,42 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="advance.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="key_of.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.metafunctions.advance_c"></a>advance_c
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.metafunctions.advance_c.description"></a><h5>
-<a name="id440857"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="advance_c">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.metafunctions.advance_c"></a><a class="link" href="advance_c.html" title="advance_c">advance_c</a>
 </h4></div></div></div>
 <a name="fusion.iterator.metafunctions.advance_c.description"></a><h6>
-<a name="id649281"></a>
+<a name="id642728"></a>
           <a class="link" href="advance_c.html#fusion.iterator.metafunctions.advance_c.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Moves an iterator by a specified distance.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.advance_c.synopsis"></a><h5>
-<a name="id440886"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.advance_c.synopsis"></a><h6>
-<a name="id649299"></a>
+<a name="id642746"></a>
           <a class="link" href="advance_c.html#fusion.iterator.metafunctions.advance_c.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
     <span class="keyword">int</span> <span class="identifier">N</span>
@@ -76,137 +47,104 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id441003"></a><p class="title"><b>Table 1.18. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id692763"></a><p class="title"><b>Table 1.18. Parameters</b></p>
-=======
-<a name="id648432"></a><p class="title"><b>Table 1.19. Parameters</b></p>
-=======
-<a name="id641332"></a><p class="title"><b>Table 1.19. Parameters</b></p>
-=======
-<a name="id664819"></a><p class="title"><b>Table&#160;1.19.&#160;Parameters</b></p>
-=======
-<a name="id652661"></a><p class="title"><b>Table&#160;1.19.&#160;Parameters</b></p>
-=======
-<a name="id649384"></a><p class="title"><b>Table&#160;1.19.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id642831"></a><p class="title"><b>Table&#160;1.19.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">I</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">I</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Iterator to move relative to
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">N</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">N</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Integer constant
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Number of positions to move
-              </p></td>
+              </p>
+              </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.advance_c.expression_semantics"></a><h5>
-<a name="id441140"></a>
-          <a href="advance_c.html#fusion.iterator.metafunctions.advance_c.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.metafunctions.advance_c.expression_semantics"></a><h6>
-<a name="id649501"></a>
+<a name="id642947"></a>
           <a class="link" href="advance_c.html#fusion.iterator.metafunctions.advance_c.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">result_of::advance_c<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: A model of the same iterator
-          concept as <tt class="computeroutput"><span class="identifier">I</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+          concept as <code class="computeroutput"><span class="identifier">I</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns an iterator a distance
-          <tt class="computeroutput"><span class="identifier">N</span></tt> from <tt class="computeroutput"><span class="identifier">I</span></tt>.
-          If <tt class="computeroutput"><span class="identifier">I</span></tt> is a <a href="../concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
-          Iterator</a> then <tt class="computeroutput"><span class="identifier">N</span></tt>
-          may be negative. Equivalent to <tt class="computeroutput">result_of::advance<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns an iterator a distance
+          <code class="computeroutput"><span class="identifier">N</span></code> from <code class="computeroutput"><span class="identifier">I</span></code>.
+          If <code class="computeroutput"><span class="identifier">I</span></code> is a <a class="link" href="../concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
+          Iterator</a> then <code class="computeroutput"><span class="identifier">N</span></code>
+          may be negative. Equivalent to <code class="computeroutput"><a class="link" href="advance.html" title="advance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.advance_c.header"></a><h5>
-<a name="id441418"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.advance_c.header"></a><h6>
-<a name="id649686"></a>
+<a name="id643132"></a>
           <a class="link" href="advance_c.html#fusion.iterator.metafunctions.advance_c.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">advance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.advance_c.example"></a><h5>
-<a name="id441574"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::begin<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.metafunctions.advance_c.example"></a><h6>
-<a name="id649794"></a>
+<a name="id643240"></a>
           <a class="link" href="advance_c.html#fusion.iterator.metafunctions.advance_c.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span>result_of::equal_to<span class="special">&lt;</span>result_of::advance_c<span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span> <span class="number">2</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="identifier">third</span><span class="special">&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><a class="link" href="equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special">&lt;</span><a class="link" href="advance_c.html" title="advance_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">advance_c</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span> <span class="number">2</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="identifier">third</span><span class="special">&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/deref.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>deref</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="value_of.html" title="value_of">
+<link rel="prev" href="value_of.html" title="value_of">
 <link rel="next" href="next.html" title="next">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,42 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="value_of.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="next.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.metafunctions.deref"></a>deref
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.metafunctions.deref.description"></a><h5>
-<a name="id434940"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="deref">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.metafunctions.deref"></a><a class="link" href="deref.html" title="deref">deref</a>
 </h4></div></div></div>
 <a name="fusion.iterator.metafunctions.deref.description"></a><h6>
-<a name="id642953"></a>
+<a name="id636400"></a>
           <a class="link" href="deref.html#fusion.iterator.metafunctions.deref.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Returns the type that will be returned by dereferencing an iterator.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.deref.synposis"></a><h5>
-<a name="id434969"></a>
-          Synposis
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.deref.synposis"></a><h6>
-<a name="id642970"></a>
+<a name="id636416"></a>
           <a class="link" href="deref.html#fusion.iterator.metafunctions.deref.synposis">Synposis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span>
     <span class="special">&gt;</span>
@@ -75,120 +46,85 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id435068"></a><p class="title"><b>Table 1.12. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id686966"></a><p class="title"><b>Table 1.12. Parameters</b></p>
-=======
-<a name="id643591"></a><p class="title"><b>Table 1.13. Parameters</b></p>
-=======
-<a name="id635945"></a><p class="title"><b>Table 1.13. Parameters</b></p>
-=======
-<a name="id658476"></a><p class="title"><b>Table&#160;1.13.&#160;Parameters</b></p>
-=======
-<a name="id646319"></a><p class="title"><b>Table&#160;1.13.&#160;Parameters</b></p>
-=======
-<a name="id643042"></a><p class="title"><b>Table&#160;1.13.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id636488"></a><p class="title"><b>Table&#160;1.13.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">I</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">I</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's argument
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.deref.expression_semantics"></a><h5>
-<a name="id435168"></a>
-          <a href="deref.html#fusion.iterator.metafunctions.deref.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.metafunctions.deref.expression_semantics"></a><h6>
-<a name="id643126"></a>
+<a name="id636572"></a>
           <a class="link" href="deref.html#fusion.iterator.metafunctions.deref.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">result_of::deref<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: Any type
+          <span class="bold"><strong>Return type</strong></span>: Any type
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns the result of dereferencing
-          an iterator of type <tt class="computeroutput"><span class="identifier">I</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns the result of dereferencing
+          an iterator of type <code class="computeroutput"><span class="identifier">I</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.deref.header"></a><h5>
-<a name="id435280"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.deref.header"></a><h6>
-<a name="id643200"></a>
+<a name="id636647"></a>
           <a class="link" href="deref.html#fusion.iterator.metafunctions.deref.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.deref.example"></a><h5>
-<a name="id435436"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&amp;&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.metafunctions.deref.example"></a><h6>
-<a name="id643308"></a>
+<a name="id636755"></a>
           <a class="link" href="deref.html#fusion.iterator.metafunctions.deref.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&amp;&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 <span class="keyword">typedef</span> <span class="keyword">const</span> <span class="identifier">vec</span> <span class="identifier">const_vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::begin<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
 
-<span class="keyword">typedef</span> result_of::begin<span class="special">&lt;</span><span class="identifier">const_vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">const_first</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">const_first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">const_second</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">const_vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">const_first</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">const_first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">const_second</span><span class="special">;</span>
 
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::deref<span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&amp;&gt;));</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::deref<span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&amp;&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&amp;&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&amp;&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/distance.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/distance.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/distance.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>distance</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="equal_to.html" title="equal_to">
+<link rel="prev" href="equal_to.html" title="equal_to">
 <link rel="next" href="advance.html" title="advance">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,42 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="equal_to.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="advance.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.metafunctions.distance"></a>distance
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.metafunctions.distance.description"></a><h5>
-<a name="id438791"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="distance">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.metafunctions.distance"></a><a class="link" href="distance.html" title="distance">distance</a>
 </h4></div></div></div>
 <a name="fusion.iterator.metafunctions.distance.description"></a><h6>
-<a name="id647826"></a>
+<a name="id641272"></a>
           <a class="link" href="distance.html#fusion.iterator.metafunctions.distance.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Returns the distance between two iterators.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.distance.synopsis"></a><h5>
-<a name="id438821"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.distance.synopsis"></a><h6>
-<a name="id647844"></a>
+<a name="id641290"></a>
           <a class="link" href="distance.html#fusion.iterator.metafunctions.distance.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">J</span>
@@ -76,113 +47,75 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id438937"></a><p class="title"><b>Table 1.16. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id689668"></a><p class="title"><b>Table 1.16. Parameters</b></p>
-=======
-<a name="id646976"></a><p class="title"><b>Table 1.17. Parameters</b></p>
-=======
-<a name="id639876"></a><p class="title"><b>Table 1.17. Parameters</b></p>
-=======
-<a name="id663363"></a><p class="title"><b>Table&#160;1.17.&#160;Parameters</b></p>
-=======
-<a name="id651206"></a><p class="title"><b>Table&#160;1.17.&#160;Parameters</b></p>
-=======
-<a name="id647929"></a><p class="title"><b>Table&#160;1.17.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id641375"></a><p class="title"><b>Table&#160;1.17.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">I</span></tt>, <tt class="computeroutput"><span class="identifier">J</span></tt>
-              </p></td>
-<td><p>
-                Models of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">I</span></code>, <code class="computeroutput"><span class="identifier">J</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Models of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a> into the same sequence
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 The start and end points of the distance to be measured
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.distance.expression_semantics"></a><h5>
-<a name="id439049"></a>
-          <a href="distance.html#fusion.iterator.metafunctions.distance.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.metafunctions.distance.expression_semantics"></a><h6>
-<a name="id648020"></a>
+<a name="id641466"></a>
           <a class="link" href="distance.html#fusion.iterator.metafunctions.distance.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">result_of::distance<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="distance.html" title="distance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">distance</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: A model of <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
+          <span class="bold"><strong>Return type</strong></span>: A model of <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
           Integral Constant</a>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns the distance between
-          iterators of types <tt class="computeroutput"><span class="identifier">I</span></tt> and
-          <tt class="computeroutput"><span class="identifier">J</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns the distance between
+          iterators of types <code class="computeroutput"><span class="identifier">I</span></code> and
+          <code class="computeroutput"><span class="identifier">J</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.distance.header"></a><h5>
-<a name="id439192"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.distance.header"></a><h6>
-<a name="id648116"></a>
+<a name="id641562"></a>
           <a class="link" href="distance.html#fusion.iterator.metafunctions.distance.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">distance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">distance</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.distance.example"></a><h5>
-<a name="id439348"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::begin<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::distance<span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span><span class="identifier">third</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">dist</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.metafunctions.distance.example"></a><h6>
-<a name="id648224"></a>
+<a name="id641670"></a>
           <a class="link" href="distance.html#fusion.iterator.metafunctions.distance.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
@@ -190,7 +123,6 @@
 <span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="distance.html" title="distance"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">distance</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span><span class="identifier">third</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">dist</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
 <span class="identifier">BOOST_MPL_ASSERT_RELATION</span><span class="special">(</span><span class="identifier">dist</span><span class="special">::</span><span class="identifier">value</span><span class="special">,</span> <span class="special">==,</span> <span class="number">2</span><span class="special">);</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/equal_to.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/equal_to.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/equal_to.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>equal_to</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="prior.html" title="prior">
+<link rel="prev" href="prior.html" title="prior">
 <link rel="next" href="distance.html" title="distance">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,44 +22,23 @@
 <div class="spirit-nav">
 <a accesskey="p" href="prior.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="distance.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.metafunctions.equal_to"></a>equal_to
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.metafunctions.equal_to.description"></a><h5>
-<a name="id437790"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="equal_to">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.metafunctions.equal_to"></a><a class="link" href="equal_to.html" title="equal_to">equal_to</a>
 </h4></div></div></div>
 <a name="fusion.iterator.metafunctions.equal_to.description"></a><h6>
-<a name="id645491"></a>
+<a name="id638937"></a>
           <a class="link" href="equal_to.html#fusion.iterator.metafunctions.equal_to.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Returns a true-valued <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
-          Integral Constant</a> if <tt class="computeroutput"><span class="identifier">I</span></tt>
-          and <tt class="computeroutput"><span class="identifier">J</span></tt> are equal.
+          Integral Constant</a> if <code class="computeroutput"><span class="identifier">I</span></code>
+          and <code class="computeroutput"><span class="identifier">J</span></code> are equal.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.equal_to.synopsis"></a><h5>
-<a name="id437850"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.equal_to.synopsis"></a><h6>
-<a name="id645527"></a>
+<a name="id638973"></a>
           <a class="link" href="equal_to.html#fusion.iterator.metafunctions.equal_to.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">J</span>
@@ -78,111 +49,74 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id437965"></a><p class="title"><b>Table 1.15. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id688990"></a><p class="title"><b>Table 1.15. Parameters</b></p>
-=======
-<a name="id645683"></a><p class="title"><b>Table 1.16. Parameters</b></p>
-=======
-<a name="id638037"></a><p class="title"><b>Table 1.16. Parameters</b></p>
-=======
-<a name="id661592"></a><p class="title"><b>Table&#160;1.16.&#160;Parameters</b></p>
-=======
-<a name="id648889"></a><p class="title"><b>Table&#160;1.16.&#160;Parameters</b></p>
-=======
-<a name="id645612"></a><p class="title"><b>Table&#160;1.16.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id639058"></a><p class="title"><b>Table&#160;1.16.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">I</span></tt>, <tt class="computeroutput"><span class="identifier">J</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">I</span></code>, <code class="computeroutput"><span class="identifier">J</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Any fusion iterators
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's arguments
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.equal_to.expression_semantics"></a><h5>
-<a name="id438069"></a>
-          <a href="equal_to.html#fusion.iterator.metafunctions.equal_to.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.metafunctions.equal_to.expression_semantics"></a><h6>
-<a name="id645698"></a>
+<a name="id639145"></a>
           <a class="link" href="equal_to.html#fusion.iterator.metafunctions.equal_to.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">result_of::equal_to<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: A model of <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
+          <span class="bold"><strong>Return type</strong></span>: A model of <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
           Integral Constant</a>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>
-          if <tt class="computeroutput"><span class="identifier">I</span></tt> and <tt class="computeroutput"><span class="identifier">J</span></tt> are iterators to the same position.
-          Returns <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt> otherwise.
+          <span class="bold"><strong>Semantics</strong></span>: Returns <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>
+          if <code class="computeroutput"><span class="identifier">I</span></code> and <code class="computeroutput"><span class="identifier">J</span></code> are iterators to the same position.
+          Returns <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></code> otherwise.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.equal_to.header"></a><h5>
-<a name="id438274"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.equal_to.header"></a><h6>
-<a name="id645836"></a>
+<a name="id639283"></a>
           <a class="link" href="equal_to.html#fusion.iterator.metafunctions.equal_to.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.equal_to.example"></a><h5>
-<a name="id438431"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::begin<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::end<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">last</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span>result_of::equal_to<span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">first</span><span class="special">&gt;));</span>
-<span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span>result_of::equal_to<span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span><span class="identifier">last</span><span class="special">&gt;));</span>
-=======
 <a name="fusion.iterator.metafunctions.equal_to.example"></a><h6>
-<a name="id645944"></a>
+<a name="id639391"></a>
           <a class="link" href="equal_to.html#fusion.iterator.metafunctions.equal_to.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
@@ -190,7 +124,6 @@
 <span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">last</span><span class="special">;</span>
 <span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><a class="link" href="equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span> <span class="identifier">first</span><span class="special">&gt;));</span>
 <span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span><a class="link" href="equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span><span class="identifier">last</span><span class="special">&gt;));</span>
->>>>>>> .merge-right.r57125
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/next.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/next.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/next.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>next</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="deref.html" title="deref">
+<link rel="prev" href="deref.html" title="deref">
 <link rel="next" href="prior.html" title="prior">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,42 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="deref.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="prior.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.metafunctions.next"></a>next
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.metafunctions.next.description"></a><h5>
-<a name="id436013"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="next">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.metafunctions.next"></a><a class="link" href="next.html" title="next">next</a>
 </h4></div></div></div>
 <a name="fusion.iterator.metafunctions.next.description"></a><h6>
-<a name="id644254"></a>
+<a name="id637700"></a>
           <a class="link" href="next.html#fusion.iterator.metafunctions.next.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Returns the type of the next iterator in a sequence.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.next.synposis"></a><h5>
-<a name="id436042"></a>
-          Synposis
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.next.synposis"></a><h6>
-<a name="id644270"></a>
+<a name="id637717"></a>
           <a class="link" href="next.html#fusion.iterator.metafunctions.next.synposis">Synposis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span>
     <span class="special">&gt;</span>
@@ -75,116 +46,80 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id436140"></a><p class="title"><b>Table 1.13. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id687720"></a><p class="title"><b>Table 1.13. Parameters</b></p>
-=======
-<a name="id644414"></a><p class="title"><b>Table 1.14. Parameters</b></p>
-=======
-<a name="id636768"></a><p class="title"><b>Table 1.14. Parameters</b></p>
-=======
-<a name="id660323"></a><p class="title"><b>Table&#160;1.14.&#160;Parameters</b></p>
-=======
-<a name="id647619"></a><p class="title"><b>Table&#160;1.14.&#160;Parameters</b></p>
-=======
-<a name="id644342"></a><p class="title"><b>Table&#160;1.14.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id637789"></a><p class="title"><b>Table&#160;1.14.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">I</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">I</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's argument
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.next.expression_semantics"></a><h5>
-<a name="id436242"></a>
-          <a href="next.html#fusion.iterator.metafunctions.next.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.metafunctions.next.expression_semantics"></a><h6>
-<a name="id644424"></a>
+<a name="id637870"></a>
           <a class="link" href="next.html#fusion.iterator.metafunctions.next.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">result_of::next<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: A model of the same iterator
-          concept as <tt class="computeroutput"><span class="identifier">I</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+          concept as <code class="computeroutput"><span class="identifier">I</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns an iterator to the
-          next element in the sequence after <tt class="computeroutput"><span class="identifier">I</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns an iterator to the
+          next element in the sequence after <code class="computeroutput"><span class="identifier">I</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.next.header"></a><h5>
-<a name="id436364"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.next.header"></a><h6>
-<a name="id644503"></a>
+<a name="id637950"></a>
           <a class="link" href="next.html#fusion.iterator.metafunctions.next.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">next</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">next</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.next.example"></a><h5>
-<a name="id436520"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span>result_of::begin<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.metafunctions.next.example"></a><h6>
-<a name="id644611"></a>
+<a name="id638058"></a>
           <a class="link" href="next.html#fusion.iterator.metafunctions.next.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::value_of<span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a><span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/prior.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/prior.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/prior.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>prior</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="next.html" title="next">
+<link rel="prev" href="next.html" title="next">
 <link rel="next" href="equal_to.html" title="equal_to">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,42 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="next.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="equal_to.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.metafunctions.prior"></a>prior
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.metafunctions.prior.description"></a><h5>
-<a name="id436823"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="prior">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.metafunctions.prior"></a><a class="link" href="prior.html" title="prior">prior</a>
 </h4></div></div></div>
 <a name="fusion.iterator.metafunctions.prior.description"></a><h6>
-<a name="id644815"></a>
+<a name="id638262"></a>
           <a class="link" href="prior.html#fusion.iterator.metafunctions.prior.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Returns the type of the previous iterator in a sequence.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.prior.synopsis"></a><h5>
-<a name="id436852"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.prior.synopsis"></a><h6>
-<a name="id644832"></a>
+<a name="id638278"></a>
           <a class="link" href="prior.html#fusion.iterator.metafunctions.prior.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span>
     <span class="special">&gt;</span>
@@ -75,119 +46,83 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id436950"></a><p class="title"><b>Table 1.14. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id688282"></a><p class="title"><b>Table 1.14. Parameters</b></p>
-=======
-<a name="id644975"></a><p class="title"><b>Table 1.15. Parameters</b></p>
-=======
-<a name="id637329"></a><p class="title"><b>Table 1.15. Parameters</b></p>
-=======
-<a name="id660884"></a><p class="title"><b>Table&#160;1.15.&#160;Parameters</b></p>
-=======
-<a name="id648181"></a><p class="title"><b>Table&#160;1.15.&#160;Parameters</b></p>
-=======
-<a name="id644904"></a><p class="title"><b>Table&#160;1.15.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id638350"></a><p class="title"><b>Table&#160;1.15.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">I</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">I</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's argument
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.prior.expression_semantics"></a><h5>
-<a name="id437051"></a>
-          <a href="prior.html#fusion.iterator.metafunctions.prior.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.metafunctions.prior.expression_semantics"></a><h6>
-<a name="id644988"></a>
+<a name="id638434"></a>
           <a class="link" href="prior.html#fusion.iterator.metafunctions.prior.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">result_of::prior<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="prior.html" title="prior"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">prior</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: A model of the same iterator
-          concept as <tt class="computeroutput"><span class="identifier">I</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: A model of the same iterator
+          concept as <code class="computeroutput"><span class="identifier">I</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns an iterator to the
-          previous element in the sequence before <tt class="computeroutput"><span class="identifier">I</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns an iterator to the
+          previous element in the sequence before <code class="computeroutput"><span class="identifier">I</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.prior.header"></a><h5>
-<a name="id437175"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.prior.header"></a><h6>
-<a name="id645070"></a>
+<a name="id638516"></a>
           <a class="link" href="prior.html#fusion.iterator.metafunctions.prior.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">prior</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">prior</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.prior.example"></a><h5>
-<a name="id437330"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span>result_of::begin<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.metafunctions.prior.example"></a><h6>
-<a name="id645178"></a>
+<a name="id638624"></a>
           <a class="link" href="prior.html#fusion.iterator.metafunctions.prior.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::value_of<span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a><span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;));</span>
 
-<span class="keyword">typedef</span> result_of::prior<span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::value_of<span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;));</span>
+<span class="keyword">typedef</span> <a class="link" href="prior.html" title="prior"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">prior</span></code></a><span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/metafunctions/value_of.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>value_of</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="../metafunctions.html" title="Metafunctions">
+<link rel="prev" href="../metafunctions.html" title="Metafunctions">
 <link rel="next" href="deref.html" title="deref">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,42 +22,21 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="deref.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.metafunctions.value_of"></a>value_of
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.metafunctions.value_of.description"></a><h5>
-<a name="id433848"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="value_of">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.iterator.metafunctions.value_of"></a><a class="link" href="value_of.html" title="value_of">value_of</a>
 </h4></div></div></div>
 <a name="fusion.iterator.metafunctions.value_of.description"></a><h6>
-<a name="id642185"></a>
+<a name="id635632"></a>
           <a class="link" href="value_of.html#fusion.iterator.metafunctions.value_of.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Returns the type stored at the position of an iterator.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.value_of.synopsis"></a><h5>
-<a name="id433878"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.value_of.synopsis"></a><h6>
-<a name="id642202"></a>
+<a name="id635648"></a>
           <a class="link" href="value_of.html#fusion.iterator.metafunctions.value_of.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span>
     <span class="special">&gt;</span>
@@ -75,121 +46,83 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id433975"></a><p class="title"><b>Table 1.11. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id686198"></a><p class="title"><b>Table 1.11. Parameters</b></p>
-=======
-<a name="id642823"></a><p class="title"><b>Table 1.12. Parameters</b></p>
-=======
-<a name="id635177"></a><p class="title"><b>Table 1.12. Parameters</b></p>
-=======
-<a name="id657708"></a><p class="title"><b>Table&#160;1.12.&#160;Parameters</b></p>
-=======
-<a name="id645551"></a><p class="title"><b>Table&#160;1.12.&#160;Parameters</b></p>
-=======
-<a name="id642274"></a><p class="title"><b>Table&#160;1.12.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id635720"></a><p class="title"><b>Table&#160;1.12.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">I</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">I</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's argument
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.value_of.expression_semantics"></a><h5>
-<a name="id434074"></a>
-          <a href="value_of.html#fusion.iterator.metafunctions.value_of.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.metafunctions.value_of.expression_semantics"></a><h6>
-<a name="id642358"></a>
+<a name="id635804"></a>
           <a class="link" href="value_of.html#fusion.iterator.metafunctions.value_of.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
-<pre class="programlisting">result_of::value_of<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span>
+        </h6>
+<pre class="programlisting"><a class="link" href="value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: Any type
+          <span class="bold"><strong>Return type</strong></span>: Any type
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns the type stored in
-          a sequence at iterator position <tt class="computeroutput"><span class="identifier">I</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns the type stored in
+          a sequence at iterator position <code class="computeroutput"><span class="identifier">I</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.value_of.header"></a><h5>
-<a name="id434185"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.metafunctions.value_of.header"></a><h6>
-<a name="id642432"></a>
+<a name="id635879"></a>
           <a class="link" href="value_of.html#fusion.iterator.metafunctions.value_of.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">value_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">value_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.metafunctions.value_of.example"></a><h5>
-<a name="id434341"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&amp;,</span><span class="keyword">const</span> <span class="keyword">int</span><span class="special">&amp;&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::begin<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.metafunctions.value_of.example"></a><h6>
-<a name="id642540"></a>
+<a name="id635987"></a>
           <a class="link" href="value_of.html#fusion.iterator.metafunctions.value_of.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&amp;,</span><span class="keyword">const</span> <span class="keyword">int</span><span class="special">&amp;&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="../../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">second</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">third</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::value_of<span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;));</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::value_of<span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&amp;&gt;));</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::value_of<span class="special">&lt;</span><span class="identifier">third</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">int</span><span class="special">&amp;&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a><span class="special">&lt;</span><span class="identifier">second</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&amp;&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="value_of.html" title="value_of"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_of</span></code></a><span class="special">&lt;</span><span class="identifier">third</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">const</span> <span class="keyword">int</span><span class="special">&amp;&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/operator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/operator.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/operator.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,23 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Operator</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../iterator.html" title="Iterator">
-<<<<<<< .working
-<link rel="previous" href="functions/advance_c.html" title="advance_c">
-<link rel="next" href="operator/operator_unary_star.html" title=" Operator
-        *">
-=======
 <link rel="prev" href="functions/deref_data.html" title="deref_data">
 <link rel="next" href="operator/operator_unary_star.html" title="Operator *">
->>>>>>> .merge-right.r57242
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -32,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="functions/deref_data.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../iterator.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="operator/operator_unary_star.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.iterator.operator"></a>Operator
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Operator">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.iterator.operator"></a><a class="link" href="operator.html" title="Operator">Operator</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="operator/operator_unary_star.html"> Operator
         *</a></span></dt>
@@ -54,7 +41,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_equality.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_equality.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_equality.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,24 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title> Operator
-        ==</title>
+<title>Operator ==</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../operator.html" title="Operator">
-<link rel="previous" href="operator_unary_star.html" title=" Operator
-        *">
-<link rel="next" href="operator_inequality.html" title=" Operator
-        !=">
+<link rel="prev" href="operator_unary_star.html" title="Operator *">
+<link rel="next" href="operator_inequality.html" title="Operator !=">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -33,41 +22,22 @@
 <div class="spirit-nav">
 <a accesskey="p" href="operator_unary_star.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../operator.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="operator_inequality.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.operator.operator_equality"></a><a href="operator_equality.html" title=" Operator
-        =="> Operator
+<div class="section" title="Operator ==">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.operator.operator_equality"></a><a class="link" href="operator_equality.html" title="Operator =="> Operator
         ==</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.operator.operator_equality.description"></a><h5>
-<a name="id432570"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.iterator.operator.operator_equality.description"></a><h6>
-<a name="id641283"></a>
+<a name="id634729"></a>
           <a class="link" href="operator_equality.html#fusion.iterator.operator.operator_equality.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Compares 2 iterators for equality.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.operator.operator_equality.synopsis"></a><h5>
-<a name="id432599"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.operator.operator_equality.synopsis"></a><h6>
-<a name="id641300"></a>
+<a name="id634746"></a>
           <a class="link" href="operator_equality.html#fusion.iterator.operator.operator_equality.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">J</span>
@@ -75,94 +45,68 @@
 <span class="emphasis"><em>unspecified</em></span> <span class="keyword">operator</span><span class="special">==(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">J</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id432739"></a><p class="title"><b>Table 1.9. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id685327"></a><p class="title"><b>Table 1.9. Parameters</b></p>
-=======
-<a name="id641952"></a><p class="title"><b>Table 1.10. Parameters</b></p>
-=======
-<a name="id634306"></a><p class="title"><b>Table 1.10. Parameters</b></p>
-=======
-<a name="id656837"></a><p class="title"><b>Table&#160;1.10.&#160;Parameters</b></p>
-=======
-<a name="id644680"></a><p class="title"><b>Table&#160;1.10.&#160;Parameters</b></p>
-=======
-<a name="id641403"></a><p class="title"><b>Table&#160;1.10.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id634849"></a><p class="title"><b>Table&#160;1.10.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">i</span></tt>, <tt class="computeroutput"><span class="identifier">j</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">i</span></code>, <code class="computeroutput"><span class="identifier">j</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Any fusion iterators
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's arguments
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.operator.operator_equality.expression_semantics"></a><h5>
-<a name="id432842"></a>
-          <a href="operator_equality.html#fusion.iterator.operator.operator_equality.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.operator.operator_equality.expression_semantics"></a><h6>
-<a name="id641489"></a>
+<a name="id634936"></a>
           <a class="link" href="operator_equality.html#fusion.iterator.operator.operator_equality.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <pre class="programlisting"><span class="identifier">i</span> <span class="special">==</span> <span class="identifier">j</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: Convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: Convertible to <code class="computeroutput"><span class="keyword">bool</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Equivalent to <tt class="computeroutput">result_of::equal_to<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">value</span></tt>
-          where <tt class="computeroutput"><span class="identifier">I</span></tt> and <tt class="computeroutput"><span class="identifier">J</span></tt> are the types of <tt class="computeroutput"><span class="identifier">i</span></tt>
-          and <tt class="computeroutput"><span class="identifier">j</span></tt> respectively.
+          <span class="bold"><strong>Semantics</strong></span>: Equivalent to <code class="computeroutput"><a class="link" href="../metafunctions/equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">value</span></code>
+          where <code class="computeroutput"><span class="identifier">I</span></code> and <code class="computeroutput"><span class="identifier">J</span></code> are the types of <code class="computeroutput"><span class="identifier">i</span></code>
+          and <code class="computeroutput"><span class="identifier">j</span></code> respectively.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.operator.operator_equality.header"></a><h5>
-<a name="id433034"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.operator.operator_equality.header"></a><h6>
-<a name="id641616"></a>
+<a name="id635063"></a>
           <a class="link" href="operator_equality.html#fusion.iterator.operator.operator_equality.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_inequality.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_inequality.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_inequality.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,22 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title> Operator
-        !=</title>
+<title>Operator !=</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../operator.html" title="Operator">
-<link rel="previous" href="operator_equality.html" title=" Operator
-        ==">
+<link rel="prev" href="operator_equality.html" title="Operator ==">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,41 +22,22 @@
 <div class="spirit-nav">
 <a accesskey="p" href="operator_equality.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../operator.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.operator.operator_inequality"></a><a href="operator_inequality.html" title=" Operator
-        !="> Operator
+<div class="section" title="Operator !=">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.operator.operator_inequality"></a><a class="link" href="operator_inequality.html" title="Operator !="> Operator
         !=</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.operator.operator_inequality.description"></a><h5>
-<a name="id433209"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.iterator.operator.operator_inequality.description"></a><h6>
-<a name="id641738"></a>
+<a name="id635184"></a>
           <a class="link" href="operator_inequality.html#fusion.iterator.operator.operator_inequality.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Compares 2 iterators for inequality.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.operator.operator_inequality.synopsis"></a><h5>
-<a name="id433239"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.operator.operator_inequality.synopsis"></a><h6>
-<a name="id641758"></a>
+<a name="id635204"></a>
           <a class="link" href="operator_inequality.html#fusion.iterator.operator.operator_inequality.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">J</span>
@@ -74,92 +45,66 @@
 <span class="emphasis"><em>unspecified</em></span> <span class="keyword">operator</span><span class="special">==(</span><span class="identifier">I</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">,</span> <span class="identifier">J</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id433380"></a><p class="title"><b>Table 1.10. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id685785"></a><p class="title"><b>Table 1.10. Parameters</b></p>
-=======
-<a name="id642410"></a><p class="title"><b>Table 1.11. Parameters</b></p>
-=======
-<a name="id634764"></a><p class="title"><b>Table 1.11. Parameters</b></p>
-=======
-<a name="id657296"></a><p class="title"><b>Table&#160;1.11.&#160;Parameters</b></p>
-=======
-<a name="id645138"></a><p class="title"><b>Table&#160;1.11.&#160;Parameters</b></p>
-=======
-<a name="id641861"></a><p class="title"><b>Table&#160;1.11.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id635308"></a><p class="title"><b>Table&#160;1.11.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">i</span></tt>, <tt class="computeroutput"><span class="identifier">j</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">i</span></code>, <code class="computeroutput"><span class="identifier">j</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Any fusion iterators
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's arguments
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.operator.operator_inequality.expression_semantics"></a><h5>
-<a name="id433483"></a>
-          <a href="operator_inequality.html#fusion.iterator.operator.operator_inequality.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.operator.operator_inequality.expression_semantics"></a><h6>
-<a name="id641945"></a>
+<a name="id635392"></a>
           <a class="link" href="operator_inequality.html#fusion.iterator.operator.operator_inequality.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <p>
-          <span class="bold"><b>Return type</b></span>: Convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: Convertible to <code class="computeroutput"><span class="keyword">bool</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Equivalent to <tt class="computeroutput"><span class="special">!</span>result_of::equal_to<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">value</span></tt>
-          where <tt class="computeroutput"><span class="identifier">I</span></tt> and <tt class="computeroutput"><span class="identifier">J</span></tt> are the types of <tt class="computeroutput"><span class="identifier">i</span></tt>
-          and <tt class="computeroutput"><span class="identifier">j</span></tt> respectively.
+          <span class="bold"><strong>Semantics</strong></span>: Equivalent to <code class="computeroutput"><span class="special">!</span><a class="link" href="../metafunctions/equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">J</span><span class="special">&gt;::</span><span class="identifier">value</span></code>
+          where <code class="computeroutput"><span class="identifier">I</span></code> and <code class="computeroutput"><span class="identifier">J</span></code> are the types of <code class="computeroutput"><span class="identifier">i</span></code>
+          and <code class="computeroutput"><span class="identifier">j</span></code> respectively.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.operator.operator_inequality.header"></a><h5>
-<a name="id433654"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.operator.operator_inequality.header"></a><h6>
-<a name="id642056"></a>
+<a name="id635502"></a>
           <a class="link" href="operator_inequality.html#fusion.iterator.operator.operator_inequality.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_unary_star.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_unary_star.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/iterator/operator/operator_unary_star.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,23 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title> Operator
-        *</title>
+<title>Operator *</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../operator.html" title="Operator">
-<link rel="previous" href="../operator.html" title="Operator">
-<link rel="next" href="operator_equality.html" title=" Operator
-        ==">
+<link rel="prev" href="../operator.html" title="Operator">
+<link rel="next" href="operator_equality.html" title="Operator ==">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -32,158 +22,104 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../operator.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../operator.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="operator_equality.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.iterator.operator.operator_unary_star"></a><a href="operator_unary_star.html" title=" Operator
-        *"> Operator
+<div class="section" title="Operator *">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.iterator.operator.operator_unary_star"></a><a class="link" href="operator_unary_star.html" title="Operator *"> Operator
         *</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.iterator.operator.operator_unary_star.description"></a><h5>
-<a name="id431600"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.iterator.operator.operator_unary_star.description"></a><h6>
-<a name="id640541"></a>
+<a name="id633987"></a>
           <a class="link" href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           Dereferences an iterator.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.operator.operator_unary_star.synopsis"></a><h5>
-<a name="id431631"></a>
-          Synopsis
-        </h5>
-=======
 <a name="fusion.iterator.operator.operator_unary_star.synopsis"></a><h6>
-<a name="id640560"></a>
+<a name="id634006"></a>
           <a class="link" href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.synopsis">Synopsis</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">I</span>
     <span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::deref<span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="keyword">operator</span><span class="special">*(</span><span class="emphasis"><em>unspecified</em></span><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="keyword">operator</span><span class="special">*(</span><span class="emphasis"><em>unspecified</em></span><span class="special">&lt;</span><span class="identifier">I</span><span class="special">&gt;</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">i</span><span class="special">);</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id431788"></a><p class="title"><b>Table 1.8. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id684663"></a><p class="title"><b>Table 1.8. Parameters</b></p>
-=======
-<a name="id640127"></a><p class="title"><b>Table 1.9. Parameters</b></p>
-=======
-<a name="id632481"></a><p class="title"><b>Table 1.9. Parameters</b></p>
-=======
-<a name="id656173"></a><p class="title"><b>Table&#160;1.9.&#160;Parameters</b></p>
-=======
-<a name="id643947"></a><p class="title"><b>Table&#160;1.9.&#160;Parameters</b></p>
-=======
-<a name="id640670"></a><p class="title"><b>Table&#160;1.9.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id634117"></a><p class="title"><b>Table&#160;1.9.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">i</span></tt>
-              </p></td>
-<td><p>
-                Model of <a href="../concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">i</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Model of <a class="link" href="../concepts/forward_iterator.html" title="Forward Iterator">Forward
                 Iterator</a>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 Operation's argument
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.iterator.operator.operator_unary_star.expression_semantics"></a><h5>
-<a name="id431889"></a>
-          <a href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.iterator.operator.operator_unary_star.expression_semantics"></a><h6>
-<a name="id640752"></a>
+<a name="id634198"></a>
           <a class="link" href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <pre class="programlisting"><span class="special">*</span><span class="identifier">i</span>
 </pre>
 <p>
-          <span class="bold"><b>Return type</b></span>: Equivalent to the return
-          type of <tt class="computeroutput">deref<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: Equivalent to the return
+          type of <code class="computeroutput"><a class="link" href="../functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Equivalent to <tt class="computeroutput">deref<span class="special">(</span><span class="identifier">i</span><span class="special">)</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Equivalent to <code class="computeroutput"><a class="link" href="../functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><span class="identifier">i</span><span class="special">)</span></code>.
         </p>
-<<<<<<< .working
-<a name="fusion.iterator.operator.operator_unary_star.header"></a><h5>
-<a name="id432026"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.iterator.operator.operator_unary_star.header"></a><h6>
-<a name="id640840"></a>
+<a name="id634286"></a>
           <a class="link" href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">iterator</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">deref</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.iterator.operator.operator_unary_star.example"></a><h5>
-<a name="id432182"></a>
-          Example
-        </h5>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&amp;&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-=======
 <a name="fusion.iterator.operator.operator_unary_star.example"></a><h6>
-<a name="id640948"></a>
+<a name="id634394"></a>
           <a class="link" href="operator_unary_star.html#fusion.iterator.operator.operator_unary_star.example">Example</a>
         </h6>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&amp;&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
 <span class="keyword">int</span> <span class="identifier">i</span><span class="special">(</span><span class="number">0</span><span class="special">);</span>
 <span class="identifier">vec</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="identifier">i</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(*</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(*</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">))</span> <span class="special">==</span> <span class="number">0</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(&amp;(*</span>next<span class="special">(</span>begin<span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="special">&amp;</span><span class="identifier">i</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(*</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(*</span><a class="link" href="../functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">))</span> <span class="special">==</span> <span class="number">0</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(&amp;(*</span><a class="link" href="../functions/next.html" title="next"><code class="computeroutput"><span class="identifier">next</span></code></a><span class="special">(</span><a class="link" href="../../sequence/intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="special">&amp;</span><span class="identifier">i</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/notes.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/notes.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/notes.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,20 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Notes</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
-<link rel="previous" href="functional/generation/metafunctions/mk_unfused.html" title="
-          make_unfused">
+<link rel="prev" href="functional/generation/metafunctions/mk_unfused.html" title="make_unfused">
 <link rel="next" href="change_log.html" title="Change log">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,82 +22,54 @@
 <div class="spirit-nav">
 <a accesskey="p" href="functional/generation/metafunctions/mk_unfused.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="change_log.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.notes"></a>Notes
-</h2></div></div>
-<div></div>
-</div>
-<a name="fusion.notes.recursive_inlined_functions"></a><h3>
-<a name="id633847"></a>
-      <a href="notes.html#fusion.notes.recursive_inlined_functions">Recursive Inlined
-=======
 <div class="section" title="Notes">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="fusion.notes"></a><a class="link" href="notes.html" title="Notes">Notes</a>
 </h2></div></div></div>
 <a name="fusion.notes.recursive_inlined_functions"></a><h4>
-<a name="id850093"></a>
+<a name="id843539"></a>
       <a class="link" href="notes.html#fusion.notes.recursive_inlined_functions">Recursive Inlined
->>>>>>> .merge-right.r57125
       Functions</a>
-    </h3>
+    </h4>
 <p>
-      An interesting peculiarity of functions like at when applied to a <a href="sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-      Sequence</a> like list
+      An interesting peculiarity of functions like <a class="link" href="sequence/intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a> when applied to a <a class="link" href="sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+      Sequence</a> like <a class="link" href="container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>
       is that what could have been linear runtime complexity effectively becomes
       constant O(1) due to compiler optimization of C++ inlined functions, however
       deeply recursive (up to a certain compiler limit of course). Compile time complexity
       remains linear.
     </p>
-<<<<<<< .working
-<a name="fusion.notes.overloaded_functions"></a><h3>
-<a name="id633922"></a>
-      Overloaded Functions
-    </h3>
-=======
 <a name="fusion.notes.overloaded_functions"></a><h4>
-<a name="id850133"></a>
+<a name="id843580"></a>
       <a class="link" href="notes.html#fusion.notes.overloaded_functions">Overloaded Functions</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       Associative sequences use function overloading to implement membership testing
       and type associated key lookup. This amounts to constant runtime and amortized
-      constant compile time complexities. There is an overloaded function, <tt class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">k</span><span class="special">)</span></tt>, for each key <span class="emphasis"><em>type</em></span> <tt class="computeroutput"><span class="identifier">k</span></tt>. The compiler chooses the appropriate function
-      given a key, <tt class="computeroutput"><span class="identifier">k</span></tt>.
+      constant compile time complexities. There is an overloaded function, <code class="computeroutput"><span class="identifier">f</span><span class="special">(</span><span class="identifier">k</span><span class="special">)</span></code>, for each key <span class="emphasis"><em>type</em></span> <code class="computeroutput"><span class="identifier">k</span></code>. The compiler chooses the appropriate function
+      given a key, <code class="computeroutput"><span class="identifier">k</span></code>.
     </p>
-<<<<<<< .working
-<a name="fusion.notes.tag_dispatching"></a><h3>
-<a name="id634005"></a>
-      Tag Dispatching
-    </h3>
-=======
 <a name="fusion.notes.tag_dispatching"></a><h4>
-<a name="id850186"></a>
+<a name="id843633"></a>
       <a class="link" href="notes.html#fusion.notes.tag_dispatching">Tag Dispatching</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       Tag dispatching is a generic programming technique for selecting template specializations.
       There are typically 3 components involved in the tag dispatching mechanism:
     </p>
-<div class="orderedlist"><ol type="1">
-<li>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
         A type for which an appropriate template specialization is required
       </li>
-<li>
+<li class="listitem">
         A metafunction that associates the type with a tag type
       </li>
-<li>
+<li class="listitem">
         A template that is specialized for the tag type
       </li>
 </ol></div>
 <p>
-      For example, the fusion <tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></tt> metafunction
+      For example, the fusion <code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code> metafunction
       is implemented as follows:
     </p>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
@@ -122,33 +84,26 @@
 <p>
       In the case:
     </p>
-<div class="orderedlist"><ol type="1">
-<li>
-<tt class="computeroutput"><span class="identifier">Sequence</span></tt> is the type for
-        which a suitable implementation of <tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin_impl</span></tt>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+<code class="computeroutput"><span class="identifier">Sequence</span></code> is the type for
+        which a suitable implementation of <code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin_impl</span></code>
         is required
       </li>
-<li>
-<tt class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span></tt> is the metafunction that associates
-        <tt class="computeroutput"><span class="identifier">Sequence</span></tt> with an appropriate
+<li class="listitem">
+<code class="computeroutput"><span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span></code> is the metafunction that associates
+        <code class="computeroutput"><span class="identifier">Sequence</span></code> with an appropriate
         tag
       </li>
-<li>
-<tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin_impl</span></tt> is the template which is specialized
+<li class="listitem">
+<code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin_impl</span></code> is the template which is specialized
         to provide an implementation for each tag type
       </li>
 </ol></div>
-<<<<<<< .working
-<a name="fusion.notes.extensibility"></a><h3>
-<a name="id634386"></a>
-      Extensibility
-    </h3>
-=======
 <a name="fusion.notes.extensibility"></a><h4>
-<a name="id850454"></a>
+<a name="id843900"></a>
       <a class="link" href="notes.html#fusion.notes.extensibility">Extensibility</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       Unlike MPL, there
       is no extensibe sequence concept in fusion. This does not mean that Fusion
@@ -156,97 +111,66 @@
       extensible. It is just that the manner of sequence extension in Fusion is diferent
       from both STL
       and MPL on account
-      of the lazy nature of fusion Algorithms.
+      of the lazy nature of fusion <a class="link" href="algorithm.html" title="Algorithm">Algorithms</a>.
       <a href="http://en.wikipedia.org/wiki/Standard_Template_Library" target="_top">STL</a>
-      containers extend themselves in place though member functions such as push_back and insert. MPL
+      containers extend themselves in place though member functions such as <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a> and <a class="link" href="algorithm/transformation/functions/insert.html" title="insert"><code class="computeroutput"><span class="identifier">insert</span></code></a>. MPL
       sequences, on the other hand, are extended through "intrinsic" functions
       that actually return whole sequences. MPL
       is purely functional and can not have side effects. For example, MPL's
-      <tt class="computeroutput"><span class="identifier">push_back</span></tt> does not actually
-      mutate an <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector</span></tt>. It can't do that. Instead, it returns
-      an extended <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector</span></tt>.
+      <code class="computeroutput"><span class="identifier">push_back</span></code> does not actually
+      mutate an <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector</span></code>. It can't do that. Instead, it returns
+      an extended <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector</span></code>.
     </p>
 <p>
       Like MPL, Fusion
       too is purely functional and can not have side effects. With runtime efficiency
       in mind, Fusion sequences are extended through generic functions that return
-      Views. Views
+      <a class="link" href="view.html" title="View">Views</a>. <a class="link" href="view.html" title="View">Views</a>
       are sequences that do not actually contain data, but instead impart an alternative
-      presentation over the data from one or more underlying sequences. Views
+      presentation over the data from one or more underlying sequences. <a class="link" href="view.html" title="View">Views</a>
       are proxies. They provide an efficient yet purely functional way to work on
-      potentially expensive sequence operations. For example, given a vector, Fusion's push_back returns a joint_view, instead of an actual extended
-      vector.
-      A joint_view
+      potentially expensive sequence operations. For example, given a <a class="link" href="container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>, Fusion's <a class="link" href="algorithm/transformation/functions/push_back.html" title="push_back"><code class="computeroutput"><span class="identifier">push_back</span></code></a> returns a <a class="link" href="view/joint_view.html" title="joint_view"><code class="computeroutput"><span class="identifier">joint_view</span></code></a>, instead of an actual extended
+      <a class="link" href="container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>.
+      A <a class="link" href="view/joint_view.html" title="joint_view"><code class="computeroutput"><span class="identifier">joint_view</span></code></a>
       holds a reference to the original sequence plus the appended data --making
       it very cheap to pass around.
     </p>
-<<<<<<< .working
-<a name="fusion.notes.element_conversion"></a><h3>
-<a name="id634704"></a>
-      Element Conversion
-    </h3>
-=======
 <a name="fusion.notes.element_conversion"></a><h4>
-<a name="id850636"></a>
+<a name="id844083"></a>
       <a class="link" href="notes.html#fusion.notes.element_conversion">Element Conversion</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
-      Functions that take in elemental values to form sequences (e.g. make_list) convert their arguments
+      Functions that take in elemental values to form sequences (e.g. <a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a>) convert their arguments
       to something suitable to be stored as a sequence element. In general, the element
       types are stored as plain values. Example:
     </p>
-<pre class="programlisting">make_list<span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">)</span>
+<pre class="programlisting"><a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">)</span>
 </pre>
 <p>
-      returns a list<tt class="computeroutput"><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span>
-      <span class="keyword">char</span><span class="special">&gt;</span></tt>.
+      returns a <a class="link" href="container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><code class="computeroutput"><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span>
+      <span class="keyword">char</span><span class="special">&gt;</span></code>.
     </p>
 <p>
       There are a few exceptions, however.
     </p>
 <p>
-      <span class="bold"><b>Arrays:</b></span>
+      <span class="bold"><strong>Arrays:</strong></span>
     </p>
 <p>
       Array arguments are deduced to reference to const types. For example
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-      <sup>[<a name="id634862" href="#ftn.id634862">10</a>]</sup>
-=======
-      <sup>[<a name="id886385" href="#ftn.id886385" class="footnote">10</a>]</sup>
-=======
-      <sup>[<a name="id851663" href="#ftn.id851663" class="footnote">10</a>]</sup>
-=======
-      <sup>[<a name="id844039" href="#ftn.id844039" class="footnote">10</a>]</sup>
-=======
-      <sup>[<a name="id866857" href="#ftn.id866857" class="footnote">10</a>]</sup>
-=======
-      <sup>[<a name="id854017" href="#ftn.id854017" class="footnote">10</a>]</sup>
-=======
-      <sup>[<a name="id850741" href="#ftn.id850741" class="footnote">10</a>]</sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
->>>>>>> .merge-right.r57125
+      <sup>[<a name="id844187" href="#ftn.id844187" class="footnote">10</a>]</sup>
       :
     </p>
-<pre class="programlisting">make_list<span class="special">(</span><span class="string">"Donald"</span><span class="special">,</span> <span class="string">"Daisy"</span><span class="special">)</span>
+<pre class="programlisting"><a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a><span class="special">(</span><span class="string">"Donald"</span><span class="special">,</span> <span class="string">"Daisy"</span><span class="special">)</span>
 </pre>
 <p>
-      creates a list
+      creates a <a class="link" href="container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>
       of type
     </p>
-<pre class="programlisting">list<span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span> <span class="special">(&amp;)[</span><span class="number">7</span><span class="special">],</span> <span class="keyword">const</span> <span class="keyword">char</span> <span class="special">(&amp;)[</span><span class="number">6</span><span class="special">]&gt;</span>
+<pre class="programlisting"><a class="link" href="container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special">&lt;</span><span class="keyword">const</span> <span class="keyword">char</span> <span class="special">(&amp;)[</span><span class="number">7</span><span class="special">],</span> <span class="keyword">const</span> <span class="keyword">char</span> <span class="special">(&amp;)[</span><span class="number">6</span><span class="special">]&gt;</span>
 </pre>
 <p>
-      <span class="bold"><b>Function pointers:</b></span>
+      <span class="bold"><strong>Function pointers:</strong></span>
     </p>
 <p>
       Function pointers are deduced to the plain non-reference type (i.e. to plain
@@ -254,42 +178,35 @@
     </p>
 <pre class="programlisting"><span class="keyword">void</span> <span class="identifier">f</span><span class="special">(</span><span class="keyword">int</span> <span class="identifier">i</span><span class="special">);</span>
   <span class="special">...</span>
-make_list<span class="special">(&amp;</span><span class="identifier">f</span><span class="special">);</span>
+<a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a><span class="special">(&amp;</span><span class="identifier">f</span><span class="special">);</span>
 </pre>
 <p>
-      creates a list
+      creates a <a class="link" href="container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>
       of type
     </p>
-<pre class="programlisting">list<span class="special">&lt;</span><span class="keyword">void</span> <span class="special">(*)(</span><span class="keyword">int</span><span class="special">)&gt;</span>
+<pre class="programlisting"><a class="link" href="container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special">&lt;</span><span class="keyword">void</span> <span class="special">(*)(</span><span class="keyword">int</span><span class="special">)&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.notes.boost__ref"></a><h3>
-<a name="id635292"></a>
-      boost::ref
-    </h3>
-=======
 <a name="fusion.notes.boost__ref"></a><h4>
-<a name="id851027"></a>
+<a name="id844474"></a>
       <a class="link" href="notes.html#fusion.notes.boost__ref">boost::ref</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
-      Fusion's generation functions (e.g. make_list) by default stores the element
+      Fusion's generation functions (e.g. <a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a>) by default stores the element
       types as plain non-reference types. Example:
     </p>
 <pre class="programlisting"><span class="keyword">void</span> <span class="identifier">foo</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">A</span><span class="special">&amp;</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">B</span><span class="special">&amp;</span> <span class="identifier">b</span><span class="special">)</span> <span class="special">{</span>
     <span class="special">...</span>
-    make_list<span class="special">(</span><span class="identifier">a</span><span class="special">,</span> <span class="identifier">b</span><span class="special">)</span>
+    <a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a><span class="special">(</span><span class="identifier">a</span><span class="special">,</span> <span class="identifier">b</span><span class="special">)</span>
 </pre>
 <p>
-      creates a list
+      creates a <a class="link" href="container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a>
       of type
     </p>
-<pre class="programlisting">list<span class="special">&lt;</span><span class="identifier">A</span><span class="special">,</span> <span class="identifier">B</span><span class="special">&gt;</span>
+<pre class="programlisting"><a class="link" href="container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special">&lt;</span><span class="identifier">A</span><span class="special">,</span> <span class="identifier">B</span><span class="special">&gt;</span>
 </pre>
 <p>
-      Sometimes the plain non-reference type is not desired. You can use <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">ref</span></tt>
-      and <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">cref</span></tt> to store references or const references
+      Sometimes the plain non-reference type is not desired. You can use <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">ref</span></code>
+      and <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">cref</span></code> to store references or const references
       (respectively) instead. The mechanism does not compromise const correctness
       since a const object wrapped with ref results in a tuple element with const
       reference type (see the fifth code line below). Examples:
@@ -298,11 +215,11 @@
       For example:
     </p>
 <pre class="programlisting"><span class="identifier">A</span> <span class="identifier">a</span><span class="special">;</span> <span class="identifier">B</span> <span class="identifier">b</span><span class="special">;</span> <span class="keyword">const</span> <span class="identifier">A</span> <span class="identifier">ca</span> <span class="special">=</span> <span class="identifier">a</span><span class="special">;</span>
-make_list<span class="special">(</span><span class="identifier">cref</span><span class="special">(</span><span class="identifier">a</span><span class="special">),</span> <span class="identifier">b</span><span class="special">);</span>          <span class="comment">// creates list&lt;const A&amp;, B&gt;
-</span>make_list<span class="special">(</span><span class="identifier">ref</span><span class="special">(</span><span class="identifier">a</span><span class="special">),</span> <span class="identifier">b</span><span class="special">);</span>           <span class="comment">// creates list&lt;A&amp;, B&gt;
-</span>make_list<span class="special">(</span><span class="identifier">ref</span><span class="special">(</span><span class="identifier">a</span><span class="special">),</span> <span class="identifier">cref</span><span class="special">(</span><span class="identifier">b</span><span class="special">));</span>     <span class="comment">// creates list&lt;A&amp;, const B&amp;&gt;
-</span>make_list<span class="special">(</span><span class="identifier">cref</span><span class="special">(</span><span class="identifier">ca</span><span class="special">));</span>            <span class="comment">// creates list&lt;const A&amp;&gt;
-</span>make_list<span class="special">(</span><span class="identifier">ref</span><span class="special">(</span><span class="identifier">ca</span><span class="special">));</span>             <span class="comment">// creates list&lt;const A&amp;&gt;
+<a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a><span class="special">(</span><span class="identifier">cref</span><span class="special">(</span><span class="identifier">a</span><span class="special">),</span> <span class="identifier">b</span><span class="special">);</span>          <span class="comment">// creates list&lt;const A&amp;, B&gt;
+</span><a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a><span class="special">(</span><span class="identifier">ref</span><span class="special">(</span><span class="identifier">a</span><span class="special">),</span> <span class="identifier">b</span><span class="special">);</span>           <span class="comment">// creates list&lt;A&amp;, B&gt;
+</span><a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a><span class="special">(</span><span class="identifier">ref</span><span class="special">(</span><span class="identifier">a</span><span class="special">),</span> <span class="identifier">cref</span><span class="special">(</span><span class="identifier">b</span><span class="special">));</span>     <span class="comment">// creates list&lt;A&amp;, const B&amp;&gt;
+</span><a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a><span class="special">(</span><span class="identifier">cref</span><span class="special">(</span><span class="identifier">ca</span><span class="special">));</span>            <span class="comment">// creates list&lt;const A&amp;&gt;
+</span><a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a><span class="special">(</span><span class="identifier">ref</span><span class="special">(</span><span class="identifier">ca</span><span class="special">));</span>             <span class="comment">// creates list&lt;const A&amp;&gt;
 </span></pre>
 <p>
       See Boost.Ref for
@@ -310,35 +227,11 @@
     </p>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<div class="footnote"><p><sup>[<a name="ftn.id634862" href="#id634862">10</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id886385" href="#id886385" class="para">10</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id851663" href="#id851663" class="para">10</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id844039" href="#id844039" class="para">10</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id866857" href="#id866857" class="para">10</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id854017" href="#id854017" class="para">10</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id850741" href="#id850741" class="para">10</a>] </sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
->>>>>>> .merge-right.r57125
+<div class="footnote"><p><sup>[<a name="ftn.id844187" href="#id844187" class="para">10</a>] </sup>
           Note that the type of a string literal is an array of const characters,
-          not <tt class="computeroutput"><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span></tt>. To get make_list to create a list with an element of a non-const
-          array type one must use the <tt class="computeroutput"><span class="identifier">ref</span></tt>
-          wrapper (see boost::ref).
+          not <code class="computeroutput"><span class="keyword">const</span> <span class="keyword">char</span><span class="special">*</span></code>. To get <a class="link" href="container/generation/functions/make_list.html" title="make_list"><code class="computeroutput"><span class="identifier">make_list</span></code></a> to create a <a class="link" href="container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a> with an element of a non-const
+          array type one must use the <code class="computeroutput"><span class="identifier">ref</span></code>
+          wrapper (see <a class="link" href="notes.html#fusion.notes.boost__ref"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">ref</span></code></a>).
         </p></div>
 </div>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/organization.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/organization.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/organization.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,19 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Organization</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
-<link rel="previous" href="quick_start.html" title="Quick Start">
+<link rel="prev" href="quick_start.html" title="Quick Start">
 <link rel="next" href="support.html" title="Support">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -31,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="quick_start.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="support.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.organization"></a>Organization
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Organization">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.organization"></a><a class="link" href="organization.html" title="Organization">Organization</a>
+</h2></div></div></div>
 <p>
       The library is organized into layers of modules, with each module addressing
       a particular area of responsibility. A module may not depend on modules in
@@ -46,36 +34,29 @@
 <p>
       The library is organized in three layers:
     </p>
-<<<<<<< .working
-<a name="fusion.organization.layers"></a><h3>
-<a name="id411703"></a>
-      Layers
-    </h3>
-=======
 <a name="fusion.organization.layers"></a><h4>
-<a name="id618936"></a>
+<a name="id612382"></a>
       <a class="link" href="organization.html#fusion.organization.layers">Layers</a>
     </h4>
->>>>>>> .merge-right.r57125
 <div class="blockquote"><blockquote class="blockquote">
 <p>
         </p>
 <p>
-          <span class="inlinemediaobject"><img src="images/fusion_org.png" alt="fusion_org"></span>
+          <span class="inlinemediaobject"><img src="../images/fusion_org.png" alt="fusion_org"></span>
         </p>
 <p>
       </p>
 </blockquote></div>
 <p>
-      The entire library is found in the <tt class="computeroutput"><span class="string">"boost/fusion"</span></tt>
+      The entire library is found in the <code class="computeroutput"><span class="string">"boost/fusion"</span></code>
       directory. Modules are organized in directories. Each module has its own header
       file placed in the same directory with the actual module-directory. For example,
-      there exists <tt class="computeroutput"><span class="string">"boost/fusion/support.hpp"</span></tt>
+      there exists <code class="computeroutput"><span class="string">"boost/fusion/support.hpp"</span></code>
       in the same directory as "boost/fusion/support". Everything, except
       those found inside "detail" directories, is public.
     </p>
 <p>
-      There is also a <tt class="computeroutput"><span class="string">"boost/fusion/include/"</span></tt>
+      There is also a <code class="computeroutput"><span class="string">"boost/fusion/include/"</span></code>
       directory that contains all the headers to all the components and modules.
       If you are unsure where to find a specific component or module, or don't want
       to fuss with hierarchy and nesting, use this.
@@ -84,149 +65,133 @@
       The library is header-only. There is no need to build object files to link
       against.
     </p>
-<<<<<<< .working
-<a name="fusion.organization.directory"></a><h3>
-<a name="id411798"></a>
-      Directory
-    </h3>
-<div class="itemizedlist"><ul type="disc">
-<li>
-=======
 <a name="fusion.organization.directory"></a><h4>
-<a name="id619006"></a>
+<a name="id612453"></a>
       <a class="link" href="organization.html#fusion.organization.directory">Directory</a>
     </h4>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
->>>>>>> .merge-right.r57125
         tuple
       </li>
-<li>
+<li class="listitem">
         algorithm
-        <div class="itemizedlist"><ul type="circle">
-<li>
+        <div class="itemizedlist"><ul class="itemizedlist" type="circle">
+<li class="listitem">
             iteration
           </li>
-<li>
+<li class="listitem">
             query
           </li>
-<li>
+<li class="listitem">
             transformation
           </li>
 </ul></div>
 </li>
-<li>
+<li class="listitem">
         adapted
-        <div class="itemizedlist"><ul type="circle">
-<li>
+        <div class="itemizedlist"><ul class="itemizedlist" type="circle">
+<li class="listitem">
             array
           </li>
-<li>
+<li class="listitem">
             mpl
           </li>
-<li>
+<li class="listitem">
             boost::tuple
           </li>
-<li>
+<li class="listitem">
             std_pair
           </li>
-<li>
+<li class="listitem">
             struct
           </li>
-<li>
+<li class="listitem">
             variant
           </li>
 </ul></div>
 </li>
-<li>
+<li class="listitem">
         view
-        <div class="itemizedlist"><ul type="circle">
-<li>
+        <div class="itemizedlist"><ul class="itemizedlist" type="circle">
+<li class="listitem">
             filter_view
           </li>
-<li>
+<li class="listitem">
             iterator_range
           </li>
-<li>
+<li class="listitem">
             joint_view
           </li>
-<li>
+<li class="listitem">
             reverse_view
           </li>
-<li>
+<li class="listitem">
             single_view
           </li>
-<li>
+<li class="listitem">
             transform_view
           </li>
-<li>
+<li class="listitem">
             zip_view
           </li>
 </ul></div>
 </li>
-<li>
+<li class="listitem">
         container
-        <div class="itemizedlist"><ul type="circle">
-<li>
+        <div class="itemizedlist"><ul class="itemizedlist" type="circle">
+<li class="listitem">
             deque
           </li>
-<li>
+<li class="listitem">
             list
           </li>
-<li>
+<li class="listitem">
             map
           </li>
-<li>
+<li class="listitem">
             set
           </li>
-<li>
+<li class="listitem">
             vector
           </li>
-<li>
+<li class="listitem">
             generation
           </li>
 </ul></div>
 </li>
-<li>
+<li class="listitem">
         mpl
       </li>
-<li>
+<li class="listitem">
         functional
       </li>
-<li>
+<li class="listitem">
         sequence
-        <div class="itemizedlist"><ul type="circle">
-<li>
+        <div class="itemizedlist"><ul class="itemizedlist" type="circle">
+<li class="listitem">
             comparison
           </li>
-<li>
+<li class="listitem">
             intrinsic
           </li>
-<li>
+<li class="listitem">
             io
           </li>
 </ul></div>
 </li>
-<li>
+<li class="listitem">
         iterator
       </li>
-<li>
+<li class="listitem">
         support
       </li>
 </ul></div>
-<<<<<<< .working
-<a name="fusion.organization.example"></a><h3>
-<a name="id411987"></a>
-      Example
-    </h3>
-=======
 <a name="fusion.organization.example"></a><h4>
-<a name="id619167"></a>
+<a name="id612614"></a>
       <a class="link" href="organization.html#fusion.organization.example">Example</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
-      If, for example, you want to use <tt class="computeroutput"><span class="identifier">list</span></tt>,
+      If, for example, you want to use <code class="computeroutput"><span class="identifier">list</span></code>,
       depending on the granularity that you desire, you may do so by including one
       of
     </p>
@@ -236,42 +201,13 @@
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">list</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
-<<<<<<< .working
-      The first includes all containers The second includes only <tt class="computeroutput"><span class="identifier">list</span></tt>
-      <sup>[<a name="id412252" href="#ftn.id412252">4</a>]</sup>
-=======
       The first includes all containers The second includes only <code class="computeroutput"><span class="identifier">list</span></code>
-      <sup>[<a name="id619376" href="#ftn.id619376" class="footnote">4</a>]</sup>
->>>>>>> .merge-right.r57125
+      <sup>[<a name="id612822" href="#ftn.id612822" class="footnote">4</a>]</sup>
       .
     </p>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<div class="footnote"><p><sup>[<a name="ftn.id412252" href="#id412252">4</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id665290" href="#id665290" class="para">4</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id619857" href="#id619857" class="para">4</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id612211" href="#id612211" class="para">4</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id635152" href="#id635152" class="para">4</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id622653" href="#id622653" class="para">4</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id619376" href="#id619376" class="para">4</a>] </sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
->>>>>>> .merge-right.r57125
+<div class="footnote"><p><sup>[<a name="ftn.id612822" href="#id612822" class="para">4</a>] </sup>
           Modules may contain smaller components. Header file information for each
           component will be provided as part of the component's documentation.
         </p></div>

Modified: branches/release/libs/fusion/doc/html/fusion/preface.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/preface.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/preface.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,20 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Preface</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="prev" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="next" href="introduction.html" title="Introduction">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,18 +22,15 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../index.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="introduction.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.preface"></a>Preface
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Preface">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.preface"></a><a class="link" href="preface.html" title="Preface">Preface</a>
+</h2></div></div></div>
 <div class="blockquote"><blockquote class="blockquote">
 <p>
         </p>
 <p>
-          <span class="emphasis"><em>&#8220;<span class="quote">Algorithms + Data Structures = Programs.</span>&#8221;</em></span>
+          <span class="emphasis"><em><span class="quote">&#8220;<span class="quote">Algorithms + Data Structures = Programs.</span>&#8221;</span></em></span>
         </p>
 <p>
       </p>
@@ -52,22 +39,15 @@
 <p>
         </p>
 <p>
-          <span class="bold"><b>--Niklaus Wirth</b></span>
+          <span class="bold"><strong>--Niklaus Wirth</strong></span>
         </p>
 <p>
       </p>
 </blockquote></div>
-<<<<<<< .working
-<a name="fusion.preface.description"></a><h3>
-<a name="id355262"></a>
-      Description
-    </h3>
-=======
 <a name="fusion.preface.description"></a><h4>
-<a name="id614034"></a>
+<a name="id607480"></a>
       <a class="link" href="preface.html#fusion.preface.description">Description</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       Fusion is a library for working with heterogenous collections of data, commonly
       referred to as tuples. A set of containers (vector, list, set and map) is provided,
@@ -82,17 +62,10 @@
       It is named "fusion" because the library is a "fusion"
       of compile time metaprogramming with runtime programming.
     </p>
-<<<<<<< .working
-<a name="fusion.preface.motivation"></a><h3>
-<a name="id398013"></a>
-      Motivation
-    </h3>
-=======
 <a name="fusion.preface.motivation"></a><h4>
-<a name="id614064"></a>
+<a name="id607510"></a>
       <a class="link" href="preface.html#fusion.preface.motivation">Motivation</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       Tuples are powerful beasts. After having developed two significant projects
       (Spirit and Phoenix)
@@ -115,130 +88,121 @@
       had an adhoc collection of tuple manipulation and traversal routines. It was
       an instant <span class="emphasis"><em>AHA!</em></span> moment.
     </p>
-<<<<<<< .working
-<a name="fusion.preface.how_to_use_this_manual"></a><h3>
-<a name="id353771"></a>
-      How to use this manual
-    </h3>
-=======
 <a name="fusion.preface.how_to_use_this_manual"></a><h4>
-<a name="id614131"></a>
+<a name="id607577"></a>
       <a class="link" href="preface.html#fusion.preface.how_to_use_this_manual">How to use this manual</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       Some icons are used to mark certain topics indicative of their relevance. These
       icons precede some text to indicate:
     </p>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id353790"></a><p class="title"><b>Table 1.1. Icons</b></p>
-<table class="table" summary="Icons">
-=======
-<a name="id657754"></a><p class="title"><b>Table 1.1. Icons</b></p>
-=======
-<a name="id613514"></a><p class="title"><b>Table 1.1. Icons</b></p>
-=======
-<a name="id605868"></a><p class="title"><b>Table 1.1. Icons</b></p>
-=======
-<a name="id628823"></a><p class="title"><b>Table&#160;1.1.&#160;Icons</b></p>
-=======
-<a name="id617421"></a><p class="title"><b>Table&#160;1.1.&#160;Icons</b></p>
-=======
-<a name="id614144"></a><p class="title"><b>Table&#160;1.1.&#160;Icons</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id607591"></a><p class="title"><b>Table&#160;1.1.&#160;Icons</b></p>
 <div class="table-contents"><table class="table" summary="Icons">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+          <p>
             Icon
-          </p></th>
-<th><p>
+          </p>
+          </th>
+<th>
+          <p>
             Name
-          </p></th>
-<th><p>
+          </p>
+          </th>
+<th>
+          <p>
             Meaning
-          </p></th>
+          </p>
+          </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-            <span class="inlinemediaobject"><img src="images/note.png" alt="note"></span>
-          </p></td>
-<td><p>
+<td>
+          <p>
+            <span class="inlinemediaobject"><img src="../images/note.png" alt="note"></span>
+          </p>
+          </td>
+<td>
+          <p>
             Note
-          </p></td>
-<td><p>
+          </p>
+          </td>
+<td>
+          <p>
             Information provided is auxiliary but will give the reader a deeper insight
             into a specific topic. May be skipped.
-          </p></td>
+          </p>
+          </td>
 </tr>
 <tr>
-<td><p>
-            <span class="inlinemediaobject"><img src="images/alert.png" alt="alert"></span>
-          </p></td>
-<td><p>
+<td>
+          <p>
+            <span class="inlinemediaobject"><img src="../images/alert.png" alt="alert"></span>
+          </p>
+          </td>
+<td>
+          <p>
             Alert
-          </p></td>
-<td><p>
+          </p>
+          </td>
+<td>
+          <p>
             Information provided is of utmost importance.
-          </p></td>
+          </p>
+          </td>
 </tr>
 <tr>
-<td><p>
-            <span class="inlinemediaobject"><img src="images/caution.png" alt="caution"></span>
-          </p></td>
-<td><p>
+<td>
+          <p>
+            <span class="inlinemediaobject"><img src="../images/caution.png" alt="caution"></span>
+          </p>
+          </td>
+<td>
+          <p>
             Caution
-          </p></td>
-<td><p>
+          </p>
+          </td>
+<td>
+          <p>
             A mild warning.
-          </p></td>
+          </p>
+          </td>
 </tr>
 <tr>
-<td><p>
-            <span class="inlinemediaobject"><img src="images/tip.png" alt="tip"></span>
-          </p></td>
-<td><p>
+<td>
+          <p>
+            <span class="inlinemediaobject"><img src="../images/tip.png" alt="tip"></span>
+          </p>
+          </td>
+<td>
+          <p>
             Tip
-          </p></td>
-<td><p>
+          </p>
+          </td>
+<td>
+          <p>
             A potentially useful and helpful piece of information.
-          </p></td>
+          </p>
+          </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<p>
+<br class="table-break"><p>
       This documentation is automatically generated by Boost QuickBook documentation
       tool. QuickBook can be found in the <a href="http://www.boost.org/tools/index.html" target="_top">Boost
       Tools</a>.
     </p>
-<<<<<<< .working
-<a name="fusion.preface.support"></a><h3>
-<a name="id355560"></a>
-      Support
-    </h3>
-=======
 <a name="fusion.preface.support"></a><h4>
-<a name="id614348"></a>
+<a name="id607795"></a>
       <a class="link" href="preface.html#fusion.preface.support">Support</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       Please direct all questions to Spirit's mailing list. You can subscribe to
       the <a href="https://lists.sourceforge.net/lists/listinfo/spirit-general" target="_top">Spirit

Modified: branches/release/libs/fusion/doc/html/fusion/quick_start.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/quick_start.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/quick_start.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,19 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Quick Start</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
-<link rel="previous" href="introduction.html" title="Introduction">
+<link rel="prev" href="introduction.html" title="Introduction">
 <link rel="next" href="organization.html" title="Organization">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -31,66 +22,47 @@
 <div class="spirit-nav">
 <a accesskey="p" href="introduction.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="organization.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.quick_start"></a>Quick Start
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Quick Start">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.quick_start"></a><a class="link" href="quick_start.html" title="Quick Start">Quick Start</a>
+</h2></div></div></div>
 <p>
       I assume the reader is already familiar with tuples (Boost.Tuple)
-      and its ancestor <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>. The tuple is a generalization of <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>
+      and its ancestor <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code>. The tuple is a generalization of <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code>
       for multiple heterogeneous elements (triples, quadruples, etc.). The tuple
-      is more or less a synonym for fusion's <tt class="computeroutput">vector</tt>.
+      is more or less a synonym for fusion's <code class="computeroutput"><a class="link" href="container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a></code>.
     </p>
 <p>
-<<<<<<< .working
-      For starters, we shall include all of Fusion's Sequence(s)
-      <sup>[<a name="id409214" href="#ftn.id409214">2</a>]</sup>
-=======
       For starters, we shall include all of Fusion's <a class="link" href="sequence.html" title="Sequence">Sequence</a>(s)
-      <sup>[<a name="id614839" href="#ftn.id614839" class="footnote">2</a>]</sup>
->>>>>>> .merge-right.r57125
+      <sup>[<a name="id608285" href="#ftn.id608285" class="footnote">2</a>]</sup>
       :
     </p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <p>
-<<<<<<< .working
-      Let's begin with a <tt class="computeroutput">vector</tt>
-      <sup>[<a name="id409361" href="#ftn.id409361">3</a>]</sup>
-=======
       Let's begin with a <code class="computeroutput"><a class="link" href="container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a></code>
-      <sup>[<a name="id614954" href="#ftn.id614954" class="footnote">3</a>]</sup>
->>>>>>> .merge-right.r57125
+      <sup>[<a name="id608401" href="#ftn.id608401" class="footnote">3</a>]</sup>
       :
     </p>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">stuff</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="string">"howdy"</span><span class="special">);</span>
-<span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> at_c<span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">stuff</span><span class="special">);</span>
-<span class="keyword">char</span> <span class="identifier">ch</span> <span class="special">=</span> at_c<span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">stuff</span><span class="special">);</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">s</span> <span class="special">=</span> at_c<span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;(</span><span class="identifier">stuff</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">stuff</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="string">"howdy"</span><span class="special">);</span>
+<span class="keyword">int</span> <span class="identifier">i</span> <span class="special">=</span> <a class="link" href="sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">0</span><span class="special">&gt;(</span><span class="identifier">stuff</span><span class="special">);</span>
+<span class="keyword">char</span> <span class="identifier">ch</span> <span class="special">=</span> <a class="link" href="sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">stuff</span><span class="special">);</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">s</span> <span class="special">=</span> <a class="link" href="sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="number">2</span><span class="special">&gt;(</span><span class="identifier">stuff</span><span class="special">);</span>
 </pre>
 <p>
-      Just replace <tt class="computeroutput"><span class="identifier">tuple</span></tt> for <tt class="computeroutput">vector</tt>
-      and <tt class="computeroutput"><span class="identifier">get</span></tt> for <tt class="computeroutput">at_c</tt> and this is exactly like
+      Just replace <code class="computeroutput"><span class="identifier">tuple</span></code> for <code class="computeroutput"><a class="link" href="container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a></code>
+      and <code class="computeroutput"><span class="identifier">get</span></code> for <code class="computeroutput"><a class="link" href="sequence/intrinsic/functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a></code> and this is exactly like
       <a href="http://www.boost.org/libs/tuple/doc/tuple_users_guide.html" target="_top">Boost.Tuple</a>.
       Actually, either names can be used interchangeably. Yet, the similarity ends
-      there. You can do a lot more with Fusion <tt class="computeroutput">vector</tt> or <tt class="computeroutput"><span class="identifier">tuple</span></tt>.
+      there. You can do a lot more with Fusion <code class="computeroutput"><a class="link" href="container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a></code> or <code class="computeroutput"><span class="identifier">tuple</span></code>.
       Let's see some examples.
     </p>
-<<<<<<< .working
-<a name="fusion.quick_start.print_the_vector_as_xml"></a><h3>
-<a name="id409777"></a>
-      <a href="quick_start.html#fusion.quick_start.print_the_vector_as_xml">Print the vector
-=======
 <a name="fusion.quick_start.print_the_vector_as_xml"></a><h4>
-<a name="id615270"></a>
+<a name="id608716"></a>
       <a class="link" href="quick_start.html#fusion.quick_start.print_the_vector_as_xml">Print the vector
->>>>>>> .merge-right.r57125
       as XML</a>
-    </h3>
+    </h4>
 <p>
       First, let's include the algorithms:
     </p>
@@ -117,45 +89,38 @@
 <p>
       Now, finally:
     </p>
-<pre class="programlisting">for_each<span class="special">(</span><span class="identifier">stuff</span><span class="special">,</span> <span class="identifier">print_xml</span><span class="special">());</span>
+<pre class="programlisting"><a class="link" href="algorithm/iteration/functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a><span class="special">(</span><span class="identifier">stuff</span><span class="special">,</span> <span class="identifier">print_xml</span><span class="special">());</span>
 </pre>
 <p>
-      That's it! <tt class="computeroutput">for_each</tt> is a fusion algorithm.
+      That's it! <code class="computeroutput"><a class="link" href="algorithm/iteration/functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a></code> is a fusion algorithm.
       It is a generic algorithm similar to STL's.
       It iterates over the sequence and calls a user supplied function. In our case,
-      it calls <tt class="computeroutput"><span class="identifier">print_xml</span></tt>'s <tt class="computeroutput"><span class="keyword">operator</span><span class="special">()</span></tt> for
-      each element in <tt class="computeroutput"><span class="identifier">stuff</span></tt>.
+      it calls <code class="computeroutput"><span class="identifier">print_xml</span></code>'s <code class="computeroutput"><span class="keyword">operator</span><span class="special">()</span></code> for
+      each element in <code class="computeroutput"><span class="identifier">stuff</span></code>.
     </p>
-<div class="caution"><table border="0" summary="Caution">
+<div class="caution" title="Caution"><table border="0" summary="Caution">
 <tr>
 <td rowspan="2" align="center" valign="top" width="25"><img alt="[Caution]" src="../../../../../doc/html/images/caution.png"></td>
 <th align="left">Caution</th>
 </tr>
-<tr><td colspan="2" align="left" valign="top"><p>
-        The result of <tt class="computeroutput"><span class="keyword">typeid</span><span class="special">(</span><span class="identifier">x</span><span class="special">).</span><span class="identifier">name</span><span class="special">()</span></tt> is platform specific. The code here is
+<tr><td align="left" valign="top"><p>
+        The result of <code class="computeroutput"><span class="keyword">typeid</span><span class="special">(</span><span class="identifier">x</span><span class="special">).</span><span class="identifier">name</span><span class="special">()</span></code> is platform specific. The code here is
         just for exposition. Of course you already know that :-)
       </p></td></tr>
 </table></div>
 <p>
-      <tt class="computeroutput">for_each</tt> is generic. With
-      <tt class="computeroutput"><span class="identifier">print_xml</span></tt>, you can use it to
-      print just about any Fusion Sequence.
-    </p>
-<<<<<<< .working
-<a name="fusion.quick_start.print_only_pointers"></a><h3>
-<a name="id410372"></a>
-      Print only pointers
-    </h3>
-=======
+      <code class="computeroutput"><a class="link" href="algorithm/iteration/functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a></code> is generic. With
+      <code class="computeroutput"><span class="identifier">print_xml</span></code>, you can use it to
+      print just about any Fusion <a class="link" href="sequence.html" title="Sequence">Sequence</a>.
+    </p>
 <a name="fusion.quick_start.print_only_pointers"></a><h4>
-<a name="id617917"></a>
+<a name="id611363"></a>
       <a class="link" href="quick_start.html#fusion.quick_start.print_only_pointers">Print only pointers</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       Let's get a little cleverer. Say we wish to write a <span class="emphasis"><em>generic</em></span>
       function that takes in an arbitrary sequence and XML prints only those elements
-      which are pointers. Ah, easy. First, let's include the <tt class="computeroutput"><span class="identifier">is_pointer</span></tt>
+      which are pointers. Ah, easy. First, let's include the <code class="computeroutput"><span class="identifier">is_pointer</span></code>
       boost type trait:
     </p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">type_traits</span><span class="special">/</span><span class="identifier">is_pointer</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
@@ -166,44 +131,37 @@
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">void</span> <span class="identifier">xml_print_pointers</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">)</span>
 <span class="special">{</span>
-    for_each<span class="special">(</span>filter_if<span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_pointer</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">),</span> <span class="identifier">print_xml</span><span class="special">());</span>
+    <a class="link" href="algorithm/iteration/functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a><span class="special">(</span><a class="link" href="algorithm/transformation/functions/filter_if.html" title="filter_if"><code class="computeroutput"><span class="identifier">filter_if</span></code></a><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_pointer</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">),</span> <span class="identifier">print_xml</span><span class="special">());</span>
 <span class="special">}</span>
 </pre>
 <p>
-      <tt class="computeroutput">filter_if</tt> is another Fusion
-      algorithm. It returns a filter_view, a conforming Fusion sequence.
+      <code class="computeroutput"><a class="link" href="algorithm/transformation/functions/filter_if.html" title="filter_if"><code class="computeroutput"><span class="identifier">filter_if</span></code></a></code> is another Fusion
+      algorithm. It returns a <a class="link" href="view/filter_view.html" title="filter_view"><code class="computeroutput"><span class="identifier">filter_view</span></code></a>, a conforming Fusion sequence.
       This view reflects only those elements that pass the given predicate. In this
-      case, the predicate is <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_pointer</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span></tt>.
-      This "filtered view" is then passed to the for_each algorithm, which then prints
+      case, the predicate is <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_pointer</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span></code>.
+      This "filtered view" is then passed to the <a class="link" href="algorithm/iteration/functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a> algorithm, which then prints
       the "filtered view" as XML.
     </p>
 <p>
       Easy, right?
     </p>
-<<<<<<< .working
-<a name="fusion.quick_start.associative_tuples"></a><h3>
-<a name="id410736"></a>
-      Associative tuples
-    </h3>
-=======
 <a name="fusion.quick_start.associative_tuples"></a><h4>
-<a name="id618190"></a>
+<a name="id611637"></a>
       <a class="link" href="quick_start.html#fusion.quick_start.associative_tuples">Associative tuples</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       Ok, moving on...
     </p>
 <p>
-      Apart from <tt class="computeroutput">vector</tt>,
+      Apart from <code class="computeroutput"><a class="link" href="container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a></code>,
       fusion has a couple of other sequence types to choose from. Each sequence has
-      its own characteristics. We have <tt class="computeroutput">list</tt>, <tt class="computeroutput">set</tt>, <tt class="computeroutput">map</tt>, plus a multitude of <tt class="computeroutput"><span class="identifier">views</span></tt> that provide various ways to present
+      its own characteristics. We have <code class="computeroutput"><a class="link" href="container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a></code>, <code class="computeroutput"><a class="link" href="container/set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a></code>, <code class="computeroutput"><a class="link" href="container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a></code>, plus a multitude of <code class="computeroutput"><span class="identifier">views</span></code> that provide various ways to present
       the sequences.
     </p>
 <p>
-      Fusion's <tt class="computeroutput">map</tt>
+      Fusion's <code class="computeroutput"><a class="link" href="container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a></code>
       associate types with elements. It can be used as a cleverer replacement of
-      the <tt class="computeroutput"><span class="keyword">struct</span></tt>. Example:
+      the <code class="computeroutput"><span class="keyword">struct</span></code>. Example:
     </p>
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">fields</span>
 <span class="special">{</span>
@@ -211,31 +169,31 @@
     <span class="keyword">struct</span> <span class="identifier">age</span><span class="special">;</span>
 <span class="special">}</span>
 
-<span class="keyword">typedef</span> map<span class="special">&lt;</span>
-    fusion::pair<span class="special">&lt;</span><span class="identifier">fields</span><span class="special">::</span><span class="identifier">name</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span>
-  <span class="special">,</span> fusion::pair<span class="special">&lt;</span><span class="identifier">fields</span><span class="special">::</span><span class="identifier">age</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;</span>
+<span class="keyword">typedef</span> <a class="link" href="container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a><span class="special">&lt;</span>
+    <a class="link" href="support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="identifier">fields</span><span class="special">::</span><span class="identifier">name</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span>
+  <span class="special">,</span> <a class="link" href="support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">fusion</span><span class="special">::</span><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="identifier">fields</span><span class="special">::</span><span class="identifier">age</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;</span>
 <span class="identifier">person</span><span class="special">;</span>
 </pre>
 <p>
-      <tt class="computeroutput">map</tt>
+      <code class="computeroutput"><a class="link" href="container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a></code>
       is an associative sequence. Its elements are Fusion pairs which differ somewhat
-      from <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>. Fusion pairs only contain one member,
+      from <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code>. Fusion pairs only contain one member,
       with the type of their second template parameter. The first type parameter
       of the pair is used as an index to the associated element in the sequence.
-      For example, given a <tt class="computeroutput"><span class="identifier">a_person</span></tt>
-      of type, <tt class="computeroutput"><span class="identifier">person</span></tt>, you can do:
+      For example, given a <code class="computeroutput"><span class="identifier">a_person</span></code>
+      of type, <code class="computeroutput"><span class="identifier">person</span></code>, you can do:
     </p>
 <pre class="programlisting"><span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">fields</span><span class="special">;</span>
-<span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">person_name</span> <span class="special">=</span> at_key<span class="special">&lt;</span><span class="identifier">name</span><span class="special">&gt;(</span><span class="identifier">a_person</span><span class="special">);</span>
-<span class="keyword">int</span> <span class="identifier">person_age</span> <span class="special">=</span> at_key<span class="special">&lt;</span><span class="identifier">age</span><span class="special">&gt;(</span><span class="identifier">a_person</span><span class="special">);</span>
+<span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span> <span class="identifier">person_name</span> <span class="special">=</span> <a class="link" href="sequence/intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">name</span><span class="special">&gt;(</span><span class="identifier">a_person</span><span class="special">);</span>
+<span class="keyword">int</span> <span class="identifier">person_age</span> <span class="special">=</span> <a class="link" href="sequence/intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">age</span><span class="special">&gt;(</span><span class="identifier">a_person</span><span class="special">);</span>
 </pre>
 <p>
-      Why go through all this trouble, you say? Well, for one, unlike the <tt class="computeroutput"><span class="keyword">struct</span></tt>, we are dealing with a generic data structure.
+      Why go through all this trouble, you say? Well, for one, unlike the <code class="computeroutput"><span class="keyword">struct</span></code>, we are dealing with a generic data structure.
       There are a multitude of facilities available at your disposal provided out
       of the box with fusion or written by others. With these facilities, introspection
       comes for free, for example. We can write one serialization function (well,
       two, if you consider loading and saving) that will work for all your fusion
-      <tt class="computeroutput">map</tt>s.
+      <code class="computeroutput"><a class="link" href="container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a></code>s.
       Example:
     </p>
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">saver</span>
@@ -250,26 +208,19 @@
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Stuff</span><span class="special">&gt;</span>
 <span class="keyword">void</span> <span class="identifier">save</span><span class="special">(</span><span class="identifier">Stuff</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">stuff</span><span class="special">)</span>
 <span class="special">{</span>
-    for_each<span class="special">(</span><span class="identifier">stuff</span><span class="special">,</span> <span class="identifier">saver</span><span class="special">());</span>
+    <a class="link" href="algorithm/iteration/functions/for_each.html" title="for_each"><code class="computeroutput"><span class="identifier">for_each</span></code></a><span class="special">(</span><span class="identifier">stuff</span><span class="special">,</span> <span class="identifier">saver</span><span class="special">());</span>
 <span class="special">}</span>
 </pre>
 <p>
-      The <tt class="computeroutput"><span class="identifier">save</span></tt> function is generic
-      and will work for all types of <tt class="computeroutput"><span class="identifier">stuff</span></tt>
-      regardless if it is a <tt class="computeroutput"><span class="identifier">person</span></tt>,
-      a <tt class="computeroutput"><span class="identifier">dog</span></tt> or a whole <tt class="computeroutput"><span class="identifier">alternate_universe</span></tt>.
-    </p>
-<<<<<<< .working
-<a name="fusion.quick_start.tip_of_the_iceberg"></a><h3>
-<a name="id411650"></a>
-      Tip of the Iceberg
-    </h3>
-=======
+      The <code class="computeroutput"><span class="identifier">save</span></code> function is generic
+      and will work for all types of <code class="computeroutput"><span class="identifier">stuff</span></code>
+      regardless if it is a <code class="computeroutput"><span class="identifier">person</span></code>,
+      a <code class="computeroutput"><span class="identifier">dog</span></code> or a whole <code class="computeroutput"><span class="identifier">alternate_universe</span></code>.
+    </p>
 <a name="fusion.quick_start.tip_of_the_iceberg"></a><h4>
-<a name="id618901"></a>
+<a name="id612347"></a>
       <a class="link" href="quick_start.html#fusion.quick_start.tip_of_the_iceberg">Tip of the Iceberg</a>
     </h4>
->>>>>>> .merge-right.r57125
 <p>
       And... we've barely scratched the surface! You can compose and expand the data
       structures, remove elements from the structures, find specific data types,
@@ -278,64 +229,14 @@
     </p>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<div class="footnote"><p><sup>[<a name="ftn.id409214" href="#id409214">2</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id658449" href="#id658449" class="para">2</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id614209" href="#id614209" class="para">2</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id606563" href="#id606563" class="para">2</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id629518" href="#id629518" class="para">2</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id618116" href="#id618116" class="para">2</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id614839" href="#id614839" class="para">2</a>] </sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
->>>>>>> .merge-right.r57125
+<div class="footnote"><p><sup>[<a name="ftn.id608285" href="#id608285" class="para">2</a>] </sup>
           There are finer grained header files available if you wish to have more
-          control over which components to include (see section Orgainization
+          control over which components to include (see section <a class="link" href="organization.html" title="Organization">Orgainization</a>
           for details).
         </p></div>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<div class="footnote"><p><sup>[<a name="ftn.id409361" href="#id409361">3</a>] </sup>
-          Unless otherwise noted, components are in namespace <tt class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span></tt>.
-          For the sake of simplicity, code in this quick start implies <tt class="computeroutput"><span class="keyword">using</span></tt> directives for the fusion components
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id658564" href="#id658564" class="para">3</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id614324" href="#id614324" class="para">3</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id606678" href="#id606678" class="para">3</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id629633" href="#id629633" class="para">3</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id618231" href="#id618231" class="para">3</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id614954" href="#id614954" class="para">3</a>] </sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<div class="footnote"><p><sup>[<a name="ftn.id608401" href="#id608401" class="para">3</a>] </sup>
           Unless otherwise noted, components are in namespace <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">fusion</span></code>.
           For the sake of simplicity, code in this quick start implies <code class="computeroutput"><span class="keyword">using</span></code> directives for the fusion components
->>>>>>> .merge-right.r57125
           we will be using.
         </p></div>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/references.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/references.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/references.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>References</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="acknowledgements.html" title="Acknowledgements">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="acknowledgements.html" title="Acknowledgements">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -25,39 +21,36 @@
 <div class="spirit-nav">
 <a accesskey="p" href="acknowledgements.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.references"></a>References
-</h2></div></div>
-<div></div>
-</div>
-<div class="orderedlist"><ol type="1">
-<li>
+<div class="section" title="References">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.references"></a><a class="link" href="references.html" title="References">References</a>
+</h2></div></div></div>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
 <a href="http://boost.org/libs/iterator/doc/new-iter-concepts.html" target="_top">New
         Iterator Concepts</a>, David Abrahams, Jeremy Siek, Thomas Witt, 2004-11-01.
       </li>
-<li>
+<li class="listitem">
 <a href="http://boost.org/libs/tuple/doc/tuple_users_guide.html" target="_top">The Boost
         Tuple Library</a>, Jaakko Jarvi, 2001.
       </li>
-<li>
+<li class="listitem">
 <a href="http://www.boost.org/libs/spirit/" target="_top">Spirit Parser Library</a>,
         Joel de Guzman, 2001-2006.
       </li>
-<li>
+<li class="listitem">
 <a href="http://www.boost.org/libs/mpl/" target="_top">The Boost MPL Library</a>,
         Aleksey Gurtovoy and David Abrahams, 2002-2004.
       </li>
-<li>
+<li class="listitem">
 <a href="http://www.boost.org/doc/html/array.html" target="_top">Boost Array</a>,
         Nicolai Josuttis, 2002-2004.
       </li>
-<li>
+<li class="listitem">
 <a href="http://www.sgi.com/tech/stl/" target="_top">Standard Template Library Programmer's
         Guide</a>, Hewlett-Packard Company, 1994.
       </li>
-<li>
+<li class="listitem">
 <a href="http://www.boost.org/doc/html/ref.html" target="_top">Boost.Ref</a>, Jaakko
         Jarvi, Peter Dimov, Douglas Gregor, Dave Abrahams, 1999-2002.
       </li>
@@ -65,7 +58,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,20 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Sequence</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<<<<<<< .working
-<link rel="previous" href="iterator/metafunctions/advance_c.html" title="advance_c">
-=======
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="prev" href="iterator/metafunctions/deref_data.html" title="deref_data">
->>>>>>> .merge-right.r57242
 <link rel="next" href="sequence/concepts.html" title="Concepts">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="iterator/metafunctions/deref_data.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="sequence/concepts.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.sequence"></a>Sequence
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Sequence">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.sequence"></a><a class="link" href="sequence.html" title="Sequence">Sequence</a>
+</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Concepts</span></dt>
 <dd><dl>
@@ -63,31 +52,24 @@
 <p>
       Like MPL, the
       Sequence is a fundamental concept in Fusion. A Sequence may or may not actually
-      store or contain data. Container are
-      sequences that hold data. Views, on the
+      store or contain data. <a class="link" href="container.html" title="Container">Container</a> are
+      sequences that hold data. <a class="link" href="view.html" title="View">Views</a>, on the
       other hand, are sequences that do not store any data. Instead, they are proxies
       that impart an alternative presentation over another sequence. All models of
-      Sequence have an associated Iterator
+      Sequence have an associated <a class="link" href="iterator.html" title="Iterator">Iterator</a>
       type that can be used to iterate through the Sequence's elements.
     </p>
-<<<<<<< .working
-<a name="fusion.sequence.header"></a><h3>
-<a name="id442034"></a>
-      Header
-    </h3>
-=======
 <a name="fusion.sequence.header"></a><h4>
-<a name="id645131"></a>
+<a name="id646152"></a>
       <a class="link" href="sequence.html#fusion.sequence.header">Header</a>
     </h4>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/concepts.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/concepts.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/concepts.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,18 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Concepts</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../sequence.html" title="Sequence">
-<link rel="previous" href="../sequence.html" title="Sequence">
-<link rel="next" href="concepts/forward_sequence.html" title="Forward
-        Sequence">
+<link rel="prev" href="../sequence.html" title="Sequence">
+<link rel="next" href="concepts/forward_sequence.html" title="Forward Sequence">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -27,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../sequence.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../sequence.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="concepts/forward_sequence.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.sequence.concepts"></a>Concepts
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Concepts">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.sequence.concepts"></a><a class="link" href="concepts.html" title="Concepts">Concepts</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="concepts/forward_sequence.html">Forward
         Sequence</a></span></dt>
@@ -47,52 +39,32 @@
 <p>
         Fusion Sequences are organized into a hierarchy of concepts.
       </p>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.traversal"></a><h4>
-<a name="id442201"></a>
-        Traversal
-      </h4>
-=======
 <a name="fusion.sequence.concepts.traversal"></a><h5>
-<a name="id645245"></a>
+<a name="id646266"></a>
         <a class="link" href="concepts.html#fusion.sequence.concepts.traversal">Traversal</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        Fusion's sequence traversal related concepts parallel Fusion's <a href="../iterator/concepts.html" title="Concepts">Iterator
-        Concepts</a>. <a href="concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-        Sequence</a> is the most basic concept. <a href="concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-        Sequence</a> is a refinement of <a href="concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-        Sequence</a>. <a href="concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-        Access Sequence</a> is a refinement of <a href="concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+        Fusion's sequence traversal related concepts parallel Fusion's <a class="link" href="../iterator/concepts.html" title="Concepts">Iterator
+        Concepts</a>. <a class="link" href="concepts/forward_sequence.html" title="Forward Sequence">Forward
+        Sequence</a> is the most basic concept. <a class="link" href="concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+        Sequence</a> is a refinement of <a class="link" href="concepts/forward_sequence.html" title="Forward Sequence">Forward
+        Sequence</a>. <a class="link" href="concepts/random_access_sequence.html" title="Random Access Sequence">Random
+        Access Sequence</a> is a refinement of <a class="link" href="concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
         Sequence</a>. These concepts pertain to sequence traversal.
       </p>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.associativity"></a><h4>
-<a name="id442286"></a>
-        Associativity
-      </h4>
-=======
 <a name="fusion.sequence.concepts.associativity"></a><h5>
-<a name="id645291"></a>
+<a name="id646312"></a>
         <a class="link" href="concepts.html#fusion.sequence.concepts.associativity">Associativity</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        The <a href="concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
+        The <a class="link" href="concepts/associative_sequence.html" title="Associative Sequence">Associative
         Sequence</a> concept is orthogonal to traversal. An Associative Sequence
         allows efficient retrieval of elements based on keys.
       </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/concepts/associative_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/concepts/associative_sequence.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/concepts/associative_sequence.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,18 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Associative
-        Sequence</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Associative Sequence</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="random_access_sequence.html" title="Random
-        Access Sequence">
+<link rel="prev" href="random_access_sequence.html" title="Random Access Sequence">
 <link rel="next" href="../intrinsic.html" title="Intrinsic">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,27 +22,15 @@
 <div class="spirit-nav">
 <a accesskey="p" href="random_access_sequence.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../intrinsic.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.sequence.concepts.associative_sequence"></a><a href="associative_sequence.html" title="Associative
-        Sequence">Associative
+<div class="section" title="Associative Sequence">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.sequence.concepts.associative_sequence"></a><a class="link" href="associative_sequence.html" title="Associative Sequence">Associative
         Sequence</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.sequence.concepts.associative_sequence.description"></a><h5>
-<a name="id447542"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.sequence.concepts.associative_sequence.description"></a><h6>
-<a name="id651268"></a>
+<a name="id651334"></a>
           <a class="link" href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           An Associative Sequence allows efficient retrieval of elements based on
           keys. Like associative sequences in MPL,
@@ -56,42 +38,36 @@
           Fusion associative sequences have no implied ordering relation. Instead,
           type identity is used to impose an equivalence relation on keys.
         </p>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
               An Associative Sequence
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">S</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">S</span></code></span></dt>
 <dd><p>
               An Associative Sequence type
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">K</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">K</span></code></span></dt>
 <dd><p>
               An arbitrary <span class="emphasis"><em>key</em></span> type
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">o</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">o</span></code></span></dt>
 <dd><p>
               An arbitrary object
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">e</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">e</span></code></span></dt>
 <dd><p>
               A Sequence element
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.associative_sequence.valid_expressions"></a><h5>
-<a name="id447735"></a>
-          <a href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.valid_expressions">Valid
-=======
 <a name="fusion.sequence.concepts.associative_sequence.valid_expressions"></a><h6>
-<a name="id651402"></a>
+<a name="id651467"></a>
           <a class="link" href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.valid_expressions">Valid
->>>>>>> .merge-right.r57125
           Expressions</a>
-        </h5>
+        </h6>
 <p>
           For any Associative Sequence the following expressions must be valid:
         </p>
@@ -103,203 +79,264 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Return type
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Type Requirements
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Runtime Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">has_key<span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/has_key.html" title="has_key"><code class="computeroutput"><span class="identifier">has_key</span></code></a><span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
                   Boolean Constant</a>. Convertible to bool.
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">at_key<span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">at_key<span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span>
-                  <span class="special">=</span> <span class="identifier">o</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span>
+                  <span class="special">=</span> <span class="identifier">o</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">s</span></tt> is mutable and
-                  <tt class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
-                  <span class="identifier">o</span></tt>, where <tt class="computeroutput"><span class="identifier">e</span></tt> is the first element in the
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">s</span></code> is mutable and
+                  <code class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
+                  <span class="identifier">o</span></code>, where <code class="computeroutput"><span class="identifier">e</span></code> is the first element in the
                   sequence, is a valid expression.
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.associative_sequence.result_type_expressions"></a><h5>
-<a name="id448116"></a>
-          <a href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.result_type_expressions">Result
-=======
 <a name="fusion.sequence.concepts.associative_sequence.result_type_expressions"></a><h6>
-<a name="id651688"></a>
+<a name="id651754"></a>
           <a class="link" href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.result_type_expressions">Result
->>>>>>> .merge-right.r57125
           Type Expressions</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Compile Time Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::has_key<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span>
-                  <span class="identifier">K</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/has_key.html" title="has_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">has_key</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span>
+                  <span class="identifier">K</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::at_key<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span>
-                  <span class="identifier">K</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span>
+                  <span class="identifier">K</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::value_at_key<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span>
-                  <span class="identifier">K</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/value_at_key.html" title="value_at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_key</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span>
+                  <span class="identifier">K</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<div class="sidebar"><p>
-          <span class="inlinemediaobject"><img src="images/note.png" alt="note"></span> <tt class="computeroutput">result_of::at_key<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">K</span><span class="special">&gt;</span></tt> returns the actual type returned by
-          <tt class="computeroutput">at_key<span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></tt>. In
+<div class="sidebar">
+<p class="title"><b></b></p>
+<p>
+          <span class="inlinemediaobject"><img src="../../../images/note.png" alt="note"></span> <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">K</span><span class="special">&gt;</span></code> returns the actual type returned by
+          <code class="computeroutput"><a class="link" href="../intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></code>. In
           most cases, this is a reference. Hence, there is no way to know the exact
-          element type using <tt class="computeroutput">result_of::at_key<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">K</span><span class="special">&gt;</span></tt>.The element at <tt class="computeroutput"><span class="identifier">K</span></tt>
+          element type using <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">K</span><span class="special">&gt;</span></code>.The element at <code class="computeroutput"><span class="identifier">K</span></code>
           may actually be a reference to begin with. For this purpose, you can use
-<<<<<<< .working
-          <tt class="computeroutput">result_of::value_at_key<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;</span></tt>.
-        </p></div>
-<a name="fusion.sequence.concepts.associative_sequence.expression_semantics"></a><h5>
-<a name="id448687"></a>
-          <a href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.expression_semantics">Expression
-=======
           <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/value_at_key.html" title="value_at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_key</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;</span></code>.
         </p>
 </div>
 <a name="fusion.sequence.concepts.associative_sequence.expression_semantics"></a><h6>
-<a name="id652092"></a>
+<a name="id652157"></a>
           <a class="link" href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">has_key<span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  A boolean Integral Constant <tt class="computeroutput"><span class="identifier">c</span></tt>
-                  such that <tt class="computeroutput"><span class="identifier">c</span><span class="special">::</span><span class="identifier">value</span> <span class="special">==</span>
-                  <span class="keyword">true</span></tt> if and only if there
-                  is one or more elements with the key <tt class="computeroutput"><span class="identifier">k</span></tt>
-                  in <tt class="computeroutput"><span class="identifier">s</span></tt>; see has_key.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/has_key.html" title="has_key"><code class="computeroutput"><span class="identifier">has_key</span></code></a><span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A boolean Integral Constant <code class="computeroutput"><span class="identifier">c</span></code>
+                  such that <code class="computeroutput"><span class="identifier">c</span><span class="special">::</span><span class="identifier">value</span> <span class="special">==</span>
+                  <span class="keyword">true</span></code> if and only if there
+                  is one or more elements with the key <code class="computeroutput"><span class="identifier">k</span></code>
+                  in <code class="computeroutput"><span class="identifier">s</span></code>; see <a class="link" href="../intrinsic/functions/has_key.html" title="has_key"><code class="computeroutput"><span class="identifier">has_key</span></code></a>.
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">at_key<span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  The element associated with the key <tt class="computeroutput"><span class="identifier">K</span></tt>
-                  in the sequence <tt class="computeroutput"><span class="identifier">s</span></tt>;
-                  see at.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">K</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  The element associated with the key <code class="computeroutput"><span class="identifier">K</span></code>
+                  in the sequence <code class="computeroutput"><span class="identifier">s</span></code>;
+                  see <a class="link" href="../intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a>.
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.associative_sequence.models"></a><h5>
-<a name="id449008"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>set</li>
-<li>map</li>
-=======
 <a name="fusion.sequence.concepts.associative_sequence.models"></a><h6>
-<a name="id652312"></a>
+<a name="id653538"></a>
           <a class="link" href="associative_sequence.html#fusion.sequence.concepts.associative_sequence.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem"><a class="link" href="../../container/set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a></li>
 <li class="listitem"><a class="link" href="../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a></li>
->>>>>>> .merge-right.r57125
+<li class="listitem">
+<a class="link" href="../../view/filter_view.html" title="filter_view"><code class="computeroutput"><span class="identifier">filter_view</span></code></a>
+            (where adapted sequence is an <a class="link" href="associative_sequence.html" title="Associative Sequence">Associative
+            Sequence</a> and a <a class="link" href="forward_sequence.html" title="Forward Sequence">Forward
+            Sequence</a>)
+          </li>
+<li class="listitem">
+<a class="link" href="../../view/iterator_range.html" title="iterator_range"><code class="computeroutput"><span class="identifier">iterator_range</span></code></a>
+            (where adapted iterators are <a class="link" href="../../iterator/concepts/associative_iterator.html" title="Associative Iterator">Associative
+            Iterator</a>s)
+          </li>
+<li class="listitem">
+<a class="link" href="../../view/joint_view.html" title="joint_view"><code class="computeroutput"><span class="identifier">joint_view</span></code></a>
+            (where adapted sequences are <a class="link" href="associative_sequence.html" title="Associative Sequence">Associative
+            Sequence</a>s and <a class="link" href="forward_sequence.html" title="Forward Sequence">Forward
+            Sequence</a>s)
+          </li>
+<li class="listitem">
+<a class="link" href="../../view/reverse_view.html" title="reverse_view"><code class="computeroutput"><span class="identifier">reverse_view</span></code></a>
+            (where adapted sequence is an <a class="link" href="associative_sequence.html" title="Associative Sequence">Associative
+            Sequence</a> and a <a class="link" href="bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+            Sequence</a>)
+          </li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/concepts/bidirectional_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/concepts/bidirectional_sequence.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/concepts/bidirectional_sequence.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,20 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Bidirectional
-        Sequence</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Bidirectional Sequence</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="forward_sequence.html" title="Forward
-        Sequence">
-<link rel="next" href="random_access_sequence.html" title="Random
-        Access Sequence">
+<link rel="prev" href="forward_sequence.html" title="Forward Sequence">
+<link rel="next" href="random_access_sequence.html" title="Random Access Sequence">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -29,84 +22,56 @@
 <div class="spirit-nav">
 <a accesskey="p" href="forward_sequence.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="random_access_sequence.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.sequence.concepts.bidirectional_sequence"></a><a href="bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+<div class="section" title="Bidirectional Sequence">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.sequence.concepts.bidirectional_sequence"></a><a class="link" href="bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
         Sequence</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.sequence.concepts.bidirectional_sequence.description"></a><h5>
-<a name="id444601"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.sequence.concepts.bidirectional_sequence.description"></a><h6>
-<a name="id646988"></a>
+<a name="id649170"></a>
           <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          A Bidirectional Sequence is a <a href="forward_sequence.html" title="Forward
-        Sequence">Forward
-          Sequence</a> whose iterators model <a href="../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+          A Bidirectional Sequence is a <a class="link" href="forward_sequence.html" title="Forward Sequence">Forward
+          Sequence</a> whose iterators model <a class="link" href="../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
           Iterator</a>.
         </p>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.bidirectional_sequence.refinement_of"></a><h5>
-<a name="id444649"></a>
-          <a href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.refinement_of">Refinement
-=======
 <a name="fusion.sequence.concepts.bidirectional_sequence.refinement_of"></a><h6>
-<a name="id647019"></a>
+<a name="id649201"></a>
           <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.refinement_of">Refinement
->>>>>>> .merge-right.r57125
           of</a>
-        </h5>
+        </h6>
 <p>
-          <a href="forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>
+          <a class="link" href="forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
         </p>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
               A Forward Sequence
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">S</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">S</span></code></span></dt>
 <dd><p>
               A Forward Sequence type
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">o</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">o</span></code></span></dt>
 <dd><p>
               An arbitrary object
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">e</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">e</span></code></span></dt>
 <dd><p>
               A Sequence element
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.bidirectional_sequence.valid_expressions"></a><h5>
-<a name="id444786"></a>
-          <a href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.valid_expressions">Valid
-=======
 <a name="fusion.sequence.concepts.bidirectional_sequence.valid_expressions"></a><h6>
-<a name="id647122"></a>
+<a name="id649304"></a>
           <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.valid_expressions">Valid
->>>>>>> .merge-right.r57125
           Expressions</a>
-        </h5>
+        </h6>
 <p>
-          In addition to the requirements defined in <a href="forward_sequence.html" title="Forward
-        Sequence">Forward
+          In addition to the requirements defined in <a class="link" href="forward_sequence.html" title="Forward Sequence">Forward
           Sequence</a>, for any Bidirectional Sequence the following must be met:
         </p>
 <div class="informaltable"><table class="table">
@@ -117,149 +82,190 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Return type
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Type Requirements
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Runtime Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">begin<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
                   Iterator</a>
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">end<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional Iterator">Bidirectional
                   Iterator</a>
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">back<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/back.html" title="back"><code class="computeroutput"><span class="identifier">back</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">back<span class="special">(</span><span class="identifier">s</span><span class="special">)</span>
-                  <span class="special">=</span> <span class="identifier">o</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/back.html" title="back"><code class="computeroutput"><span class="identifier">back</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span>
+                  <span class="special">=</span> <span class="identifier">o</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">s</span></tt> is mutable and
-                  <tt class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
-                  <span class="identifier">o</span></tt>, where <tt class="computeroutput"><span class="identifier">e</span></tt> is the first element in the
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">s</span></code> is mutable and
+                  <code class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
+                  <span class="identifier">o</span></code>, where <code class="computeroutput"><span class="identifier">e</span></code> is the first element in the
                   sequence, is a valid expression.
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.bidirectional_sequence.result_type_expressions"></a><h5>
-<a name="id445223"></a>
-          <a href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.result_type_expressions">Result
-=======
 <a name="fusion.sequence.concepts.bidirectional_sequence.result_type_expressions"></a><h6>
-<a name="id647446"></a>
+<a name="id649628"></a>
           <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.result_type_expressions">Result
->>>>>>> .merge-right.r57125
           Type Expressions</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Compile Time Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::begin<span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::end<span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::back<span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/back.html" title="back"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">back</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.bidirectional_sequence.expression_semantics"></a><h5>
-<a name="id445497"></a>
-          <a href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.expression_semantics">Expression
-=======
 <a name="fusion.sequence.concepts.bidirectional_sequence.expression_semantics"></a><h6>
-<a name="id647649"></a>
+<a name="id649831"></a>
           <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <p>
           The semantics of an expression are defined only where they differ from,
-          or are not defined in <a href="forward_sequence.html" title="Forward
-        Sequence">Forward
+          or are not defined in <a class="link" href="forward_sequence.html" title="Forward Sequence">Forward
           Sequence</a>.
         </p>
 <div class="informaltable"><table class="table">
@@ -268,37 +274,32 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput">back<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  The last element in the sequence; see back.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/back.html" title="back"><code class="computeroutput"><span class="identifier">back</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  The last element in the sequence; see <a class="link" href="../intrinsic/functions/back.html" title="back"><code class="computeroutput"><span class="identifier">back</span></code></a>.
+                </p>
+                </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.bidirectional_sequence.models"></a><h5>
-<a name="id445649"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>std::pair</li>
-<li>boost::array</li>
-<li>vector</li>
-<li>reverse_view</li>
-<li>
-iterator_range
-=======
 <a name="fusion.sequence.concepts.bidirectional_sequence.models"></a><h6>
-<a name="id647755"></a>
+<a name="id649936"></a>
           <a class="link" href="bidirectional_sequence.html#fusion.sequence.concepts.bidirectional_sequence.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
@@ -308,22 +309,21 @@
 <li class="listitem"><a class="link" href="../../view/reverse_view.html" title="reverse_view"><code class="computeroutput"><span class="identifier">reverse_view</span></code></a></li>
 <li class="listitem">
 <a class="link" href="../../view/iterator_range.html" title="iterator_range"><code class="computeroutput"><span class="identifier">iterator_range</span></code></a>
->>>>>>> .merge-right.r57125
             (where adapted sequence is a Bidirectional Sequence)
           </li>
-<li>
-transform_view
+<li class="listitem">
+<a class="link" href="../../view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a>
             (where adapted sequence is a Bidirectional Sequence)
           </li>
-<li>
-zip_view
-            (where adapted sequences are models Bidirectional Sequence)
+<li class="listitem">
+<a class="link" href="../../view/zip_view.html" title="zip_view"><code class="computeroutput"><span class="identifier">zip_view</span></code></a>
+            (where adapted sequences are models of Bidirectional Sequence)
           </li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/concepts/forward_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/concepts/forward_sequence.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/concepts/forward_sequence.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,19 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Forward
-        Sequence</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Forward Sequence</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="../concepts.html" title="Concepts">
-<link rel="next" href="bidirectional_sequence.html" title="Bidirectional
-        Sequence">
+<link rel="prev" href="../concepts.html" title="Concepts">
+<link rel="next" href="bidirectional_sequence.html" title="Bidirectional Sequence">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -28,27 +22,15 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../concepts.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="bidirectional_sequence.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.sequence.concepts.forward_sequence"></a><a href="forward_sequence.html" title="Forward
-        Sequence">Forward
+<div class="section" title="Forward Sequence">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.sequence.concepts.forward_sequence"></a><a class="link" href="forward_sequence.html" title="Forward Sequence">Forward
         Sequence</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.sequence.concepts.forward_sequence.description"></a><h5>
-<a name="id442346"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.sequence.concepts.forward_sequence.description"></a><h6>
-<a name="id645322"></a>
+<a name="id646343"></a>
           <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           A Forward Sequence is a Sequence whose elements are arranged in a definite
           order. The ordering is guaranteed not to change from iteration to iteration.
@@ -56,38 +38,32 @@
           equality (if the container's element type is Equality Comparable) and of
           lexicographical ordering (if the container's element type is LessThan Comparable).
         </p>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
               A Forward Sequence
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">S</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">S</span></code></span></dt>
 <dd><p>
               A Forward Sequence type
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">o</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">o</span></code></span></dt>
 <dd><p>
               An arbitrary object
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">e</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">e</span></code></span></dt>
 <dd><p>
               A Sequence element
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.forward_sequence.valid_expressions"></a><h5>
-<a name="id442473"></a>
-          <a href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.valid_expressions">Valid
-=======
 <a name="fusion.sequence.concepts.forward_sequence.valid_expressions"></a><h6>
-<a name="id645420"></a>
+<a name="id646442"></a>
           <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.valid_expressions">Valid
->>>>>>> .merge-right.r57125
           Expressions</a>
-        </h5>
+        </h6>
 <p>
           For any Forward Sequence the following expressions must be valid:
         </p>
@@ -99,304 +75,366 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Return type
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Type Requirements
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Runtime Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">begin<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">end<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="../../iterator/concepts/forward_iterator.html" title="Forward Iterator">Forward
                   Iterator</a>
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">size<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/size.html" title="size"><code class="computeroutput"><span class="identifier">size</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
                   Integral Constant</a>. Convertible to int.
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">empty<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/empty.html" title="empty"><code class="computeroutput"><span class="identifier">empty</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
                   Boolean Constant</a>. Convertible to bool.
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">front<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/front.html" title="front"><code class="computeroutput"><span class="identifier">front</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">front<span class="special">(</span><span class="identifier">s</span><span class="special">)</span>
-                  <span class="special">=</span> <span class="identifier">o</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/front.html" title="front"><code class="computeroutput"><span class="identifier">front</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span>
+                  <span class="special">=</span> <span class="identifier">o</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">s</span></tt> is mutable and
-                  <tt class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
-                  <span class="identifier">o</span></tt>, where <tt class="computeroutput"><span class="identifier">e</span></tt> is the first element in the
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">s</span></code> is mutable and
+                  <code class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
+                  <span class="identifier">o</span></code>, where <code class="computeroutput"><span class="identifier">e</span></code> is the first element in the
                   sequence, is a valid expression.
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.forward_sequence.result_type_expressions"></a><h5>
-<a name="id443053"></a>
-          <a href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.result_type_expressions">Result
-=======
 <a name="fusion.sequence.concepts.forward_sequence.result_type_expressions"></a><h6>
-<a name="id645924"></a>
+<a name="id648105"></a>
           <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.result_type_expressions">Result
->>>>>>> .merge-right.r57125
           Type Expressions</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Compile Time Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::begin<span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::end<span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Unspecified
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::empty<span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/empty.html" title="empty"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">empty</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::front<span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/front.html" title="front"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">front</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.forward_sequence.expression_semantics"></a><h5>
-<a name="id443468"></a>
-          <a href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.expression_semantics">Expression
-=======
 <a name="fusion.sequence.concepts.forward_sequence.expression_semantics"></a><h6>
-<a name="id646230"></a>
+<a name="id648411"></a>
           <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">begin<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  An iterator to the first element of the sequence; see begin.
-                </p></td>
-</tr>
-<tr>
-<td><p>
-                  <tt class="computeroutput">end<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  A past-the-end iterator to the sequence; see end.
-                </p></td>
-</tr>
-<tr>
-<td><p>
-                  <tt class="computeroutput">size<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  The size of the sequence; see size.
-                </p></td>
-</tr>
-<tr>
-<td><p>
-                  <tt class="computeroutput">empty<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  A boolean Integral Constant <tt class="computeroutput"><span class="identifier">c</span></tt>
-                  such that <tt class="computeroutput"><span class="identifier">c</span><span class="special">::</span><span class="identifier">value</span> <span class="special">==</span>
-                  <span class="keyword">true</span></tt> if and only if the
-                  sequence is empty; see empty.
-                </p></td>
-</tr>
-<tr>
-<td><p>
-                  <tt class="computeroutput">front<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  The first element in the sequence; see front.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  An iterator to the first element of the sequence; see <a class="link" href="../intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a>.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A past-the-end iterator to the sequence; see <a class="link" href="../intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a>.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/size.html" title="size"><code class="computeroutput"><span class="identifier">size</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  The size of the sequence; see <a class="link" href="../intrinsic/functions/size.html" title="size"><code class="computeroutput"><span class="identifier">size</span></code></a>.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/empty.html" title="empty"><code class="computeroutput"><span class="identifier">empty</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A boolean Integral Constant <code class="computeroutput"><span class="identifier">c</span></code>
+                  such that <code class="computeroutput"><span class="identifier">c</span><span class="special">::</span><span class="identifier">value</span> <span class="special">==</span>
+                  <span class="keyword">true</span></code> if and only if the
+                  sequence is empty; see <a class="link" href="../intrinsic/functions/empty.html" title="empty"><code class="computeroutput"><span class="identifier">empty</span></code></a>.
+                </p>
+                </td>
+</tr>
+<tr>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/front.html" title="front"><code class="computeroutput"><span class="identifier">front</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  The first element in the sequence; see <a class="link" href="../intrinsic/functions/front.html" title="front"><code class="computeroutput"><span class="identifier">front</span></code></a>.
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.forward_sequence.invariants"></a><h5>
-<a name="id443935"></a>
-          Invariants
-        </h5>
-=======
 <a name="fusion.sequence.concepts.forward_sequence.invariants"></a><h6>
-<a name="id646558"></a>
+<a name="id648740"></a>
           <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.invariants">Invariants</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           For any Forward Sequence s the following invariants always hold:
         </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
-<tt class="computeroutput"><span class="special">[</span>begin<span class="special">(</span><span class="identifier">s</span><span class="special">),</span> end<span class="special">(</span><span class="identifier">s</span><span class="special">))</span></tt> is always a valid range.
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+<code class="computeroutput"><span class="special">[</span><a class="link" href="../intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">),</span> <a class="link" href="../intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">))</span></code> is always a valid range.
           </li>
-<li>
-            An Algorithm that iterates through
-            the range <tt class="computeroutput"><span class="special">[</span>begin<span class="special">(</span><span class="identifier">s</span><span class="special">),</span> end<span class="special">(</span><span class="identifier">s</span><span class="special">))</span></tt> will pass through every element of
-            <tt class="computeroutput"><span class="identifier">s</span></tt> exactly once.
+<li class="listitem">
+            An <a class="link" href="../../algorithm.html" title="Algorithm">Algorithm</a> that iterates through
+            the range <code class="computeroutput"><span class="special">[</span><a class="link" href="../intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">),</span> <a class="link" href="../intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">))</span></code> will pass through every element of
+            <code class="computeroutput"><span class="identifier">s</span></code> exactly once.
           </li>
-<li>
-<tt class="computeroutput">begin<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-            is identical to <tt class="computeroutput">end<span class="special">(</span><span class="identifier">s</span><span class="special">))</span></tt>
-            if and only if <tt class="computeroutput"><span class="identifier">s</span></tt> is empty.
+<li class="listitem">
+<code class="computeroutput"><a class="link" href="../intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+            is identical to <code class="computeroutput"><a class="link" href="../intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">))</span></code>
+            if and only if <code class="computeroutput"><span class="identifier">s</span></code> is empty.
           </li>
-<li>
-            Two different iterations through <tt class="computeroutput"><span class="identifier">s</span></tt>
+<li class="listitem">
+            Two different iterations through <code class="computeroutput"><span class="identifier">s</span></code>
             will access its elements in the same order.
           </li>
 </ul></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.forward_sequence.models"></a><h5>
-<a name="id444246"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>std::pair</li>
-<li>boost::array</li>
-<li>vector</li>
-<li>cons</li>
-<li>list</li>
-<li>set</li>
-<li>map</li>
-<li>single_view</li>
-<li>filter_view</li>
-<li>iterator_range</li>
-<li>joint_view</li>
-<li>transform_view</li>
-<li>reverse_view</li>
-<li>zip_view</li>
-=======
 <a name="fusion.sequence.concepts.forward_sequence.models"></a><h6>
-<a name="id646759"></a>
+<a name="id648940"></a>
           <a class="link" href="forward_sequence.html#fusion.sequence.concepts.forward_sequence.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
@@ -414,12 +452,11 @@
 <li class="listitem"><a class="link" href="../../view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a></li>
 <li class="listitem"><a class="link" href="../../view/reverse_view.html" title="reverse_view"><code class="computeroutput"><span class="identifier">reverse_view</span></code></a></li>
 <li class="listitem"><a class="link" href="../../view/zip_view.html" title="zip_view"><code class="computeroutput"><span class="identifier">zip_view</span></code></a></li>
->>>>>>> .merge-right.r57125
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/concepts/random_access_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/concepts/random_access_sequence.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/concepts/random_access_sequence.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,20 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Random
-        Access Sequence</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Random Access Sequence</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../concepts.html" title="Concepts">
-<link rel="previous" href="bidirectional_sequence.html" title="Bidirectional
-        Sequence">
-<link rel="next" href="associative_sequence.html" title="Associative
-        Sequence">
+<link rel="prev" href="bidirectional_sequence.html" title="Bidirectional Sequence">
+<link rel="next" href="associative_sequence.html" title="Associative Sequence">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -29,91 +22,63 @@
 <div class="spirit-nav">
 <a accesskey="p" href="bidirectional_sequence.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../concepts.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="associative_sequence.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.sequence.concepts.random_access_sequence"></a><a href="random_access_sequence.html" title="Random
-        Access Sequence">Random
+<div class="section" title="Random Access Sequence">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.sequence.concepts.random_access_sequence"></a><a class="link" href="random_access_sequence.html" title="Random Access Sequence">Random
         Access Sequence</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.sequence.concepts.random_access_sequence.description"></a><h5>
-<a name="id445865"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.sequence.concepts.random_access_sequence.description"></a><h6>
-<a name="id650077"></a>
+<a name="id650142"></a>
           <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          A Random Access Sequence is a <a href="bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-          Sequence</a> whose iterators model <a href="../../iterator/concepts/random_access_iterator.html" title="Random
-        Access Iterator">Random
+          A Random Access Sequence is a <a class="link" href="bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+          Sequence</a> whose iterators model <a class="link" href="../../iterator/concepts/random_access_iterator.html" title="Random Access Iterator">Random
           Access Iterator</a>. It guarantees constant time access to arbitrary
           sequence elements.
         </p>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.random_access_sequence.refinement_of"></a><h5>
-<a name="id445915"></a>
-          <a href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.refinement_of">Refinement
-=======
 <a name="fusion.sequence.concepts.random_access_sequence.refinement_of"></a><h6>
-<a name="id650108"></a>
+<a name="id650173"></a>
           <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.refinement_of">Refinement
->>>>>>> .merge-right.r57125
           of</a>
-        </h5>
+        </h6>
 <p>
-          <a href="bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+          <a class="link" href="bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
           Sequence</a>
         </p>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
               A Random Access Sequence
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">S</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">S</span></code></span></dt>
 <dd><p>
               A Random Access Sequence type
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">N</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">N</span></code></span></dt>
 <dd><p>
               An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
               Integral Constant</a>
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">o</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">o</span></code></span></dt>
 <dd><p>
               An arbitrary object
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">e</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">e</span></code></span></dt>
 <dd><p>
               A Sequence element
             </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.random_access_sequence.valid_expressions"></a><h5>
-<a name="id446083"></a>
-          <a href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.valid_expressions">Valid
-=======
 <a name="fusion.sequence.concepts.random_access_sequence.valid_expressions"></a><h6>
-<a name="id650235"></a>
+<a name="id650300"></a>
           <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.valid_expressions">Valid
->>>>>>> .merge-right.r57125
           Expressions</a>
-        </h5>
+        </h6>
 <p>
-          In addition to the requirements defined in <a href="bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+          In addition to the requirements defined in <a class="link" href="bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
           Sequence</a>, for any Random Access Sequence the following must be met:
         </p>
 <div class="informaltable"><table class="table">
@@ -124,170 +89,215 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Return type
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Type Requirements
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Runtime Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">begin<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="../../iterator/concepts/random_access_iterator.html" title="Random
-        Access Iterator">Random
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="../../iterator/concepts/random_access_iterator.html" title="Random Access Iterator">Random
                   Access Iterator</a>
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">end<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  <a href="../../iterator/concepts/random_access_iterator.html" title="Random
-        Access Iterator">Random
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  <a class="link" href="../../iterator/concepts/random_access_iterator.html" title="Random Access Iterator">Random
                   Access Iterator</a>
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">at<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">at<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span>
-                  <span class="special">=</span> <span class="identifier">o</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span>
+                  <span class="special">=</span> <span class="identifier">o</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">s</span></tt> is mutable and
-                  <tt class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
-                  <span class="identifier">o</span></tt>, where <tt class="computeroutput"><span class="identifier">e</span></tt> is the first element in the
+                </p>
+                </td>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">s</span></code> is mutable and
+                  <code class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
+                  <span class="identifier">o</span></code>, where <code class="computeroutput"><span class="identifier">e</span></code> is the first element in the
                   sequence, is a valid expression.
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Constant
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.random_access_sequence.result_type_expressions"></a><h5>
-<a name="id446539"></a>
-          <a href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.result_type_expressions">Result
-=======
 <a name="fusion.sequence.concepts.random_access_sequence.result_type_expressions"></a><h6>
-<a name="id650574"></a>
+<a name="id650639"></a>
           <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.result_type_expressions">Result
->>>>>>> .merge-right.r57125
           Type Expressions</a>
-        </h5>
+        </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Compile Time Complexity
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::begin<span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::end<span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::at<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span>
-                  <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/at.html" title="at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span>
+                  <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput">result_of::value_at<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span>
-                  <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/value_at.html" title="value_at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span>
+                  <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Amortized constant time
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
 </table></div>
-<div class="sidebar"><p>
-          <span class="inlinemediaobject"><img src="images/note.png" alt="note"></span> <tt class="computeroutput">result_of::at<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;</span></tt> returns the actual type returned by
-          <tt class="computeroutput">at<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></tt>. In
+<div class="sidebar">
+<p class="title"><b></b></p>
+<p>
+          <span class="inlinemediaobject"><img src="../../../images/note.png" alt="note"></span> <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/at.html" title="at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;</span></code> returns the actual type returned by
+          <code class="computeroutput"><a class="link" href="../intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></code>. In
           most cases, this is a reference. Hence, there is no way to know the exact
-          element type using <tt class="computeroutput">result_of::at<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;</span></tt>.The element at <tt class="computeroutput"><span class="identifier">N</span></tt>
+          element type using <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/at.html" title="at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;</span></code>.The element at <code class="computeroutput"><span class="identifier">N</span></code>
           may actually be a reference to begin with. For this purpose, you can use
-<<<<<<< .working
-          <tt class="computeroutput">result_of::value_at<span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;</span></tt>.
-        </p></div>
-<a name="fusion.sequence.concepts.random_access_sequence.expression_semantics"></a><h5>
-<a name="id447167"></a>
-          <a href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.expression_semantics">Expression
-=======
           <code class="computeroutput"><a class="link" href="../intrinsic/metafunctions/value_at.html" title="value_at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at</span></code></a><span class="special">&lt;</span><span class="identifier">S</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;</span></code>.
         </p>
 </div>
 <a name="fusion.sequence.concepts.random_access_sequence.expression_semantics"></a><h6>
-<a name="id651020"></a>
+<a name="id651085"></a>
           <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.expression_semantics">Expression
->>>>>>> .merge-right.r57125
           Semantics</a>
-        </h5>
+        </h6>
 <p>
           The semantics of an expression are defined only where they differ from,
-          or are not defined in <a href="bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+          or are not defined in <a class="link" href="bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
           Sequence</a>.
         </p>
 <div class="informaltable"><table class="table">
@@ -296,37 +306,32 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Expression
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Semantics
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput">at<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></tt>
-                </p></td>
-<td><p>
-                  The Nth element from the beginning of the sequence; see at.
-                </p></td>
+<td>
+                <p>
+                  <code class="computeroutput"><a class="link" href="../intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  The Nth element from the beginning of the sequence; see <a class="link" href="../intrinsic/functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a>.
+                </p>
+                </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.sequence.concepts.random_access_sequence.models"></a><h5>
-<a name="id447327"></a>
-          Models
-        </h5>
-<div class="itemizedlist"><ul type="disc">
-<li>std::pair</li>
-<li>boost::array</li>
-<li>vector</li>
-<li>reverse_view</li>
-<li>
-iterator_range
-=======
 <a name="fusion.sequence.concepts.random_access_sequence.models"></a><h6>
-<a name="id651132"></a>
+<a name="id651197"></a>
           <a class="link" href="random_access_sequence.html#fusion.sequence.concepts.random_access_sequence.models">Models</a>
         </h6>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
@@ -336,22 +341,21 @@
 <li class="listitem"><a class="link" href="../../view/reverse_view.html" title="reverse_view"><code class="computeroutput"><span class="identifier">reverse_view</span></code></a></li>
 <li class="listitem">
 <a class="link" href="../../view/iterator_range.html" title="iterator_range"><code class="computeroutput"><span class="identifier">iterator_range</span></code></a>
->>>>>>> .merge-right.r57125
             (where adapted sequence is a Random Access Sequence)
           </li>
-<li>
-transform_view
+<li class="listitem">
+<a class="link" href="../../view/transform_view.html" title="transform_view"><code class="computeroutput"><span class="identifier">transform_view</span></code></a>
             (where adapted sequence is a Random Access Sequence)
           </li>
-<li>
-zip_view
-            (where adapted sequences are models Random Access Sequence)
+<li class="listitem">
+<a class="link" href="../../view/zip_view.html" title="zip_view"><code class="computeroutput"><span class="identifier">zip_view</span></code></a>
+            (where adapted sequences are models of Random Access Sequence)
           </li>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,19 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Intrinsic</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../sequence.html" title="Sequence">
-<link rel="previous" href="concepts/associative_sequence.html" title="Associative
-        Sequence">
+<link rel="prev" href="concepts/associative_sequence.html" title="Associative Sequence">
 <link rel="next" href="intrinsic/functions.html" title="Functions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -31,75 +22,34 @@
 <div class="spirit-nav">
 <a accesskey="p" href="concepts/associative_sequence.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../sequence.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="intrinsic/functions.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.sequence.intrinsic"></a>Intrinsic
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Intrinsic">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.sequence.intrinsic"></a><a class="link" href="intrinsic.html" title="Intrinsic">Intrinsic</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Functions</span></dt>
 <dt><span class="section">Metafunctions</span></dt>
 </dl></div>
 <p>
-        Intrinsic form the essential interface of every Fusion Sequence.
+        Intrinsic form the essential interface of every Fusion <a class="link" href="../sequence.html" title="Sequence">Sequence</a>.
         <a href="http://en.wikipedia.org/wiki/Standard_Template_Library" target="_top">STL</a>
         counterparts of these functions are usually implemented as member functions.
-<<<<<<< .working
-        Intrinsic functions, unlike Algorithms,
-        are not generic across the full Sequence
-        repertoire. They need to be implemented for each Fusion Sequence
-        <sup>[<a name="id449132" href="#ftn.id449132">5</a>]</sup>
-=======
         Intrinsic functions, unlike <a class="link" href="../algorithm.html" title="Algorithm">Algorithms</a>,
         are not generic across the full <a class="link" href="../sequence.html" title="Sequence">Sequence</a>
         repertoire. They need to be implemented for each Fusion <a class="link" href="../sequence.html" title="Sequence">Sequence</a>
-        <sup>[<a name="id660256" href="#ftn.id660256" class="footnote">5</a>]</sup>
->>>>>>> .merge-right.r57125
+        <sup>[<a name="id653702" href="#ftn.id653702" class="footnote">5</a>]</sup>
         .
       </p>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.header"></a><h4>
-<a name="id449150"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.sequence.intrinsic.header"></a><h5>
-<a name="id660268"></a>
+<a name="id653714"></a>
         <a class="link" href="intrinsic.html#fusion.sequence.intrinsic.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<div class="footnote"><p><sup>[<a name="ftn.id449132" href="#id449132">5</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id700405" href="#id700405" class="para">5</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id660036" href="#id660036" class="para">5</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id652390" href="#id652390" class="para">5</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id674871" href="#id674871" class="para">5</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id663532" href="#id663532" class="para">5</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id660256" href="#id660256" class="para">5</a>] </sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
->>>>>>> .merge-right.r57125
+<div class="footnote"><p><sup>[<a name="ftn.id653702" href="#id653702" class="para">5</a>] </sup>
             In practice, many of intrinsic functions have default implementations
             that will work in majority of cases
           </p></div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../intrinsic.html" title="Intrinsic">
-<link rel="previous" href="../intrinsic.html" title="Intrinsic">
+<link rel="prev" href="../intrinsic.html" title="Intrinsic">
 <link rel="next" href="functions/begin.html" title="begin">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../intrinsic.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../intrinsic.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="functions/begin.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.sequence.intrinsic.functions"></a>Functions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.sequence.intrinsic.functions"></a><a class="link" href="functions.html" title="Functions">Functions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">begin</span></dt>
 <dt><span class="section">end</span></dt>
@@ -49,7 +42,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>at</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="size.html" title="size">
+<link rel="prev" href="size.html" title="size">
 <link rel="next" href="at_c.html" title="at_c">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,110 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="size.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="at_c.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.at"></a>at
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="at">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.at"></a><a class="link" href="at.html" title="at">at</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.at.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id454767"></a>
-            Description
-=======
-<a name="id705408"></a>
-=======
-<a name="id667405"></a>
-=======
-<a name="id659759"></a>
-=======
-<a name="id679987"></a>
-=======
-<a name="id669280"></a>
-=======
-<a name="id666003"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id659450"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the N-th element from the beginning of the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.at.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id454796"></a>
-            Synopsis
-=======
-<a name="id705425"></a>
-=======
-<a name="id667421"></a>
-=======
-<a name="id659776"></a>
-=======
-<a name="id680004"></a>
-=======
-<a name="id669297"></a>
-=======
-<a name="id666020"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id659466"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">N</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::at<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/at.html" title="at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">at</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">N</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::at<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/at.html" title="at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">at</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.at.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id455124"></a>
-            Parameters
-=======
-<a name="id705658"></a>
-=======
-<a name="id667791"></a>
-=======
-<a name="id660145"></a>
-=======
-<a name="id681534"></a>
-=======
-<a name="id671305"></a>
-=======
-<a name="id668028"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id661475"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,157 +56,99 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/random_access_sequence.html" title="Random Access Sequence">Random
                     Access Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence we wish to investigate.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">N</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">N</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
                     Integral Constant</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     An index from the beginning of the sequence.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.at.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id455282"></a>
-            <a href="at.html#fusion.sequence.intrinsic.functions.at.expression_semantics">Expression
-=======
-<a name="id705783"></a>
-=======
-<a name="id667916"></a>
-=======
-<a name="id660270"></a>
-=======
-<a name="id681659"></a>
-=======
-<a name="id671430"></a>
-=======
-<a name="id668153"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id661600"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">at</span><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Returns a reference to
-            the N-th element from the beginning of the sequence <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            if <tt class="computeroutput"><span class="identifier">seq</span></tt> is mutable and
-            <tt class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
-            <span class="identifier">o</span></tt>, where <tt class="computeroutput"><span class="identifier">e</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: Returns a reference to
+            the N-th element from the beginning of the sequence <code class="computeroutput"><span class="identifier">seq</span></code>
+            if <code class="computeroutput"><span class="identifier">seq</span></code> is mutable and
+            <code class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
+            <span class="identifier">o</span></code>, where <code class="computeroutput"><span class="identifier">e</span></code>
             is the N-th element from the beginning of the sequence, is a valid expression.
             Else, returns a type convertable to the N-th element from the beginning
             of the sequence.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: <tt class="computeroutput"><span class="number">0</span>
-            <span class="special">&lt;=</span> <span class="identifier">N</span><span class="special">::</span><span class="identifier">value</span> <span class="special">&lt;</span> size<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
+            <span class="bold"><strong>Precondition</strong></span>: <code class="computeroutput"><span class="number">0</span>
+            <span class="special">&lt;=</span> <span class="identifier">N</span><span class="special">::</span><span class="identifier">value</span> <span class="special">&lt;</span> <a class="link" href="size.html" title="size"><code class="computeroutput"><span class="identifier">size</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Equivalent to
+            <span class="bold"><strong>Semantics</strong></span>: Equivalent to
           </p>
-<pre class="programlisting">deref<span class="special">(</span>advance<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span>begin<span class="special">(</span><span class="identifier">s</span><span class="special">)))</span>
+<pre class="programlisting"><a class="link" href="../../../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="../../../iterator/functions/advance.html" title="advance"><code class="computeroutput"><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><a class="link" href="begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)))</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.at.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id455597"></a>
-            Header
-=======
-<a name="id705993"></a>
-=======
-<a name="id668126"></a>
-=======
-<a name="id660480"></a>
-=======
-<a name="id681869"></a>
-=======
-<a name="id671640"></a>
-=======
-<a name="id668363"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id661810"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.at.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id455760"></a>
-            Example
-=======
-<a name="id706108"></a>
-=======
-<a name="id668241"></a>
-=======
-<a name="id660595"></a>
-=======
-<a name="id681984"></a>
-=======
-<a name="id671755"></a>
-=======
-<a name="id668478"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id661925"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.functions.at.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">at</span><span class="special">&lt;</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;</span> <span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_c.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_c.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_c.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>at_c</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="at.html" title="at">
+<link rel="prev" href="at.html" title="at">
 <link rel="next" href="has_key.html" title="has_key">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,110 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="at.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="has_key.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.at_c"></a>at_c
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="at_c">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.at_c"></a><a class="link" href="at_c.html" title="at_c">at_c</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.at_c.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id455987"></a>
-            Description
-=======
-<a name="id706268"></a>
-=======
-<a name="id668401"></a>
-=======
-<a name="id660755"></a>
-=======
-<a name="id682144"></a>
-=======
-<a name="id671915"></a>
-=======
-<a name="id668638"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id662084"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the N-th element from the beginning of the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.at_c.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id456017"></a>
-            Synopsis
-=======
-<a name="id708606"></a>
-=======
-<a name="id668418"></a>
-=======
-<a name="id660772"></a>
-=======
-<a name="id682161"></a>
-=======
-<a name="id671932"></a>
-=======
-<a name="id668655"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id662101"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">int</span> <span class="identifier">N</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::at_c<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">at_c</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">int</span> <span class="identifier">N</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::at_c<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">at_c</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.at_c.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id456348"></a>
-            Parameters
-=======
-<a name="id708839"></a>
-=======
-<a name="id668650"></a>
-=======
-<a name="id661005"></a>
-=======
-<a name="id682393"></a>
-=======
-<a name="id672164"></a>
-=======
-<a name="id668888"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id662334"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,157 +56,99 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/random_access_sequence.html" title="Random Access Sequence">Random
                     Access Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence we wish to investigate.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">N</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">N</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     An integral constant
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     An index from the beginning of the sequence.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.at_c.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id456499"></a>
-            <a href="at_c.html#fusion.sequence.intrinsic.functions.at_c.expression_semantics">Expression
-=======
-<a name="id708960"></a>
-=======
-<a name="id668772"></a>
-=======
-<a name="id661126"></a>
-=======
-<a name="id682515"></a>
-=======
-<a name="id672286"></a>
-=======
-<a name="id669009"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id662455"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">at_c</span><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Returns a reference to
-            the N-th element from the beginning of the sequence <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            if <tt class="computeroutput"><span class="identifier">seq</span></tt> is mutable and
-            <tt class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
-            <span class="identifier">o</span></tt>, where <tt class="computeroutput"><span class="identifier">e</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: Returns a reference to
+            the N-th element from the beginning of the sequence <code class="computeroutput"><span class="identifier">seq</span></code>
+            if <code class="computeroutput"><span class="identifier">seq</span></code> is mutable and
+            <code class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
+            <span class="identifier">o</span></code>, where <code class="computeroutput"><span class="identifier">e</span></code>
             is the N-th element from the beginning of the sequence, is a valid expression.
             Else, returns a type convertable to the N-th element from the beginning
             of the sequence.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: <tt class="computeroutput"><span class="number">0</span>
+            <span class="bold"><strong>Precondition</strong></span>: <code class="computeroutput"><span class="number">0</span>
             <span class="special">&lt;=</span> <span class="identifier">N</span>
-            <span class="special">&lt;</span> size<span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
+            <span class="special">&lt;</span> <a class="link" href="size.html" title="size"><code class="computeroutput"><span class="identifier">size</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Equivalent to
+            <span class="bold"><strong>Semantics</strong></span>: Equivalent to
           </p>
-<pre class="programlisting">deref<span class="special">(</span>advance<span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span>begin<span class="special">(</span><span class="identifier">s</span><span class="special">)))</span>
+<pre class="programlisting"><a class="link" href="../../../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="../../../iterator/functions/advance.html" title="advance"><code class="computeroutput"><span class="identifier">advance</span></code></a><span class="special">&lt;</span><span class="identifier">N</span><span class="special">&gt;(</span><a class="link" href="begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a><span class="special">(</span><span class="identifier">s</span><span class="special">)))</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.at_c.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id456804"></a>
-            Header
-=======
-<a name="id709163"></a>
-=======
-<a name="id668974"></a>
-=======
-<a name="id661329"></a>
-=======
-<a name="id682717"></a>
-=======
-<a name="id672488"></a>
-=======
-<a name="id669212"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id662658"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at_c</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">at_c</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.at_c.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id456970"></a>
-            Example
-=======
-<a name="id709278"></a>
-=======
-<a name="id669090"></a>
-=======
-<a name="id661444"></a>
-=======
-<a name="id682833"></a>
-=======
-<a name="id672604"></a>
-=======
-<a name="id669327"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id662773"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.functions.at_c.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">at_c</span><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">2</span><span class="special">);</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_key.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/at_key.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>at_key</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="has_key.html" title="has_key">
+<link rel="prev" href="has_key.html" title="has_key">
 <link rel="next" href="swap.html" title="swap">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,110 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="has_key.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="swap.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.at_key"></a>at_key
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="at_key">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.at_key"></a><a class="link" href="at_key.html" title="at_key">at_key</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.at_key.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id458062"></a>
-            Description
-=======
-<a name="id710034"></a>
-=======
-<a name="id669846"></a>
-=======
-<a name="id662200"></a>
-=======
-<a name="id683589"></a>
-=======
-<a name="id673360"></a>
-=======
-<a name="id670083"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id663530"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the element associated with a Key from the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.at_key.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id458092"></a>
-            Synopsis
-=======
-<a name="id710051"></a>
-=======
-<a name="id669862"></a>
-=======
-<a name="id662217"></a>
-=======
-<a name="id683605"></a>
-=======
-<a name="id673377"></a>
-=======
-<a name="id670100"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id663546"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Key</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::at_key<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">at_key</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Key</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::at_key<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">at_key</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.at_key.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id458422"></a>
-            Parameters
-=======
-<a name="id710284"></a>
-=======
-<a name="id671188"></a>
-=======
-<a name="id663542"></a>
-=======
-<a name="id683839"></a>
-=======
-<a name="id673610"></a>
-=======
-<a name="id670333"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id663779"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,153 +56,95 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/associative_sequence.html" title="Associative Sequence">Associative
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence we wish to investigate.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">Key</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">Key</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The queried key.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.at_key.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id458572"></a>
-            <a href="at_key.html#fusion.sequence.intrinsic.functions.at_key.expression_semantics">Expression
-=======
-<a name="id710405"></a>
-=======
-<a name="id671309"></a>
-=======
-<a name="id663663"></a>
-=======
-<a name="id683960"></a>
-=======
-<a name="id673731"></a>
-=======
-<a name="id670454"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id663900"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">at_key</span><span class="special">&lt;</span><span class="identifier">Key</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Returns a reference to
-            the element associated with Key from the sequence <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            if <tt class="computeroutput"><span class="identifier">seq</span></tt> is mutable and
-            <tt class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
-            <span class="identifier">o</span></tt>, where <tt class="computeroutput"><span class="identifier">e</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: Returns a reference to
+            the element associated with Key from the sequence <code class="computeroutput"><span class="identifier">seq</span></code>
+            if <code class="computeroutput"><span class="identifier">seq</span></code> is mutable and
+            <code class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
+            <span class="identifier">o</span></code>, where <code class="computeroutput"><span class="identifier">e</span></code>
             is the element associated with Key, is a valid expression. Else, returns
             a type convertable to the element associated with Key.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: <tt class="computeroutput"><span class="identifier">has_key</span><span class="special">&lt;</span><span class="identifier">Key</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">true</span></tt>
+            <span class="bold"><strong>Precondition</strong></span>: <code class="computeroutput"><span class="identifier">has_key</span><span class="special">&lt;</span><span class="identifier">Key</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">true</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the element associated
+            <span class="bold"><strong>Semantics</strong></span>: Returns the element associated
             with Key.
           </p>
 <a name="fusion.sequence.intrinsic.functions.at_key.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id458777"></a>
-            Header
-=======
-<a name="id710545"></a>
-=======
-<a name="id671450"></a>
-=======
-<a name="id663804"></a>
-=======
-<a name="id684100"></a>
-=======
-<a name="id673871"></a>
-=======
-<a name="id670594"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id664041"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.at_key.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id458943"></a>
-            Example
-=======
-<a name="id710660"></a>
-=======
-<a name="id671565"></a>
-=======
-<a name="id663919"></a>
-=======
-<a name="id684216"></a>
-=======
-<a name="id673986"></a>
-=======
-<a name="id670710"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id664156"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.functions.at_key.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">set<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">bool</span><span class="special">&gt;</span> <span class="identifier">s</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="keyword">true</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">bool</span><span class="special">&gt;</span> <span class="identifier">s</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="keyword">true</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">at_key</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span> <span class="special">==</span> <span class="char">'x'</span><span class="special">);</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/back.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/back.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>back</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="front.html" title="front">
+<link rel="prev" href="front.html" title="front">
 <link rel="next" href="size.html" title="size">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,110 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="front.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="size.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.back"></a>back
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="back">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.back"></a><a class="link" href="back.html" title="back">back</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.back.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id453047"></a>
-            Description
-=======
-<a name="id704208"></a>
-=======
-<a name="id666205"></a>
-=======
-<a name="id658559"></a>
-=======
-<a name="id678787"></a>
-=======
-<a name="id668080"></a>
-=======
-<a name="id664803"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id658250"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the last element in the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.back.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id453076"></a>
-            Synopsis
-=======
-<a name="id704225"></a>
-=======
-<a name="id666221"></a>
-=======
-<a name="id658576"></a>
-=======
-<a name="id678804"></a>
-=======
-<a name="id668097"></a>
-=======
-<a name="id664820"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id658266"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::back<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/back.html" title="back"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">back</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">back</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::back<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/back.html" title="back"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">back</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">back</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.back.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id453351"></a>
-            Parameters
-=======
-<a name="id704415"></a>
-=======
-<a name="id666411"></a>
-=======
-<a name="id658765"></a>
-=======
-<a name="id678993"></a>
-=======
-<a name="id668286"></a>
-=======
-<a name="id665010"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id658456"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,140 +56,76 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence we wish to investigate.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.back.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id453464"></a>
-            <a href="back.html#fusion.sequence.intrinsic.functions.back.expression_semantics">Expression
-=======
-<a name="id704505"></a>
-=======
-<a name="id666501"></a>
-=======
-<a name="id658855"></a>
-=======
-<a name="id679083"></a>
-=======
-<a name="id668376"></a>
-=======
-<a name="id665100"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id658546"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">back</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Returns a reference to
-            the last element in the sequence <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            if <tt class="computeroutput"><span class="identifier">seq</span></tt> is mutable and
-            <tt class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
-            <span class="identifier">o</span></tt>, where <tt class="computeroutput"><span class="identifier">e</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: Returns a reference to
+            the last element in the sequence <code class="computeroutput"><span class="identifier">seq</span></code>
+            if <code class="computeroutput"><span class="identifier">seq</span></code> is mutable and
+            <code class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
+            <span class="identifier">o</span></code>, where <code class="computeroutput"><span class="identifier">e</span></code>
             is the last element in the sequence, is a valid expression. Else, returns
             a type convertable to the last element in the sequence.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: <tt class="computeroutput">empty<span class="special">(</span><span class="identifier">seq</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">false</span></tt>
+            <span class="bold"><strong>Precondition</strong></span>: <code class="computeroutput"><a class="link" href="empty.html" title="empty"><code class="computeroutput"><span class="identifier">empty</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">false</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the last element
+            <span class="bold"><strong>Semantics</strong></span>: Returns the last element
             in the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.back.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id453659"></a>
-            Header
-=======
-<a name="id704636"></a>
-=======
-<a name="id666632"></a>
-=======
-<a name="id658986"></a>
-=======
-<a name="id679214"></a>
-=======
-<a name="id668507"></a>
-=======
-<a name="id665230"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id658677"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.back.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id453825"></a>
-            Example
-=======
-<a name="id704751"></a>
-=======
-<a name="id666747"></a>
-=======
-<a name="id659101"></a>
-=======
-<a name="id679329"></a>
-=======
-<a name="id668622"></a>
-=======
-<a name="id665346"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id658792"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.functions.back.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">back</span><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/begin.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/begin.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/begin.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>begin</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="../functions.html" title="Functions">
+<link rel="prev" href="../functions.html" title="Functions">
 <link rel="next" href="end.html" title="end">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,110 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../functions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="end.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.begin"></a>begin
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="begin">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.begin"></a><a class="link" href="begin.html" title="begin">begin</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.begin.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id449344"></a>
-            Description
-=======
-<a name="id700544"></a>
-=======
-<a name="id660175"></a>
-=======
-<a name="id652529"></a>
-=======
-<a name="id675010"></a>
-=======
-<a name="id663672"></a>
-=======
-<a name="id660395"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id653841"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns an iterator pointing to the first element in the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.begin.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id449373"></a>
-            Synopsis
-=======
-<a name="id700561"></a>
-=======
-<a name="id660192"></a>
-=======
-<a name="id652546"></a>
-=======
-<a name="id675027"></a>
-=======
-<a name="id663688"></a>
-=======
-<a name="id660412"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id653858"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::begin<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">begin</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::begin<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">begin</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.begin.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id449647"></a>
-            Parameters
-=======
-<a name="id700751"></a>
-=======
-<a name="id660381"></a>
-=======
-<a name="id652735"></a>
-=======
-<a name="id675216"></a>
-=======
-<a name="id663878"></a>
-=======
-<a name="id660601"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id654048"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,83 +56,50 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence we wish to get an iterator from.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.begin.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id449760"></a>
-            <a href="begin.html#fusion.sequence.intrinsic.functions.begin.expression_semantics">Expression
-=======
-<a name="id700851"></a>
-=======
-<a name="id660471"></a>
-=======
-<a name="id652825"></a>
-=======
-<a name="id675306"></a>
-=======
-<a name="id663968"></a>
-=======
-<a name="id660691"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id654138"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">begin</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
-            Iterator</a> if <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            is a <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a> else, <a href="../../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
-            Iterator</a> if <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            is a <a href="../../concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-            Sequence</a> else, <a href="../../../iterator/concepts/random_access_iterator.html" title="Random
-        Access Iterator">Random
-            Access Iterator</a> if <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            is a <a href="../../concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-            Access Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -241,72 +122,22 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns an iterator pointing
+            <span class="bold"><strong>Semantics</strong></span>: Returns an iterator pointing
             to the first element in the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.begin.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id449927"></a>
-            Header
-=======
-<a name="id700953"></a>
-=======
-<a name="id660601"></a>
-=======
-<a name="id652955"></a>
-=======
-<a name="id675436"></a>
-=======
-<a name="id664098"></a>
-=======
-<a name="id660821"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id654267"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">begin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">begin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.begin.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id450094"></a>
-            Example
-=======
-<a name="id701068"></a>
-=======
-<a name="id660716"></a>
-=======
-<a name="id653070"></a>
-=======
-<a name="id675551"></a>
-=======
-<a name="id664213"></a>
-=======
-<a name="id660936"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id654382"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.functions.begin.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span><span class="identifier">begin</span><span class="special">(</span><span class="identifier">v</span><span class="special">))</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="../../../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><span class="identifier">begin</span><span class="special">(</span><span class="identifier">v</span><span class="special">))</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/empty.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/empty.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/empty.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>empty</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="end.html" title="end">
+<link rel="prev" href="end.html" title="end">
 <link rel="next" href="front.html" title="front">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,108 +22,30 @@
 <div class="spirit-nav">
 <a accesskey="p" href="end.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="front.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.empty"></a>empty
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="empty">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.empty"></a><a class="link" href="empty.html" title="empty">empty</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.empty.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id451280"></a>
-            Description
-=======
-<a name="id701884"></a>
-=======
-<a name="id661560"></a>
-=======
-<a name="id653914"></a>
-=======
-<a name="id676395"></a>
-=======
-<a name="id665056"></a>
-=======
-<a name="id661780"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id655226"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns a type convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>
-            that evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt> if
-            the sequence is empty, else, evaluates to <tt class="computeroutput"><span class="keyword">false</span></tt>.
+            Returns a type convertible to <code class="computeroutput"><span class="keyword">bool</span></code>
+            that evaluates to <code class="computeroutput"><span class="keyword">true</span></code> if
+            the sequence is empty, else, evaluates to <code class="computeroutput"><span class="keyword">false</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.functions.empty.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id451345"></a>
-            Synopsis
-=======
-<a name="id701924"></a>
-=======
-<a name="id661599"></a>
-=======
-<a name="id653953"></a>
-=======
-<a name="id676434"></a>
-=======
-<a name="id665096"></a>
-=======
-<a name="id661819"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id655266"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::empty<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/empty.html" title="empty"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">empty</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">empty</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.empty.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id451498"></a>
-            Parameters
-=======
-<a name="id702027"></a>
-=======
-<a name="id661702"></a>
-=======
-<a name="id654056"></a>
-=======
-<a name="id676538"></a>
-=======
-<a name="id665199"></a>
-=======
-<a name="id661922"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id655369"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -140,131 +54,67 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence we wish to investigate.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.empty.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id451612"></a>
-            <a href="empty.html#fusion.sequence.intrinsic.functions.empty.expression_semantics">Expression
-=======
-<a name="id702117"></a>
-=======
-<a name="id661792"></a>
-=======
-<a name="id654146"></a>
-=======
-<a name="id676628"></a>
-=======
-<a name="id665289"></a>
-=======
-<a name="id662012"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id655459"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">empty</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: Convertible to <code class="computeroutput"><span class="keyword">bool</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt> if the sequence is empty, else, evaluates
-            to <tt class="computeroutput"><span class="keyword">false</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Evaluates to <code class="computeroutput"><span class="keyword">true</span></code> if the sequence is empty, else, evaluates
+            to <code class="computeroutput"><span class="keyword">false</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.functions.empty.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id451723"></a>
-            Header
-=======
-<a name="id702192"></a>
-=======
-<a name="id661867"></a>
-=======
-<a name="id654221"></a>
-=======
-<a name="id676702"></a>
-=======
-<a name="id665364"></a>
-=======
-<a name="id662087"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id655533"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">empty</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">empty</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.empty.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id451890"></a>
-            Example
-=======
-<a name="id702307"></a>
-=======
-<a name="id661982"></a>
-=======
-<a name="id654336"></a>
-=======
-<a name="id677978"></a>
-=======
-<a name="id667271"></a>
-=======
-<a name="id663994"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id657441"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.functions.empty.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">empty</span><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">false</span><span class="special">);</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/end.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/end.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/end.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>end</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="begin.html" title="begin">
+<link rel="prev" href="begin.html" title="begin">
 <link rel="next" href="empty.html" title="empty">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,110 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="begin.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="empty.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.end"></a>end
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="end">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.end"></a><a class="link" href="end.html" title="end">end</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.end.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id450304"></a>
-            Description
-=======
-<a name="id701214"></a>
-=======
-<a name="id660861"></a>
-=======
-<a name="id653215"></a>
-=======
-<a name="id675696"></a>
-=======
-<a name="id664358"></a>
-=======
-<a name="id661081"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id654528"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns an iterator pointing to one element past the end of the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.end.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id450334"></a>
-            Synopsis
-=======
-<a name="id701230"></a>
-=======
-<a name="id660878"></a>
-=======
-<a name="id653232"></a>
-=======
-<a name="id675713"></a>
-=======
-<a name="id664375"></a>
-=======
-<a name="id661098"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id654544"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::end<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">end</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::end<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">end</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.end.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id450606"></a>
-            Parameters
-=======
-<a name="id701420"></a>
-=======
-<a name="id661068"></a>
-=======
-<a name="id653422"></a>
-=======
-<a name="id675903"></a>
-=======
-<a name="id664564"></a>
-=======
-<a name="id661288"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id654734"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,83 +56,50 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence we wish to get an iterator from.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.end.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id450718"></a>
-            <a href="end.html#fusion.sequence.intrinsic.functions.end.expression_semantics">Expression
-=======
-<a name="id701510"></a>
-=======
-<a name="id661158"></a>
-=======
-<a name="id653512"></a>
-=======
-<a name="id675993"></a>
-=======
-<a name="id664654"></a>
-=======
-<a name="id661378"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id654824"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">end</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: <a href="../../../iterator/concepts/forward_iterator.html" title="Forward
-        Iterator">Forward
-            Iterator</a> if <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            is a <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-            Sequence</a> else, <a href="../../../iterator/concepts/bidirectional_iterator.html" title="Bidirectional
-        Iterator">Bidirectional
-            Iterator</a> if <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            is a <a href="../../concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-            Sequence</a> else, <a href="../../../iterator/concepts/random_access_iterator.html" title="Random
-        Access Iterator">Random
-            Access Iterator</a> if <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            is a <a href="../../concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-            Access Sequence</a>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -241,72 +122,22 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns an iterator pointing
+            <span class="bold"><strong>Semantics</strong></span>: Returns an iterator pointing
             to one element past the end of the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.end.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id450886"></a>
-            Header
-=======
-<a name="id701612"></a>
-=======
-<a name="id661287"></a>
-=======
-<a name="id653641"></a>
-=======
-<a name="id676122"></a>
-=======
-<a name="id664784"></a>
-=======
-<a name="id661507"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id654954"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">end</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">end</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.end.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id451051"></a>
-            Example
-=======
-<a name="id701727"></a>
-=======
-<a name="id661402"></a>
-=======
-<a name="id653756"></a>
-=======
-<a name="id676238"></a>
-=======
-<a name="id664899"></a>
-=======
-<a name="id661622"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id655069"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.functions.end.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span>deref<span class="special">(</span>prior<span class="special">(</span><span class="identifier">end</span><span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
+<span class="identifier">assert</span><span class="special">(</span><a class="link" href="../../../iterator/functions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">deref</span></code></a><span class="special">(</span><a class="link" href="../../../iterator/functions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">prior</span></code></a><span class="special">(</span><span class="identifier">end</span><span class="special">(</span><span class="identifier">v</span><span class="special">)))</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/front.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/front.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>front</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="empty.html" title="empty">
+<link rel="prev" href="empty.html" title="empty">
 <link rel="next" href="back.html" title="back">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,110 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="empty.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="back.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.front"></a>front
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="front">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.front"></a><a class="link" href="front.html" title="front">front</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.front.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id452080"></a>
-            Description
-=======
-<a name="id702440"></a>
-=======
-<a name="id665529"></a>
-=======
-<a name="id657883"></a>
-=======
-<a name="id678111"></a>
-=======
-<a name="id667404"></a>
-=======
-<a name="id664128"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id657574"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the first element in the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.front.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id452109"></a>
-            Synopsis
-=======
-<a name="id702457"></a>
-=======
-<a name="id665546"></a>
-=======
-<a name="id657900"></a>
-=======
-<a name="id678128"></a>
-=======
-<a name="id667421"></a>
-=======
-<a name="id664144"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id657591"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::front<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/front.html" title="front"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">front</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">front</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::front<span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/front.html" title="front"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">front</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">front</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.front.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id452384"></a>
-            Parameters
-=======
-<a name="id702646"></a>
-=======
-<a name="id665735"></a>
-=======
-<a name="id658090"></a>
-=======
-<a name="id678318"></a>
-=======
-<a name="id667611"></a>
-=======
-<a name="id664334"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id657780"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -142,140 +56,76 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence we wish to investigate.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.front.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id452497"></a>
-            <a href="front.html#fusion.sequence.intrinsic.functions.front.expression_semantics">Expression
-=======
-<a name="id702736"></a>
-=======
-<a name="id665825"></a>
-=======
-<a name="id658180"></a>
-=======
-<a name="id678408"></a>
-=======
-<a name="id667701"></a>
-=======
-<a name="id664424"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id657870"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">front</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Returns a reference to
-            the first element in the sequence <tt class="computeroutput"><span class="identifier">seq</span></tt>
-            if <tt class="computeroutput"><span class="identifier">seq</span></tt> is mutable and
-            <tt class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
-            <span class="identifier">o</span></tt>, where <tt class="computeroutput"><span class="identifier">e</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: Returns a reference to
+            the first element in the sequence <code class="computeroutput"><span class="identifier">seq</span></code>
+            if <code class="computeroutput"><span class="identifier">seq</span></code> is mutable and
+            <code class="computeroutput"><span class="identifier">e</span> <span class="special">=</span>
+            <span class="identifier">o</span></code>, where <code class="computeroutput"><span class="identifier">e</span></code>
             is the first element in the sequence, is a valid expression. Else, returns
             a type convertable to the first element in the sequence.
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: <tt class="computeroutput">empty<span class="special">(</span><span class="identifier">seq</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">false</span></tt>
+            <span class="bold"><strong>Precondition</strong></span>: <code class="computeroutput"><a class="link" href="empty.html" title="empty"><code class="computeroutput"><span class="identifier">empty</span></code></a><span class="special">(</span><span class="identifier">seq</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">false</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the first element
+            <span class="bold"><strong>Semantics</strong></span>: Returns the first element
             in the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.front.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id452690"></a>
-            Header
-=======
-<a name="id702867"></a>
-=======
-<a name="id665956"></a>
-=======
-<a name="id658310"></a>
-=======
-<a name="id678539"></a>
-=======
-<a name="id667832"></a>
-=======
-<a name="id664555"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id658001"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.front.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id452856"></a>
-            Example
-=======
-<a name="id702982"></a>
-=======
-<a name="id666071"></a>
-=======
-<a name="id658426"></a>
-=======
-<a name="id678654"></a>
-=======
-<a name="id667947"></a>
-=======
-<a name="id664670"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id658116"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.functions.front.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">front</span><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">1</span><span class="special">);</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/has_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/has_key.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/has_key.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>has_key</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="at_c.html" title="at_c">
+<link rel="prev" href="at_c.html" title="at_c">
 <link rel="next" href="at_key.html" title="at_key">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,109 +22,31 @@
 <div class="spirit-nav">
 <a accesskey="p" href="at_c.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="at_key.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.has_key"></a>has_key
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="has_key">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.has_key"></a><a class="link" href="has_key.html" title="has_key">has_key</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.has_key.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id457172"></a>
-            Description
-=======
-<a name="id709418"></a>
-=======
-<a name="id669230"></a>
-=======
-<a name="id661584"></a>
-=======
-<a name="id682973"></a>
-=======
-<a name="id672744"></a>
-=======
-<a name="id669467"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id662914"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns a type convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>
-            that evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt> if
+            Returns a type convertible to <code class="computeroutput"><span class="keyword">bool</span></code>
+            that evaluates to <code class="computeroutput"><span class="keyword">true</span></code> if
             the sequence contains an element associated with a Key, else, evaluates
-            to <tt class="computeroutput"><span class="keyword">false</span></tt>.
+            to <code class="computeroutput"><span class="keyword">false</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.functions.has_key.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id457238"></a>
-            Synopsis
-=======
-<a name="id709457"></a>
-=======
-<a name="id669268"></a>
-=======
-<a name="id661623"></a>
-=======
-<a name="id683011"></a>
-=======
-<a name="id672782"></a>
-=======
-<a name="id669506"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id662952"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Key</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::has_key<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/has_key.html" title="has_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">has_key</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">has_key</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.has_key.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id457419"></a>
-            Parameters
-=======
-<a name="id709582"></a>
-=======
-<a name="id669393"></a>
-=======
-<a name="id661747"></a>
-=======
-<a name="id683136"></a>
-=======
-<a name="id672907"></a>
-=======
-<a name="id669630"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id663077"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -141,144 +55,86 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/associative_sequence.html" title="Associative
-        Sequence">Associative
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/associative_sequence.html" title="Associative Sequence">Associative
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence we wish to investigate.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">Key</span></tt>
-                  </p></td>
-<td><p>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">Key</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Any type
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The queried key.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.has_key.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id457572"></a>
-            <a href="has_key.html#fusion.sequence.intrinsic.functions.has_key.expression_semantics">Expression
-=======
-<a name="id709700"></a>
-=======
-<a name="id669512"></a>
-=======
-<a name="id661866"></a>
-=======
-<a name="id683255"></a>
-=======
-<a name="id673026"></a>
-=======
-<a name="id669749"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id663196"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">has_key</span><span class="special">&lt;</span><span class="identifier">Key</span><span class="special">&gt;(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: Convertible to <code class="computeroutput"><span class="keyword">bool</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Evaluates to <tt class="computeroutput"><span class="keyword">true</span></tt> if the sequence contains an element
-            associated with Key, else, evaluates to <tt class="computeroutput"><span class="keyword">false</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Evaluates to <code class="computeroutput"><span class="keyword">true</span></code> if the sequence contains an element
+            associated with Key, else, evaluates to <code class="computeroutput"><span class="keyword">false</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.functions.has_key.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id457693"></a>
-            Header
-=======
-<a name="id709778"></a>
-=======
-<a name="id669590"></a>
-=======
-<a name="id661944"></a>
-=======
-<a name="id683333"></a>
-=======
-<a name="id673104"></a>
-=======
-<a name="id669827"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id663274"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">has_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">has_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.has_key.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id457859"></a>
-            Example
-=======
-<a name="id709894"></a>
-=======
-<a name="id669705"></a>
-=======
-<a name="id662059"></a>
-=======
-<a name="id683448"></a>
-=======
-<a name="id673219"></a>
-=======
-<a name="id669942"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id663389"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.functions.has_key.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">set<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">bool</span><span class="special">&gt;</span> <span class="identifier">s</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="keyword">true</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/set.html" title="set"><code class="computeroutput"><span class="identifier">set</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">bool</span><span class="special">&gt;</span> <span class="identifier">s</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="keyword">true</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">has_key</span><span class="special">&lt;</span><span class="keyword">char</span><span class="special">&gt;(</span><span class="identifier">s</span><span class="special">)</span> <span class="special">==</span> <span class="keyword">true</span><span class="special">);</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/size.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/size.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/size.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>size</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="back.html" title="back">
+<link rel="prev" href="back.html" title="back">
 <link rel="next" href="at.html" title="at">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,107 +22,29 @@
 <div class="spirit-nav">
 <a accesskey="p" href="back.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="at.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.size"></a>size
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="size">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.size"></a><a class="link" href="size.html" title="size">size</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.size.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id454017"></a>
-            Description
-=======
-<a name="id704884"></a>
-=======
-<a name="id666880"></a>
-=======
-<a name="id659234"></a>
-=======
-<a name="id679463"></a>
-=======
-<a name="id668756"></a>
-=======
-<a name="id665479"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id658925"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns a type convertible to <tt class="computeroutput"><span class="keyword">int</span></tt>
+            Returns a type convertible to <code class="computeroutput"><span class="keyword">int</span></code>
             that evaluates the number of elements in the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.size.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id454060"></a>
-            Synopsis
-=======
-<a name="id704908"></a>
-=======
-<a name="id666904"></a>
-=======
-<a name="id659258"></a>
-=======
-<a name="id679487"></a>
-=======
-<a name="id668780"></a>
-=======
-<a name="id665503"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id658949"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
-<span class="keyword">typename</span> result_of::size<span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
+<span class="keyword">typename</span> <a class="link" href="../metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">size</span><span class="special">(</span><span class="identifier">Sequence</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.size.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id454212"></a>
-            Parameters
-=======
-<a name="id705011"></a>
-=======
-<a name="id667007"></a>
-=======
-<a name="id659362"></a>
-=======
-<a name="id679590"></a>
-=======
-<a name="id668883"></a>
-=======
-<a name="id665606"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id659052"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -139,131 +53,67 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq</span></tt>
-                  </p></td>
-<td><p>
-                    Model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence we wish to investigate.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.size.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id454326"></a>
-            <a href="size.html#fusion.sequence.intrinsic.functions.size.expression_semantics">Expression
-=======
-<a name="id705101"></a>
-=======
-<a name="id667097"></a>
-=======
-<a name="id659452"></a>
-=======
-<a name="id679680"></a>
-=======
-<a name="id668973"></a>
-=======
-<a name="id665696"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id659142"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">size</span><span class="special">(</span><span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Convertible to <tt class="computeroutput"><span class="keyword">int</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: Convertible to <code class="computeroutput"><span class="keyword">int</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the number of elements
+            <span class="bold"><strong>Semantics</strong></span>: Returns the number of elements
             in the sequence.
           </p>
 <a name="fusion.sequence.intrinsic.functions.size.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id454412"></a>
-            Header
-=======
-<a name="id705160"></a>
-=======
-<a name="id667156"></a>
-=======
-<a name="id659510"></a>
-=======
-<a name="id679739"></a>
-=======
-<a name="id669032"></a>
-=======
-<a name="id665755"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id659201"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">size</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">size</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.size.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id454577"></a>
-            Example
-=======
-<a name="id705275"></a>
-=======
-<a name="id667271"></a>
-=======
-<a name="id659626"></a>
-=======
-<a name="id679854"></a>
-=======
-<a name="id669147"></a>
-=======
-<a name="id665870"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id659316"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.functions.size.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">3</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">size</span><span class="special">(</span><span class="identifier">v</span><span class="special">)</span> <span class="special">==</span> <span class="number">3</span><span class="special">);</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/swap.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/swap.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/functions/swap.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>swap</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../functions.html" title="Functions">
-<link rel="previous" href="at_key.html" title="at_key">
+<link rel="prev" href="at_key.html" title="at_key">
 <link rel="next" href="../metafunctions.html" title="Metafunctions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,105 +22,27 @@
 <div class="spirit-nav">
 <a accesskey="p" href="at_key.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../functions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.functions.swap"></a>swap
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="swap">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.functions.swap"></a><a class="link" href="swap.html" title="swap">swap</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.functions.swap.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id459147"></a>
-            Description
-=======
-<a name="id711894"></a>
-=======
-<a name="id671705"></a>
-=======
-<a name="id664059"></a>
-=======
-<a name="id684356"></a>
-=======
-<a name="id674127"></a>
-=======
-<a name="id670850"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id664296"></a>
             <a class="link" href="swap.html#fusion.sequence.intrinsic.functions.swap.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Performs an element by element swap of the elements in 2 sequences.
           </p>
 <a name="fusion.sequence.intrinsic.functions.swap.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id459177"></a>
-            Synopsis
-=======
-<a name="id711910"></a>
-=======
-<a name="id671722"></a>
-=======
-<a name="id664076"></a>
-=======
-<a name="id684373"></a>
-=======
-<a name="id674144"></a>
-=======
-<a name="id670867"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id664313"></a>
             <a class="link" href="swap.html#fusion.sequence.intrinsic.functions.swap.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">&gt;</span>
 <span class="keyword">void</span> <span class="identifier">swap</span><span class="special">(</span><span class="identifier">Seq1</span><span class="special">&amp;</span> <span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">Seq2</span><span class="special">&amp;</span> <span class="identifier">seq2</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.intrinsic.functions.swap.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id459316"></a>
-            Parameters
-=======
-<a name="id712006"></a>
-=======
-<a name="id671818"></a>
-=======
-<a name="id664172"></a>
-=======
-<a name="id684469"></a>
-=======
-<a name="id674240"></a>
-=======
-<a name="id670963"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id664409"></a>
             <a class="link" href="swap.html#fusion.sequence.intrinsic.functions.swap.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -137,107 +51,68 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameters
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">seq1</span></tt>, <tt class="computeroutput"><span class="identifier">seq2</span></tt>
-                  </p></td>
-<td><p>
-                    Models of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">seq1</span></code>, <code class="computeroutput"><span class="identifier">seq2</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Models of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                     Sequence</a>
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequences whos elements we wish to swap.
-                  </p></td>
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.intrinsic.functions.swap.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id459442"></a>
-            <a href="swap.html#fusion.sequence.intrinsic.functions.swap.expression_semantics">Expression
-=======
-<a name="id712104"></a>
-=======
-<a name="id671915"></a>
-=======
-<a name="id664269"></a>
-=======
-<a name="id684566"></a>
-=======
-<a name="id674337"></a>
-=======
-<a name="id671060"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id664506"></a>
             <a class="link" href="swap.html#fusion.sequence.intrinsic.functions.swap.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">swap</span><span class="special">(</span><span class="identifier">seq1</span><span class="special">,</span> <span class="identifier">seq2</span><span class="special">);</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">void</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">void</span></code>
           </p>
 <p>
-            <span class="bold"><b>Precondition</b></span>: <tt class="computeroutput">size<span class="special">(</span><span class="identifier">seq1</span><span class="special">)</span> <span class="special">==</span> size<span class="special">(</span><span class="identifier">seq2</span><span class="special">)</span></tt>
+            <span class="bold"><strong>Precondition</strong></span>: <code class="computeroutput"><a class="link" href="size.html" title="size"><code class="computeroutput"><span class="identifier">size</span></code></a><span class="special">(</span><span class="identifier">seq1</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="size.html" title="size"><code class="computeroutput"><span class="identifier">size</span></code></a><span class="special">(</span><span class="identifier">seq2</span><span class="special">)</span></code>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Calls <tt class="computeroutput"><span class="identifier">swap</span><span class="special">(</span><span class="identifier">a1</span><span class="special">,</span> <span class="identifier">b1</span><span class="special">)</span></tt> for corresponding elements in <tt class="computeroutput"><span class="identifier">seq1</span></tt> and <tt class="computeroutput"><span class="identifier">seq2</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Calls <code class="computeroutput"><span class="identifier">swap</span><span class="special">(</span><span class="identifier">a1</span><span class="special">,</span> <span class="identifier">b1</span><span class="special">)</span></code> for corresponding elements in <code class="computeroutput"><span class="identifier">seq1</span></code> and <code class="computeroutput"><span class="identifier">seq2</span></code>.
           </p>
 <p>
             /sequence/intrinsic/swap.hpp&gt;
           </p>
 <a name="fusion.sequence.intrinsic.functions.swap.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id459689"></a>
-            Example
-=======
-<a name="id712272"></a>
-=======
-<a name="id672083"></a>
-=======
-<a name="id664437"></a>
-=======
-<a name="id684734"></a>
-=======
-<a name="id674505"></a>
-=======
-<a name="id671228"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id664674"></a>
             <a class="link" href="swap.html#fusion.sequence.intrinsic.functions.swap.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">),</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="string">"world"</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">),</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="string">"world"</span><span class="special">);</span>
 <span class="identifier">swap</span><span class="special">(</span><span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">);</span>
-<span class="identifier">assert</span><span class="special">(</span><span class="identifier">v1</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="string">"world"</span><span class="special">));</span>
-<span class="identifier">assert</span><span class="special">(</span><span class="identifier">v2</span> <span class="special">==</span> make_vector<span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">));</span>
+<span class="identifier">assert</span><span class="special">(</span><span class="identifier">v1</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="string">"world"</span><span class="special">));</span>
+<span class="identifier">assert</span><span class="special">(</span><span class="identifier">v2</span> <span class="special">==</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="string">"hello"</span><span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Metafunctions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../intrinsic.html" title="Intrinsic">
-<link rel="previous" href="functions/swap.html" title="swap">
+<link rel="prev" href="functions/swap.html" title="swap">
 <link rel="next" href="metafunctions/begin.html" title="begin">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="functions/swap.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../intrinsic.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="metafunctions/begin.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions"></a>Metafunctions
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Metafunctions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions"></a><a class="link" href="metafunctions.html" title="Metafunctions">Metafunctions</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">begin</span></dt>
 <dt><span class="section">end</span></dt>
@@ -52,7 +45,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>at</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="size.html" title="size">
+<link rel="prev" href="size.html" title="size">
 <link rel="next" href="at_c.html" title="at_c">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,80 +22,22 @@
 <div class="spirit-nav">
 <a accesskey="p" href="size.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="at_c.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.at"></a>at
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="at">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.at"></a><a class="link" href="at.html" title="at">at</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.at.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id463892"></a>
-            Description
-=======
-<a name="id715319"></a>
-=======
-<a name="id677580"></a>
-=======
-<a name="id669935"></a>
-=======
-<a name="id691340"></a>
-=======
-<a name="id680002"></a>
-=======
-<a name="id676725"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id670172"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.metafunctions.at.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-<<<<<<< .working
-            Returns the result type of at
-            <sup>[<a name="id463929" href="#ftn.id463929">6</a>]</sup>
-=======
             Returns the result type of <a class="link" href="../functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a>
-            <sup>[<a name="id676747" href="#ftn.id676747" class="footnote">6</a>]</sup>
->>>>>>> .merge-right.r57125
+            <sup>[<a name="id670193" href="#ftn.id670193" class="footnote">6</a>]</sup>
             .
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.at.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id464047"></a>
-            Synopsis
-=======
-<a name="id715410"></a>
-=======
-<a name="id677672"></a>
-=======
-<a name="id670026"></a>
-=======
-<a name="id691432"></a>
-=======
-<a name="id680093"></a>
-=======
-<a name="id676816"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id670263"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.metafunctions.at.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -114,172 +48,105 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id464162"></a><p class="title"><b>Table 1.25. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id715494"></a><p class="title"><b>Table 1.25. Parameters</b></p>
-=======
-<a name="id677756"></a><p class="title"><b>Table 1.29. Parameters</b></p>
-=======
-<a name="id670110"></a><p class="title"><b>Table 1.29. Parameters</b></p>
-=======
-<a name="id691516"></a><p class="title"><b>Table&#160;1.29.&#160;Parameters</b></p>
-=======
-<a name="id680177"></a><p class="title"><b>Table&#160;1.29.&#160;Parameters</b></p>
-=======
-<a name="id676900"></a><p class="title"><b>Table&#160;1.29.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id670347"></a><p class="title"><b>Table&#160;1.29.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">N</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">N</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
                   Integral Constant</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Index of element
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.at.expression_semantics"></a><h6>
-<a name="id464305"></a>
-            <a href="at.html#fusion.sequence.intrinsic.metafunctions.at.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.at.expression_semantics"></a><h6>
-<a name="id677019"></a>
+<a name="id670466"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.metafunctions.at.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type.
+            <span class="bold"><strong>Return type</strong></span>: Any type.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the result type of
-            using at to access the <tt class="computeroutput"><span class="identifier">N</span></tt>th element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the result type of
+            using <a class="link" href="../functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a> to access the <code class="computeroutput"><span class="identifier">N</span></code>th element of <code class="computeroutput"><span class="identifier">Seq</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.at.header"></a><h6>
-<a name="id677114"></a>
+<a name="id670560"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.metafunctions.at.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.at.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id464452"></a>
-            Example
-=======
-<a name="id715711"></a>
-=======
-<a name="id678084"></a>
-=======
-<a name="id670439"></a>
-=======
-<a name="id691844"></a>
-=======
-<a name="id680506"></a>
-=======
-<a name="id677229"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id670676"></a>
             <a class="link" href="at.html#fusion.sequence.intrinsic.metafunctions.at.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::at<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&amp;&gt;));</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="at.html" title="at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&amp;&gt;));</span>
 </pre>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<div class="footnote"><p><sup>[<a name="ftn.id463929" href="#id463929">6</a>] </sup>
-                result_of::at reflects the actual return
-                type of the function at. Sequence(s)
-                typically return references to its elements via the at function. If you want
-                to get the actual element type, use result_of::value_at
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id715340" href="#id715340" class="para">6</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id677602" href="#id677602" class="para">6</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id669956" href="#id669956" class="para">6</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id691362" href="#id691362" class="para">6</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id680024" href="#id680024" class="para">6</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id676747" href="#id676747" class="para">6</a>] </sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<div class="footnote"><p><sup>[<a name="ftn.id670193" href="#id670193" class="para">6</a>] </sup>
                 <a class="link" href="at.html" title="at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at</span></code></a> reflects the actual return
                 type of the function <a class="link" href="../functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a>. <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>(s)
                 typically return references to its elements via the <a class="link" href="../functions/at.html" title="at"><code class="computeroutput"><span class="identifier">at</span></code></a> function. If you want
                 to get the actual element type, use <a class="link" href="value_at.html" title="value_at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at</span></code></a>
->>>>>>> .merge-right.r57125
               </p></div>
 </div>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_c.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>at_c</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="at.html" title="at">
+<link rel="prev" href="at.html" title="at">
 <link rel="next" href="value_at.html" title="value_at">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,80 +22,22 @@
 <div class="spirit-nav">
 <a accesskey="p" href="at.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="value_at.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.at_c"></a>at_c
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="at_c">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.at_c"></a><a class="link" href="at_c.html" title="at_c">at_c</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.at_c.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id464709"></a>
-            Description
-=======
-<a name="id715889"></a>
-=======
-<a name="id678262"></a>
-=======
-<a name="id670616"></a>
-=======
-<a name="id692022"></a>
-=======
-<a name="id680684"></a>
-=======
-<a name="id677407"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id670853"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-<<<<<<< .working
-            Returns the result type of at_c
-            <sup>[<a name="id464747" href="#ftn.id464747">7</a>]</sup>
-=======
             Returns the result type of <a class="link" href="../functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a>
-            <sup>[<a name="id677431" href="#ftn.id677431" class="footnote">7</a>]</sup>
->>>>>>> .merge-right.r57125
+            <sup>[<a name="id670877" href="#ftn.id670877" class="footnote">7</a>]</sup>
             .
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.at_c.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id464868"></a>
-            Synopsis
-=======
-<a name="id715982"></a>
-=======
-<a name="id678356"></a>
-=======
-<a name="id670710"></a>
-=======
-<a name="id692116"></a>
-=======
-<a name="id680777"></a>
-=======
-<a name="id677500"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id670947"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -114,171 +48,104 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id464983"></a><p class="title"><b>Table 1.26. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id716066"></a><p class="title"><b>Table 1.26. Parameters</b></p>
-=======
-<a name="id678440"></a><p class="title"><b>Table 1.30. Parameters</b></p>
-=======
-<a name="id670794"></a><p class="title"><b>Table 1.30. Parameters</b></p>
-=======
-<a name="id692200"></a><p class="title"><b>Table&#160;1.30.&#160;Parameters</b></p>
-=======
-<a name="id680861"></a><p class="title"><b>Table&#160;1.30.&#160;Parameters</b></p>
-=======
-<a name="id677584"></a><p class="title"><b>Table&#160;1.30.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id671031"></a><p class="title"><b>Table&#160;1.30.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">M</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">M</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Positive integer index
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Index of element
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.at_c.expression_semantics"></a><h6>
-<a name="id465121"></a>
-            <a href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.at_c.expression_semantics"></a><h6>
-<a name="id677697"></a>
+<a name="id671144"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">M</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type
+            <span class="bold"><strong>Return type</strong></span>: Any type
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the result type of
-            using at_c to access the <tt class="computeroutput"><span class="identifier">M</span></tt>th element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the result type of
+            using <a class="link" href="../functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a> to access the <code class="computeroutput"><span class="identifier">M</span></code>th element of <code class="computeroutput"><span class="identifier">Seq</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.at_c.header"></a><h6>
-<a name="id677790"></a>
+<a name="id671236"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.at_c.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id465270"></a>
-            Example
-=======
-<a name="id716275"></a>
-=======
-<a name="id678760"></a>
-=======
-<a name="id671114"></a>
-=======
-<a name="id692520"></a>
-=======
-<a name="id681182"></a>
-=======
-<a name="id677905"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id671351"></a>
             <a class="link" href="at_c.html#fusion.sequence.intrinsic.metafunctions.at_c.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::at_c<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">,</span> <span class="number">1</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&amp;&gt;));</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">,</span> <span class="number">1</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&amp;&gt;));</span>
 </pre>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<div class="footnote"><p><sup>[<a name="ftn.id464747" href="#id464747">7</a>] </sup>
-                result_of::at_c reflects the actual
-                return type of the function at_c. Sequence(s)
-                typically return references to its elements via the at_c function. If you want
-                to get the actual element type, use result_of::value_at_c
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id715913" href="#id715913" class="para">7</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id678286" href="#id678286" class="para">7</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id670640" href="#id670640" class="para">7</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id692046" href="#id692046" class="para">7</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id680708" href="#id680708" class="para">7</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id677431" href="#id677431" class="para">7</a>] </sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<div class="footnote"><p><sup>[<a name="ftn.id670877" href="#id670877" class="para">7</a>] </sup>
                 <a class="link" href="at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span></code></a> reflects the actual
                 return type of the function <a class="link" href="../functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a>. <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>(s)
                 typically return references to its elements via the <a class="link" href="../functions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">at_c</span></code></a> function. If you want
                 to get the actual element type, use <a class="link" href="value_at_c.html" title="value_at_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_c</span></code></a>
->>>>>>> .merge-right.r57125
               </p></div>
 </div>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/at_key.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>at_key</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="has_key.html" title="has_key">
+<link rel="prev" href="has_key.html" title="has_key">
 <link rel="next" href="value_at_key.html" title="value_at_key">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,80 +22,22 @@
 <div class="spirit-nav">
 <a accesskey="p" href="has_key.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="value_at_key.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.at_key"></a>at_key
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="at_key">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.at_key"></a><a class="link" href="at_key.html" title="at_key">at_key</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.at_key.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id467644"></a>
-            Description
-=======
-<a name="id719070"></a>
-=======
-<a name="id681553"></a>
-=======
-<a name="id673907"></a>
-=======
-<a name="id696337"></a>
-=======
-<a name="id685067"></a>
-=======
-<a name="id681790"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id675236"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-<<<<<<< .working
-            Returns the result type of at_key
-            <sup>[<a name="id467682" href="#ftn.id467682">8</a>]</sup>
-=======
             Returns the result type of <a class="link" href="../functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a>
-            <sup>[<a name="id681814" href="#ftn.id681814" class="footnote">8</a>]</sup>
->>>>>>> .merge-right.r57125
+            <sup>[<a name="id675260" href="#ftn.id675260" class="footnote">8</a>]</sup>
             .
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.at_key.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id467800"></a>
-            Synopsis
-=======
-<a name="id719163"></a>
-=======
-<a name="id681646"></a>
-=======
-<a name="id674000"></a>
-=======
-<a name="id696430"></a>
-=======
-<a name="id685160"></a>
-=======
-<a name="id681883"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id675330"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -114,173 +48,106 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id467915"></a><p class="title"><b>Table 1.30. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id719247"></a><p class="title"><b>Table 1.30. Parameters</b></p>
-=======
-<a name="id681730"></a><p class="title"><b>Table 1.34. Parameters</b></p>
-=======
-<a name="id674084"></a><p class="title"><b>Table 1.34. Parameters</b></p>
-=======
-<a name="id696514"></a><p class="title"><b>Table&#160;1.34.&#160;Parameters</b></p>
-=======
-<a name="id685244"></a><p class="title"><b>Table&#160;1.34.&#160;Parameters</b></p>
-=======
-<a name="id681967"></a><p class="title"><b>Table&#160;1.34.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id675414"></a><p class="title"><b>Table&#160;1.34.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Key</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Key</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Key type
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.at_key.expression_semantics"></a><h6>
-<a name="id468053"></a>
-            <a href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.at_key.expression_semantics"></a><h6>
-<a name="id682079"></a>
+<a name="id675525"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type.
+            <span class="bold"><strong>Return type</strong></span>: Any type.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the result of using
-            at_key to access the element
-            with key type <tt class="computeroutput"><span class="identifier">Key</span></tt> in
-            <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the result of using
+            <a class="link" href="../functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a> to access the element
+            with key type <code class="computeroutput"><span class="identifier">Key</span></code> in
+            <code class="computeroutput"><span class="identifier">Seq</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.at_key.header"></a><h6>
-<a name="id682171"></a>
+<a name="id675618"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.at_key.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id468201"></a>
-            Example
-=======
-<a name="id719455"></a>
-=======
-<a name="id682050"></a>
-=======
-<a name="id674404"></a>
-=======
-<a name="id696834"></a>
-=======
-<a name="id685563"></a>
-=======
-<a name="id682287"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id675733"></a>
             <a class="link" href="at_key.html#fusion.sequence.intrinsic.metafunctions.at_key.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> map<span class="special">&lt;</span>pair<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> pair<span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> pair<span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span> <span cla
ss="keyword">char</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">mymap</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::at_key<span class="special">&lt;</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&amp;&gt;));</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a><span class="special">&lt;</span><a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span c
lass="keyword">double</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">mymap</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&amp;&gt;));</span>
 </pre>
 <div class="footnotes">
 <br><hr width="100" align="left">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<div class="footnote"><p><sup>[<a name="ftn.id467682" href="#id467682">8</a>] </sup>
-                result_of::at_key reflects the actual
-                return type of the function at_key. <span class="underline">_sequence</span>_s
-                typically return references to its elements via the at_key function. If you
-                want to get the actual element type, use result_of::value_at_key
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id719094" href="#id719094" class="para">8</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id681577" href="#id681577" class="para">8</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id673931" href="#id673931" class="para">8</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id696361" href="#id696361" class="para">8</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id685091" href="#id685091" class="para">8</a>] </sup>
-=======
-<div class="footnote"><p><sup>[<a name="ftn.id681814" href="#id681814" class="para">8</a>] </sup>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<div class="footnote"><p><sup>[<a name="ftn.id675260" href="#id675260" class="para">8</a>] </sup>
                 <a class="link" href="at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span></code></a> reflects the actual
                 return type of the function <a class="link" href="../functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a>. <span class="underline">_sequence</span>_s
                 typically return references to its elements via the <a class="link" href="../functions/at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">at_key</span></code></a> function. If you
                 want to get the actual element type, use <a class="link" href="value_at_key.html" title="value_at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_key</span></code></a>
->>>>>>> .merge-right.r57125
               </p></div>
 </div>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/back.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/back.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/back.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>back</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="front.html" title="front">
+<link rel="prev" href="front.html" title="front">
 <link rel="next" href="size.html" title="size">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="front.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="size.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.back"></a>back
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="back">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.back"></a><a class="link" href="back.html" title="back">back</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.back.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id462630"></a>
-            Description
-=======
-<a name="id714442"></a>
-=======
-<a name="id674841"></a>
-=======
-<a name="id667195"></a>
-=======
-<a name="id689693"></a>
-=======
-<a name="id678355"></a>
-=======
-<a name="id675078"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id668525"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.metafunctions.back.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of back.
+            Returns the result type of <a class="link" href="../functions/back.html" title="back"><code class="computeroutput"><span class="identifier">back</span></code></a>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.back.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id462678"></a>
-            Synopsis
-=======
-<a name="id714470"></a>
-=======
-<a name="id674870"></a>
-=======
-<a name="id667224"></a>
-=======
-<a name="id689722"></a>
-=======
-<a name="id678384"></a>
-=======
-<a name="id675107"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id668553"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.metafunctions.back.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">back</span>
@@ -105,122 +44,77 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id462775"></a><p class="title"><b>Table 1.23. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id714540"></a><p class="title"><b>Table 1.23. Parameters</b></p>
-=======
-<a name="id674940"></a><p class="title"><b>Table 1.27. Parameters</b></p>
-=======
-<a name="id667294"></a><p class="title"><b>Table 1.27. Parameters</b></p>
-=======
-<a name="id689792"></a><p class="title"><b>Table&#160;1.27.&#160;Parameters</b></p>
-=======
-<a name="id678453"></a><p class="title"><b>Table&#160;1.27.&#160;Parameters</b></p>
-=======
-<a name="id675177"></a><p class="title"><b>Table&#160;1.27.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id668623"></a><p class="title"><b>Table&#160;1.27.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.back.expression_semantics"></a><h6>
-<a name="id462874"></a>
-            <a href="back.html#fusion.sequence.intrinsic.metafunctions.back.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.back.expression_semantics"></a><h6>
-<a name="id675258"></a>
+<a name="id668705"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.metafunctions.back.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">back</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type
+            <span class="bold"><strong>Return type</strong></span>: Any type
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: The type returned by dereferencing
-            an iterator to the last element in the sequence. Equivalent to <tt class="computeroutput">result_of::deref<span class="special">&lt;</span>result_of::prior<span class="special">&lt;</span>result_of::end<span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class
="identifier">type</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: The type returned by dereferencing
+            an iterator to the last element in the sequence. Equivalent to <code class="computeroutput"><a class="link" href="../../../iterator/metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><a class="link" href="../../../iterator/metafunctions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">prior</span></code></a><span class="special">&lt;</span><a class="link" href="end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type
</span><span class="special">&gt;::</span><span class="identifier">type</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.back.header"></a><h6>
-<a name="id675405"></a>
+<a name="id668851"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.metafunctions.back.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">back</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.back.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id463105"></a>
-            Example
-=======
-<a name="id714772"></a>
-=======
-<a name="id675283"></a>
-=======
-<a name="id667637"></a>
-=======
-<a name="id690135"></a>
-=======
-<a name="id678797"></a>
-=======
-<a name="id675520"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id668966"></a>
             <a class="link" href="back.html#fusion.sequence.intrinsic.metafunctions.back.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::back<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&amp;&gt;));</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="back.html" title="back"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">back</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&amp;&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/begin.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>begin</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="../metafunctions.html" title="Metafunctions">
+<link rel="prev" href="../metafunctions.html" title="Metafunctions">
 <link rel="next" href="end.html" title="end">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="end.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.begin"></a>begin
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="begin">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.begin"></a><a class="link" href="begin.html" title="begin">begin</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.begin.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id460036"></a>
-            Description
-=======
-<a name="id712512"></a>
-=======
-<a name="id672323"></a>
-=======
-<a name="id664677"></a>
-=======
-<a name="id684974"></a>
-=======
-<a name="id674745"></a>
-=======
-<a name="id671468"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id664914"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of begin.
+            Returns the result type of <a class="link" href="../functions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">begin</span></code></a>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.begin.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id460084"></a>
-            Synopsis
-=======
-<a name="id712540"></a>
-=======
-<a name="id672352"></a>
-=======
-<a name="id664706"></a>
-=======
-<a name="id685003"></a>
-=======
-<a name="id674774"></a>
-=======
-<a name="id671497"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id664943"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">begin</span>
@@ -105,84 +44,59 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id460180"></a><p class="title"><b>Table 1.19. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id712610"></a><p class="title"><b>Table 1.19. Parameters</b></p>
-=======
-<a name="id672422"></a><p class="title"><b>Table 1.23. Parameters</b></p>
-=======
-<a name="id664776"></a><p class="title"><b>Table 1.23. Parameters</b></p>
-=======
-<a name="id685072"></a><p class="title"><b>Table&#160;1.23.&#160;Parameters</b></p>
-=======
-<a name="id674843"></a><p class="title"><b>Table&#160;1.23.&#160;Parameters</b></p>
-=======
-<a name="id671566"></a><p class="title"><b>Table&#160;1.23.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id665013"></a><p class="title"><b>Table&#160;1.23.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.begin.expression_semantics"></a><h6>
-<a name="id460281"></a>
-            <a href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.begin.expression_semantics"></a><h6>
-<a name="id671648"></a>
+<a name="id665094"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: An iterator modelling the
-            same traversal concept as <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -205,48 +119,23 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the type of an iterator
-            to the first element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the type of an iterator
+            to the first element of <code class="computeroutput"><span class="identifier">Seq</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.begin.header"></a><h6>
-<a name="id671793"></a>
+<a name="id665240"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">begin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">begin</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.begin.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id460401"></a>
-            Example
-=======
-<a name="id712770"></a>
-=======
-<a name="id672764"></a>
-=======
-<a name="id665118"></a>
-=======
-<a name="id685414"></a>
-=======
-<a name="id675185"></a>
-=======
-<a name="id671908"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id665355"></a>
             <a class="link" href="begin.html#fusion.sequence.intrinsic.metafunctions.begin.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::begin<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">it</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::deref<span class="special">&lt;</span><span class="identifier">it</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&amp;&gt;))</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">it</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="../../../iterator/metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><span class="identifier">it</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&amp;&gt;))</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/empty.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>empty</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="end.html" title="end">
+<link rel="prev" href="end.html" title="end">
 <link rel="next" href="front.html" title="front">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="end.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="front.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.empty"></a>empty
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="empty">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.empty"></a><a class="link" href="empty.html" title="empty">empty</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.empty.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id461321"></a>
-            Description
-=======
-<a name="id713400"></a>
-=======
-<a name="id673713"></a>
-=======
-<a name="id666067"></a>
-=======
-<a name="id688565"></a>
-=======
-<a name="id677227"></a>
-=======
-<a name="id673950"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id667397"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of empty.
+            Returns the result type of <a class="link" href="../functions/empty.html" title="empty"><code class="computeroutput"><span class="identifier">empty</span></code></a>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.empty.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id461369"></a>
-            Synopsis
-=======
-<a name="id713428"></a>
-=======
-<a name="id673742"></a>
-=======
-<a name="id666096"></a>
-=======
-<a name="id688594"></a>
-=======
-<a name="id677256"></a>
-=======
-<a name="id673979"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id667425"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">empty</span>
@@ -105,127 +44,82 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id461466"></a><p class="title"><b>Table 1.21. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id713498"></a><p class="title"><b>Table 1.21. Parameters</b></p>
-=======
-<a name="id673812"></a><p class="title"><b>Table 1.25. Parameters</b></p>
-=======
-<a name="id666166"></a><p class="title"><b>Table 1.25. Parameters</b></p>
-=======
-<a name="id688664"></a><p class="title"><b>Table&#160;1.25.&#160;Parameters</b></p>
-=======
-<a name="id677325"></a><p class="title"><b>Table&#160;1.25.&#160;Parameters</b></p>
-=======
-<a name="id674049"></a><p class="title"><b>Table&#160;1.25.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id667495"></a><p class="title"><b>Table&#160;1.25.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.empty.expression_semantics"></a><h6>
-<a name="id461568"></a>
-            <a href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.empty.expression_semantics"></a><h6>
-<a name="id674130"></a>
+<a name="id667577"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">empty</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
+            <span class="bold"><strong>Return type</strong></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
             Integral Constant</a>
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>
-            if <tt class="computeroutput"><span class="identifier">Seq</span></tt> has zero elements,
-            <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt> otherwise.
+            <span class="bold"><strong>Semantics</strong></span>: Returns <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>
+            if <code class="computeroutput"><span class="identifier">Seq</span></code> has zero elements,
+            <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></code> otherwise.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.empty.header"></a><h6>
-<a name="id674231"></a>
+<a name="id667677"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">empty</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">empty</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.empty.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id461725"></a>
-            Example
-=======
-<a name="id713684"></a>
-=======
-<a name="id674109"></a>
-=======
-<a name="id666463"></a>
-=======
-<a name="id688961"></a>
-=======
-<a name="id677623"></a>
-=======
-<a name="id674346"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id667793"></a>
             <a class="link" href="empty.html#fusion.sequence.intrinsic.metafunctions.empty.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;&gt;</span> <span class="identifier">empty_vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;&gt;</span> <span class="identifier">empty_vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
 
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span>result_of::empty<span class="special">&lt;</span><span class="identifier">empty_vec</span><span class="special">&gt;));</span>
-<span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span>result_of::empty<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><a class="link" href="empty.html" title="empty"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">empty</span></code></a><span class="special">&lt;</span><span class="identifier">empty_vec</span><span class="special">&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span><a class="link" href="empty.html" title="empty"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">empty</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/end.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/end.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/end.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>end</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="begin.html" title="begin">
+<link rel="prev" href="begin.html" title="begin">
 <link rel="next" href="empty.html" title="empty">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="begin.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="empty.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.end"></a>end
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="end">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.end"></a><a class="link" href="end.html" title="end">end</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.end.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id460654"></a>
-            Description
-=======
-<a name="id712940"></a>
-=======
-<a name="id672934"></a>
-=======
-<a name="id665288"></a>
-=======
-<a name="id685585"></a>
-=======
-<a name="id675356"></a>
-=======
-<a name="id672079"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id665525"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.metafunctions.end.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of end.
+            Returns the result type of <a class="link" href="../functions/end.html" title="end"><code class="computeroutput"><span class="identifier">end</span></code></a>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.end.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id460701"></a>
-            Synopsis
-=======
-<a name="id712966"></a>
-=======
-<a name="id672960"></a>
-=======
-<a name="id665315"></a>
-=======
-<a name="id685611"></a>
-=======
-<a name="id675382"></a>
-=======
-<a name="id672105"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id665552"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.metafunctions.end.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">end</span>
@@ -105,84 +44,59 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id460798"></a><p class="title"><b>Table 1.20. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id713036"></a><p class="title"><b>Table 1.20. Parameters</b></p>
-=======
-<a name="id673030"></a><p class="title"><b>Table 1.24. Parameters</b></p>
-=======
-<a name="id665384"></a><p class="title"><b>Table 1.24. Parameters</b></p>
-=======
-<a name="id685681"></a><p class="title"><b>Table&#160;1.24.&#160;Parameters</b></p>
-=======
-<a name="id675452"></a><p class="title"><b>Table&#160;1.24.&#160;Parameters</b></p>
-=======
-<a name="id672175"></a><p class="title"><b>Table&#160;1.24.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id665621"></a><p class="title"><b>Table&#160;1.24.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.end.expression_semantics"></a><h6>
-<a name="id460898"></a>
-            <a href="end.html#fusion.sequence.intrinsic.metafunctions.end.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.end.expression_semantics"></a><h6>
-<a name="id673486"></a>
+<a name="id666932"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.metafunctions.end.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-<<<<<<< .working
-            <span class="bold"><b>Return type</b></span>: A model of the same traversal
-            concept as <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
-=======
             <span class="bold"><strong>Return type</strong></span>:
->>>>>>> .merge-right.r57242
           </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
@@ -205,48 +119,23 @@
             </li>
 </ul></div>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the type of an iterator
-            one past the end of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the type of an iterator
+            one past the end of <code class="computeroutput"><span class="identifier">Seq</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.end.header"></a><h6>
-<a name="id673631"></a>
+<a name="id667077"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.metafunctions.end.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">end</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">end</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.end.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id461016"></a>
-            Example
-=======
-<a name="id713196"></a>
-=======
-<a name="id673509"></a>
-=======
-<a name="id665863"></a>
-=======
-<a name="id688361"></a>
-=======
-<a name="id677023"></a>
-=======
-<a name="id673746"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id667193"></a>
             <a class="link" href="end.html#fusion.sequence.intrinsic.metafunctions.end.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::prior<span class="special">&lt;</span>result_of::end<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span>result_of::equal_to<span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span> result_of::begin<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;))</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../../../iterator/metafunctions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">prior</span></code></a><span class="special">&lt;</span><a class="link" href="end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">first</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><a class="link" href="../../../iterator/metafunctions/equal_to.html" title="equal_to"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">equal_to</span></code></a><span class="special">&lt;</span><span class="identifier">first</span><span class="special">,</span> <a class="link" href="begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;))</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/front.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/front.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/front.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>front</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="empty.html" title="empty">
+<link rel="prev" href="empty.html" title="empty">
 <link rel="next" href="back.html" title="back">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="empty.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="back.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.front"></a>front
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="front">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.front"></a><a class="link" href="front.html" title="front">front</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.front.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id461984"></a>
-            Description
-=======
-<a name="id713858"></a>
-=======
-<a name="id674283"></a>
-=======
-<a name="id666637"></a>
-=======
-<a name="id689135"></a>
-=======
-<a name="id677797"></a>
-=======
-<a name="id674520"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id667967"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.metafunctions.front.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of front.
+            Returns the result type of <a class="link" href="../functions/front.html" title="front"><code class="computeroutput"><span class="identifier">front</span></code></a>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.front.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id462032"></a>
-            Synopsis
-=======
-<a name="id713887"></a>
-=======
-<a name="id674312"></a>
-=======
-<a name="id666666"></a>
-=======
-<a name="id689164"></a>
-=======
-<a name="id677826"></a>
-=======
-<a name="id674549"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id667995"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.metafunctions.front.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">front</span>
@@ -105,123 +44,78 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id462129"></a><p class="title"><b>Table 1.22. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id713956"></a><p class="title"><b>Table 1.22. Parameters</b></p>
-=======
-<a name="id674382"></a><p class="title"><b>Table 1.26. Parameters</b></p>
-=======
-<a name="id666736"></a><p class="title"><b>Table 1.26. Parameters</b></p>
-=======
-<a name="id689234"></a><p class="title"><b>Table&#160;1.26.&#160;Parameters</b></p>
-=======
-<a name="id677895"></a><p class="title"><b>Table&#160;1.26.&#160;Parameters</b></p>
-=======
-<a name="id674619"></a><p class="title"><b>Table&#160;1.26.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id668065"></a><p class="title"><b>Table&#160;1.26.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.front.expression_semantics"></a><h6>
-<a name="id462230"></a>
-            <a href="front.html#fusion.sequence.intrinsic.metafunctions.front.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.front.expression_semantics"></a><h6>
-<a name="id674700"></a>
+<a name="id668147"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.metafunctions.front.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">front</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type
+            <span class="bold"><strong>Return type</strong></span>: Any type
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: The type returned by dereferencing
-            an iterator to the first element in <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
-            Equivalent to <tt class="computeroutput">result_of::deref<span class="special">&lt;</span>result_of::begin<span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: The type returned by dereferencing
+            an iterator to the first element in <code class="computeroutput"><span class="identifier">Seq</span></code>.
+            Equivalent to <code class="computeroutput"><a class="link" href="../../../iterator/metafunctions/deref.html" title="deref"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">deref</span></code></a><span class="special">&lt;</span><a class="link" href="begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">&gt;::</span><span class="identifier">type</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.front.header"></a><h6>
-<a name="id674827"></a>
+<a name="id668274"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.metafunctions.front.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">front</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.front.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id462431"></a>
-            Example
-=======
-<a name="id714306"></a>
-=======
-<a name="id674706"></a>
-=======
-<a name="id667060"></a>
-=======
-<a name="id689558"></a>
-=======
-<a name="id678219"></a>
-=======
-<a name="id674943"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id668389"></a>
             <a class="link" href="front.html#fusion.sequence.intrinsic.metafunctions.front.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::front<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&amp;&gt;));</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="front.html" title="front"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">front</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&amp;&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/has_key.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>has_key</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="value_at_c.html" title="value_at_c">
+<link rel="prev" href="value_at_c.html" title="value_at_c">
 <link rel="next" href="at_key.html" title="at_key">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="value_at_c.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="at_key.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.has_key"></a>has_key
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="has_key">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.has_key"></a><a class="link" href="has_key.html" title="has_key">has_key</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.has_key.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id466822"></a>
-            Description
-=======
-<a name="id718488"></a>
-=======
-<a name="id680859"></a>
-=======
-<a name="id673213"></a>
-=======
-<a name="id695643"></a>
-=======
-<a name="id684373"></a>
-=======
-<a name="id681096"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id674543"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of has_key.
+            Returns the result type of <a class="link" href="../functions/has_key.html" title="has_key"><code class="computeroutput"><span class="identifier">has_key</span></code></a>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.has_key.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id466869"></a>
-            Synopsis
-=======
-<a name="id718519"></a>
-=======
-<a name="id680890"></a>
-=======
-<a name="id673244"></a>
-=======
-<a name="id695674"></a>
-=======
-<a name="id684404"></a>
-=======
-<a name="id681127"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id674574"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -107,139 +46,100 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id466985"></a><p class="title"><b>Table 1.29. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id718605"></a><p class="title"><b>Table 1.29. Parameters</b></p>
-=======
-<a name="id680977"></a><p class="title"><b>Table 1.33. Parameters</b></p>
-=======
-<a name="id673331"></a><p class="title"><b>Table 1.33. Parameters</b></p>
-=======
-<a name="id695761"></a><p class="title"><b>Table&#160;1.33.&#160;Parameters</b></p>
-=======
-<a name="id684491"></a><p class="title"><b>Table&#160;1.33.&#160;Parameters</b></p>
-=======
-<a name="id681214"></a><p class="title"><b>Table&#160;1.33.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id674660"></a><p class="title"><b>Table&#160;1.33.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Key</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Key</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Key type
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.has_key.expression_semantics"></a><h6>
-<a name="id467122"></a>
-            <a href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.has_key.expression_semantics"></a><h6>
-<a name="id681325"></a>
+<a name="id674772"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">has_key</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
+            <span class="bold"><strong>Return type</strong></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
             Integral Constant</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>
-            if <tt class="computeroutput"><span class="identifier">Seq</span></tt> contains an element
-            with key type <tt class="computeroutput"><span class="identifier">Key</span></tt>, returns
-            <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt> otherwise.
+            <span class="bold"><strong>Semantics</strong></span>: Returns <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>
+            if <code class="computeroutput"><span class="identifier">Seq</span></code> contains an element
+            with key type <code class="computeroutput"><span class="identifier">Key</span></code>, returns
+            <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></code> otherwise.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.has_key.header"></a><h6>
-<a name="id681442"></a>
+<a name="id674888"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">has_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">has_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.has_key.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id467302"></a>
-            Example
-=======
-<a name="id718837"></a>
-=======
-<a name="id681320"></a>
-=======
-<a name="id673674"></a>
-=======
-<a name="id696104"></a>
-=======
-<a name="id684834"></a>
-=======
-<a name="id681557"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id675003"></a>
             <a class="link" href="has_key.html#fusion.sequence.intrinsic.metafunctions.has_key.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> map<span class="special">&lt;</span>pair<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> pair<span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> pair<span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span> <span cla
ss="keyword">char</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">mymap</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span>result_of::has_key<span class="special">&lt;</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;));</span>
-<span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span>result_of::has_key<span class="special">&lt;</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">void</span><span class="special">*&gt;));</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a><span class="special">&lt;</span><a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span c
lass="keyword">double</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">mymap</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><a class="link" href="has_key.html" title="has_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">has_key</span></code></a><span class="special">&lt;</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;));</span>
+<span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span><a class="link" href="has_key.html" title="has_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">has_key</span></code></a><span class="special">&lt;</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">void</span><span class="special">*&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/size.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/size.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/size.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>size</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="back.html" title="back">
+<link rel="prev" href="back.html" title="back">
 <link rel="next" href="at.html" title="at">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="back.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="at.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.size"></a>size
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="size">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.size"></a><a class="link" href="size.html" title="size">size</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.size.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id463304"></a>
-            Description
-=======
-<a name="id714907"></a>
-=======
-<a name="id675418"></a>
-=======
-<a name="id667772"></a>
-=======
-<a name="id690271"></a>
-=======
-<a name="id679479"></a>
-=======
-<a name="id676202"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id669648"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.metafunctions.size.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the result type of size.
+            Returns the result type of <a class="link" href="../functions/size.html" title="size"><code class="computeroutput"><span class="identifier">size</span></code></a>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.size.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id463351"></a>
-            Synopsis
-=======
-<a name="id714936"></a>
-=======
-<a name="id675447"></a>
-=======
-<a name="id667801"></a>
-=======
-<a name="id690299"></a>
-=======
-<a name="id679508"></a>
-=======
-<a name="id676231"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id669677"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.metafunctions.size.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">size</span>
@@ -105,123 +44,78 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id463448"></a><p class="title"><b>Table 1.24. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id715006"></a><p class="title"><b>Table 1.24. Parameters</b></p>
-=======
-<a name="id675517"></a><p class="title"><b>Table 1.28. Parameters</b></p>
-=======
-<a name="id667871"></a><p class="title"><b>Table 1.28. Parameters</b></p>
-=======
-<a name="id690916"></a><p class="title"><b>Table&#160;1.28.&#160;Parameters</b></p>
-=======
-<a name="id679577"></a><p class="title"><b>Table&#160;1.28.&#160;Parameters</b></p>
-=======
-<a name="id676300"></a><p class="title"><b>Table&#160;1.28.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id669747"></a><p class="title"><b>Table&#160;1.28.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.size.expression_semantics"></a><h6>
-<a name="id463548"></a>
-            <a href="size.html#fusion.sequence.intrinsic.metafunctions.size.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.size.expression_semantics"></a><h6>
-<a name="id676382"></a>
+<a name="id669828"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.metafunctions.size.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
+            <span class="bold"><strong>Return type</strong></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
             Integral Constant</a>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the number of elements
-            in <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the number of elements
+            in <code class="computeroutput"><span class="identifier">Seq</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.size.header"></a><h6>
-<a name="id676454"></a>
+<a name="id669900"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.metafunctions.size.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">size</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">size</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.size.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id463662"></a>
-            Example
-=======
-<a name="id715163"></a>
-=======
-<a name="id677424"></a>
-=======
-<a name="id669779"></a>
-=======
-<a name="id691184"></a>
-=======
-<a name="id679846"></a>
-=======
-<a name="id676569"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id670016"></a>
             <a class="link" href="size.html#fusion.sequence.intrinsic.metafunctions.size.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::size<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">size_mpl_integral_constant</span><span class="special">;</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">size_mpl_integral_constant</span><span class="special">;</span>
 <span class="identifier">BOOST_MPL_ASSERT_RELATION</span><span class="special">(</span><span class="identifier">size_mpl_integral_constant</span><span class="special">::</span><span class="identifier">value</span><span class="special">,</span> <span class="special">==,</span> <span class="number">3</span><span class="special">);</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/swap.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>swap</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="value_at_key.html" title="value_at_key">
+<link rel="prev" href="value_at_key.html" title="value_at_key">
 <link rel="next" href="../../operator.html" title="Operator">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="value_at_key.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../operator.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.swap"></a>swap
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="swap">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.swap"></a><a class="link" href="swap.html" title="swap">swap</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.swap.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id469266"></a>
-            Description
-=======
-<a name="id720274"></a>
-=======
-<a name="id682916"></a>
-=======
-<a name="id675271"></a>
-=======
-<a name="id698861"></a>
-=======
-<a name="id686430"></a>
-=======
-<a name="id683154"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id676600"></a>
             <a class="link" href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Returns the return type of swap.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.swap.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id469297"></a>
-            Synopsis
-=======
-<a name="id720294"></a>
-=======
-<a name="id682937"></a>
-=======
-<a name="id675291"></a>
-=======
-<a name="id698881"></a>
-=======
-<a name="id686451"></a>
-=======
-<a name="id683174"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id676620"></a>
             <a class="link" href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">swap</span>
@@ -105,85 +44,65 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id469414"></a><p class="title"><b>Table 1.32. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id720378"></a><p class="title"><b>Table 1.32. Parameters</b></p>
-=======
-<a name="id683021"></a><p class="title"><b>Table 1.36. Parameters</b></p>
-=======
-<a name="id675375"></a><p class="title"><b>Table 1.36. Parameters</b></p>
-=======
-<a name="id698965"></a><p class="title"><b>Table&#160;1.36.&#160;Parameters</b></p>
-=======
-<a name="id686535"></a><p class="title"><b>Table&#160;1.36.&#160;Parameters</b></p>
-=======
-<a name="id683258"></a><p class="title"><b>Table&#160;1.36.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id676704"></a><p class="title"><b>Table&#160;1.36.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameters
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq1</span></tt>, <tt class="computeroutput"><span class="identifier">Seq2</span></tt>
-                </p></td>
-<td><p>
-                  Models of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq1</span></code>, <code class="computeroutput"><span class="identifier">Seq2</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  Models of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   The sequences being swapped
-                </p></td>
+                </p>
+                </td>
 </tr></tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.swap.expression_semantics"></a><h6>
-<a name="id469528"></a>
-            <a href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.swap.expression_semantics"></a><h6>
-<a name="id683348"></a>
+<a name="id676794"></a>
             <a class="link" href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">swap</span><span class="special">&lt;</span><span class="identifier">Seq1</span><span class="special">,</span> <span class="identifier">Seq2</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">void</span></tt>.
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">void</span></code>.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Always returns <tt class="computeroutput"><span class="keyword">void</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Always returns <code class="computeroutput"><span class="keyword">void</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.swap.header"></a><h6>
-<a name="id683431"></a>
+<a name="id676877"></a>
             <a class="link" href="swap.html#fusion.sequence.intrinsic.metafunctions.swap.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">swap</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>value_at</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="at_c.html" title="at_c">
+<link rel="prev" href="at_c.html" title="at_c">
 <link rel="next" href="value_at_c.html" title="value_at_c">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="at_c.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="value_at_c.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.value_at"></a>value_at
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="value_at">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.value_at"></a><a class="link" href="value_at.html" title="value_at">value_at</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id465491"></a>
-            Description
-=======
-<a name="id717519"></a>
-=======
-<a name="id678911"></a>
-=======
-<a name="id671265"></a>
-=======
-<a name="id692671"></a>
-=======
-<a name="id681333"></a>
-=======
-<a name="id678056"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id671502"></a>
             <a class="link" href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the actual type at a given index from the Sequence.
+            Returns the actual type at a given index from the <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id465529"></a>
-            Synopsis
-=======
-<a name="id717547"></a>
-=======
-<a name="id678939"></a>
-=======
-<a name="id671293"></a>
-=======
-<a name="id692699"></a>
-=======
-<a name="id681360"></a>
-=======
-<a name="id678084"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id671530"></a>
             <a class="link" href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -107,136 +46,97 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id465644"></a><p class="title"><b>Table 1.27. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id717633"></a><p class="title"><b>Table 1.27. Parameters</b></p>
-=======
-<a name="id679025"></a><p class="title"><b>Table 1.31. Parameters</b></p>
-=======
-<a name="id671379"></a><p class="title"><b>Table 1.31. Parameters</b></p>
-=======
-<a name="id692785"></a><p class="title"><b>Table&#160;1.31.&#160;Parameters</b></p>
-=======
-<a name="id681447"></a><p class="title"><b>Table&#160;1.31.&#160;Parameters</b></p>
-=======
-<a name="id678170"></a><p class="title"><b>Table&#160;1.31.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id671616"></a><p class="title"><b>Table&#160;1.31.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">N</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">N</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
                   Integral Constant</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Index of element
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.value_at.expression_semantics"></a><h6>
-<a name="id465789"></a>
-            <a href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.value_at.expression_semantics"></a><h6>
-<a name="id678286"></a>
+<a name="id671733"></a>
             <a class="link" href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">N</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type.
+            <span class="bold"><strong>Return type</strong></span>: Any type.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the actual type at
-            the <tt class="computeroutput"><span class="identifier">N</span></tt>th element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the actual type at
+            the <code class="computeroutput"><span class="identifier">N</span></code>th element of <code class="computeroutput"><span class="identifier">Seq</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at.header"></a><h6>
-<a name="id678369"></a>
+<a name="id671816"></a>
             <a class="link" href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">value_at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">value_at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id465918"></a>
-            Example
-=======
-<a name="id717838"></a>
-=======
-<a name="id679342"></a>
-=======
-<a name="id671696"></a>
-=======
-<a name="id694878"></a>
-=======
-<a name="id683607"></a>
-=======
-<a name="id680331"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id673777"></a>
             <a class="link" href="value_at.html#fusion.sequence.intrinsic.metafunctions.value_at.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::value_at<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;));</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="value_at.html" title="value_at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">int_</span><span class="special">&lt;</span><span class="number">1</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_c.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>value_at_c</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="value_at.html" title="value_at">
+<link rel="prev" href="value_at.html" title="value_at">
 <link rel="next" href="has_key.html" title="has_key">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="value_at.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="has_key.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.value_at_c"></a>value_at_c
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="value_at_c">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.value_at_c"></a><a class="link" href="value_at_c.html" title="value_at_c">value_at_c</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at_c.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id466177"></a>
-            Description
-=======
-<a name="id718018"></a>
-=======
-<a name="id680274"></a>
-=======
-<a name="id672628"></a>
-=======
-<a name="id695058"></a>
-=======
-<a name="id683787"></a>
-=======
-<a name="id680511"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id673957"></a>
             <a class="link" href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the actual type at a given index from the Sequence.
+            Returns the actual type at a given index from the <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at_c.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id466216"></a>
-            Synopsis
-=======
-<a name="id718046"></a>
-=======
-<a name="id680301"></a>
-=======
-<a name="id672655"></a>
-=======
-<a name="id695085"></a>
-=======
-<a name="id683815"></a>
-=======
-<a name="id680538"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id673985"></a>
             <a class="link" href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -107,135 +46,96 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id466331"></a><p class="title"><b>Table 1.28. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id718132"></a><p class="title"><b>Table 1.28. Parameters</b></p>
-=======
-<a name="id680388"></a><p class="title"><b>Table 1.32. Parameters</b></p>
-=======
-<a name="id672742"></a><p class="title"><b>Table 1.32. Parameters</b></p>
-=======
-<a name="id695172"></a><p class="title"><b>Table&#160;1.32.&#160;Parameters</b></p>
-=======
-<a name="id683901"></a><p class="title"><b>Table&#160;1.32.&#160;Parameters</b></p>
-=======
-<a name="id680625"></a><p class="title"><b>Table&#160;1.32.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id674071"></a><p class="title"><b>Table&#160;1.32.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">M</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">M</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Positive integer index
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Index of element
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.value_at_c.expression_semantics"></a><h6>
-<a name="id466468"></a>
-            <a href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.value_at_c.expression_semantics"></a><h6>
-<a name="id680737"></a>
+<a name="id674184"></a>
             <a class="link" href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_c</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">M</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type
+            <span class="bold"><strong>Return type</strong></span>: Any type
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the actual type at
-            the <tt class="computeroutput"><span class="identifier">M</span></tt>th element of <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the actual type at
+            the <code class="computeroutput"><span class="identifier">M</span></code>th element of <code class="computeroutput"><span class="identifier">Seq</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at_c.header"></a><h6>
-<a name="id680823"></a>
+<a name="id674269"></a>
             <a class="link" href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">value_at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">value_at</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at_c.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id466598"></a>
-            Example
-=======
-<a name="id718334"></a>
-=======
-<a name="id680706"></a>
-=======
-<a name="id673060"></a>
-=======
-<a name="id695490"></a>
-=======
-<a name="id684219"></a>
-=======
-<a name="id680943"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id674389"></a>
             <a class="link" href="value_at_c.html#fusion.sequence.intrinsic.metafunctions.value_at_c.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::value_at_c<span class="special">&lt;</span><span class="identifier">vec</span><span class="special">,</span> <span class="number">1</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;));</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">float</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="value_at_c.html" title="value_at_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_c</span></code></a><span class="special">&lt;</span><span class="identifier">vec</span><span class="special">,</span> <span class="number">1</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/intrinsic/metafunctions/value_at_key.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>value_at_key</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../metafunctions.html" title="Metafunctions">
-<link rel="previous" href="at_key.html" title="at_key">
+<link rel="prev" href="at_key.html" title="at_key">
 <link rel="next" href="swap.html" title="swap">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,73 +22,20 @@
 <div class="spirit-nav">
 <a accesskey="p" href="at_key.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../metafunctions.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="swap.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.intrinsic.metafunctions.value_at_key"></a>value_at_key
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="value_at_key">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.intrinsic.metafunctions.value_at_key"></a><a class="link" href="value_at_key.html" title="value_at_key">value_at_key</a>
+</h5></div></div></div>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at_key.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id468523"></a>
-            Description
-=======
-<a name="id719741"></a>
-=======
-<a name="id682267"></a>
-=======
-<a name="id674621"></a>
-=======
-<a name="id698212"></a>
-=======
-<a name="id685781"></a>
-=======
-<a name="id682504"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id675951"></a>
             <a class="link" href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Returns the actual element type associated with a Key from the Sequence.
+            Returns the actual element type associated with a Key from the <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at_key.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id468561"></a>
-            Synopsis
-=======
-<a name="id719765"></a>
-=======
-<a name="id682291"></a>
-=======
-<a name="id674645"></a>
-=======
-<a name="id698236"></a>
-=======
-<a name="id685805"></a>
-=======
-<a name="id682528"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id675975"></a>
             <a class="link" href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">Seq</span><span class="special">,</span>
@@ -107,136 +46,97 @@
 <span class="special">};</span>
 </pre>
 <div class="table">
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id468676"></a><p class="title"><b>Table 1.31. Parameters</b></p>
-<table class="table" summary="Parameters">
-=======
-<a name="id719851"></a><p class="title"><b>Table 1.31. Parameters</b></p>
-=======
-<a name="id682378"></a><p class="title"><b>Table 1.35. Parameters</b></p>
-=======
-<a name="id674732"></a><p class="title"><b>Table 1.35. Parameters</b></p>
-=======
-<a name="id698322"></a><p class="title"><b>Table&#160;1.35.&#160;Parameters</b></p>
-=======
-<a name="id685892"></a><p class="title"><b>Table&#160;1.35.&#160;Parameters</b></p>
-=======
-<a name="id682615"></a><p class="title"><b>Table&#160;1.35.&#160;Parameters</b></p>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id676061"></a><p class="title"><b>Table&#160;1.35.&#160;Parameters</b></p>
 <div class="table-contents"><table class="table" summary="Parameters">
->>>>>>> .merge-right.r57125
 <colgroup>
 <col>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                <p>
                   Parameter
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Requirement
-                </p></th>
-<th><p>
+                </p>
+                </th>
+<th>
+                <p>
                   Description
-                </p></th>
+                </p>
+                </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Seq</span></tt>
-                </p></td>
-<td><p>
-                  A model of <a href="../../concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Seq</span></code>
+                </p>
+                </td>
+<td>
+                <p>
+                  A model of <a class="link" href="../../concepts/forward_sequence.html" title="Forward Sequence">Forward
                   Sequence</a>
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Argument sequence
-                </p></td>
+                </p>
+                </td>
 </tr>
 <tr>
-<td><p>
-                  <tt class="computeroutput"><span class="identifier">Key</span></tt>
-                </p></td>
-<td><p>
+<td>
+                <p>
+                  <code class="computeroutput"><span class="identifier">Key</span></code>
+                </p>
+                </td>
+<td>
+                <p>
                   Any type
-                </p></td>
-<td><p>
+                </p>
+                </td>
+<td>
+                <p>
                   Key type
-                </p></td>
+                </p>
+                </td>
 </tr>
 </tbody>
-</table>
+</table></div>
 </div>
-<<<<<<< .working
-<a name="fusion.sequence.intrinsic.metafunctions.value_at_key.expression_semantics"></a><h6>
-<a name="id468815"></a>
-            <a href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.expression_semantics">Expression
-=======
 <br class="table-break"><a name="fusion.sequence.intrinsic.metafunctions.value_at_key.expression_semantics"></a><h6>
-<a name="id682726"></a>
+<a name="id676173"></a>
             <a class="link" href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at_key</span><span class="special">&lt;</span><span class="identifier">Seq</span><span class="special">,</span> <span class="identifier">Key</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: Any type.
+            <span class="bold"><strong>Return type</strong></span>: Any type.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the actual element
-            type associated with key type <tt class="computeroutput"><span class="identifier">Key</span></tt>
-            in <tt class="computeroutput"><span class="identifier">Seq</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the actual element
+            type associated with key type <code class="computeroutput"><span class="identifier">Key</span></code>
+            in <code class="computeroutput"><span class="identifier">Seq</span></code>.
           </p>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at_key.header"></a><h6>
-<a name="id682812"></a>
+<a name="id676258"></a>
             <a class="link" href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.header">Header</a>
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">intrinsic</span><span class="special">/</span><span class="identifier">value_at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">value_at_key</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.intrinsic.metafunctions.value_at_key.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id468944"></a>
-            Example
-=======
-<a name="id720052"></a>
-=======
-<a name="id682694"></a>
-=======
-<a name="id675049"></a>
-=======
-<a name="id698639"></a>
-=======
-<a name="id686208"></a>
-=======
-<a name="id682932"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id676378"></a>
             <a class="link" href="value_at_key.html#fusion.sequence.intrinsic.metafunctions.value_at_key.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="keyword">typedef</span> map<span class="special">&lt;</span>pair<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> pair<span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> pair<span class="special">&lt;</span><span class="keyword">double</span><span class="special">,</span> <span cla
ss="keyword">char</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">mymap</span><span class="special">;</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span>result_of::at_key<span class="special">&lt;</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;));</span>
+<pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../../../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a><span class="special">&lt;</span><a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;,</span> <a class="link" href="../../../support/pair.html" title="pair"><code class="computeroutput"><span class="identifier">pair</span></code></a><span class="special">&lt;</span><span c
lass="keyword">double</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">mymap</span><span class="special">;</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><a class="link" href="at_key.html" title="at_key"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_key</span></code></a><span class="special">&lt;</span><span class="identifier">mymap</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;::</span><span class="identifier">type</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Operator</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../sequence.html" title="Sequence">
-<link rel="previous" href="intrinsic/metafunctions/swap.html" title="swap">
+<link rel="prev" href="intrinsic/metafunctions/swap.html" title="swap">
 <link rel="next" href="operator/i_o.html" title="I/O">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,26 +22,23 @@
 <div class="spirit-nav">
 <a accesskey="p" href="intrinsic/metafunctions/swap.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../sequence.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="operator/i_o.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.sequence.operator"></a>Operator
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Operator">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.sequence.operator"></a><a class="link" href="operator.html" title="Operator">Operator</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">I/O</span></dt>
 <dt><span class="section">Comparison</span></dt>
 </dl></div>
 <p>
-        These operators, like the Algorithms,
+        These operators, like the <a class="link" href="../algorithm.html" title="Algorithm">Algorithms</a>,
         work generically on all Fusion sequences. All conforming Fusion sequences
         automatically get these operators for free.
       </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Comparison</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../operator.html" title="Operator">
-<link rel="previous" href="i_o/out.html" title="out">
+<link rel="prev" href="i_o/out.html" title="out">
 <link rel="next" href="comparison/equal.html" title="equal">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="i_o/out.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../operator.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="comparison/equal.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.sequence.operator.comparison"></a>Comparison
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="Comparison">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.sequence.operator.comparison"></a><a class="link" href="comparison.html" title="Comparison">Comparison</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">equal</span></dt>
 <dt><span class="section"><a href="comparison/not_equal.html">not
@@ -47,32 +40,25 @@
           than equal</a></span></dt>
 </dl></div>
 <p>
-          The Comparison operators: <tt class="computeroutput"><span class="special">==</span></tt>,
-          <tt class="computeroutput"><span class="special">!=</span></tt>, <tt class="computeroutput"><span class="special">&lt;</span></tt>,
-          <tt class="computeroutput"><span class="special">&lt;=</span></tt>, <tt class="computeroutput"><span class="special">&gt;=</span></tt>
-          and <tt class="computeroutput"><span class="special">&gt;=</span></tt> work generically
+          The Comparison operators: <code class="computeroutput"><span class="special">==</span></code>,
+          <code class="computeroutput"><span class="special">!=</span></code>, <code class="computeroutput"><span class="special">&lt;</span></code>,
+          <code class="computeroutput"><span class="special">&lt;=</span></code>, <code class="computeroutput"><span class="special">&gt;=</span></code>
+          and <code class="computeroutput"><span class="special">&gt;=</span></code> work generically
           on all Fusion sequences. Comparison operators are "short- circuited":
           elementary comparisons start from the first elements and are performed
           only until the result is clear.
         </p>
-<<<<<<< .working
-<a name="fusion.sequence.operator.comparison.header"></a><h5>
-<a name="id472612"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.sequence.operator.comparison.header"></a><h6>
-<a name="id678811"></a>
+<a name="id679048"></a>
           <a class="link" href="comparison.html#fusion.sequence.operator.comparison.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/equal.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/equal.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/equal.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,20 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>equal</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../comparison.html" title="Comparison">
-<link rel="previous" href="../comparison.html" title="Comparison">
-<link rel="next" href="not_equal.html" title="not
-          equal">
+<link rel="prev" href="../comparison.html" title="Comparison">
+<link rel="next" href="not_equal.html" title="not equal">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -31,106 +22,28 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../comparison.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../comparison.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="not_equal.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.operator.comparison.equal"></a>equal
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="equal">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.operator.comparison.equal"></a><a class="link" href="equal.html" title="equal">equal</a>
+</h5></div></div></div>
 <a name="fusion.sequence.operator.comparison.equal.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id472785"></a>
-            Description
-=======
-<a name="id723820"></a>
-=======
-<a name="id686575"></a>
-=======
-<a name="id678929"></a>
-=======
-<a name="id701427"></a>
-=======
-<a name="id688996"></a>
-=======
-<a name="id685720"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id679166"></a>
             <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
             Compare two sequences for equality.
           </p>
 <a name="fusion.sequence.operator.comparison.equal.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id472815"></a>
-            Synopsis
-=======
-<a name="id723838"></a>
-=======
-<a name="id686593"></a>
-=======
-<a name="id678947"></a>
-=======
-<a name="id701445"></a>
-=======
-<a name="id689014"></a>
-=======
-<a name="id685738"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id679184"></a>
             <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">&gt;</span>
 <span class="keyword">bool</span>
 <span class="keyword">operator</span><span class="special">==(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">b</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.equal.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id472966"></a>
-            Parameters
-=======
-<a name="id723945"></a>
-=======
-<a name="id686700"></a>
-=======
-<a name="id679054"></a>
-=======
-<a name="id701552"></a>
-=======
-<a name="id689121"></a>
-=======
-<a name="id685844"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id679291"></a>
             <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -139,72 +52,59 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
-                    <span class="identifier">b</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of Sequence
-                  </p></td>
-<td><p>
-                    Sequence(s) to compare
-                  </p></td>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
+                    <span class="identifier">b</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>(s) to compare
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.operator.comparison.equal.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id473097"></a>
-            <a href="equal.html#fusion.sequence.operator.comparison.equal.expression_semantics">Expression
-=======
-<a name="id724048"></a>
-=======
-<a name="id686803"></a>
-=======
-<a name="id679157"></a>
-=======
-<a name="id701655"></a>
-=======
-<a name="id689224"></a>
-=======
-<a name="id685948"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id679394"></a>
             <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">a</span> <span class="special">==</span> <span class="identifier">b</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>
           </p>
 <p>
-            <span class="bold"><b>Requirements</b></span>:
+            <span class="bold"><strong>Requirements</strong></span>:
           </p>
 <p>
-            For each element, <tt class="computeroutput"><span class="identifier">e1</span></tt>,
-            in sequence <tt class="computeroutput"><span class="identifier">a</span></tt>, and for
-            each element, <tt class="computeroutput"><span class="identifier">e2</span></tt>, in
-            sequence <tt class="computeroutput"><span class="identifier">b</span></tt>, <tt class="computeroutput"><span class="identifier">a</span> <span class="special">==</span> <span class="identifier">b</span></tt> is a valid expression returning a
+            For each element, <code class="computeroutput"><span class="identifier">e1</span></code>,
+            in sequence <code class="computeroutput"><span class="identifier">a</span></code>, and for
+            each element, <code class="computeroutput"><span class="identifier">e2</span></code>, in
+            sequence <code class="computeroutput"><span class="identifier">b</span></code>, <code class="computeroutput"><span class="identifier">a</span> <span class="special">==</span> <span class="identifier">b</span></code> is a valid expression returning a
             type that is convertible to bool.
           </p>
 <p>
@@ -212,79 +112,29 @@
             compile time error.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>:
+            <span class="bold"><strong>Semantics</strong></span>:
           </p>
 <p>
-            For each element, <tt class="computeroutput"><span class="identifier">e1</span></tt>,
-            in sequence <tt class="computeroutput"><span class="identifier">a</span></tt>, and for
-            each element, <tt class="computeroutput"><span class="identifier">e2</span></tt>, in
-            sequence <tt class="computeroutput"><span class="identifier">b</span></tt>, <tt class="computeroutput"><span class="identifier">e1</span> <span class="special">==</span> <span class="identifier">e2</span></tt> returns true. For any 2 zero length
+            For each element, <code class="computeroutput"><span class="identifier">e1</span></code>,
+            in sequence <code class="computeroutput"><span class="identifier">a</span></code>, and for
+            each element, <code class="computeroutput"><span class="identifier">e2</span></code>, in
+            sequence <code class="computeroutput"><span class="identifier">b</span></code>, <code class="computeroutput"><span class="identifier">e1</span> <span class="special">==</span> <span class="identifier">e2</span></code> returns true. For any 2 zero length
             <span class="underline">_sequence</span>_s, e and f, e == f returns
             true.
           </p>
 <a name="fusion.sequence.operator.comparison.equal.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id473355"></a>
-            Header
-=======
-<a name="id724222"></a>
-=======
-<a name="id686977"></a>
-=======
-<a name="id679331"></a>
-=======
-<a name="id701829"></a>
-=======
-<a name="id689398"></a>
-=======
-<a name="id686122"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id679568"></a>
             <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.equal.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id473522"></a>
-            Example
-=======
-<a name="id724338"></a>
-=======
-<a name="id687092"></a>
-=======
-<a name="id679446"></a>
-=======
-<a name="id701944"></a>
-=======
-<a name="id689514"></a>
-=======
-<a name="id686237"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id679683"></a>
             <a class="link" href="equal.html#fusion.sequence.operator.comparison.equal.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v1</span> <span class="special">==</span> <span class="identifier">v2</span><span class="special">);</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,24 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>greater
-          than</title>
+<title>greater than</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../comparison.html" title="Comparison">
-<link rel="previous" href="less_than_equal.html" title="less
-          than equal">
-<link rel="next" href="greater_than_equal.html" title="greater
-          than equal">
+<link rel="prev" href="less_than_equal.html" title="less than equal">
+<link rel="next" href="greater_than_equal.html" title="greater than equal">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -33,79 +22,25 @@
 <div class="spirit-nav">
 <a accesskey="p" href="less_than_equal.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../comparison.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="greater_than_equal.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.operator.comparison.greater_than"></a><a href="greater_than.html" title="greater
-          than">greater
+<div class="section" title="greater than">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.operator.comparison.greater_than"></a><a class="link" href="greater_than.html" title="greater than">greater
           than</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <p>
             Lexicographically compare two sequences.
           </p>
 <a name="fusion.sequence.operator.comparison.greater_than.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id476656"></a>
-            Synopsis
-=======
-<a name="id728882"></a>
-=======
-<a name="id689588"></a>
-=======
-<a name="id681942"></a>
-=======
-<a name="id705260"></a>
-=======
-<a name="id692829"></a>
-=======
-<a name="id689552"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id682998"></a>
             <a class="link" href="greater_than.html#fusion.sequence.operator.comparison.greater_than.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">&gt;</span>
 <span class="keyword">bool</span>
 <span class="keyword">operator</span><span class="special">&gt;(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">b</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.greater_than.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id476808"></a>
-            Parameters
-=======
-<a name="id728993"></a>
-=======
-<a name="id689700"></a>
-=======
-<a name="id682054"></a>
-=======
-<a name="id705371"></a>
-=======
-<a name="id692940"></a>
-=======
-<a name="id689664"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id683110"></a>
             <a class="link" href="greater_than.html#fusion.sequence.operator.comparison.greater_than.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -114,72 +49,59 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
-                    <span class="identifier">b</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of Sequence
-                  </p></td>
-<td><p>
-                    Sequence(s) to compare
-                  </p></td>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
+                    <span class="identifier">b</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>(s) to compare
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.operator.comparison.greater_than.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id476940"></a>
-            <a href="greater_than.html#fusion.sequence.operator.comparison.greater_than.expression_semantics">Expression
-=======
-<a name="id729096"></a>
-=======
-<a name="id689803"></a>
-=======
-<a name="id682157"></a>
-=======
-<a name="id705474"></a>
-=======
-<a name="id693044"></a>
-=======
-<a name="id689767"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id683213"></a>
             <a class="link" href="greater_than.html#fusion.sequence.operator.comparison.greater_than.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">a</span> <span class="special">&gt;</span> <span class="identifier">b</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>
           </p>
 <p>
-            <span class="bold"><b>Requirements</b></span>:
+            <span class="bold"><strong>Requirements</strong></span>:
           </p>
 <p>
-            For each element, <tt class="computeroutput"><span class="identifier">e1</span></tt>,
-            in sequence <tt class="computeroutput"><span class="identifier">a</span></tt>, and for
-            each element, <tt class="computeroutput"><span class="identifier">e2</span></tt>, in
-            sequence <tt class="computeroutput"><span class="identifier">b</span></tt>, <tt class="computeroutput"><span class="identifier">a</span> <span class="special">&lt;</span> <span class="identifier">b</span></tt> is a valid expression returning a
+            For each element, <code class="computeroutput"><span class="identifier">e1</span></code>,
+            in sequence <code class="computeroutput"><span class="identifier">a</span></code>, and for
+            each element, <code class="computeroutput"><span class="identifier">e2</span></code>, in
+            sequence <code class="computeroutput"><span class="identifier">b</span></code>, <code class="computeroutput"><span class="identifier">a</span> <span class="special">&lt;</span> <span class="identifier">b</span></code> is a valid expression returning a
             type that is convertible to bool.
           </p>
 <p>
@@ -187,72 +109,22 @@
             compile time error.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns b &lt; a.
+            <span class="bold"><strong>Semantics</strong></span>: Returns b &lt; a.
           </p>
 <a name="fusion.sequence.operator.comparison.greater_than.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id477117"></a>
-            Header
-=======
-<a name="id729213"></a>
-=======
-<a name="id689919"></a>
-=======
-<a name="id682273"></a>
-=======
-<a name="id705591"></a>
-=======
-<a name="id693160"></a>
-=======
-<a name="id689883"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id683330"></a>
             <a class="link" href="greater_than.html#fusion.sequence.operator.comparison.greater_than.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">less_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">less_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.greater_than.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id477284"></a>
-            Example
-=======
-<a name="id729330"></a>
-=======
-<a name="id690037"></a>
-=======
-<a name="id682391"></a>
-=======
-<a name="id705708"></a>
-=======
-<a name="id693278"></a>
-=======
-<a name="id690001"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id683447"></a>
             <a class="link" href="greater_than.html#fusion.sequence.operator.comparison.greater_than.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">long</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">4.4</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">long</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">4.4</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v2</span> <span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v3</span> <span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">);</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/greater_than_equal.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,22 +1,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>greater
-          than equal</title>
+<title>greater than equal</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../comparison.html" title="Comparison">
-<link rel="previous" href="greater_than.html" title="greater
-          than">
+<link rel="prev" href="greater_than.html" title="greater than">
 <link rel="next" href="../../../container.html" title="Container">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,79 +22,25 @@
 <div class="spirit-nav">
 <a accesskey="p" href="greater_than.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../comparison.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../../container.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.operator.comparison.greater_than_equal"></a><a href="greater_than_equal.html" title="greater
-          than equal">greater
+<div class="section" title="greater than equal">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.operator.comparison.greater_than_equal"></a><a class="link" href="greater_than_equal.html" title="greater than equal">greater
           than equal</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <p>
             Lexicographically compare two sequences.
           </p>
 <a name="fusion.sequence.operator.comparison.greater_than_equal.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id477625"></a>
-            Synopsis
-=======
-<a name="id729575"></a>
-=======
-<a name="id691921"></a>
-=======
-<a name="id684275"></a>
-=======
-<a name="id706636"></a>
-=======
-<a name="id694206"></a>
-=======
-<a name="id690929"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id684375"></a>
             <a class="link" href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">&gt;</span>
 <span class="keyword">bool</span>
 <span class="keyword">operator</span><span class="special">&gt;=(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">b</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.greater_than_equal.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id477779"></a>
-            Parameters
-=======
-<a name="id729684"></a>
-=======
-<a name="id692030"></a>
-=======
-<a name="id684384"></a>
-=======
-<a name="id706746"></a>
-=======
-<a name="id694315"></a>
-=======
-<a name="id691038"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id684484"></a>
             <a class="link" href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -113,72 +49,59 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
-                    <span class="identifier">b</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of Sequence
-                  </p></td>
-<td><p>
-                    Sequence(s) to compare
-                  </p></td>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
+                    <span class="identifier">b</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>(s) to compare
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.operator.comparison.greater_than_equal.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id477911"></a>
-            <a href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.expression_semantics">Expression
-=======
-<a name="id729854"></a>
-=======
-<a name="id692131"></a>
-=======
-<a name="id684485"></a>
-=======
-<a name="id706846"></a>
-=======
-<a name="id694416"></a>
-=======
-<a name="id691139"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id684585"></a>
             <a class="link" href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">a</span> <span class="special">&gt;=</span> <span class="identifier">b</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>
           </p>
 <p>
-            <span class="bold"><b>Requirements</b></span>:
+            <span class="bold"><strong>Requirements</strong></span>:
           </p>
 <p>
-            For each element, <tt class="computeroutput"><span class="identifier">e1</span></tt>,
-            in sequence <tt class="computeroutput"><span class="identifier">a</span></tt>, and for
-            each element, <tt class="computeroutput"><span class="identifier">e2</span></tt>, in
-            sequence <tt class="computeroutput"><span class="identifier">b</span></tt>, <tt class="computeroutput"><span class="identifier">a</span> <span class="special">&lt;</span> <span class="identifier">b</span></tt> is a valid expression returning a
+            For each element, <code class="computeroutput"><span class="identifier">e1</span></code>,
+            in sequence <code class="computeroutput"><span class="identifier">a</span></code>, and for
+            each element, <code class="computeroutput"><span class="identifier">e2</span></code>, in
+            sequence <code class="computeroutput"><span class="identifier">b</span></code>, <code class="computeroutput"><span class="identifier">a</span> <span class="special">&lt;</span> <span class="identifier">b</span></code> is a valid expression returning a
             type that is convertible to bool.
           </p>
 <p>
@@ -186,72 +109,22 @@
             compile time error.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns !(a &lt; b).
+            <span class="bold"><strong>Semantics</strong></span>: Returns !(a &lt; b).
           </p>
 <a name="fusion.sequence.operator.comparison.greater_than_equal.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id478087"></a>
-            Header
-=======
-<a name="id729973"></a>
-=======
-<a name="id692249"></a>
-=======
-<a name="id684604"></a>
-=======
-<a name="id706965"></a>
-=======
-<a name="id694534"></a>
-=======
-<a name="id691258"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id684704"></a>
             <a class="link" href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">greater_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">greater_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.greater_than_equal.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id478255"></a>
-            Example
-=======
-<a name="id730093"></a>
-=======
-<a name="id692369"></a>
-=======
-<a name="id684724"></a>
-=======
-<a name="id707085"></a>
-=======
-<a name="id694654"></a>
-=======
-<a name="id691378"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id684824"></a>
             <a class="link" href="greater_than_equal.html#fusion.sequence.operator.comparison.greater_than_equal.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">long</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">4.4</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">long</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">4.4</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v2</span> <span class="special">&gt;=</span> <span class="identifier">v1</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v3</span> <span class="special">&gt;=</span> <span class="identifier">v2</span><span class="special">);</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,24 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>less
-          than</title>
+<title>less than</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../comparison.html" title="Comparison">
-<link rel="previous" href="not_equal.html" title="not
-          equal">
-<link rel="next" href="less_than_equal.html" title="less
-          than equal">
+<link rel="prev" href="not_equal.html" title="not equal">
+<link rel="next" href="less_than_equal.html" title="less than equal">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -33,79 +22,25 @@
 <div class="spirit-nav">
 <a accesskey="p" href="not_equal.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../comparison.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="less_than_equal.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.operator.comparison.less_than"></a><a href="less_than.html" title="less
-          than">less
+<div class="section" title="less than">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.operator.comparison.less_than"></a><a class="link" href="less_than.html" title="less than">less
           than</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <p>
             Lexicographically compare two sequences.
           </p>
 <a name="fusion.sequence.operator.comparison.less_than.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id474689"></a>
-            Synopsis
-=======
-<a name="id725161"></a>
-=======
-<a name="id688189"></a>
-=======
-<a name="id680543"></a>
-=======
-<a name="id703860"></a>
-=======
-<a name="id691430"></a>
-=======
-<a name="id688153"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id681599"></a>
             <a class="link" href="less_than.html#fusion.sequence.operator.comparison.less_than.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">&gt;</span>
 <span class="keyword">bool</span>
 <span class="keyword">operator</span><span class="special">&lt;(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">b</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.less_than.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id474841"></a>
-            Parameters
-=======
-<a name="id727592"></a>
-=======
-<a name="id688298"></a>
-=======
-<a name="id680652"></a>
-=======
-<a name="id703970"></a>
-=======
-<a name="id691539"></a>
-=======
-<a name="id688262"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id681708"></a>
             <a class="link" href="less_than.html#fusion.sequence.operator.comparison.less_than.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -114,72 +49,59 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
-                    <span class="identifier">b</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of Sequence
-                  </p></td>
-<td><p>
-                    Sequence(s) to compare
-                  </p></td>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
+                    <span class="identifier">b</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>(s) to compare
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.operator.comparison.less_than.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id474973"></a>
-            <a href="less_than.html#fusion.sequence.operator.comparison.less_than.expression_semantics">Expression
-=======
-<a name="id727695"></a>
-=======
-<a name="id688401"></a>
-=======
-<a name="id680755"></a>
-=======
-<a name="id704073"></a>
-=======
-<a name="id691642"></a>
-=======
-<a name="id688365"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id681812"></a>
             <a class="link" href="less_than.html#fusion.sequence.operator.comparison.less_than.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">a</span> <span class="special">&lt;</span> <span class="identifier">b</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>
           </p>
 <p>
-            <span class="bold"><b>Requirements</b></span>:
+            <span class="bold"><strong>Requirements</strong></span>:
           </p>
 <p>
-            For each element, <tt class="computeroutput"><span class="identifier">e1</span></tt>,
-            in sequence <tt class="computeroutput"><span class="identifier">a</span></tt>, and for
-            each element, <tt class="computeroutput"><span class="identifier">e2</span></tt>, in
-            sequence <tt class="computeroutput"><span class="identifier">b</span></tt>, <tt class="computeroutput"><span class="identifier">a</span> <span class="special">&lt;</span> <span class="identifier">b</span></tt> is a valid expression returning a
+            For each element, <code class="computeroutput"><span class="identifier">e1</span></code>,
+            in sequence <code class="computeroutput"><span class="identifier">a</span></code>, and for
+            each element, <code class="computeroutput"><span class="identifier">e2</span></code>, in
+            sequence <code class="computeroutput"><span class="identifier">b</span></code>, <code class="computeroutput"><span class="identifier">a</span> <span class="special">&lt;</span> <span class="identifier">b</span></code> is a valid expression returning a
             type that is convertible to bool.
           </p>
 <p>
@@ -187,74 +109,24 @@
             compile time error.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns the lexicographical
-            comparison of between <tt class="computeroutput"><span class="identifier">a</span></tt>
-            and <tt class="computeroutput"><span class="identifier">b</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: Returns the lexicographical
+            comparison of between <code class="computeroutput"><span class="identifier">a</span></code>
+            and <code class="computeroutput"><span class="identifier">b</span></code>.
           </p>
 <a name="fusion.sequence.operator.comparison.less_than.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id475172"></a>
-            Header
-=======
-<a name="id727826"></a>
-=======
-<a name="id688532"></a>
-=======
-<a name="id680886"></a>
-=======
-<a name="id704204"></a>
-=======
-<a name="id691773"></a>
-=======
-<a name="id688496"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id681942"></a>
             <a class="link" href="less_than.html#fusion.sequence.operator.comparison.less_than.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">less</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">less</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.less_than.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id475339"></a>
-            Example
-=======
-<a name="id727941"></a>
-=======
-<a name="id688647"></a>
-=======
-<a name="id681001"></a>
-=======
-<a name="id704319"></a>
-=======
-<a name="id691888"></a>
-=======
-<a name="id688611"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id682058"></a>
             <a class="link" href="less_than.html#fusion.sequence.operator.comparison.less_than.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">long</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">4.4</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">long</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">4.4</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v1</span> <span class="special">&lt;</span> <span class="identifier">v2</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v2</span> <span class="special">&lt;</span> <span class="identifier">v3</span><span class="special">);</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than_equal.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than_equal.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/less_than_equal.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,24 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>less
-          than equal</title>
+<title>less than equal</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../comparison.html" title="Comparison">
-<link rel="previous" href="less_than.html" title="less
-          than">
-<link rel="next" href="greater_than.html" title="greater
-          than">
+<link rel="prev" href="less_than.html" title="less than">
+<link rel="next" href="greater_than.html" title="greater than">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -33,79 +22,25 @@
 <div class="spirit-nav">
 <a accesskey="p" href="less_than.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../comparison.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="greater_than.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.operator.comparison.less_than_equal"></a><a href="less_than_equal.html" title="less
-          than equal">less
+<div class="section" title="less than equal">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.operator.comparison.less_than_equal"></a><a class="link" href="less_than_equal.html" title="less than equal">less
           than equal</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <p>
             Lexicographically compare two sequences.
           </p>
 <a name="fusion.sequence.operator.comparison.less_than_equal.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id475682"></a>
-            Synopsis
-=======
-<a name="id728183"></a>
-=======
-<a name="id688890"></a>
-=======
-<a name="id681244"></a>
-=======
-<a name="id704561"></a>
-=======
-<a name="id692130"></a>
-=======
-<a name="id688854"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id682300"></a>
             <a class="link" href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">&gt;</span>
 <span class="keyword">bool</span>
 <span class="keyword">operator</span><span class="special">&lt;=(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">b</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.less_than_equal.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id475835"></a>
-            Parameters
-=======
-<a name="id728295"></a>
-=======
-<a name="id689001"></a>
-=======
-<a name="id681355"></a>
-=======
-<a name="id704673"></a>
-=======
-<a name="id692242"></a>
-=======
-<a name="id688965"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id682412"></a>
             <a class="link" href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -114,72 +49,59 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
-                    <span class="identifier">b</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of Sequence
-                  </p></td>
-<td><p>
-                    Sequence(s) to compare
-                  </p></td>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
+                    <span class="identifier">b</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>(s) to compare
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.operator.comparison.less_than_equal.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id475968"></a>
-            <a href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.expression_semantics">Expression
-=======
-<a name="id728398"></a>
-=======
-<a name="id689104"></a>
-=======
-<a name="id681459"></a>
-=======
-<a name="id704776"></a>
-=======
-<a name="id692345"></a>
-=======
-<a name="id689068"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id682515"></a>
             <a class="link" href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">a</span> <span class="special">&lt;=</span> <span class="identifier">b</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>
           </p>
 <p>
-            <span class="bold"><b>Requirements</b></span>:
+            <span class="bold"><strong>Requirements</strong></span>:
           </p>
 <p>
-            For each element, <tt class="computeroutput"><span class="identifier">e1</span></tt>,
-            in sequence <tt class="computeroutput"><span class="identifier">a</span></tt>, and for
-            each element, <tt class="computeroutput"><span class="identifier">e2</span></tt>, in
-            sequence <tt class="computeroutput"><span class="identifier">b</span></tt>, <tt class="computeroutput"><span class="identifier">a</span> <span class="special">&lt;</span> <span class="identifier">b</span></tt> is a valid expression returning a
+            For each element, <code class="computeroutput"><span class="identifier">e1</span></code>,
+            in sequence <code class="computeroutput"><span class="identifier">a</span></code>, and for
+            each element, <code class="computeroutput"><span class="identifier">e2</span></code>, in
+            sequence <code class="computeroutput"><span class="identifier">b</span></code>, <code class="computeroutput"><span class="identifier">a</span> <span class="special">&lt;</span> <span class="identifier">b</span></code> is a valid expression returning a
             type that is convertible to bool.
           </p>
 <p>
@@ -187,72 +109,22 @@
             compile time error.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: Returns !(b &lt; a).
+            <span class="bold"><strong>Semantics</strong></span>: Returns !(b &lt; a).
           </p>
 <a name="fusion.sequence.operator.comparison.less_than_equal.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id476144"></a>
-            Header
-=======
-<a name="id728517"></a>
-=======
-<a name="id689223"></a>
-=======
-<a name="id681577"></a>
-=======
-<a name="id704895"></a>
-=======
-<a name="id692464"></a>
-=======
-<a name="id689187"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id682634"></a>
             <a class="link" href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">less_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">less_equal</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.less_than_equal.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id476312"></a>
-            Example
-=======
-<a name="id728637"></a>
-=======
-<a name="id689343"></a>
-=======
-<a name="id681697"></a>
-=======
-<a name="id705015"></a>
-=======
-<a name="id692584"></a>
-=======
-<a name="id689307"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id682754"></a>
             <a class="link" href="less_than_equal.html#fusion.sequence.operator.comparison.less_than_equal.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">long</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">4.4</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">4</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">short</span><span class="special">,</span> <span class="keyword">float</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">3.3f</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">long</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="number">4.4</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v1</span> <span class="special">&lt;=</span> <span class="identifier">v2</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v2</span> <span class="special">&lt;=</span> <span class="identifier">v3</span><span class="special">);</span>
 </pre>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/not_equal.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/not_equal.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/comparison/not_equal.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,23 +1,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>not
-          equal</title>
+<title>not equal</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../comparison.html" title="Comparison">
-<link rel="previous" href="equal.html" title="equal">
-<link rel="next" href="less_than.html" title="less
-          than">
+<link rel="prev" href="equal.html" title="equal">
+<link rel="next" href="less_than.html" title="less than">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -32,79 +22,25 @@
 <div class="spirit-nav">
 <a accesskey="p" href="equal.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../comparison.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="less_than.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.operator.comparison.not_equal"></a><a href="not_equal.html" title="not
-          equal">not
+<div class="section" title="not equal">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.operator.comparison.not_equal"></a><a class="link" href="not_equal.html" title="not equal">not
           equal</a>
-</h5></div></div>
-<div></div>
-</div>
+</h5></div></div></div>
 <p>
             Compare two sequences for inequality.
           </p>
 <a name="fusion.sequence.operator.comparison.not_equal.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id473757"></a>
-            Synopsis
-=======
-<a name="id724501"></a>
-=======
-<a name="id687255"></a>
-=======
-<a name="id679609"></a>
-=======
-<a name="id702108"></a>
-=======
-<a name="id689677"></a>
-=======
-<a name="id686400"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id679846"></a>
             <a class="link" href="not_equal.html#fusion.sequence.operator.comparison.not_equal.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Seq1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Seq2</span><span class="special">&gt;</span>
 <span class="keyword">bool</span>
 <span class="keyword">operator</span><span class="special">!=(</span><span class="identifier">Seq1</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">a</span><span class="special">,</span> <span class="identifier">Seq2</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">b</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.not_equal.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id473909"></a>
-            Parameters
-=======
-<a name="id724610"></a>
-=======
-<a name="id687364"></a>
-=======
-<a name="id679719"></a>
-=======
-<a name="id702217"></a>
-=======
-<a name="id689786"></a>
-=======
-<a name="id686509"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id679956"></a>
             <a class="link" href="not_equal.html#fusion.sequence.operator.comparison.not_equal.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -113,72 +49,59 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                    <tt class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
-                    <span class="identifier">b</span></tt>
-                  </p></td>
-<td><p>
-                    Instances of Sequence
-                  </p></td>
-<td><p>
-                    Sequence(s) to compare
-                  </p></td>
+<td>
+                  <p>
+                    <code class="computeroutput"><span class="identifier">a</span><span class="special">,</span>
+                    <span class="identifier">b</span></code>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    Instances of <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>(s) to compare
+                  </p>
+                  </td>
 </tr></tbody>
 </table></div>
 <a name="fusion.sequence.operator.comparison.not_equal.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id474042"></a>
-            <a href="not_equal.html#fusion.sequence.operator.comparison.not_equal.expression_semantics">Expression
-=======
-<a name="id724713"></a>
-=======
-<a name="id687468"></a>
-=======
-<a name="id679822"></a>
-=======
-<a name="id702320"></a>
-=======
-<a name="id689889"></a>
-=======
-<a name="id686612"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id680059"></a>
             <a class="link" href="not_equal.html#fusion.sequence.operator.comparison.not_equal.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">a</span> <span class="special">!=</span> <span class="identifier">b</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="keyword">bool</span></tt>
+            <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="keyword">bool</span></code>
           </p>
 <p>
-            <span class="bold"><b>Requirements</b></span>:
+            <span class="bold"><strong>Requirements</strong></span>:
           </p>
 <p>
-            For each element, <tt class="computeroutput"><span class="identifier">e1</span></tt>,
-            in sequence <tt class="computeroutput"><span class="identifier">a</span></tt>, and for
-            each element, <tt class="computeroutput"><span class="identifier">e2</span></tt>, in
-            sequence <tt class="computeroutput"><span class="identifier">b</span></tt>, <tt class="computeroutput"><span class="identifier">a</span> <span class="special">==</span> <span class="identifier">b</span></tt> is a valid expression returning a
+            For each element, <code class="computeroutput"><span class="identifier">e1</span></code>,
+            in sequence <code class="computeroutput"><span class="identifier">a</span></code>, and for
+            each element, <code class="computeroutput"><span class="identifier">e2</span></code>, in
+            sequence <code class="computeroutput"><span class="identifier">b</span></code>, <code class="computeroutput"><span class="identifier">a</span> <span class="special">==</span> <span class="identifier">b</span></code> is a valid expression returning a
             type that is convertible to bool.
           </p>
 <p>
@@ -186,74 +109,24 @@
             compile time error.
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>:
+            <span class="bold"><strong>Semantics</strong></span>:
           </p>
 <p>
             Returns !(a == b).
           </p>
 <a name="fusion.sequence.operator.comparison.not_equal.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id474221"></a>
-            Header
-=======
-<a name="id724833"></a>
-=======
-<a name="id687588"></a>
-=======
-<a name="id679942"></a>
-=======
-<a name="id702440"></a>
-=======
-<a name="id690009"></a>
-=======
-<a name="id686732"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id680179"></a>
             <a class="link" href="not_equal.html#fusion.sequence.operator.comparison.not_equal.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">comparison</span><span class="special">/</span><span class="identifier">not_equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">not_equal_to</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.operator.comparison.not_equal.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id474388"></a>
-            Example
-=======
-<a name="id724948"></a>
-=======
-<a name="id687703"></a>
-=======
-<a name="id680057"></a>
-=======
-<a name="id703648"></a>
-=======
-<a name="id691217"></a>
-=======
-<a name="id687940"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id681387"></a>
             <a class="link" href="not_equal.html#fusion.sequence.operator.comparison.not_equal.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="char">'b'</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">t4</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v3</span><span class="special">(</span><span class="number">5</span><span class="special">,</span> <span class="char">'b'</span><span class="special">);</span>
+<a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">t4</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="char">'a'</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v1</span> <span class="special">!=</span> <span class="identifier">v3</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(</span><span class="identifier">v1</span> <span class="special">!=</span> <span class="identifier">t4</span><span class="special">);</span>
 <span class="identifier">assert</span><span class="special">(!(</span><span class="identifier">v1</span> <span class="special">!=</span> <span class="identifier">v2</span><span class="special">));</span>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>I/O</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../operator.html" title="Operator">
-<link rel="previous" href="../operator.html" title="Operator">
+<link rel="prev" href="../operator.html" title="Operator">
 <link rel="next" href="i_o/in.html" title="in">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,61 +22,58 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../operator.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../operator.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="i_o/in.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.sequence.operator.i_o"></a>I/O
-</h4></div></div>
-<div></div>
-</div>
+<div class="section" title="I/O">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.sequence.operator.i_o"></a><a class="link" href="i_o.html" title="I/O">I/O</a>
+</h4></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">in</span></dt>
 <dt><span class="section">out</span></dt>
 </dl></div>
 <p>
-          The I/O operators: <tt class="computeroutput"><span class="special">&lt;&lt;</span></tt>
-          and <tt class="computeroutput"><span class="special">&gt;&gt;</span></tt> work generically
-          on all Fusion sequences. The global <tt class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;&lt;</span></tt> has been overloaded for generic
-          output streams such that Sequence(s)
-          are output by recursively calling <tt class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;&lt;</span></tt> for each element. Analogously,
-          the global <tt class="computeroutput"><span class="keyword">operator</span><span class="special">&gt;&gt;</span></tt>
-          has been overloaded to extract Sequence(s)
-          from generic input streams by recursively calling <tt class="computeroutput"><span class="keyword">operator</span><span class="special">&gt;&gt;</span></tt> for each element.
+          The I/O operators: <code class="computeroutput"><span class="special">&lt;&lt;</span></code>
+          and <code class="computeroutput"><span class="special">&gt;&gt;</span></code> work generically
+          on all Fusion sequences. The global <code class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;&lt;</span></code> has been overloaded for generic
+          output streams such that <a class="link" href="../../sequence.html" title="Sequence">Sequence</a>(s)
+          are output by recursively calling <code class="computeroutput"><span class="keyword">operator</span><span class="special">&lt;&lt;</span></code> for each element. Analogously,
+          the global <code class="computeroutput"><span class="keyword">operator</span><span class="special">&gt;&gt;</span></code>
+          has been overloaded to extract <a class="link" href="../../sequence.html" title="Sequence">Sequence</a>(s)
+          from generic input streams by recursively calling <code class="computeroutput"><span class="keyword">operator</span><span class="special">&gt;&gt;</span></code> for each element.
         </p>
 <p>
-          The default delimiter between the elements is space, and the Sequence
+          The default delimiter between the elements is space, and the <a class="link" href="../../sequence.html" title="Sequence">Sequence</a>
           is enclosed in parenthesis. For Example:
         </p>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">float</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">a</span><span class="special">(</span><span class="number">1.0f</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="string">"Howdy folks!"</span><span class="special">);</span>
+<pre class="programlisting"><a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">float</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">&gt;</span> <span class="identifier">a</span><span class="special">(</span><span class="number">1.0f</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">(</span><span class="string">"Howdy folks!"</span><span class="special">);</span>
 <span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">a</span><span class="special">;</span>
 </pre>
 <p>
-          outputs the vector
+          outputs the <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>
           as: (1.0 2 Howdy folks!)
         </p>
 <p>
           The library defines three manipulators for changing the default behavior:
         </p>
-<div class="variablelist">
+<div class="variablelist" title="Manipulators">
 <p class="title"><b>Manipulators</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">tuple_open</span><span class="special">(</span><span class="identifier">arg</span><span class="special">)</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">tuple_open</span><span class="special">(</span><span class="identifier">arg</span><span class="special">)</span></code></span></dt>
 <dd><p>
               Defines the character that is output before the first element.
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">tuple_close</span><span class="special">(</span><span class="identifier">arg</span><span class="special">)</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">tuple_close</span><span class="special">(</span><span class="identifier">arg</span><span class="special">)</span></code></span></dt>
 <dd><p>
               Defines the character that is output after the last element.
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">tuple_delimiter</span><span class="special">(</span><span class="identifier">arg</span><span class="special">)</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">tuple_delimiter</span><span class="special">(</span><span class="identifier">arg</span><span class="special">)</span></code></span></dt>
 <dd><p>
               Defines the delimiter character between elements.
             </p></dd>
 </dl>
 </div>
 <p>
-          The argument to <tt class="computeroutput"><span class="identifier">tuple_open</span></tt>,
-          <tt class="computeroutput"><span class="identifier">tuple_close</span></tt> and <tt class="computeroutput"><span class="identifier">tuple_delimiter</span></tt> may be a <tt class="computeroutput"><span class="keyword">char</span></tt>, <tt class="computeroutput"><span class="keyword">wchar_t</span></tt>,
+          The argument to <code class="computeroutput"><span class="identifier">tuple_open</span></code>,
+          <code class="computeroutput"><span class="identifier">tuple_close</span></code> and <code class="computeroutput"><span class="identifier">tuple_delimiter</span></code> may be a <code class="computeroutput"><span class="keyword">char</span></code>, <code class="computeroutput"><span class="keyword">wchar_t</span></code>,
           a C-string, or a wide C-string.
         </p>
 <p>
@@ -89,12 +82,12 @@
 <pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">tuple_open</span><span class="special">(</span><span class="char">'['</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">tuple_close</span><span class="special">(</span><span class="char">']'</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">tuple_delimiter</span><span class="special">(</span><span class="string">", "</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">a</span><span class="special">;</span>
 </pre>
 <p>
-          outputs the same vector, <tt class="computeroutput"><span class="identifier">a</span></tt>
+          outputs the same <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>, <code class="computeroutput"><span class="identifier">a</span></code>
           as: [1.0, 2, Howdy folks!]
         </p>
 <p>
-          The same manipulators work with <tt class="computeroutput"><span class="keyword">operator</span><span class="special">&gt;&gt;</span></tt> and <tt class="computeroutput"><span class="identifier">istream</span></tt>
-          as well. Suppose the <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cin</span></tt>
+          The same manipulators work with <code class="computeroutput"><span class="keyword">operator</span><span class="special">&gt;&gt;</span></code> and <code class="computeroutput"><span class="identifier">istream</span></code>
+          as well. Suppose the <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cin</span></code>
           stream contains the following data:
         </p>
 <pre class="programlisting"><span class="special">(</span><span class="number">1</span> <span class="number">2</span> <span class="number">3</span><span class="special">)</span> <span class="special">[</span><span class="number">4</span><span class="special">:</span><span class="number">5</span><span class="special">]</span>
@@ -102,41 +95,34 @@
 <p>
           The code:
         </p>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">i</span><span class="special">;</span>
-vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">j</span><span class="special">;</span>
+<pre class="programlisting"><a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">i</span><span class="special">;</span>
+<a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">j</span><span class="special">;</span>
 
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cin</span> <span class="special">&gt;&gt;</span> <span class="identifier">i</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cin</span> <span class="special">&gt;&gt;</span> <span class="identifier">set_open</span><span class="special">(</span><span class="char">'['</span><span class="special">)</span> <span class="special">&gt;&gt;</span> <span class="identifier">set_close</span><span class="special">(</span><span class="char">']'</span><span class="special">)</span> <span class="special">&gt;&gt;</span> <span class="identifier">set_delimiter</span><span class="special">(</span><span class="char">':'</span><span class="special">);</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cin</span> <span class="special">&gt;&gt;</span> <span class="identifier">j</span><span class="special">;</span>
 </pre>
 <p>
-          reads the data into the vector(s) <tt class="computeroutput"><span class="identifier">i</span></tt>
-          and <tt class="computeroutput"><span class="identifier">j</span></tt>.
+          reads the data into the <a class="link" href="../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>(s) <code class="computeroutput"><span class="identifier">i</span></code>
+          and <code class="computeroutput"><span class="identifier">j</span></code>.
         </p>
 <p>
-          Note that extracting Sequence(s)
-          with <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span></tt> or C-style string elements does
-          not generally work, since the streamed Sequence
+          Note that extracting <a class="link" href="../../sequence.html" title="Sequence">Sequence</a>(s)
+          with <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span></code> or C-style string elements does
+          not generally work, since the streamed <a class="link" href="../../sequence.html" title="Sequence">Sequence</a>
           representation may not be unambiguously parseable.
         </p>
-<<<<<<< .working
-<a name="fusion.sequence.operator.i_o.header"></a><h5>
-<a name="id470864"></a>
-          Header
-        </h5>
-=======
 <a name="fusion.sequence.operator.i_o.header"></a><h6>
-<a name="id676501"></a>
+<a name="id677830"></a>
           <a class="link" href="i_o.html#fusion.sequence.operator.i_o.header">Header</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">io</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">io</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/in.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/in.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/in.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>in</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../i_o.html" title="I/O">
-<link rel="previous" href="../i_o.html" title="I/O">
+<link rel="prev" href="../i_o.html" title="I/O">
 <link rel="next" href="out.html" title="out">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,107 +22,29 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../i_o.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../i_o.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="out.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.operator.i_o.in"></a>in
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="in">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.operator.i_o.in"></a><a class="link" href="in.html" title="in">in</a>
+</h5></div></div></div>
 <a name="fusion.sequence.operator.i_o.in.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id471038"></a>
-            Description
-=======
-<a name="id721510"></a>
-=======
-<a name="id684264"></a>
-=======
-<a name="id676618"></a>
-=======
-<a name="id700209"></a>
-=======
-<a name="id687778"></a>
-=======
-<a name="id684501"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id677948"></a>
             <a class="link" href="in.html#fusion.sequence.operator.i_o.in.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Read a Sequence from an input
+            Read a <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a> from an input
             stream.
           </p>
 <a name="fusion.sequence.operator.i_o.in.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id471075"></a>
-            Synopsis
-=======
-<a name="id721531"></a>
-=======
-<a name="id684286"></a>
-=======
-<a name="id676640"></a>
-=======
-<a name="id700230"></a>
-=======
-<a name="id687800"></a>
-=======
-<a name="id684523"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id677969"></a>
             <a class="link" href="in.html#fusion.sequence.operator.i_o.in.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">IStream</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="identifier">IStream</span><span class="special">&amp;</span>
 <span class="keyword">operator</span><span class="special">&gt;&gt;(</span><span class="identifier">IStream</span><span class="special">&amp;</span> <span class="identifier">is</span><span class="special">,</span> <span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.operator.i_o.in.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id471219"></a>
-            Parameters
-=======
-<a name="id721632"></a>
-=======
-<a name="id684386"></a>
-=======
-<a name="id676741"></a>
-=======
-<a name="id700331"></a>
-=======
-<a name="id687901"></a>
-=======
-<a name="id684624"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id678070"></a>
             <a class="link" href="in.html#fusion.sequence.operator.i_o.in.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -139,143 +53,86 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
+<td>
+                  <p>
                     is
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     An input stream.
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Stream to extract information from.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
+<td>
+                  <p>
                     seq
-                  </p></td>
-<td><p>
-                    A Sequence.
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    A <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>.
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence to read.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.sequence.operator.i_o.in.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id471348"></a>
-            <a href="in.html#fusion.sequence.operator.i_o.in.expression_semantics">Expression
-=======
-<a name="id721738"></a>
-=======
-<a name="id684492"></a>
-=======
-<a name="id676846"></a>
-=======
-<a name="id700437"></a>
-=======
-<a name="id688006"></a>
-=======
-<a name="id684730"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id678176"></a>
             <a class="link" href="in.html#fusion.sequence.operator.i_o.in.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">is</span> <span class="special">&gt;&gt;</span> <span class="identifier">seq</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: IStream&amp;
+            <span class="bold"><strong>Return type</strong></span>: IStream&amp;
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: For each element, <tt class="computeroutput"><span class="identifier">e</span></tt>, in sequence, <tt class="computeroutput"><span class="identifier">seq</span></tt>,
-            call <tt class="computeroutput"><span class="identifier">is</span> <span class="special">&gt;&gt;</span>
-            <span class="identifier">e</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: For each element, <code class="computeroutput"><span class="identifier">e</span></code>, in sequence, <code class="computeroutput"><span class="identifier">seq</span></code>,
+            call <code class="computeroutput"><span class="identifier">is</span> <span class="special">&gt;&gt;</span>
+            <span class="identifier">e</span></code>.
           </p>
 <a name="fusion.sequence.operator.i_o.in.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id471465"></a>
-            Header
-=======
-<a name="id721817"></a>
-=======
-<a name="id685664"></a>
-=======
-<a name="id678018"></a>
-=======
-<a name="id700516"></a>
-=======
-<a name="id688086"></a>
-=======
-<a name="id684809"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id678255"></a>
             <a class="link" href="in.html#fusion.sequence.operator.i_o.in.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">io</span><span class="special">/</span><span class="identifier">in</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">in</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.operator.i_o.in.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id471630"></a>
-            Example
-=======
-<a name="id723025"></a>
-=======
-<a name="id685779"></a>
-=======
-<a name="id678133"></a>
-=======
-<a name="id700632"></a>
-=======
-<a name="id688201"></a>
-=======
-<a name="id684924"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id678370"></a>
             <a class="link" href="in.html#fusion.sequence.operator.i_o.in.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">;</span>
+<pre class="programlisting"><a class="link" href="../../../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cin</span> <span class="special">&gt;&gt;</span> <span class="identifier">v</span><span class="special">;</span>
 </pre>
 </div>

Modified: branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/out.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/out.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/sequence/operator/i_o/out.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,18 +3,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>out</title>
 <link rel="stylesheet" href="../../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../../index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="../../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="up" href="../i_o.html" title="I/O">
-<link rel="previous" href="in.html" title="in">
+<link rel="prev" href="in.html" title="in">
 <link rel="next" href="../comparison.html" title="Comparison">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,107 +22,29 @@
 <div class="spirit-nav">
 <a accesskey="p" href="in.html"><img src="../../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../i_o.html"><img src="../../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../../index.html"><img src="../../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../comparison.html"><img src="../../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h5 class="title">
-<a name="fusion.sequence.operator.i_o.out"></a>out
-</h5></div></div>
-<div></div>
-</div>
+<div class="section" title="out">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="fusion.sequence.operator.i_o.out"></a><a class="link" href="out.html" title="out">out</a>
+</h5></div></div></div>
 <a name="fusion.sequence.operator.i_o.out.description"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id471787"></a>
-            Description
-=======
-<a name="id723130"></a>
-=======
-<a name="id685885"></a>
-=======
-<a name="id678239"></a>
-=======
-<a name="id700737"></a>
-=======
-<a name="id688306"></a>
-=======
-<a name="id685030"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id678476"></a>
             <a class="link" href="out.html#fusion.sequence.operator.i_o.out.description">Description</a>
->>>>>>> .merge-right.r57125
           </h6>
 <p>
-            Write a Sequence to an output
+            Write a <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a> to an output
             stream.
           </p>
 <a name="fusion.sequence.operator.i_o.out.synopsis"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id471825"></a>
-            Synopsis
-=======
-<a name="id723152"></a>
-=======
-<a name="id685906"></a>
-=======
-<a name="id678261"></a>
-=======
-<a name="id700759"></a>
-=======
-<a name="id688328"></a>
-=======
-<a name="id685051"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id678498"></a>
             <a class="link" href="out.html#fusion.sequence.operator.i_o.out.synopsis">Synopsis</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">OStream</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="identifier">OStream</span><span class="special">&amp;</span>
 <span class="keyword">operator</span><span class="special">&lt;&lt;(</span><span class="identifier">OStream</span><span class="special">&amp;</span> <span class="identifier">os</span><span class="special">,</span> <span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">seq</span><span class="special">);</span>
 </pre>
 <a name="fusion.sequence.operator.i_o.out.parameters"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id471969"></a>
-            Parameters
-=======
-<a name="id723253"></a>
-=======
-<a name="id686007"></a>
-=======
-<a name="id678361"></a>
-=======
-<a name="id700860"></a>
-=======
-<a name="id688429"></a>
-=======
-<a name="id685152"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id678598"></a>
             <a class="link" href="out.html#fusion.sequence.operator.i_o.out.parameters">Parameters</a>
->>>>>>> .merge-right.r57125
           </h6>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -139,143 +53,86 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+                  <p>
                     Parameter
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Requirement
-                  </p></th>
-<th><p>
+                  </p>
+                  </th>
+<th>
+                  <p>
                     Description
-                  </p></th>
+                  </p>
+                  </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
+<td>
+                  <p>
                     os
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     An output stream.
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
                     Stream to write information to.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 <tr>
-<td><p>
+<td>
+                  <p>
                     seq
-                  </p></td>
-<td><p>
-                    A Sequence.
-                  </p></td>
-<td><p>
+                  </p>
+                  </td>
+<td>
+                  <p>
+                    A <a class="link" href="../../../sequence.html" title="Sequence">Sequence</a>.
+                  </p>
+                  </td>
+<td>
+                  <p>
                     The sequence to write.
-                  </p></td>
+                  </p>
+                  </td>
 </tr>
 </tbody>
 </table></div>
 <a name="fusion.sequence.operator.i_o.out.expression_semantics"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id472097"></a>
-            <a href="out.html#fusion.sequence.operator.i_o.out.expression_semantics">Expression
-=======
-<a name="id723358"></a>
-=======
-<a name="id686113"></a>
-=======
-<a name="id678467"></a>
-=======
-<a name="id700965"></a>
-=======
-<a name="id688534"></a>
-=======
-<a name="id685258"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id678704"></a>
             <a class="link" href="out.html#fusion.sequence.operator.i_o.out.expression_semantics">Expression
->>>>>>> .merge-right.r57125
             Semantics</a>
           </h6>
 <pre class="programlisting"><span class="identifier">os</span> <span class="special">&lt;&lt;</span> <span class="identifier">seq</span>
 </pre>
 <p>
-            <span class="bold"><b>Return type</b></span>: OStream&amp;
+            <span class="bold"><strong>Return type</strong></span>: OStream&amp;
           </p>
 <p>
-            <span class="bold"><b>Semantics</b></span>: For each element, <tt class="computeroutput"><span class="identifier">e</span></tt>, in sequence, <tt class="computeroutput"><span class="identifier">seq</span></tt>,
-            call <tt class="computeroutput"><span class="identifier">os</span> <span class="special">&lt;&lt;</span>
-            <span class="identifier">e</span></tt>.
+            <span class="bold"><strong>Semantics</strong></span>: For each element, <code class="computeroutput"><span class="identifier">e</span></code>, in sequence, <code class="computeroutput"><span class="identifier">seq</span></code>,
+            call <code class="computeroutput"><span class="identifier">os</span> <span class="special">&lt;&lt;</span>
+            <span class="identifier">e</span></code>.
           </p>
 <a name="fusion.sequence.operator.i_o.out.header"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id472215"></a>
-            Header
-=======
-<a name="id723438"></a>
-=======
-<a name="id686192"></a>
-=======
-<a name="id678546"></a>
-=======
-<a name="id701044"></a>
-=======
-<a name="id688614"></a>
-=======
-<a name="id685337"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id678783"></a>
             <a class="link" href="out.html#fusion.sequence.operator.i_o.out.header">Header</a>
->>>>>>> .merge-right.r57125
           </h6>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">sequence</span><span class="special">/</span><span class="identifier">io</span><span class="special">/</span><span class="identifier">out</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">out</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 <a name="fusion.sequence.operator.i_o.out.example"></a><h6>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<a name="id472381"></a>
-            Example
-=======
-<a name="id723553"></a>
-=======
-<a name="id686307"></a>
-=======
-<a name="id678661"></a>
-=======
-<a name="id701160"></a>
-=======
-<a name="id688729"></a>
-=======
-<a name="id685452"></a>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+<a name="id678898"></a>
             <a class="link" href="out.html#fusion.sequence.operator.i_o.out.example">Example</a>
->>>>>>> .merge-right.r57125
           </h6>
-<pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> make_vector<span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"Hello"</span><span class="special">,</span> <span class="char">'x'</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
+<pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <a class="link" href="../../../container/generation/functions/make_vector.html" title="make_vector"><code class="computeroutput"><span class="identifier">make_vector</span></code></a><span class="special">(</span><span class="number">123</span><span class="special">,</span> <span class="string">"Hello"</span><span class="special">,</span> <span class="char">'x'</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: branches/release/libs/fusion/doc/html/fusion/support.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/support.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Support</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="organization.html" title="Organization">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="organization.html" title="Organization">
 <link rel="next" href="support/is_sequence.html" title="is_sequence">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="organization.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="support/is_sequence.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.support"></a>Support
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Support">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.support"></a><a class="link" href="support.html" title="Support">Support</a>
+</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">is_sequence</span></dt>
 <dt><span class="section">is_view</span></dt>
@@ -48,7 +41,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/support/category_of.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/category_of.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/support/category_of.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>category_of</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../support.html" title="Support">
-<link rel="previous" href="tag_of.html" title="tag_of">
+<link rel="prev" href="tag_of.html" title="tag_of">
 <link rel="next" href="deduce.html" title="deduce">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,45 +22,24 @@
 <div class="spirit-nav">
 <a accesskey="p" href="tag_of.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="deduce.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.support.category_of"></a>category_of
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.support.category_of.description"></a><h4>
-<a name="id415166"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="category_of">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.support.category_of"></a><a class="link" href="category_of.html" title="category_of">category_of</a>
 </h3></div></div></div>
 <a name="fusion.support.category_of.description"></a><h5>
-<a name="id614510"></a>
+<a name="id616213"></a>
         <a class="link" href="category_of.html#fusion.support.category_of.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         A metafunction that establishes the conceptual classification of a particular
-        Sequence or Iterator
-        (see Iterator Concepts and
-        Sequence Concepts).
-      </p>
-<<<<<<< .working
-<a name="fusion.support.category_of.synopsis"></a><h4>
-<a name="id415216"></a>
-        Synopsis
-      </h4>
-=======
+        <a class="link" href="../sequence.html" title="Sequence">Sequence</a> or <a class="link" href="../iterator.html" title="Iterator">Iterator</a>
+        (see <a class="link" href="../iterator/concepts.html" title="Concepts">Iterator Concepts</a> and
+        <a class="link" href="../sequence/concepts.html" title="Concepts">Sequence Concepts</a>).
+      </p>
 <a name="fusion.support.category_of.synopsis"></a><h5>
-<a name="id614546"></a>
+<a name="id616249"></a>
         <a class="link" href="category_of.html#fusion.support.category_of.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
 <span class="special">{</span>
     <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
@@ -74,17 +49,10 @@
     <span class="special">};</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.category_of.parameters"></a><h4>
-<a name="id415332"></a>
-        Parameters
-      </h4>
-=======
 <a name="fusion.support.category_of.parameters"></a><h5>
-<a name="id614639"></a>
+<a name="id616343"></a>
         <a class="link" href="category_of.html#fusion.support.category_of.parameters">Parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -92,56 +60,62 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">T</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">T</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Any type
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 The type to query.
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.support.category_of.expression_semantics"></a><h4>
-<a name="id415431"></a>
-        <a href="category_of.html#fusion.support.category_of.expression_semantics">Expression
-=======
 <a name="fusion.support.category_of.expression_semantics"></a><h5>
-<a name="id614722"></a>
+<a name="id616426"></a>
         <a class="link" href="category_of.html#fusion.support.category_of.expression_semantics">Expression
->>>>>>> .merge-right.r57125
         Semantics</a>
-      </h4>
+      </h5>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">category_of</span><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">category</span><span class="special">;</span>
 </pre>
 <p>
-        <span class="bold"><b>Return type</b></span>:
+        <span class="bold"><strong>Return type</strong></span>:
       </p>
 <p>
         The return type is derived from one of:
       </p>
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">boost</span> <span class="special">{</span> <span class="keyword">namespace</span> <span class="identifier">fusion</span>
 <span class="special">{</span>
-    <span class="keyword">struct</span> <span class="identifier">incrementable_sequence_tag</span> <span class="special">{};</span>
+    <span class="keyword">struct</span> <span class="identifier">incrementable_traversal_tag</span> <span class="special">{};</span>
 
-    <span class="keyword">struct</span> <span class="identifier">single_pass_sequence_tag</span>
-        <span class="special">:</span> <span class="identifier">incrementable_sequence_tag</span> <span class="special">{};</span>
+    <span class="keyword">struct</span> <span class="identifier">single_pass_traversal_tag</span>
+        <span class="special">:</span> <span class="identifier">incrementable_traversal_tag</span> <span class="special">{};</span>
 
     <span class="keyword">struct</span> <span class="identifier">forward_traversal_tag</span>
-        <span class="special">:</span> <span class="identifier">single_pass_sequence_tag</span> <span class="special">{};</span>
+        <span class="special">:</span> <span class="identifier">single_pass_traversal_tag</span> <span class="special">{};</span>
 
     <span class="keyword">struct</span> <span class="identifier">bidirectional_traversal_tag</span>
         <span class="special">:</span> <span class="identifier">forward_traversal_tag</span> <span class="special">{};</span>
@@ -159,44 +133,30 @@
 <span class="special">}}</span>
 </pre>
 <p>
-        <span class="bold"><b>Semantics</b></span>: Establishes the conceptual classification
-        of a particular Sequence or Iterator.
+        <span class="bold"><strong>Semantics</strong></span>: Establishes the conceptual classification
+        of a particular <a class="link" href="../sequence.html" title="Sequence">Sequence</a> or <a class="link" href="../iterator.html" title="Iterator">Iterator</a>.
       </p>
-<<<<<<< .working
-<a name="fusion.support.category_of.header"></a><h4>
-<a name="id415978"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.support.category_of.header"></a><h5>
-<a name="id616377"></a>
+<a name="id616988"></a>
         <a class="link" href="category_of.html#fusion.support.category_of.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">support</span><span class="special">/</span><span class="identifier">category_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">category_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.category_of.example"></a><h4>
-<a name="id416116"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.support.category_of.example"></a><h5>
-<a name="id616485"></a>
+<a name="id617096"></a>
         <a class="link" href="category_of.html#fusion.support.category_of.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_base_of</span><span class="special">;</span>
-<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">category_of</span><span class="special">&lt;</span>list<span class="special">&lt;&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">list_category</span><span class="special">;</span>
-<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">category_of</span><span class="special">&lt;</span>vector<span class="special">&lt;&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">vector_category</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">category_of</span><span class="special">&lt;</span><a class="link" href="../container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special">&lt;&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">list_category</span><span class="special">;</span>
+<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">category_of</span><span class="special">&lt;</span><a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">vector_category</span><span class="special">;</span>
 <span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">is_base_of</span><span class="special">&lt;</span><span class="identifier">forward_traversal_tag</span><span class="special">,</span> <span class="identifier">list_category</span><span class="special">&gt;</span> <span class="special">));</span>
 <span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">is_base_of</span><span class="special">&lt;</span><span class="identifier">random_access_traversal_tag</span><span class="special">,</span> <span class="identifier">vector_category</span><span class="special">&gt;</span> <span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/support/deduce.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/deduce.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/support/deduce.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>deduce</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../support.html" title="Support">
-<link rel="previous" href="category_of.html" title="category_of">
+<link rel="prev" href="category_of.html" title="category_of">
 <link rel="next" href="deduce_sequence.html" title="deduce_sequence">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,62 +22,34 @@
 <div class="spirit-nav">
 <a accesskey="p" href="category_of.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="deduce_sequence.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.support.deduce"></a>deduce
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.support.deduce.description"></a><h4>
-<a name="id416406"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="deduce">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.support.deduce"></a><a class="link" href="deduce.html" title="deduce">deduce</a>
 </h3></div></div></div>
 <a name="fusion.support.deduce.description"></a><h5>
-<a name="id616706"></a>
+<a name="id617317"></a>
         <a class="link" href="deduce.html#fusion.support.deduce.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        Metafunction to apply <a href="../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+        Metafunction to apply <a class="link" href="../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
         conversion</em></span></a> to the full argument type.
       </p>
 <p>
-        It removes references to <tt class="computeroutput"><span class="keyword">const</span></tt>,
-        references to array types are kept, even if the array is <tt class="computeroutput"><span class="keyword">const</span></tt>.
-        Reference wrappers are removed (see boost::ref).
+        It removes references to <code class="computeroutput"><span class="keyword">const</span></code>,
+        references to array types are kept, even if the array is <code class="computeroutput"><span class="keyword">const</span></code>.
+        Reference wrappers are removed (see <a class="link" href="../notes.html#fusion.notes.boost__ref"><code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">ref</span></code></a>).
       </p>
-<<<<<<< .working
-<a name="fusion.support.deduce.header"></a><h4>
-<a name="id416503"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.support.deduce.header"></a><h5>
-<a name="id616763"></a>
+<a name="id617375"></a>
         <a class="link" href="deduce.html#fusion.support.deduce.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">support</span><span class="special">/</span><span class="identifier">deduce</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">deduce</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.deduce.synopsis"></a><h4>
-<a name="id416658"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.support.deduce.synopsis"></a><h5>
-<a name="id616871"></a>
+<a name="id617483"></a>
         <a class="link" href="deduce.html#fusion.support.deduce.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
 <span class="special">{</span>
     <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
@@ -91,17 +59,10 @@
     <span class="special">};</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.deduce.example"></a><h4>
-<a name="id416787"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.support.deduce.example"></a><h5>
-<a name="id616965"></a>
+<a name="id617576"></a>
         <a class="link" href="deduce.html#fusion.support.deduce.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">holder</span>
 <span class="special">{</span>
@@ -118,23 +79,15 @@
     <span class="keyword">return</span> <span class="identifier">holder</span><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;(</span><span class="identifier">a</span><span class="special">);</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.deduce.see_also"></a><h4>
-<a name="id417150"></a>
-        See also
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li>deduce_sequence</li></ul></div>
-=======
 <a name="fusion.support.deduce.see_also"></a><h5>
-<a name="id617233"></a>
+<a name="id617844"></a>
         <a class="link" href="deduce.html#fusion.support.deduce.see_also">See also</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="deduce_sequence.html" title="deduce_sequence"><code class="computeroutput"><span class="identifier">deduce_sequence</span></code></a></li></ul></div>
->>>>>>> .merge-right.r57125
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/support/deduce_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/deduce_sequence.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/support/deduce_sequence.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>deduce_sequence</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../support.html" title="Support">
-<link rel="previous" href="deduce.html" title="deduce">
+<link rel="prev" href="deduce.html" title="deduce">
 <link rel="next" href="pair.html" title="pair">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,62 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="deduce.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="pair.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.support.deduce_sequence"></a>deduce_sequence
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.support.deduce_sequence.description"></a><h4>
-<a name="id417217"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="deduce_sequence">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.support.deduce_sequence"></a><a class="link" href="deduce_sequence.html" title="deduce_sequence">deduce_sequence</a>
 </h3></div></div></div>
 <a name="fusion.support.deduce_sequence.description"></a><h5>
-<a name="id617273"></a>
+<a name="id617885"></a>
         <a class="link" href="deduce_sequence.html#fusion.support.deduce_sequence.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        Applies <a href="../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
-        conversion</em></span></a> to each element in a <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-        Sequence</a>. The resulting type is a <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+        Applies <a class="link" href="../notes.html#fusion.notes.element_conversion"><span class="emphasis"><em>element
+        conversion</em></span></a> to each element in a <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+        Sequence</a>. The resulting type is a <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
         Access Sequence</a> that provides a converting constructor accepting the
         original type as its argument.
       </p>
-<<<<<<< .working
-<a name="fusion.support.deduce_sequence.header"></a><h4>
-<a name="id417277"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.support.deduce_sequence.header"></a><h5>
-<a name="id617306"></a>
+<a name="id617917"></a>
         <a class="link" href="deduce_sequence.html#fusion.support.deduce_sequence.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">support</span><span class="special">/</span><span class="identifier">deduce_sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">deduce_sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.deduce_sequence.synopsis"></a><h4>
-<a name="id417432"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.support.deduce_sequence.synopsis"></a><h5>
-<a name="id617414"></a>
+<a name="id618025"></a>
         <a class="link" href="deduce_sequence.html#fusion.support.deduce_sequence.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
 <span class="special">{</span>
     <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
@@ -91,17 +57,10 @@
     <span class="special">};</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.deduce_sequence.example"></a><h4>
-<a name="id417561"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.support.deduce_sequence.example"></a><h5>
-<a name="id617507"></a>
+<a name="id618119"></a>
         <a class="link" href="deduce_sequence.html#fusion.support.deduce_sequence.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Seq</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">holder</span>
 <span class="special">{</span>
@@ -113,30 +72,22 @@
 <span class="special">};</span>
 
 <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T0</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">&gt;</span>
-<span class="identifier">holder</span><span class="special">&lt;</span> vector<span class="special">&lt;</span><span class="identifier">T0</span> <span class="keyword">const</span> <span class="special">&amp;,</span> <span class="identifier">T1</span> <span class="keyword">const</span> <span class="special">&amp;&gt;</span> <span class="special">&gt;</span>
+<span class="identifier">holder</span><span class="special">&lt;</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="identifier">T0</span> <span class="keyword">const</span> <span class="special">&amp;,</span> <span class="identifier">T1</span> <span class="keyword">const</span> <span class="special">&amp;&gt;</span> <span class="special">&gt;</span>
 <span class="identifier">make_holder</span><span class="special">(</span><span class="identifier">T0</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">a0</span><span class="special">,</span> <span class="identifier">T1</span> <span class="keyword">const</span> <span class="special">&amp;</span> <span class="identifier">a1</span><span class="special">)</span>
 <span class="special">{</span>
-    <span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="identifier">T0</span> <span class="keyword">const</span> <span class="special">&amp;,</span> <span class="identifier">T1</span> <span class="keyword">const</span> <span class="special">&amp;&gt;</span> <span class="identifier">arg_vec_t</span><span class="special">;</span>
+    <span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="identifier">T0</span> <span class="keyword">const</span> <span class="special">&amp;,</span> <span class="identifier">T1</span> <span class="keyword">const</span> <span class="special">&amp;&gt;</span> <span class="identifier">arg_vec_t</span><span class="special">;</span>
     <span class="keyword">return</span> <span class="identifier">holder</span><span class="special">&lt;</span><span class="identifier">arg_vec_t</span><span class="special">&gt;(</span> <span class="identifier">arg_vec_t</span><span class="special">(</span><span class="identifier">a0</span><span class="special">,</span><span class="identifier">a1</span><span class="special">)</span> <span class="special">);</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.deduce_sequence.see_also"></a><h4>
-<a name="id418120"></a>
-        See also
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li>deduce</li></ul></div>
-=======
 <a name="fusion.support.deduce_sequence.see_also"></a><h5>
-<a name="id617918"></a>
+<a name="id618529"></a>
         <a class="link" href="deduce_sequence.html#fusion.support.deduce_sequence.see_also">See also</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="deduce.html" title="deduce"><code class="computeroutput"><span class="identifier">deduce</span></code></a></li></ul></div>
->>>>>>> .merge-right.r57125
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/support/is_sequence.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/is_sequence.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/support/is_sequence.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>is_sequence</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../support.html" title="Support">
-<link rel="previous" href="../support.html" title="Support">
+<link rel="prev" href="../support.html" title="Support">
 <link rel="next" href="is_view.html" title="is_view">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,46 +22,25 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../support.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="is_view.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.support.is_sequence"></a>is_sequence
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.support.is_sequence.description"></a><h4>
-<a name="id412300"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="is_sequence">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.support.is_sequence"></a><a class="link" href="is_sequence.html" title="is_sequence">is_sequence</a>
 </h3></div></div></div>
 <a name="fusion.support.is_sequence.description"></a><h5>
-<a name="id612247"></a>
+<a name="id612858"></a>
         <a class="link" href="is_sequence.html#fusion.support.is_sequence.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        Metafunction that evaluates to <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>
-        if a certain type <tt class="computeroutput"><span class="identifier">T</span></tt> is a
-        conforming Fusion Sequence, <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt>
+        Metafunction that evaluates to <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>
+        if a certain type <code class="computeroutput"><span class="identifier">T</span></code> is a
+        conforming Fusion <a class="link" href="../sequence.html" title="Sequence">Sequence</a>, <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></code>
         otherwise. This may be specialized to accomodate clients which provide Fusion
         conforming sequences.
       </p>
-<<<<<<< .working
-<a name="fusion.support.is_sequence.synopsis"></a><h4>
-<a name="id412380"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.support.is_sequence.synopsis"></a><h5>
-<a name="id612305"></a>
+<a name="id612916"></a>
         <a class="link" href="is_sequence.html#fusion.support.is_sequence.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
 <span class="special">{</span>
     <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
@@ -75,17 +50,10 @@
     <span class="special">};</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.is_sequence.parameters"></a><h4>
-<a name="id412496"></a>
-        Parameters
-      </h4>
-=======
 <a name="fusion.support.is_sequence.parameters"></a><h5>
-<a name="id612398"></a>
+<a name="id613010"></a>
         <a class="link" href="is_sequence.html#fusion.support.is_sequence.parameters">Parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -93,87 +61,79 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">T</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">T</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Any type
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 The type to query.
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.support.is_sequence.expression_semantics"></a><h4>
-<a name="id412595"></a>
-        <a href="is_sequence.html#fusion.support.is_sequence.expression_semantics">Expression
-=======
 <a name="fusion.support.is_sequence.expression_semantics"></a><h5>
-<a name="id612481"></a>
+<a name="id613092"></a>
         <a class="link" href="is_sequence.html#fusion.support.is_sequence.expression_semantics">Expression
->>>>>>> .merge-right.r57125
         Semantics</a>
-      </h4>
+      </h5>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">c</span><span class="special">;</span>
 </pre>
 <p>
-        <span class="bold"><b>Return type</b></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
+        <span class="bold"><strong>Return type</strong></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
         Boolean Constant</a>.
       </p>
 <p>
-        <span class="bold"><b>Semantics</b></span>: Metafunction that evaluates to
-        <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt> if a certain type <tt class="computeroutput"><span class="identifier">T</span></tt>
-        is a conforming Fusion sequence, <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt>
+        <span class="bold"><strong>Semantics</strong></span>: Metafunction that evaluates to
+        <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code> if a certain type <code class="computeroutput"><span class="identifier">T</span></code>
+        is a conforming Fusion sequence, <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></code>
         otherwise.
       </p>
-<<<<<<< .working
-<a name="fusion.support.is_sequence.header"></a><h4>
-<a name="id412744"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.support.is_sequence.header"></a><h5>
-<a name="id612595"></a>
+<a name="id613206"></a>
         <a class="link" href="is_sequence.html#fusion.support.is_sequence.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">support</span><span class="special">/</span><span class="identifier">is_sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">is_sequence</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.is_sequence.example"></a><h4>
-<a name="id412883"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.support.is_sequence.example"></a><h5>
-<a name="id612703"></a>
+<a name="id614407"></a>
         <a class="link" href="is_sequence.html#fusion.support.is_sequence.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special">&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
 <span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span> <span class="identifier">is_sequence</span><span class="special">&lt;</span> <span class="keyword">int</span> <span class="special">&gt;</span> <span class="special">));</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special">&lt;</span>list<span class="special">&lt;&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special">&lt;</span>list<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special">&lt;</span>vector<span class="special">&lt;&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
-<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special">&lt;</span>vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special">&lt;</span><a class="link" href="../container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special">&lt;&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special">&lt;</span><a class="link" href="../container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special">&lt;</span><a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
+<span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_sequence</span><span class="special">&lt;</span><a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/support/is_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/is_view.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/support/is_view.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>is_view</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../support.html" title="Support">
-<link rel="previous" href="is_sequence.html" title="is_sequence">
+<link rel="prev" href="is_sequence.html" title="is_sequence">
 <link rel="next" href="tag_of.html" title="tag_of">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,49 +22,28 @@
 <div class="spirit-nav">
 <a accesskey="p" href="is_sequence.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tag_of.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.support.is_view"></a>is_view
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.support.is_view.description"></a><h4>
-<a name="id413272"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="is_view">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.support.is_view"></a><a class="link" href="is_view.html" title="is_view">is_view</a>
 </h3></div></div></div>
 <a name="fusion.support.is_view.description"></a><h5>
-<a name="id613016"></a>
+<a name="id614719"></a>
         <a class="link" href="is_view.html#fusion.support.is_view.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        Metafunction that evaluates to <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>
-        if a certain type <tt class="computeroutput"><span class="identifier">T</span></tt> is a
-        conforming Fusion View, <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt>
+        Metafunction that evaluates to <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>
+        if a certain type <code class="computeroutput"><span class="identifier">T</span></code> is a
+        conforming Fusion <a class="link" href="../view.html" title="View">View</a>, <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></code>
         otherwise. A view is a specialized sequence that does not actually contain
         data. Views hold sequences which may be other views. In general, views are
         held by other views by value, while non-views are held by other views by
-        reference. <tt class="computeroutput"><span class="identifier">is_view</span></tt> may be
+        reference. <code class="computeroutput"><span class="identifier">is_view</span></code> may be
         specialized to accomodate clients providing Fusion conforming views.
       </p>
-<<<<<<< .working
-<a name="fusion.support.is_view.synopsis"></a><h4>
-<a name="id413366"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.support.is_view.synopsis"></a><h5>
-<a name="id613080"></a>
+<a name="id614784"></a>
         <a class="link" href="is_view.html#fusion.support.is_view.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
 <span class="special">{</span>
     <span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
@@ -78,17 +53,10 @@
     <span class="special">};</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.is_view.parameters"></a><h4>
-<a name="id413482"></a>
-        Parameters
-      </h4>
-=======
 <a name="fusion.support.is_view.parameters"></a><h5>
-<a name="id613174"></a>
+<a name="id614878"></a>
         <a class="link" href="is_view.html#fusion.support.is_view.parameters">Parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -96,89 +64,80 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">T</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">T</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Any type
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 The type to query.
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.support.is_view.expression_semantics"></a><h4>
-<a name="id413581"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.support.is_view.expression_semantics"></a><h5>
-<a name="id613257"></a>
+<a name="id614960"></a>
         <a class="link" href="is_view.html#fusion.support.is_view.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_view</span><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">c</span><span class="special">;</span>
 </pre>
 <p>
-        <span class="bold"><b>Return type</b></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
+        <span class="bold"><strong>Return type</strong></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
         Boolean Constant</a>.
       </p>
 <p>
-        <span class="bold"><b>Semantics</b></span>: Metafunction that evaluates to
-        <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt> if a certain type <tt class="computeroutput"><span class="identifier">T</span></tt>
-        is a conforming Fusion view, <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></tt>
+        <span class="bold"><strong>Semantics</strong></span>: Metafunction that evaluates to
+        <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code> if a certain type <code class="computeroutput"><span class="identifier">T</span></code>
+        is a conforming Fusion view, <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">false_</span></code>
         otherwise.
       </p>
-<<<<<<< .working
-<a name="fusion.support.is_view.header"></a><h4>
-<a name="id413730"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.support.is_view.header"></a><h5>
-<a name="id613371"></a>
+<a name="id615074"></a>
         <a class="link" href="is_view.html#fusion.support.is_view.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">support</span><span class="special">/</span><span class="identifier">is_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">is_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.is_view.example"></a><h4>
-<a name="id413867"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.support.is_view.example"></a><h5>
-<a name="id613479"></a>
+<a name="id615182"></a>
         <a class="link" href="is_view.html#fusion.support.is_view.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_view</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="special">));</span>
 <span class="identifier">BOOST_MPL_ASSERT_NOT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_view</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">));</span>
 
 <span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span>
 <span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_pointer</span><span class="special">;</span>
-<span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">*,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">long</span><span class="special">*,</span> <span class="keyword">bool</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vector_type</span><span class="special">;</span>
-<span class="keyword">typedef</span> filter_view<span class="special">&lt;</span><span class="identifier">vector_type</span><span class="special">,</span> <span class="identifier">is_pointer</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">filter_view_type</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">*,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">long</span><span class="special">*,</span> <span class="keyword">bool</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vector_type</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../view/filter_view.html" title="filter_view"><code class="computeroutput"><span class="identifier">filter_view</span></code></a><span class="special">&lt;</span><span class="identifier">vector_type</span><span class="special">,</span> <span class="identifier">is_pointer</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">filter_view_type</span><span class="special">;</span>
 <span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">is_view</span><span class="special">&lt;</span><span class="identifier">filter_view_type</span><span class="special">&gt;</span> <span class="special">));</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/support/pair.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/pair.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/support/pair.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>pair</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../support.html" title="Support">
-<link rel="previous" href="deduce_sequence.html" title="deduce_sequence">
+<link rel="prev" href="deduce_sequence.html" title="deduce_sequence">
 <link rel="next" href="../iterator.html" title="Iterator">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,45 +22,24 @@
 <div class="spirit-nav">
 <a accesskey="p" href="deduce_sequence.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../iterator.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.support.pair"></a>pair
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.support.pair.description"></a><h4>
-<a name="id418183"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="pair">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.support.pair"></a><a class="link" href="pair.html" title="pair">pair</a>
 </h3></div></div></div>
 <a name="fusion.support.pair.description"></a><h5>
-<a name="id617959"></a>
+<a name="id618570"></a>
         <a class="link" href="pair.html#fusion.support.pair.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        Fusion <tt class="computeroutput"><span class="identifier">pair</span></tt> type is a half
-        runtime pair. A half runtime pair is similar to a std::pair,
-        but, unlike std::pair,
+        Fusion <code class="computeroutput"><span class="identifier">pair</span></code> type is a half
+        runtime pair. A half runtime pair is similar to a <a class="link" href="../adapted/std__pair.html" title="std::pair"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a>,
+        but, unlike <a class="link" href="../adapted/std__pair.html" title="std::pair"><code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code></a>,
         the first type does not have data. It is used as elements in <a class="link" href="../container/map.html" title="map"><code class="computeroutput"><span class="identifier">map</span></code></a>s, for example.
       </p>
-<<<<<<< .working
-<a name="fusion.support.pair.synopsis"></a><h4>
-<a name="id418285"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.support.pair.synopsis"></a><h5>
-<a name="id618026"></a>
+<a name="id618637"></a>
         <a class="link" href="pair.html#fusion.support.pair.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">First</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Second</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">pair</span><span class="special">;</span>
 
@@ -84,240 +59,276 @@
 <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">make_pair</span><span class="special">&lt;</span><span class="identifier">First</span><span class="special">,</span><span class="identifier">Second</span><span class="special">&gt;::</span><span class="identifier">type</span>
 <span class="identifier">make_pair</span><span class="special">(</span><span class="identifier">Second</span> <span class="keyword">const</span> <span class="special">&amp;);</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.pair.template_parameters"></a><h4>
-<a name="id418690"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.support.pair.template_parameters"></a><h5>
-<a name="id618322"></a>
+<a name="id618934"></a>
         <a class="link" href="pair.html#fusion.support.pair.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
+<td>
+              <p>
                 First
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 The first type. This is purely a type. No data is held.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
+<td>
+              <p>
                 Second
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 The second type. This contains data.
-              </p></td>
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">P</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">P</span></code></span></dt>
 <dd><p>
             Fusion pair type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">p</span></tt>,
-        <tt class="computeroutput"><span class="identifier">p2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">p</span></code>,
+        <code class="computeroutput"><span class="identifier">p2</span></code></span></dt>
 <dd><p>
             Fusion pairs
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt>,
-        <tt class="computeroutput"><span class="identifier">S</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code>,
+        <code class="computeroutput"><span class="identifier">S</span></code></span></dt>
 <dd><p>
             Arbitrary types
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            Value of type <tt class="computeroutput"><span class="identifier">S</span></tt>
+            Value of type <code class="computeroutput"><span class="identifier">S</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">o</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">o</span></code></span></dt>
 <dd><p>
             Output stream
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">i</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">i</span></code></span></dt>
 <dd><p>
             Input stream
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.support.pair.expression_semantics"></a><h4>
-<a name="id418971"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.support.pair.expression_semantics"></a><h5>
-<a name="id618540"></a>
+<a name="id620244"></a>
         <a class="link" href="pair.html#fusion.support.pair.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">P</span><span class="special">::</span><span class="identifier">first_type</span></tt>
-              </p></td>
-<td><p>
-                The type of the first template parameter, <tt class="computeroutput"><span class="identifier">F</span></tt>,
-                equivalent to <tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">first</span><span class="special">&lt;</span><span class="identifier">P</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>.
-              </p></td>
-</tr>
-<tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">P</span><span class="special">::</span><span class="identifier">second_type</span></tt>
-              </p></td>
-<td><p>
-                The type of the second template parameter, <tt class="computeroutput"><span class="identifier">S</span></tt>,
-                equivalent to <tt class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">second</span><span class="special">&lt;</span><span class="identifier">P</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>.
-              </p></td>
-</tr>
-<tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">P</span><span class="special">()</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">P</span><span class="special">::</span><span class="identifier">first_type</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                The type of the first template parameter, <code class="computeroutput"><span class="identifier">F</span></code>,
+                equivalent to <code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">first</span><span class="special">&lt;</span><span class="identifier">P</span><span class="special">&gt;::</span><span class="identifier">type</span></code>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">P</span><span class="special">::</span><span class="identifier">second_type</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                The type of the second template parameter, <code class="computeroutput"><span class="identifier">S</span></code>,
+                equivalent to <code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">second</span><span class="special">&lt;</span><span class="identifier">P</span><span class="special">&gt;::</span><span class="identifier">type</span></code>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">P</span><span class="special">()</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Default construction.
-              </p></td>
-</tr>
-<tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">P</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Construct a pair given value for the second type, <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
-</tr>
-<tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">P</span><span class="special">(</span><span class="identifier">p2</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a pair from another pair, <tt class="computeroutput"><span class="identifier">p2</span></tt>.
-              </p></td>
-</tr>
-<tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">p</span><span class="special">.</span><span class="identifier">second</span></tt>
-              </p></td>
-<td><p>
-                Get the data from <tt class="computeroutput"><span class="identifier">p1</span></tt>.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">p</span> <span class="special">=</span>
-                <span class="identifier">p2</span></tt>
-              </p></td>
-<td><p>
-                Assigns a pair, <tt class="computeroutput"><span class="identifier">p1</span></tt>,
-                from another pair, <tt class="computeroutput"><span class="identifier">p2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">P</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Construct a pair given value for the second type, <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">P</span><span class="special">(</span><span class="identifier">p2</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a pair from another pair, <code class="computeroutput"><span class="identifier">p2</span></code>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">p</span><span class="special">.</span><span class="identifier">second</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Get the data from <code class="computeroutput"><span class="identifier">p1</span></code>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">p</span> <span class="special">=</span>
+                <span class="identifier">p2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns a pair, <code class="computeroutput"><span class="identifier">p1</span></code>,
+                from another pair, <code class="computeroutput"><span class="identifier">p2</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
+<td>
+              <p>
                 make_pair&lt;F&gt;(s)
-              </p></td>
-<td><p>
-                Make a pair given the first type, <tt class="computeroutput"><span class="identifier">F</span></tt>,
-                and a value for the second type, <tt class="computeroutput"><span class="identifier">s</span></tt>.
-                The second type assumes the type of <tt class="computeroutput"><span class="identifier">s</span></tt>
-              </p></td>
-</tr>
-<tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">o</span> <span class="special">&lt;&lt;</span>
-                <span class="identifier">p</span></tt>
-              </p></td>
-<td><p>
-                Output <tt class="computeroutput"><span class="identifier">p</span></tt> to output
-                stream, <tt class="computeroutput"><span class="identifier">o</span></tt>.
-              </p></td>
-</tr>
-<tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">i</span> <span class="special">&gt;&gt;</span>
-                <span class="identifier">p</span></tt>
-              </p></td>
-<td><p>
-                Input <tt class="computeroutput"><span class="identifier">p</span></tt> from input
-                stream, <tt class="computeroutput"><span class="identifier">i</span></tt>.
-              </p></td>
-</tr>
-<tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">p</span> <span class="special">==</span>
-                <span class="identifier">p2</span></tt>
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
+                Make a pair given the first type, <code class="computeroutput"><span class="identifier">F</span></code>,
+                and a value for the second type, <code class="computeroutput"><span class="identifier">s</span></code>.
+                The second type assumes the type of <code class="computeroutput"><span class="identifier">s</span></code>
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">o</span> <span class="special">&lt;&lt;</span>
+                <span class="identifier">p</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Output <code class="computeroutput"><span class="identifier">p</span></code> to output
+                stream, <code class="computeroutput"><span class="identifier">o</span></code>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">i</span> <span class="special">&gt;&gt;</span>
+                <span class="identifier">p</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Input <code class="computeroutput"><span class="identifier">p</span></code> from input
+                stream, <code class="computeroutput"><span class="identifier">i</span></code>.
+              </p>
+              </td>
+</tr>
+<tr>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">p</span> <span class="special">==</span>
+                <span class="identifier">p2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Tests two pairs for equality.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">p</span> <span class="special">!=</span>
-                <span class="identifier">p2</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">p</span> <span class="special">!=</span>
+                <span class="identifier">p2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Tests two pairs for inequality.
-              </p></td>
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.support.pair.header"></a><h4>
-<a name="id419746"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.support.pair.header"></a><h5>
-<a name="id619127"></a>
+<a name="id620830"></a>
         <a class="link" href="pair.html#fusion.support.pair.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">support</span><span class="special">/</span><span class="identifier">pair</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">pair</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.pair.example"></a><h4>
-<a name="id419900"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.support.pair.example"></a><h5>
-<a name="id619235"></a>
+<a name="id620938"></a>
         <a class="link" href="pair.html#fusion.support.pair.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">pair</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">p</span><span class="special">(</span><span class="char">'X'</span><span class="special">);</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">p</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">make_pair</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;(</span><span class="char">'X'</span><span class="special">)</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
@@ -326,7 +337,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/support/tag_of.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/support/tag_of.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/support/tag_of.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>tag_of</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../support.html" title="Support">
-<link rel="previous" href="is_view.html" title="is_view">
+<link rel="prev" href="is_view.html" title="is_view">
 <link rel="next" href="category_of.html" title="category_of">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,49 +22,28 @@
 <div class="spirit-nav">
 <a accesskey="p" href="is_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../support.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="category_of.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.support.tag_of"></a>tag_of
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.support.tag_of.description"></a><h4>
-<a name="id414266"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="tag_of">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.support.tag_of"></a><a class="link" href="tag_of.html" title="tag_of">tag_of</a>
 </h3></div></div></div>
 <a name="fusion.support.tag_of.description"></a><h5>
-<a name="id613799"></a>
+<a name="id615503"></a>
         <a class="link" href="tag_of.html#fusion.support.tag_of.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         All conforming Fusion sequences and iterators have an associated tag type.
-        The purpose of the tag is to enable <a href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
-        dispatching</em></span></a> from Intrinsic
+        The purpose of the tag is to enable <a class="link" href="../notes.html#fusion.notes.tag_dispatching"><span class="emphasis"><em>tag
+        dispatching</em></span></a> from <a class="link" href="../sequence/intrinsic.html" title="Intrinsic">Intrinsic</a>
         functions to implementations appropriate for the type.
       </p>
 <p>
         This metafunction may be specialized to accomodate clients providing Fusion
         conforming sequences.
       </p>
-<<<<<<< .working
-<a name="fusion.support.tag_of.synopsis"></a><h4>
-<a name="id414314"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.support.tag_of.synopsis"></a><h5>
-<a name="id613830"></a>
+<a name="id615534"></a>
         <a class="link" href="tag_of.html#fusion.support.tag_of.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">namespace</span> <span class="identifier">traits</span>
 <span class="special">{</span>
     <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
@@ -78,17 +53,10 @@
     <span class="special">};</span>
 <span class="special">}</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.tag_of.parameters"></a><h4>
-<a name="id414428"></a>
-        Parameters
-      </h4>
-=======
 <a name="fusion.support.tag_of.parameters"></a><h5>
-<a name="id613923"></a>
+<a name="id615626"></a>
         <a class="link" href="tag_of.html#fusion.support.tag_of.parameters">Parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -96,81 +64,68 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Requirement
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">T</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">T</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Any type
-              </p></td>
-<td><p>
+              </p>
+              </td>
+<td>
+              <p>
                 The type to query.
-              </p></td>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.support.tag_of.expression_semantics"></a><h4>
-<a name="id414528"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.support.tag_of.expression_semantics"></a><h5>
-<a name="id614006"></a>
+<a name="id615709"></a>
         <a class="link" href="tag_of.html#fusion.support.tag_of.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">tag</span><span class="special">;</span>
 </pre>
 <p>
-        <span class="bold"><b>Return type</b></span>: Any type.
+        <span class="bold"><strong>Return type</strong></span>: Any type.
       </p>
 <p>
-        <span class="bold"><b>Semantics</b></span>: Returns the tag type associated
-        with <tt class="computeroutput"><span class="identifier">T</span></tt>.
+        <span class="bold"><strong>Semantics</strong></span>: Returns the tag type associated
+        with <code class="computeroutput"><span class="identifier">T</span></code>.
       </p>
-<<<<<<< .working
-<a name="fusion.support.tag_of.header"></a><h4>
-<a name="id414630"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.support.tag_of.header"></a><h5>
-<a name="id614086"></a>
+<a name="id615790"></a>
         <a class="link" href="tag_of.html#fusion.support.tag_of.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">support</span><span class="special">/</span><span class="identifier">tag_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">tag_of</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.support.tag_of.example"></a><h4>
-<a name="id414767"></a>
-        Example
-      </h4>
-<pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span>list<span class="special">&lt;&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">tag1</span><span class="special">;</span>
-<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span>list<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">tag2</span><span class="special">;</span>
-<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span>vector<span class="special">&lt;&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">tag3</span><span class="special">;</span>
-<span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span>vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">tag4</span><span class="special">;</span>
-=======
 <a name="fusion.support.tag_of.example"></a><h5>
-<a name="id614194"></a>
+<a name="id615898"></a>
         <a class="link" href="tag_of.html#fusion.support.tag_of.example">Example</a>
       </h5>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span><a class="link" href="../container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special">&lt;&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">tag1</span><span class="special">;</span>
 <span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span><a class="link" href="../container/list.html" title="list"><code class="computeroutput"><span class="identifier">list</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">tag2</span><span class="special">;</span>
 <span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span><a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">tag3</span><span class="special">;</span>
 <span class="keyword">typedef</span> <span class="identifier">traits</span><span class="special">::</span><span class="identifier">tag_of</span><span class="special">&lt;</span><a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">tag4</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 
 <span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">tag1</span><span class="special">,</span> <span class="identifier">tag2</span><span class="special">&gt;));</span>
 <span class="identifier">BOOST_MPL_ASSERT</span><span class="special">((</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_same</span><span class="special">&lt;</span><span class="identifier">tag3</span><span class="special">,</span> <span class="identifier">tag4</span><span class="special">&gt;));</span>
@@ -178,7 +133,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/tuple.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Tuple</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="algorithm/transformation/metafunctions/push_front.html" title="push_front">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="algorithm/transformation/metafunctions/push_front.html" title="push_front">
 <link rel="next" href="tuple/class_template_tuple.html" title="Class template tuple">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="algorithm/transformation/metafunctions/push_front.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tuple/class_template_tuple.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.tuple"></a>Tuple
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="Tuple">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.tuple"></a><a class="link" href="tuple.html" title="Tuple">Tuple</a>
+</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Class template tuple</span></dt>
 <dd><dl>
@@ -51,18 +44,18 @@
 <p>
       The TR1 technical report describes extensions to the C++ standard library.
       Many of these extensions will be considered for the next iteration of the C++
-      standard. TR1 describes a tuple type, and support for treating <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>
+      standard. TR1 describes a tuple type, and support for treating <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code>
       as a type of tuple.
     </p>
 <p>
       Fusion provides full support for the <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
-      Tuple</a> interface, and the extended uses of <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt> described
+      Tuple</a> interface, and the extended uses of <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code> described
       in the TR1 document.
     </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class template tuple</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../tuple.html" title="Tuple">
-<link rel="previous" href="../tuple.html" title="Tuple">
+<link rel="prev" href="../tuple.html" title="Tuple">
 <link rel="next" href="class_template_tuple/construction.html" title="Construction">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../tuple.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tuple.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="class_template_tuple/construction.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.tuple.class_template_tuple"></a>Class template tuple
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="Class template tuple">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.tuple.class_template_tuple"></a><a class="link" href="class_template_tuple.html" title="Class template tuple">Class template tuple</a>
+</h3></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">Construction</span></dt>
 <dt><span class="section"><a href="class_template_tuple/tuple_creation_functions.html">Tuple
@@ -46,26 +39,18 @@
 </dl></div>
 <p>
         Fusion's implementation of the <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
-        Tuple</a> is also a fusion <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+        Tuple</a> is also a fusion <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
         Sequence</a>. As such the fusion tuple type provides a lot of functionality
         beyond that required by TR1.
       </p>
 <p>
-        Currently tuple is basically a synonym for vector, although this may be changed
+        Currently tuple is basically a synonym for <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>, although this may be changed
         in future releases of fusion.
       </p>
-<<<<<<< .working
-<a name="fusion.tuple.class_template_tuple.synopsis"></a><h4>
-<a name="id592075"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.tuple.class_template_tuple.synopsis"></a><h5>
-<a name="id799922"></a>
+<a name="id801399"></a>
         <a class="link" href="class_template_tuple.html#fusion.tuple.class_template_tuple.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span>
     <span class="keyword">typename</span> <span class="identifier">T1</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span><span class="special">,</span>
     <span class="keyword">typename</span> <span class="identifier">T2</span> <span class="special">=</span> <span class="emphasis"><em>unspecified</em></span><span class="special">,</span>
@@ -79,7 +64,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/construction.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/construction.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/construction.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,18 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Construction</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../class_template_tuple.html" title="Class template tuple">
-<link rel="previous" href="../class_template_tuple.html" title="Class template tuple">
-<link rel="next" href="tuple_creation_functions.html" title="Tuple
-        creation functions">
+<link rel="prev" href="../class_template_tuple.html" title="Class template tuple">
+<link rel="next" href="tuple_creation_functions.html" title="Tuple creation functions">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -27,28 +22,14 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../class_template_tuple.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../class_template_tuple.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tuple_creation_functions.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.tuple.class_template_tuple.construction"></a>Construction
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.tuple.class_template_tuple.construction.description"></a><h5>
-<a name="id592245"></a>
-          Description
-        </h5>
-=======
 <div class="section" title="Construction">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fusion.tuple.class_template_tuple.construction"></a><a class="link" href="construction.html" title="Construction">Construction</a>
 </h4></div></div></div>
 <a name="fusion.tuple.class_template_tuple.construction.description"></a><h6>
-<a name="id800045"></a>
+<a name="id801523"></a>
           <a class="link" href="construction.html#fusion.tuple.class_template_tuple.construction.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
           Tuple</a> type provides a default constructor, a constructor that takes
@@ -56,42 +37,34 @@
           copy constructor. The details of the various constructors are described
           in this section.
         </p>
-<<<<<<< .working
-<a name="fusion.tuple.class_template_tuple.construction.specification"></a><h5>
-<a name="id592287"></a>
-          Specification
-        </h5>
-<div class="variablelist">
-=======
 <a name="fusion.tuple.class_template_tuple.construction.specification"></a><h6>
-<a name="id800073"></a>
+<a name="id801550"></a>
           <a class="link" href="construction.html#fusion.tuple.class_template_tuple.construction.specification">Specification</a>
         </h6>
 <div class="variablelist" title="Notation">
->>>>>>> .merge-right.r57125
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">T1</span>
-          <span class="special">...</span> <span class="identifier">TN</span></tt>,
-          <tt class="computeroutput"><span class="identifier">U1</span> <span class="special">...</span>
-          <span class="identifier">UN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">T1</span>
+          <span class="special">...</span> <span class="identifier">TN</span></code>,
+          <code class="computeroutput"><span class="identifier">U1</span> <span class="special">...</span>
+          <span class="identifier">UN</span></code></span></dt>
 <dd><p>
               Tuple element types
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">P1</span>
-          <span class="special">...</span> <span class="identifier">PN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">P1</span>
+          <span class="special">...</span> <span class="identifier">PN</span></code></span></dt>
 <dd><p>
               Parameter types
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">Ti</span></tt>,
-          <tt class="computeroutput"><span class="identifier">Ui</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">Ti</span></code>,
+          <code class="computeroutput"><span class="identifier">Ui</span></code></span></dt>
 <dd><p>
-              The type of the <tt class="computeroutput"><span class="identifier">i</span></tt>th
+              The type of the <code class="computeroutput"><span class="identifier">i</span></code>th
               element of a tuple
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">Pi</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">Pi</span></code></span></dt>
 <dd><p>
-              The type of the <tt class="computeroutput"><span class="identifier">i</span></tt>th
+              The type of the <code class="computeroutput"><span class="identifier">i</span></code>th
               parameter
             </p></dd>
 </dl>
@@ -99,50 +72,50 @@
 <pre class="programlisting"><span class="identifier">tuple</span><span class="special">();</span>
 </pre>
 <p>
-          <span class="bold"><b>Requirements</b></span>: Each <tt class="computeroutput"><span class="identifier">Ti</span></tt>
+          <span class="bold"><strong>Requirements</strong></span>: Each <code class="computeroutput"><span class="identifier">Ti</span></code>
           is default constructable.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Default initializes each element
+          <span class="bold"><strong>Semantics</strong></span>: Default initializes each element
           of the tuple.
         </p>
 <pre class="programlisting"><span class="identifier">tuple</span><span class="special">(</span><span class="identifier">P1</span><span class="special">,</span><span class="identifier">P2</span><span class="special">,...,</span><span class="identifier">PN</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requirements</b></span>: Each <tt class="computeroutput"><span class="identifier">Pi</span></tt>
-          is <tt class="computeroutput"><span class="identifier">Ti</span></tt> if <tt class="computeroutput"><span class="identifier">Ti</span></tt> is a reference type, <tt class="computeroutput"><span class="keyword">const</span> <span class="identifier">Ti</span><span class="special">&amp;</span></tt> otherwise.
+          <span class="bold"><strong>Requirements</strong></span>: Each <code class="computeroutput"><span class="identifier">Pi</span></code>
+          is <code class="computeroutput"><span class="identifier">Ti</span></code> if <code class="computeroutput"><span class="identifier">Ti</span></code> is a reference type, <code class="computeroutput"><span class="keyword">const</span> <span class="identifier">Ti</span><span class="special">&amp;</span></code> otherwise.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Copy initializes each element
+          <span class="bold"><strong>Semantics</strong></span>: Copy initializes each element
           with the corresponding parameter.
         </p>
 <pre class="programlisting"><span class="identifier">tuple</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">tuple</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requirements</b></span>: Each <tt class="computeroutput"><span class="identifier">Ti</span></tt>
+          <span class="bold"><strong>Requirements</strong></span>: Each <code class="computeroutput"><span class="identifier">Ti</span></code>
           should be copy constructable.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Copy constructs each element
-          of <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt>
-          with the corresponding element of <tt class="computeroutput"><span class="identifier">t</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Copy constructs each element
+          of <code class="computeroutput"><span class="special">*</span><span class="keyword">this</span></code>
+          with the corresponding element of <code class="computeroutput"><span class="identifier">t</span></code>.
         </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">U1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">UN</span><span class="special">&gt;</span>
 <span class="identifier">tuple</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">U1</span><span class="special">,</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">UN</span><span class="special">&gt;&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requirements</b></span>: Each <tt class="computeroutput"><span class="identifier">Ti</span></tt>
-          shall be constructible from the corresponding <tt class="computeroutput"><span class="identifier">Ui</span></tt>.
+          <span class="bold"><strong>Requirements</strong></span>: Each <code class="computeroutput"><span class="identifier">Ti</span></code>
+          shall be constructible from the corresponding <code class="computeroutput"><span class="identifier">Ui</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Constructs each element of
-          <tt class="computeroutput"><span class="special">*</span><span class="keyword">this</span></tt>
-          with the corresponding element of <tt class="computeroutput"><span class="identifier">t</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Constructs each element of
+          <code class="computeroutput"><span class="special">*</span><span class="keyword">this</span></code>
+          with the corresponding element of <code class="computeroutput"><span class="identifier">t</span></code>.
         </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/element_access.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/element_access.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/element_access.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,20 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Element
-        access</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Element access</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../class_template_tuple.html" title="Class template tuple">
-<link rel="previous" href="tuple_helper_classes.html" title="Tuple
-        helper classes">
-<link rel="next" href="relational_operators.html" title="Relational
-        operators">
+<link rel="prev" href="tuple_helper_classes.html" title="Tuple helper classes">
+<link rel="next" href="relational_operators.html" title="Relational operators">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -29,83 +22,64 @@
 <div class="spirit-nav">
 <a accesskey="p" href="tuple_helper_classes.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../class_template_tuple.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="relational_operators.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.tuple.class_template_tuple.element_access"></a><a href="element_access.html" title="Element
-        access">Element
+<div class="section" title="Element access">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.tuple.class_template_tuple.element_access"></a><a class="link" href="element_access.html" title="Element access">Element
         access</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.tuple.class_template_tuple.element_access.description"></a><h5>
-<a name="id594261"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.tuple.class_template_tuple.element_access.description"></a><h6>
-<a name="id801793"></a>
+<a name="id804085"></a>
           <a class="link" href="element_access.html#fusion.tuple.class_template_tuple.element_access.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
-          Tuple</a> provides the <tt class="computeroutput"><span class="identifier">get</span></tt>
+          Tuple</a> provides the <code class="computeroutput"><span class="identifier">get</span></code>
           function to provide access to it's elements by zero based numeric index.
         </p>
-<<<<<<< .working
-<a name="fusion.tuple.class_template_tuple.element_access.specification"></a><h5>
-<a name="id594311"></a>
-          Specification
-        </h5>
-=======
 <a name="fusion.tuple.class_template_tuple.element_access.specification"></a><h6>
-<a name="id801828"></a>
+<a name="id804120"></a>
           <a class="link" href="element_access.html#fusion.tuple.class_template_tuple.element_access.specification">Specification</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">int</span> <span class="identifier">I</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;</span>
 <span class="identifier">RJ</span> <span class="identifier">get</span><span class="special">(</span><span class="identifier">T</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requires</b></span>: <tt class="computeroutput"><span class="number">0</span>
+          <span class="bold"><strong>Requires</strong></span>: <code class="computeroutput"><span class="number">0</span>
           <span class="special">&lt;</span> <span class="identifier">I</span>
-          <span class="special">&lt;=</span> <span class="identifier">N</span></tt>.
-          The program is ill formed if <tt class="computeroutput"><span class="identifier">I</span></tt>
-          is out of bounds. <tt class="computeroutput"><span class="identifier">T</span></tt> is
-          any fusion sequence type, including <tt class="computeroutput"><span class="identifier">tuple</span></tt>.
+          <span class="special">&lt;=</span> <span class="identifier">N</span></code>.
+          The program is ill formed if <code class="computeroutput"><span class="identifier">I</span></code>
+          is out of bounds. <code class="computeroutput"><span class="identifier">T</span></code> is
+          any fusion sequence type, including <code class="computeroutput"><span class="identifier">tuple</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="identifier">RJ</span></tt>
-          is equivalent to <tt class="computeroutput">result_of::at_c<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="identifier">RJ</span></code>
+          is equivalent to <code class="computeroutput"><a class="link" href="../../sequence/intrinsic/metafunctions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Returns</b></span>: A reference to the <tt class="computeroutput"><span class="identifier">I</span></tt>th element of <tt class="computeroutput"><span class="identifier">T</span></tt>.
+          <span class="bold"><strong>Returns</strong></span>: A reference to the <code class="computeroutput"><span class="identifier">I</span></code>th element of <code class="computeroutput"><span class="identifier">T</span></code>.
         </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">int</span> <span class="identifier">I</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
 <span class="identifier">PJ</span> <span class="identifier">get</span><span class="special">(</span><span class="identifier">T</span> <span class="keyword">const</span><span class="special">&amp;</span> <span class="identifier">t</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requires</b></span>: <tt class="computeroutput"><span class="number">0</span>
+          <span class="bold"><strong>Requires</strong></span>: <code class="computeroutput"><span class="number">0</span>
           <span class="special">&lt;</span> <span class="identifier">I</span>
-          <span class="special">&lt;=</span> <span class="identifier">N</span></tt>.
-          The program is ill formed if <tt class="computeroutput"><span class="identifier">I</span></tt>
-          is out of bounds. <tt class="computeroutput"><span class="identifier">T</span></tt> is
-          any fusion sequence type, including <tt class="computeroutput"><span class="identifier">tuple</span></tt>.
+          <span class="special">&lt;=</span> <span class="identifier">N</span></code>.
+          The program is ill formed if <code class="computeroutput"><span class="identifier">I</span></code>
+          is out of bounds. <code class="computeroutput"><span class="identifier">T</span></code> is
+          any fusion sequence type, including <code class="computeroutput"><span class="identifier">tuple</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Return type</b></span>: <tt class="computeroutput"><span class="identifier">PJ</span></tt>
-          is equivalent to <tt class="computeroutput">result_of::at_c<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>.
+          <span class="bold"><strong>Return type</strong></span>: <code class="computeroutput"><span class="identifier">PJ</span></code>
+          is equivalent to <code class="computeroutput"><a class="link" href="../../sequence/intrinsic/metafunctions/at_c.html" title="at_c"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">at_c</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Returns</b></span>: A const reference to the <tt class="computeroutput"><span class="identifier">I</span></tt>th element of <tt class="computeroutput"><span class="identifier">T</span></tt>.
+          <span class="bold"><strong>Returns</strong></span>: A const reference to the <code class="computeroutput"><span class="identifier">I</span></code>th element of <code class="computeroutput"><span class="identifier">T</span></code>.
         </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/relational_operators.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/relational_operators.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/relational_operators.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,18 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Relational
-        operators</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Relational operators</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../class_template_tuple.html" title="Class template tuple">
-<link rel="previous" href="element_access.html" title="Element
-        access">
+<link rel="prev" href="element_access.html" title="Element access">
 <link rel="next" href="../pairs.html" title="Pairs">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -28,67 +22,47 @@
 <div class="spirit-nav">
 <a accesskey="p" href="element_access.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../class_template_tuple.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../pairs.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.tuple.class_template_tuple.relational_operators"></a><a href="relational_operators.html" title="Relational
-        operators">Relational
+<div class="section" title="Relational operators">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.tuple.class_template_tuple.relational_operators"></a><a class="link" href="relational_operators.html" title="Relational operators">Relational
         operators</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.tuple.class_template_tuple.relational_operators.description"></a><h5>
-<a name="id594938"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.tuple.class_template_tuple.relational_operators.description"></a><h6>
-<a name="id802258"></a>
+<a name="id804550"></a>
           <a class="link" href="relational_operators.html#fusion.tuple.class_template_tuple.relational_operators.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
           Tuple</a> provides the standard boolean relational operators.
         </p>
-<<<<<<< .working
-<a name="fusion.tuple.class_template_tuple.relational_operators.specification"></a><h5>
-<a name="id594976"></a>
-          Specification
-        </h5>
-<div class="variablelist">
-=======
 <a name="fusion.tuple.class_template_tuple.relational_operators.specification"></a><h6>
-<a name="id802282"></a>
+<a name="id804574"></a>
           <a class="link" href="relational_operators.html#fusion.tuple.class_template_tuple.relational_operators.specification">Specification</a>
         </h6>
 <div class="variablelist" title="Notation">
->>>>>>> .merge-right.r57125
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">T1</span>
-          <span class="special">...</span> <span class="identifier">TN</span></tt>,
-          <tt class="computeroutput"><span class="identifier">U1</span> <span class="special">...</span>
-          <span class="identifier">UN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">T1</span>
+          <span class="special">...</span> <span class="identifier">TN</span></code>,
+          <code class="computeroutput"><span class="identifier">U1</span> <span class="special">...</span>
+          <span class="identifier">UN</span></code></span></dt>
 <dd><p>
               Tuple element types
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">P1</span>
-          <span class="special">...</span> <span class="identifier">PN</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">P1</span>
+          <span class="special">...</span> <span class="identifier">PN</span></code></span></dt>
 <dd><p>
               Parameter types
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">Ti</span></tt>,
-          <tt class="computeroutput"><span class="identifier">Ui</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">Ti</span></code>,
+          <code class="computeroutput"><span class="identifier">Ui</span></code></span></dt>
 <dd><p>
-              The type of the <tt class="computeroutput"><span class="identifier">i</span></tt>th
+              The type of the <code class="computeroutput"><span class="identifier">i</span></code>th
               element of a tuple
             </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">Pi</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">Pi</span></code></span></dt>
 <dd><p>
-              The type of the <tt class="computeroutput"><span class="identifier">i</span></tt>th
+              The type of the <code class="computeroutput"><span class="identifier">i</span></code>th
               parameter
             </p></dd>
 </dl>
@@ -100,23 +74,19 @@
     <span class="keyword">const</span> <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">U1</span><span class="special">,</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">UN</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requirements</b></span>: For all <tt class="computeroutput"><span class="identifier">i</span></tt>,
-          <tt class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
+          <span class="bold"><strong>Requirements</strong></span>: For all <code class="computeroutput"><span class="identifier">i</span></code>,
+          <code class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
           <span class="identifier">i</span> <span class="special">&lt;</span>
-          <span class="identifier">N</span></tt>, <tt class="computeroutput"><a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span> <span class="special">==</span> <a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span></tt>
-          is a valid expression returning a type that is convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>.
-        </p>
-<p>
-          <span class="bold"><b>Semantics</b></span>: Returns <tt class="computeroutput"><span class="keyword">true</span></tt>
-          if and only if <tt class="computeroutput"><a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span> <span class="special">==</span> <a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span></tt>
-          for all <tt class="computeroutput"><span class="identifier">i</span></tt>. For any 2 zero
-          length tuples <tt class="computeroutput"><span class="identifier">e</span></tt> and <tt class="computeroutput"><span class="identifier">f</span></tt>, <tt class="computeroutput"><span class="identifier">e</span>
-          <span class="special">==</span> <span class="identifier">f</span></tt>
-          returns <tt class="computeroutput"><span class="keyword">true</span></tt>.
+          <span class="identifier">N</span></code>, <code class="computeroutput"><a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span></code>
+          is a valid expression returning a type that is convertible to <code class="computeroutput"><span class="keyword">bool</span></code>.
+        </p>
+<p>
+          <span class="bold"><strong>Semantics</strong></span>: Returns <code class="computeroutput"><span class="keyword">true</span></code>
+          if and only if <code class="computeroutput"><a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span></code>
+          for all <code class="computeroutput"><span class="identifier">i</span></code>. For any 2 zero
+          length tuples <code class="computeroutput"><span class="identifier">e</span></code> and <code class="computeroutput"><span class="identifier">f</span></code>, <code class="computeroutput"><span class="identifier">e</span>
+          <span class="special">==</span> <span class="identifier">f</span></code>
+          returns <code class="computeroutput"><span class="keyword">true</span></code>.
         </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">,</span>
          <span class="keyword">typename</span> <span class="identifier">U1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">UN</span><span class="special">&gt;</span>
@@ -125,18 +95,16 @@
     <span class="keyword">const</span> <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">U1</span><span class="special">,</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">UN</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requirements</b></span>: For all <tt class="computeroutput"><span class="identifier">i</span></tt>,
-          <tt class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
+          <span class="bold"><strong>Requirements</strong></span>: For all <code class="computeroutput"><span class="identifier">i</span></code>,
+          <code class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
           <span class="identifier">i</span> <span class="special">&lt;</span>
-          <span class="identifier">N</span></tt>, <tt class="computeroutput"><a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span> <span class="special">&lt;</span> <a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span></tt>
-          is a valid expression returning a type that is convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+          <span class="identifier">N</span></code>, <code class="computeroutput"><a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span> <span class="special">&lt;</span> <a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span></code>
+          is a valid expression returning a type that is convertible to <code class="computeroutput"><span class="keyword">bool</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns the lexicographical
-          comparison of between <tt class="computeroutput"><span class="identifier">lhs</span></tt>
-          and <tt class="computeroutput"><span class="identifier">rhs</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns the lexicographical
+          comparison of between <code class="computeroutput"><span class="identifier">lhs</span></code>
+          and <code class="computeroutput"><span class="identifier">rhs</span></code>.
         </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">,</span>
          <span class="keyword">typename</span> <span class="identifier">U1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">UN</span><span class="special">&gt;</span>
@@ -145,16 +113,14 @@
     <span class="keyword">const</span> <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">U1</span><span class="special">,</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">UN</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requirements</b></span>: For all <tt class="computeroutput"><span class="identifier">i</span></tt>,
-          <tt class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
+          <span class="bold"><strong>Requirements</strong></span>: For all <code class="computeroutput"><span class="identifier">i</span></code>,
+          <code class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
           <span class="identifier">i</span> <span class="special">&lt;</span>
-          <span class="identifier">N</span></tt>, <tt class="computeroutput"><a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span> <span class="special">==</span> <a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span></tt>
-          is a valid expression returning a type that is convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+          <span class="identifier">N</span></code>, <code class="computeroutput"><a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span> <span class="special">==</span> <a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span></code>
+          is a valid expression returning a type that is convertible to <code class="computeroutput"><span class="keyword">bool</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns <tt class="computeroutput"><span class="special">!(</span><span class="identifier">lhs</span> <span class="special">==</span> <span class="identifier">rhs</span><span class="special">)</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns <code class="computeroutput"><span class="special">!(</span><span class="identifier">lhs</span> <span class="special">==</span> <span class="identifier">rhs</span><span class="special">)</span></code>.
         </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">,</span>
          <span class="keyword">typename</span> <span class="identifier">U1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">UN</span><span class="special">&gt;</span>
@@ -163,16 +129,14 @@
     <span class="keyword">const</span> <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">U1</span><span class="special">,</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">UN</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requirements</b></span>: For all <tt class="computeroutput"><span class="identifier">i</span></tt>,
-          <tt class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
+          <span class="bold"><strong>Requirements</strong></span>: For all <code class="computeroutput"><span class="identifier">i</span></code>,
+          <code class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
           <span class="identifier">i</span> <span class="special">&lt;</span>
-          <span class="identifier">N</span></tt>, <tt class="computeroutput"><a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span> <span class="special">&lt;</span> <a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span></tt>
-          is a valid expression returning a type that is convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+          <span class="identifier">N</span></code>, <code class="computeroutput"><a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span> <span class="special">&lt;</span> <a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span></code>
+          is a valid expression returning a type that is convertible to <code class="computeroutput"><span class="keyword">bool</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns <tt class="computeroutput"><span class="special">!(</span><span class="identifier">rhs</span> <span class="special">&lt;</span> <span class="identifier">lhs</span><span class="special">)</span></tt>
+          <span class="bold"><strong>Semantics</strong></span>: Returns <code class="computeroutput"><span class="special">!(</span><span class="identifier">rhs</span> <span class="special">&lt;</span> <span class="identifier">lhs</span><span class="special">)</span></code>
         </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">,</span>
          <span class="keyword">typename</span> <span class="identifier">U1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">UN</span><span class="special">&gt;</span>
@@ -181,17 +145,15 @@
     <span class="keyword">const</span> <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">U1</span><span class="special">,</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">UN</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requirements</b></span>: For all <tt class="computeroutput"><span class="identifier">i</span></tt>,
-          <tt class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
+          <span class="bold"><strong>Requirements</strong></span>: For all <code class="computeroutput"><span class="identifier">i</span></code>,
+          <code class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
           <span class="identifier">i</span> <span class="special">&lt;</span>
-          <span class="identifier">N</span></tt>, <tt class="computeroutput"><a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span> <span class="special">&lt;</span> <a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span></tt>
-          is a valid expression returning a type that is convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+          <span class="identifier">N</span></code>, <code class="computeroutput"><a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span> <span class="special">&lt;</span> <a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span></code>
+          is a valid expression returning a type that is convertible to <code class="computeroutput"><span class="keyword">bool</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns <tt class="computeroutput"><span class="identifier">rhs</span>
-          <span class="special">&lt;</span> <span class="identifier">lhs</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns <code class="computeroutput"><span class="identifier">rhs</span>
+          <span class="special">&lt;</span> <span class="identifier">lhs</span></code>.
         </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">,</span>
          <span class="keyword">typename</span> <span class="identifier">U1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">UN</span><span class="special">&gt;</span>
@@ -200,21 +162,19 @@
     <span class="keyword">const</span> <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">U1</span><span class="special">,</span> <span class="identifier">U2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">UN</span><span class="special">&gt;&amp;</span> <span class="identifier">rhs</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Requirements</b></span>: For all <tt class="computeroutput"><span class="identifier">i</span></tt>,
-          <tt class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
+          <span class="bold"><strong>Requirements</strong></span>: For all <code class="computeroutput"><span class="identifier">i</span></code>,
+          <code class="computeroutput"><span class="number">1</span> <span class="special">&lt;=</span>
           <span class="identifier">i</span> <span class="special">&lt;</span>
-          <span class="identifier">N</span></tt>, <tt class="computeroutput"><a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span> <span class="special">&lt;</span> <a href="element_access.html" title="Element
-        access"><tt class="computeroutput"><span class="identifier">get</span></tt></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span></tt>
-          is a valid expression returning a type that is convertible to <tt class="computeroutput"><span class="keyword">bool</span></tt>.
+          <span class="identifier">N</span></code>, <code class="computeroutput"><a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">lhs</span><span class="special">)</span> <span class="special">&lt;</span> <a class="link" href="element_access.html" title="Element access"><code class="computeroutput"><span class="identifier">get</span></code></a><span class="special">&lt;</span><span class="identifier">i</span><span class="special">&gt;(</span><span class="identifier">rhs</span><span class="special">)</span></code>
+          is a valid expression returning a type that is convertible to <code class="computeroutput"><span class="keyword">bool</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Semantics</b></span>: Returns <tt class="computeroutput"><span class="special">!(</span><span class="identifier">lhs</span> <span class="special">&lt;</span> <span class="identifier">rhs</span><span class="special">)</span></tt>.
+          <span class="bold"><strong>Semantics</strong></span>: Returns <code class="computeroutput"><span class="special">!(</span><span class="identifier">lhs</span> <span class="special">&lt;</span> <span class="identifier">rhs</span><span class="special">)</span></code>.
         </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_creation_functions.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,19 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Tuple
-        creation functions</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Tuple creation functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../class_template_tuple.html" title="Class template tuple">
-<link rel="previous" href="construction.html" title="Construction">
-<link rel="next" href="tuple_helper_classes.html" title="Tuple
-        helper classes">
+<link rel="prev" href="construction.html" title="Construction">
+<link rel="next" href="tuple_helper_classes.html" title="Tuple helper classes">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -28,69 +22,50 @@
 <div class="spirit-nav">
 <a accesskey="p" href="construction.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../class_template_tuple.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tuple_helper_classes.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.tuple.class_template_tuple.tuple_creation_functions"></a><a href="tuple_creation_functions.html" title="Tuple
-        creation functions">Tuple
+<div class="section" title="Tuple creation functions">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.tuple.class_template_tuple.tuple_creation_functions"></a><a class="link" href="tuple_creation_functions.html" title="Tuple creation functions">Tuple
         creation functions</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.tuple.class_template_tuple.tuple_creation_functions.description"></a><h5>
-<a name="id593031"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.tuple.class_template_tuple.tuple_creation_functions.description"></a><h6>
-<a name="id800948"></a>
+<a name="id803240"></a>
           <a class="link" href="tuple_creation_functions.html#fusion.tuple.class_template_tuple.tuple_creation_functions.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
-          TR1 describes 2 utility functions for creating <span class="underline">_tr1</span><span class="underline">tuple</span>_s. <tt class="computeroutput"><span class="identifier">make_tuple</span></tt>
-          builds a tuple out of it's argument list, and <tt class="computeroutput"><span class="identifier">tie</span></tt>
+          TR1 describes 2 utility functions for creating <span class="underline">_tr1</span><span class="underline">tuple</span>_s. <code class="computeroutput"><span class="identifier">make_tuple</span></code>
+          builds a tuple out of it's argument list, and <code class="computeroutput"><span class="identifier">tie</span></code>
           builds a tuple of references to it's arguments. The details of these creation
           functions are described in this section.
         </p>
-<<<<<<< .working
-<a name="fusion.tuple.class_template_tuple.tuple_creation_functions.specification"></a><h5>
-<a name="id593102"></a>
-          Specification
-        </h5>
-=======
 <a name="fusion.tuple.class_template_tuple.tuple_creation_functions.specification"></a><h6>
-<a name="id800990"></a>
+<a name="id803282"></a>
           <a class="link" href="tuple_creation_functions.html#fusion.tuple.class_template_tuple.tuple_creation_functions.specification">Specification</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
 <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">V1</span><span class="special">,</span> <span class="identifier">V2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">VN</span><span class="special">&gt;</span> <span class="identifier">make_tuple</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">T1</span><span class="special">&amp;</span> <span class="identifier">t1</span><span class="special">,</span> <span class="keyword">const</span> <span class="identifier">T2</span><span class="special">&amp;</span> <span class="identifier">t2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">const</span> <span class="identifier">TN</span><span class="special">&amp;</span> <span class="identifier">tn</span><span class="special">);</span>
 </pre>
 <p>
-          Where <tt class="computeroutput"><span class="identifier">Vi</span></tt> is <tt class="computeroutput"><span class="identifier">X</span><span class="special">&amp;</span></tt>
-          if the cv-unqualified type <tt class="computeroutput"><span class="identifier">Ti</span></tt>
-          is <tt class="computeroutput"><span class="identifier">reference_wrapper</span><span class="special">&lt;</span><span class="identifier">X</span><span class="special">&gt;</span></tt>,
-          otherwise <tt class="computeroutput"><span class="identifier">Vi</span></tt> is <tt class="computeroutput"><span class="identifier">Ti</span></tt>.
+          Where <code class="computeroutput"><span class="identifier">Vi</span></code> is <code class="computeroutput"><span class="identifier">X</span><span class="special">&amp;</span></code>
+          if the cv-unqualified type <code class="computeroutput"><span class="identifier">Ti</span></code>
+          is <code class="computeroutput"><span class="identifier">reference_wrapper</span><span class="special">&lt;</span><span class="identifier">X</span><span class="special">&gt;</span></code>,
+          otherwise <code class="computeroutput"><span class="identifier">Vi</span></code> is <code class="computeroutput"><span class="identifier">Ti</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Returns</b></span>: <tt class="computeroutput"><span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">V1</span><span class="special">,</span> <span class="identifier">V2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">VN</span><span class="special">&gt;(</span><span class="identifier">t1</span><span class="special">,</span> <span class="identifier">t2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">tN</span><span class="special">)</span></tt>
+          <span class="bold"><strong>Returns</strong></span>: <code class="computeroutput"><span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">V1</span><span class="special">,</span> <span class="identifier">V2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">VN</span><span class="special">&gt;(</span><span class="identifier">t1</span><span class="special">,</span> <span class="identifier">t2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">tN</span><span class="special">)</span></code>
         </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span><span class="special">,</span> <span class="special">...,</span> <span class="keyword">typename</span> <span class="identifier">TN</span><span class="special">&gt;</span>
 <span class="identifier">tuple</span><span class="special">&lt;</span><span class="identifier">T1</span><span class="special">&amp;,</span> <span class="identifier">T2</span><span class="special">&amp;,</span> <span class="special">...,</span> <span class="identifier">TN</span><span class="special">&amp;&gt;</span> <span class="identifier">tie</span><span class="special">(</span><span class="identifier">T1</span><span class="special">&amp;</span> <span class="identifier">t1</span><span class="special">,</span> <span class="identifier">T2</span><span class="special">&amp;</span> <span class="identifier">t2</span><span class="special">,</span> <span class="special">...,</span> <span class="identifier">TN</span><span class="special">&amp;</span> <span class="identifier">tn</span><span class="special">);</span>
 </pre>
 <p>
-          <span class="bold"><b>Returns</b></span>: tuple&lt;T1&amp;, T2&amp;, ...,
-          TN&amp;&gt;(t1, t2, ..., tN). When argument <tt class="computeroutput"><span class="identifier">ti</span></tt>
-          is <tt class="computeroutput"><span class="identifier">ignore</span></tt>, assigning any
+          <span class="bold"><strong>Returns</strong></span>: tuple&lt;T1&amp;, T2&amp;, ...,
+          TN&amp;&gt;(t1, t2, ..., tN). When argument <code class="computeroutput"><span class="identifier">ti</span></code>
+          is <code class="computeroutput"><span class="identifier">ignore</span></code>, assigning any
           value to the corresponding tuple element has has no effect.
         </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/class_template_tuple/tuple_helper_classes.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,20 +1,13 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Tuple
-        helper classes</title>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Tuple helper classes</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../class_template_tuple.html" title="Class template tuple">
-<link rel="previous" href="tuple_creation_functions.html" title="Tuple
-        creation functions">
-<link rel="next" href="element_access.html" title="Element
-        access">
+<link rel="prev" href="tuple_creation_functions.html" title="Tuple creation functions">
+<link rel="next" href="element_access.html" title="Element access">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
@@ -29,75 +22,56 @@
 <div class="spirit-nav">
 <a accesskey="p" href="tuple_creation_functions.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../class_template_tuple.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="element_access.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h4 class="title">
-<a name="fusion.tuple.class_template_tuple.tuple_helper_classes"></a><a href="tuple_helper_classes.html" title="Tuple
-        helper classes">Tuple
+<div class="section" title="Tuple helper classes">
+<div class="titlepage"><div><div><h4 class="title">
+<a name="fusion.tuple.class_template_tuple.tuple_helper_classes"></a><a class="link" href="tuple_helper_classes.html" title="Tuple helper classes">Tuple
         helper classes</a>
-<<<<<<< .working
-</h4></div></div>
-<div></div>
-</div>
-<a name="fusion.tuple.class_template_tuple.tuple_helper_classes.description"></a><h5>
-<a name="id593818"></a>
-          Description
-        </h5>
-=======
 </h4></div></div></div>
 <a name="fusion.tuple.class_template_tuple.tuple_helper_classes.description"></a><h6>
-<a name="id801499"></a>
+<a name="id803791"></a>
           <a class="link" href="tuple_helper_classes.html#fusion.tuple.class_template_tuple.tuple_helper_classes.description">Description</a>
         </h6>
->>>>>>> .merge-right.r57125
 <p>
           The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
           Tuple</a> provides 2 helper traits, for compile time access to the
           tuple size, and the element types.
         </p>
-<<<<<<< .working
-<a name="fusion.tuple.class_template_tuple.tuple_helper_classes.specification"></a><h5>
-<a name="id593857"></a>
-          Specification
-        </h5>
-=======
 <a name="fusion.tuple.class_template_tuple.tuple_helper_classes.specification"></a><h6>
-<a name="id801522"></a>
+<a name="id803814"></a>
           <a class="link" href="tuple_helper_classes.html#fusion.tuple.class_template_tuple.tuple_helper_classes.specification">Specification</a>
         </h6>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">tuple_size</span><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">value</span>
 </pre>
 <p>
-          <span class="bold"><b>Requires</b></span>: <tt class="computeroutput"><span class="identifier">T</span></tt>
-          is any fusion sequence type, including <tt class="computeroutput"><span class="identifier">tuple</span></tt>.
+          <span class="bold"><strong>Requires</strong></span>: <code class="computeroutput"><span class="identifier">T</span></code>
+          is any fusion sequence type, including <code class="computeroutput"><span class="identifier">tuple</span></code>.
         </p>
 <p>
-          <span class="bold"><b>Type</b></span>: <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
+          <span class="bold"><strong>Type</strong></span>: <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
           Integral Constant</a>
         </p>
 <p>
-          <span class="bold"><b>Value</b></span>: The number of elements in the sequence.
-          Equivalent to <tt class="computeroutput">result_of::size<span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>.
+          <span class="bold"><strong>Value</strong></span>: The number of elements in the sequence.
+          Equivalent to <code class="computeroutput"><a class="link" href="../../sequence/intrinsic/metafunctions/size.html" title="size"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">size</span></code></a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span></code>.
         </p>
 <pre class="programlisting"><span class="identifier">tuple_element</span><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span> <span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-          <span class="bold"><b>Requires</b></span>: <tt class="computeroutput"><span class="identifier">T</span></tt>
-          is any fusion sequence type, including <tt class="computeroutput"><span class="identifier">tuple</span></tt>.
-          <tt class="computeroutput"><span class="number">0</span> <span class="special">&lt;=</span>
+          <span class="bold"><strong>Requires</strong></span>: <code class="computeroutput"><span class="identifier">T</span></code>
+          is any fusion sequence type, including <code class="computeroutput"><span class="identifier">tuple</span></code>.
+          <code class="computeroutput"><span class="number">0</span> <span class="special">&lt;=</span>
           <span class="identifier">I</span> <span class="special">&lt;</span>
-          <span class="identifier">N</span></tt> or the program is ill formed.
+          <span class="identifier">N</span></code> or the program is ill formed.
         </p>
 <p>
-          <span class="bold"><b>Value</b></span>: The type of the <tt class="computeroutput"><span class="identifier">I</span></tt>th
-          element of <tt class="computeroutput"><span class="identifier">T</span></tt>. Equivalent
-          to <tt class="computeroutput">result_of::value_at<span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span></tt>.
+          <span class="bold"><strong>Value</strong></span>: The type of the <code class="computeroutput"><span class="identifier">I</span></code>th
+          element of <code class="computeroutput"><span class="identifier">T</span></code>. Equivalent
+          to <code class="computeroutput"><a class="link" href="../../sequence/intrinsic/metafunctions/value_at.html" title="value_at"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">value_at</span></code></a><span class="special">&lt;</span><span class="identifier">I</span><span class="special">,</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">type</span></code>.
         </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/tuple/pairs.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/tuple/pairs.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/tuple/pairs.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,17 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Pairs</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../tuple.html" title="Tuple">
-<link rel="previous" href="class_template_tuple/relational_operators.html" title="Relational
-        operators">
+<link rel="prev" href="class_template_tuple/relational_operators.html" title="Relational operators">
 <link rel="next" href="../extension.html" title="Extension">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,70 +22,49 @@
 <div class="spirit-nav">
 <a accesskey="p" href="class_template_tuple/relational_operators.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tuple.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../extension.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.tuple.pairs"></a>Pairs
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.tuple.pairs.description"></a><h4>
-<a name="id598281"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="Pairs">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.tuple.pairs"></a><a class="link" href="pairs.html" title="Pairs">Pairs</a>
 </h3></div></div></div>
 <a name="fusion.tuple.pairs.description"></a><h5>
-<a name="id806304"></a>
+<a name="id807777"></a>
         <a class="link" href="pairs.html#fusion.tuple.pairs.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         The <a href="http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf" target="_top">TR1
-        Tuple</a> interface is specified to provide uniform access to <tt class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></tt>
+        Tuple</a> interface is specified to provide uniform access to <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span></code>
         as if it were a 2 element tuple.
       </p>
-<<<<<<< .working
-<a name="fusion.tuple.pairs.specification"></a><h4>
-<a name="id598338"></a>
-        Specification
-      </h4>
-=======
 <a name="fusion.tuple.pairs.specification"></a><h5>
-<a name="id806341"></a>
+<a name="id807814"></a>
         <a class="link" href="pairs.html#fusion.tuple.pairs.specification">Specification</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">tuple_size</span><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span><span class="special">&lt;</span><span class="identifier">T1</span><span class="special">,</span> <span class="identifier">T2</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">value</span>
 </pre>
 <p>
-        <span class="bold"><b>Type</b></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
+        <span class="bold"><strong>Type</strong></span>: An <a href="http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html" target="_top">MPL
         Integral Constant</a>
       </p>
 <p>
-        <span class="bold"><b>Value</b></span>: Returns 2, the number of elements
+        <span class="bold"><strong>Value</strong></span>: Returns 2, the number of elements
         in a pair.
       </p>
 <pre class="programlisting"><span class="identifier">tuple_element</span><span class="special">&lt;</span><span class="number">0</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span><span class="special">&lt;</span><span class="identifier">T1</span><span class="special">,</span> <span class="identifier">T2</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-        <span class="bold"><b>Type</b></span>: <tt class="computeroutput"><span class="identifier">T1</span></tt>
+        <span class="bold"><strong>Type</strong></span>: <code class="computeroutput"><span class="identifier">T1</span></code>
       </p>
 <p>
-        <span class="bold"><b>Value</b></span>: Returns the type of the first element
+        <span class="bold"><strong>Value</strong></span>: Returns the type of the first element
         of the pair
       </p>
 <pre class="programlisting"><span class="identifier">tuple_element</span><span class="special">&lt;</span><span class="number">1</span><span class="special">,</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span><span class="special">&lt;</span><span class="identifier">T1</span><span class="special">,</span> <span class="identifier">T2</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">type</span>
 </pre>
 <p>
-        <span class="bold"><b>Type</b></span>: <tt class="computeroutput"><span class="identifier">T2</span></tt>
+        <span class="bold"><strong>Type</strong></span>: <code class="computeroutput"><span class="identifier">T2</span></code>
       </p>
 <p>
-        <span class="bold"><b>Value</b></span>: Returns thetype of the second element
+        <span class="bold"><strong>Value</strong></span>: Returns thetype of the second element
         of the pair
       </p>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">int</span> <span class="identifier">I</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T2</span><span class="special">&gt;</span>
@@ -100,26 +74,26 @@
 <span class="keyword">const</span> <span class="identifier">P</span><span class="special">&amp;</span> <span class="identifier">get</span><span class="special">(</span><span class="keyword">const</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">pair</span><span class="special">&lt;</span><span class="identifier">T1</span><span class="special">,</span> <span class="identifier">T2</span><span class="special">&gt;&amp;</span> <span class="identifier">pr</span><span class="special">);</span>
 </pre>
 <p>
-        <span class="bold"><b>Type</b></span>: If <tt class="computeroutput"><span class="identifier">I</span>
-        <span class="special">==</span> <span class="number">0</span></tt>
-        <tt class="computeroutput"><span class="identifier">P</span></tt> is <tt class="computeroutput"><span class="identifier">T1</span></tt>,
-        else if <tt class="computeroutput"><span class="identifier">I</span> <span class="special">==</span>
-        <span class="number">1</span></tt> <tt class="computeroutput"><span class="identifier">P</span></tt>
-        is <tt class="computeroutput"><span class="identifier">T2</span></tt> else the program is
+        <span class="bold"><strong>Type</strong></span>: If <code class="computeroutput"><span class="identifier">I</span>
+        <span class="special">==</span> <span class="number">0</span></code>
+        <code class="computeroutput"><span class="identifier">P</span></code> is <code class="computeroutput"><span class="identifier">T1</span></code>,
+        else if <code class="computeroutput"><span class="identifier">I</span> <span class="special">==</span>
+        <span class="number">1</span></code> <code class="computeroutput"><span class="identifier">P</span></code>
+        is <code class="computeroutput"><span class="identifier">T2</span></code> else the program is
         ill-formed.
       </p>
 <p>
-        <span class="bold"><b>Returns: <tt class="computeroutput"><span class="identifier">pr</span><span class="special">.</span><span class="identifier">first</span></tt>
-        if <tt class="computeroutput"><span class="identifier">I</span> <span class="special">==</span>
-        <span class="number">0</span></tt> else <tt class="computeroutput"><span class="identifier">pr</span><span class="special">.</span><span class="identifier">second</span></tt>.</b></span>[*Returns:
-        <tt class="computeroutput"><span class="identifier">pr</span><span class="special">.</span><span class="identifier">first</span></tt> if <tt class="computeroutput"><span class="identifier">I</span>
-        <span class="special">==</span> <span class="number">0</span></tt>
-        else <tt class="computeroutput"><span class="identifier">pr</span><span class="special">.</span><span class="identifier">second</span></tt>.
+        <span class="bold"><strong>Returns: <code class="computeroutput"><span class="identifier">pr</span><span class="special">.</span><span class="identifier">first</span></code>
+        if <code class="computeroutput"><span class="identifier">I</span> <span class="special">==</span>
+        <span class="number">0</span></code> else <code class="computeroutput"><span class="identifier">pr</span><span class="special">.</span><span class="identifier">second</span></code>.</strong></span>[*Returns:
+        <code class="computeroutput"><span class="identifier">pr</span><span class="special">.</span><span class="identifier">first</span></code> if <code class="computeroutput"><span class="identifier">I</span>
+        <span class="special">==</span> <span class="number">0</span></code>
+        else <code class="computeroutput"><span class="identifier">pr</span><span class="special">.</span><span class="identifier">second</span></code>.
       </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/view.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>View</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="up" href="../index.html" title="Chapter 1. Fusion 2.0">
-<link rel="previous" href="container/conversion/metafunctions/as_map.html" title="as_map">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
+<link rel="prev" href="container/conversion/metafunctions/as_map.html" title="as_map">
 <link rel="next" href="view/single_view.html" title="single_view">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,13 +22,10 @@
 <div class="spirit-nav">
 <a accesskey="p" href="container/conversion/metafunctions/as_map.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="view/single_view.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h2 class="title" style="clear: both">
-<a name="fusion.view"></a>View
-</h2></div></div>
-<div></div>
-</div>
+<div class="section" title="View">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="fusion.view"></a><a class="link" href="view.html" title="View">View</a>
+</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section">single_view</span></dt>
 <dt><span class="section">filter_view</span></dt>
@@ -52,24 +45,17 @@
       sequence(s) are actually accessed. Views' lazy nature make them very cheap
       to copy and be passed around by value.
     </p>
-<<<<<<< .working
-<a name="fusion.view.header"></a><h3>
-<a name="id517980"></a>
-      Header
-    </h3>
-=======
 <a name="fusion.view.header"></a><h4>
-<a name="id722826"></a>
+<a name="id725001"></a>
       <a class="link" href="view.html#fusion.view.header">Header</a>
     </h4>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/view/filter_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/filter_view.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/view/filter_view.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>filter_view</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../view.html" title="View">
-<link rel="previous" href="single_view.html" title="single_view">
+<link rel="prev" href="single_view.html" title="single_view">
 <link rel="next" href="iterator_range.html" title="iterator_range">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,74 +22,39 @@
 <div class="spirit-nav">
 <a accesskey="p" href="single_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="iterator_range.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.view.filter_view"></a>filter_view
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.view.filter_view.description"></a><h4>
-<a name="id518972"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="filter_view">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.view.filter_view"></a><a class="link" href="filter_view.html" title="filter_view">filter_view</a>
 </h3></div></div></div>
 <a name="fusion.view.filter_view.description"></a><h5>
-<a name="id723629"></a>
+<a name="id725803"></a>
         <a class="link" href="filter_view.html#fusion.view.filter_view.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        <tt class="computeroutput"><span class="identifier">filter_view</span></tt> is a view into
+        <code class="computeroutput"><span class="identifier">filter_view</span></code> is a view into
         a subset of its underlying sequence's elements satisfying a given predicate
         (an MPL metafunction).
-        The <tt class="computeroutput"><span class="identifier">filter_view</span></tt> presents
-        only those elements for which its predicate evaluates to <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></tt>.
+        The <code class="computeroutput"><span class="identifier">filter_view</span></code> presents
+        only those elements for which its predicate evaluates to <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">true_</span></code>.
       </p>
-<<<<<<< .working
-<a name="fusion.view.filter_view.header"></a><h4>
-<a name="id519054"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.view.filter_view.header"></a><h5>
-<a name="id723679"></a>
+<a name="id726394"></a>
         <a class="link" href="filter_view.html#fusion.view.filter_view.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">view</span><span class="special">/</span><span class="identifier">filter_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">filter_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.filter_view.synopsis"></a><h4>
-<a name="id519209"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.view.filter_view.synopsis"></a><h5>
-<a name="id723787"></a>
+<a name="id726502"></a>
         <a class="link" href="filter_view.html#fusion.view.filter_view.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Pred</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">filter_view</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.filter_view.template_parameters"></a><h4>
-<a name="id519305"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.view.filter_view.template_parameters"></a><h5>
-<a name="id724954"></a>
+<a name="id726567"></a>
         <a class="link" href="filter_view.html#fusion.view.filter_view.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -101,52 +62,60 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-              </p></td>
-<td><p>
-                A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Sequence</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                 Sequence</a>
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Pred</span></tt>
-              </p></td>
-<td><p>
-                Unary Metafunction returning an <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">bool_</span></tt>
-              </p></td>
-<td><p>
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Pred</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Unary Metafunction returning an <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">bool_</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.filter_view.model_of"></a><h4>
-<a name="id519472"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a></li></ul></div>
-<div class="variablelist">
-=======
 <a name="fusion.view.filter_view.model_of"></a><h5>
-<a name="id725086"></a>
+<a name="id726699"></a>
         <a class="link" href="filter_view.html#fusion.view.filter_view.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
@@ -159,45 +128,30 @@
         </li>
 </ul></div>
 <div class="variablelist" title="Notation">
->>>>>>> .merge-right.r57125
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">F</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">F</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">filter_view</span></tt> type
+            A <code class="computeroutput"><span class="identifier">filter_view</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt>,
-        <tt class="computeroutput"><span class="identifier">f2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code>,
+        <code class="computeroutput"><span class="identifier">f2</span></code></span></dt>
 <dd><p>
-            Instances of <tt class="computeroutput"><span class="identifier">filter_view</span></tt>
+            Instances of <code class="computeroutput"><span class="identifier">filter_view</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>
+            A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.view.filter_view.expression_semantics"></a><h4>
-<a name="id519632"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.view.filter_view.expression_semantics"></a><h5>
-<a name="id725220"></a>
+<a name="id726832"></a>
         <a class="link" href="filter_view.html#fusion.view.filter_view.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-<<<<<<< .working
-        defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-        Sequence</a>.
-=======
         defined in the implemented models.
->>>>>>> .merge-right.r57242
       </p>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -205,62 +159,71 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">F</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a <tt class="computeroutput"><span class="identifier">filter_view</span></tt>
-                given a sequence, <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">F</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a <code class="computeroutput"><span class="identifier">filter_view</span></code>
+                given a sequence, <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">F</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a <tt class="computeroutput"><span class="identifier">filter_view</span></tt>
-                from another <tt class="computeroutput"><span class="identifier">filter_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">f</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">F</span><span class="special">(</span><span class="identifier">f</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a <code class="computeroutput"><span class="identifier">filter_view</span></code>
+                from another <code class="computeroutput"><span class="identifier">filter_view</span></code>,
+                <code class="computeroutput"><span class="identifier">f</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">f</span> <span class="special">=</span>
-                <span class="identifier">f2</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a <tt class="computeroutput"><span class="identifier">filter_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">f</span></tt>, from another
-                <tt class="computeroutput"><span class="identifier">filter_view</span></tt>, <tt class="computeroutput"><span class="identifier">f2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">f</span> <span class="special">=</span>
+                <span class="identifier">f2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a <code class="computeroutput"><span class="identifier">filter_view</span></code>,
+                <code class="computeroutput"><span class="identifier">f</span></code>, from another
+                <code class="computeroutput"><span class="identifier">filter_view</span></code>, <code class="computeroutput"><span class="identifier">f2</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.filter_view.example"></a><h4>
-<a name="id519942"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.view.filter_view.example"></a><h5>
-<a name="id725438"></a>
+<a name="id727051"></a>
         <a class="link" href="filter_view.html#fusion.view.filter_view.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">_</span><span class="special">;</span>
 <span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">not_</span><span class="special">;</span>
 <span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">is_class</span><span class="special">;</span>
 
-<span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">long</span><span class="special">,</span> <span class="keyword">bool</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vector_type</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">long</span><span class="special">,</span> <span class="keyword">bool</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vector_type</span><span class="special">;</span>
 
 <span class="identifier">vector_type</span> <span class="identifier">v</span><span class="special">(</span><span class="string">"a-string"</span><span class="special">,</span> <span class="char">'@'</span><span class="special">,</span> <span class="number">987654</span><span class="special">,</span> <span class="keyword">true</span><span class="special">,</span> <span class="number">6.6</span><span class="special">);</span>
 <span class="identifier">filter_view</span><span class="special">&lt;</span><span class="identifier">vector_type</span> <span class="keyword">const</span><span class="special">,</span> <span class="identifier">not_</span><span class="special">&lt;</span><span class="identifier">is_class</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;</span> <span class="special">&gt;</span> <span class="identifier">view</span><span class="special">(</span><span class="identifier">v</span><span class="special">);</span>
@@ -269,7 +232,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/view/iterator_range.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/iterator_range.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/view/iterator_range.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>iterator_range</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../view.html" title="View">
-<link rel="previous" href="filter_view.html" title="filter_view">
+<link rel="prev" href="filter_view.html" title="filter_view">
 <link rel="next" href="joint_view.html" title="joint_view">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,71 +22,36 @@
 <div class="spirit-nav">
 <a accesskey="p" href="filter_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="joint_view.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.view.iterator_range"></a>iterator_range
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.view.iterator_range.description"></a><h4>
-<a name="id520416"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="iterator_range">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.view.iterator_range"></a><a class="link" href="iterator_range.html" title="iterator_range">iterator_range</a>
 </h3></div></div></div>
 <a name="fusion.view.iterator_range.description"></a><h5>
-<a name="id725780"></a>
+<a name="id727393"></a>
         <a class="link" href="iterator_range.html#fusion.view.iterator_range.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        <tt class="computeroutput"><span class="identifier">iterator_range</span></tt> presents a
+        <code class="computeroutput"><span class="identifier">iterator_range</span></code> presents a
         sub-range of its underlying sequence delimited by a pair of iterators.
       </p>
-<<<<<<< .working
-<a name="fusion.view.iterator_range.header"></a><h4>
-<a name="id520456"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.view.iterator_range.header"></a><h5>
-<a name="id725804"></a>
+<a name="id727417"></a>
         <a class="link" href="iterator_range.html#fusion.view.iterator_range.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">view</span><span class="special">/</span><span class="identifier">iterator_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">iterator_range</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.iterator_range.synopsis"></a><h4>
-<a name="id520612"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.view.iterator_range.synopsis"></a><h5>
-<a name="id725912"></a>
+<a name="id727525"></a>
         <a class="link" href="iterator_range.html#fusion.view.iterator_range.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">First</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Last</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">iterator_range</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.iterator_range.template_parameters"></a><h4>
-<a name="id520708"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.view.iterator_range.template_parameters"></a><h5>
-<a name="id725977"></a>
+<a name="id727590"></a>
         <a class="link" href="iterator_range.html#fusion.view.iterator_range.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -98,54 +59,59 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">First</span></tt>
-              </p></td>
-<td><p>
-                A fusion Iterator
-              </p></td>
-<td><p>
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">First</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A fusion <a class="link" href="../iterator.html" title="Iterator">Iterator</a>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Last</span></tt>
-              </p></td>
-<td><p>
-                A fusion Iterator
-              </p></td>
-<td><p>
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Last</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A fusion <a class="link" href="../iterator.html" title="Iterator">Iterator</a>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.iterator_range.model_of"></a><h4>
-<a name="id520861"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li>
-<a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>,
-          <a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-          Sequence</a> or <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-=======
 <a name="fusion.view.iterator_range.model_of"></a><h5>
-<a name="id726099"></a>
+<a name="id727712"></a>
         <a class="link" href="iterator_range.html#fusion.view.iterator_range.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
@@ -153,9 +119,8 @@
 <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>,
           <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
           Sequence</a> or <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
->>>>>>> .merge-right.r57125
           Access Sequence</a> depending on the traversal characteristics (see
-          Sequence Traversal Concept)
+          <a class="link" href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence Traversal Concept</a>)
           of its underlying sequence.
         </li>
 <li class="listitem">
@@ -166,48 +131,36 @@
           Iterator</a> model.
         </li>
 </ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">IR</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">IR</span></code></span></dt>
 <dd><p>
-            An <tt class="computeroutput"><span class="identifier">iterator_range</span></tt> type
+            An <code class="computeroutput"><span class="identifier">iterator_range</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">First</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">First</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">l</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">l</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">Last</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">Last</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">ir</span></tt>,
-        <tt class="computeroutput"><span class="identifier">ir2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">ir</span></code>,
+        <code class="computeroutput"><span class="identifier">ir2</span></code></span></dt>
 <dd><p>
-            Instances of <tt class="computeroutput"><span class="identifier">iterator_range</span></tt>
+            Instances of <code class="computeroutput"><span class="identifier">iterator_range</span></code>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.view.iterator_range.expression_semantics"></a><h4>
-<a name="id521090"></a>
-        <a href="iterator_range.html#fusion.view.iterator_range.expression_semantics">Expression
-=======
 <a name="fusion.view.iterator_range.expression_semantics"></a><h5>
-<a name="id726283"></a>
+<a name="id727896"></a>
         <a class="link" href="iterator_range.html#fusion.view.iterator_range.expression_semantics">Expression
->>>>>>> .merge-right.r57125
         Semantics</a>
-      </h4>
+      </h5>
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-<<<<<<< .working
-        defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-        Sequence</a>.
-=======
         defined in the implemented models.
->>>>>>> .merge-right.r57242
       </p>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -215,67 +168,76 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">IR</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span> <span class="identifier">l</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates an <tt class="computeroutput"><span class="identifier">iterator_range</span></tt>
-                given iterators, <tt class="computeroutput"><span class="identifier">f</span></tt>
-                and <tt class="computeroutput"><span class="identifier">l</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">IR</span><span class="special">(</span><span class="identifier">f</span><span class="special">,</span> <span class="identifier">l</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates an <code class="computeroutput"><span class="identifier">iterator_range</span></code>
+                given iterators, <code class="computeroutput"><span class="identifier">f</span></code>
+                and <code class="computeroutput"><span class="identifier">l</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">IR</span><span class="special">(</span><span class="identifier">ir</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs an <tt class="computeroutput"><span class="identifier">iterator_range</span></tt>
-                from another <tt class="computeroutput"><span class="identifier">iterator_range</span></tt>,
-                <tt class="computeroutput"><span class="identifier">ir</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">IR</span><span class="special">(</span><span class="identifier">ir</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs an <code class="computeroutput"><span class="identifier">iterator_range</span></code>
+                from another <code class="computeroutput"><span class="identifier">iterator_range</span></code>,
+                <code class="computeroutput"><span class="identifier">ir</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">ir</span> <span class="special">=</span>
-                <span class="identifier">ir2</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a <tt class="computeroutput"><span class="identifier">iterator_range</span></tt>,
-                <tt class="computeroutput"><span class="identifier">ir</span></tt>, from another
-                <tt class="computeroutput"><span class="identifier">iterator_range</span></tt>,
-                <tt class="computeroutput"><span class="identifier">ir2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">ir</span> <span class="special">=</span>
+                <span class="identifier">ir2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a <code class="computeroutput"><span class="identifier">iterator_range</span></code>,
+                <code class="computeroutput"><span class="identifier">ir</span></code>, from another
+                <code class="computeroutput"><span class="identifier">iterator_range</span></code>,
+                <code class="computeroutput"><span class="identifier">ir2</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.iterator_range.example"></a><h4>
-<a name="id521424"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.view.iterator_range.example"></a><h5>
-<a name="id726517"></a>
+<a name="id728130"></a>
         <a class="link" href="iterator_range.html#fusion.view.iterator_range.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">char</span> <span class="keyword">const</span><span class="special">*</span> <span class="identifier">s</span> <span class="special">=</span> <span class="string">"Ruby"</span><span class="special">;</span>
-<span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">,</span> <span class="keyword">char</span> <span class="keyword">const</span><span class="special">*&gt;</span> <span class="identifier">vector_type</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">,</span> <span class="keyword">char</span> <span class="keyword">const</span><span class="special">*&gt;</span> <span class="identifier">vector_type</span><span class="special">;</span>
 <span class="identifier">vector_type</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'x'</span><span class="special">,</span> <span class="number">3.3</span><span class="special">,</span> <span class="identifier">s</span><span class="special">);</span>
 
-<span class="keyword">typedef</span> result_of::begin<span class="special">&lt;</span><span class="identifier">vector_type</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">A</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::end<span class="special">&lt;</span><span class="identifier">vector_type</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">B</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::next<span class="special">&lt;</span><span class="identifier">A</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">C</span><span class="special">;</span>
-<span class="keyword">typedef</span> result_of::prior<span class="special">&lt;</span><span class="identifier">B</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">D</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../sequence/intrinsic/metafunctions/begin.html" title="begin"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">begin</span></code></a><span class="special">&lt;</span><span class="identifier">vector_type</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">A</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../sequence/intrinsic/metafunctions/end.html" title="end"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">end</span></code></a><span class="special">&lt;</span><span class="identifier">vector_type</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">B</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../iterator/metafunctions/next.html" title="next"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">next</span></code></a><span class="special">&lt;</span><span class="identifier">A</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">C</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../iterator/metafunctions/prior.html" title="prior"><code class="computeroutput"><span class="identifier">result_of</span><span class="special">::</span><span class="identifier">prior</span></code></a><span class="special">&lt;</span><span class="identifier">B</span><span class="special">&gt;::</span><span class="identifier">type</span> <span class="identifier">D</span><span class="special">;</span>
 
 <span class="identifier">C</span> <span class="identifier">c</span><span class="special">(</span><span class="identifier">vec</span><span class="special">);</span>
 <span class="identifier">D</span> <span class="identifier">d</span><span class="special">(</span><span class="identifier">vec</span><span class="special">);</span>
@@ -286,7 +248,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/view/joint_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/joint_view.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/view/joint_view.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>joint_view</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../view.html" title="View">
-<link rel="previous" href="iterator_range.html" title="iterator_range">
+<link rel="prev" href="iterator_range.html" title="iterator_range">
 <link rel="next" href="zip_view.html" title="zip_view">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,71 +22,36 @@
 <div class="spirit-nav">
 <a accesskey="p" href="iterator_range.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="zip_view.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.view.joint_view"></a>joint_view
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.view.joint_view.description"></a><h4>
-<a name="id522089"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="joint_view">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.view.joint_view"></a><a class="link" href="joint_view.html" title="joint_view">joint_view</a>
 </h3></div></div></div>
 <a name="fusion.view.joint_view.description"></a><h5>
-<a name="id726993"></a>
+<a name="id731337"></a>
         <a class="link" href="joint_view.html#fusion.view.joint_view.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        <tt class="computeroutput"><span class="identifier">joint_view</span></tt> presents a view
+        <code class="computeroutput"><span class="identifier">joint_view</span></code> presents a view
         which is a concatenation of two sequences.
       </p>
-<<<<<<< .working
-<a name="fusion.view.joint_view.header"></a><h4>
-<a name="id522129"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.view.joint_view.header"></a><h5>
-<a name="id727017"></a>
+<a name="id731361"></a>
         <a class="link" href="joint_view.html#fusion.view.joint_view.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">view</span><span class="special">/</span><span class="identifier">joint_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">joint_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.joint_view.synopsis"></a><h4>
-<a name="id522285"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.view.joint_view.synopsis"></a><h5>
-<a name="id730770"></a>
+<a name="id731469"></a>
         <a class="link" href="joint_view.html#fusion.view.joint_view.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence2</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">joint_view</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.joint_view.template_parameters"></a><h4>
-<a name="id522380"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.view.joint_view.template_parameters"></a><h5>
-<a name="id730834"></a>
+<a name="id731534"></a>
         <a class="link" href="joint_view.html#fusion.view.joint_view.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -98,54 +59,61 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Sequence1</span></tt>
-              </p></td>
-<td><p>
-                A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Sequence1</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                 Sequence</a>
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Sequence2</span></tt>
-              </p></td>
-<td><p>
-                A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Sequence2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                 Sequence</a>
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.joint_view.model_of"></a><h4>
-<a name="id522535"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a></li></ul></div>
-<div class="variablelist">
-=======
 <a name="fusion.view.joint_view.model_of"></a><h5>
-<a name="id730957"></a>
+<a name="id731656"></a>
         <a class="link" href="joint_view.html#fusion.view.joint_view.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
@@ -159,48 +127,34 @@
         </li>
 </ul></div>
 <div class="variablelist" title="Notation">
->>>>>>> .merge-right.r57125
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">JV</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">JV</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">joint_view</span></tt> type
+            A <code class="computeroutput"><span class="identifier">joint_view</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s1</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s1</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">Sequence1</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">Sequence1</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s2</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">Sequence2</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">Sequence2</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">jv</span></tt>,
-        <tt class="computeroutput"><span class="identifier">jv2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">jv</span></code>,
+        <code class="computeroutput"><span class="identifier">jv2</span></code></span></dt>
 <dd><p>
-            Instances of <tt class="computeroutput"><span class="identifier">joint_view</span></tt>
+            Instances of <code class="computeroutput"><span class="identifier">joint_view</span></code>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.view.joint_view.expression_semantics"></a><h4>
-<a name="id522734"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.view.joint_view.expression_semantics"></a><h5>
-<a name="id731125"></a>
+<a name="id731824"></a>
         <a class="link" href="joint_view.html#fusion.view.joint_view.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-<<<<<<< .working
-        defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-        Sequence</a>.
-=======
         defined in the implemented models.
->>>>>>> .merge-right.r57242
       </p>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -208,72 +162,79 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">JV</span><span class="special">(</span><span class="identifier">s1</span><span class="special">,</span> <span class="identifier">s2</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a <tt class="computeroutput"><span class="identifier">joint_view</span></tt>
-                given sequences, <tt class="computeroutput"><span class="identifier">s1</span></tt>
-                and <tt class="computeroutput"><span class="identifier">s2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">JV</span><span class="special">(</span><span class="identifier">s1</span><span class="special">,</span> <span class="identifier">s2</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a <code class="computeroutput"><span class="identifier">joint_view</span></code>
+                given sequences, <code class="computeroutput"><span class="identifier">s1</span></code>
+                and <code class="computeroutput"><span class="identifier">s2</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">JV</span><span class="special">(</span><span class="identifier">jv</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a <tt class="computeroutput"><span class="identifier">joint_view</span></tt>
-                from another <tt class="computeroutput"><span class="identifier">joint_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">jv</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">JV</span><span class="special">(</span><span class="identifier">jv</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a <code class="computeroutput"><span class="identifier">joint_view</span></code>
+                from another <code class="computeroutput"><span class="identifier">joint_view</span></code>,
+                <code class="computeroutput"><span class="identifier">jv</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">jv</span> <span class="special">=</span>
-                <span class="identifier">jv2</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a <tt class="computeroutput"><span class="identifier">joint_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">jv</span></tt>, from another
-                <tt class="computeroutput"><span class="identifier">joint_view</span></tt>, <tt class="computeroutput"><span class="identifier">jv2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">jv</span> <span class="special">=</span>
+                <span class="identifier">jv2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a <code class="computeroutput"><span class="identifier">joint_view</span></code>,
+                <code class="computeroutput"><span class="identifier">jv</span></code>, from another
+                <code class="computeroutput"><span class="identifier">joint_view</span></code>, <code class="computeroutput"><span class="identifier">jv2</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.joint_view.example"></a><h4>
-<a name="id523069"></a>
-        Example
-      </h4>
-<pre class="programlisting">vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">3</span><span class="special">,</span> <span class="char">'x'</span><span class="special">);</span>
-vector<span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="string">"hello"</span><span class="special">,</span> <span class="number">123</span><span class="special">);</span>
-=======
 <a name="fusion.view.joint_view.example"></a><h5>
-<a name="id731359"></a>
+<a name="id732058"></a>
         <a class="link" href="joint_view.html#fusion.view.joint_view.example">Example</a>
       </h5>
 <pre class="programlisting"><a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">3</span><span class="special">,</span> <span class="char">'x'</span><span class="special">);</span>
 <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">v2</span><span class="special">(</span><span class="string">"hello"</span><span class="special">,</span> <span class="number">123</span><span class="special">);</span>
->>>>>>> .merge-right.r57125
 <span class="identifier">joint_view</span><span class="special">&lt;</span>
-    vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span>
-  <span class="special">,</span> vector<span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span>
+    <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">&gt;</span>
+  <span class="special">,</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span><span class="special">,</span> <span class="keyword">int</span><span class="special">&gt;</span>
 <span class="special">&gt;</span> <span class="identifier">view</span><span class="special">(</span><span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">);</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">view</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/view/nview.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/nview.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/view/nview.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>nview</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../view.html" title="View">
-<link rel="previous" href="reverse_view.html" title="reverse_view">
+<link rel="prev" href="reverse_view.html" title="reverse_view">
 <link rel="next" href="../adapted.html" title="Adapted">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,60 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="reverse_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../adapted.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.view.nview"></a>nview
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.view.nview.description"></a><h4>
-<a name="id528240"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="nview">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.view.nview"></a><a class="link" href="nview.html" title="nview">nview</a>
 </h3></div></div></div>
 <a name="fusion.view.nview.description"></a><h5>
-<a name="id735048"></a>
+<a name="id736869"></a>
         <a class="link" href="nview.html#fusion.view.nview.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        <tt class="computeroutput"><span class="identifier">nview</span></tt> presents a view which
-        iterates over a given Sequence in
-        a specified order. An <tt class="computeroutput"><span class="identifier">nview</span></tt>
-        is constructed from an arbitrary Sequence
+        <code class="computeroutput"><span class="identifier">nview</span></code> presents a view which
+        iterates over a given <a class="link" href="../sequence.html" title="Sequence">Sequence</a> in
+        a specified order. An <code class="computeroutput"><span class="identifier">nview</span></code>
+        is constructed from an arbitrary <a class="link" href="../sequence.html" title="Sequence">Sequence</a>
         and a list of indicies specifying the elements to iterate over.
       </p>
-<<<<<<< .working
-<a name="fusion.view.nview.header"></a><h4>
-<a name="id528309"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.view.nview.header"></a><h5>
-<a name="id735089"></a>
+<a name="id736910"></a>
         <a class="link" href="nview.html#fusion.view.nview.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">view</span><span class="special">/</span><span class="identifier">nview</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">nview</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.nview.synopsis"></a><h4>
-<a name="id528464"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.view.nview.synopsis"></a><h5>
-<a name="id736290"></a>
+<a name="id737018"></a>
         <a class="link" href="nview.html#fusion.view.nview.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Indicies</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">nview</span><span class="special">;</span>
 
@@ -87,17 +55,10 @@
 <span class="keyword">typename</span> <span class="identifier">result_of</span><span class="special">::</span><span class="identifier">nview</span><span class="special">&lt;</span><span class="identifier">Sequence</span><span class="special">,</span> <span class="identifier">I1</span><span class="special">,</span> <span class="identifier">I2</span><span class="special">,</span> <span class="special">...&gt;::</span><span class="identifier">type</span>
 <span class="identifier">as_nview</span><span class="special">(</span><span class="identifier">Sequence</span><span class="special">&amp;</span> <span class="identifier">s</span><span class="special">);</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.nview.template_parameters"></a><h4>
-<a name="id528750"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.view.nview.template_parameters"></a><h5>
-<a name="id736497"></a>
+<a name="id737226"></a>
         <a class="link" href="nview.html#fusion.view.nview.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -105,106 +66,110 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-              </p></td>
-<td><p>
-                An arbitrary Fusion <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Sequence</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                An arbitrary Fusion <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                 Sequence</a>
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Indicies</span></tt>
-              </p></td>
-<td><p>
-                A <tt class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector_c</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="special">...&gt;</span></tt> holding the indicies defining
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Indicies</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A <code class="computeroutput"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector_c</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="special">...&gt;</span></code> holding the indicies defining
                 the required iteration order.
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">I1</span></tt>, <tt class="computeroutput"><span class="identifier">I2</span></tt>, <tt class="computeroutput"><span class="identifier">I3</span></tt>...
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">I1</span></code>, <code class="computeroutput"><span class="identifier">I2</span></code>, <code class="computeroutput"><span class="identifier">I3</span></code>...
+              </p>
+              </td>
+<td>
+              <p>
                 A list of integers specifying the required iteration order.
-              </p></td>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">INT_MAX</span></tt> for <tt class="computeroutput"><span class="identifier">I2</span></tt>, <tt class="computeroutput"><span class="identifier">I3</span></tt>...
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">INT_MAX</span></code> for <code class="computeroutput"><span class="identifier">I2</span></code>, <code class="computeroutput"><span class="identifier">I3</span></code>...
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.nview.model_of"></a><h4>
-<a name="id529035"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li>
-<a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-          Access Sequence</a> (see <a href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence
-=======
 <a name="fusion.view.nview.model_of"></a><h5>
-<a name="id736711"></a>
+<a name="id737439"></a>
         <a class="link" href="nview.html#fusion.view.nview.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
 <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
           Access Sequence</a> (see <a class="link" href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence
->>>>>>> .merge-right.r57125
           Traversal Concept</a>)
         </li></ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">NV</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">NV</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">nview</span></tt> type
+            A <code class="computeroutput"><span class="identifier">nview</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">Sequences</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">Sequences</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">nv1</span></tt>,
-        <tt class="computeroutput"><span class="identifier">nv2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">nv1</span></code>,
+        <code class="computeroutput"><span class="identifier">nv2</span></code></span></dt>
 <dd><p>
-            Instances of <tt class="computeroutput"><span class="identifier">NV</span></tt>
+            Instances of <code class="computeroutput"><span class="identifier">NV</span></code>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.view.nview.expression_semantics"></a><h4>
-<a name="id529208"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.view.nview.expression_semantics"></a><h5>
-<a name="id736831"></a>
+<a name="id737559"></a>
         <a class="link" href="nview.html#fusion.view.nview.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-        defined in <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
+        defined in <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
         Access Sequence</a>.
       </p>
 <div class="informaltable"><table class="table">
@@ -213,64 +178,72 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">NV</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates an <tt class="computeroutput"><span class="identifier">nview</span></tt>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">NV</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates an <code class="computeroutput"><span class="identifier">nview</span></code>
                 given a sequence and a list of indicies.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">NV</span><span class="special">(</span><span class="identifier">nv1</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs an <tt class="computeroutput"><span class="identifier">nview</span></tt>
-                from another <tt class="computeroutput"><span class="identifier">nview</span></tt>,
-                <tt class="computeroutput"><span class="identifier">nv1</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">NV</span><span class="special">(</span><span class="identifier">nv1</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs an <code class="computeroutput"><span class="identifier">nview</span></code>
+                from another <code class="computeroutput"><span class="identifier">nview</span></code>,
+                <code class="computeroutput"><span class="identifier">nv1</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">nv1</span> <span class="special">=</span>
-                <span class="identifier">nv2</span></tt>
-              </p></td>
-<td><p>
-                Assigns to an <tt class="computeroutput"><span class="identifier">nview</span></tt>,
-                <tt class="computeroutput"><span class="identifier">nv1</span></tt>, from another
-                <tt class="computeroutput"><span class="identifier">nview</span></tt>, <tt class="computeroutput"><span class="identifier">nv2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">nv1</span> <span class="special">=</span>
+                <span class="identifier">nv2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to an <code class="computeroutput"><span class="identifier">nview</span></code>,
+                <code class="computeroutput"><span class="identifier">nv1</span></code>, from another
+                <code class="computeroutput"><span class="identifier">nview</span></code>, <code class="computeroutput"><span class="identifier">nv2</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
 <p>
-        The <tt class="computeroutput"><span class="identifier">nview</span></tt> internally stores
-        a Fusion vector
-        of references to the elements of the original Fusion Sequence
+        The <code class="computeroutput"><span class="identifier">nview</span></code> internally stores
+        a Fusion <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a>
+        of references to the elements of the original Fusion <a class="link" href="../sequence.html" title="Sequence">Sequence</a>
       </p>
-<<<<<<< .working
-<a name="fusion.view.nview.example"></a><h4>
-<a name="id529549"></a>
-        Example
-      </h4>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
-=======
 <a name="fusion.view.nview.example"></a><h5>
-<a name="id737073"></a>
+<a name="id737802"></a>
         <a class="link" href="nview.html#fusion.view.nview.example">Example</a>
       </h5>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">char</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vec</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 <span class="keyword">typedef</span> <span class="identifier">mpl</span><span class="special">::</span><span class="identifier">vector_c</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">1</span><span class="special">,</span> <span class="number">0</span><span class="special">,</span> <span class="number">2</span><span class="special">,</span> <span class="number">0</span><span class="special">&gt;</span> <span class="identifier">indicies</span><span class="special">;</span>
 
 <span class="identifier">vec</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span> <span class="char">'c'</span><span class="special">,</span> <span class="number">2.0</span><span class="special">);</span>
@@ -281,7 +254,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/view/reverse_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/reverse_view.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/view/reverse_view.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>reverse_view</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../view.html" title="View">
-<link rel="previous" href="transform_view.html" title="transform_view">
+<link rel="prev" href="transform_view.html" title="transform_view">
 <link rel="next" href="nview.html" title="nview">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,57 +22,33 @@
 <div class="spirit-nav">
 <a accesskey="p" href="transform_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="nview.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.view.reverse_view"></a>reverse_view
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="reverse_view">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.view.reverse_view"></a><a class="link" href="reverse_view.html" title="reverse_view">reverse_view</a>
+</h3></div></div></div>
 <p>
-        <tt class="computeroutput"><span class="identifier">reverse_view</span></tt> presents a reversed
+        <code class="computeroutput"><span class="identifier">reverse_view</span></code> presents a reversed
         view of underlying sequence. The first element will be its last and the last
         element will be its first.
       </p>
-<<<<<<< .working
-<a name="fusion.view.reverse_view.header"></a><h4>
-<a name="id527152"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.view.reverse_view.header"></a><h5>
-<a name="id734258"></a>
+<a name="id734958"></a>
         <a class="link" href="reverse_view.html#fusion.view.reverse_view.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">view</span><span class="special">/</span><span class="identifier">reverse_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">reverse_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.reverse_view.synopsis"></a><h4>
-<a name="id527307"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.view.reverse_view.synopsis"></a><h5>
-<a name="id734366"></a>
+<a name="id735066"></a>
         <a class="link" href="reverse_view.html#fusion.view.reverse_view.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">reverse_view</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.reverse_view.template_parameters"></a><h4>
-<a name="id527385"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.view.reverse_view.template_parameters"></a><h5>
-<a name="id734418"></a>
+<a name="id735118"></a>
         <a class="link" href="reverse_view.html#fusion.view.reverse_view.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -84,54 +56,54 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-              </p></td>
-<td><p>
-                A <a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Sequence</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
                 Sequence</a>
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.reverse_view.model_of"></a><h4>
-<a name="id527497"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-=======
 <a name="fusion.view.reverse_view.model_of"></a><h5>
-<a name="id734506"></a>
+<a name="id735205"></a>
         <a class="link" href="reverse_view.html#fusion.view.reverse_view.model_of">Model of</a>
       </h5>
-<<<<<<< .working
-<<<<<<< .working
-<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
->>>>>>> .merge-right.r57125
-          Sequence</a></li></ul></div>
-=======
-<p>
-        A model of the same sequence concept as <code class="computeroutput"><span class="identifier">Sequence</span></code>.
-      </p>
-=======
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
-<li class="listitem"><a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
-          Sequence</a></li>
+<li class="listitem">
+          A model of <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+          Sequence</a> if <code class="computeroutput"><span class="identifier">Sequence</span></code>
+          is a <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+          Sequence</a> else, <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+          Access Sequence</a> if <code class="computeroutput"><span class="identifier">Sequence</span></code>
+          is a <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+          Access Sequence</a>.
+        </li>
 <li class="listitem">
 <a class="link" href="../sequence/concepts/associative_sequence.html" title="Associative Sequence">Associative
           Sequence</a> if <code class="computeroutput"><span class="identifier">Sequence</span></code>
@@ -139,46 +111,32 @@
           Sequence</a> model.
         </li>
 </ul></div>
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">RV</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">RV</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">reverse_view</span></tt> type
+            A <code class="computeroutput"><span class="identifier">reverse_view</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">Sequence</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">rv</span></tt>,
-        <tt class="computeroutput"><span class="identifier">rv2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">rv</span></code>,
+        <code class="computeroutput"><span class="identifier">rv2</span></code></span></dt>
 <dd><p>
-            Instances of <tt class="computeroutput"><span class="identifier">reverse_view</span></tt>
+            Instances of <code class="computeroutput"><span class="identifier">reverse_view</span></code>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.view.reverse_view.expression_semantics"></a><h4>
-<a name="id527661"></a>
-        <a href="reverse_view.html#fusion.view.reverse_view.expression_semantics">Expression
-=======
 <a name="fusion.view.reverse_view.expression_semantics"></a><h5>
-<a name="id734641"></a>
+<a name="id735370"></a>
         <a class="link" href="reverse_view.html#fusion.view.reverse_view.expression_semantics">Expression
->>>>>>> .merge-right.r57125
         Semantics</a>
-      </h4>
+      </h5>
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-<<<<<<< .working
-        defined in <a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-        Sequence</a>.
-=======
         defined in the implemented models.
->>>>>>> .merge-right.r57242
       </p>
 <div class="informaltable"><table class="table">
 <colgroup>
@@ -186,59 +144,67 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">RV</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a unary <tt class="computeroutput"><span class="identifier">reverse_view</span></tt>
-                given sequence, <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">RV</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a unary <code class="computeroutput"><span class="identifier">reverse_view</span></code>
+                given sequence, <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">RV</span><span class="special">(</span><span class="identifier">rv</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a <tt class="computeroutput"><span class="identifier">reverse_view</span></tt>
-                from another <tt class="computeroutput"><span class="identifier">reverse_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">rv</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">RV</span><span class="special">(</span><span class="identifier">rv</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a <code class="computeroutput"><span class="identifier">reverse_view</span></code>
+                from another <code class="computeroutput"><span class="identifier">reverse_view</span></code>,
+                <code class="computeroutput"><span class="identifier">rv</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">rv</span> <span class="special">=</span>
-                <span class="identifier">rv2</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a <tt class="computeroutput"><span class="identifier">reverse_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">rv</span></tt>, from another
-                <tt class="computeroutput"><span class="identifier">reverse_view</span></tt>, <tt class="computeroutput"><span class="identifier">rv2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">rv</span> <span class="special">=</span>
+                <span class="identifier">rv2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a <code class="computeroutput"><span class="identifier">reverse_view</span></code>,
+                <code class="computeroutput"><span class="identifier">rv</span></code>, from another
+                <code class="computeroutput"><span class="identifier">reverse_view</span></code>, <code class="computeroutput"><span class="identifier">rv2</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.reverse_view.example"></a><h4>
-<a name="id527974"></a>
-        Example
-      </h4>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">short</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vector_type</span><span class="special">;</span>
-=======
 <a name="fusion.view.reverse_view.example"></a><h5>
-<a name="id734860"></a>
+<a name="id735588"></a>
         <a class="link" href="reverse_view.html#fusion.view.reverse_view.example">Example</a>
       </h5>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">short</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vector_type</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 <span class="identifier">vector_type</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="number">5</span><span class="special">,</span> <span class="number">3.3</span><span class="special">);</span>
 
 <span class="identifier">reverse_view</span><span class="special">&lt;</span><span class="identifier">vector_type</span><span class="special">&gt;</span> <span class="identifier">reverse</span><span class="special">(</span><span class="identifier">vec</span><span class="special">);</span>
@@ -247,7 +213,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/view/single_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/single_view.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/view/single_view.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>single_view</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../view.html" title="View">
-<link rel="previous" href="../view.html" title="View">
+<link rel="prev" href="../view.html" title="View">
 <link rel="next" href="filter_view.html" title="filter_view">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,56 +22,32 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="filter_view.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.view.single_view"></a>single_view
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="single_view">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.view.single_view"></a><a class="link" href="single_view.html" title="single_view">single_view</a>
+</h3></div></div></div>
 <p>
-        <tt class="computeroutput"><span class="identifier">single_view</span></tt> is a view into
+        <code class="computeroutput"><span class="identifier">single_view</span></code> is a view into
         a value as a single element sequence.
       </p>
-<<<<<<< .working
-<a name="fusion.view.single_view.header"></a><h4>
-<a name="id353110"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.view.single_view.header"></a><h5>
-<a name="id722947"></a>
+<a name="id725122"></a>
         <a class="link" href="single_view.html#fusion.view.single_view.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">view</span><span class="special">/</span><span class="identifier">single_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">single_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.single_view.synopsis"></a><h4>
-<a name="id518175"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.view.single_view.synopsis"></a><h5>
-<a name="id723055"></a>
+<a name="id725230"></a>
         <a class="link" href="single_view.html#fusion.view.single_view.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">single_view</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.single_view.template_parameters"></a><h4>
-<a name="id518253"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.view.single_view.template_parameters"></a><h5>
-<a name="id723107"></a>
+<a name="id725281"></a>
         <a class="link" href="single_view.html#fusion.view.single_view.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -83,75 +55,69 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">T</span></tt>
-              </p></td>
-<td><p>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">T</span></code>
+              </p>
+              </td>
+<td>
+              <p>
                 Any type
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.single_view.model_of"></a><h4>
-<a name="id518355"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li><a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a></li></ul></div>
-<div class="variablelist">
-=======
 <a name="fusion.view.single_view.model_of"></a><h5>
-<a name="id723190"></a>
+<a name="id725364"></a>
         <a class="link" href="single_view.html#fusion.view.single_view.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a></li></ul></div>
 <div class="variablelist" title="Notation">
->>>>>>> .merge-right.r57125
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">S</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">S</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">single_view</span></tt> type
+            A <code class="computeroutput"><span class="identifier">single_view</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt>,
-        <tt class="computeroutput"><span class="identifier">s2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code>,
+        <code class="computeroutput"><span class="identifier">s2</span></code></span></dt>
 <dd><p>
-            Instances of <tt class="computeroutput"><span class="identifier">single_view</span></tt>
+            Instances of <code class="computeroutput"><span class="identifier">single_view</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">x</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">x</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">T</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">T</span></code>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.view.single_view.expression_semantics"></a><h4>
-<a name="id518518"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.view.single_view.expression_semantics"></a><h5>
-<a name="id723305"></a>
+<a name="id725479"></a>
         <a class="link" href="single_view.html#fusion.view.single_view.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-        defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+        defined in <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
         Sequence</a>.
       </p>
 <div class="informaltable"><table class="table">
@@ -160,64 +126,73 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">S</span><span class="special">(</span><span class="identifier">x</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a <tt class="computeroutput"><span class="identifier">single_view</span></tt>
-                from <tt class="computeroutput"><span class="identifier">x</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">S</span><span class="special">(</span><span class="identifier">x</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a <code class="computeroutput"><span class="identifier">single_view</span></code>
+                from <code class="computeroutput"><span class="identifier">x</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">S</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a <tt class="computeroutput"><span class="identifier">single_view</span></tt>
-                from another <tt class="computeroutput"><span class="identifier">single_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">s</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">S</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a <code class="computeroutput"><span class="identifier">single_view</span></code>
+                from another <code class="computeroutput"><span class="identifier">single_view</span></code>,
+                <code class="computeroutput"><span class="identifier">s</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">s</span> <span class="special">=</span>
-                <span class="identifier">s2</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a <tt class="computeroutput"><span class="identifier">single_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">s</span></tt>, from another
-                <tt class="computeroutput"><span class="identifier">single_view</span></tt>, <tt class="computeroutput"><span class="identifier">s2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">s</span> <span class="special">=</span>
+                <span class="identifier">s2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a <code class="computeroutput"><span class="identifier">single_view</span></code>,
+                <code class="computeroutput"><span class="identifier">s</span></code>, from another
+                <code class="computeroutput"><span class="identifier">single_view</span></code>, <code class="computeroutput"><span class="identifier">s2</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.single_view.example"></a><h4>
-<a name="id518828"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.view.single_view.example"></a><h5>
-<a name="id723528"></a>
+<a name="id725703"></a>
         <a class="link" href="single_view.html#fusion.view.single_view.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="identifier">single_view</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">view</span><span class="special">(</span><span class="number">3</span><span class="special">);</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">view</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span>
 </pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/view/transform_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/transform_view.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/view/transform_view.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>transform_view</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../view.html" title="View">
-<link rel="previous" href="zip_view.html" title="zip_view">
+<link rel="prev" href="zip_view.html" title="zip_view">
 <link rel="next" href="reverse_view.html" title="reverse_view">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,70 +22,46 @@
 <div class="spirit-nav">
 <a accesskey="p" href="zip_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reverse_view.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.view.transform_view"></a>transform_view
-</h3></div></div>
-<div></div>
-</div>
+<div class="section" title="transform_view">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="fusion.view.transform_view"></a><a class="link" href="transform_view.html" title="transform_view">transform_view</a>
+</h3></div></div></div>
 <p>
-        The unary version of <tt class="computeroutput"><span class="identifier">transform_view</span></tt>
+        The unary version of <code class="computeroutput"><span class="identifier">transform_view</span></code>
         presents a view of its underlying sequence given a unary function object
-        or function pointer. The binary version of <tt class="computeroutput"><span class="identifier">transform_view</span></tt>
+        or function pointer. The binary version of <code class="computeroutput"><span class="identifier">transform_view</span></code>
         presents a view of 2 underlying sequences, given a binary function object
-        or function pointer. The <tt class="computeroutput"><span class="identifier">transform_view</span></tt>
-        inherits the traversal characteristics (see <a href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence
+        or function pointer. The <code class="computeroutput"><span class="identifier">transform_view</span></code>
+        inherits the traversal characteristics (see <a class="link" href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence
         Traversal Concept</a>) of its underlying sequence or sequences.
       </p>
-<<<<<<< .working
-<a name="fusion.view.transform_view.header"></a><h4>
-<a name="id524861"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.view.transform_view.header"></a><h5>
-<a name="id732614"></a>
+<a name="id733314"></a>
         <a class="link" href="transform_view.html#fusion.view.transform_view.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">view</span><span class="special">/</span><span class="identifier">transform_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">transform_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.transform_view.synopsis"></a><h4>
-<a name="id525017"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.view.transform_view.synopsis"></a><h5>
-<a name="id732722"></a>
+<a name="id733422"></a>
         <a class="link" href="transform_view.html#fusion.view.transform_view.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        <span class="bold"><b>Unary Version</b></span>
+        <span class="bold"><strong>Unary Version</strong></span>
       </p>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">F1</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">transform_view</span><span class="special">;</span>
 </pre>
 <p>
-        <span class="bold"><b>Binary Version</b></span>
+        <span class="bold"><strong>Binary Version</strong></span>
       </p>
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequence1</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Sequence2</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">F2</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">transform_view</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.transform_view.template_parameters"></a><h4>
-<a name="id525221"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.view.transform_view.template_parameters"></a><h5>
-<a name="id732868"></a>
+<a name="id733569"></a>
         <a class="link" href="transform_view.html#fusion.view.transform_view.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -97,171 +69,181 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
-              </p></td>
-<td><p>
-                A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Sequence</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                 Sequence</a>
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Sequence1</span></tt>
-              </p></td>
-<td><p>
-                A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Sequence1</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                 Sequence</a>
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Sequence2</span></tt>
-              </p></td>
-<td><p>
-                A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Sequence2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                 Sequence</a>
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">F1</span></tt>
-              </p></td>
-<td><p>
-                A unary function object or function pointer. <tt class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F1</span><span class="special">(</span><span class="identifier">E</span><span class="special">)&gt;::</span><span class="identifier">type</span></tt> is the return type of an instance
-                of <tt class="computeroutput"><span class="identifier">F1</span></tt> when called
-                with a value of each element type <tt class="computeroutput"><span class="identifier">E</span></tt>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">F1</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A unary function object or function pointer. <code class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F1</span><span class="special">(</span><span class="identifier">E</span><span class="special">)&gt;::</span><span class="identifier">type</span></code> is the return type of an instance
+                of <code class="computeroutput"><span class="identifier">F1</span></code> when called
+                with a value of each element type <code class="computeroutput"><span class="identifier">E</span></code>
                 in the input sequence.
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">F2</span></tt>
-              </p></td>
-<td><p>
-                A binary function object or function pointer. <tt class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F2</span><span class="special">(</span><span class="identifier">E1</span><span class="special">,</span> <span class="identifier">E2</span><span class="special">)&gt;::</span><span class="identifier">type</span></tt> is the return type of an instance
-                of <tt class="computeroutput"><span class="identifier">F2</span></tt> when called
-                with a value of each corresponding pair of element type <tt class="computeroutput"><span class="identifier">E1</span></tt> and <tt class="computeroutput"><span class="identifier">E2</span></tt>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">F2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A binary function object or function pointer. <code class="computeroutput">boost::result_of<span class="special">&lt;</span><span class="identifier">F2</span><span class="special">(</span><span class="identifier">E1</span><span class="special">,</span> <span class="identifier">E2</span><span class="special">)&gt;::</span><span class="identifier">type</span></code> is the return type of an instance
+                of <code class="computeroutput"><span class="identifier">F2</span></code> when called
+                with a value of each corresponding pair of element type <code class="computeroutput"><span class="identifier">E1</span></code> and <code class="computeroutput"><span class="identifier">E2</span></code>
                 in the input sequences.
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.transform_view.model_of"></a><h4>
-<a name="id525686"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li>
-<a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>,
-          <a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-          Sequence</a> or <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-=======
 <a name="fusion.view.transform_view.model_of"></a><h5>
-<a name="id733216"></a>
+<a name="id733915"></a>
         <a class="link" href="transform_view.html#fusion.view.transform_view.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
 <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>,
           <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
           Sequence</a> or <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
->>>>>>> .merge-right.r57125
           Access Sequence</a> depending on the traversal characteristics (see
-          Sequence Traversal Concept)
+          <a class="link" href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence Traversal Concept</a>)
           of its underlying sequence.
         </li></ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">TV</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">TV</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">transform_view</span></tt> type
+            A <code class="computeroutput"><span class="identifier">transform_view</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">BTV</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">BTV</span></code></span></dt>
 <dd><p>
-            A binary <tt class="computeroutput"><span class="identifier">transform_view</span></tt>
+            A binary <code class="computeroutput"><span class="identifier">transform_view</span></code>
             type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">UTV</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">UTV</span></code></span></dt>
 <dd><p>
-            A unary <tt class="computeroutput"><span class="identifier">transform_view</span></tt>
+            A unary <code class="computeroutput"><span class="identifier">transform_view</span></code>
             type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f1</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f1</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">F1</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">F1</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">f2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">f2</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">F2</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">F2</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">Sequence</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">Sequence</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s1</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s1</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">Sequence1</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">Sequence1</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s2</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">Sequence2</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">Sequence2</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">tv</span></tt>,
-        <tt class="computeroutput"><span class="identifier">tv2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">tv</span></code>,
+        <code class="computeroutput"><span class="identifier">tv2</span></code></span></dt>
 <dd><p>
-            Instances of <tt class="computeroutput"><span class="identifier">transform_view</span></tt>
+            Instances of <code class="computeroutput"><span class="identifier">transform_view</span></code>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.view.transform_view.expression_semantics"></a><h4>
-<a name="id526088"></a>
-        <a href="transform_view.html#fusion.view.transform_view.expression_semantics">Expression
-=======
 <a name="fusion.view.transform_view.expression_semantics"></a><h5>
-<a name="id733498"></a>
+<a name="id734197"></a>
         <a class="link" href="transform_view.html#fusion.view.transform_view.expression_semantics">Expression
->>>>>>> .merge-right.r57125
         Semantics</a>
-      </h4>
+      </h5>
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-        defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
-        Sequence</a>, <a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-        Sequence</a> or <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-        Access Sequence</a> depending on the traversal characteristics (see Sequence Traversal Concept)
+        defined in <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
+        Sequence</a>, <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
+        Sequence</a> or <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
+        Access Sequence</a> depending on the traversal characteristics (see <a class="link" href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence Traversal Concept</a>)
         of its underlying sequence or sequences.
       </p>
 <div class="informaltable"><table class="table">
@@ -270,70 +252,83 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">UTV</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="identifier">f1</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a unary <tt class="computeroutput"><span class="identifier">transform_view</span></tt>
-                given sequence, <tt class="computeroutput"><span class="identifier">s</span></tt>
-                and unary function object or function pointer, <tt class="computeroutput"><span class="identifier">f1</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">UTV</span><span class="special">(</span><span class="identifier">s</span><span class="special">,</span> <span class="identifier">f1</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a unary <code class="computeroutput"><span class="identifier">transform_view</span></code>
+                given sequence, <code class="computeroutput"><span class="identifier">s</span></code>
+                and unary function object or function pointer, <code class="computeroutput"><span class="identifier">f1</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">BTV</span><span class="special">(</span><span class="identifier">s1</span><span class="special">,</span> <span class="identifier">s2</span><span class="special">,</span> <span class="identifier">f2</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a binary <tt class="computeroutput"><span class="identifier">transform_view</span></tt>
-                given sequences, <tt class="computeroutput"><span class="identifier">s1</span></tt>
-                and <tt class="computeroutput"><span class="identifier">s2</span></tt> and binary
-                function object or function pointer, <tt class="computeroutput"><span class="identifier">f2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">BTV</span><span class="special">(</span><span class="identifier">s1</span><span class="special">,</span> <span class="identifier">s2</span><span class="special">,</span> <span class="identifier">f2</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a binary <code class="computeroutput"><span class="identifier">transform_view</span></code>
+                given sequences, <code class="computeroutput"><span class="identifier">s1</span></code>
+                and <code class="computeroutput"><span class="identifier">s2</span></code> and binary
+                function object or function pointer, <code class="computeroutput"><span class="identifier">f2</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">TV</span><span class="special">(</span><span class="identifier">tv</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a <tt class="computeroutput"><span class="identifier">transform_view</span></tt>
-                from another <tt class="computeroutput"><span class="identifier">transform_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">tv</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">TV</span><span class="special">(</span><span class="identifier">tv</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a <code class="computeroutput"><span class="identifier">transform_view</span></code>
+                from another <code class="computeroutput"><span class="identifier">transform_view</span></code>,
+                <code class="computeroutput"><span class="identifier">tv</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">tv</span> <span class="special">=</span>
-                <span class="identifier">tv2</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a <tt class="computeroutput"><span class="identifier">transform_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">tv</span></tt>, from another
-                <tt class="computeroutput"><span class="identifier">transform_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">tv2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">tv</span> <span class="special">=</span>
+                <span class="identifier">tv2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a <code class="computeroutput"><span class="identifier">transform_view</span></code>,
+                <code class="computeroutput"><span class="identifier">tv</span></code>, from another
+                <code class="computeroutput"><span class="identifier">transform_view</span></code>,
+                <code class="computeroutput"><span class="identifier">tv2</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.transform_view.example"></a><h4>
-<a name="id526566"></a>
-        Example
-      </h4>
-=======
 <a name="fusion.view.transform_view.example"></a><h5>
-<a name="id733832"></a>
+<a name="id734532"></a>
         <a class="link" href="transform_view.html#fusion.view.transform_view.example">Example</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">struct</span> <span class="identifier">square</span>
 <span class="special">{</span>
     <span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sig</span><span class="special">&gt;</span>
@@ -351,7 +346,7 @@
     <span class="special">}</span>
 <span class="special">};</span>
 
-<span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">short</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vector_type</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span> <span class="keyword">short</span><span class="special">,</span> <span class="keyword">double</span><span class="special">&gt;</span> <span class="identifier">vector_type</span><span class="special">;</span>
 <span class="identifier">vector_type</span> <span class="identifier">vec</span><span class="special">(</span><span class="number">2</span><span class="special">,</span> <span class="number">5</span><span class="special">,</span> <span class="number">3.3</span><span class="special">);</span>
 
 <span class="identifier">transform_view</span><span class="special">&lt;</span><span class="identifier">vector_type</span><span class="special">,</span> <span class="identifier">square</span><span class="special">&gt;</span> <span class="identifier">transform</span><span class="special">(</span><span class="identifier">vec</span><span class="special">,</span> <span class="identifier">square</span><span class="special">());</span>
@@ -360,7 +355,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/fusion/view/zip_view.html
==============================================================================
--- branches/release/libs/fusion/doc/html/fusion/view/zip_view.html	(original)
+++ branches/release/libs/fusion/doc/html/fusion/view/zip_view.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -1,16 +1,12 @@
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>zip_view</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
->>>>>>> .merge-right.r57125
-<link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
 <link rel="up" href="../view.html" title="View">
-<link rel="previous" href="joint_view.html" title="joint_view">
+<link rel="prev" href="joint_view.html" title="joint_view">
 <link rel="next" href="transform_view.html" title="transform_view">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,74 +22,39 @@
 <div class="spirit-nav">
 <a accesskey="p" href="joint_view.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../view.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="transform_view.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
 </div>
-<<<<<<< .working
-<div class="section" lang="en">
-<div class="titlepage">
-<div><div><h3 class="title">
-<a name="fusion.view.zip_view"></a>zip_view
-</h3></div></div>
-<div></div>
-</div>
-<a name="fusion.view.zip_view.description"></a><h4>
-<a name="id523475"></a>
-        Description
-      </h4>
-=======
 <div class="section" title="zip_view">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="fusion.view.zip_view"></a><a class="link" href="zip_view.html" title="zip_view">zip_view</a>
 </h3></div></div></div>
 <a name="fusion.view.zip_view.description"></a><h5>
-<a name="id731648"></a>
+<a name="id732348"></a>
         <a class="link" href="zip_view.html#fusion.view.zip_view.description">Description</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
-        <tt class="computeroutput"><span class="identifier">zip_view</span></tt> presents a view
-        which iterates over a collection of Sequence(s)
-        in parallel. A <tt class="computeroutput"><span class="identifier">zip_view</span></tt> is
-        constructed from a Sequence of references
+        <code class="computeroutput"><span class="identifier">zip_view</span></code> presents a view
+        which iterates over a collection of <a class="link" href="../sequence.html" title="Sequence">Sequence</a>(s)
+        in parallel. A <code class="computeroutput"><span class="identifier">zip_view</span></code> is
+        constructed from a <a class="link" href="../sequence.html" title="Sequence">Sequence</a> of references
         to the component <span class="underline">_sequence</span>_s.
       </p>
-<<<<<<< .working
-<a name="fusion.view.zip_view.header"></a><h4>
-<a name="id523552"></a>
-        Header
-      </h4>
-=======
 <a name="fusion.view.zip_view.header"></a><h5>
-<a name="id731695"></a>
+<a name="id732394"></a>
         <a class="link" href="zip_view.html#fusion.view.zip_view.header">Header</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">view</span><span class="special">/</span><span class="identifier">zip_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 <span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">zip_view</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.zip_view.synopsis"></a><h4>
-<a name="id523707"></a>
-        Synopsis
-      </h4>
-=======
 <a name="fusion.view.zip_view.synopsis"></a><h5>
-<a name="id731803"></a>
+<a name="id732502"></a>
         <a class="link" href="zip_view.html#fusion.view.zip_view.synopsis">Synopsis</a>
       </h5>
->>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="keyword">template</span> <span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Sequences</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">zip_view</span><span class="special">;</span>
 </pre>
-<<<<<<< .working
-<a name="fusion.view.zip_view.template_parameters"></a><h4>
-<a name="id523785"></a>
-        Template parameters
-      </h4>
-=======
 <a name="fusion.view.zip_view.template_parameters"></a><h5>
-<a name="id731854"></a>
+<a name="id732554"></a>
         <a class="link" href="zip_view.html#fusion.view.zip_view.template_parameters">Template parameters</a>
       </h5>
->>>>>>> .merge-right.r57125
 <div class="informaltable"><table class="table">
 <colgroup>
 <col>
@@ -101,88 +62,77 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Parameter
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Description
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Default
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody><tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">Sequences</span></tt>
-              </p></td>
-<td><p>
-                A <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">Sequences</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                A <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
                 Sequence</a> of references to other Fusion <span class="underline">_sequence</span>_s
-              </p></td>
-<td><p>
-              </p></td>
+              </p>
+              </td>
+<td>
+              <p>
+              </p>
+              </td>
 </tr></tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.zip_view.model_of"></a><h4>
-<a name="id523904"></a>
-        Model of
-      </h4>
-<div class="itemizedlist"><ul type="disc"><li>
-<a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward Sequence</a>,
-          <a href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional
-        Sequence">Bidirectional
-          Sequence</a> or <a href="../sequence/concepts/random_access_sequence.html" title="Random
-        Access Sequence">Random
-=======
 <a name="fusion.view.zip_view.model_of"></a><h5>
-<a name="id731947"></a>
+<a name="id732646"></a>
         <a class="link" href="zip_view.html#fusion.view.zip_view.model_of">Model of</a>
       </h5>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
 <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward Sequence</a>,
           <a class="link" href="../sequence/concepts/bidirectional_sequence.html" title="Bidirectional Sequence">Bidirectional
           Sequence</a> or <a class="link" href="../sequence/concepts/random_access_sequence.html" title="Random Access Sequence">Random
->>>>>>> .merge-right.r57125
           Access Sequence</a> depending on the traversal characteristics (see
-          Sequence Traversal Concept)
+          <a class="link" href="../sequence/concepts.html#fusion.sequence.concepts.traversal">Sequence Traversal Concept</a>)
           of its underlying sequence.
         </li></ul></div>
-<div class="variablelist">
+<div class="variablelist" title="Notation">
 <p class="title"><b>Notation</b></p>
 <dl>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">ZV</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">ZV</span></code></span></dt>
 <dd><p>
-            A <tt class="computeroutput"><span class="identifier">zip_view</span></tt> type
+            A <code class="computeroutput"><span class="identifier">zip_view</span></code> type
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">s</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">s</span></code></span></dt>
 <dd><p>
-            An instance of <tt class="computeroutput"><span class="identifier">Sequences</span></tt>
+            An instance of <code class="computeroutput"><span class="identifier">Sequences</span></code>
           </p></dd>
-<dt><span class="term"><tt class="computeroutput"><span class="identifier">zv1</span></tt>,
-        <tt class="computeroutput"><span class="identifier">zv2</span></tt></span></dt>
+<dt><span class="term"><code class="computeroutput"><span class="identifier">zv1</span></code>,
+        <code class="computeroutput"><span class="identifier">zv2</span></code></span></dt>
 <dd><p>
-            Instances of <tt class="computeroutput"><span class="identifier">ZV</span></tt>
+            Instances of <code class="computeroutput"><span class="identifier">ZV</span></code>
           </p></dd>
 </dl>
 </div>
-<<<<<<< .working
-<a name="fusion.view.zip_view.expression_semantics"></a><h4>
-<a name="id524097"></a>
-        Expression Semantics
-      </h4>
-=======
 <a name="fusion.view.zip_view.expression_semantics"></a><h5>
-<a name="id732078"></a>
+<a name="id732777"></a>
         <a class="link" href="zip_view.html#fusion.view.zip_view.expression_semantics">Expression Semantics</a>
       </h5>
->>>>>>> .merge-right.r57125
 <p>
         Semantics of an expression is defined only where it differs from, or is not
-        defined in <a href="../sequence/concepts/forward_sequence.html" title="Forward
-        Sequence">Forward
+        defined in <a class="link" href="../sequence/concepts/forward_sequence.html" title="Forward Sequence">Forward
         Sequence</a>.
       </p>
 <div class="informaltable"><table class="table">
@@ -191,70 +141,77 @@
 <col>
 </colgroup>
 <thead><tr>
-<th><p>
+<th>
+              <p>
                 Expression
-              </p></th>
-<th><p>
+              </p>
+              </th>
+<th>
+              <p>
                 Semantics
-              </p></th>
+              </p>
+              </th>
 </tr></thead>
 <tbody>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">ZV</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Creates a <tt class="computeroutput"><span class="identifier">zip_view</span></tt>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">ZV</span><span class="special">(</span><span class="identifier">s</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Creates a <code class="computeroutput"><span class="identifier">zip_view</span></code>
                 given a sequence of references to the component <span class="underline">_sequence</span>_s.
-              </p></td>
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">ZV</span><span class="special">(</span><span class="identifier">zv1</span><span class="special">)</span></tt>
-              </p></td>
-<td><p>
-                Copy constructs a <tt class="computeroutput"><span class="identifier">zip_view</span></tt>
-                from another <tt class="computeroutput"><span class="identifier">zip_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">zv</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">ZV</span><span class="special">(</span><span class="identifier">zv1</span><span class="special">)</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Copy constructs a <code class="computeroutput"><span class="identifier">zip_view</span></code>
+                from another <code class="computeroutput"><span class="identifier">zip_view</span></code>,
+                <code class="computeroutput"><span class="identifier">zv</span></code>.
+              </p>
+              </td>
 </tr>
 <tr>
-<td><p>
-                <tt class="computeroutput"><span class="identifier">zv1</span> <span class="special">=</span>
-                <span class="identifier">zv2</span></tt>
-              </p></td>
-<td><p>
-                Assigns to a <tt class="computeroutput"><span class="identifier">zip_view</span></tt>,
-                <tt class="computeroutput"><span class="identifier">zv</span></tt>, from another
-                <tt class="computeroutput"><span class="identifier">zip_view</span></tt>, <tt class="computeroutput"><span class="identifier">zv2</span></tt>.
-              </p></td>
+<td>
+              <p>
+                <code class="computeroutput"><span class="identifier">zv1</span> <span class="special">=</span>
+                <span class="identifier">zv2</span></code>
+              </p>
+              </td>
+<td>
+              <p>
+                Assigns to a <code class="computeroutput"><span class="identifier">zip_view</span></code>,
+                <code class="computeroutput"><span class="identifier">zv</span></code>, from another
+                <code class="computeroutput"><span class="identifier">zip_view</span></code>, <code class="computeroutput"><span class="identifier">zv2</span></code>.
+              </p>
+              </td>
 </tr>
 </tbody>
 </table></div>
-<<<<<<< .working
-<a name="fusion.view.zip_view.example"></a><h4>
-<a name="id524404"></a>
-        Example
-      </h4>
-<pre class="programlisting"><span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec1</span><span class="special">;</span>
-<span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec2</span><span class="special">;</span>
-=======
 <a name="fusion.view.zip_view.example"></a><h5>
-<a name="id732298"></a>
+<a name="id732998"></a>
         <a class="link" href="zip_view.html#fusion.view.zip_view.example">Example</a>
       </h5>
 <pre class="programlisting"><span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">int</span><span class="special">,</span><span class="keyword">int</span><span class="special">&gt;</span> <span class="identifier">vec1</span><span class="special">;</span>
 <span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="keyword">char</span><span class="special">,</span><span class="keyword">char</span><span class="special">&gt;</span> <span class="identifier">vec2</span><span class="special">;</span>
->>>>>>> .merge-right.r57125
 <span class="identifier">vec1</span> <span class="identifier">v1</span><span class="special">(</span><span class="number">1</span><span class="special">,</span><span class="number">2</span><span class="special">);</span>
 <span class="identifier">vec2</span> <span class="identifier">v2</span><span class="special">(</span><span class="char">'a'</span><span class="special">,</span><span class="char">'b'</span><span class="special">);</span>
-<span class="keyword">typedef</span> vector<span class="special">&lt;</span><span class="identifier">vec1</span><span class="special">&amp;,</span> <span class="identifier">vec2</span><span class="special">&amp;&gt;</span> <span class="identifier">sequences</span><span class="special">;</span>
+<span class="keyword">typedef</span> <a class="link" href="../container/vector.html" title="vector"><code class="computeroutput"><span class="identifier">vector</span></code></a><span class="special">&lt;</span><span class="identifier">vec1</span><span class="special">&amp;,</span> <span class="identifier">vec2</span><span class="special">&amp;&gt;</span> <span class="identifier">sequences</span><span class="special">;</span>
 <span class="identifier">std</span><span class="special">::</span><span class="identifier">cout</span> <span class="special">&lt;&lt;</span> <span class="identifier">zip_view</span><span class="special">&lt;</span><span class="identifier">sequences</span><span class="special">&gt;(</span><span class="identifier">sequences</span><span class="special">(</span><span class="identifier">v1</span><span class="special">,</span> <span class="identifier">v2</span><span class="special">))</span> <span class="special">&lt;&lt;</span> <span class="identifier">std</span><span class="special">::</span><span class="identifier">endl</span><span class="special">;</span> <span class="comment">// ((1 a) (2 b))
 </span></pre>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+<td align="right"><div class="copyright-footer">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger<p>
         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)

Modified: branches/release/libs/fusion/doc/html/index.html
==============================================================================
--- branches/release/libs/fusion/doc/html/index.html	(original)
+++ branches/release/libs/fusion/doc/html/index.html	2010-01-15 01:35:28 EST (Fri, 15 Jan 2010)
@@ -3,16 +3,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Chapter&#160;1.&#160;Fusion 2.0</title>
 <link rel="stylesheet" href="../../../../doc/html/boostbook.css" type="text/css">
-<<<<<<< .working
-<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
-=======
 <meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-<link rel="home" href="index.html" title="Chapter 1. Fusion 2.0">
-=======
 <link rel="home" href="index.html" title="Chapter&#160;1.&#160;Fusion 2.0">
->>>>>>> .merge-right.r58299
 <link rel="next" href="fusion/preface.html" title="Preface">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,14 +18,8 @@
 </tr></table>
 <hr>
 <div class="spirit-nav"><a accesskey="n" href="fusion/preface.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
-<<<<<<< .working
-<div class="chapter" lang="en">
-<div class="titlepage">
-<div>
-=======
 <div class="chapter" title="Chapter&#160;1.&#160;Fusion 2.0">
 <div class="titlepage"><div>
->>>>>>> .merge-right.r58299
 <div><h2 class="title">
 <a name="fusion"></a>Chapter&#160;1.&#160;Fusion 2.0</h2></div>
 <div><div class="author"><h3 class="author">
@@ -47,18 +33,13 @@
 </h3></div></div>
 <div><p class="copyright">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger</p></div>
-<<<<<<< .working
-<div><div class="legalnotice"><p>
-=======
 <div><div class="legalnotice" title="Legal Notice">
-<a name="id613974"></a><p>
->>>>>>> .merge-right.r57125
+<a name="id607420"></a><p>
         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)
-      </p></div></div>
-</div>
-<div></div>
-</div>
+      </p>
+</div></div>
+</div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
@@ -266,31 +247,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<td align="left"><p><small>Last revised: October 11, 2009 at 16:05:02 GMT</small></p></td>
-=======
-<td align="left"><p><small>Last revised: October 20, 2009 at 14:59:29 GMT</small></p></td>
-=======
-<td align="left"><p><small>Last revised: October 30, 2009 at 00:09:36 GMT</small></p></td>
-=======
-<td align="left"><p><small>Last revised: November 03, 2009 at 17:25:59 GMT</small></p></td>
-=======
-<td align="left"><p><small>Last revised: December 11, 2009 at 10:57:59 GMT</small></p></td>
-=======
-<td align="left"><p><small>Last revised: December 28, 2009 at 16:58:16 GMT</small></p></td>
-=======
-<td align="left"><p><small>Last revised: December 29, 2009 at 14:02:18 GMT</small></p></td>
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
->>>>>>> .merge-right.r57125
+<td align="left"><p><small>Last revised: December 29, 2009 at 18:24:22 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>