Merge branch 'develop'

Author: olk

doc/callcc.qbk

@@ -6,7 +6,7 @@
 ]
 
 [#cc]
-[section:cc call/cc]
+[section:cc Context switching with call/cc]
 
 __callcc__ (call with current continuation) is a universal control operator
 (well-known from the programming language Scheme) that captures the current

doc/execution_context_v1.qbk

@@ -10,12 +10,11 @@
 
 [warning __econtext__ is deprecated.]
 
-[note Include `execution_context.hpp` and provide flag
-['BOOST_EXECUTION_CONTEXT=1] in order to use __econtext__.]
+[note Include `execution_context.hpp` and pass define BOOST_EXECUTION_CONTEXT=1
+at compilers command-line in order to use __econtext__ (v1).]
 
-[note This class is only enabled if property ['segmented-stacks=on] (enables
-segmented stacks) is specified at b2-commandline or compiler flag
-['BOOST_EXECUTION_CONTEXT=1] was defined.]
+[note Segmented stacks (['segmented-stacks=on]), e.g. on demand growing stacks,
+can only be used with __econtext__ (v1).]
 
 Class __econtext__ encapsulates context switching and manages the associated
 context' stack (allocation/deallocation).

doc/execution_context_v2.qbk

@@ -10,8 +10,11 @@
 
 [warning __econtext__ is deprecated.]
 
-[note Include `execution_context.hpp` and provide flag
-['BOOST_EXECUTION_CONTEXT=2] in order to use __econtext__.]
+[note Include `execution_context.hpp` and pass define BOOST_EXECUTION_CONTEXT=2
+at compilers command-line in order to use __econtext__ (v2).]
+
+[note Segmented stacks (['segmented-stacks=on]), e.g. on demand growing stacks,
+are not supported by __econtext__ (v2).]
 
 Class __econtext__ encapsulates context switching and manages the associated
 context' stack (allocation/deallocation).

doc/stack.qbk

@@ -214,6 +214,8 @@ __segmented_stack__ __boost_context__ must be built with
 property `segmented-stacks`, e.g. [*toolset=gcc segmented-stacks=on] at b2/bjam
 command line.]
 
+[note Segmented stacks can only be used with __econtext__ (v1)].
+
         #include <boost/context/segmented_stack.hpp>
 
         template< typename traitsT >