2010-02-23 Benjamin Kosnik <bkoz@redhat.com>

	* doc/xml/manual/concurrency.xml: Move...
	* doc/xml/manual/concurrency_extensions.xml: ...here.
	* doc/xml/manual/extensions.xml: Adjust.
	* doc/Makefile.am: Adjust.
	* doc/Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157027 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 92d90eb..9bdba70 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,13 @@
 2010-02-23  Benjamin Kosnik  <bkoz@redhat.com>
 
+       * doc/xml/manual/concurrency.xml: Move...
+       * doc/xml/manual/concurrency_extensions.xml: ...here.
+       * doc/xml/manual/extensions.xml: Adjust.
+       * doc/Makefile.am: Adjust.
+       * doc/Makefile.in: Regenerate.
+
+2010-02-23  Benjamin Kosnik  <bkoz@redhat.com>
+
        * include/bits/random.h: Doxygen group markup fixes.
 
 2010-02-23  Paolo Carlini  <paolo.carlini@oracle.com>

diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
index 22c30f1..1312c88 100644 (file)
--- a/libstdc++-v3/doc/Makefile.am
+++ b/libstdc++-v3/doc/Makefile.am
@@ -80,7 +80,7 @@ xml_sources = \
        ${xml_srcdir}/manual/bitmap_allocator.xml \
        ${xml_srcdir}/manual/build_hacking.xml \
        ${xml_srcdir}/manual/codecvt.xml \
-       ${xml_srcdir}/manual/concurrency.xml \
+       ${xml_srcdir}/manual/concurrency_extensions.xml \
        ${xml_srcdir}/manual/configure.xml \
        ${xml_srcdir}/manual/containers.xml \
        ${xml_srcdir}/manual/ctype.xml \

diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
index a592cc3..4bbb39e 100644 (file)
--- a/libstdc++-v3/doc/Makefile.in
+++ b/libstdc++-v3/doc/Makefile.in
@@ -291,7 +291,7 @@ xml_sources = \
        ${xml_srcdir}/manual/bitmap_allocator.xml \
        ${xml_srcdir}/manual/build_hacking.xml \
        ${xml_srcdir}/manual/codecvt.xml \
-       ${xml_srcdir}/manual/concurrency.xml \
+       ${xml_srcdir}/manual/concurrency_extensions.xml \
        ${xml_srcdir}/manual/configure.xml \
        ${xml_srcdir}/manual/containers.xml \
        ${xml_srcdir}/manual/ctype.xml \

diff --git a/libstdc++-v3/doc/xml/manual/concurrency.xml b/libstdc++-v3/doc/xml/manual/concurrency_extensions.xml
similarity index 100%
rename from libstdc++-v3/doc/xml/manual/concurrency.xml
rename to libstdc++-v3/doc/xml/manual/concurrency_extensions.xml

diff --git a/libstdc++-v3/doc/xml/manual/extensions.xml b/libstdc++-v3/doc/xml/manual/extensions.xml
index c715fb3..c3fc3bb 100644 (file)
--- a/libstdc++-v3/doc/xml/manual/extensions.xml
+++ b/libstdc++-v3/doc/xml/manual/extensions.xml
@@ -587,7 +587,7 @@ int main()
 
 <!-- Chapter 13 : Concurrency -->
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-           parse="xml" href="concurrency.xml">
+           parse="xml" href="concurrency_extensions.xml">
 </xi:include>
 
 </part>