Return-Path: 
 <svn-return-282-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 26018 invoked from network); 30 Jul 2004 04:14:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 30 Jul 2004 04:14:14 -0000
Received: (qmail 68834 invoked by uid 500); 30 Jul 2004 04:14:14 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 68785 invoked by uid 500); 30 Jul 2004 04:14:13 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
list-post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 68761 invoked by uid 99); 30 Jul 2004 04:14:13 -0000
X-ASF-Spam-Status: No, hits=0.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Thu, 29 Jul 2004 21:14:11 -0700
Received: (qmail 25999 invoked by uid 65534); 30 Jul 2004 04:14:11 -0000
Date: 30 Jul 2004 04:14:11 -0000
Message-ID: <20040730041411.25997.qmail@minotaur.apache.org>
From: crossley@apache.org
To: svn@forrest.apache.org
Subject: svn commit: rev 30963 -
 forrest/trunk/src/core/context/resources/schema/dtd/v20
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: crossley
Date: Thu Jul 29 21:14:10 2004
New Revision: 30963

Modified:
   forrest/trunk/src/core/context/resources/schema/dtd/v20/document-v20.mod
Log:
The last patch inadvertently added back the link, jump, and fork elements.
Remove them again, leaving only <a>.
Submitted by: Rick Tessner


Modified: forrest/trunk/src/core/context/resources/schema/dtd/v20/document-v20.mod
==============================================================================
--- forrest/trunk/src/core/context/resources/schema/dtd/v20/document-v20.mod	(original)
+++ forrest/trunk/src/core/context/resources/schema/dtd/v20/document-v20.mod	Thu Jul 29 21:14:10 2004
@@ -51,7 +51,7 @@
 <!-- Entities referred to later on are defined up front -->
 <!ENTITY % markup "strong|em|code|sub|sup">
 <!ENTITY % special-inline "br|img|icon|acronym">
-<!ENTITY % links "a|link|fork|jump">
+<!ENTITY % links "a">
 <!ENTITY % paragraphs "p|source|note|warning|fixme">
 <!ENTITY % tables "table">
 <!ENTITY % lists "ol|ul|dl">
@@ -170,18 +170,6 @@
 <!-- http://www.w3.org/TR/xhtml2/mod-hypertext.html#s_hypertextmodule -->
 <!ELEMENT a (%link-content.mix;)*>
 <!ATTLIST a
-  %common.att; 
-  %link.att; 
->
-<!-- windows-replacing link (equivalent of <a ... target="_top">) -->
-<!ELEMENT jump (%link-content.mix;)*>
-<!ATTLIST jump
-  %common.att; 
-  %link.att; 
->
-<!-- window-forking link (equivalent of <a ... target="_blank">) -->
-<!ELEMENT fork (%link-content.mix;)*>
-<!ATTLIST fork
   %common.att; 
   %link.att; 
 >