From 95eb960fe90e6eb009954a3d6ecc12485509a339 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 16 Jun 2014 12:26:22 +0100 Subject: [PATCH] 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 --- doc/Jamfile.v2 | 3 --- doc/html/core.html | 16 ---------------- doc/html/core/addressof.html | 16 ---------------- doc/html/core/checked_delete.html | 16 ---------------- doc/html/core/enable_if.html | 16 ---------------- doc/html/core/noncopyable.html | 16 ---------------- doc/src/boost.xml | 2 -- 7 files changed, 85 deletions(-) delete mode 100644 doc/html/core.html delete mode 100644 doc/html/core/addressof.html delete mode 100644 doc/html/core/checked_delete.html delete mode 100644 doc/html/core/enable_if.html delete mode 100644 doc/html/core/noncopyable.html 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 ../libs/accumulators/doc//accumulators ../libs/circular_buffer/doc//standalone/docbook ../libs/lexical_cast/doc//lexical_cast - ../libs/core/doc//core - ../libs/core/doc//ref_reference ../libs/crc/doc//crc ../libs/chrono/doc//chrono ../libs/program_options/doc//autodoc.xml @@ -96,7 +94,6 @@ boostbook doc ../libs/accumulators/doc//accumulators ../libs/chrono/doc//chrono ../libs/lexical_cast/doc//lexical_cast - ../libs/core/doc//core ../libs/crc/doc//crc ../libs/functional/hash/doc//hash #../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 @@ - - - - - Redirect to generated documentation - - - - Automatic redirection failed, please go to - http://www.boost.org/doc/libs/master/doc/html/unordered.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 @@ - - - - - Redirect to generated documentation - - - - Automatic redirection failed, please go to - http://www.boost.org/doc/libs/master/doc/html/core/addressof.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 @@ - - - - - Redirect to generated documentation - - - - Automatic redirection failed, please go to - http://www.boost.org/doc/libs/master/doc/html/core/checked_delete.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 @@ - - - - - Redirect to generated documentation - - - - Automatic redirection failed, please go to - http://www.boost.org/doc/libs/master/doc/html/core/enable_if.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 @@ - - - - - Redirect to generated documentation - - - - Automatic redirection failed, please go to - http://www.boost.org/doc/libs/master/doc/html/core/noncopyable.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 @@ - -