Patchwork Remove whitespace inside <keyword>

login
register
mail settings
Submitter Andreas Schwab
Date Nov. 11, 2012, 7:26 p.m.
Message ID <m2r4o0j5zx.fsf@igel.home>
Download mbox | patch
Permalink /patch/198292/
State New
Headers show

Comments

Andreas Schwab - Nov. 11, 2012, 7:26 p.m.
Whitespace is apparently significant for <keyword>, you get something
like 

<meta name="keywords" content="&#10;      ISO C++&#10;    , &#10;      runtime&#10;    , &#10;      library&#10;    " />

in the HTML output.

Andreas.

	* 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.
Jonathan Wakely - Nov. 11, 2012, 8:05 p.m.
On 11 November 2012 19:26, Andreas Schwab wrote:
> Whitespace is apparently significant for <keyword>, you get something
> like
>
> <meta name="keywords" content="&#10;      ISO C++&#10;    , &#10;      runtime&#10;    , &#10;      library&#10;    " />
>
> in the HTML output.

Huh, thanks for noticing it. Assuming it passes 'make
doc-xml-validate-docbook' the patch is OK.

Patch

diff --git a/libstdc++-v3/doc/xml/chapter.txml b/libstdc++-v3/doc/xml/chapter.txml
index 85323e7..b251c84 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 c452192..be0929b 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 6dc7413..23c6355 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 94672ed..e776d6e 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 8a1dbbd..38c395e 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 d060f45..b3069a3 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 86d503c..0ed7ba7 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 68f3f43..8eb90d1 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 ddeea01..5bd0758 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 f62d8f4..2321b0f 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 f25d3cf..869b63f 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 ab6d63b..3bc489a 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 771d005..a51cf7b 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 6ccceb0..9961515 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 e3dd9b9..0d3381f 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 e36d3aa..0d0e1b9 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 25c92c3..05f6eba 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 377b1a2..c90ffc6 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 d6f2407..21b7072 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 caaf46d..bbd8199 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 89b2c31..389f9bd 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 fd21442..9b642b1 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 804cc7f..522f562 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 c01735e..7acec6b 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 7621de9..027e390 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 339ac1f..480b697 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 11dc3ae..aab26b9 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 9e31976..8a78095 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 b46e707..d05ca4d 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 0eff6dd..9cb5610 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 8d4d127..3e3a864 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 eb1014e..4957355 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 af71923..0ab59d5 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 60db2f2..a0699b4 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 bca5865..aa67764 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 cb4db67..adb3c87 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 be1aaf6..bea1c50 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 67f6f89..1541343 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 aae3aec..06c28bf 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 58571f2..3664f30 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 997e76b..540c016 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 1387189..d281c02 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 2cb7205..4d33a46 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 88bf14d..b3d8ea3 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 afa597e..5eb0022 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 41eed1e..6a4a792 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 5fd913e..6b9d82e 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>