[Boost-commit] svn:boost r49600 - in branches/release: . libs/proto/doc libs/proto/doc/reference libs/proto/doc/reference/transform

Subject: [Boost-commit] svn:boost r49600 - in branches/release: . libs/proto/doc libs/proto/doc/reference libs/proto/doc/reference/transform
From: eric_at_[hidden]
Date: 2008-11-05 14:35:54

Author: eric_niebler
Date: 2008-11-05 14:35:54 EST (Wed, 05 Nov 2008)
New Revision: 49600
URL: http://svn.boost.org/trac/boost/changeset/49600

Log:
Merged revisions 49599 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r49599 | eric_niebler | 2008-11-05 10:50:01 -0800 (Wed, 05 Nov 2008) | 1 line
  
  fix bad links
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/libs/proto/doc/Jamfile.v2                   |     5 ++++-                                   
   branches/release/libs/proto/doc/back_end.qbk                 |    14 +++++++-------                          
   branches/release/libs/proto/doc/reference/eval.xml           |     2 +-                                      
   branches/release/libs/proto/doc/reference/extends.xml        |     2 +-                                      
   branches/release/libs/proto/doc/reference/transform/make.xml |     6 +++---                                  
   5 files changed, 16 insertions(+), 13 deletions(-)

Modified: branches/release/libs/proto/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/proto/doc/Jamfile.v2	(original)
+++ branches/release/libs/proto/doc/Jamfile.v2	2008-11-05 14:35:54 EST (Wed, 05 Nov 2008)
@@ -50,5 +50,8 @@
         # Set this one for PDF generation *only*:
         # default png graphics are awful in PDF form,
         # better use SVG's instead:
-        # <format>pdf:<xsl:param>admon.graphics.extension=".svg"
+        #<format>pdf:<xsl:param>admon.graphics.extension=".svg"
+        #<format>pdf:<xsl:param>img.src.path="C:/Program Files/docbook-xsl-1.73.2/images/"
+        #<format>pdf:<xsl:param>admon.graphics.path="C:/Program Files/docbook-xsl-1.73.2/images/"
+        #<format>pdf:<xsl:param>callout.graphics.path="C:/Program Files/docbook-xsl-1.73.2/images/callouts/"
     ;

Modified: branches/release/libs/proto/doc/back_end.qbk
==============================================================================
--- branches/release/libs/proto/doc/back_end.qbk	(original)
+++ branches/release/libs/proto/doc/back_end.qbk	2008-11-05 14:35:54 EST (Wed, 05 Nov 2008)
@@ -171,7 +171,7 @@
 nested `eval<>` class template. Each specialization handles a different
 expression type.
 
-In the [link boost_proto.users_guide.hello_calculator Hello Calculator]
+In the [link boost_proto.users_guide.getting_started.hello_calculator Hello Calculator]
 section, we saw an example of a user-defined context class for evaluating
 calculator expressions. That context class was implemented with the help
 of Proto's _callable_context_. If we were to implement it from scratch, it
@@ -246,7 +246,7 @@
 
 Defining a context from scratch this way is tedious and verbose, but it gives
 you complete control over how the expression is evaluated. The context class in
-the [link boost_proto.users_guide.hello_calculator Hello Calculator] example
+the [link boost_proto.users_guide.getting_started.hello_calculator Hello Calculator] example
 was much simpler. In the next section we'll see the helper class Proto provides
 to ease the job of implementing context classes.
 
