From fb038c188dcc15c5e2b64710f75d0d5a0e32bde6 Mon Sep 17 00:00:00 2001
From: Aleksey Gurtovoy <agurtovoy@meta-comm.com>
Date: Fri, 2 Jul 2010 09:26:29 +0000
Subject: [PATCH] Manually merge changesets @55858 and @58111 from the trunk
 (svnmerge.py refuses to)

[SVN r63521]
---
 doc/src/refmanual/for_each.rst |  4 ++--
 doc/src/refmanual/protect.rst  | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/doc/src/refmanual/for_each.rst b/doc/src/refmanual/for_each.rst
index f2fce9c..6385605 100644
--- a/doc/src/refmanual/for_each.rst
+++ b/doc/src/refmanual/for_each.rst
@@ -103,7 +103,7 @@ For any |Forward Sequence| ``s``, |Lambda Expression| ``op`` , and an
         
     .. parsed-literal::
 
-        for_each< tranform_view<s,op> >( f );
+        for_each< transform_view<s,op> >( f );
 
 
 Complexity
@@ -121,7 +121,7 @@ Example
     {
         template< typename U > void operator()(U x)
         {
-            std::cout << x << '\n';
+            std::cout << x << '\\n';
         }
     };
 
diff --git a/doc/src/refmanual/protect.rst b/doc/src/refmanual/protect.rst
index cf4f967..1ede413 100644
--- a/doc/src/refmanual/protect.rst
+++ b/doc/src/refmanual/protect.rst
@@ -81,25 +81,22 @@ Example
 
 .. parsed-literal::
     
-    FIXME
-    
     struct f
     {
         template< typename T1, typename T2 > struct apply
         {
-            // |...|
+            typedef T2 type;
         };
     };
-    
-    typedef bind<_1, protect< bind<f,_1,_2> > >
-    
-    typedef apply_wrap0< f0 >::type r1;
-    typedef apply_wrap0< g0 >::type r2;
-    typedef apply_wrap2< f2,int,char >::type r3;
-
+     
+    typedef bind< quote\ ``3``\<if\_>,_1,_2,bind<f,_1,_2> > b1;
+    typedef bind< quote\ ``3``\<if\_>,_1,_2,protect< bind<f,_1,_2> > > b2;
+     
+    typedef apply_wrap\ ``2``\< b1,false\_,char >::type r1;
+    typedef apply_wrap\ ``2``\< b2,false\_,char >::type r2;
+     
     BOOST_MPL_ASSERT(( is_same<r1,char> ));
-    BOOST_MPL_ASSERT(( is_same<r2,char> ));
-    BOOST_MPL_ASSERT(( is_same<r3,char> ));
+    BOOST_MPL_ASSERT(( is_same<r2,protect< bind<f,_1,_2> > > ));
 
 
 See also