svn commit: r51607 - in head/ja_JP.eucJP: htdocs htdocs/releases htdocs/security share/xml

Ryusuke SUZUKI <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]>
Author: ryusuke
Date: Wed May  2 09:46:10 2018
New Revision: 51607
URL: https://svnweb.freebsd.org/changeset/doc/51607

Log:
  - Merge the following from the English version:
  
  	r51342 -> r51605	head/ja_JP.eucJP/htdocs/index.xsl
  	r51261 -> r51605	head/ja_JP.eucJP/htdocs/releases/index.xml
  	r51259 -> r51605	head/ja_JP.eucJP/htdocs/security/security.xml
  	r51261 -> r51605	head/ja_JP.eucJP/share/xml/navibar.l10n.ent

Modified:
  head/ja_JP.eucJP/htdocs/index.xsl
  head/ja_JP.eucJP/htdocs/releases/index.xml
  head/ja_JP.eucJP/htdocs/security/security.xml
  head/ja_JP.eucJP/share/xml/navibar.l10n.ent

Modified: head/ja_JP.eucJP/htdocs/index.xsl
==============================================================================
--- head/ja_JP.eucJP/htdocs/index.xsl	Wed May  2 08:18:08 2018	(r51606)
+++ head/ja_JP.eucJP/htdocs/index.xsl	Wed May  2 09:46:10 2018	(r51607)
@@ -5,7 +5,7 @@
 ]>
 
 <!-- $FreeBSD$ -->
-<!-- Original revision: r51342 -->
+<!-- Original revision: r51605 -->
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -99,10 +99,8 @@
 			  <ul id="frontreleaseslist">
 			    <li>¥×¥í¥À¥¯¥·¥ç¥ó:&nbsp;<a
 				href="&u.rel.announce;">&rel.current;</a>,
-					<a
-				href="&u.rel1.announce;">&rel1.current;</a>,
-					<a
-				href="&u.rel2.announce;">&rel2.current;</a></li>
+				<a
+				href="&u.rel1.announce;">&rel1.current;</a></li>
 			    <xsl:if test="'&beta.upcoming;' != 'IGNORE'">
 			    <li>¼¡²óͽÄê: <a
 				href="&u.betarel.schedule;">&betarel.current;</a></li>

Modified: head/ja_JP.eucJP/htdocs/releases/index.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/releases/index.xml	Wed May  2 08:18:08 2018	(r51606)
+++ head/ja_JP.eucJP/htdocs/releases/index.xml	Wed May  2 09:46:10 2018	(r51607)
@@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r51261 -->
+<!-- Original revision: r51605 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -64,17 +64,6 @@
 	<a href="&u.rel1.signatures;">¥Á¥§¥Ã¥¯¥µ¥à</a>
 	</em></p>
 
-      <p><b>Release &rel2.current;</b> (&rel2.current.date;)
-	<em>
-	<a href="&u.rel2.announce;">¥¢¥Ê¥¦¥ó¥¹</a> :
-	<a href="&u.rel2.notes;">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a> :
-	<a href="&u.rel2.installation;">¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É</a> :
-	<a href="&u.rel2.hardware;">¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</a> :
-	<a href="&u.rel2.readme;">README</a> :
-	<a href="&u.rel2.errata;">Errata (Àµ¸íɽ)</a> :
-	<a href="&u.rel2.signatures;">¥Á¥§¥Ã¥¯¥µ¥à</a>
-	</em></p>
-
   <a name="future"></a>
   <h2>¾­Íè¤Î¥ê¥ê¡¼¥¹</h2>
 
@@ -90,12 +79,6 @@
       ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="&base;/where.html">FreeBSD ¤ò¼ê¤Ë¤¤¤ì¤ë</a>
       ¤Î¹à¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
 
