summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDaniel James <daniel@calamity.org.uk>2013-10-08 21:01:18 +0000
committerDaniel James <daniel@calamity.org.uk>2013-10-08 21:01:18 +0000
commitf3230c5e32f03652494064ca4ef3a586dbb6c6dd (patch)
tree261e38094720f0221c3ca5947203ce961bc54061 /doc
parenta25f95546614c9711f0863ebee8a631a04559e25 (diff)
downloadboost-f3230c5e32f03652494064ca4ef3a586dbb6c6dd.tar.gz
Merge circular buffer documentation fixes.
[SVN r86209]
Diffstat (limited to 'doc')
-rw-r--r--doc/Jamfile.v23
-rw-r--r--doc/html/circular_buffer.html17
-rw-r--r--doc/src/boost.xml14
3 files changed, 23 insertions, 11 deletions
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index d9df1e26f4..67ba959654 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -40,6 +40,7 @@ boostbook doc
<dependency>../libs/accumulators/doc//statsdoc.xml
<dependency>../libs/accumulators/doc//opdoc.xml
<dependency>../libs/accumulators/doc//accumulators
+ <dependency>../libs/circular_buffer/doc//standalone/<format>docbook
<dependency>../libs/conversion/doc//lexical_cast
<dependency>../libs/chrono/doc//chrono
<dependency>../libs/program_options/doc//autodoc.xml
@@ -102,6 +103,7 @@ boostbook doc
<implicit-dependency>../tools/build/v2/doc//jam_docs
<implicit-dependency>../tools/quickbook/doc//quickbook
<implicit-dependency>../libs/mpi/doc//mpi
+ <implicit-dependency>../libs/circular_buffer/doc//standalone/<format>docbook
<implicit-dependency>../libs/container/doc//standalone/<format>docbook
<implicit-dependency>../libs/interprocess/doc//standalone/<format>docbook
<implicit-dependency>../libs/intrusive/doc//standalone/<format>docbook
@@ -130,3 +132,4 @@ explicit callouts ;
+
diff --git a/doc/html/circular_buffer.html b/doc/html/circular_buffer.html
new file mode 100644
index 0000000000..0c8c3b319b
--- /dev/null
+++ b/doc/html/circular_buffer.html
@@ -0,0 +1,17 @@
+<!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://boost-sandbox.sourceforge.net/doc/html/circular_buffer.html">
+ </head>
+ <body>
+ Automatic redirection failed, please go to
+ <a href="http://boost-sandbox.sourceforge.net/doc/html/container.html">http://boost-sandbox.sourceforge.net/doc/html/circular_buffer.html</a>
+ </body>
+</html>
+
diff --git a/doc/src/boost.xml b/doc/src/boost.xml
index e59462f271..9ef83e0919 100644
--- a/doc/src/boost.xml
+++ b/doc/src/boost.xml
@@ -98,17 +98,7 @@
<xi:include href="chrono.xml"/>
- <library name="Circular Buffer" dirname="circular_buffer" html-only="1"
- url="../../libs/circular_buffer/index.html">
- <libraryinfo>
- <author>
- <firstname>Jan</firstname>
- <surname>Gaspar</surname>
- </author>
- <librarypurpose>A STL compliant container also known as ring or cyclic buffer</librarypurpose>
- <librarycategory name="category:containers"/>
- </libraryinfo>
- </library>
+ <xi:include href="circular_buffer.auto_index.docbook"/>
<library name="Compatibility" dirname="compatibility" html-only="1">
<libraryinfo>
@@ -774,3 +764,5 @@
+
+