Merge.

[SVN r43270]
Roll back links to the beta site.
2008-02-16 09:50:01 +00:00 · 2008-02-07 20:47:08 +00:00 · 2007-12-04 23:43:00 +00:00 · 2007-12-04 23:42:18 +00:00 · 2007-12-02 10:07:42 +00:00 · 2007-11-25 20:26:14 +00:00
2 changed files with 4 additions and 1 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@ -26,5 +26,8 @@ boostbook standalone
        <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
    ;

--- a/doc/optional.qbk
+++ b/doc/optional.qbk
@ -22,7 +22,7 @@ Distributed under the Boost Software License, Version 1.0.
 [/ 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]]
Author	SHA1	Message	Date
Daniel James	78f4e53489	Merge. [SVN r43270]	2008-02-16 09:50:01 +00:00
Daniel James	2793220db1	Roll back links to the beta site. [SVN r43163]	2008-02-07 20:47:08 +00:00
Daniel James	8485d7aa5d	Add some parameters to the optional documentation jamfile, so that the links work better. [SVN r41714]	2007-12-04 23:43:00 +00:00
Daniel James	3058457fcd	Update a couple of links in the optional library. [SVN r41713]	2007-12-04 23:42:18 +00:00
Daniel James	9ce49fdd59	Create a branch to fix links on. [SVN r41573]	2007-12-02 10:07:42 +00:00
Fernando Cacciola	95c864e119	Cast to base added to avoid a call to the convertir constructor/assignment (see Tickes 1419 and 1420) [SVN r41381]	2007-11-25 20:26:14 +00:00
Beman Dawes	9afdbe65e7	// Add or correct comment identifying Boost library this header is associated with. [SVN r41173]	2007-11-17 20:13:16 +00:00
Beman Dawes	f6518df0c4	Get rid of .cvsignore files [SVN r41107]	2007-11-15 15:20:27 +00:00
Fernando Cacciola	05a685b035	Fixed intention in the added binding test [SVN r40860]	2007-11-06 22:21:43 +00:00
Fernando Cacciola	3b5b5d82a0	Added test to ensure proper binding of optional references (in reference to Ticket 1301) [SVN r40707]	2007-11-02 23:41:37 +00:00
Fernando Cacciola	06ba35cd42	Fixed error reported by Edward Diener [SVN r40706]	2007-11-02 23:06:42 +00:00
Fernando Cacciola	3499d477dc	Merged changests from RC_1_34_0 - base rev 33417 [SVN r40705]	2007-11-02 22:56:23 +00:00
Fernando Cacciola	a690c8e7a2	Merged changests from RC_1_34_0 - base rev 33417 [SVN r40704]	2007-11-02 22:55:49 +00:00