Property changes on: .
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/RC_1_34_0/boost:1-33417 /branches/doc:1-44584 /branches/iostreams_dev:1-42144 /branches/unordered/trunk:1-44057,44076-44415,44420,44458-44466,44470,44512-44515,44517-44536 /devel:1-38328
   + /branches/RC_1_34_0/boost:1-33417 /branches/doc:1-44647 /branches/iostreams_dev:1-42144 /branches/unordered/trunk:1-44057,44076-44415,44420,44458-44466,44470,44512-44515,44517-44536 /devel:1-38328

Index: libs/python/doc/tutorial/doc/tutorial.qbk
===================================================================
--- libs/python/doc/tutorial/doc/tutorial.qbk	(revision 44712)
+++ libs/python/doc/tutorial/doc/tutorial.qbk	(working copy)
@@ -1381,9 +1381,9 @@
 [section Using the interpreter]
 
 As you probably already know, objects in Python are reference-counted.
-Naturally, the [^PyObject]s of the Python/C API are also reference-counted.
+Naturally, the [^PyObject]s of the Python\/C API are also reference-counted.
 There is a difference however. While the reference-counting is fully
-automatic in Python, the Python/C API requires you to do it
+automatic in Python, the Python\/C API requires you to do it
 [@http://www.python.org/doc/current/api/refcounts.html by hand]. This is
 messy and especially hard to get right in the presence of C++ exceptions.
 Fortunately Boost.Python provides the [@../../../v2/handle.html handle] and
Index: libs/python/doc/tutorial/index.html
===================================================================
--- libs/python/doc/tutorial/index.html	(revision 44712)
+++ libs/python/doc/tutorial/index.html	(working copy)
@@ -11,8 +11,8 @@
     <a href="doc/html/index.html">link</a> &nbsp;<hr>
     <p>© Copyright Beman Dawes, 2001</p>
     <p>Distributed under the Boost Software License, Version 1.0. (See 
-    accompanying file <a href="../../../LICENSE_1_0.txt">
+    accompanying file <a href="../../../../LICENSE_1_0.txt">
     LICENSE_1_0.txt</a> or copy at
     <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
   </body>
-</html>
\ No newline at end of file
+</html>
Index: libs/python/doc/building.rst
===================================================================
--- libs/python/doc/building.rst	(revision 44712)
+++ libs/python/doc/building.rst	(working copy)
@@ -11,7 +11,7 @@
    :alt: Boost C++ Libraries:
    :class: boost-logo
 
-__ ../index.htm
+__ ../index.html
 
 
 .. section-numbering::
Index: libs/mpi/doc/mpi.qbk
===================================================================
--- libs/mpi/doc/mpi.qbk	(revision 44712)
+++ libs/mpi/doc/mpi.qbk	(working copy)
@@ -2004,7 +2004,7 @@
 [@http://www.open-mpi.org/ Open MPI] version 1.1. The NetPIPE results
 follow:
 
-[$../../../libs/mpi/doc/netpipe.png]
+[$../../libs/mpi/doc/netpipe.png]
 
 There are a some observations we can make about these NetPIPE
 results. First of all, the top two plots show that Boost.MPI performs
Index: libs/intrusive/doc/intrusive.qbk
===================================================================
--- libs/intrusive/doc/intrusive.qbk	(revision 44712)
+++ libs/intrusive/doc/intrusive.qbk	(working copy)
@@ -3011,7 +3011,7 @@
 `test_list` objects to funtion objects taking pointers to them.
 
 You can find the full test code code in the 
-[@../../perf/perf_list.cpp perf_list.cpp] source file.
+[@../../libs/intrusive/perf/perf_list.cpp perf_list.cpp] source file.
 
 [section:performance_results_push_back Back insertion and destruction]
 
Index: libs/date_time/xmldoc/buildinfo.xml
===================================================================
--- libs/date_time/xmldoc/buildinfo.xml	(revision 44712)
+++ libs/date_time/xmldoc/buildinfo.xml	(working copy)
@@ -146,7 +146,7 @@
       <listitem><ulink url="../../libs/conversion/lexical_cast.htm">boost.lexical_cast </ulink> </listitem>
       <listitem><ulink url="../../libs/smart_ptr/smart_ptr.htm">boost.smart_ptr (local time only)</ulink> </listitem>
       <listitem><ulink url="../../libs/algorithm/string/">boost::string_algorithms </ulink> </listitem>
-      <listitem><ulink url="../../libs/algorithm/serialize/">boost::serialize (serialization code only) </ulink> </listitem>
+      <listitem><ulink url="../../libs/serialization/index.html">boost::serialize (serialization code only) </ulink> </listitem>
     </itemizedlist>
     so these libraries need to be installed. 
   </para>
Index: libs/numeric/conversion/doc/conversion.qbk
===================================================================
--- libs/numeric/conversion/doc/conversion.qbk	(revision 44712)
+++ libs/numeric/conversion/doc/conversion.qbk	(working copy)
@@ -21,7 +21,7 @@
 
 [/ Cited Boost resources ]
 
-[def __MPL_INTEGRAL_CONSTANT__ [@../../../../mpl/refmanual/integral-constant.html MPL's Integral Constant] ]
+[def __MPL_INTEGRAL_CONSTANT__ [@../../../../mpl/doc/refmanual/integral-constant.html MPL's Integral Constant] ]
 
 
 
Index: libs/utility/shared_container_iterator.html
===================================================================
--- libs/utility/shared_container_iterator.html	(revision 44712)
+++ libs/utility/shared_container_iterator.html	(working copy)
@@ -315,7 +315,7 @@
 <p>© Copyright 2003 The Trustees of Indiana University.
  Use, modification and distribution is subject to 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>
+ http://www.boost.org/LICENSE_1_0.txt)</p>
 
 </body>
 
Index: libs/interprocess/doc/interprocess.qbk
===================================================================
--- libs/interprocess/doc/interprocess.qbk	(revision 44712)
+++ libs/interprocess/doc/interprocess.qbk	(working copy)
@@ -5704,7 +5704,7 @@
 to the segment manager. Because of this,
 in [*Boost.Interprocess] all managed memory segments derive from a common class that
 implements memory-independent (shared memory, memory mapped files) functions:
-[@../../../../boost/interprocess/detail/managed_memory_impl.hpp 
+[@../../boost/interprocess/detail/managed_memory_impl.hpp 
 boost::interprocess::detail::basic_managed_memory_impl]
 
 Deriving from this class, [*Boost.Interprocess] implements several managed memory
@@ -5766,7 +5766,7 @@
    to the segment manager.
 
 The pool is implemented by the
-[@../../../../boost/interprocess/allocators/detail/node_pool.hpp
+[@../../boost/interprocess/allocators/detail/node_pool.hpp
 private_node_pool and shared_node_pool] classes.
 
 [endsect]
@@ -5809,7 +5809,7 @@
    to the segment manager.
 
 The adaptive pool is implemented by the
-[@../../../../boost/interprocess/allocators/detail/adaptive_node_pool.hpp
+[@../../boost/interprocess/allocators/detail/adaptive_node_pool.hpp
 private_adaptive_node_pool and adaptive_node_pool] classes.
 
 [endsect]
Index: libs/optional/doc/optional.qbk
===================================================================
--- libs/optional/doc/optional.qbk	(revision 44712)
+++ libs/optional/doc/optional.qbk	(working copy)
@@ -22,7 +22,7 @@
 [/ Cited Boost resources ]
 
 [def __BOOST_VARIANT__ [@../../../variant/index.html Boost.Variant]]
-[def __BOOST_TRIBOOL__ [@../../../tribool/index.html boost::tribool]]
+[def __BOOST_TRIBOOL__ [@../../../../doc/html/tribool.html boost::tribool]]
 
 [def __OPTIONAL_POINTEE__ [@../../../utility/OptionalPointee.html OptionalPointee]]
 [def __COPY_CONSTRUCTIBLE__ [@../../../utility/CopyConstructible.html Copy Constructible]]
Index: libs/optional/doc/Jamfile.v2
===================================================================
--- libs/optional/doc/Jamfile.v2	(revision 44712)
+++ libs/optional/doc/Jamfile.v2	(working copy)
@@ -26,5 +26,8 @@
         <xsl:param>toc.max.depth=2
         <xsl:param>toc.section.depth=2
         <xsl:param>chunk.section.depth=1
+        <xsl:param>boost.root=../../../..
+        <xsl:param>boost.libraries=../../../libraries.htm
+        <xsl:param>html.stylesheet=../../../../doc/html/boostbook.css
     ;
 
Index: libs/optional/index.html
===================================================================
--- libs/optional/index.html	(revision 44712)
+++ libs/optional/index.html	(working copy)
@@ -4,10 +4,10 @@
 </head>
 <body>
 Automatic redirection failed, please go to
-<a href="doc/optional.html">doc/html/index.html</a>.&nbsp;<hr>
+<a href="doc/html/index.html">doc/html/index.html</a>.&nbsp;<hr>
 <p>� Copyright Beman Dawes, 2001</p>
 <p>Distributed under the Boost Software License, Version 1.0. (See accompanying 
 file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy 
 at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
 </body>
-</html>
\ No newline at end of file
+</html>
Index: libs/bimap/doc/bimap_and_boost.qbk
===================================================================
--- libs/bimap/doc/bimap_and_boost.qbk	(revision 44712)
+++ libs/bimap/doc/bimap_and_boost.qbk	(working copy)
@@ -219,7 +219,7 @@
 This is a statistical property depending on the typical distribution of keys in a given application, so it is not feasible to have a general-purpose hash function with excellent results in every possible scenario; the default value for this parameter uses Boost.Hash, which often provides good enough results.
 
 Boost.Hash can be
-[@http://www.boost.org/regression-logs/cs-win32_metacomm/doc/html/hash/custom.html
+[@http://www.boost.org/doc/html/hash/custom.html
 extended for custom data types],
 enabling to use the default parameter of the unordered set types with any user types.
 
@@ -474,4 +474,4 @@
 
 [endsect]
 
-[endsect]
\ No newline at end of file
+[endsect]
Index: libs/format/doc/format.html
===================================================================
--- libs/format/doc/format.html	(revision 44712)
+++ libs/format/doc/format.html	(working copy)
@@ -79,7 +79,7 @@
 
       <blockquote>
         <pre>
-cout &lt;&lt; format("%2% %1%") % 36 % 77 )
+cout &lt;&lt; format("%2% %1%") % 36 % 77;
 </pre>
       </blockquote>or later on, as in
 
Index: libs/spirit/doc/notes/style_guide.qbk
===================================================================
--- libs/spirit/doc/notes/style_guide.qbk	(revision 44712)
+++ libs/spirit/doc/notes/style_guide.qbk	(working copy)
@@ -11,7 +11,7 @@
 keep an easy-to-read, consistent en aesthetically pleasing look to the Spirit
 code, the following coding styleguide is advised.
 
-This coding style is adapted and extended from the ANTLR/PCCTS style (Terrence
+This coding style is adapted and extended from the ANTLR\/PCCTS style (Terrence
 Parr) and [@http://groups.yahoo.com/group/boost/files/coding_guidelines.html
 Boost coding guidelines] (David Abrahams and Nathan Myers) and is the
 combined work of Joel de Guzman, Chris Uzdavinis and Hartmut Kaiser.
Index: libs/spirit/doc/what_s_new.qbk
===================================================================
--- libs/spirit/doc/what_s_new.qbk	(revision 44712)
+++ libs/spirit/doc/what_s_new.qbk	(working copy)
@@ -35,7 +35,7 @@
 corrected as described above. As an alternative you can define the preprocessor 
 constant `BOOST_SPIRIT_USE_OLD_NAMESPACE`, which will force the Spirit Classic 
 code to be in the namespace `boost::spirit` as before. This is not recommended, 
-though, as it maz result in naming clashs
+though, as it may result in naming clashes.
 
 The change of the namespace will be automatically deactivated whenever the 
 deprecated include files are being used. This ensures full backwards 
Index: tools/jam/doc/bjam.qbk
===================================================================
--- tools/jam/doc/bjam.qbk	(revision 44712)
+++ tools/jam/doc/bjam.qbk	(working copy)
@@ -124,7 +124,7 @@
 
 [   [=build.bat=] [Windows NT, 2000, and XP]
     [[lines
-        [line [@http://www.borland.com/bcppbuilder/freecompiler =borland=]]
+        [line [@http://www.codegear.com/downloads/free/cppbuilder =borland=]]
         [line [@http://www.borland.com/ Borland] C++Builder (BCC 5.5)]
         ]]
     [[list
@@ -291,7 +291,7 @@
 
 [   [] []
     [[lines
-        [line [@http://www.borland.com/bcppbuilder/freecompiler =kylix=]]
+        [line [@http://www.codegear.com/downloads/free/cppbuilder =kylix=]]
         [line [@http://www.borland.com/ Borland] C++Builder]
         ]]
     [[list
@@ -341,7 +341,7 @@
 
 [   [] []
     [[lines
-        [line [@http://www-3.ibm.com/software/ad/vacpp/ =vacpp=]]
+        [line [@http://www-306.ibm.com/software/awdtools/vacpp/ =vacpp=]]
         [line IBM VisualAge C++]
         ]]
     [[list
@@ -1801,4 +1801,4 @@
 
 [section History]
 [include history.qbk]
-[endsect]
\ No newline at end of file
+[endsect]