diff --git a/en/index.xsl b/en/index.xsl index 7f302f63fb..63edebd2e7 100644 --- a/en/index.xsl +++ b/en/index.xsl @@ -4,7 +4,7 @@ ]> - + @@ -334,7 +334,7 @@
  • - More + More
  • Errata Notices RSS Feed diff --git a/en/security/Makefile b/en/security/Makefile index 9a295886e1..8bc6760bd3 100644 --- a/en/security/Makefile +++ b/en/security/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/security/Makefile,v 1.16 2008/03/01 01:55:27 simon Exp $ +# $FreeBSD: www/en/security/Makefile,v 1.17 2008/06/20 20:03:28 danger Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -11,21 +11,30 @@ DATA= so_public_key.asc DOCS= charter.sgml DOCS+= security.sgml DOCS+= advisories.sgml +DOCS+= notices.sgml advisories.sgml: advisories.html.inc -INDEXLINK= security.html +notices.sgml: notices.html.inc -security.html: advisories.html.inc advisories.rdf +INDEXLINK= security.html DEPENDSET.DEFAULT= advisories DEPENDSET.errata-rss= notices +DEPENDSET.notices= notices XML.DEFAULT= ${XML_ADVISORIES} XMLDOCS= advisories:mkindex.xsl::advisories.html.inc +PARAMS.advisories= --param type "'advisory'" NO_DATA.advisories= yes NO_TIDY.advisories= yes +XMLDOCS+= notices:mkindex.xsl::notices.html.inc +PARAMS.notices= --param advisories.xml "'${XML_NOTICES}'" +PARAMS.notices+= --param type "'notice'" +NO_DATA.notices= yes +NO_TIDY.notices= yes + XMLDOCS+= advisories-rdf:security-rdf.xsl::advisories.rdf XMLDOCS+= advisories-rss:security-rss.xsl::rss.xml XMLDOCS+= errata-rss:errata-rss.xsl::errata.xml diff --git a/en/security/mkindex.xsl b/en/security/mkindex.xsl index 9997fa9401..7f3dc05891 100644 --- a/en/security/mkindex.xsl +++ b/en/security/mkindex.xsl @@ -5,7 +5,7 @@ ]> - + @@ -16,6 +16,7 @@ + diff --git a/en/security/security.sgml b/en/security/security.sgml index 9d8fcecf01..da732fea20 100644 --- a/en/security/security.sgml +++ b/en/security/security.sgml @@ -1,12 +1,11 @@ - + %developers; - ]> - + &header; @@ -32,6 +31,7 @@ diff --git a/share/sgml/libcommon.xsl b/share/sgml/libcommon.xsl index e94d674483..3c436d9af2 100644 --- a/share/sgml/libcommon.xsl +++ b/share/sgml/libcommon.xsl @@ -1,7 +1,7 @@ - + + - - - - - - - - - - - - - - - - + + @@ -798,12 +782,13 @@ + - + diff --git a/share/sgml/navibar.ent b/share/sgml/navibar.ent index 029afe81ce..17d51da635 100644 --- a/share/sgml/navibar.ent +++ b/share/sgml/navibar.ent @@ -1,4 +1,4 @@ - + Security Information
  • Bug Reports
    • DateAdvisory name
    Date name