summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDaniel James <daniel@calamity.org.uk>2014-06-16 12:26:22 +0100
committerDaniel James <daniel@calamity.org.uk>2014-06-16 12:31:51 +0100
commit95eb960fe90e6eb009954a3d6ecc12485509a339 (patch)
tree4b70dea8f62e4b017c3653bd59bc8e5c8231d2b8 /doc
parent7546a32279e125fac7e8df9c5690175b637f4201 (diff)
downloadboost-95eb960fe90e6eb009954a3d6ecc12485509a339.tar.gz
Remove core from combined documentation.
They want it to be standalone. This reverts: - commit 88303ffaa15c293c14e207b7e62918210f471b03. - commit 84779968902e151f6c1e17cd91e063e35f701d24. - commit 52ea2044ced3b2be744e5036be953f7b133ca873. Conflicts: doc/Jamfile.v2 doc/src/boost.xml
Diffstat (limited to 'doc')
-rw-r--r--doc/Jamfile.v23
-rw-r--r--doc/html/core.html16
-rw-r--r--doc/html/core/addressof.html16
-rw-r--r--doc/html/core/checked_delete.html16
-rw-r--r--doc/html/core/enable_if.html16
-rw-r--r--doc/html/core/noncopyable.html16
-rw-r--r--doc/src/boost.xml2
7 files changed, 0 insertions, 85 deletions
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 2ae369b0f8..2029e9feff 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -42,8 +42,6 @@ boostbook doc
<dependency>../libs/accumulators/doc//accumulators
<dependency>../libs/circular_buffer/doc//standalone/<format>docbook
<dependency>../libs/lexical_cast/doc//lexical_cast
- <dependency>../libs/core/doc//core
- <dependency>../libs/core/doc//ref_reference
<dependency>../libs/crc/doc//crc
<dependency>../libs/chrono/doc//chrono
<dependency>../libs/program_options/doc//autodoc.xml
@@ -96,7 +94,6 @@ boostbook doc
<implicit-dependency>../libs/accumulators/doc//accumulators
<implicit-dependency>../libs/chrono/doc//chrono
<implicit-dependency>../libs/lexical_cast/doc//lexical_cast
- <implicit-dependency>../libs/core/doc//core
<implicit-dependency>../libs/crc/doc//crc
<implicit-dependency>../libs/functional/hash/doc//hash
#<implicit-dependency>../libs/type_traits/doc//type_traits
diff --git a/doc/html/core.html b/doc/html/core.html
deleted file mode 100644
index 6ba70d78e0..0000000000
--- a/doc/html/core.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!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/doc/libs/master/doc/html/core.html">
- </head>
- <body>
- Automatic redirection failed, please go to
- <a href="http://www.boost.org/doc/libs/master/doc/html/core.html">http://www.boost.org/doc/libs/master/doc/html/unordered.html</a>
- </body>
-</html>
diff --git a/doc/html/core/addressof.html b/doc/html/core/addressof.html
deleted file mode 100644
index b9a17764b4..0000000000
--- a/doc/html/core/addressof.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!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/doc/libs/master/doc/html/core/addressof.html">
- </head>
- <body>
- Automatic redirection failed, please go to
- <a href="http://www.boost.org/doc/libs/master/doc/html/core/addressof.html">http://www.boost.org/doc/libs/master/doc/html/core/addressof.html</a>
- </body>
-</html>
diff --git a/doc/html/core/checked_delete.html b/doc/html/core/checked_delete.html
deleted file mode 100644
index ad6e44d018..0000000000
--- a/doc/html/core/checked_delete.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!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/doc/libs/master/doc/html/core/checked_delete.html">
- </head>
- <body>
- Automatic redirection failed, please go to
- <a href="http://www.boost.org/doc/libs/master/doc/html/core/checked_delete.html">http://www.boost.org/doc/libs/master/doc/html/core/checked_delete.html</a>
- </body>
-</html>
diff --git a/doc/html/core/enable_if.html b/doc/html/core/enable_if.html
deleted file mode 100644
index 7921136ca5..0000000000
--- a/doc/html/core/enable_if.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!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/doc/libs/master/doc/html/core/enable_if.html">
- </head>
- <body>
- Automatic redirection failed, please go to
- <a href="http://www.boost.org/doc/libs/master/doc/html/core/enable_if.html">http://www.boost.org/doc/libs/master/doc/html/core/enable_if.html</a>
- </body>
-</html>
diff --git a/doc/html/core/noncopyable.html b/doc/html/core/noncopyable.html
deleted file mode 100644
index 53a328bd48..0000000000
--- a/doc/html/core/noncopyable.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!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/doc/libs/master/doc/html/core/noncopyable.html">
- </head>
- <body>
- Automatic redirection failed, please go to
- <a href="http://www.boost.org/doc/libs/master/doc/html/core/noncopyable.html">http://www.boost.org/doc/libs/master/doc/html/core/noncopyable.html</a>
- </body>
-</html>
diff --git a/doc/src/boost.xml b/doc/src/boost.xml
index 02958fe8b4..caddace95f 100644
--- a/doc/src/boost.xml
+++ b/doc/src/boost.xml
@@ -200,8 +200,6 @@
</libraryinfo>
</library>
- <xi:include href="core.xml"/>
-
<xi:include href="crc.xml"/>
<xi:include href="../../libs/date_time/xmldoc/date_time.xml"/>