docs-common/packaging rpm-info.dtd,1.6,1.7

[Tommy Reynolds (jtr)]

Author: jtr

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

Modified Files:
	rpm-info.dtd 
Log Message:
Consolidate author, editor and such, information into a colophon that we
can access using the manditory ID attributes.



Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpm-info.dtd	28 Dec 2005 00:55:52 -0000	1.6
+++ rpm-info.dtd	29 Dec 2005 17:32:16 -0000	1.7
@@ -1,4 +1,4 @@
-<!ELEMENT rpm-info		(author+,translator*,editor*, license,copyright+,titles,changelog)	>
+<!ELEMENT rpm-info		(colophon,author+,translator*,editor*, license,copyright+,titles,changelog)	>
 
 <!ELEMENT release		EMPTY					>
 <!ATTLIST release	rel	CDATA		#REQUIRED		>
@@ -28,25 +28,25 @@
 <!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 colophon		(worker+)				>
+
+<!ELEMENT worker  		EMPTY					>
+<!ATTLIST worker	id	  ID		#REQUIRED		>
+<!ATTLIST worker	wholename CDATA   	#REQUIRED 		>
+<!ATTLIST worker	email     CDATA   	#REQUIRED 		>
+<!ATTLIST worker  	surname   CDATA   	#REQUIRED 		>
+<!ATTLIST worker  	firstname CDATA   	#REQUIRED 		>
+<!ATTLIST worker  	initials  CDATA		#REQUIRED 		>
+
+<!ELEMENT author		EMPTY					>
+<!ATTLIST author	worker	  IDREF		#REQUIRED		>
 
 <!ELEMENT editor  			EMPTY				>
-<!ATTLIST editor	wholename CDATA   #REQUIRED 			>
-<!ATTLIST editor	email     CDATA   #REQUIRED 			>
-<!ATTLIST editor  	surname   CDATA   #REQUIRED 			>
-<!ATTLIST editor  	firstname CDATA   #REQUIRED 			>
+<!ATTLIST editor	worker	  IDREF		#REQUIRED		>
 
 
 <!ELEMENT translator  			EMPTY				>
-<!ATTLIST translator	wholename CDATA   #REQUIRED 			>
-<!ATTLIST translator	email     CDATA   #REQUIRED 			>
-<!ATTLIST translator	surname   CDATA   #REQUIRED 			>
-<!ATTLIST translator  	firstname CDATA   #REQUIRED 			>
+<!ATTLIST translator	worker	  IDREF		#REQUIRED		>
 
 <!ELEMENT details		(#PCDATA)				>
 <!ATTLIST details       lang      CDATA   "en"                          >