[conglomerate] Fixed typos

[Daniel Mustieles GarcÃa <dmustieles src gnome org>]

commit 788c80061f4bd72bfefc98cc94ea43de51c08285
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Fri Apr 27 11:12:07 2012 +0200

    Fixed typos

 doc/C/conglomerate.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/doc/C/conglomerate.xml b/doc/C/conglomerate.xml
index 61c4da6..8a89d7c 100644
--- a/doc/C/conglomerate.xml
+++ b/doc/C/conglomerate.xml
@@ -1860,7 +1860,7 @@ Set Encore = Nothing
         </sect2>
         <sect2 id="description">
             <title id="description.title">description</title>
-            <para>A paragraph describing the Document Type annoted by the XDS.</para>
+            <para>A paragraph describing the Document Type annotated by the XDS.</para>
             <sect3 id="description_attributes">
                 <title>Attributes</title>
                 <informaltable>
@@ -2052,7 +2052,7 @@ Set Encore = Nothing
                 <entry>desc</entry>
             </row>
             <row>
-                <entry>whitepace</entry>
+                <entry>whitespace</entry>
                 <entry>
                     <para>normalize</para>
                     <para>preserve</para>