Author: ru
Date: 2012-08-30 16:08:13 +0000 (Thu, 30 Aug 2012)
New Revision: 4832
URL: http://trac.nginx.org/nginx/changeset/4832/nginx
Log:
Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
Modified:
trunk/docs/GNUmakefile
trunk/docs/dtd/changes.dtd
trunk/docs/xml/nginx/changes.xml
Modified: trunk/docs/GNUmakefile
===================================================================
--- trunk/docs/GNUmakefile 2012-08-30 16:05:43 UTC (rev 4831)
+++ trunk/docs/GNUmakefile 2012-08-30 16:08:13 UTC (rev 4832)
@@ -12,22 +12,26 @@
$(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
Modified: trunk/docs/dtd/changes.dtd
===================================================================
--- trunk/docs/dtd/changes.dtd 2012-08-30 16:05:43 UTC (rev 4831)
+++ trunk/docs/dtd/changes.dtd 2012-08-30 16:08:13 UTC (rev 4832)
@@ -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 >
Modified: trunk/docs/xml/nginx/changes.xml
===================================================================
--- trunk/docs/xml/nginx/changes.xml 2012-08-30 16:05:43 UTC (rev 4831)
+++ trunk/docs/xml/nginx/changes.xml 2012-08-30 16:08:13 UTC (rev 4832)
@@ -2,13 +2,9 @@
<!DOCTYPE change_log SYSTEM "../../dtd/changes.dtd" >
-<change_log link="/nginx/changes.html" path="/nginx/" root=".."
- title="nginx">
+<change_log title="nginx">
-<title lang="ru">Изменения в nginx</title>
-<title lang="en">nginx changelog</title>
-
<changes ver="1.3.5" date="21.08.2012">
<change type="change">
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
