Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.

diff --git a/docs/GNUmakefile b/docs/GNUmakefile
index aea6760549823f7408aff115ecc6d63015f3ddfe..7c72b91712c22b59cc64a70ff1cb0690b3735357 100644 (file)
--- 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
 

diff --git a/docs/dtd/changes.dtd b/docs/dtd/changes.dtd
index 4dea2c7afd80aa5c7c5c8fd2b1086627ecfcae01..e14518af7cb85e80524bc699231f541dbb7c13a6 100644 (file)
--- 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 >

diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index af5ea7c0b66e9a2e34c04cccda789afd08eac8e4..cc475da0042e7eedb2239dacbf13f8c38adc9c62 100644 (file)
--- 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">