@@ -260,15 +260,15 @@
 you can use to help while implementing your own contexts. They are:
 
 [variablelist
-  [ [[link boost_proto.users_guide.expression_evaluation.canned_contexts.default_context [^default_context]]]
+  [ [[link boost_proto.users_guide.back_end.expression_evaluation.canned_contexts.default_context [^default_context]]]
     [An evaluation context that assigns the usual C++ meanings to all the
      operators. For example, addition nodes are handled by evaluating the
      left and right children and then adding the results. The _default_context_
      uses Boost.Typeof to deduce the types of the expressions it evaluates.] ]
-  [ [[link boost_proto.users_guide.expression_evaluation.canned_contexts.null_context [^null_context]]]
+  [ [[link boost_proto.users_guide.back_end.expression_evaluation.canned_contexts.null_context [^null_context]]]
     [A simple context that recursively evaluates children but does not combine
      the results in any way and returns void.] ]
-  [ [[link boost_proto.users_guide.expression_evaluation.canned_contexts.callable_context [^callable_context<>]]]
+  [ [[link boost_proto.users_guide.back_end.expression_evaluation.canned_contexts.callable_context [^callable_context<>]]]
     [A helper that simplifies the job of writing context classes. Rather than
      writing template specializations, with _callable_context_ you write a
      function object with an overloaded function call operator. Any expressions
@@ -452,7 +452,7 @@
 properly thought of as a context adaptor. To use it, you must define your own
 context that inherits from _callable_context_.
 
-In the [link boost_proto.users_guide.expression_evaluation.canned_contexts.null_context [^null_context]]
+In the [link boost_proto.users_guide.back_end.expression_evaluation.canned_contexts.null_context [^null_context]]
 section, we saw how to implement an evaluation context that increments all the
 integers within an expression tree. Here is how to do the same thing with the
 _callable_context_:
@@ -1472,7 +1472,7 @@
 
 You'll notice that `_child_c::impl::operator()` takes arguments of types `expr_param`, `state_param`, and `data_param`. The typedefs make it easy to accept arguments by reference or const reference accordingly.
 
-The only other interesting bit is the `is_callable<>` specialization, which will be described in the [link boost_proto.users_guide.expression_transformation.is_callable next section].
+The only other interesting bit is the `is_callable<>` specialization, which will be described in the [link boost_proto.users_guide.back_end.expression_transformation.is_callable next section].
 
 [endsect]
 

Modified: branches/release/libs/proto/doc/reference/eval.xml
==============================================================================
--- branches/release/libs/proto/doc/reference/eval.xml	(original)
+++ branches/release/libs/proto/doc/reference/eval.xml	2008-11-05 14:35:54 EST (Wed, 05 Nov 2008)
@@ -14,7 +14,7 @@
           <purpose>A <conceptname>PolymorphicFunctionObject</conceptname> type for evaluating a given Proto
             expression with a given context.</purpose>
           <inherit>
-            <type>proto::callable</type>
+            <type><classname>proto::callable</classname></type>
           </inherit>
           <struct-specialization name="result">
             <template>

Modified: branches/release/libs/proto/doc/reference/extends.xml
==============================================================================
--- branches/release/libs/proto/doc/reference/extends.xml	(original)
+++ branches/release/libs/proto/doc/reference/extends.xml	2008-11-05 14:35:54 EST (Wed, 05 Nov 2008)
@@ -289,7 +289,7 @@
     </macro-parameter>
     <macro-parameter name="Derived"/>
     <macro-parameter name="Domain"/>
-    <purpose>For creating expression wrappers that to a Proto expression template, like
+    <purpose>For creating expression wrappers that add members to a Proto expression template, like
       <computeroutput><classname alt="boost::proto::extends">proto::extends&lt;&gt;</classname></computeroutput>,
       but while retaining POD-ness of the expression wrapper.</purpose>
     <description>

Modified: branches/release/libs/proto/doc/reference/transform/make.xml
==============================================================================
--- branches/release/libs/proto/doc/reference/transform/make.xml	(original)
+++ branches/release/libs/proto/doc/reference/transform/make.xml	2008-11-05 14:35:54 EST (Wed, 05 Nov 2008)
@@ -146,7 +146,7 @@
                             X<subscript>i</subscript>'
                           </computeroutput> be
                           <computeroutput>
-                            <classname>proto::make</classname>&lt;X<subscript>i</subscript>&gt;::impl&lt;Expr, State, Data&gt;::result_type
+                            boost::result_of&lt;<classname>proto::make</classname>&lt;X<subscript>i</subscript>&gt;(Expr, State, Data)&gt;::type
                           </computeroutput>
                           (which evaluates this procedure recursively). Note whether any substitutions took place during
                           this operation.
@@ -179,7 +179,7 @@
                       Otherwise, if <computeroutput>O</computeroutput> is a <conceptname>Transform</conceptname>, then let
                       the result type be
                       <computeroutput>
-                        <classname>proto::when</classname>&lt;<classname>_</classname>, O&gt;::impl&lt;Expr, State, Data&gt;::result_type
+                        boost::result_of&lt;<classname>proto::when</classname>&lt;<classname>_</classname>, O&gt;(Expr, State, Data)&gt;::type
                       </computeroutput>.
                       Note that a substitution took place.
                     </para>
@@ -221,7 +221,7 @@
                   <itemizedlist>
                     <listitem>
                       <para>
-                        If <computeroutput>T</computeroutput> if of the form
+                        If <computeroutput>T</computeroutput> is of the form
                         <computeroutput>O(A<subscript>0</subscript>,...A<subscript>n</subscript>)</computeroutput>, then:
                       </para>
                       <itemizedlist>