From 7089853fb1a1e153e7da82387bba6f49e4dca17f Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 5 Jan 2011 16:59:38 +0000
Subject: [PATCH] Merge the following from the English version:

	1.169 -> 1.170	www/ja/index.xsl
	1.11 -> 1.18	www/ja/security/Makefile
	1.4 -> 1.7	www/ja/security/mkindex.xsl
	1.216 -> 1.217	www/ja/security/security.sgml
	1.31 -> 1.32	www/ja/share/sgml/navibar.l10n.ent
---
 ja/index.xsl                   |  6 +++---
 ja/security/Makefile           | 28 +++++++++++++++++++++++-----
 ja/security/mkindex.xsl        | 13 +++----------
 ja/security/security.sgml      |  7 ++++---
 ja/share/sgml/navibar.l10n.ent |  3 ++-
 5 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/ja/index.xsl b/ja/index.xsl
index 7c945ac34d..cb3d03c7f4 100644
--- a/ja/index.xsl
+++ b/ja/index.xsl
@@ -4,8 +4,8 @@
 <!ENTITY title "The FreeBSD Project">
 ]>
 
-<!-- $FreeBSD: www/ja/index.xsl,v 1.57 2010/05/12 13:21:39 ryusuke Exp $ -->
-<!-- Original revision: 1.169 -->
+<!-- $FreeBSD: www/ja/index.xsl,v 1.58 2010/12/07 14:23:08 ryusuke Exp $ -->
+<!-- Original revision: 1.170 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
@@ -335,7 +335,7 @@
 			  <div>
 			    <ul class="newseventslist">
 			      <li class="first-child">
-				<a href="&base;/security/" title="もっと詳しく">もっと詳しく</a>
+				<a href="&enbase;/security/notices.html" title="すべての Errata 情報">すべて表示</a>
 			      </li>
 			      <li class="last-child">
 				<a href="&enbase;/security/errata.xml" title="Errata 情報の RSS フィード"><img class="rssimage" src="&enbase;/layout/images/ico_rss.png" width="27" height="12" alt="Errata Notices RSS Feed" /></a>
diff --git a/ja/security/Makefile b/ja/security/Makefile
index cab4c79cd3..c76fdbff26 100644
--- a/ja/security/Makefile
+++ b/ja/security/Makefile
@@ -1,6 +1,6 @@
-# $FreeBSD: www/ja/security/Makefile,v 1.17 2004/01/19 17:19:34 hrs Exp $
+# $FreeBSD: www/ja/security/Makefile,v 1.18 2006/08/19 21:24:49 hrs Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.11
+# Original revision: 1.18
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -9,20 +9,38 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=  
+#DATA=	so_public_key.asc
+#DOCS=	charter.sgml
 DOCS+=	security.sgml
+#DOCS+=	advisories.sgml
+#DOCS+=  notices.sgml
 
-INDEXLINK= security.html
+#advisories.sgml: advisories.html.inc
 
-security.html: advisories.html.inc
+#notices.sgml: notices.html.inc
+
+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
+
 ### Revision checking
 REVCHECK=	YES
 
diff --git a/ja/security/mkindex.xsl b/ja/security/mkindex.xsl
index 64775ee982..306c86ffdb 100644
--- a/ja/security/mkindex.xsl
+++ b/ja/security/mkindex.xsl
@@ -5,26 +5,19 @@
 <!ENTITY title "">
 ]>
 
-<!-- $FreeBSD: www/ja/security/mkindex.xsl,v 1.2 2004/01/19 17:19:34 hrs Exp $ -->
-<!-- Original revision: 1.4 -->
+<!-- $FreeBSD: www/ja/security/mkindex.xsl,v 1.3 2006/08/19 21:24:49 hrs Exp $ -->
+<!-- Original revision: 1.7 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   
-  <xsl:variable name="date" select="'$FreeBSD: www/ja/security/mkindex.xsl,v 1.2 2004/01/19 17:19:34 hrs Exp $'"/>
-
   <xsl:output type="xml" encoding="&xml.encoding;"
               omit-xml-declaration="yes" />
 
   <xsl:template match="/">
     <xsl:call-template name="html-list-advisories">
        <xsl:with-param name="advisories.xml" select="$advisories.xml" />
+       <xsl:with-param name="type" select="$type" />
     </xsl:call-template>
   </xsl:template>
-
-  <xsl:template name="html-list-advisories-release-label">
-    <xsl:param name="relname" select="'none'" />
-
-    <p><xsl:value-of select="$relname" /> の公開。</p>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/ja/security/security.sgml b/ja/security/security.sgml
index 5766ec46c7..106672329e 100644
--- a/ja/security/security.sgml
+++ b/ja/security/security.sgml
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.90 2010/08/17 09:38:00 ryusuke Exp $">
+<!ENTITY date "$FreeBSD: www/ja/security/security.sgml,v 1.91 2010/12/01 09:26:05 ryusuke Exp $">
 <!ENTITY title "FreeBSD セキュリティ情報">
 <!ENTITY % navinclude.support "INCLUDE">
 <!ENTITY % developers SYSTEM "../../en/developers.sgml"> %developers;
 <!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
 ]>
-<!-- $FreeBSD: www/ja/security/security.sgml,v 1.90 2010/08/17 09:38:00 ryusuke Exp $ -->
+<!-- $FreeBSD: www/ja/security/security.sgml,v 1.91 2010/12/01 09:26:05 ryusuke Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.216 -->
+<!-- Original revision: 1.217 -->
 
 <html>
   &header;
@@ -33,6 +33,7 @@
   <ul>
     <li><a href="&enbase;/security/charter.html">セキュリティオフィサおよびチームの憲章</a></li>
     <li><a href="&enbase;/security/advisories.html">FreeBSD のセキュリティ勧告</a></li>
+    <li><a href="&enbase;/security/notices.html">FreeBSD の Errata 情報</a></li>
     <li><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/security-advisories.html">
 	FreeBSD セキュリティ勧告の読み方</a></li>
   </ul>
diff --git a/ja/share/sgml/navibar.l10n.ent b/ja/share/sgml/navibar.l10n.ent
index ea16fc3075..b4d0e629fd 100644
--- a/ja/share/sgml/navibar.l10n.ent
+++ b/ja/share/sgml/navibar.l10n.ent
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='euc-jp'?>
-<!-- $FreeBSD: www/ja/share/sgml/navibar.l10n.ent,v 1.14 2010/07/09 17:27:15 ryusuke Exp $ -->
+<!-- $FreeBSD: www/ja/share/sgml/navibar.l10n.ent,v 1.15 2010/07/15 12:15:29 ryusuke Exp $ -->
 
 <!ENTITY % navinclude.about "IGNORE">
 <![ %navinclude.about; [
@@ -141,6 +141,7 @@
 <li><a href="&base;/security/">セキュリティ情報</a>
 	<ul>
 		<li><a href="&enbase;/security/advisories.html">セキュリティ勧告</a></li>
+		<li><a href="&enbase;/security/notices.html">Errata 情報</a></li>
 	</ul>
 </li>
 <li><a href="&base;/support/bugreports.html">バグ報告</a>