changeset 4831:5e3bda6f5208

Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 30 Aug 2012 16:08:13 +0000
parents 2c863b4a8f93
children 949ea3d3cd1a
files docs/GNUmakefile docs/dtd/changes.dtd docs/xml/nginx/changes.xml
diffstat 3 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/docs/GNUmakefile
+++ b/docs/GNUmakefile
@@ -12,22 +12,26 @@ changes:	$(TEMP)/$(NGINX)/CHANGES.ru				
 		$(TEMP)/$(NGINX)/CHANGES
 
 
-$(TEMP)/$(NGINX)/CHANGES.ru:	docs/xml/nginx/changes.xml		\
+$(TEMP)/$(NGINX)/CHANGES.ru:	docs/dtd/changes.dtd			\
+				docs/xml/nginx/changes.xml		\
 				docs/xml/change_log_conf.xml		\
 				docs/xslt/changes.xslt
 
 	mkdir -p $(TEMP)/$(NGINX)
 
+	xmllint --noout --valid docs/xml/nginx/changes.xml
 	xsltproc --stringparam lang ru					\
 		-o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml
 
 
-$(TEMP)/$(NGINX)/CHANGES:	docs/xml/nginx/changes.xml		\
+$(TEMP)/$(NGINX)/CHANGES:	docs/dtd/changes.dtd			\
+				docs/xml/nginx/changes.xml		\
 				docs/xml/change_log_conf.xml		\
 				docs/xslt/changes.xslt
 
 	mkdir -p $(TEMP)/$(NGINX)
 
+	xmllint --noout --valid docs/xml/nginx/changes.xml
 	xsltproc --stringparam lang en					\
 		-o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml
 
--- a/docs/dtd/changes.dtd
+++ b/docs/dtd/changes.dtd
@@ -12,10 +12,10 @@
 >
 
 <!ELEMENT change       (para)* >
-<!ATTLIST change       type (bugfix | feature | change | workaround) #IMPLIED >
+<!ATTLIST change       type (bugfix | feature | change | security | workaround) #IMPLIED >
 
 <!ELEMENT para         (#PCDATA | at | br | nobr)* >
-<!ATTLIST para         lang (ru | en) #IMPLIED >
+<!ATTLIST para         lang (ru | en) #REQUIRED >
 
 <!ELEMENT at           EMPTY >
 <!ELEMENT br           EMPTY >
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE change_log SYSTEM "../../dtd/changes.dtd" >
 
 
-<change_log link="/nginx/changes.html" path="/nginx/" root=".."
-            title="nginx">
-
-<title lang="ru">Изменения в nginx</title>
-<title lang="en">nginx changelog</title>
+<change_log title="nginx">
 
 
 <changes ver="1.3.5" date="21.08.2012">