Run xmllint on C/evolution.xml when building with "make check" or "make

2008-06-30  Matthew Barnes  <mbarnes@redhat.com>

	* help/Makefile.am:
	Run xmllint on C/evolution.xml when building with "make check"
	or "make distcheck".  Should hopefully prevent any more invalid
	DocBook syntax from slipping into releases.

	* help/C/evolution.xml:
	Fix some issues that xmllint caught.


svn path=/trunk/; revision=35707

3 files changed, 14 insertions, 2 deletions

diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index 5ac0a2fdc1..c71124de68 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -5197,7 +5197,7 @@
          <warning>
           <para>You are not permitted to send a message on behalf of more than one person at a time.</para>
          </warning>
-         <para>When the recipient opens the mail, he or she can also read a message that <guilabel>The message was sent by &lt;<emphasis>Delegator's name</emphasis>&gt; on behalf of &lt;<emphasis>Delegate's name</emphasis>&gt;</guilabel> on the preview pane header bar.</para>
+         <para>When the recipient opens the mail, he or she can also read a message that <guilabel>The message was sent by &lt;Delegator's name&gt; on behalf of &lt;Delegate's name&gt;</guilabel> on the preview pane header bar.</para>
         </listitem>
        </orderedlist>
       </listitem>
@@ -7410,7 +7410,7 @@
     <member>You may not use, export, or re-export this product in violation of any applicable laws or regulations including, without limitation, U.S. export regulations or the laws of the country in which you reside.</member>
    </simplelist>
    <simplelist>
-    <member><copyright><year>2007</year><holder>Novell, Inc.</holder></copyright> Permission is granted to copy, distribute, and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.2 or any later version, published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the GFDL can be found at http://www.fsf.org/licenses/fdl.html.</member>
+    <member>Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.2 or any later version, published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the GFDL can be found at http://www.fsf.org/licenses/fdl.html.</member>
     <member>THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT:</member>
     <member>1. THE DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND</member>
     <member>2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.</member>
diff --git a/help/ChangeLog b/help/ChangeLog
index 2a3e94a62f..321a70e90f 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* Makefile.am:
+	Run xmllint on C/evolution.xml when building with "make check"
+	or "make distcheck".  Should hopefully prevent any more invalid
+	DocBook syntax from slipping into releases.
+
+	* C/evolution.xml:
+	Fix some issues that xmllint caught.
+
 2008-06-27 Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es/es.po: Updated Spanish translation
diff --git a/help/Makefile.am b/help/Makefile.am
index 9ec5e9c467..c16e167445 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -131,3 +131,5 @@ DOC_FIGURES =  \
 
 DOC_LINGUAS = cs de el en_GB es fr oc ru sv mk
 
+check:
+	xmllint --valid --noout $(top_srcdir)/help/C/evolution.xml