diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2012-08-30 16:08:13 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2012-08-30 16:08:13 +0000 |
| commit | 7ee8de668c4a3d337eb3997a258e4e40adaf069c (patch) | |
| tree | ce654e6e7a93099cbf812d08557fd05020b9a893 /docs | |
| parent | 440ab7aec1d63031d24e36150e04cf80fbcb5836 (diff) | |
| download | nginx-7ee8de668c4a3d337eb3997a258e4e40adaf069c.tar.gz nginx-7ee8de668c4a3d337eb3997a258e4e40adaf069c.tar.bz2 | |
Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/GNUmakefile | 8 | ||||
| -rw-r--r-- | docs/dtd/changes.dtd | 4 | ||||
| -rw-r--r-- | docs/xml/nginx/changes.xml | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/docs/GNUmakefile b/docs/GNUmakefile index aea676054..7c72b9171 100644 --- 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 4dea2c7af..e14518af7 100644 --- 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 af5ea7c0b..cc475da00 100644 --- 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"> |