svn commit: r38960 - in head/ja_JP.eucJP/htdocs: events security

Fri Jun 1 12:24:11 UTC 2012

Author: ryusuke
Date: Fri Jun  1 12:24:10 2012
New Revision: 38960
URL: http://svn.freebsd.org/changeset/doc/38960

Log:
  - Merge the following from the English version:
  
  	r38115 -> r38855	head/ja_JP.eucJP/htdocs/events/Makefile
  	r38700 -> r38865	head/ja_JP.eucJP/htdocs/security/security.sgml

Modified:
  head/ja_JP.eucJP/htdocs/events/Makefile
  head/ja_JP.eucJP/htdocs/security/security.sgml

Modified: head/ja_JP.eucJP/htdocs/events/Makefile
==============================================================================

--- head/ja_JP.eucJP/htdocs/events/Makefile	Fri Jun  1 04:57:18 2012	(r38959)
+++ head/ja_JP.eucJP/htdocs/events/Makefile	Fri Jun  1 12:24:10 2012	(r38960)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.20
+# Original revision: r38855
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -13,9 +13,9 @@
 #SUBDIR+= 2003
 
 # The year the top level events.html file starts from:
-YEARSTART= 2011
+YEARSTART= 2012
 # Years to generate past events pages for and link from top level:
-PASTYEARS= 2010 2009 2008 2007 2006 2005 2004 2003
+PASTYEARS= 2011 2010 2009 2008 2007 2006 2005 2004 2003
 
 DATA=	events.css
 INDEXLINK=	events.html

Modified: head/ja_JP.eucJP/htdocs/security/security.sgml
==============================================================================
--- head/ja_JP.eucJP/htdocs/security/security.sgml	Fri Jun  1 04:57:18 2012	(r38959)
+++ head/ja_JP.eucJP/htdocs/security/security.sgml	Fri Jun  1 12:24:10 2012	(r38960)
@@ -8,7 +8,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.224 -->
+<!-- Original revision: r38865 -->
 
 <html>
   &header;
@@ -87,14 +87,14 @@
 
   <table>
     <tr valign="top">
-      <td>&a.cperciva; <a
-        href="mailto:cperciva at FreeBSD.org">&lt;cperciva at FreeBSD.org&gt;</a></td>
+      <td>&a.simon; <a
+        href="mailto:simon at FreeBSD.org">&lt;simon at FreeBSD.org&gt;</a></td>
       <td>¥»¥¥å¥ê¥Æ¥£¥ª¥Õ¥£¥µ</td>
     </tr>
     <tr valign="top">
-      <td>&a.simon; <a
-        href="mailto:simon at FreeBSD.org">&lt;simon at FreeBSD.org&gt;</a></td>
-      <td>¥»¥¥å¥ê¥Æ¥£¥ª¥Õ¥£¥µÊäº´</td>
+      <td>&a.cperciva; <a
+        href="mailto:cperciva at FreeBSD.org">&lt;cperciva at FreeBSD.org&gt;</a></td>
+      <td>Ì¾ÍÀ¥»¥¥å¥ê¥Æ¥£¥ª¥Õ¥£¥µ</td>
     </tr>
     <tr valign="top">
       <td>&a.rwatson; <a
