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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Tue Oct 1 14:00:20 UTC 2013 

Author: ryusuke
Date: Tue Oct  1 14:00:18 2013
New Revision: 42786
URL: http://svnweb.freebsd.org/changeset/doc/42786

Log:
  - Merge the following from the English version:
  
  	r41946 -> r42777	head/ja_JP.eucJP/htdocs/security/security.xml
  	r41857 -> r42767	head/ja_JP.eucJP/htdocs/where.xml

Modified:
  head/ja_JP.eucJP/htdocs/security/security.xml
  head/ja_JP.eucJP/htdocs/where.xml

Modified: head/ja_JP.eucJP/htdocs/security/security.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/security/security.xml	Tue Oct  1 13:46:43 2013	(r42785)
+++ head/ja_JP.eucJP/htdocs/security/security.xml	Tue Oct  1 14:00:18 2013	(r42786)
@@ -6,7 +6,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r41946 -->
+<!-- Original revision: r42777 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -72,40 +72,48 @@
       <th>Êݼ齪λͽÄêÆü</th>
     </tr>
     <tr>
-      <td>RELENG_8</td>
+      <td>stable/8</td>
       <td>¤Ê¤·</td>
       <td>¤Ê¤·</td>
       <td>¤Ê¤·</td>
       <td>ºÇ½ª¥ê¥ê¡¼¥¹¸å 2 ǯ</td>
     </tr>
     <tr>
-      <td>RELENG_8_4</td>
+      <td>releng/8.4</td>
       <td>8.4-RELEASE</td>
       <td>Extended</td>
       <td>2013 ǯ 6 ·î 9 Æü</td>
       <td>2015 ǯ 6 ·î 30 Æü</td>
     </tr>
     <tr>
-      <td>RELENG_8_3</td>
+      <td>releng/8.3</td>
       <td>8.3-RELEASE</td>
       <td>Extended</td>
       <td>2012 ǯ 4 ·î 18 Æü</td>
       <td>2014 ǯ 4 ·î 30 Æü</td>
     </tr>
     <tr>
-      <td>RELENG_9</td>
+      <td>stable/9</td>
       <td>¤Ê¤·</td>
       <td>¤Ê¤·</td>
       <td>¤Ê¤·</td>
       <td>ºÇ½ª¥ê¥ê¡¼¥¹¸å 2 ǯ</td>
     </tr>
     <tr>
-      <td>RELENG_9_1</td>
+      <td>releng/9.1</td>
       <td>9.1-RELEASE</td>
       <td>Extended</td>
       <td>2012 ǯ 12 ·î 30 Æü</td>
       <td>2014 ǯ 12 ·î 31 Æü</td>
     </tr>
+
+    <tr>
+      <td>releng/9.2</td>
+      <td>9.2-RELEASE</td>
+      <td>Normal</td>
+      <td>2013 ǯ 9 ·î 30 Æü</td>
+      <td>2014 ǯ 9 ·î 30 Æü</td>
+    </tr>
   </table>
 
   <p>¤³¤ì°ÊÁ°¤Î¸Å¤¤¥ê¥ê¡¼¥¹¤Ë¤Ä¤¤¤Æ¤Ï¡¢
@@ -143,16 +151,16 @@
 
   <ul>
     <li><p>-STABLE ¥Ö¥é¥ó¥Á¤Ë¤Ï
-	<tt>RELENG_9</tt> ¤Î¤è¤¦¤Ê¥¿¥°Ì¾¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£
+	<tt>stable/9</tt> ¤Î¤è¤¦¤Ê¥¿¥°Ì¾¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£
 	¤³¤ì¤ËÂбþ¤¹¤ë¹½ÃÛʪ¤Ï
-	<tt>FreeBSD 9.1-STABLE</tt> ¤Î¤è¤¦¤Ê̾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£</p></li>
+	<tt>FreeBSD 9.2-STABLE</tt> ¤Î¤è¤¦¤Ê̾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£</p></li>
 
     <li><p>FreeBSD ¤Î³Æ¥ê¥ê¡¼¥¹¤Ë¤Ï¡¢
 	Âбþ¤¹¤ë¥»¥­¥å¥ê¥Æ¥£¥Ö¥é¥ó¥Á¤¬¤Ò¤È¤ÄÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	¥»¥­¥å¥ê¥Æ¥£¥Ö¥é¥ó¥Á¤Ë¤Ï
-	<tt>RELENG_9_1</tt> ¤Î¤è¤¦¤Ê¥¿¥°Ì¾¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£
+	<tt>releng/9.2</tt> ¤Î¤è¤¦¤Ê¥¿¥°Ì¾¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£
 	¤³¤ì¤ËÂбþ¤¹¤ë¹½ÃÛʪ¤Ï
-	<tt>FreeBSD 9.1-RELEASE-p1</tt> ¤Î¤è¤¦¤Ê̾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£</p></li>
+	<tt>FreeBSD 9.2-RELEASE-p1</tt> ¤Î¤è¤¦¤Ê̾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£</p></li>
   </ul>
 
   <p>Ports Collection ¤Ë´ØÏ¢¤·¤¿ÌäÂê¤Ï¡¢

Modified: head/ja_JP.eucJP/htdocs/where.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/where.xml	Tue Oct  1 13:46:43 2013	(r42785)
+++ head/ja_JP.eucJP/htdocs/where.xml	Tue Oct  1 14:00:18 2013	(r42786)
@@ -5,7 +5,7 @@
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r41857 -->
+<!-- Original revision: r42767 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -69,10 +69,10 @@
 	<tr>
 	  <td colspan="2">FreeBSD &rel.current;-RELEASE</td>
 	  <td colspan="2"></td>
-	  <td rowspan="5"><a href="&enbase;/releases/&rel.current;R/relnotes.html">[View]</a></td>
-	  <td rowspan="5"><a href="&enbase;/releases/&rel.current;R/hardware.html">[View]</a></td>
-	  <td rowspan="5"><a href="&enbase;/releases/&rel.current;R/installation.html">[View]</a></td>
-	  <td rowspan="5"><a href="&enbase;/releases/&rel.current;R/errata.html">[View]</a></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/relnotes.html">[View]</a></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/hardware.html">[View]</a></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/installation.html">[View]</a></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/errata.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
@@ -86,7 +86,6 @@
 	  <td><a href="&url.rel;/i386/i386/&rel.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td>
 	  <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	</tr>
-<!--
 	<tr>
 	  <td></td>
 	  <td>ia64</td>
@@ -99,7 +98,6 @@
 	  <td><a href="&url.rel;/powerpc/powerpc/&rel.current;-RELEASE">[ÇÛÉÛ¸µ]</a></td>
 	  <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	</tr>
--->
 	<tr>
 	  <td></td>
 	  <td>powerpc64</td>

More information about the svn-doc-all mailing list