-    <p>&os;&nbsp;12.0 ¥ê¥ê¡¼¥¹¥µ¥¤¥¯¥ë¤Î³«»Ï»þ´ü¤Ï¡¢
-      2019 ǯ½éƬ¤òͽÄꤷ¤Æ¤¤¤Þ¤¹¡£
-      12.0-RELEASE ¤Î¥¹¥±¥¸¥å¡¼¥ë¤Ï¡¢·èÄ꼡Âè
-      <a href="&enbase;/releases/12.0R/schedule.html">¤³¤³</a>
-      ¤«¤é³Îǧ¤Ç¤­¤Þ¤¹¡£</p>
-
   <!-- temporary disable entry: RL 20150303
   <a name="prior-supported"></a>
   <h2>¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë²áµî¤Î¥ê¥ê¡¼¥¹</h2>
@@ -123,6 +106,18 @@
 	  <a href="&enbase;/releases/11.0R/readme.html">Readme</a>:
 	  <a href="&enbase;/releases/11.0R/errata.html">Errata (Àµ¸íɽ)</a>:
 	  <a href="&enbase;/releases/11.0R/signatures.html">¥Á¥§¥Ã¥¯¥µ¥à</a>
+	</em>
+      </li>
+
+      <li><b>10.3</b> (2016 ǯ 4 ·î)
+	<em>
+	  <a href="&enbase;/releases/10.3R/announce.html">¥¢¥Ê¥¦¥ó¥¹</a>:
+	  <a href="&enbase;/releases/10.3R/relnotes.html">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a>:
+	  <a href="&enbase;/releases/10.3R/installation.html">¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É</a>:
+	  <a href="&enbase;/releases/10.3R/hardware.html">¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</a>:
+	  <a href="&enbase;/releases/10.3R/readme.html">Readme</a>:
+	  <a href="&enbase;/releases/10.3R/errata.html">Errata (Àµ¸íɽ)</a>
+	  <a href="&enbase;/releases/10.3R/signatures.html">¥Á¥§¥Ã¥¯¥µ¥à</a>
 	</em>
       </li>
 

Modified: head/ja_JP.eucJP/htdocs/security/security.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/security/security.xml	Wed May  2 08:18:08 2018	(r51606)
+++ head/ja_JP.eucJP/htdocs/security/security.xml	Wed May  2 09:46:10 2018	(r51607)
@@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r51259 -->
+<!-- Original revision: r51605 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -153,13 +153,6 @@
       <td>¤Ê¤·</td>
       <td>¤Ê¤·</td>
       <td>2018 ǯ 10 ·î 31 Æü</td>
-    </tr>
-    <tr>
-      <td>releng/10.3</td>
-      <td>10.3-RELEASE</td>
-      <td>Extended</td>
-      <td>2016 ǯ 4 ·î 4 Æü</td>
-      <td>2018 ǯ 4 ·î 30 Æü</td>
     </tr>
     <tr>
       <td>releng/10.4</td>

Modified: head/ja_JP.eucJP/share/xml/navibar.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/navibar.l10n.ent	Wed May  2 08:18:08 2018	(r51606)
+++ head/ja_JP.eucJP/share/xml/navibar.l10n.ent	Wed May  2 09:46:10 2018	(r51607)
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='euc-jp'?>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r51261 -->
+<!-- Original revision: r51605 -->
 
 <!ENTITY nav.about '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
@@ -103,8 +103,6 @@
 	  <a href="&u.rel.announce;">&rel.current;</a></li>
 	<li>¥×¥í¥À¥¯¥·¥ç¥ó¥ê¥ê¡¼¥¹:<br />
 	  <a href="&u.rel1.announce;">&rel1.current;</a></li>
-	<li>¥×¥í¥À¥¯¥·¥ç¥ó¥ê¥ê¡¼¥¹:<br />
-	  <a href="&u.rel2.announce;">&rel2.current;</a></li>
       </ul>
     </li>
     <li><a href="&base;/snapshots/">¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥ê¥ê¡¼¥¹</a>

_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.