From 41a677bdafed3efd83dc3d856c1cfed5ff1b8b57 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Mon, 23 Feb 2009 18:39:32 +0000
Subject: [PATCH] Merge PDF build changes from Trunk.

[SVN r51417]
---
 doc/Jamfile.v2               | 5 +++++
 doc/implementation_notes.qbk | 2 --
 doc/reference.qbk            | 6 +++---
 doc/special_cases.qbk        | 6 +-----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index abdaf20..eeb464c 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -12,6 +12,8 @@
 
 import quickbook ;
 
+path-constant images : html ;
+
 xml optional
     :
         optional.qbk
@@ -26,5 +28,8 @@ boostbook standalone
         <xsl:param>toc.max.depth=2
         <xsl:param>toc.section.depth=2
         <xsl:param>chunk.section.depth=1
+        <format>pdf:<xsl:param>img.src.path=$(images)/
+        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/optional/doc/html
     ;
 
+
diff --git a/doc/implementation_notes.qbk b/doc/implementation_notes.qbk
index 519b3ee..53e6138 100644
--- a/doc/implementation_notes.qbk
+++ b/doc/implementation_notes.qbk
@@ -10,8 +10,6 @@
 
 
 
-[#optional_implementation_notes]
-
 [section Implementation Notes]
 
 `optional<T>` is currently implemented using a custom aligned storage facility
diff --git a/doc/reference.qbk b/doc/reference.qbk
index c50b61a..ea41210 100644
--- a/doc/reference.qbk
+++ b/doc/reference.qbk
@@ -331,7 +331,7 @@ factory.
 * [*Postconditions: ] `*this` is [_initialized] and its value is ['directly given]
 from the factory `f` (i.e., the value [_is not copied]).
 * [*Throws:] Whatever the `T` constructor called by the factory throws.
-* [*Notes:] See [link optional_in_place_factories In-Place Factories]
+* [*Notes:] See [link boost_optional.in_place_factories In-Place Factories]
 * [*Exception Safety:] Exceptions can only be thrown during the call to
 the `T` constructor used by the factory; in that case, this constructor has
 no effect.
@@ -385,7 +385,7 @@ __SPACE__
 * [*Postconditions: ] `*this` is initialized and it references the same
 object referenced by `rhs`.
 * [*Notes:] If `*this` was initialized, is is ['rebound] to the new object.
-See [link optional_refassign here] for details on this behavior.
+See [link boost_optional.rebinding_semantics_for_assignment_of_optional_references here] for details on this behavior.
 * [*Example:]
 ``
 int a = 1 ;
@@ -444,7 +444,7 @@ __SPACE__
 references the same object referenced by `*rhs`; otherwise, `*this` is
 uninitialized (and references no object).
 * [*Notes:] If `*this` was initialized and so is *rhs, this is is ['rebound] to
-the new object. See [link optional_refassign here] for details on this behavior.
+the new object. See [link boost_optional.rebinding_semantics_for_assignment_of_optional_references here] for details on this behavior.
 * [*Example:]
 ``
 int a = 1 ;
diff --git a/doc/special_cases.qbk b/doc/special_cases.qbk
index a054474..07f1039 100644
--- a/doc/special_cases.qbk
+++ b/doc/special_cases.qbk
@@ -23,8 +23,6 @@ rather than the reference itself.
 
 [endsect]
 
-[#optional_refassign]
-
 [section Rebinding semantics for assignment of optional references]
 
 If you assign to an ['uninitialized ] `optional<T&>` the effect is to bind (for
@@ -112,8 +110,6 @@ In such scenario, you can assign the value itself directly, as in:
 
 [endsect]
 
-[#optional_in_place_factories]
-
 [section In-Place Factories]
 
 One of the typical problems with wrappers and containers is that their
@@ -288,7 +284,7 @@ instead, it won't compile).
 
 [section Exception Safety Guarantees]
 
-Because of the current implementation (see [link optional_implementation_notes Implementation Notes]), all of the assignment methods:
+Because of the current implementation (see [link boost_optional.implementation_notes Implementation Notes]), all of the assignment methods:
 
 * `optional<T>::operator= ( optional<T> const& )`
 * `optional<T>::operator= ( T const& )`