diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bd9ef5937768e566c990bef9518876ea5b443f9f..7276018f4ef6f1b2a8dfe8be8d96149d9994d49d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,53 @@
2012-11-11 Andreas Schwab <schwab@linux-m68k.org>
+ * doc/xml/chapter.txml: Remove whitespace inside <keyword>.
+ * doc/xml/class.txml: Likewise.
+ * doc/xml/manual/abi.xml: Likewise.
+ * doc/xml/manual/algorithms.xml: Likewise.
+ * doc/xml/manual/allocator.xml: Likewise.
+ * doc/xml/manual/appendix_contributing.xml: Likewise.
+ * doc/xml/manual/appendix_free.xml: Likewise.
+ * doc/xml/manual/appendix_porting.xml: Likewise.
+ * doc/xml/manual/atomics.xml: Likewise.
+ * doc/xml/manual/auto_ptr.xml: Likewise.
+ * doc/xml/manual/backwards_compatibility.xml: Likewise.
+ * doc/xml/manual/bitmap_allocator.xml: Likewise.
+ * doc/xml/manual/build_hacking.xml: Likewise.
+ * doc/xml/manual/codecvt.xml: Likewise.
+ * doc/xml/manual/concurrency.xml: Likewise.
+ * doc/xml/manual/concurrency_extensions.xml: Likewise.
+ * doc/xml/manual/configure.xml: Likewise.
+ * doc/xml/manual/containers.xml: Likewise.
+ * doc/xml/manual/ctype.xml: Likewise.
+ * doc/xml/manual/debug.xml: Likewise.
+ * doc/xml/manual/debug_mode.xml: Likewise.
+ * doc/xml/manual/diagnostics.xml: Likewise.
+ * doc/xml/manual/extensions.xml: Likewise.
+ * doc/xml/manual/internals.xml: Likewise.
+ * doc/xml/manual/intro.xml: Likewise.
+ * doc/xml/manual/io.xml: Likewise.
+ * doc/xml/manual/iterators.xml: Likewise.
+ * doc/xml/manual/locale.xml: Likewise.
+ * doc/xml/manual/localization.xml: Likewise.
+ * doc/xml/manual/messages.xml: Likewise.
+ * doc/xml/manual/mt_allocator.xml: Likewise.
+ * doc/xml/manual/numerics.xml: Likewise.
+ * doc/xml/manual/parallel_mode.xml: Likewise.
+ * doc/xml/manual/policy_data_structures.xml: Likewise.
+ * doc/xml/manual/prerequisites.xml: Likewise.
+ * doc/xml/manual/profile_mode.xml: Likewise.
+ * doc/xml/manual/shared_ptr.xml: Likewise.
+ * doc/xml/manual/status_cxx1998.xml: Likewise.
+ * doc/xml/manual/status_cxx2011.xml: Likewise.
+ * doc/xml/manual/status_cxxtr1.xml: Likewise.
+ * doc/xml/manual/status_cxxtr24733.xml: Likewise.
+ * doc/xml/manual/strings.xml: Likewise.
+ * doc/xml/manual/support.xml: Likewise.
+ * doc/xml/manual/test.xml: Likewise.
+ * doc/xml/manual/using_exceptions.xml: Likewise.
+ * doc/xml/manual/utilities.xml: Likewise.
+ * doc/xml/spine.xml: Likewise.
+
* acinclude.m4 (GLIBCXX_CONFIGURE_DOCBOOK): Also check for
/usr/share/xml/docbook/stylesheet/nwalsh5/current.
* configure: Regenerate.
diff --git a/libstdc++-v3/doc/xml/chapter.txml b/libstdc++-v3/doc/xml/chapter.txml
index 85323e73baaa72f2184c94d414cbb2862eac4b49..b251c84609a1b6e4988b0027424e9c22a6c0e412 100644
--- a/libstdc++-v3/doc/xml/chapter.txml
+++ b/libstdc++-v3/doc/xml/chapter.txml
@@ -4,12 +4,8 @@
<info><title>Introduction</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/class.txml b/libstdc++-v3/doc/xml/class.txml
index c452192a9f25199ecf1e881d57f962649fe14782..be0929b7046f07af7e0b3796bb3b3278e3f8e53a 100644
--- a/libstdc++-v3/doc/xml/class.txml
+++ b/libstdc++-v3/doc/xml/class.txml
@@ -5,12 +5,8 @@
<info><title>allocator</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- allocator
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>allocator</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/abi.xml b/libstdc++-v3/doc/xml/manual/abi.xml
index 6dc741363894bff36b290e39271dcc57b21c44aa..23c635543a8f6c7f89e39b2abea3a02b31480a7c 100644
--- a/libstdc++-v3/doc/xml/manual/abi.xml
+++ b/libstdc++-v3/doc/xml/manual/abi.xml
@@ -4,24 +4,12 @@
<info><title>ABI Policy and Guidelines</title>
<keywordset>
- <keyword>
- C++
- </keyword>
- <keyword>
- ABI
- </keyword>
- <keyword>
- version
- </keyword>
- <keyword>
- dynamic
- </keyword>
- <keyword>
- shared
- </keyword>
- <keyword>
- compatibility
- </keyword>
+ <keyword>C++</keyword>
+ <keyword>ABI</keyword>
+ <keyword>version</keyword>
+ <keyword>dynamic</keyword>
+ <keyword>shared</keyword>
+ <keyword>compatibility</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/algorithms.xml b/libstdc++-v3/doc/xml/manual/algorithms.xml
index 94672ed419655740aa8b43f12951508c997788cd..e776d6e3e5586688363f7c517247f226b522f5b4 100644
--- a/libstdc++-v3/doc/xml/manual/algorithms.xml
+++ b/libstdc++-v3/doc/xml/manual/algorithms.xml
@@ -7,15 +7,9 @@
<indexterm><primary>Algorithms</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
- <keyword>
- algorithm
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
+ <keyword>algorithm</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/allocator.xml b/libstdc++-v3/doc/xml/manual/allocator.xml
index 8a1dbbdd514f00fb263d8003a775a1c5f3096068..38c395eb06e3e6ce2886510b56e39d58e376bdea 100644
--- a/libstdc++-v3/doc/xml/manual/allocator.xml
+++ b/libstdc++-v3/doc/xml/manual/allocator.xml
@@ -4,12 +4,8 @@
<info><title>Allocators</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- allocator
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>allocator</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
index d060f45a6d384ef27577738a906ec995b7c8f5b5..b3069a3b7a632719e8a3972493e3d2af0416c3b5 100644
--- a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
+++ b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
@@ -10,12 +10,8 @@
</indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/appendix_free.xml b/libstdc++-v3/doc/xml/manual/appendix_free.xml
index 86d503c9452e2a3e3d9bd11ec2c36d83296ee759..0ed7ba72d2a2d6873bddeee4ae576d75cf6b7b3e 100644
--- a/libstdc++-v3/doc/xml/manual/appendix_free.xml
+++ b/libstdc++-v3/doc/xml/manual/appendix_free.xml
@@ -10,12 +10,8 @@
</indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/appendix_porting.xml b/libstdc++-v3/doc/xml/manual/appendix_porting.xml
index 68f3f435d99cf09df9bf1402ec7ebe3f6ece4ccb..8eb90d1874531f1d80ad7c1f5fe69fc1802a7229 100644
--- a/libstdc++-v3/doc/xml/manual/appendix_porting.xml
+++ b/libstdc++-v3/doc/xml/manual/appendix_porting.xml
@@ -10,12 +10,8 @@
</indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/atomics.xml b/libstdc++-v3/doc/xml/manual/atomics.xml
index ddeea0185d533436121bfa5982181f9b81690684..5bd07585d69bc32c302426914e0ef94b1e6f0b7e 100644
--- a/libstdc++-v3/doc/xml/manual/atomics.xml
+++ b/libstdc++-v3/doc/xml/manual/atomics.xml
@@ -7,15 +7,9 @@
<indexterm><primary>Atomics</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
- <keyword>
- atomic
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
+ <keyword>atomic</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/auto_ptr.xml b/libstdc++-v3/doc/xml/manual/auto_ptr.xml
index f62d8f472b4f3f842de71d4d06a368f4ba02b459..2321b0f5029375c6cbdbd0bdf068ee932cf3ae9a 100644
--- a/libstdc++-v3/doc/xml/manual/auto_ptr.xml
+++ b/libstdc++-v3/doc/xml/manual/auto_ptr.xml
@@ -4,12 +4,8 @@
<info><title>auto_ptr</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- auto_ptr
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>auto_ptr</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/backwards_compatibility.xml b/libstdc++-v3/doc/xml/manual/backwards_compatibility.xml
index f25d3cf5187bc2ab4e1f2c99b1fb442ab22d4257..869b63f19927675108ee0399cfe1f408e9528c91 100644
--- a/libstdc++-v3/doc/xml/manual/backwards_compatibility.xml
+++ b/libstdc++-v3/doc/xml/manual/backwards_compatibility.xml
@@ -4,12 +4,8 @@
<info><title>Backwards Compatibility</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- backwards
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>backwards</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/bitmap_allocator.xml b/libstdc++-v3/doc/xml/manual/bitmap_allocator.xml
index ab6d63b16c40d6f6a368f26a0661d9278f5bcb88..3bc489a02cdd30a44de32c23dfe6dc68018a3b1b 100644
--- a/libstdc++-v3/doc/xml/manual/bitmap_allocator.xml
+++ b/libstdc++-v3/doc/xml/manual/bitmap_allocator.xml
@@ -4,12 +4,8 @@
<info><title>The bitmap_allocator</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- allocator
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>allocator</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/build_hacking.xml b/libstdc++-v3/doc/xml/manual/build_hacking.xml
index 771d005e71b667b30e208c8317cf73742b2300ea..a51cf7bf492365a4c7d75248d1de2b0e370ca912 100644
--- a/libstdc++-v3/doc/xml/manual/build_hacking.xml
+++ b/libstdc++-v3/doc/xml/manual/build_hacking.xml
@@ -4,27 +4,13 @@
<info><title>Configure and Build Hacking</title>
<keywordset>
- <keyword>
- C++
- </keyword>
- <keyword>
- build
- </keyword>
- <keyword>
- configure
- </keyword>
- <keyword>
- hacking
- </keyword>
- <keyword>
- version
- </keyword>
- <keyword>
- dynamic
- </keyword>
- <keyword>
- shared
- </keyword>
+ <keyword>C++</keyword>
+ <keyword>build</keyword>
+ <keyword>configure</keyword>
+ <keyword>hacking</keyword>
+ <keyword>version</keyword>
+ <keyword>dynamic</keyword>
+ <keyword>shared</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/codecvt.xml b/libstdc++-v3/doc/xml/manual/codecvt.xml
index 6ccceb080af8b45a9dab45113db0439dd242a9e6..9961515d49152c2e2ee6a6367012f55e8e30df35 100644
--- a/libstdc++-v3/doc/xml/manual/codecvt.xml
+++ b/libstdc++-v3/doc/xml/manual/codecvt.xml
@@ -4,12 +4,8 @@
<info><title>codecvt</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- codecvt
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>codecvt</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/concurrency.xml b/libstdc++-v3/doc/xml/manual/concurrency.xml
index e3dd9b9468a1b57fd6e8cb41a152d7acfc45d49f..0d3381f1a0e7f91432c60025e1b8851862d065a1 100644
--- a/libstdc++-v3/doc/xml/manual/concurrency.xml
+++ b/libstdc++-v3/doc/xml/manual/concurrency.xml
@@ -7,24 +7,12 @@
<indexterm><primary>Concurrency</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
- <keyword>
- mutex
- </keyword>
- <keyword>
- thread
- </keyword>
- <keyword>
- future
- </keyword>
- <keyword>
- condition_variable
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
+ <keyword>mutex</keyword>
+ <keyword>thread</keyword>
+ <keyword>future</keyword>
+ <keyword>condition_variable</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/concurrency_extensions.xml b/libstdc++-v3/doc/xml/manual/concurrency_extensions.xml
index e36d3aa99473cc2460c43abb8f4e2c0ca3f2d39c..0d0e1b951eb1d2439bde79051a3fac824adde10c 100644
--- a/libstdc++-v3/doc/xml/manual/concurrency_extensions.xml
+++ b/libstdc++-v3/doc/xml/manual/concurrency_extensions.xml
@@ -4,12 +4,8 @@
<info><title>Concurrency</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/configure.xml b/libstdc++-v3/doc/xml/manual/configure.xml
index 25c92c36189851cb8426104069a8d89b86ae7d1d..05f6ebabefac46335cf00395fa881178a757eed9 100644
--- a/libstdc++-v3/doc/xml/manual/configure.xml
+++ b/libstdc++-v3/doc/xml/manual/configure.xml
@@ -4,15 +4,9 @@
<info><title>Configure</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- configure
- </keyword>
- <keyword>
- options
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>configure</keyword>
+ <keyword>options</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/containers.xml b/libstdc++-v3/doc/xml/manual/containers.xml
index 377b1a2ee6fa3a36331196fd92402031a52bf42d..c90ffc65e469d478138a1e8a7b86f587367cc15e 100644
--- a/libstdc++-v3/doc/xml/manual/containers.xml
+++ b/libstdc++-v3/doc/xml/manual/containers.xml
@@ -7,12 +7,8 @@
<indexterm><primary>Containers</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/ctype.xml b/libstdc++-v3/doc/xml/manual/ctype.xml
index d6f2407a6e86fdd021bf225afacea0dd1306c8b0..21b70724fd79243aea0942627f9769db36074b0f 100644
--- a/libstdc++-v3/doc/xml/manual/ctype.xml
+++ b/libstdc++-v3/doc/xml/manual/ctype.xml
@@ -4,12 +4,8 @@
<info><title>ctype</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- ctype
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>ctype</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/debug.xml b/libstdc++-v3/doc/xml/manual/debug.xml
index caaf46d29c0f502c4a3790afc0acf6e41764e85b..bbd8199341662f55b0c2171b251488b9c4f13476 100644
--- a/libstdc++-v3/doc/xml/manual/debug.xml
+++ b/libstdc++-v3/doc/xml/manual/debug.xml
@@ -4,12 +4,8 @@
<info><title>Debugging Support</title>
<keywordset>
- <keyword>
- C++
- </keyword>
- <keyword>
- debug
- </keyword>
+ <keyword>C++</keyword>
+ <keyword>debug</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/debug_mode.xml b/libstdc++-v3/doc/xml/manual/debug_mode.xml
index 89b2c31b811c68c5eb199d952aa7ac0bc808ec21..389f9bdfb4aff2f70013b337e8d9341c2a838504 100644
--- a/libstdc++-v3/doc/xml/manual/debug_mode.xml
+++ b/libstdc++-v3/doc/xml/manual/debug_mode.xml
@@ -4,15 +4,9 @@
<info><title>Debug Mode</title>
<keywordset>
- <keyword>
- C++
- </keyword>
- <keyword>
- library
- </keyword>
- <keyword>
- debug
- </keyword>
+ <keyword>C++</keyword>
+ <keyword>library</keyword>
+ <keyword>debug</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/diagnostics.xml b/libstdc++-v3/doc/xml/manual/diagnostics.xml
index fd21442b992864e20f214179e8550734b83ef52b..9b642b1a7f1fc16c1696d88d9ce01939a76004dd 100644
--- a/libstdc++-v3/doc/xml/manual/diagnostics.xml
+++ b/libstdc++-v3/doc/xml/manual/diagnostics.xml
@@ -7,12 +7,8 @@
<indexterm><primary>Diagnostics</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/extensions.xml b/libstdc++-v3/doc/xml/manual/extensions.xml
index 804cc7f0bf709e4ba277146ea7e409c96a2d2669..522f562e629d812ad4b632ee5e643bbbf23f492f 100644
--- a/libstdc++-v3/doc/xml/manual/extensions.xml
+++ b/libstdc++-v3/doc/xml/manual/extensions.xml
@@ -7,12 +7,8 @@
<indexterm><primary>Extensions</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/internals.xml b/libstdc++-v3/doc/xml/manual/internals.xml
index c01735eb4fb8970d052dd928ccd7215df6fbe7bb..7acec6bbf59db1b16fd27f03422f4fcf2371d73c 100644
--- a/libstdc++-v3/doc/xml/manual/internals.xml
+++ b/libstdc++-v3/doc/xml/manual/internals.xml
@@ -4,12 +4,8 @@
<info><title>Porting to New Hardware or Operating Systems</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- internals
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>internals</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/intro.xml b/libstdc++-v3/doc/xml/manual/intro.xml
index 7621de9c2b184fd91837dcecb5693e112c303b14..027e39034d1475c233750a9ec002d26ceadd6b3d 100644
--- a/libstdc++-v3/doc/xml/manual/intro.xml
+++ b/libstdc++-v3/doc/xml/manual/intro.xml
@@ -6,12 +6,8 @@
<indexterm><primary>Introduction</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/io.xml b/libstdc++-v3/doc/xml/manual/io.xml
index 339ac1f450f0191a4d3a008f5a97568d7f079a71..480b697bd54d9dd3024263c5a8313dc9f359caf4 100644
--- a/libstdc++-v3/doc/xml/manual/io.xml
+++ b/libstdc++-v3/doc/xml/manual/io.xml
@@ -7,12 +7,8 @@
<indexterm><primary>Input and Output</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/iterators.xml b/libstdc++-v3/doc/xml/manual/iterators.xml
index 11dc3ae885849d00241bbcc8c9eaf7e9bccc78db..aab26b92e400a1835b4c030a2a3e977fc763346e 100644
--- a/libstdc++-v3/doc/xml/manual/iterators.xml
+++ b/libstdc++-v3/doc/xml/manual/iterators.xml
@@ -7,12 +7,8 @@
<indexterm><primary>Iterators</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/locale.xml b/libstdc++-v3/doc/xml/manual/locale.xml
index 9e3197647d8ec492cd5f1601a833172cb036d3fb..8a78095060571580faed4323ab5ee7ab0b362627 100644
--- a/libstdc++-v3/doc/xml/manual/locale.xml
+++ b/libstdc++-v3/doc/xml/manual/locale.xml
@@ -3,12 +3,8 @@
<info><title>locale</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- locale
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>locale</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/localization.xml b/libstdc++-v3/doc/xml/manual/localization.xml
index b46e707fc4e0793f91a51ee0c5c4c239a14cc541..d05ca4d7dca50e9bbd65de020b5fc99085a9ef19 100644
--- a/libstdc++-v3/doc/xml/manual/localization.xml
+++ b/libstdc++-v3/doc/xml/manual/localization.xml
@@ -7,12 +7,8 @@
<indexterm><primary>Localization</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/messages.xml b/libstdc++-v3/doc/xml/manual/messages.xml
index 0eff6dd2d7ed71584402f66ca3d23fe0959a5689..9cb56104002947ede0b9934f8c747a1d0cdb387e 100644
--- a/libstdc++-v3/doc/xml/manual/messages.xml
+++ b/libstdc++-v3/doc/xml/manual/messages.xml
@@ -4,12 +4,8 @@
<info><title>messages</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- messages
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>messages</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/mt_allocator.xml b/libstdc++-v3/doc/xml/manual/mt_allocator.xml
index 8d4d127e6c479481836dbf49cf89c84f382e69b7..3e3a864eb00cf8e92551ece2244d50a3946493d9 100644
--- a/libstdc++-v3/doc/xml/manual/mt_allocator.xml
+++ b/libstdc++-v3/doc/xml/manual/mt_allocator.xml
@@ -4,12 +4,8 @@
<info><title>The mt_allocator</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- allocator
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>allocator</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/numerics.xml b/libstdc++-v3/doc/xml/manual/numerics.xml
index eb1014e98a9524d504cd680a8720d176e4760dd2..495735502be6c8fe6d176b1f46f7ca48eb96bc25 100644
--- a/libstdc++-v3/doc/xml/manual/numerics.xml
+++ b/libstdc++-v3/doc/xml/manual/numerics.xml
@@ -7,12 +7,8 @@
<indexterm><primary>Numerics</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/parallel_mode.xml b/libstdc++-v3/doc/xml/manual/parallel_mode.xml
index af71923d82a24a7001ce9c61edd927386f3c569e..0ab59d56ca0bb80d70fb0e7fe88203a0e0554bba 100644
--- a/libstdc++-v3/doc/xml/manual/parallel_mode.xml
+++ b/libstdc++-v3/doc/xml/manual/parallel_mode.xml
@@ -4,15 +4,9 @@
<info><title>Parallel Mode</title>
<keywordset>
- <keyword>
- C++
- </keyword>
- <keyword>
- library
- </keyword>
- <keyword>
- parallel
- </keyword>
+ <keyword>C++</keyword>
+ <keyword>library</keyword>
+ <keyword>parallel</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/policy_data_structures.xml b/libstdc++-v3/doc/xml/manual/policy_data_structures.xml
index 60db2f25c3c9b4e3ea35b63d4fc4704361400317..a0699b45566723142a83585be228ab39b861ee74 100644
--- a/libstdc++-v3/doc/xml/manual/policy_data_structures.xml
+++ b/libstdc++-v3/doc/xml/manual/policy_data_structures.xml
@@ -3,36 +3,16 @@
<info>
<title>Policy-Based Data Structures</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- policy
- </keyword>
- <keyword>
- container
- </keyword>
- <keyword>
- data
- </keyword>
- <keyword>
- structure
- </keyword>
- <keyword>
- associated
- </keyword>
- <keyword>
- tree
- </keyword>
- <keyword>
- trie
- </keyword>
- <keyword>
- hash
- </keyword>
- <keyword>
- metaprogramming
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>policy</keyword>
+ <keyword>container</keyword>
+ <keyword>data</keyword>
+ <keyword>structure</keyword>
+ <keyword>associated</keyword>
+ <keyword>tree</keyword>
+ <keyword>trie</keyword>
+ <keyword>hash</keyword>
+ <keyword>metaprogramming</keyword>
</keywordset>
</info>
<?dbhtml filename="policy_data_structures.html"?>
diff --git a/libstdc++-v3/doc/xml/manual/prerequisites.xml b/libstdc++-v3/doc/xml/manual/prerequisites.xml
index bca5865a8767b69780df51c6dce5976da7ae9dc9..aa677647555fb9d4d4c4f64b7345039cd6d3b527 100644
--- a/libstdc++-v3/doc/xml/manual/prerequisites.xml
+++ b/libstdc++-v3/doc/xml/manual/prerequisites.xml
@@ -4,12 +4,8 @@
<info><title>Prerequisites</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- Prerequisites
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>Prerequisites</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/profile_mode.xml b/libstdc++-v3/doc/xml/manual/profile_mode.xml
index cb4db6732a57261e2b69d731a3b78be699d1d55f..adb3c8718db06dc1a424bf1c44742e814d5c25c0 100644
--- a/libstdc++-v3/doc/xml/manual/profile_mode.xml
+++ b/libstdc++-v3/doc/xml/manual/profile_mode.xml
@@ -4,15 +4,9 @@
<info><title>Profile Mode</title>
<keywordset>
- <keyword>
- C++
- </keyword>
- <keyword>
- library
- </keyword>
- <keyword>
- profile
- </keyword>
+ <keyword>C++</keyword>
+ <keyword>library</keyword>
+ <keyword>profile</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/shared_ptr.xml b/libstdc++-v3/doc/xml/manual/shared_ptr.xml
index be1aaf655f27d00b64b87e1c7f6c67a1c727d0f1..bea1c50c79cbfc636200b3f237bf85183af69536 100644
--- a/libstdc++-v3/doc/xml/manual/shared_ptr.xml
+++ b/libstdc++-v3/doc/xml/manual/shared_ptr.xml
@@ -4,12 +4,8 @@
<info><title>shared_ptr</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- shared_ptr
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>shared_ptr</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/status_cxx1998.xml b/libstdc++-v3/doc/xml/manual/status_cxx1998.xml
index 67f6f891df032d9cacde6f19e06a5c22bdaf66c3..1541343e0cb72ef2dca2a040eefa438f83621c52 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxx1998.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx1998.xml
@@ -4,12 +4,8 @@
<info><title>C++ 1998/2003</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- 1998
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>1998</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2011.xml b/libstdc++-v3/doc/xml/manual/status_cxx2011.xml
index aae3aece62e8e9d59d151e89dc63d44bb439d9e1..06c28bf092c66d36c60b909475d3cae69de38de0 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxx2011.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx2011.xml
@@ -4,12 +4,8 @@
<info><title>C++ 2011</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- 2011
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>2011</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/status_cxxtr1.xml b/libstdc++-v3/doc/xml/manual/status_cxxtr1.xml
index 58571f2dde7c83f871ab05dbf0173b9c522e9e19..3664f3017bb57774f05a5e336a0cc665f9ca3e17 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxxtr1.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxxtr1.xml
@@ -4,12 +4,8 @@
<info><title>C++ TR1</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- tr1
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>tr1</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/status_cxxtr24733.xml b/libstdc++-v3/doc/xml/manual/status_cxxtr24733.xml
index 997e76be18f765e3602636a4a23378af585eae9c..540c0169295f705bebdc5f833ef6a5124f18864e 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxxtr24733.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxxtr24733.xml
@@ -4,9 +4,7 @@
<info><title>C++ TR 24733</title>
<keywordset>
- <keyword>
- TR 24733
- </keyword>
+ <keyword>TR 24733</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/strings.xml b/libstdc++-v3/doc/xml/manual/strings.xml
index 1387189ece4a9f44201f9a8e18bfd706c5a4ca3b..d281c02bd5233b11c2bf1a8f7b29340ee50d4385 100644
--- a/libstdc++-v3/doc/xml/manual/strings.xml
+++ b/libstdc++-v3/doc/xml/manual/strings.xml
@@ -7,12 +7,8 @@
<indexterm><primary>Strings</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/support.xml b/libstdc++-v3/doc/xml/manual/support.xml
index 2cb7205bd4452d008fdbdf3e9b85722a139fa560..4d33a46f4a0476f35c1a872881dc012163e15687 100644
--- a/libstdc++-v3/doc/xml/manual/support.xml
+++ b/libstdc++-v3/doc/xml/manual/support.xml
@@ -7,12 +7,8 @@
<indexterm><primary>Support</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/test.xml b/libstdc++-v3/doc/xml/manual/test.xml
index 88bf14dffefbd23d2d5ad757b824ad90a84d0fb0..b3d8ea361bad9d68ec952dbdc7ffd74ec374cd22 100644
--- a/libstdc++-v3/doc/xml/manual/test.xml
+++ b/libstdc++-v3/doc/xml/manual/test.xml
@@ -4,27 +4,13 @@
<info><title>Test</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- test
- </keyword>
- <keyword>
- testsuite
- </keyword>
- <keyword>
- performance
- </keyword>
- <keyword>
- conformance
- </keyword>
- <keyword>
- ABI
- </keyword>
- <keyword>
- exception safety
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>test</keyword>
+ <keyword>testsuite</keyword>
+ <keyword>performance</keyword>
+ <keyword>conformance</keyword>
+ <keyword>ABI</keyword>
+ <keyword>exception safety</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/using_exceptions.xml b/libstdc++-v3/doc/xml/manual/using_exceptions.xml
index afa597e696a8626aadea6d1dda02e871aae8fb14..5eb002289da3db4420197227ddd3c4efa81bc58b 100644
--- a/libstdc++-v3/doc/xml/manual/using_exceptions.xml
+++ b/libstdc++-v3/doc/xml/manual/using_exceptions.xml
@@ -4,27 +4,13 @@
<info><title>Exceptions</title>
<keywordset>
- <keyword>
- C++
- </keyword>
- <keyword>
- exception
- </keyword>
- <keyword>
- error
- </keyword>
- <keyword>
- exception neutrality
- </keyword>
- <keyword>
- exception safety
- </keyword>
- <keyword>
- exception propagation
- </keyword>
- <keyword>
- -fno-exceptions
- </keyword>
+ <keyword>C++</keyword>
+ <keyword>exception</keyword>
+ <keyword>error</keyword>
+ <keyword>exception neutrality</keyword>
+ <keyword>exception safety</keyword>
+ <keyword>exception propagation</keyword>
+ <keyword>-fno-exceptions</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/manual/utilities.xml b/libstdc++-v3/doc/xml/manual/utilities.xml
index 41eed1ecb862e59481849fb076a56dc6ec51b050..6a4a792ca1afdae368e0e2ce3f68bc44abc5b332 100644
--- a/libstdc++-v3/doc/xml/manual/utilities.xml
+++ b/libstdc++-v3/doc/xml/manual/utilities.xml
@@ -7,12 +7,8 @@
<indexterm><primary>Utilities</primary></indexterm>
</title>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>library</keyword>
</keywordset>
</info>
diff --git a/libstdc++-v3/doc/xml/spine.xml b/libstdc++-v3/doc/xml/spine.xml
index 5fd913e94d49905dec535c36bce42fe75aabd3f2..6b9d82eaf470d3113b623e7a40cacceb97eb57db 100644
--- a/libstdc++-v3/doc/xml/spine.xml
+++ b/libstdc++-v3/doc/xml/spine.xml
@@ -6,15 +6,9 @@
<info>
<keywordset>
- <keyword>
- ISO C++
- </keyword>
- <keyword>
- runtime
- </keyword>
- <keyword>
- library
- </keyword>
+ <keyword>ISO C++</keyword>
+ <keyword>runtime</keyword>
+ <keyword>library</keyword>
</keywordset>
<abstract xml:id="contents">
<title>Short Contents</title>