From owner-svn-doc-projects@FreeBSD.ORG  Fri Jul  5 11:03:25 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4009E796;
 Fri,  5 Jul 2013 11:03:25 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 325241295;
 Fri,  5 Jul 2013 11:03:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65B3P11096955;
 Fri, 5 Jul 2013 11:03:25 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65B3Po8096954;
 Fri, 5 Jul 2013 11:03:25 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307051103.r65B3Po8096954@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 5 Jul 2013 11:03:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42156 - projects/db5/es_ES.ISO8859-1/share/xml
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 11:03:25 -0000

Author: gabor
Date: Fri Jul  5 11:03:24 2013
New Revision: 42156
URL: http://svnweb.freebsd.org/changeset/doc/42156

Log:
  - Fix erroneous merge

Modified:
  projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent

Modified: projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent
==============================================================================
--- projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent	Fri Jul  5 10:30:18 2013	(r42155)
+++ projects/db5/es_ES.ISO8859-1/share/xml/trademarks.ent	Fri Jul  5 11:03:24 2013	(r42156)
@@ -353,6 +353,7 @@ Coverity, Inc.</para>">
   designations have been followed by the <quote>&trade;</quote> or the
   <quote>&reg;</quote> symbol.</para>">
 
+<!ENTITY legalnotice '
 <legalnotice xmlns="http://docbook.org/ns/docbook" xml:id="legalnotice">
   <para>La redistribución y uso en fuente (SGML DocBook) y formatos
     "compilados" (SGML, HTML, PDF, PostScript, RTF y cualquier otro) con o