diff options
author | Frank Mori Hess <fmh6jj@gmail.com> | 2009-03-11 17:51:08 +0000 |
---|---|---|
committer | Frank Mori Hess <fmh6jj@gmail.com> | 2009-03-11 17:51:08 +0000 |
commit | 468f673c244bfddf33bce6a4831e8094f792a3d5 (patch) | |
tree | 1996407a4767b286da0dc27b88a0463a74a6cf94 /doc | |
parent | 032d584e08c4c020e8f10f7d1b1333d30c33010b (diff) | |
download | boost-468f673c244bfddf33bce6a4831e8094f792a3d5.tar.gz |
Merging Signals2 to release branch.
[SVN r51710]
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Jamfile.v2 | 4 | ||||
-rw-r--r-- | doc/html/signals2.html | 16 | ||||
-rw-r--r-- | doc/src/boost.xml | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 4a2e1c00a1..4f2982a69e 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -28,7 +28,7 @@ boostbook doc <dependency>../libs/foreach/doc//foreach <dependency>../libs/mpi/doc//mpi <dependency>../libs/mpi/doc//mpi_autodoc.xml - #<dependency>../libs/proto/doc//protodoc.xml + #<dependency>../libs/proto/doc//protodoc.xml <dependency>../libs/proto/doc//proto <dependency>../libs/typeof/doc//typeof <dependency>../libs/xpressive/doc//autodoc.xml @@ -46,6 +46,7 @@ boostbook doc <dependency>../libs/units/doc//units <dependency>../libs/unordered/doc//unordered <dependency>../libs/thread/doc//thread + <dependency>../libs/signals2/doc//hello_world_def_code_snippet.xml ## Add path references to the QuickBook generated docs... @@ -66,6 +67,7 @@ boostbook doc <implicit-dependency>../libs/units/doc//units <implicit-dependency>../libs/unordered/doc//unordered <implicit-dependency>../libs/thread/doc//thread + <implicit-dependency>../libs/signals2/doc//hello_world_def_code_snippet.xml <xsl:param>boost.libraries=../../libs/libraries.htm diff --git a/doc/html/signals2.html b/doc/html/signals2.html new file mode 100644 index 0000000000..0eb570868e --- /dev/null +++ b/doc/html/signals2.html @@ -0,0 +1,16 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> + <head> + <!-- Copyright (C) 2002 Douglas Gregor <doug.gregor -at- gmail.com> + + Distributed under 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) --> + <title>Redirect to generated documentation</title> + <meta http-equiv="refresh" content="0; URL=http://www.boost.org/regression-logs/cs-win32_metacomm/doc/html/signals2.html"> + </head> + <body> + Automatic redirection failed, please go to + <a href="http://www.boost.org/regression-logs/cs-win32_metacomm/doc/html/signals2.html">http://www.boost.org/regression-logs/cs-win32_metacomm/doc/html/signals2.html</a> + </body> +</html> diff --git a/doc/src/boost.xml b/doc/src/boost.xml index 98c7528679..ed34c7f64b 100644 --- a/doc/src/boost.xml +++ b/doc/src/boost.xml @@ -598,6 +598,8 @@ </library> <xi:include href="../../libs/signals/doc/signals.xml"/> + + <xi:include href="../../libs/signals2/doc/signals.xml"/> <library name="Smart Pointer" dirname="smart_ptr" html-only="1" url="../../libs/smart_ptr/index.html"> |