docs-common/packaging rpm-info.dtd,1.3,1.4

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1009/docs-common/packaging

Modified Files:
	rpm-info.dtd 
Log Message:
Experiment over, reverted rpm-info tests


Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpm-info.dtd	27 Nov 2005 17:58:25 -0000	1.3
+++ rpm-info.dtd	27 Nov 2005 23:27:58 -0000	1.4
@@ -19,28 +19,33 @@
 <!ELEMENT title			(#PCDATA) 				>
 <!ELEMENT desc			(#PCDATA)				>
 
-<!ELEMENT changelog		((docrevision|pkgrevision)+)		>
+<!ELEMENT changelog		(revision+)				>
 <!ATTLIST changelog 	order  	(newest-first)  #REQUIRED 		>
 
-<!ELEMENT docrevision		(date,docversion,initials,details+)     >
-<!ELEMENT docversion            (#PCDATA)                               >
-
-<!ELEMENT pkgrevision           (date,pkgversion,pkgrelease,wholename,email,details+) >
-<!-- pkgversion will often key off docversion, but not necessarily -->
-<!ELEMENT pkgversion            (#PCDATA)                               >
-<!ELEMENT pkgrelease            (#PCDATA)                               >
-
-<!-- used in both docrevision and pkgrevision elements -->
-<!ELEMENT date                  (#PCDATA)                               >
-<!ELEMENT details               (#PCDATA)                               >
-
-<!ELEMENT author  		(wholename,email,surname,firstname,initials) >
-<!ELEMENT editor                (wholename,email,surname,firstname) >
-<!ELEMENT translator            (wholename,email,surname,firstname) >
-
-<!ELEMENT wholename             (#PCDATA)                               >
-<!ELEMENT email                 (#PCDATA)                               >
-<!ELEMENT surname               (#PCDATA)                               >
-<!ELEMENT firstname             (#PCDATA)                               >
-<!ELEMENT initials              (#PCDATA)                               >
+<!ELEMENT revision		(author+,editor*,details)		>
+<!ATTLIST revision  	date   	CDATA   	#REQUIRED 		>
+<!ATTLIST revision  	version	CDATA   	#REQUIRED 		>
+<!ATTLIST revision	release	CDATA		#REQUIRED		>
+<!ATTLIST revision	role	(doc|rpm)	"doc"			>
+
+<!ELEMENT author  		EMPTY					>
+<!ATTLIST author	wholename CDATA   	#REQUIRED 		>
+<!ATTLIST author	email     CDATA   	#REQUIRED 		>
+<!ATTLIST author  	surname   CDATA   	#REQUIRED 		>
+<!ATTLIST author  	firstname CDATA   	#REQUIRED 		>
+<!ATTLIST author  	initials  CDATA		#REQUIRED 		>
+
+<!ELEMENT editor  			EMPTY				>
+<!ATTLIST editor	wholename CDATA   #REQUIRED 			>
+<!ATTLIST editor	email     CDATA   #REQUIRED 			>
+<!ATTLIST editor  	surname   CDATA   #REQUIRED 			>
+<!ATTLIST editor  	firstname CDATA   #REQUIRED 			>
+
+
+<!ELEMENT translator  			EMPTY				>
+<!ATTLIST translator	wholename CDATA   #REQUIRED 			>
+<!ATTLIST translator	email     CDATA   #REQUIRED 			>
+<!ATTLIST translator	surname   CDATA   #REQUIRED 			>
+<!ATTLIST translator  	firstname CDATA   #REQUIRED 			>
 
+<!ELEMENT details		(#PCDATA)				>